diff --git a/src/app/app.component.html b/src/app/app.component.html
index ce032fa7..fe7f33a6 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,12 +1 @@
-<md-sidenav-container>
-
-    <fuse-layout></fuse-layout>
-
-    <!-- QUICK PANEL -->
-    <md-sidenav fuseMdSidenavHelper="quick-panel" align="end">
-        quick-panel
-    </md-sidenav>
-    <!-- / QUICK PANEL -->
-
-</md-sidenav-container>
-
+<fuse-main></fuse-main>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c708b423..f8e107ac 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -5,21 +5,21 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AppComponent } from './app.component';
 import { RouterModule, Routes } from '@angular/router';
 import 'hammerjs';
-import { ProjectModule } from './main/apps/dashboards/project/project.module';
+import { ProjectModule } from './main/content/apps/dashboards/project/project.module';
 import { FuseLayoutService } from './core/services/layout.service';
 import { FuseNavigationService } from './core/components/navigation/navigation.service';
 import { FuseMatchMedia } from './core/services/match-media.service';
-import { FuseNavbarService } from './core/components/layout/navbar/navbar.service';
+import { FuseNavbarService } from './main/navbar/navbar.service';
 import { SharedModule } from './core/modules/shared.module';
 import { FuseMdSidenavHelperService } from './core/directives/md-sidenav-helper/md-sidenav-helper.service';
-import { FuseLayoutModule } from './core/components/layout/layout.module';
+import { FuseMainModule } from './main/main.module';
 import { PerfectScrollbarConfigInterface, PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 import { HttpModule } from '@angular/http';
 import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
 import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
-import { PagesModule } from './main/pages/pages.module';
-import { UIModule } from './main/ui/ui.module';
-import { ComponentsModule } from './main/components/components.module';
+import { PagesModule } from './main/content/pages/pages.module';
+import { UIModule } from './main/content/ui/ui.module';
+import { ComponentsModule } from './main/content/components/components.module';
 
 const PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
     suppressScrollX: true
@@ -72,7 +72,7 @@ const appRoutes: Routes = [
 
         PerfectScrollbarModule.forRoot(PERFECT_SCROLLBAR_CONFIG),
 
-        FuseLayoutModule,
+        FuseMainModule,
 
         ProjectModule,
 
diff --git a/src/app/core/components/layout/layout.component.html b/src/app/core/components/layout/layout.component.html
deleted file mode 100644
index 8d425087..00000000
--- a/src/app/core/components/layout/layout.component.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- TOOLBAR: Above -->
-<ng-container *ngIf="layoutSettings.toolbar === 'above'">
-    <fuse-toolbar class="above"></fuse-toolbar>
-</ng-container>
-<!-- / TOOLBAR: Above -->
-
-<div id="wrapper">
-
-    <fuse-navbar class="md-primary-bg" *ngIf="layoutSettings.navigation === 'left'"></fuse-navbar>
-
-    <div class="content-wrapper">
-
-        <!-- TOOLBAR: Below -->
-        <ng-container *ngIf="layoutSettings.toolbar === 'below'">
-            <fuse-toolbar class="below"></fuse-toolbar>
-        </ng-container>
-        <!-- / TOOLBAR: Below -->
-
-        <fuse-content perfect-scrollbar></fuse-content>
-
-        <!-- FOOTER: Below -->
-        <ng-container *ngIf="layoutSettings.footer === 'below'">
-            <fuse-footer class="below"></fuse-footer>
-        </ng-container>
-        <!-- / FOOTER: Below -->
-
-    </div>
-
-    <fuse-navbar class="md-primary-bg" *ngIf="layoutSettings.navigation === 'right'"></fuse-navbar>
-
-</div>
-
-<!-- FOOTER: Above -->
-<ng-container *ngIf="layoutSettings.footer === 'above'">
-    <fuse-footer class="above"></fuse-footer>
-</ng-container>
-<!-- FOOTER: Above -->
diff --git a/src/app/core/components/layout/layout.component.scss b/src/app/core/components/layout/layout.component.scss
deleted file mode 100644
index 754a1727..00000000
--- a/src/app/core/components/layout/layout.component.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-fuse-layout {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-
-    #wrapper {
-        display: flex;
-        flex: 1;
-
-        .content-wrapper {
-            display: flex;
-            flex-direction: column;
-            flex: 1;
-            overflow: hidden;
-
-            fuse-content {
-                display: flex;
-                flex-direction: row;
-                width: 100%;
-                height: 100%;
-                overflow-x: hidden;
-                overflow-y: auto;
-
-                > *:not(router-outlet):not(.ps__scrollbar-x-rail):not(.ps__scrollbar-y-rail) {
-                    width: 100%;
-                    min-width: 100%;
-                }
-            }
-        }
-    }
-}
diff --git a/src/app/main/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html
similarity index 100%
rename from src/app/main/apps/calendar/calendar.component.html
rename to src/app/main/content/apps/calendar/calendar.component.html
diff --git a/src/app/main/apps/calendar/calendar.component.scss b/src/app/main/content/apps/calendar/calendar.component.scss
similarity index 100%
rename from src/app/main/apps/calendar/calendar.component.scss
rename to src/app/main/content/apps/calendar/calendar.component.scss
diff --git a/src/app/main/apps/calendar/calendar.component.ts b/src/app/main/content/apps/calendar/calendar.component.ts
similarity index 98%
rename from src/app/main/apps/calendar/calendar.component.ts
rename to src/app/main/content/apps/calendar/calendar.component.ts
index b208c028..c99b474c 100644
--- a/src/app/main/apps/calendar/calendar.component.ts
+++ b/src/app/main/content/apps/calendar/calendar.component.ts
@@ -12,7 +12,7 @@ import {
     CalendarEventTimesChangedEvent,
     CalendarMonthViewDay
 } from 'angular-calendar';
-import { FuseConfirmDialogComponent } from '../../../core/components/confirm-dialog/confirm-dialog.component';
+import { FuseConfirmDialogComponent } from '../../../../core/components/confirm-dialog/confirm-dialog.component';
 
 @Component({
     selector       : 'fuse-calendar',
diff --git a/src/app/main/apps/calendar/calendar.module.ts b/src/app/main/content/apps/calendar/calendar.module.ts
similarity index 93%
rename from src/app/main/apps/calendar/calendar.module.ts
rename to src/app/main/content/apps/calendar/calendar.module.ts
index ca59bee0..d8b2733d 100644
--- a/src/app/main/apps/calendar/calendar.module.ts
+++ b/src/app/main/content/apps/calendar/calendar.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { CalendarComponent } from './calendar.component';
 import { CalendarService } from './calendar.service';
diff --git a/src/app/main/apps/calendar/calendar.service.ts b/src/app/main/content/apps/calendar/calendar.service.ts
similarity index 100%
rename from src/app/main/apps/calendar/calendar.service.ts
rename to src/app/main/content/apps/calendar/calendar.service.ts
diff --git a/src/app/main/apps/calendar/event-detail/event-detail.component.html b/src/app/main/content/apps/calendar/event-detail/event-detail.component.html
similarity index 100%
rename from src/app/main/apps/calendar/event-detail/event-detail.component.html
rename to src/app/main/content/apps/calendar/event-detail/event-detail.component.html
diff --git a/src/app/main/apps/calendar/event-detail/event-detail.component.scss b/src/app/main/content/apps/calendar/event-detail/event-detail.component.scss
similarity index 100%
rename from src/app/main/apps/calendar/event-detail/event-detail.component.scss
rename to src/app/main/content/apps/calendar/event-detail/event-detail.component.scss
diff --git a/src/app/main/apps/calendar/event-detail/event-detail.component.ts b/src/app/main/content/apps/calendar/event-detail/event-detail.component.ts
similarity index 100%
rename from src/app/main/apps/calendar/event-detail/event-detail.component.ts
rename to src/app/main/content/apps/calendar/event-detail/event-detail.component.ts
diff --git a/src/app/main/apps/calendar/event-form/event-form.component.html b/src/app/main/content/apps/calendar/event-form/event-form.component.html
similarity index 100%
rename from src/app/main/apps/calendar/event-form/event-form.component.html
rename to src/app/main/content/apps/calendar/event-form/event-form.component.html
diff --git a/src/app/main/apps/calendar/event-form/event-form.component.scss b/src/app/main/content/apps/calendar/event-form/event-form.component.scss
similarity index 100%
rename from src/app/main/apps/calendar/event-form/event-form.component.scss
rename to src/app/main/content/apps/calendar/event-form/event-form.component.scss
diff --git a/src/app/main/apps/calendar/event-form/event-form.component.ts b/src/app/main/content/apps/calendar/event-form/event-form.component.ts
similarity index 100%
rename from src/app/main/apps/calendar/event-form/event-form.component.ts
rename to src/app/main/content/apps/calendar/event-form/event-form.component.ts
diff --git a/src/app/main/apps/calendar/event.model.ts b/src/app/main/content/apps/calendar/event.model.ts
similarity index 100%
rename from src/app/main/apps/calendar/event.model.ts
rename to src/app/main/content/apps/calendar/event.model.ts
diff --git a/src/app/main/apps/chat/chat-start/chat-start.component.html b/src/app/main/content/apps/chat/chat-start/chat-start.component.html
similarity index 100%
rename from src/app/main/apps/chat/chat-start/chat-start.component.html
rename to src/app/main/content/apps/chat/chat-start/chat-start.component.html
diff --git a/src/app/main/apps/chat/chat-start/chat-start.component.scss b/src/app/main/content/apps/chat/chat-start/chat-start.component.scss
similarity index 100%
rename from src/app/main/apps/chat/chat-start/chat-start.component.scss
rename to src/app/main/content/apps/chat/chat-start/chat-start.component.scss
diff --git a/src/app/main/apps/chat/chat-start/chat-start.component.ts b/src/app/main/content/apps/chat/chat-start/chat-start.component.ts
similarity index 100%
rename from src/app/main/apps/chat/chat-start/chat-start.component.ts
rename to src/app/main/content/apps/chat/chat-start/chat-start.component.ts
diff --git a/src/app/main/apps/chat/chat-view/chat-view.component.html b/src/app/main/content/apps/chat/chat-view/chat-view.component.html
similarity index 100%
rename from src/app/main/apps/chat/chat-view/chat-view.component.html
rename to src/app/main/content/apps/chat/chat-view/chat-view.component.html
diff --git a/src/app/main/apps/chat/chat-view/chat-view.component.scss b/src/app/main/content/apps/chat/chat-view/chat-view.component.scss
similarity index 100%
rename from src/app/main/apps/chat/chat-view/chat-view.component.scss
rename to src/app/main/content/apps/chat/chat-view/chat-view.component.scss
diff --git a/src/app/main/apps/chat/chat-view/chat-view.component.ts b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts
similarity index 100%
rename from src/app/main/apps/chat/chat-view/chat-view.component.ts
rename to src/app/main/content/apps/chat/chat-view/chat-view.component.ts
diff --git a/src/app/main/apps/chat/chat.component.html b/src/app/main/content/apps/chat/chat.component.html
similarity index 100%
rename from src/app/main/apps/chat/chat.component.html
rename to src/app/main/content/apps/chat/chat.component.html
diff --git a/src/app/main/apps/chat/chat.component.scss b/src/app/main/content/apps/chat/chat.component.scss
similarity index 100%
rename from src/app/main/apps/chat/chat.component.scss
rename to src/app/main/content/apps/chat/chat.component.scss
diff --git a/src/app/main/apps/chat/chat.component.ts b/src/app/main/content/apps/chat/chat.component.ts
similarity index 100%
rename from src/app/main/apps/chat/chat.component.ts
rename to src/app/main/content/apps/chat/chat.component.ts
diff --git a/src/app/main/apps/chat/chat.module.ts b/src/app/main/content/apps/chat/chat.module.ts
similarity index 95%
rename from src/app/main/apps/chat/chat.module.ts
rename to src/app/main/content/apps/chat/chat.module.ts
index 42d843c5..6d9ead69 100644
--- a/src/app/main/apps/chat/chat.module.ts
+++ b/src/app/main/content/apps/chat/chat.module.ts
@@ -1,5 +1,5 @@
 import {NgModule} from '@angular/core';
-import {SharedModule} from '../../../core/modules/shared.module';
+import {SharedModule} from '../../../../core/modules/shared.module';
 import {RouterModule, Routes} from '@angular/router';
 import {ChatComponent} from './chat.component';
 import {ChatService} from './chat.service';
diff --git a/src/app/main/apps/chat/chat.service.ts b/src/app/main/content/apps/chat/chat.service.ts
similarity index 99%
rename from src/app/main/apps/chat/chat.service.ts
rename to src/app/main/content/apps/chat/chat.service.ts
index 7996a17a..f3353e6e 100644
--- a/src/app/main/apps/chat/chat.service.ts
+++ b/src/app/main/content/apps/chat/chat.service.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable';
 import { Http } from '@angular/http';
 import { Subject } from 'rxjs/Subject';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { FuseUtils } from '../../../core/fuseUtils';
+import { FuseUtils } from '../../../../core/fuseUtils';
 
 @Injectable()
 export class ChatService implements Resolve<any>
diff --git a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/left/chats/chats.component.html
rename to src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
diff --git a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss
rename to src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss
diff --git a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.ts b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts
similarity index 92%
rename from src/app/main/apps/chat/sidenavs/left/chats/chats.component.ts
rename to src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts
index 6be10562..abcb32d3 100644
--- a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.ts
+++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ChatService } from '../../../chat.service';
-import { FuseMdSidenavHelperService } from '../../../../../../core/directives/md-sidenav-helper/md-sidenav-helper.service';
+import { FuseMdSidenavHelperService } from '../../../../../../../core/directives/md-sidenav-helper/md-sidenav-helper.service';
 import { ObservableMedia } from '@angular/flex-layout';
 
 @Component({
diff --git a/src/app/main/apps/chat/sidenavs/left/left.component.html b/src/app/main/content/apps/chat/sidenavs/left/left.component.html
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/left/left.component.html
rename to src/app/main/content/apps/chat/sidenavs/left/left.component.html
diff --git a/src/app/main/apps/chat/sidenavs/left/left.component.scss b/src/app/main/content/apps/chat/sidenavs/left/left.component.scss
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/left/left.component.scss
rename to src/app/main/content/apps/chat/sidenavs/left/left.component.scss
diff --git a/src/app/main/apps/chat/sidenavs/left/left.component.ts b/src/app/main/content/apps/chat/sidenavs/left/left.component.ts
similarity index 90%
rename from src/app/main/apps/chat/sidenavs/left/left.component.ts
rename to src/app/main/content/apps/chat/sidenavs/left/left.component.ts
index 0b16799f..a97840bc 100644
--- a/src/app/main/apps/chat/sidenavs/left/left.component.ts
+++ b/src/app/main/content/apps/chat/sidenavs/left/left.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Animations } from '../../../../../core/animations';
+import { Animations } from '../../../../../../core/animations';
 import { ChatService } from '../../chat.service';
 
 @Component({
diff --git a/src/app/main/apps/chat/sidenavs/left/user/user.component.html b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/left/user/user.component.html
rename to src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
diff --git a/src/app/main/apps/chat/sidenavs/left/user/user.component.scss b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/left/user/user.component.scss
rename to src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss
diff --git a/src/app/main/apps/chat/sidenavs/left/user/user.component.ts b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/left/user/user.component.ts
rename to src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts
diff --git a/src/app/main/apps/chat/sidenavs/right/contact/contact.component.html b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/right/contact/contact.component.html
rename to src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
diff --git a/src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss
rename to src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss
diff --git a/src/app/main/apps/chat/sidenavs/right/contact/contact.component.ts b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/right/contact/contact.component.ts
rename to src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts
diff --git a/src/app/main/apps/chat/sidenavs/right/right.component.html b/src/app/main/content/apps/chat/sidenavs/right/right.component.html
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/right/right.component.html
rename to src/app/main/content/apps/chat/sidenavs/right/right.component.html
diff --git a/src/app/main/apps/chat/sidenavs/right/right.component.scss b/src/app/main/content/apps/chat/sidenavs/right/right.component.scss
similarity index 100%
rename from src/app/main/apps/chat/sidenavs/right/right.component.scss
rename to src/app/main/content/apps/chat/sidenavs/right/right.component.scss
diff --git a/src/app/main/apps/chat/sidenavs/right/right.component.ts b/src/app/main/content/apps/chat/sidenavs/right/right.component.ts
similarity index 90%
rename from src/app/main/apps/chat/sidenavs/right/right.component.ts
rename to src/app/main/content/apps/chat/sidenavs/right/right.component.ts
index 3006f034..99c495af 100644
--- a/src/app/main/apps/chat/sidenavs/right/right.component.ts
+++ b/src/app/main/content/apps/chat/sidenavs/right/right.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Animations } from '../../../../../core/animations';
+import { Animations } from '../../../../../../core/animations';
 import { ChatService } from '../../chat.service';
 
 @Component({
diff --git a/src/app/main/apps/contacts/contact-list/contact-list.component.html b/src/app/main/content/apps/contacts/contact-list/contact-list.component.html
similarity index 100%
rename from src/app/main/apps/contacts/contact-list/contact-list.component.html
rename to src/app/main/content/apps/contacts/contact-list/contact-list.component.html
diff --git a/src/app/main/apps/contacts/contact-list/contact-list.component.scss b/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
similarity index 100%
rename from src/app/main/apps/contacts/contact-list/contact-list.component.scss
rename to src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
diff --git a/src/app/main/apps/contacts/contact-list/contact-list.component.ts b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
similarity index 100%
rename from src/app/main/apps/contacts/contact-list/contact-list.component.ts
rename to src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
diff --git a/src/app/main/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
similarity index 100%
rename from src/app/main/apps/contacts/contacts.component.html
rename to src/app/main/content/apps/contacts/contacts.component.html
diff --git a/src/app/main/apps/contacts/contacts.component.scss b/src/app/main/content/apps/contacts/contacts.component.scss
similarity index 100%
rename from src/app/main/apps/contacts/contacts.component.scss
rename to src/app/main/content/apps/contacts/contacts.component.scss
diff --git a/src/app/main/apps/contacts/contacts.component.ts b/src/app/main/content/apps/contacts/contacts.component.ts
similarity index 100%
rename from src/app/main/apps/contacts/contacts.component.ts
rename to src/app/main/content/apps/contacts/contacts.component.ts
diff --git a/src/app/main/apps/contacts/contacts.module.ts b/src/app/main/content/apps/contacts/contacts.module.ts
similarity index 92%
rename from src/app/main/apps/contacts/contacts.module.ts
rename to src/app/main/content/apps/contacts/contacts.module.ts
index e93f148e..25c613ca 100644
--- a/src/app/main/apps/contacts/contacts.module.ts
+++ b/src/app/main/content/apps/contacts/contacts.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { MainSidenavComponent } from './sidenavs/main/main.component';
 import { ContactsComponent } from './contacts.component';
diff --git a/src/app/main/apps/contacts/contacts.service.ts b/src/app/main/content/apps/contacts/contacts.service.ts
similarity index 100%
rename from src/app/main/apps/contacts/contacts.service.ts
rename to src/app/main/content/apps/contacts/contacts.service.ts
diff --git a/src/app/main/apps/contacts/sidenavs/main/main.component.html b/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
similarity index 100%
rename from src/app/main/apps/contacts/sidenavs/main/main.component.html
rename to src/app/main/content/apps/contacts/sidenavs/main/main.component.html
diff --git a/src/app/main/apps/contacts/sidenavs/main/main.component.scss b/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss
similarity index 100%
rename from src/app/main/apps/contacts/sidenavs/main/main.component.scss
rename to src/app/main/content/apps/contacts/sidenavs/main/main.component.scss
diff --git a/src/app/main/apps/contacts/sidenavs/main/main.component.ts b/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts
similarity index 100%
rename from src/app/main/apps/contacts/sidenavs/main/main.component.ts
rename to src/app/main/content/apps/contacts/sidenavs/main/main.component.ts
diff --git a/src/app/main/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
similarity index 100%
rename from src/app/main/apps/dashboards/project/project.component.html
rename to src/app/main/content/apps/dashboards/project/project.component.html
diff --git a/src/app/main/apps/dashboards/project/project.component.scss b/src/app/main/content/apps/dashboards/project/project.component.scss
similarity index 100%
rename from src/app/main/apps/dashboards/project/project.component.scss
rename to src/app/main/content/apps/dashboards/project/project.component.scss
diff --git a/src/app/main/apps/dashboards/project/project.component.ts b/src/app/main/content/apps/dashboards/project/project.component.ts
similarity index 92%
rename from src/app/main/apps/dashboards/project/project.component.ts
rename to src/app/main/content/apps/dashboards/project/project.component.ts
index 48fb55d2..bbb37f74 100644
--- a/src/app/main/apps/dashboards/project/project.component.ts
+++ b/src/app/main/content/apps/dashboards/project/project.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { Subscription } from 'rxjs/Subscription';
 
 @Component({
diff --git a/src/app/main/apps/dashboards/project/project.module.ts b/src/app/main/content/apps/dashboards/project/project.module.ts
similarity index 86%
rename from src/app/main/apps/dashboards/project/project.module.ts
rename to src/app/main/content/apps/dashboards/project/project.module.ts
index cd617311..1a8b72cd 100644
--- a/src/app/main/apps/dashboards/project/project.module.ts
+++ b/src/app/main/content/apps/dashboards/project/project.module.ts
@@ -1,7 +1,7 @@
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 import {ProjectComponent} from './project.component';
-import {SharedModule} from '../../../../core/modules/shared.module';
+import {SharedModule} from '../../../../../core/modules/shared.module';
 
 const routes: Routes = [
     {
diff --git a/src/app/main/apps/file-manager/file-list/file-list.component.html b/src/app/main/content/apps/file-manager/file-list/file-list.component.html
similarity index 100%
rename from src/app/main/apps/file-manager/file-list/file-list.component.html
rename to src/app/main/content/apps/file-manager/file-list/file-list.component.html
diff --git a/src/app/main/apps/file-manager/file-list/file-list.component.scss b/src/app/main/content/apps/file-manager/file-list/file-list.component.scss
similarity index 100%
rename from src/app/main/apps/file-manager/file-list/file-list.component.scss
rename to src/app/main/content/apps/file-manager/file-list/file-list.component.scss
diff --git a/src/app/main/apps/file-manager/file-list/file-list.component.ts b/src/app/main/content/apps/file-manager/file-list/file-list.component.ts
similarity index 100%
rename from src/app/main/apps/file-manager/file-list/file-list.component.ts
rename to src/app/main/content/apps/file-manager/file-list/file-list.component.ts
diff --git a/src/app/main/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html
similarity index 100%
rename from src/app/main/apps/file-manager/file-manager.component.html
rename to src/app/main/content/apps/file-manager/file-manager.component.html
diff --git a/src/app/main/apps/file-manager/file-manager.component.scss b/src/app/main/content/apps/file-manager/file-manager.component.scss
similarity index 100%
rename from src/app/main/apps/file-manager/file-manager.component.scss
rename to src/app/main/content/apps/file-manager/file-manager.component.scss
diff --git a/src/app/main/apps/file-manager/file-manager.component.ts b/src/app/main/content/apps/file-manager/file-manager.component.ts
similarity index 100%
rename from src/app/main/apps/file-manager/file-manager.component.ts
rename to src/app/main/content/apps/file-manager/file-manager.component.ts
diff --git a/src/app/main/apps/file-manager/file-manager.module.ts b/src/app/main/content/apps/file-manager/file-manager.module.ts
similarity index 93%
rename from src/app/main/apps/file-manager/file-manager.module.ts
rename to src/app/main/content/apps/file-manager/file-manager.module.ts
index b769e4e3..beadf3eb 100644
--- a/src/app/main/apps/file-manager/file-manager.module.ts
+++ b/src/app/main/content/apps/file-manager/file-manager.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { FileManagerComponent } from './file-manager.component';
 import { FileManagerService } from './file-manager.service';
diff --git a/src/app/main/apps/file-manager/file-manager.service.ts b/src/app/main/content/apps/file-manager/file-manager.service.ts
similarity index 100%
rename from src/app/main/apps/file-manager/file-manager.service.ts
rename to src/app/main/content/apps/file-manager/file-manager.service.ts
diff --git a/src/app/main/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
similarity index 100%
rename from src/app/main/apps/file-manager/sidenavs/details/details.component.html
rename to src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
diff --git a/src/app/main/apps/file-manager/sidenavs/details/details.component.scss b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss
similarity index 100%
rename from src/app/main/apps/file-manager/sidenavs/details/details.component.scss
rename to src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss
diff --git a/src/app/main/apps/file-manager/sidenavs/details/details.component.ts b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts
similarity index 100%
rename from src/app/main/apps/file-manager/sidenavs/details/details.component.ts
rename to src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts
diff --git a/src/app/main/apps/file-manager/sidenavs/main/main.component.html b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
similarity index 100%
rename from src/app/main/apps/file-manager/sidenavs/main/main.component.html
rename to src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
diff --git a/src/app/main/apps/file-manager/sidenavs/main/main.component.scss b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.scss
similarity index 100%
rename from src/app/main/apps/file-manager/sidenavs/main/main.component.scss
rename to src/app/main/content/apps/file-manager/sidenavs/main/main.component.scss
diff --git a/src/app/main/apps/file-manager/sidenavs/main/main.component.ts b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts
similarity index 100%
rename from src/app/main/apps/file-manager/sidenavs/main/main.component.ts
rename to src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts
diff --git a/src/app/main/apps/mail/mail-details/mail-details.component.html b/src/app/main/content/apps/mail/mail-details/mail-details.component.html
similarity index 100%
rename from src/app/main/apps/mail/mail-details/mail-details.component.html
rename to src/app/main/content/apps/mail/mail-details/mail-details.component.html
diff --git a/src/app/main/apps/mail/mail-details/mail-details.component.scss b/src/app/main/content/apps/mail/mail-details/mail-details.component.scss
similarity index 100%
rename from src/app/main/apps/mail/mail-details/mail-details.component.scss
rename to src/app/main/content/apps/mail/mail-details/mail-details.component.scss
diff --git a/src/app/main/apps/mail/mail-details/mail-details.component.ts b/src/app/main/content/apps/mail/mail-details/mail-details.component.ts
similarity index 100%
rename from src/app/main/apps/mail/mail-details/mail-details.component.ts
rename to src/app/main/content/apps/mail/mail-details/mail-details.component.ts
diff --git a/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
similarity index 100%
rename from src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
rename to src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
diff --git a/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
similarity index 100%
rename from src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
rename to src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
diff --git a/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts b/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts
similarity index 100%
rename from src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts
rename to src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts
diff --git a/src/app/main/apps/mail/mail-list/mail-list.component.html b/src/app/main/content/apps/mail/mail-list/mail-list.component.html
similarity index 100%
rename from src/app/main/apps/mail/mail-list/mail-list.component.html
rename to src/app/main/content/apps/mail/mail-list/mail-list.component.html
diff --git a/src/app/main/apps/mail/mail-list/mail-list.component.scss b/src/app/main/content/apps/mail/mail-list/mail-list.component.scss
similarity index 100%
rename from src/app/main/apps/mail/mail-list/mail-list.component.scss
rename to src/app/main/content/apps/mail/mail-list/mail-list.component.scss
diff --git a/src/app/main/apps/mail/mail-list/mail-list.component.ts b/src/app/main/content/apps/mail/mail-list/mail-list.component.ts
similarity index 100%
rename from src/app/main/apps/mail/mail-list/mail-list.component.ts
rename to src/app/main/content/apps/mail/mail-list/mail-list.component.ts
diff --git a/src/app/main/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html
similarity index 100%
rename from src/app/main/apps/mail/mail.component.html
rename to src/app/main/content/apps/mail/mail.component.html
diff --git a/src/app/main/apps/mail/mail.component.scss b/src/app/main/content/apps/mail/mail.component.scss
similarity index 100%
rename from src/app/main/apps/mail/mail.component.scss
rename to src/app/main/content/apps/mail/mail.component.scss
diff --git a/src/app/main/apps/mail/mail.component.ts b/src/app/main/content/apps/mail/mail.component.ts
similarity index 100%
rename from src/app/main/apps/mail/mail.component.ts
rename to src/app/main/content/apps/mail/mail.component.ts
diff --git a/src/app/main/apps/mail/mail.model.ts b/src/app/main/content/apps/mail/mail.model.ts
similarity index 100%
rename from src/app/main/apps/mail/mail.model.ts
rename to src/app/main/content/apps/mail/mail.model.ts
diff --git a/src/app/main/apps/mail/mail.module.ts b/src/app/main/content/apps/mail/mail.module.ts
similarity index 96%
rename from src/app/main/apps/mail/mail.module.ts
rename to src/app/main/content/apps/mail/mail.module.ts
index 871536c3..36765edf 100644
--- a/src/app/main/apps/mail/mail.module.ts
+++ b/src/app/main/content/apps/mail/mail.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { MailComponent } from './mail.component';
 import { MainSidenavComponent } from './sidenavs/main/main-sidenav.component';
diff --git a/src/app/main/apps/mail/mail.service.ts b/src/app/main/content/apps/mail/mail.service.ts
similarity index 100%
rename from src/app/main/apps/mail/mail.service.ts
rename to src/app/main/content/apps/mail/mail.service.ts
diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
similarity index 100%
rename from src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
rename to src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss
similarity index 100%
rename from src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss
rename to src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss
diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
similarity index 100%
rename from src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts
rename to src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
similarity index 100%
rename from src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html
rename to src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss
similarity index 100%
rename from src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss
rename to src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss
diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts
similarity index 100%
rename from src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts
rename to src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts
diff --git a/src/app/main/apps/todo/todo-details/todo-details.component.html b/src/app/main/content/apps/todo/todo-details/todo-details.component.html
similarity index 100%
rename from src/app/main/apps/todo/todo-details/todo-details.component.html
rename to src/app/main/content/apps/todo/todo-details/todo-details.component.html
diff --git a/src/app/main/apps/todo/todo-details/todo-details.component.scss b/src/app/main/content/apps/todo/todo-details/todo-details.component.scss
similarity index 97%
rename from src/app/main/apps/todo/todo-details/todo-details.component.scss
rename to src/app/main/content/apps/todo/todo-details/todo-details.component.scss
index aed07e55..04424c0f 100644
--- a/src/app/main/apps/todo/todo-details/todo-details.component.scss
+++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../core/scss/fuse';
+@import '../../../../../core/scss/fuse';
 
 :host {
     display: flex;
diff --git a/src/app/main/apps/todo/todo-details/todo-details.component.ts b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts
similarity index 98%
rename from src/app/main/apps/todo/todo-details/todo-details.component.ts
rename to src/app/main/content/apps/todo/todo-details/todo-details.component.ts
index 8101cb9a..2cdf31ed 100644
--- a/src/app/main/apps/todo/todo-details/todo-details.component.ts
+++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts
@@ -3,7 +3,7 @@ import { TodoService } from '../todo.service';
 import { Todo } from '../todo.model';
 import { Subscription } from 'rxjs/Subscription';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
-import { FuseUtils } from '../../../../core/fuseUtils';
+import { FuseUtils } from '../../../../../core/fuseUtils';
 
 @Component({
     selector   : 'fuse-todo-details',
diff --git a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.html b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
similarity index 100%
rename from src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
rename to src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
diff --git a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
similarity index 98%
rename from src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
rename to src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
index 37dfb2db..e50ae7eb 100644
--- a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
+++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
@@ -1,4 +1,4 @@
-@import 'src/app/core/scss/fuse';
+@import '../../../../../../core/scss/fuse';
 
 .todo-list-item {
     display: block;
diff --git a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
similarity index 100%
rename from src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
rename to src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
diff --git a/src/app/main/apps/todo/todo-list/todo-list.component.html b/src/app/main/content/apps/todo/todo-list/todo-list.component.html
similarity index 100%
rename from src/app/main/apps/todo/todo-list/todo-list.component.html
rename to src/app/main/content/apps/todo/todo-list/todo-list.component.html
diff --git a/src/app/main/apps/todo/todo-list/todo-list.component.scss b/src/app/main/content/apps/todo/todo-list/todo-list.component.scss
similarity index 100%
rename from src/app/main/apps/todo/todo-list/todo-list.component.scss
rename to src/app/main/content/apps/todo/todo-list/todo-list.component.scss
diff --git a/src/app/main/apps/todo/todo-list/todo-list.component.ts b/src/app/main/content/apps/todo/todo-list/todo-list.component.ts
similarity index 100%
rename from src/app/main/apps/todo/todo-list/todo-list.component.ts
rename to src/app/main/content/apps/todo/todo-list/todo-list.component.ts
diff --git a/src/app/main/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html
similarity index 100%
rename from src/app/main/apps/todo/todo.component.html
rename to src/app/main/content/apps/todo/todo.component.html
diff --git a/src/app/main/apps/todo/todo.component.scss b/src/app/main/content/apps/todo/todo.component.scss
similarity index 100%
rename from src/app/main/apps/todo/todo.component.scss
rename to src/app/main/content/apps/todo/todo.component.scss
diff --git a/src/app/main/apps/todo/todo.component.ts b/src/app/main/content/apps/todo/todo.component.ts
similarity index 100%
rename from src/app/main/apps/todo/todo.component.ts
rename to src/app/main/content/apps/todo/todo.component.ts
diff --git a/src/app/main/apps/todo/todo.model.ts b/src/app/main/content/apps/todo/todo.model.ts
similarity index 100%
rename from src/app/main/apps/todo/todo.model.ts
rename to src/app/main/content/apps/todo/todo.model.ts
diff --git a/src/app/main/apps/todo/todo.module.ts b/src/app/main/content/apps/todo/todo.module.ts
similarity index 96%
rename from src/app/main/apps/todo/todo.module.ts
rename to src/app/main/content/apps/todo/todo.module.ts
index 2fe6b088..65695268 100644
--- a/src/app/main/apps/todo/todo.module.ts
+++ b/src/app/main/content/apps/todo/todo.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 import { RouterModule, Routes } from '@angular/router';
 import { TodoComponent } from './todo.component';
 import { TodoService } from './todo.service';
diff --git a/src/app/main/apps/todo/todo.service.ts b/src/app/main/content/apps/todo/todo.service.ts
similarity index 99%
rename from src/app/main/apps/todo/todo.service.ts
rename to src/app/main/content/apps/todo/todo.service.ts
index a2095b6b..ccc32d23 100644
--- a/src/app/main/apps/todo/todo.service.ts
+++ b/src/app/main/content/apps/todo/todo.service.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable';
 import { Http } from '@angular/http';
 import { Todo } from './todo.model';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { FuseUtils } from '../../../core/fuseUtils';
+import { FuseUtils } from '../../../../core/fuseUtils';
 import { Subject } from 'rxjs/Subject';
 import { Location } from '@angular/common';
 
diff --git a/src/app/main/components/components.module.ts b/src/app/main/content/components/components.module.ts
similarity index 87%
rename from src/app/main/components/components.module.ts
rename to src/app/main/content/components/components.module.ts
index 304aec20..ef7b89a2 100644
--- a/src/app/main/components/components.module.ts
+++ b/src/app/main/content/components/components.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../core/modules/shared.module';
+import { SharedModule } from '../../../core/modules/shared.module';
 import { RouterModule } from '@angular/router';
 import { NgxDatatableComponent } from './datatable/ngx-datatable.component';
 
diff --git a/src/app/main/components/datatable/ngx-datatable.component.html b/src/app/main/content/components/datatable/ngx-datatable.component.html
similarity index 100%
rename from src/app/main/components/datatable/ngx-datatable.component.html
rename to src/app/main/content/components/datatable/ngx-datatable.component.html
diff --git a/src/app/main/components/datatable/ngx-datatable.component.scss b/src/app/main/content/components/datatable/ngx-datatable.component.scss
similarity index 100%
rename from src/app/main/components/datatable/ngx-datatable.component.scss
rename to src/app/main/content/components/datatable/ngx-datatable.component.scss
diff --git a/src/app/main/components/datatable/ngx-datatable.component.ts b/src/app/main/content/components/datatable/ngx-datatable.component.ts
similarity index 100%
rename from src/app/main/components/datatable/ngx-datatable.component.ts
rename to src/app/main/content/components/datatable/ngx-datatable.component.ts
diff --git a/src/app/core/components/layout/content/content.component.html b/src/app/main/content/content.component.html
similarity index 100%
rename from src/app/core/components/layout/content/content.component.html
rename to src/app/main/content/content.component.html
diff --git a/src/app/core/components/layout/content/content.component.scss b/src/app/main/content/content.component.scss
similarity index 100%
rename from src/app/core/components/layout/content/content.component.scss
rename to src/app/main/content/content.component.scss
diff --git a/src/app/core/components/layout/content/content.component.ts b/src/app/main/content/content.component.ts
similarity index 100%
rename from src/app/core/components/layout/content/content.component.ts
rename to src/app/main/content/content.component.ts
diff --git a/src/app/main/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
similarity index 100%
rename from src/app/main/pages/authentication/forgot-password/forgot-password.component.html
rename to src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
diff --git a/src/app/main/pages/authentication/forgot-password/forgot-password.component.scss b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss
similarity index 98%
rename from src/app/main/pages/authentication/forgot-password/forgot-password.component.scss
rename to src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss
index 76283b12..21a35018 100644
--- a/src/app/main/pages/authentication/forgot-password/forgot-password.component.scss
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/authentication/forgot-password/forgot-password.component.ts b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts
similarity index 95%
rename from src/app/main/pages/authentication/forgot-password/forgot-password.component.ts
rename to src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts
index 9e869549..54cdd1e6 100644
--- a/src/app/main/pages/authentication/forgot-password/forgot-password.component.ts
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 @Component({
diff --git a/src/app/main/pages/authentication/lock/lock.component.html b/src/app/main/content/pages/authentication/lock/lock.component.html
similarity index 100%
rename from src/app/main/pages/authentication/lock/lock.component.html
rename to src/app/main/content/pages/authentication/lock/lock.component.html
diff --git a/src/app/main/pages/authentication/lock/lock.component.scss b/src/app/main/content/pages/authentication/lock/lock.component.scss
similarity index 100%
rename from src/app/main/pages/authentication/lock/lock.component.scss
rename to src/app/main/content/pages/authentication/lock/lock.component.scss
diff --git a/src/app/main/pages/authentication/lock/lock.component.ts b/src/app/main/content/pages/authentication/lock/lock.component.ts
similarity index 95%
rename from src/app/main/pages/authentication/lock/lock.component.ts
rename to src/app/main/content/pages/authentication/lock/lock.component.ts
index 8cf9da21..df88ade2 100644
--- a/src/app/main/pages/authentication/lock/lock.component.ts
+++ b/src/app/main/content/pages/authentication/lock/lock.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 @Component({
diff --git a/src/app/main/pages/authentication/login-2/login-2.component.html b/src/app/main/content/pages/authentication/login-2/login-2.component.html
similarity index 100%
rename from src/app/main/pages/authentication/login-2/login-2.component.html
rename to src/app/main/content/pages/authentication/login-2/login-2.component.html
diff --git a/src/app/main/pages/authentication/login-2/login-2.component.scss b/src/app/main/content/pages/authentication/login-2/login-2.component.scss
similarity index 100%
rename from src/app/main/pages/authentication/login-2/login-2.component.scss
rename to src/app/main/content/pages/authentication/login-2/login-2.component.scss
diff --git a/src/app/main/pages/authentication/login-2/login-2.component.ts b/src/app/main/content/pages/authentication/login-2/login-2.component.ts
similarity index 95%
rename from src/app/main/pages/authentication/login-2/login-2.component.ts
rename to src/app/main/content/pages/authentication/login-2/login-2.component.ts
index 8cc139e1..c870cd87 100644
--- a/src/app/main/pages/authentication/login-2/login-2.component.ts
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 @Component({
diff --git a/src/app/main/pages/authentication/login/login.component.html b/src/app/main/content/pages/authentication/login/login.component.html
similarity index 100%
rename from src/app/main/pages/authentication/login/login.component.html
rename to src/app/main/content/pages/authentication/login/login.component.html
diff --git a/src/app/main/pages/authentication/login/login.component.scss b/src/app/main/content/pages/authentication/login/login.component.scss
similarity index 100%
rename from src/app/main/pages/authentication/login/login.component.scss
rename to src/app/main/content/pages/authentication/login/login.component.scss
diff --git a/src/app/main/pages/authentication/login/login.component.ts b/src/app/main/content/pages/authentication/login/login.component.ts
similarity index 95%
rename from src/app/main/pages/authentication/login/login.component.ts
rename to src/app/main/content/pages/authentication/login/login.component.ts
index 23c501b1..f19efac8 100644
--- a/src/app/main/pages/authentication/login/login.component.ts
+++ b/src/app/main/content/pages/authentication/login/login.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 @Component({
diff --git a/src/app/main/pages/authentication/register-2/register-2.component.html b/src/app/main/content/pages/authentication/register-2/register-2.component.html
similarity index 100%
rename from src/app/main/pages/authentication/register-2/register-2.component.html
rename to src/app/main/content/pages/authentication/register-2/register-2.component.html
diff --git a/src/app/main/pages/authentication/register-2/register-2.component.scss b/src/app/main/content/pages/authentication/register-2/register-2.component.scss
similarity index 99%
rename from src/app/main/pages/authentication/register-2/register-2.component.scss
rename to src/app/main/content/pages/authentication/register-2/register-2.component.scss
index 000c0ba7..89ce1feb 100644
--- a/src/app/main/pages/authentication/register-2/register-2.component.scss
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/authentication/register-2/register-2.component.ts b/src/app/main/content/pages/authentication/register-2/register-2.component.ts
similarity index 95%
rename from src/app/main/pages/authentication/register-2/register-2.component.ts
rename to src/app/main/content/pages/authentication/register-2/register-2.component.ts
index dfea9acb..7e94e50c 100644
--- a/src/app/main/pages/authentication/register-2/register-2.component.ts
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 @Component({
diff --git a/src/app/main/pages/authentication/register/register.component.html b/src/app/main/content/pages/authentication/register/register.component.html
similarity index 100%
rename from src/app/main/pages/authentication/register/register.component.html
rename to src/app/main/content/pages/authentication/register/register.component.html
diff --git a/src/app/main/pages/authentication/register/register.component.scss b/src/app/main/content/pages/authentication/register/register.component.scss
similarity index 99%
rename from src/app/main/pages/authentication/register/register.component.scss
rename to src/app/main/content/pages/authentication/register/register.component.scss
index 649a4be3..086b3018 100644
--- a/src/app/main/pages/authentication/register/register.component.scss
+++ b/src/app/main/content/pages/authentication/register/register.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/authentication/register/register.component.ts b/src/app/main/content/pages/authentication/register/register.component.ts
similarity index 95%
rename from src/app/main/pages/authentication/register/register.component.ts
rename to src/app/main/content/pages/authentication/register/register.component.ts
index 0145f400..2e7a0f7f 100644
--- a/src/app/main/pages/authentication/register/register.component.ts
+++ b/src/app/main/content/pages/authentication/register/register.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 @Component({
diff --git a/src/app/main/pages/authentication/reset-password/reset-password.component.html b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
similarity index 100%
rename from src/app/main/pages/authentication/reset-password/reset-password.component.html
rename to src/app/main/content/pages/authentication/reset-password/reset-password.component.html
diff --git a/src/app/main/pages/authentication/reset-password/reset-password.component.scss b/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss
similarity index 98%
rename from src/app/main/pages/authentication/reset-password/reset-password.component.scss
rename to src/app/main/content/pages/authentication/reset-password/reset-password.component.scss
index 1745c596..88451321 100644
--- a/src/app/main/pages/authentication/reset-password/reset-password.component.scss
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/authentication/reset-password/reset-password.component.ts b/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts
similarity index 95%
rename from src/app/main/pages/authentication/reset-password/reset-password.component.ts
rename to src/app/main/content/pages/authentication/reset-password/reset-password.component.ts
index 2c881180..5dc8d5d2 100644
--- a/src/app/main/pages/authentication/reset-password/reset-password.component.ts
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
 @Component({
diff --git a/src/app/main/pages/coming-soon/coming-soon.component.html b/src/app/main/content/pages/coming-soon/coming-soon.component.html
similarity index 100%
rename from src/app/main/pages/coming-soon/coming-soon.component.html
rename to src/app/main/content/pages/coming-soon/coming-soon.component.html
diff --git a/src/app/main/pages/coming-soon/coming-soon.component.scss b/src/app/main/content/pages/coming-soon/coming-soon.component.scss
similarity index 100%
rename from src/app/main/pages/coming-soon/coming-soon.component.scss
rename to src/app/main/content/pages/coming-soon/coming-soon.component.scss
diff --git a/src/app/main/pages/coming-soon/coming-soon.component.ts b/src/app/main/content/pages/coming-soon/coming-soon.component.ts
similarity index 95%
rename from src/app/main/pages/coming-soon/coming-soon.component.ts
rename to src/app/main/content/pages/coming-soon/coming-soon.component.ts
index f264d448..10e5bfb4 100644
--- a/src/app/main/pages/coming-soon/coming-soon.component.ts
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
-import { FuseLayoutService } from '../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../core/services/layout.service';
 
 @Component({
     selector   : 'fuse-coming-soon',
diff --git a/src/app/main/pages/errors/404/error-404.component.html b/src/app/main/content/pages/errors/404/error-404.component.html
similarity index 100%
rename from src/app/main/pages/errors/404/error-404.component.html
rename to src/app/main/content/pages/errors/404/error-404.component.html
diff --git a/src/app/main/pages/errors/404/error-404.component.scss b/src/app/main/content/pages/errors/404/error-404.component.scss
similarity index 96%
rename from src/app/main/pages/errors/404/error-404.component.scss
rename to src/app/main/content/pages/errors/404/error-404.component.scss
index 53b669ab..7e6376bd 100644
--- a/src/app/main/pages/errors/404/error-404.component.scss
+++ b/src/app/main/content/pages/errors/404/error-404.component.scss
@@ -1,4 +1,4 @@
-@import "../../../../core/scss/fuse";
+@import "../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/errors/404/error-404.component.ts b/src/app/main/content/pages/errors/404/error-404.component.ts
similarity index 86%
rename from src/app/main/pages/errors/404/error-404.component.ts
rename to src/app/main/content/pages/errors/404/error-404.component.ts
index 245cc598..7154df11 100644
--- a/src/app/main/pages/errors/404/error-404.component.ts
+++ b/src/app/main/content/pages/errors/404/error-404.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 
 @Component({
     selector   : 'fuse-error-404',
diff --git a/src/app/main/pages/errors/500/error-500.component.html b/src/app/main/content/pages/errors/500/error-500.component.html
similarity index 100%
rename from src/app/main/pages/errors/500/error-500.component.html
rename to src/app/main/content/pages/errors/500/error-500.component.html
diff --git a/src/app/main/pages/errors/500/error-500.component.scss b/src/app/main/content/pages/errors/500/error-500.component.scss
similarity index 95%
rename from src/app/main/pages/errors/500/error-500.component.scss
rename to src/app/main/content/pages/errors/500/error-500.component.scss
index fddbcaf8..e541cab9 100644
--- a/src/app/main/pages/errors/500/error-500.component.scss
+++ b/src/app/main/content/pages/errors/500/error-500.component.scss
@@ -1,4 +1,4 @@
-@import "../../../../core/scss/fuse";
+@import "../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/errors/500/error-500.component.ts b/src/app/main/content/pages/errors/500/error-500.component.ts
similarity index 86%
rename from src/app/main/pages/errors/500/error-500.component.ts
rename to src/app/main/content/pages/errors/500/error-500.component.ts
index f0ad2fec..1038ad34 100644
--- a/src/app/main/pages/errors/500/error-500.component.ts
+++ b/src/app/main/content/pages/errors/500/error-500.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../../core/services/layout.service';
 
 @Component({
     selector   : 'fuse-error-500',
diff --git a/src/app/main/pages/invoices/compact/compact.component.html b/src/app/main/content/pages/invoices/compact/compact.component.html
similarity index 100%
rename from src/app/main/pages/invoices/compact/compact.component.html
rename to src/app/main/content/pages/invoices/compact/compact.component.html
diff --git a/src/app/main/pages/invoices/compact/compact.component.scss b/src/app/main/content/pages/invoices/compact/compact.component.scss
similarity index 100%
rename from src/app/main/pages/invoices/compact/compact.component.scss
rename to src/app/main/content/pages/invoices/compact/compact.component.scss
diff --git a/src/app/main/pages/invoices/compact/compact.component.ts b/src/app/main/content/pages/invoices/compact/compact.component.ts
similarity index 100%
rename from src/app/main/pages/invoices/compact/compact.component.ts
rename to src/app/main/content/pages/invoices/compact/compact.component.ts
diff --git a/src/app/main/pages/invoices/invoice.service.ts b/src/app/main/content/pages/invoices/invoice.service.ts
similarity index 100%
rename from src/app/main/pages/invoices/invoice.service.ts
rename to src/app/main/content/pages/invoices/invoice.service.ts
diff --git a/src/app/main/pages/invoices/modern/modern.component.html b/src/app/main/content/pages/invoices/modern/modern.component.html
similarity index 100%
rename from src/app/main/pages/invoices/modern/modern.component.html
rename to src/app/main/content/pages/invoices/modern/modern.component.html
diff --git a/src/app/main/pages/invoices/modern/modern.component.scss b/src/app/main/content/pages/invoices/modern/modern.component.scss
similarity index 100%
rename from src/app/main/pages/invoices/modern/modern.component.scss
rename to src/app/main/content/pages/invoices/modern/modern.component.scss
diff --git a/src/app/main/pages/invoices/modern/modern.component.ts b/src/app/main/content/pages/invoices/modern/modern.component.ts
similarity index 100%
rename from src/app/main/pages/invoices/modern/modern.component.ts
rename to src/app/main/content/pages/invoices/modern/modern.component.ts
diff --git a/src/app/main/pages/maintenance/maintenance.component.html b/src/app/main/content/pages/maintenance/maintenance.component.html
similarity index 100%
rename from src/app/main/pages/maintenance/maintenance.component.html
rename to src/app/main/content/pages/maintenance/maintenance.component.html
diff --git a/src/app/main/pages/maintenance/maintenance.component.scss b/src/app/main/content/pages/maintenance/maintenance.component.scss
similarity index 100%
rename from src/app/main/pages/maintenance/maintenance.component.scss
rename to src/app/main/content/pages/maintenance/maintenance.component.scss
diff --git a/src/app/main/pages/maintenance/maintenance.component.ts b/src/app/main/content/pages/maintenance/maintenance.component.ts
similarity index 86%
rename from src/app/main/pages/maintenance/maintenance.component.ts
rename to src/app/main/content/pages/maintenance/maintenance.component.ts
index f0441be3..c1000072 100644
--- a/src/app/main/pages/maintenance/maintenance.component.ts
+++ b/src/app/main/content/pages/maintenance/maintenance.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FuseLayoutService } from '../../../core/services/layout.service';
+import { FuseLayoutService } from '../../../../core/services/layout.service';
 
 @Component({
     selector   : 'fuse-maintenance',
diff --git a/src/app/main/pages/pages.module.ts b/src/app/main/content/pages/pages.module.ts
similarity index 98%
rename from src/app/main/pages/pages.module.ts
rename to src/app/main/content/pages/pages.module.ts
index 0de21e5d..b3f1ed8c 100644
--- a/src/app/main/pages/pages.module.ts
+++ b/src/app/main/content/pages/pages.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../core/modules/shared.module';
+import { SharedModule } from '../../../core/modules/shared.module';
 import { RouterModule } from '@angular/router';
 
 import { LoginComponent } from './authentication/login/login.component';
diff --git a/src/app/main/pages/profile/profile.component.html b/src/app/main/content/pages/profile/profile.component.html
similarity index 100%
rename from src/app/main/pages/profile/profile.component.html
rename to src/app/main/content/pages/profile/profile.component.html
diff --git a/src/app/main/pages/profile/profile.component.scss b/src/app/main/content/pages/profile/profile.component.scss
similarity index 96%
rename from src/app/main/pages/profile/profile.component.scss
rename to src/app/main/content/pages/profile/profile.component.scss
index a7e5e542..af51ba98 100644
--- a/src/app/main/pages/profile/profile.component.scss
+++ b/src/app/main/content/pages/profile/profile.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/profile/profile.component.ts b/src/app/main/content/pages/profile/profile.component.ts
similarity index 100%
rename from src/app/main/pages/profile/profile.component.ts
rename to src/app/main/content/pages/profile/profile.component.ts
diff --git a/src/app/main/pages/profile/profile.module.ts b/src/app/main/content/pages/profile/profile.module.ts
similarity index 91%
rename from src/app/main/pages/profile/profile.module.ts
rename to src/app/main/content/pages/profile/profile.module.ts
index a9adca04..6723657f 100644
--- a/src/app/main/pages/profile/profile.module.ts
+++ b/src/app/main/content/pages/profile/profile.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 
 import { ProfileComponent } from './profile.component';
 import { ProfileTimelineComponent } from './tabs/timeline/timeline.component';
diff --git a/src/app/main/pages/profile/profile.service.ts b/src/app/main/content/pages/profile/profile.service.ts
similarity index 100%
rename from src/app/main/pages/profile/profile.service.ts
rename to src/app/main/content/pages/profile/profile.service.ts
diff --git a/src/app/main/pages/profile/tabs/about/about.component.html b/src/app/main/content/pages/profile/tabs/about/about.component.html
similarity index 100%
rename from src/app/main/pages/profile/tabs/about/about.component.html
rename to src/app/main/content/pages/profile/tabs/about/about.component.html
diff --git a/src/app/main/pages/profile/tabs/about/about.component.scss b/src/app/main/content/pages/profile/tabs/about/about.component.scss
similarity index 98%
rename from src/app/main/pages/profile/tabs/about/about.component.scss
rename to src/app/main/content/pages/profile/tabs/about/about.component.scss
index eabcfbf6..f4133d7b 100644
--- a/src/app/main/pages/profile/tabs/about/about.component.scss
+++ b/src/app/main/content/pages/profile/tabs/about/about.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/profile/tabs/about/about.component.ts b/src/app/main/content/pages/profile/tabs/about/about.component.ts
similarity index 100%
rename from src/app/main/pages/profile/tabs/about/about.component.ts
rename to src/app/main/content/pages/profile/tabs/about/about.component.ts
diff --git a/src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.html b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html
similarity index 100%
rename from src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.html
rename to src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html
diff --git a/src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.scss b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss
similarity index 96%
rename from src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.scss
rename to src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss
index 5691b548..83ece155 100644
--- a/src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.scss
+++ b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.ts b/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts
similarity index 100%
rename from src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.ts
rename to src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts
diff --git a/src/app/main/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
similarity index 100%
rename from src/app/main/pages/profile/tabs/timeline/timeline.component.html
rename to src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
diff --git a/src/app/main/pages/profile/tabs/timeline/timeline.component.scss b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss
similarity index 99%
rename from src/app/main/pages/profile/tabs/timeline/timeline.component.scss
rename to src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss
index 448e4a20..09824417 100644
--- a/src/app/main/pages/profile/tabs/timeline/timeline.component.scss
+++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/profile/tabs/timeline/timeline.component.ts b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts
similarity index 100%
rename from src/app/main/pages/profile/tabs/timeline/timeline.component.ts
rename to src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts
diff --git a/src/app/main/pages/search/search.component.html b/src/app/main/content/pages/search/search.component.html
similarity index 100%
rename from src/app/main/pages/search/search.component.html
rename to src/app/main/content/pages/search/search.component.html
diff --git a/src/app/main/pages/search/search.component.scss b/src/app/main/content/pages/search/search.component.scss
similarity index 97%
rename from src/app/main/pages/search/search.component.scss
rename to src/app/main/content/pages/search/search.component.scss
index f1f14de3..d6e0818e 100644
--- a/src/app/main/pages/search/search.component.scss
+++ b/src/app/main/content/pages/search/search.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/search/search.component.ts b/src/app/main/content/pages/search/search.component.ts
similarity index 100%
rename from src/app/main/pages/search/search.component.ts
rename to src/app/main/content/pages/search/search.component.ts
diff --git a/src/app/main/pages/search/search.module.ts b/src/app/main/content/pages/search/search.module.ts
similarity index 88%
rename from src/app/main/pages/search/search.module.ts
rename to src/app/main/content/pages/search/search.module.ts
index 78360cbc..5e9bf9b9 100644
--- a/src/app/main/pages/search/search.module.ts
+++ b/src/app/main/content/pages/search/search.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../../core/modules/shared.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
 
 import { SearchClassicComponent } from './tabs/classic/classic.component';
 import { SearchTableComponent } from './tabs/table/table.component';
diff --git a/src/app/main/pages/search/search.service.ts b/src/app/main/content/pages/search/search.service.ts
similarity index 100%
rename from src/app/main/pages/search/search.service.ts
rename to src/app/main/content/pages/search/search.service.ts
diff --git a/src/app/main/pages/search/tabs/classic/classic.component.html b/src/app/main/content/pages/search/tabs/classic/classic.component.html
similarity index 100%
rename from src/app/main/pages/search/tabs/classic/classic.component.html
rename to src/app/main/content/pages/search/tabs/classic/classic.component.html
diff --git a/src/app/main/pages/search/tabs/classic/classic.component.scss b/src/app/main/content/pages/search/tabs/classic/classic.component.scss
similarity index 96%
rename from src/app/main/pages/search/tabs/classic/classic.component.scss
rename to src/app/main/content/pages/search/tabs/classic/classic.component.scss
index 4a8acf7c..73f10e46 100644
--- a/src/app/main/pages/search/tabs/classic/classic.component.scss
+++ b/src/app/main/content/pages/search/tabs/classic/classic.component.scss
@@ -1,4 +1,4 @@
-@import "src/app/core/scss/fuse";
+@import "../../../../../../core/scss/fuse";
 
 :host {
 
diff --git a/src/app/main/pages/search/tabs/classic/classic.component.ts b/src/app/main/content/pages/search/tabs/classic/classic.component.ts
similarity index 100%
rename from src/app/main/pages/search/tabs/classic/classic.component.ts
rename to src/app/main/content/pages/search/tabs/classic/classic.component.ts
diff --git a/src/app/main/pages/search/tabs/table/table.component.html b/src/app/main/content/pages/search/tabs/table/table.component.html
similarity index 100%
rename from src/app/main/pages/search/tabs/table/table.component.html
rename to src/app/main/content/pages/search/tabs/table/table.component.html
diff --git a/src/app/main/content/pages/search/tabs/table/table.component.scss b/src/app/main/content/pages/search/tabs/table/table.component.scss
new file mode 100644
index 00000000..56e6b52a
--- /dev/null
+++ b/src/app/main/content/pages/search/tabs/table/table.component.scss
@@ -0,0 +1,6 @@
+@import "../../../../../../core/scss/fuse";
+
+:host {
+
+
+}
\ No newline at end of file
diff --git a/src/app/main/pages/search/tabs/table/table.component.ts b/src/app/main/content/pages/search/tabs/table/table.component.ts
similarity index 100%
rename from src/app/main/pages/search/tabs/table/table.component.ts
rename to src/app/main/content/pages/search/tabs/table/table.component.ts
diff --git a/src/app/main/ui/colors/colors.component.html b/src/app/main/content/ui/colors/colors.component.html
similarity index 100%
rename from src/app/main/ui/colors/colors.component.html
rename to src/app/main/content/ui/colors/colors.component.html
diff --git a/src/app/main/ui/colors/colors.component.scss b/src/app/main/content/ui/colors/colors.component.scss
similarity index 100%
rename from src/app/main/ui/colors/colors.component.scss
rename to src/app/main/content/ui/colors/colors.component.scss
diff --git a/src/app/main/ui/colors/colors.component.ts b/src/app/main/content/ui/colors/colors.component.ts
similarity index 88%
rename from src/app/main/ui/colors/colors.component.ts
rename to src/app/main/content/ui/colors/colors.component.ts
index d2766877..745bc93a 100644
--- a/src/app/main/ui/colors/colors.component.ts
+++ b/src/app/main/content/ui/colors/colors.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { MatColors } from '../../../core/matColors';
-import { MdTab } from '@angular/material';
+import { MatColors } from '../../../../core/matColors';
 
 @Component({
     selector   : 'fuse-colors',
diff --git a/src/app/main/ui/colors/colors.module.ts b/src/app/main/content/ui/colors/colors.module.ts
similarity index 75%
rename from src/app/main/ui/colors/colors.module.ts
rename to src/app/main/content/ui/colors/colors.module.ts
index d4690cf4..09378492 100644
--- a/src/app/main/ui/colors/colors.module.ts
+++ b/src/app/main/content/ui/colors/colors.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { SharedModule } from '../../../core/modules/shared.module';
-import { FuseDemoModule } from '../../../core/components/demo/demo.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
+import { FuseDemoModule } from '../../../../core/components/demo/demo.module';
 import { ColorsComponent } from './colors.component';
 
 const routes: Routes = [
diff --git a/src/app/main/ui/page-layouts/blank/blank.component.html b/src/app/main/content/ui/page-layouts/blank/blank.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/blank/blank.component.html
rename to src/app/main/content/ui/page-layouts/blank/blank.component.html
diff --git a/src/app/main/ui/page-layouts/blank/blank.component.scss b/src/app/main/content/ui/page-layouts/blank/blank.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/blank/blank.component.scss
rename to src/app/main/content/ui/page-layouts/blank/blank.component.scss
diff --git a/src/app/main/ui/page-layouts/blank/blank.component.ts b/src/app/main/content/ui/page-layouts/blank/blank.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/blank/blank.component.ts
rename to src/app/main/content/ui/page-layouts/blank/blank.component.ts
diff --git a/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
rename to src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
diff --git a/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss
rename to src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss
diff --git a/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts
rename to src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts
diff --git a/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.html
rename to src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
diff --git a/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.scss b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.scss
rename to src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.scss
diff --git a/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts
rename to src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.ts
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
rename to src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss
rename to src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts
rename to src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
rename to src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss
rename to src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts
rename to src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
rename to src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss
rename to src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts
rename to src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
rename to src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss
rename to src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts
rename to src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts
diff --git a/src/app/main/ui/page-layouts/page-layouts.module.ts b/src/app/main/content/ui/page-layouts/page-layouts.module.ts
similarity index 96%
rename from src/app/main/ui/page-layouts/page-layouts.module.ts
rename to src/app/main/content/ui/page-layouts/page-layouts.module.ts
index ac8a862c..b939eb30 100644
--- a/src/app/main/ui/page-layouts/page-layouts.module.ts
+++ b/src/app/main/content/ui/page-layouts/page-layouts.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { SharedModule } from '../../../core/modules/shared.module';
-import { FuseDemoModule } from '../../../core/components/demo/demo.module';
+import { SharedModule } from '../../../../core/modules/shared.module';
+import { FuseDemoModule } from '../../../../core/components/demo/demo.module';
 import { CardedFullWidthComponent } from './carded/fullwidth/fullwidth.component';
 import { CardedFullWidth2Component } from './carded/fullwidth-2/fullwidth-2.component';
 import { CardedLeftSidenavComponent } from './carded/left-sidenav/left-sidenav.component';
diff --git a/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.html
rename to src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
diff --git a/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.scss b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.scss
rename to src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts
rename to src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.ts
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts
rename to src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts
rename to src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts
diff --git a/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.html b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.html
rename to src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
diff --git a/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.scss b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.scss
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.scss
rename to src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.scss
diff --git a/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.ts
similarity index 100%
rename from src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts
rename to src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.ts
diff --git a/src/app/main/ui/ui.module.ts b/src/app/main/content/ui/ui.module.ts
similarity index 100%
rename from src/app/main/ui/ui.module.ts
rename to src/app/main/content/ui/ui.module.ts
diff --git a/src/app/core/components/layout/footer/footer.component.html b/src/app/main/footer/footer.component.html
similarity index 100%
rename from src/app/core/components/layout/footer/footer.component.html
rename to src/app/main/footer/footer.component.html
diff --git a/src/app/core/components/layout/footer/footer.component.scss b/src/app/main/footer/footer.component.scss
similarity index 100%
rename from src/app/core/components/layout/footer/footer.component.scss
rename to src/app/main/footer/footer.component.scss
diff --git a/src/app/core/components/layout/footer/footer.component.ts b/src/app/main/footer/footer.component.ts
similarity index 100%
rename from src/app/core/components/layout/footer/footer.component.ts
rename to src/app/main/footer/footer.component.ts
diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html
new file mode 100644
index 00000000..330addb2
--- /dev/null
+++ b/src/app/main/main.component.html
@@ -0,0 +1,51 @@
+<md-sidenav-container>
+
+    <div id="fuse-main-content">
+
+        <!-- TOOLBAR: Above -->
+        <ng-container *ngIf="layoutSettings.toolbar === 'above'">
+            <fuse-toolbar class="above"></fuse-toolbar>
+        </ng-container>
+        <!-- / TOOLBAR: Above -->
+
+        <div id="wrapper">
+
+            <fuse-navbar class="md-primary-bg" *ngIf="layoutSettings.navigation === 'left'"></fuse-navbar>
+
+            <div class="content-wrapper">
+
+                <!-- TOOLBAR: Below -->
+                <ng-container *ngIf="layoutSettings.toolbar === 'below'">
+                    <fuse-toolbar class="below"></fuse-toolbar>
+                </ng-container>
+                <!-- / TOOLBAR: Below -->
+
+                <fuse-content perfect-scrollbar></fuse-content>
+
+                <!-- FOOTER: Below -->
+                <ng-container *ngIf="layoutSettings.footer === 'below'">
+                    <fuse-footer class="below"></fuse-footer>
+                </ng-container>
+                <!-- / FOOTER: Below -->
+
+            </div>
+
+            <fuse-navbar class="md-primary-bg" *ngIf="layoutSettings.navigation === 'right'"></fuse-navbar>
+
+        </div>
+
+        <!-- FOOTER: Above -->
+        <ng-container *ngIf="layoutSettings.footer === 'above'">
+            <fuse-footer class="above"></fuse-footer>
+        </ng-container>
+        <!-- FOOTER: Above -->
+
+    </div>
+
+    <!-- QUICK PANEL -->
+    <md-sidenav fuseMdSidenavHelper="quick-panel" align="end">
+        quick-panel
+    </md-sidenav>
+    <!-- / QUICK PANEL -->
+
+</md-sidenav-container>
diff --git a/src/app/main/main.component.scss b/src/app/main/main.component.scss
new file mode 100644
index 00000000..9dd7ce3b
--- /dev/null
+++ b/src/app/main/main.component.scss
@@ -0,0 +1,50 @@
+fuse-main {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+
+    .mat-sidenav-container {
+        display: flex;
+        flex: 1;
+
+        .mat-sidenav-content {
+            display: flex;
+            flex: 1;
+            overflow: hidden;
+            width: 100%;
+
+            #fuse-main-content {
+                display: flex;
+                flex: 1;
+                flex-direction: column;
+
+                #wrapper {
+                    display: flex;
+                    flex: 1;
+
+                    .content-wrapper {
+                        display: flex;
+                        flex-direction: column;
+                        flex: 1;
+                        overflow: hidden;
+
+                        fuse-content {
+                            display: flex;
+                            flex-direction: row;
+                            width: 100%;
+                            height: 100%;
+                            overflow-x: hidden;
+                            overflow-y: auto;
+
+                            > *:not(router-outlet):not(.ps__scrollbar-x-rail):not(.ps__scrollbar-y-rail) {
+                                width: 100%;
+                                min-width: 100%;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/app/core/components/layout/layout.component.ts b/src/app/main/main.component.ts
similarity index 74%
rename from src/app/core/components/layout/layout.component.ts
rename to src/app/main/main.component.ts
index 4af4aa59..f92d4acf 100644
--- a/src/app/core/components/layout/layout.component.ts
+++ b/src/app/main/main.component.ts
@@ -1,14 +1,14 @@
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
-import { FuseLayoutService } from '../../services/layout.service';
+import { FuseLayoutService } from '../core/services/layout.service';
 import { Subscription } from 'rxjs/Subscription';
 
 @Component({
-    selector     : 'fuse-layout',
-    templateUrl  : './layout.component.html',
-    styleUrls    : ['./layout.component.scss'],
+    selector     : 'fuse-main',
+    templateUrl  : './main.component.html',
+    styleUrls    : ['./main.component.scss'],
     encapsulation: ViewEncapsulation.None
 })
-export class FuseLayoutComponent implements OnInit, OnDestroy
+export class FuseMainComponent implements OnInit, OnDestroy
 {
     onSettingsChanged: Subscription;
     layoutSettings: { navigation: string, toolbar: string, footer: string };
diff --git a/src/app/core/components/layout/layout.module.ts b/src/app/main/main.module.ts
similarity index 72%
rename from src/app/core/components/layout/layout.module.ts
rename to src/app/main/main.module.ts
index 5710911a..6f298957 100644
--- a/src/app/core/components/layout/layout.module.ts
+++ b/src/app/main/main.module.ts
@@ -1,19 +1,19 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../modules/shared.module';
+import { SharedModule } from '../core/modules/shared.module';
 import { RouterModule } from '@angular/router';
-import { FuseLayoutComponent } from './layout.component';
+import { FuseMainComponent } from './main.component';
 import { FuseContentComponent } from './content/content.component';
 import { FuseFooterComponent } from './footer/footer.component';
 import { FuseNavbarComponent } from './navbar/navbar.component';
 import { FuseToolbarComponent } from './toolbar/toolbar.component';
-import { FuseNavigationModule } from '../navigation/navigation.module';
+import { FuseNavigationModule } from '../core/components/navigation/navigation.module';
 import { FuseNavbarToggleDirective } from './navbar/navbar-toggle.directive';
 
 @NgModule({
     declarations: [
         FuseContentComponent,
         FuseFooterComponent,
-        FuseLayoutComponent,
+        FuseMainComponent,
         FuseNavbarComponent,
         FuseToolbarComponent,
         FuseNavbarToggleDirective
@@ -24,10 +24,10 @@ import { FuseNavbarToggleDirective } from './navbar/navbar-toggle.directive';
         FuseNavigationModule
     ],
     exports     : [
-        FuseLayoutComponent
+        FuseMainComponent
     ]
 })
 
-export class FuseLayoutModule
+export class FuseMainModule
 {
 }
diff --git a/src/app/core/components/layout/navbar/navbar-toggle.directive.ts b/src/app/main/navbar/navbar-toggle.directive.ts
similarity index 100%
rename from src/app/core/components/layout/navbar/navbar-toggle.directive.ts
rename to src/app/main/navbar/navbar-toggle.directive.ts
diff --git a/src/app/core/components/layout/navbar/navbar.component.html b/src/app/main/navbar/navbar.component.html
similarity index 100%
rename from src/app/core/components/layout/navbar/navbar.component.html
rename to src/app/main/navbar/navbar.component.html
diff --git a/src/app/core/components/layout/navbar/navbar.component.scss b/src/app/main/navbar/navbar.component.scss
similarity index 98%
rename from src/app/core/components/layout/navbar/navbar.component.scss
rename to src/app/main/navbar/navbar.component.scss
index f366bfab..33e3151f 100644
--- a/src/app/core/components/layout/navbar/navbar.component.scss
+++ b/src/app/main/navbar/navbar.component.scss
@@ -1,4 +1,4 @@
-@import "../../../scss/fuse";
+@import "../../core/scss/fuse";
 
 body {
 
diff --git a/src/app/core/components/layout/navbar/navbar.component.ts b/src/app/main/navbar/navbar.component.ts
similarity index 95%
rename from src/app/core/components/layout/navbar/navbar.component.ts
rename to src/app/main/navbar/navbar.component.ts
index c6198b7b..3932b1b9 100644
--- a/src/app/core/components/layout/navbar/navbar.component.ts
+++ b/src/app/main/navbar/navbar.component.ts
@@ -1,7 +1,7 @@
 import { Component, HostBinding, HostListener, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
-import { AppComponent } from '../../../../app.component';
+import { AppComponent } from '../../app.component';
 import { Subscription } from 'rxjs/Subscription';
-import { FuseMatchMedia } from '../../../services/match-media.service';
+import { FuseMatchMedia } from '../../core/services/match-media.service';
 import { FuseNavbarService } from './navbar.service';
 
 @Component({
diff --git a/src/app/core/components/layout/navbar/navbar.service.ts b/src/app/main/navbar/navbar.service.ts
similarity index 100%
rename from src/app/core/components/layout/navbar/navbar.service.ts
rename to src/app/main/navbar/navbar.service.ts
diff --git a/src/app/main/pages/search/tabs/table/table.component.scss b/src/app/main/pages/search/tabs/table/table.component.scss
deleted file mode 100644
index 9abf0e94..00000000
--- a/src/app/main/pages/search/tabs/table/table.component.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "src/app/core/scss/fuse";
-
-:host {
-
-
-}
\ No newline at end of file
diff --git a/src/app/core/components/layout/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html
similarity index 100%
rename from src/app/core/components/layout/toolbar/toolbar.component.html
rename to src/app/main/toolbar/toolbar.component.html
diff --git a/src/app/core/components/layout/toolbar/toolbar.component.scss b/src/app/main/toolbar/toolbar.component.scss
similarity index 100%
rename from src/app/core/components/layout/toolbar/toolbar.component.scss
rename to src/app/main/toolbar/toolbar.component.scss
diff --git a/src/app/core/components/layout/toolbar/toolbar.component.ts b/src/app/main/toolbar/toolbar.component.ts
similarity index 100%
rename from src/app/core/components/layout/toolbar/toolbar.component.ts
rename to src/app/main/toolbar/toolbar.component.ts