diff --git a/src/@fuse/components/index.ts b/src/@fuse/components/index.ts
index 0a8fb885..1cbd9d98 100644
--- a/src/@fuse/components/index.ts
+++ b/src/@fuse/components/index.ts
@@ -2,6 +2,7 @@ export * from './confirm-dialog/confirm-dialog.module';
 export * from './countdown/countdown.module';
 export * from './demo/demo.module';
 export * from './highlight/highlight.module';
+export * from './layouts/layouts.module';
 export * from './material-color-picker/material-color-picker.module';
 export * from './navigation/navigation.module';
 export * from './search-bar/search-bar.module';
diff --git a/src/@fuse/components/layouts/layouts.module.ts b/src/@fuse/components/layouts/layouts.module.ts
new file mode 100644
index 00000000..c63b7335
--- /dev/null
+++ b/src/@fuse/components/layouts/layouts.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { FuseVerticalNavBasicLayoutComponent } from '@fuse/components/layouts/vertical-nav/basic/basic.component';
+
+@NgModule({
+    declarations: [
+        FuseVerticalNavBasicLayoutComponent
+    ],
+    imports     : [
+        CommonModule
+    ],
+    exports     : [
+        FuseVerticalNavBasicLayoutComponent
+    ]
+})
+export class FuseLayoutsModule
+{
+}
diff --git a/src/app/main/main.component.html b/src/@fuse/components/layouts/vertical-nav/basic/basic.component.html
similarity index 100%
rename from src/app/main/main.component.html
rename to src/@fuse/components/layouts/vertical-nav/basic/basic.component.html
diff --git a/src/app/main/main.component.scss b/src/@fuse/components/layouts/vertical-nav/basic/basic.component.scss
similarity index 98%
rename from src/app/main/main.component.scss
rename to src/@fuse/components/layouts/vertical-nav/basic/basic.component.scss
index c677d9e3..793e79b4 100644
--- a/src/app/main/main.component.scss
+++ b/src/@fuse/components/layouts/vertical-nav/basic/basic.component.scss
@@ -1,6 +1,6 @@
 @import "src/@fuse/scss/fuse";
 
-fuse-main {
+fuse-vertical-nav-basic-layout {
     display: flex;
     flex-direction: column;
     width: 100%;
diff --git a/src/@fuse/components/layouts/vertical-nav/basic/basic.component.ts b/src/@fuse/components/layouts/vertical-nav/basic/basic.component.ts
new file mode 100644
index 00000000..17a17f17
--- /dev/null
+++ b/src/@fuse/components/layouts/vertical-nav/basic/basic.component.ts
@@ -0,0 +1,14 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+
+@Component({
+    selector     : 'fuse-vertical-nav-basic-layout',
+    templateUrl  : './basic.component.html',
+    styleUrls    : ['./basic.component.scss'],
+    encapsulation: ViewEncapsulation.None
+})
+export class FuseVerticalNavBasicLayoutComponent
+{
+    constructor()
+    {
+    }
+}
diff --git a/src/@fuse/components/theme-options/theme-options.component.html b/src/@fuse/components/theme-options/theme-options.component.html
index 71b95e66..57d63d2d 100644
--- a/src/@fuse/components/theme-options/theme-options.component.html
+++ b/src/@fuse/components/theme-options/theme-options.component.html
@@ -12,6 +12,14 @@
 
     <div class="theme-options-panel-inner" fxLayout="column" fxLayoutAlign="start start">
 
+        <h3>Layout:</h3>
+        <mat-radio-group [(ngModel)]="config.layout.style" (ngModelChange)="onSettingsChange()"
+                         fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
+            <mat-radio-button class="mr-8 mb-8" value="vertical">Vertical</mat-radio-button>
+            <mat-radio-button class="mr-8 mb-8" value="horizontal">Horizontal</mat-radio-button>
+            <mat-radio-button class="mr-8 mb-8" value="none">None</mat-radio-button>
+        </mat-radio-group>
+
         <h3>Navigation:</h3>
         <mat-radio-group [(ngModel)]="config.layout.navigation" (ngModelChange)="onSettingsChange()"
                          fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
diff --git a/src/app/app.component.html b/src/app/app.component.html
index fe7f33a6..720092b3 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1 +1,8 @@
-<fuse-main></fuse-main>
+<!--<fuse-main></fuse-main>-->
+
+<fuse-vertical-nav-basic-layout>
+    <fuse-navbar></fuse-navbar>
+    <fuse-toolbar></fuse-toolbar>
+    <fuse-content></fuse-content>
+    <fuse-footer></fuse-footer>
+</fuse-vertical-nav-basic-layout>
\ No newline at end of file
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 44ea53db..a9b4fa1b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,39 +8,39 @@ import { TranslateModule } from '@ngx-translate/core';
 import 'hammerjs';
 
 import { FuseModule } from '@fuse/fuse.module';
+import { FuseLayoutsModule } from '@fuse/components';
 import { FuseSharedModule } from '@fuse/shared.module';
 
 import { fuseConfig } from './fuse-config';
 
 import { AppComponent } from './app.component';
 import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
-import { FuseMainModule } from './main/main.module';
 import { AppStoreModule } from './store/store.module';
 
 const appRoutes: Routes = [
     {
         path        : 'apps',
-        loadChildren: './main/content/apps/apps.module#FuseAppsModule'
+        loadChildren: './main/apps/apps.module#FuseAppsModule'
     },
     {
         path        : 'pages',
-        loadChildren: './main/content/pages/pages.module#FusePagesModule'
+        loadChildren: './main/pages/pages.module#FusePagesModule'
     },
     {
         path        : 'ui',
-        loadChildren: './main/content/ui/ui.module#FuseUIModule'
+        loadChildren: './main/ui/ui.module#FuseUIModule'
     },
     {
         path        : 'services',
-        loadChildren: './main/content/services/services.module#FuseServicesModule'
+        loadChildren: './main/services/services.module#FuseServicesModule'
     },
     {
         path        : 'components',
-        loadChildren: './main/content/components/components.module#FuseComponentsModule'
+        loadChildren: './main/components/components.module#FuseComponentsModule'
     },
     {
         path        : 'components-third-party',
-        loadChildren: './main/content/components-third-party/components-third-party.module#FuseComponentsThirdPartyModule'
+        loadChildren: './main/components-third-party/components-third-party.module#FuseComponentsThirdPartyModule'
     },
     {
         path      : '**',
@@ -66,10 +66,10 @@ const appRoutes: Routes = [
 
         // Fuse Main and Shared modules
         FuseModule.forRoot(fuseConfig),
+        FuseLayoutsModule,
         FuseSharedModule,
 
-        AppStoreModule,
-        FuseMainModule
+        AppStoreModule
     ],
     bootstrap   : [
         AppComponent
diff --git a/src/app/fuse-config.ts b/src/app/fuse-config.ts
index 0cdd3de8..15c37aa7 100644
--- a/src/app/fuse-config.ts
+++ b/src/app/fuse-config.ts
@@ -7,8 +7,13 @@
  */
 export const fuseConfig = {
     layout          : {
-        navigation      : 'left', // 'right', 'left', 'top', 'none'
-        navigationFolded: false, // true, false
+        style     : 'vertical',
+        navigation: {
+            position: 'left',
+            folded  : false
+        },
+        // navigation      : 'left', // 'right', 'left', 'top', 'none'
+        // navigationFolded: false, // true, false
         toolbar         : 'below', // 'above', 'below', 'none'
         footer          : 'below', // 'above', 'below', 'none'
         mode            : 'fullwidth' // 'boxed', 'fullwidth'
diff --git a/src/app/layout/content/content.component.html b/src/app/layout/content/content.component.html
new file mode 100644
index 00000000..3a361ae6
--- /dev/null
+++ b/src/app/layout/content/content.component.html
@@ -0,0 +1,6 @@
+<!--
+    *ngIf="true" hack is required here for router-outlet to work
+    correctly. Otherwise, it won't register the changes on the
+    layout and won't update the view.
+ -->
+<router-outlet *ngIf="true"></router-outlet>
\ No newline at end of file
diff --git a/src/app/main/content/content.component.scss b/src/app/layout/content/content.component.scss
similarity index 100%
rename from src/app/main/content/content.component.scss
rename to src/app/layout/content/content.component.scss
diff --git a/src/app/main/content/content.component.ts b/src/app/layout/content/content.component.ts
similarity index 100%
rename from src/app/main/content/content.component.ts
rename to src/app/layout/content/content.component.ts
diff --git a/src/app/main/content/content.module.ts b/src/app/layout/content/content.module.ts
similarity index 83%
rename from src/app/main/content/content.module.ts
rename to src/app/layout/content/content.module.ts
index bbccf91f..2be7d794 100644
--- a/src/app/main/content/content.module.ts
+++ b/src/app/layout/content/content.module.ts
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
-import { FuseContentComponent } from 'app/main/content/content.component';
+import { FuseContentComponent } from 'app/layout/content/content.component';
 
 @NgModule({
     declarations: [
diff --git a/src/app/main/footer/footer.component.html b/src/app/layout/footer/footer.component.html
similarity index 100%
rename from src/app/main/footer/footer.component.html
rename to src/app/layout/footer/footer.component.html
diff --git a/src/app/main/footer/footer.component.scss b/src/app/layout/footer/footer.component.scss
similarity index 100%
rename from src/app/main/footer/footer.component.scss
rename to src/app/layout/footer/footer.component.scss
diff --git a/src/app/main/footer/footer.component.ts b/src/app/layout/footer/footer.component.ts
similarity index 100%
rename from src/app/main/footer/footer.component.ts
rename to src/app/layout/footer/footer.component.ts
diff --git a/src/app/main/footer/footer.module.ts b/src/app/layout/footer/footer.module.ts
similarity index 88%
rename from src/app/main/footer/footer.module.ts
rename to src/app/layout/footer/footer.module.ts
index a7c26d66..10b7c9e1 100644
--- a/src/app/main/footer/footer.module.ts
+++ b/src/app/layout/footer/footer.module.ts
@@ -4,7 +4,7 @@ import { MatButtonModule, MatIconModule, MatToolbarModule } from '@angular/mater
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
-import { FuseFooterComponent } from 'app/main/footer/footer.component';
+import { FuseFooterComponent } from 'app/layout/footer/footer.component';
 
 @NgModule({
     declarations: [
diff --git a/src/app/main/navbar/navbar.component.html b/src/app/layout/navbar/navbar.component.html
similarity index 100%
rename from src/app/main/navbar/navbar.component.html
rename to src/app/layout/navbar/navbar.component.html
diff --git a/src/app/main/navbar/navbar.component.scss b/src/app/layout/navbar/navbar.component.scss
similarity index 98%
rename from src/app/main/navbar/navbar.component.scss
rename to src/app/layout/navbar/navbar.component.scss
index bc12ef87..0a09af21 100644
--- a/src/app/main/navbar/navbar.component.scss
+++ b/src/app/layout/navbar/navbar.component.scss
@@ -1,4 +1,4 @@
-@import "src/@fuse/scss/fuse";
+@import "../../../@fuse/scss/fuse";
 
 body {
 
diff --git a/src/app/main/navbar/navbar.component.ts b/src/app/layout/navbar/navbar.component.ts
similarity index 100%
rename from src/app/main/navbar/navbar.component.ts
rename to src/app/layout/navbar/navbar.component.ts
diff --git a/src/app/main/navbar/navbar.module.ts b/src/app/layout/navbar/navbar.module.ts
similarity index 88%
rename from src/app/main/navbar/navbar.module.ts
rename to src/app/layout/navbar/navbar.module.ts
index c3da75e6..589de6d9 100644
--- a/src/app/main/navbar/navbar.module.ts
+++ b/src/app/layout/navbar/navbar.module.ts
@@ -5,7 +5,7 @@ import { MatButtonModule, MatIconModule } from '@angular/material';
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
-import { FuseNavbarComponent } from 'app/main/navbar/navbar.component';
+import { FuseNavbarComponent } from 'app/layout/navbar/navbar.component';
 import { FuseNavigationModule } from '@fuse/components';
 
 @NgModule({
diff --git a/src/app/main/quick-panel/quick-panel.component.html b/src/app/layout/quick-panel/quick-panel.component.html
similarity index 100%
rename from src/app/main/quick-panel/quick-panel.component.html
rename to src/app/layout/quick-panel/quick-panel.component.html
diff --git a/src/app/main/quick-panel/quick-panel.component.scss b/src/app/layout/quick-panel/quick-panel.component.scss
similarity index 100%
rename from src/app/main/quick-panel/quick-panel.component.scss
rename to src/app/layout/quick-panel/quick-panel.component.scss
diff --git a/src/app/main/quick-panel/quick-panel.component.ts b/src/app/layout/quick-panel/quick-panel.component.ts
similarity index 100%
rename from src/app/main/quick-panel/quick-panel.component.ts
rename to src/app/layout/quick-panel/quick-panel.component.ts
diff --git a/src/app/main/quick-panel/quick-panel.module.ts b/src/app/layout/quick-panel/quick-panel.module.ts
similarity index 86%
rename from src/app/main/quick-panel/quick-panel.module.ts
rename to src/app/layout/quick-panel/quick-panel.module.ts
index 716461e3..0a863545 100644
--- a/src/app/main/quick-panel/quick-panel.module.ts
+++ b/src/app/layout/quick-panel/quick-panel.module.ts
@@ -4,7 +4,7 @@ import { MatDividerModule, MatListModule, MatSlideToggleModule } from '@angular/
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
-import { FuseQuickPanelComponent } from 'app/main/quick-panel/quick-panel.component';
+import { FuseQuickPanelComponent } from 'app/layout/quick-panel/quick-panel.component';
 
 @NgModule({
     declarations: [
diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/layout/toolbar/toolbar.component.html
similarity index 100%
rename from src/app/main/toolbar/toolbar.component.html
rename to src/app/layout/toolbar/toolbar.component.html
diff --git a/src/app/main/toolbar/toolbar.component.scss b/src/app/layout/toolbar/toolbar.component.scss
similarity index 96%
rename from src/app/main/toolbar/toolbar.component.scss
rename to src/app/layout/toolbar/toolbar.component.scss
index f1bd3177..25abc217 100644
--- a/src/app/main/toolbar/toolbar.component.scss
+++ b/src/app/layout/toolbar/toolbar.component.scss
@@ -1,4 +1,4 @@
-@import 'src/@fuse/scss/fuse';
+@import '../../../@fuse/scss/fuse';
 
 :host {
     position: relative;
diff --git a/src/app/main/toolbar/toolbar.component.ts b/src/app/layout/toolbar/toolbar.component.ts
similarity index 100%
rename from src/app/main/toolbar/toolbar.component.ts
rename to src/app/layout/toolbar/toolbar.component.ts
diff --git a/src/app/main/toolbar/toolbar.module.ts b/src/app/layout/toolbar/toolbar.module.ts
similarity index 90%
rename from src/app/main/toolbar/toolbar.module.ts
rename to src/app/layout/toolbar/toolbar.module.ts
index 4d61d960..57272437 100644
--- a/src/app/main/toolbar/toolbar.module.ts
+++ b/src/app/layout/toolbar/toolbar.module.ts
@@ -4,7 +4,7 @@ import { MatButtonModule, MatIconModule, MatMenuModule, MatProgressBarModule, Ma
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
-import { FuseToolbarComponent } from 'app/main/toolbar/toolbar.component';
+import { FuseToolbarComponent } from 'app/layout/toolbar/toolbar.component';
 import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components';
 
 @NgModule({
diff --git a/src/app/main/content/apps/academy/academy.module.ts b/src/app/main/apps/academy/academy.module.ts
similarity index 100%
rename from src/app/main/content/apps/academy/academy.module.ts
rename to src/app/main/apps/academy/academy.module.ts
diff --git a/src/app/main/content/apps/academy/course.service.ts b/src/app/main/apps/academy/course.service.ts
similarity index 100%
rename from src/app/main/content/apps/academy/course.service.ts
rename to src/app/main/apps/academy/course.service.ts
diff --git a/src/app/main/content/apps/academy/course/course.component.html b/src/app/main/apps/academy/course/course.component.html
similarity index 100%
rename from src/app/main/content/apps/academy/course/course.component.html
rename to src/app/main/apps/academy/course/course.component.html
diff --git a/src/app/main/content/apps/academy/course/course.component.scss b/src/app/main/apps/academy/course/course.component.scss
similarity index 100%
rename from src/app/main/content/apps/academy/course/course.component.scss
rename to src/app/main/apps/academy/course/course.component.scss
diff --git a/src/app/main/content/apps/academy/course/course.component.ts b/src/app/main/apps/academy/course/course.component.ts
similarity index 100%
rename from src/app/main/content/apps/academy/course/course.component.ts
rename to src/app/main/apps/academy/course/course.component.ts
diff --git a/src/app/main/content/apps/academy/courses.service.ts b/src/app/main/apps/academy/courses.service.ts
similarity index 100%
rename from src/app/main/content/apps/academy/courses.service.ts
rename to src/app/main/apps/academy/courses.service.ts
diff --git a/src/app/main/content/apps/academy/courses/courses.component.html b/src/app/main/apps/academy/courses/courses.component.html
similarity index 100%
rename from src/app/main/content/apps/academy/courses/courses.component.html
rename to src/app/main/apps/academy/courses/courses.component.html
diff --git a/src/app/main/content/apps/academy/courses/courses.component.scss b/src/app/main/apps/academy/courses/courses.component.scss
similarity index 100%
rename from src/app/main/content/apps/academy/courses/courses.component.scss
rename to src/app/main/apps/academy/courses/courses.component.scss
diff --git a/src/app/main/content/apps/academy/courses/courses.component.ts b/src/app/main/apps/academy/courses/courses.component.ts
similarity index 100%
rename from src/app/main/content/apps/academy/courses/courses.component.ts
rename to src/app/main/apps/academy/courses/courses.component.ts
diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/apps/apps.module.ts
similarity index 100%
rename from src/app/main/content/apps/apps.module.ts
rename to src/app/main/apps/apps.module.ts
diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/apps/calendar/calendar.component.html
similarity index 100%
rename from src/app/main/content/apps/calendar/calendar.component.html
rename to src/app/main/apps/calendar/calendar.component.html
diff --git a/src/app/main/content/apps/calendar/calendar.component.scss b/src/app/main/apps/calendar/calendar.component.scss
similarity index 100%
rename from src/app/main/content/apps/calendar/calendar.component.scss
rename to src/app/main/apps/calendar/calendar.component.scss
diff --git a/src/app/main/content/apps/calendar/calendar.component.ts b/src/app/main/apps/calendar/calendar.component.ts
similarity index 100%
rename from src/app/main/content/apps/calendar/calendar.component.ts
rename to src/app/main/apps/calendar/calendar.component.ts
diff --git a/src/app/main/content/apps/calendar/calendar.module.ts b/src/app/main/apps/calendar/calendar.module.ts
similarity index 100%
rename from src/app/main/content/apps/calendar/calendar.module.ts
rename to src/app/main/apps/calendar/calendar.module.ts
diff --git a/src/app/main/content/apps/calendar/calendar.service.ts b/src/app/main/apps/calendar/calendar.service.ts
similarity index 100%
rename from src/app/main/content/apps/calendar/calendar.service.ts
rename to src/app/main/apps/calendar/calendar.service.ts
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.html b/src/app/main/apps/calendar/event-form/event-form.component.html
similarity index 100%
rename from src/app/main/content/apps/calendar/event-form/event-form.component.html
rename to src/app/main/apps/calendar/event-form/event-form.component.html
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.scss b/src/app/main/apps/calendar/event-form/event-form.component.scss
similarity index 100%
rename from src/app/main/content/apps/calendar/event-form/event-form.component.scss
rename to src/app/main/apps/calendar/event-form/event-form.component.scss
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.ts b/src/app/main/apps/calendar/event-form/event-form.component.ts
similarity index 100%
rename from src/app/main/content/apps/calendar/event-form/event-form.component.ts
rename to src/app/main/apps/calendar/event-form/event-form.component.ts
diff --git a/src/app/main/content/apps/calendar/event.model.ts b/src/app/main/apps/calendar/event.model.ts
similarity index 100%
rename from src/app/main/content/apps/calendar/event.model.ts
rename to src/app/main/apps/calendar/event.model.ts
diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.html b/src/app/main/apps/chat/chat-start/chat-start.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/chat-start/chat-start.component.html
rename to src/app/main/apps/chat/chat-start/chat-start.component.html
diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.scss b/src/app/main/apps/chat/chat-start/chat-start.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/chat-start/chat-start.component.scss
rename to src/app/main/apps/chat/chat-start/chat-start.component.scss
diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.ts b/src/app/main/apps/chat/chat-start/chat-start.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/chat-start/chat-start.component.ts
rename to src/app/main/apps/chat/chat-start/chat-start.component.ts
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.html b/src/app/main/apps/chat/chat-view/chat-view.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/chat-view/chat-view.component.html
rename to src/app/main/apps/chat/chat-view/chat-view.component.html
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.scss b/src/app/main/apps/chat/chat-view/chat-view.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/chat-view/chat-view.component.scss
rename to src/app/main/apps/chat/chat-view/chat-view.component.scss
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts b/src/app/main/apps/chat/chat-view/chat-view.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/chat-view/chat-view.component.ts
rename to src/app/main/apps/chat/chat-view/chat-view.component.ts
diff --git a/src/app/main/content/apps/chat/chat.component.html b/src/app/main/apps/chat/chat.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/chat.component.html
rename to src/app/main/apps/chat/chat.component.html
diff --git a/src/app/main/content/apps/chat/chat.component.scss b/src/app/main/apps/chat/chat.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/chat.component.scss
rename to src/app/main/apps/chat/chat.component.scss
diff --git a/src/app/main/content/apps/chat/chat.component.ts b/src/app/main/apps/chat/chat.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/chat.component.ts
rename to src/app/main/apps/chat/chat.component.ts
diff --git a/src/app/main/content/apps/chat/chat.module.ts b/src/app/main/apps/chat/chat.module.ts
similarity index 100%
rename from src/app/main/content/apps/chat/chat.module.ts
rename to src/app/main/apps/chat/chat.module.ts
diff --git a/src/app/main/content/apps/chat/chat.service.ts b/src/app/main/apps/chat/chat.service.ts
similarity index 100%
rename from src/app/main/content/apps/chat/chat.service.ts
rename to src/app/main/apps/chat/chat.service.ts
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
rename to src/app/main/apps/chat/sidenavs/left/chats/chats.component.html
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.scss
rename to src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts
rename to src/app/main/apps/chat/sidenavs/left/chats/chats.component.ts
diff --git a/src/app/main/content/apps/chat/sidenavs/left/left.component.html b/src/app/main/apps/chat/sidenavs/left/left.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/left.component.html
rename to src/app/main/apps/chat/sidenavs/left/left.component.html
diff --git a/src/app/main/content/apps/chat/sidenavs/left/left.component.scss b/src/app/main/apps/chat/sidenavs/left/left.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/left.component.scss
rename to src/app/main/apps/chat/sidenavs/left/left.component.scss
diff --git a/src/app/main/content/apps/chat/sidenavs/left/left.component.ts b/src/app/main/apps/chat/sidenavs/left/left.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/left.component.ts
rename to src/app/main/apps/chat/sidenavs/left/left.component.ts
diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html b/src/app/main/apps/chat/sidenavs/left/user/user.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
rename to src/app/main/apps/chat/sidenavs/left/user/user.component.html
diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss b/src/app/main/apps/chat/sidenavs/left/user/user.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss
rename to src/app/main/apps/chat/sidenavs/left/user/user.component.scss
diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts b/src/app/main/apps/chat/sidenavs/left/user/user.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts
rename to src/app/main/apps/chat/sidenavs/left/user/user.component.ts
diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html b/src/app/main/apps/chat/sidenavs/right/contact/contact.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
rename to src/app/main/apps/chat/sidenavs/right/contact/contact.component.html
diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss b/src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss
rename to src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss
diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts b/src/app/main/apps/chat/sidenavs/right/contact/contact.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.ts
rename to src/app/main/apps/chat/sidenavs/right/contact/contact.component.ts
diff --git a/src/app/main/content/apps/chat/sidenavs/right/right.component.html b/src/app/main/apps/chat/sidenavs/right/right.component.html
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/right/right.component.html
rename to src/app/main/apps/chat/sidenavs/right/right.component.html
diff --git a/src/app/main/content/apps/chat/sidenavs/right/right.component.scss b/src/app/main/apps/chat/sidenavs/right/right.component.scss
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/right/right.component.scss
rename to src/app/main/apps/chat/sidenavs/right/right.component.scss
diff --git a/src/app/main/content/apps/chat/sidenavs/right/right.component.ts b/src/app/main/apps/chat/sidenavs/right/right.component.ts
similarity index 100%
rename from src/app/main/content/apps/chat/sidenavs/right/right.component.ts
rename to src/app/main/apps/chat/sidenavs/right/right.component.ts
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html b/src/app/main/apps/contacts/contact-form/contact-form.component.html
similarity index 100%
rename from src/app/main/content/apps/contacts/contact-form/contact-form.component.html
rename to src/app/main/apps/contacts/contact-form/contact-form.component.html
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.scss b/src/app/main/apps/contacts/contact-form/contact-form.component.scss
similarity index 100%
rename from src/app/main/content/apps/contacts/contact-form/contact-form.component.scss
rename to src/app/main/apps/contacts/contact-form/contact-form.component.scss
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.ts b/src/app/main/apps/contacts/contact-form/contact-form.component.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/contact-form/contact-form.component.ts
rename to src/app/main/apps/contacts/contact-form/contact-form.component.ts
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.html b/src/app/main/apps/contacts/contact-list/contact-list.component.html
similarity index 100%
rename from src/app/main/content/apps/contacts/contact-list/contact-list.component.html
rename to src/app/main/apps/contacts/contact-list/contact-list.component.html
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.scss b/src/app/main/apps/contacts/contact-list/contact-list.component.scss
similarity index 100%
rename from src/app/main/content/apps/contacts/contact-list/contact-list.component.scss
rename to src/app/main/apps/contacts/contact-list/contact-list.component.scss
diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts b/src/app/main/apps/contacts/contact-list/contact-list.component.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/contact-list/contact-list.component.ts
rename to src/app/main/apps/contacts/contact-list/contact-list.component.ts
diff --git a/src/app/main/content/apps/contacts/contact.model.ts b/src/app/main/apps/contacts/contact.model.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/contact.model.ts
rename to src/app/main/apps/contacts/contact.model.ts
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/apps/contacts/contacts.component.html
similarity index 100%
rename from src/app/main/content/apps/contacts/contacts.component.html
rename to src/app/main/apps/contacts/contacts.component.html
diff --git a/src/app/main/content/apps/contacts/contacts.component.scss b/src/app/main/apps/contacts/contacts.component.scss
similarity index 100%
rename from src/app/main/content/apps/contacts/contacts.component.scss
rename to src/app/main/apps/contacts/contacts.component.scss
diff --git a/src/app/main/content/apps/contacts/contacts.component.ts b/src/app/main/apps/contacts/contacts.component.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/contacts.component.ts
rename to src/app/main/apps/contacts/contacts.component.ts
diff --git a/src/app/main/content/apps/contacts/contacts.module.ts b/src/app/main/apps/contacts/contacts.module.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/contacts.module.ts
rename to src/app/main/apps/contacts/contacts.module.ts
diff --git a/src/app/main/content/apps/contacts/contacts.service.ts b/src/app/main/apps/contacts/contacts.service.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/contacts.service.ts
rename to src/app/main/apps/contacts/contacts.service.ts
diff --git a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html b/src/app/main/apps/contacts/selected-bar/selected-bar.component.html
similarity index 100%
rename from src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html
rename to src/app/main/apps/contacts/selected-bar/selected-bar.component.html
diff --git a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.scss b/src/app/main/apps/contacts/selected-bar/selected-bar.component.scss
similarity index 100%
rename from src/app/main/content/apps/contacts/selected-bar/selected-bar.component.scss
rename to src/app/main/apps/contacts/selected-bar/selected-bar.component.scss
diff --git a/src/app/main/content/apps/contacts/selected-bar/selected-bar.component.ts b/src/app/main/apps/contacts/selected-bar/selected-bar.component.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/selected-bar/selected-bar.component.ts
rename to src/app/main/apps/contacts/selected-bar/selected-bar.component.ts
diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.html b/src/app/main/apps/contacts/sidenavs/main/main.component.html
similarity index 100%
rename from src/app/main/content/apps/contacts/sidenavs/main/main.component.html
rename to src/app/main/apps/contacts/sidenavs/main/main.component.html
diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.scss b/src/app/main/apps/contacts/sidenavs/main/main.component.scss
similarity index 100%
rename from src/app/main/content/apps/contacts/sidenavs/main/main.component.scss
rename to src/app/main/apps/contacts/sidenavs/main/main.component.scss
diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts b/src/app/main/apps/contacts/sidenavs/main/main.component.ts
similarity index 100%
rename from src/app/main/content/apps/contacts/sidenavs/main/main.component.ts
rename to src/app/main/apps/contacts/sidenavs/main/main.component.ts
diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.component.html b/src/app/main/apps/dashboards/analytics/analytics.component.html
similarity index 100%
rename from src/app/main/content/apps/dashboards/analytics/analytics.component.html
rename to src/app/main/apps/dashboards/analytics/analytics.component.html
diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.component.scss b/src/app/main/apps/dashboards/analytics/analytics.component.scss
similarity index 100%
rename from src/app/main/content/apps/dashboards/analytics/analytics.component.scss
rename to src/app/main/apps/dashboards/analytics/analytics.component.scss
diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.component.ts b/src/app/main/apps/dashboards/analytics/analytics.component.ts
similarity index 100%
rename from src/app/main/content/apps/dashboards/analytics/analytics.component.ts
rename to src/app/main/apps/dashboards/analytics/analytics.component.ts
diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts b/src/app/main/apps/dashboards/analytics/analytics.module.ts
similarity index 100%
rename from src/app/main/content/apps/dashboards/analytics/analytics.module.ts
rename to src/app/main/apps/dashboards/analytics/analytics.module.ts
diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.service.ts b/src/app/main/apps/dashboards/analytics/analytics.service.ts
similarity index 100%
rename from src/app/main/content/apps/dashboards/analytics/analytics.service.ts
rename to src/app/main/apps/dashboards/analytics/analytics.service.ts
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/apps/dashboards/project/project.component.html
similarity index 100%
rename from src/app/main/content/apps/dashboards/project/project.component.html
rename to src/app/main/apps/dashboards/project/project.component.html
diff --git a/src/app/main/content/apps/dashboards/project/project.component.scss b/src/app/main/apps/dashboards/project/project.component.scss
similarity index 100%
rename from src/app/main/content/apps/dashboards/project/project.component.scss
rename to src/app/main/apps/dashboards/project/project.component.scss
diff --git a/src/app/main/content/apps/dashboards/project/project.component.ts b/src/app/main/apps/dashboards/project/project.component.ts
similarity index 100%
rename from src/app/main/content/apps/dashboards/project/project.component.ts
rename to src/app/main/apps/dashboards/project/project.component.ts
diff --git a/src/app/main/content/apps/dashboards/project/project.module.ts b/src/app/main/apps/dashboards/project/project.module.ts
similarity index 100%
rename from src/app/main/content/apps/dashboards/project/project.module.ts
rename to src/app/main/apps/dashboards/project/project.module.ts
diff --git a/src/app/main/content/apps/dashboards/project/project.service.ts b/src/app/main/apps/dashboards/project/project.service.ts
similarity index 100%
rename from src/app/main/content/apps/dashboards/project/project.service.ts
rename to src/app/main/apps/dashboards/project/project.service.ts
diff --git a/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.html b/src/app/main/apps/e-commerce/dashboard/dashboard.component.html
similarity index 100%
rename from src/app/main/content/apps/e-commerce/dashboard/dashboard.component.html
rename to src/app/main/apps/e-commerce/dashboard/dashboard.component.html
diff --git a/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.scss b/src/app/main/apps/e-commerce/dashboard/dashboard.component.scss
similarity index 100%
rename from src/app/main/content/apps/e-commerce/dashboard/dashboard.component.scss
rename to src/app/main/apps/e-commerce/dashboard/dashboard.component.scss
diff --git a/src/app/main/content/apps/e-commerce/dashboard/dashboard.component.ts b/src/app/main/apps/e-commerce/dashboard/dashboard.component.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/dashboard/dashboard.component.ts
rename to src/app/main/apps/e-commerce/dashboard/dashboard.component.ts
diff --git a/src/app/main/content/apps/e-commerce/dashboard/dashboard.service.ts b/src/app/main/apps/e-commerce/dashboard/dashboard.service.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/dashboard/dashboard.service.ts
rename to src/app/main/apps/e-commerce/dashboard/dashboard.service.ts
diff --git a/src/app/main/content/apps/e-commerce/e-commerce.module.ts b/src/app/main/apps/e-commerce/e-commerce.module.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/e-commerce.module.ts
rename to src/app/main/apps/e-commerce/e-commerce.module.ts
diff --git a/src/app/main/content/apps/e-commerce/order/order-statuses.ts b/src/app/main/apps/e-commerce/order/order-statuses.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/order/order-statuses.ts
rename to src/app/main/apps/e-commerce/order/order-statuses.ts
diff --git a/src/app/main/content/apps/e-commerce/order/order.component.html b/src/app/main/apps/e-commerce/order/order.component.html
similarity index 100%
rename from src/app/main/content/apps/e-commerce/order/order.component.html
rename to src/app/main/apps/e-commerce/order/order.component.html
diff --git a/src/app/main/content/apps/e-commerce/order/order.component.scss b/src/app/main/apps/e-commerce/order/order.component.scss
similarity index 100%
rename from src/app/main/content/apps/e-commerce/order/order.component.scss
rename to src/app/main/apps/e-commerce/order/order.component.scss
diff --git a/src/app/main/content/apps/e-commerce/order/order.component.ts b/src/app/main/apps/e-commerce/order/order.component.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/order/order.component.ts
rename to src/app/main/apps/e-commerce/order/order.component.ts
diff --git a/src/app/main/content/apps/e-commerce/order/order.model.ts b/src/app/main/apps/e-commerce/order/order.model.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/order/order.model.ts
rename to src/app/main/apps/e-commerce/order/order.model.ts
diff --git a/src/app/main/content/apps/e-commerce/order/order.service.ts b/src/app/main/apps/e-commerce/order/order.service.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/order/order.service.ts
rename to src/app/main/apps/e-commerce/order/order.service.ts
diff --git a/src/app/main/content/apps/e-commerce/orders/orders.component.html b/src/app/main/apps/e-commerce/orders/orders.component.html
similarity index 100%
rename from src/app/main/content/apps/e-commerce/orders/orders.component.html
rename to src/app/main/apps/e-commerce/orders/orders.component.html
diff --git a/src/app/main/content/apps/e-commerce/orders/orders.component.scss b/src/app/main/apps/e-commerce/orders/orders.component.scss
similarity index 100%
rename from src/app/main/content/apps/e-commerce/orders/orders.component.scss
rename to src/app/main/apps/e-commerce/orders/orders.component.scss
diff --git a/src/app/main/content/apps/e-commerce/orders/orders.component.ts b/src/app/main/apps/e-commerce/orders/orders.component.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/orders/orders.component.ts
rename to src/app/main/apps/e-commerce/orders/orders.component.ts
diff --git a/src/app/main/content/apps/e-commerce/orders/orders.service.ts b/src/app/main/apps/e-commerce/orders/orders.service.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/orders/orders.service.ts
rename to src/app/main/apps/e-commerce/orders/orders.service.ts
diff --git a/src/app/main/content/apps/e-commerce/product/product.component.html b/src/app/main/apps/e-commerce/product/product.component.html
similarity index 100%
rename from src/app/main/content/apps/e-commerce/product/product.component.html
rename to src/app/main/apps/e-commerce/product/product.component.html
diff --git a/src/app/main/content/apps/e-commerce/product/product.component.scss b/src/app/main/apps/e-commerce/product/product.component.scss
similarity index 100%
rename from src/app/main/content/apps/e-commerce/product/product.component.scss
rename to src/app/main/apps/e-commerce/product/product.component.scss
diff --git a/src/app/main/content/apps/e-commerce/product/product.component.ts b/src/app/main/apps/e-commerce/product/product.component.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/product/product.component.ts
rename to src/app/main/apps/e-commerce/product/product.component.ts
diff --git a/src/app/main/content/apps/e-commerce/product/product.model.ts b/src/app/main/apps/e-commerce/product/product.model.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/product/product.model.ts
rename to src/app/main/apps/e-commerce/product/product.model.ts
diff --git a/src/app/main/content/apps/e-commerce/product/product.service.ts b/src/app/main/apps/e-commerce/product/product.service.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/product/product.service.ts
rename to src/app/main/apps/e-commerce/product/product.service.ts
diff --git a/src/app/main/content/apps/e-commerce/products/products.component.html b/src/app/main/apps/e-commerce/products/products.component.html
similarity index 100%
rename from src/app/main/content/apps/e-commerce/products/products.component.html
rename to src/app/main/apps/e-commerce/products/products.component.html
diff --git a/src/app/main/content/apps/e-commerce/products/products.component.scss b/src/app/main/apps/e-commerce/products/products.component.scss
similarity index 100%
rename from src/app/main/content/apps/e-commerce/products/products.component.scss
rename to src/app/main/apps/e-commerce/products/products.component.scss
diff --git a/src/app/main/content/apps/e-commerce/products/products.component.ts b/src/app/main/apps/e-commerce/products/products.component.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/products/products.component.ts
rename to src/app/main/apps/e-commerce/products/products.component.ts
diff --git a/src/app/main/content/apps/e-commerce/products/products.service.ts b/src/app/main/apps/e-commerce/products/products.service.ts
similarity index 100%
rename from src/app/main/content/apps/e-commerce/products/products.service.ts
rename to src/app/main/apps/e-commerce/products/products.service.ts
diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.html b/src/app/main/apps/file-manager/file-list/file-list.component.html
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-list/file-list.component.html
rename to src/app/main/apps/file-manager/file-list/file-list.component.html
diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.scss b/src/app/main/apps/file-manager/file-list/file-list.component.scss
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-list/file-list.component.scss
rename to src/app/main/apps/file-manager/file-list/file-list.component.scss
diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.ts b/src/app/main/apps/file-manager/file-list/file-list.component.ts
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-list/file-list.component.ts
rename to src/app/main/apps/file-manager/file-list/file-list.component.ts
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/apps/file-manager/file-manager.component.html
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-manager.component.html
rename to src/app/main/apps/file-manager/file-manager.component.html
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.scss b/src/app/main/apps/file-manager/file-manager.component.scss
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-manager.component.scss
rename to src/app/main/apps/file-manager/file-manager.component.scss
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.ts b/src/app/main/apps/file-manager/file-manager.component.ts
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-manager.component.ts
rename to src/app/main/apps/file-manager/file-manager.component.ts
diff --git a/src/app/main/content/apps/file-manager/file-manager.module.ts b/src/app/main/apps/file-manager/file-manager.module.ts
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-manager.module.ts
rename to src/app/main/apps/file-manager/file-manager.module.ts
diff --git a/src/app/main/content/apps/file-manager/file-manager.service.ts b/src/app/main/apps/file-manager/file-manager.service.ts
similarity index 100%
rename from src/app/main/content/apps/file-manager/file-manager.service.ts
rename to src/app/main/apps/file-manager/file-manager.service.ts
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/apps/file-manager/sidenavs/details/details.component.html
similarity index 100%
rename from src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
rename to src/app/main/apps/file-manager/sidenavs/details/details.component.html
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss b/src/app/main/apps/file-manager/sidenavs/details/details.component.scss
similarity index 100%
rename from src/app/main/content/apps/file-manager/sidenavs/details/details.component.scss
rename to src/app/main/apps/file-manager/sidenavs/details/details.component.scss
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts b/src/app/main/apps/file-manager/sidenavs/details/details.component.ts
similarity index 100%
rename from src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts
rename to src/app/main/apps/file-manager/sidenavs/details/details.component.ts
diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html b/src/app/main/apps/file-manager/sidenavs/main/main.component.html
similarity index 100%
rename from src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
rename to src/app/main/apps/file-manager/sidenavs/main/main.component.html
diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.scss b/src/app/main/apps/file-manager/sidenavs/main/main.component.scss
similarity index 100%
rename from src/app/main/content/apps/file-manager/sidenavs/main/main.component.scss
rename to src/app/main/apps/file-manager/sidenavs/main/main.component.scss
diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts b/src/app/main/apps/file-manager/sidenavs/main/main.component.ts
similarity index 100%
rename from src/app/main/content/apps/file-manager/sidenavs/main/main.component.ts
rename to src/app/main/apps/file-manager/sidenavs/main/main.component.ts
diff --git a/src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.html b/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.html
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.html
rename to src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.html
diff --git a/src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.scss b/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.scss
rename to src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.scss
diff --git a/src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.ts b/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/dialogs/compose/compose.component.ts
rename to src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.ts
diff --git a/src/app/main/content/apps/mail-ngrx/i18n/en.ts b/src/app/main/apps/mail-ngrx/i18n/en.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/i18n/en.ts
rename to src/app/main/apps/mail-ngrx/i18n/en.ts
diff --git a/src/app/main/content/apps/mail-ngrx/i18n/tr.ts b/src/app/main/apps/mail-ngrx/i18n/tr.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/i18n/tr.ts
rename to src/app/main/apps/mail-ngrx/i18n/tr.ts
diff --git a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.html b/src/app/main/apps/mail-ngrx/mail-details/mail-details.component.html
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.html
rename to src/app/main/apps/mail-ngrx/mail-details/mail-details.component.html
diff --git a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.scss b/src/app/main/apps/mail-ngrx/mail-details/mail-details.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.scss
rename to src/app/main/apps/mail-ngrx/mail-details/mail-details.component.scss
diff --git a/src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.ts b/src/app/main/apps/mail-ngrx/mail-details/mail-details.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.ts
rename to src/app/main/apps/mail-ngrx/mail-details/mail-details.component.ts
diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html
rename to src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html
diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss
rename to src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss
diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts b/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts
rename to src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.ts
diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.html b/src/app/main/apps/mail-ngrx/mail-list/mail-list.component.html
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.html
rename to src/app/main/apps/mail-ngrx/mail-list/mail-list.component.html
diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.scss b/src/app/main/apps/mail-ngrx/mail-list/mail-list.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.scss
rename to src/app/main/apps/mail-ngrx/mail-list/mail-list.component.scss
diff --git a/src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.ts b/src/app/main/apps/mail-ngrx/mail-list/mail-list.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail-list/mail-list.component.ts
rename to src/app/main/apps/mail-ngrx/mail-list/mail-list.component.ts
diff --git a/src/app/main/content/apps/mail-ngrx/mail.component.html b/src/app/main/apps/mail-ngrx/mail.component.html
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail.component.html
rename to src/app/main/apps/mail-ngrx/mail.component.html
diff --git a/src/app/main/content/apps/mail-ngrx/mail.component.scss b/src/app/main/apps/mail-ngrx/mail.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail.component.scss
rename to src/app/main/apps/mail-ngrx/mail.component.scss
diff --git a/src/app/main/content/apps/mail-ngrx/mail.component.ts b/src/app/main/apps/mail-ngrx/mail.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail.component.ts
rename to src/app/main/apps/mail-ngrx/mail.component.ts
diff --git a/src/app/main/content/apps/mail-ngrx/mail.model.ts b/src/app/main/apps/mail-ngrx/mail.model.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail.model.ts
rename to src/app/main/apps/mail-ngrx/mail.model.ts
diff --git a/src/app/main/content/apps/mail-ngrx/mail.module.ts b/src/app/main/apps/mail-ngrx/mail.module.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail.module.ts
rename to src/app/main/apps/mail-ngrx/mail.module.ts
diff --git a/src/app/main/content/apps/mail-ngrx/mail.service.ts b/src/app/main/apps/mail-ngrx/mail.service.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/mail.service.ts
rename to src/app/main/apps/mail-ngrx/mail.service.ts
diff --git a/src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html
rename to src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html
diff --git a/src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.scss b/src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.scss
rename to src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.scss
diff --git a/src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts b/src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts
rename to src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/actions/filters.actions.ts b/src/app/main/apps/mail-ngrx/store/actions/filters.actions.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/actions/filters.actions.ts
rename to src/app/main/apps/mail-ngrx/store/actions/filters.actions.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/actions/folders.actions.ts b/src/app/main/apps/mail-ngrx/store/actions/folders.actions.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/actions/folders.actions.ts
rename to src/app/main/apps/mail-ngrx/store/actions/folders.actions.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/actions/index.ts b/src/app/main/apps/mail-ngrx/store/actions/index.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/actions/index.ts
rename to src/app/main/apps/mail-ngrx/store/actions/index.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/actions/labels.actions.ts b/src/app/main/apps/mail-ngrx/store/actions/labels.actions.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/actions/labels.actions.ts
rename to src/app/main/apps/mail-ngrx/store/actions/labels.actions.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/actions/mails.actions.ts b/src/app/main/apps/mail-ngrx/store/actions/mails.actions.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/actions/mails.actions.ts
rename to src/app/main/apps/mail-ngrx/store/actions/mails.actions.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/effects/filters.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/filters.effects.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/effects/filters.effects.ts
rename to src/app/main/apps/mail-ngrx/store/effects/filters.effects.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/effects/folders.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/folders.effects.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/effects/folders.effects.ts
rename to src/app/main/apps/mail-ngrx/store/effects/folders.effects.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/effects/index.ts b/src/app/main/apps/mail-ngrx/store/effects/index.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/effects/index.ts
rename to src/app/main/apps/mail-ngrx/store/effects/index.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/effects/labels.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/labels.effects.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/effects/labels.effects.ts
rename to src/app/main/apps/mail-ngrx/store/effects/labels.effects.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts b/src/app/main/apps/mail-ngrx/store/effects/mails.effects.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts
rename to src/app/main/apps/mail-ngrx/store/effects/mails.effects.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/guards/index.ts b/src/app/main/apps/mail-ngrx/store/guards/index.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/guards/index.ts
rename to src/app/main/apps/mail-ngrx/store/guards/index.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/guards/resolve.guard.ts b/src/app/main/apps/mail-ngrx/store/guards/resolve.guard.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/guards/resolve.guard.ts
rename to src/app/main/apps/mail-ngrx/store/guards/resolve.guard.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/index.ts b/src/app/main/apps/mail-ngrx/store/index.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/index.ts
rename to src/app/main/apps/mail-ngrx/store/index.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/reducers/filters.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/filters.reducer.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/reducers/filters.reducer.ts
rename to src/app/main/apps/mail-ngrx/store/reducers/filters.reducer.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/reducers/folders.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/folders.reducer.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/reducers/folders.reducer.ts
rename to src/app/main/apps/mail-ngrx/store/reducers/folders.reducer.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/reducers/index.ts b/src/app/main/apps/mail-ngrx/store/reducers/index.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/reducers/index.ts
rename to src/app/main/apps/mail-ngrx/store/reducers/index.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/reducers/labels.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/labels.reducer.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/reducers/labels.reducer.ts
rename to src/app/main/apps/mail-ngrx/store/reducers/labels.reducer.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/reducers/mails.reducer.ts b/src/app/main/apps/mail-ngrx/store/reducers/mails.reducer.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/reducers/mails.reducer.ts
rename to src/app/main/apps/mail-ngrx/store/reducers/mails.reducer.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/filters.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/filters.selectors.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/selectors/filters.selectors.ts
rename to src/app/main/apps/mail-ngrx/store/selectors/filters.selectors.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/folders.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/folders.selectors.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/selectors/folders.selectors.ts
rename to src/app/main/apps/mail-ngrx/store/selectors/folders.selectors.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/index.ts b/src/app/main/apps/mail-ngrx/store/selectors/index.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/selectors/index.ts
rename to src/app/main/apps/mail-ngrx/store/selectors/index.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/labels.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/labels.selectors.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/selectors/labels.selectors.ts
rename to src/app/main/apps/mail-ngrx/store/selectors/labels.selectors.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts b/src/app/main/apps/mail-ngrx/store/selectors/mails.selectors.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts
rename to src/app/main/apps/mail-ngrx/store/selectors/mails.selectors.ts
diff --git a/src/app/main/content/apps/mail-ngrx/store/store.module.ts b/src/app/main/apps/mail-ngrx/store/store.module.ts
similarity index 100%
rename from src/app/main/content/apps/mail-ngrx/store/store.module.ts
rename to src/app/main/apps/mail-ngrx/store/store.module.ts
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/apps/mail/dialogs/compose/compose.component.html
similarity index 100%
rename from src/app/main/content/apps/mail/dialogs/compose/compose.component.html
rename to src/app/main/apps/mail/dialogs/compose/compose.component.html
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.scss b/src/app/main/apps/mail/dialogs/compose/compose.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail/dialogs/compose/compose.component.scss
rename to src/app/main/apps/mail/dialogs/compose/compose.component.scss
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.ts b/src/app/main/apps/mail/dialogs/compose/compose.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail/dialogs/compose/compose.component.ts
rename to src/app/main/apps/mail/dialogs/compose/compose.component.ts
diff --git a/src/app/main/content/apps/mail/i18n/en.ts b/src/app/main/apps/mail/i18n/en.ts
similarity index 100%
rename from src/app/main/content/apps/mail/i18n/en.ts
rename to src/app/main/apps/mail/i18n/en.ts
diff --git a/src/app/main/content/apps/mail/i18n/tr.ts b/src/app/main/apps/mail/i18n/tr.ts
similarity index 100%
rename from src/app/main/content/apps/mail/i18n/tr.ts
rename to src/app/main/apps/mail/i18n/tr.ts
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.html b/src/app/main/apps/mail/mail-details/mail-details.component.html
similarity index 100%
rename from src/app/main/content/apps/mail/mail-details/mail-details.component.html
rename to src/app/main/apps/mail/mail-details/mail-details.component.html
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.scss b/src/app/main/apps/mail/mail-details/mail-details.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail/mail-details/mail-details.component.scss
rename to src/app/main/apps/mail/mail-details/mail-details.component.scss
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.ts b/src/app/main/apps/mail/mail-details/mail-details.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail/mail-details/mail-details.component.ts
rename to src/app/main/apps/mail/mail-details/mail-details.component.ts
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
similarity index 100%
rename from src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
rename to src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
rename to src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts b/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts
rename to src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.ts
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.html b/src/app/main/apps/mail/mail-list/mail-list.component.html
similarity index 100%
rename from src/app/main/content/apps/mail/mail-list/mail-list.component.html
rename to src/app/main/apps/mail/mail-list/mail-list.component.html
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.scss b/src/app/main/apps/mail/mail-list/mail-list.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail/mail-list/mail-list.component.scss
rename to src/app/main/apps/mail/mail-list/mail-list.component.scss
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.ts b/src/app/main/apps/mail/mail-list/mail-list.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail/mail-list/mail-list.component.ts
rename to src/app/main/apps/mail/mail-list/mail-list.component.ts
diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/apps/mail/mail.component.html
similarity index 100%
rename from src/app/main/content/apps/mail/mail.component.html
rename to src/app/main/apps/mail/mail.component.html
diff --git a/src/app/main/content/apps/mail/mail.component.scss b/src/app/main/apps/mail/mail.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail/mail.component.scss
rename to src/app/main/apps/mail/mail.component.scss
diff --git a/src/app/main/content/apps/mail/mail.component.ts b/src/app/main/apps/mail/mail.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail/mail.component.ts
rename to src/app/main/apps/mail/mail.component.ts
diff --git a/src/app/main/content/apps/mail/mail.model.ts b/src/app/main/apps/mail/mail.model.ts
similarity index 100%
rename from src/app/main/content/apps/mail/mail.model.ts
rename to src/app/main/apps/mail/mail.model.ts
diff --git a/src/app/main/content/apps/mail/mail.module.ts b/src/app/main/apps/mail/mail.module.ts
similarity index 100%
rename from src/app/main/content/apps/mail/mail.module.ts
rename to src/app/main/apps/mail/mail.module.ts
diff --git a/src/app/main/content/apps/mail/mail.service.ts b/src/app/main/apps/mail/mail.service.ts
similarity index 100%
rename from src/app/main/content/apps/mail/mail.service.ts
rename to src/app/main/apps/mail/mail.service.ts
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
similarity index 100%
rename from src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
rename to src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss
similarity index 100%
rename from src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.scss
rename to src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts
similarity index 100%
rename from src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.ts
rename to src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board.model.ts b/src/app/main/apps/scrumboard/board.model.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board.model.ts
rename to src/app/main/apps/scrumboard/board.model.ts
diff --git a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.html b/src/app/main/apps/scrumboard/board/add-list/add-list.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/add-list/add-list.component.html
rename to src/app/main/apps/scrumboard/board/add-list/add-list.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.scss b/src/app/main/apps/scrumboard/board/add-list/add-list.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/add-list/add-list.component.scss
rename to src/app/main/apps/scrumboard/board/add-list/add-list.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts b/src/app/main/apps/scrumboard/board/add-list/add-list.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/add-list/add-list.component.ts
rename to src/app/main/apps/scrumboard/board/add-list/add-list.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.html b/src/app/main/apps/scrumboard/board/board.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/board.component.html
rename to src/app/main/apps/scrumboard/board/board.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.scss b/src/app/main/apps/scrumboard/board/board.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/board.component.scss
rename to src/app/main/apps/scrumboard/board/board.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/board.component.ts b/src/app/main/apps/scrumboard/board/board.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/board.component.ts
rename to src/app/main/apps/scrumboard/board/board.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/apps/scrumboard/board/dialogs/card/card.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
rename to src/app/main/apps/scrumboard/board/dialogs/card/card.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss b/src/app/main/apps/scrumboard/board/dialogs/card/card.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.scss
rename to src/app/main/apps/scrumboard/board/dialogs/card/card.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts b/src/app/main/apps/scrumboard/board/dialogs/card/card.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts
rename to src/app/main/apps/scrumboard/board/dialogs/card/card.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html b/src/app/main/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
rename to src/app/main/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.scss b/src/app/main/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.scss
rename to src/app/main/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts b/src/app/main/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
rename to src/app/main/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.html b/src/app/main/apps/scrumboard/board/edit-board-name/edit-board-name.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.html
rename to src/app/main/apps/scrumboard/board/edit-board-name/edit-board-name.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.scss b/src/app/main/apps/scrumboard/board/edit-board-name/edit-board-name.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.scss
rename to src/app/main/apps/scrumboard/board/edit-board-name/edit-board-name.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts b/src/app/main/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts
rename to src/app/main/apps/scrumboard/board/edit-board-name/edit-board-name.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.html b/src/app/main/apps/scrumboard/board/list/add-card/add-card.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.html
rename to src/app/main/apps/scrumboard/board/list/add-card/add-card.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.scss b/src/app/main/apps/scrumboard/board/list/add-card/add-card.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.scss
rename to src/app/main/apps/scrumboard/board/list/add-card/add-card.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.ts b/src/app/main/apps/scrumboard/board/list/add-card/add-card.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/add-card/add-card.component.ts
rename to src/app/main/apps/scrumboard/board/list/add-card/add-card.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.html b/src/app/main/apps/scrumboard/board/list/card/card.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/card/card.component.html
rename to src/app/main/apps/scrumboard/board/list/card/card.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.scss b/src/app/main/apps/scrumboard/board/list/card/card.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/card/card.component.scss
rename to src/app/main/apps/scrumboard/board/list/card/card.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/list/card/card.component.ts b/src/app/main/apps/scrumboard/board/list/card/card.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/card/card.component.ts
rename to src/app/main/apps/scrumboard/board/list/card/card.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html b/src/app/main/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html
rename to src/app/main/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.scss b/src/app/main/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.scss
rename to src/app/main/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts b/src/app/main/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts
rename to src/app/main/apps/scrumboard/board/list/edit-list-name/edit-list-name.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.html b/src/app/main/apps/scrumboard/board/list/list.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/list.component.html
rename to src/app/main/apps/scrumboard/board/list/list.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.scss b/src/app/main/apps/scrumboard/board/list/list.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/list.component.scss
rename to src/app/main/apps/scrumboard/board/list/list.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.ts b/src/app/main/apps/scrumboard/board/list/list.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/list/list.component.ts
rename to src/app/main/apps/scrumboard/board/list/list.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html b/src/app/main/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html
rename to src/app/main/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.scss b/src/app/main/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.scss
rename to src/app/main/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts b/src/app/main/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts
rename to src/app/main/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html b/src/app/main/apps/scrumboard/board/sidenavs/settings/settings.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
rename to src/app/main/apps/scrumboard/board/sidenavs/settings/settings.component.html
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.scss b/src/app/main/apps/scrumboard/board/sidenavs/settings/settings.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.scss
rename to src/app/main/apps/scrumboard/board/sidenavs/settings/settings.component.scss
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts b/src/app/main/apps/scrumboard/board/sidenavs/settings/settings.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.ts
rename to src/app/main/apps/scrumboard/board/sidenavs/settings/settings.component.ts
diff --git a/src/app/main/content/apps/scrumboard/card.model.ts b/src/app/main/apps/scrumboard/card.model.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/card.model.ts
rename to src/app/main/apps/scrumboard/card.model.ts
diff --git a/src/app/main/content/apps/scrumboard/list.model.ts b/src/app/main/apps/scrumboard/list.model.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/list.model.ts
rename to src/app/main/apps/scrumboard/list.model.ts
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.html b/src/app/main/apps/scrumboard/scrumboard.component.html
similarity index 100%
rename from src/app/main/content/apps/scrumboard/scrumboard.component.html
rename to src/app/main/apps/scrumboard/scrumboard.component.html
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.scss b/src/app/main/apps/scrumboard/scrumboard.component.scss
similarity index 100%
rename from src/app/main/content/apps/scrumboard/scrumboard.component.scss
rename to src/app/main/apps/scrumboard/scrumboard.component.scss
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.ts b/src/app/main/apps/scrumboard/scrumboard.component.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/scrumboard.component.ts
rename to src/app/main/apps/scrumboard/scrumboard.component.ts
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.module.ts b/src/app/main/apps/scrumboard/scrumboard.module.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/scrumboard.module.ts
rename to src/app/main/apps/scrumboard/scrumboard.module.ts
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.service.ts b/src/app/main/apps/scrumboard/scrumboard.service.ts
similarity index 100%
rename from src/app/main/content/apps/scrumboard/scrumboard.service.ts
rename to src/app/main/apps/scrumboard/scrumboard.service.ts
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html
similarity index 100%
rename from src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
rename to src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss
similarity index 100%
rename from src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.scss
rename to src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts
similarity index 100%
rename from src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.ts
rename to src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.html b/src/app/main/apps/todo/todo-details/todo-details.component.html
similarity index 100%
rename from src/app/main/content/apps/todo/todo-details/todo-details.component.html
rename to src/app/main/apps/todo/todo-details/todo-details.component.html
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.scss b/src/app/main/apps/todo/todo-details/todo-details.component.scss
similarity index 100%
rename from src/app/main/content/apps/todo/todo-details/todo-details.component.scss
rename to src/app/main/apps/todo/todo-details/todo-details.component.scss
diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts b/src/app/main/apps/todo/todo-details/todo-details.component.ts
similarity index 100%
rename from src/app/main/content/apps/todo/todo-details/todo-details.component.ts
rename to src/app/main/apps/todo/todo-details/todo-details.component.ts
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
similarity index 100%
rename from src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
rename to src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
similarity index 100%
rename from src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
rename to src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
similarity index 100%
rename from src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
rename to src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.html b/src/app/main/apps/todo/todo-list/todo-list.component.html
similarity index 100%
rename from src/app/main/content/apps/todo/todo-list/todo-list.component.html
rename to src/app/main/apps/todo/todo-list/todo-list.component.html
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.scss b/src/app/main/apps/todo/todo-list/todo-list.component.scss
similarity index 100%
rename from src/app/main/content/apps/todo/todo-list/todo-list.component.scss
rename to src/app/main/apps/todo/todo-list/todo-list.component.scss
diff --git a/src/app/main/content/apps/todo/todo-list/todo-list.component.ts b/src/app/main/apps/todo/todo-list/todo-list.component.ts
similarity index 100%
rename from src/app/main/content/apps/todo/todo-list/todo-list.component.ts
rename to src/app/main/apps/todo/todo-list/todo-list.component.ts
diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/apps/todo/todo.component.html
similarity index 100%
rename from src/app/main/content/apps/todo/todo.component.html
rename to src/app/main/apps/todo/todo.component.html
diff --git a/src/app/main/content/apps/todo/todo.component.scss b/src/app/main/apps/todo/todo.component.scss
similarity index 100%
rename from src/app/main/content/apps/todo/todo.component.scss
rename to src/app/main/apps/todo/todo.component.scss
diff --git a/src/app/main/content/apps/todo/todo.component.ts b/src/app/main/apps/todo/todo.component.ts
similarity index 100%
rename from src/app/main/content/apps/todo/todo.component.ts
rename to src/app/main/apps/todo/todo.component.ts
diff --git a/src/app/main/content/apps/todo/todo.model.ts b/src/app/main/apps/todo/todo.model.ts
similarity index 100%
rename from src/app/main/content/apps/todo/todo.model.ts
rename to src/app/main/apps/todo/todo.model.ts
diff --git a/src/app/main/content/apps/todo/todo.module.ts b/src/app/main/apps/todo/todo.module.ts
similarity index 100%
rename from src/app/main/content/apps/todo/todo.module.ts
rename to src/app/main/apps/todo/todo.module.ts
diff --git a/src/app/main/content/apps/todo/todo.service.ts b/src/app/main/apps/todo/todo.service.ts
similarity index 100%
rename from src/app/main/content/apps/todo/todo.service.ts
rename to src/app/main/apps/todo/todo.service.ts
diff --git a/src/app/main/content/components-third-party/components-third-party.module.ts b/src/app/main/components-third-party/components-third-party.module.ts
similarity index 100%
rename from src/app/main/content/components-third-party/components-third-party.module.ts
rename to src/app/main/components-third-party/components-third-party.module.ts
diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html b/src/app/main/components-third-party/datatable/ngx-datatable.component.html
similarity index 100%
rename from src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
rename to src/app/main/components-third-party/datatable/ngx-datatable.component.html
diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.scss b/src/app/main/components-third-party/datatable/ngx-datatable.component.scss
similarity index 100%
rename from src/app/main/content/components-third-party/datatable/ngx-datatable.component.scss
rename to src/app/main/components-third-party/datatable/ngx-datatable.component.scss
diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts b/src/app/main/components-third-party/datatable/ngx-datatable.component.ts
similarity index 100%
rename from src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts
rename to src/app/main/components-third-party/datatable/ngx-datatable.component.ts
diff --git a/src/app/main/content/components-third-party/google-maps/google-maps.component.html b/src/app/main/components-third-party/google-maps/google-maps.component.html
similarity index 100%
rename from src/app/main/content/components-third-party/google-maps/google-maps.component.html
rename to src/app/main/components-third-party/google-maps/google-maps.component.html
diff --git a/src/app/main/content/components-third-party/google-maps/google-maps.component.scss b/src/app/main/components-third-party/google-maps/google-maps.component.scss
similarity index 100%
rename from src/app/main/content/components-third-party/google-maps/google-maps.component.scss
rename to src/app/main/components-third-party/google-maps/google-maps.component.scss
diff --git a/src/app/main/content/components-third-party/google-maps/google-maps.component.ts b/src/app/main/components-third-party/google-maps/google-maps.component.ts
similarity index 100%
rename from src/app/main/content/components-third-party/google-maps/google-maps.component.ts
rename to src/app/main/components-third-party/google-maps/google-maps.component.ts
diff --git a/src/app/main/content/components-third-party/google-maps/google-maps.module.ts b/src/app/main/components-third-party/google-maps/google-maps.module.ts
similarity index 100%
rename from src/app/main/content/components-third-party/google-maps/google-maps.module.ts
rename to src/app/main/components-third-party/google-maps/google-maps.module.ts
diff --git a/src/app/main/content/components/angular-material/angular-material.component.html b/src/app/main/components/angular-material/angular-material.component.html
similarity index 100%
rename from src/app/main/content/components/angular-material/angular-material.component.html
rename to src/app/main/components/angular-material/angular-material.component.html
diff --git a/src/app/main/content/components/angular-material/angular-material.component.scss b/src/app/main/components/angular-material/angular-material.component.scss
similarity index 100%
rename from src/app/main/content/components/angular-material/angular-material.component.scss
rename to src/app/main/components/angular-material/angular-material.component.scss
diff --git a/src/app/main/content/components/angular-material/angular-material.component.ts b/src/app/main/components/angular-material/angular-material.component.ts
similarity index 100%
rename from src/app/main/content/components/angular-material/angular-material.component.ts
rename to src/app/main/components/angular-material/angular-material.component.ts
diff --git a/src/app/main/content/components/angular-material/angular-material.module.ts b/src/app/main/components/angular-material/angular-material.module.ts
similarity index 100%
rename from src/app/main/content/components/angular-material/angular-material.module.ts
rename to src/app/main/components/angular-material/angular-material.module.ts
diff --git a/src/app/main/content/components/angular-material/example-components.ts b/src/app/main/components/angular-material/example-components.ts
similarity index 100%
rename from src/app/main/content/components/angular-material/example-components.ts
rename to src/app/main/components/angular-material/example-components.ts
diff --git a/src/app/main/content/components/angular-material/example-viewer/example-viewer.html b/src/app/main/components/angular-material/example-viewer/example-viewer.html
similarity index 100%
rename from src/app/main/content/components/angular-material/example-viewer/example-viewer.html
rename to src/app/main/components/angular-material/example-viewer/example-viewer.html
diff --git a/src/app/main/content/components/angular-material/example-viewer/example-viewer.scss b/src/app/main/components/angular-material/example-viewer/example-viewer.scss
similarity index 100%
rename from src/app/main/content/components/angular-material/example-viewer/example-viewer.scss
rename to src/app/main/components/angular-material/example-viewer/example-viewer.scss
diff --git a/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts b/src/app/main/components/angular-material/example-viewer/example-viewer.ts
similarity index 100%
rename from src/app/main/content/components/angular-material/example-viewer/example-viewer.ts
rename to src/app/main/components/angular-material/example-viewer/example-viewer.ts
diff --git a/src/app/main/content/components/angular-material/material.module.ts b/src/app/main/components/angular-material/material.module.ts
similarity index 100%
rename from src/app/main/content/components/angular-material/material.module.ts
rename to src/app/main/components/angular-material/material.module.ts
diff --git a/src/app/main/content/components/cards/cards.component.html b/src/app/main/components/cards/cards.component.html
similarity index 100%
rename from src/app/main/content/components/cards/cards.component.html
rename to src/app/main/components/cards/cards.component.html
diff --git a/src/app/main/content/components/cards/cards.component.scss b/src/app/main/components/cards/cards.component.scss
similarity index 100%
rename from src/app/main/content/components/cards/cards.component.scss
rename to src/app/main/components/cards/cards.component.scss
diff --git a/src/app/main/content/components/cards/cards.component.ts b/src/app/main/components/cards/cards.component.ts
similarity index 100%
rename from src/app/main/content/components/cards/cards.component.ts
rename to src/app/main/components/cards/cards.component.ts
diff --git a/src/app/main/content/components/components.module.ts b/src/app/main/components/components.module.ts
similarity index 100%
rename from src/app/main/content/components/components.module.ts
rename to src/app/main/components/components.module.ts
diff --git a/src/app/main/content/components/countdown/countdown.component.html b/src/app/main/components/countdown/countdown.component.html
similarity index 100%
rename from src/app/main/content/components/countdown/countdown.component.html
rename to src/app/main/components/countdown/countdown.component.html
diff --git a/src/app/main/content/components/countdown/countdown.component.scss b/src/app/main/components/countdown/countdown.component.scss
similarity index 100%
rename from src/app/main/content/components/countdown/countdown.component.scss
rename to src/app/main/components/countdown/countdown.component.scss
diff --git a/src/app/main/content/components/countdown/countdown.component.ts b/src/app/main/components/countdown/countdown.component.ts
similarity index 100%
rename from src/app/main/content/components/countdown/countdown.component.ts
rename to src/app/main/components/countdown/countdown.component.ts
diff --git a/src/app/main/content/components/highlight/highlight.component.html b/src/app/main/components/highlight/highlight.component.html
similarity index 100%
rename from src/app/main/content/components/highlight/highlight.component.html
rename to src/app/main/components/highlight/highlight.component.html
diff --git a/src/app/main/content/components/highlight/highlight.component.scss b/src/app/main/components/highlight/highlight.component.scss
similarity index 100%
rename from src/app/main/content/components/highlight/highlight.component.scss
rename to src/app/main/components/highlight/highlight.component.scss
diff --git a/src/app/main/content/components/highlight/highlight.component.ts b/src/app/main/components/highlight/highlight.component.ts
similarity index 100%
rename from src/app/main/content/components/highlight/highlight.component.ts
rename to src/app/main/components/highlight/highlight.component.ts
diff --git a/src/app/main/content/components/material-color-picker/material-color-picker.component.html b/src/app/main/components/material-color-picker/material-color-picker.component.html
similarity index 100%
rename from src/app/main/content/components/material-color-picker/material-color-picker.component.html
rename to src/app/main/components/material-color-picker/material-color-picker.component.html
diff --git a/src/app/main/content/components/material-color-picker/material-color-picker.component.scss b/src/app/main/components/material-color-picker/material-color-picker.component.scss
similarity index 100%
rename from src/app/main/content/components/material-color-picker/material-color-picker.component.scss
rename to src/app/main/components/material-color-picker/material-color-picker.component.scss
diff --git a/src/app/main/content/components/material-color-picker/material-color-picker.component.ts b/src/app/main/components/material-color-picker/material-color-picker.component.ts
similarity index 100%
rename from src/app/main/content/components/material-color-picker/material-color-picker.component.ts
rename to src/app/main/components/material-color-picker/material-color-picker.component.ts
diff --git a/src/app/main/content/components/multi-language/multi-language.component.html b/src/app/main/components/multi-language/multi-language.component.html
similarity index 100%
rename from src/app/main/content/components/multi-language/multi-language.component.html
rename to src/app/main/components/multi-language/multi-language.component.html
diff --git a/src/app/main/content/components/multi-language/multi-language.component.scss b/src/app/main/components/multi-language/multi-language.component.scss
similarity index 100%
rename from src/app/main/content/components/multi-language/multi-language.component.scss
rename to src/app/main/components/multi-language/multi-language.component.scss
diff --git a/src/app/main/content/components/multi-language/multi-language.component.ts b/src/app/main/components/multi-language/multi-language.component.ts
similarity index 100%
rename from src/app/main/content/components/multi-language/multi-language.component.ts
rename to src/app/main/components/multi-language/multi-language.component.ts
diff --git a/src/app/main/content/components/navigation/navigation.component.html b/src/app/main/components/navigation/navigation.component.html
similarity index 100%
rename from src/app/main/content/components/navigation/navigation.component.html
rename to src/app/main/components/navigation/navigation.component.html
diff --git a/src/app/main/content/components/navigation/navigation.component.scss b/src/app/main/components/navigation/navigation.component.scss
similarity index 100%
rename from src/app/main/content/components/navigation/navigation.component.scss
rename to src/app/main/components/navigation/navigation.component.scss
diff --git a/src/app/main/content/components/navigation/navigation.component.ts b/src/app/main/components/navigation/navigation.component.ts
similarity index 100%
rename from src/app/main/content/components/navigation/navigation.component.ts
rename to src/app/main/components/navigation/navigation.component.ts
diff --git a/src/app/main/content/components/search-bar/search-bar.component.html b/src/app/main/components/search-bar/search-bar.component.html
similarity index 100%
rename from src/app/main/content/components/search-bar/search-bar.component.html
rename to src/app/main/components/search-bar/search-bar.component.html
diff --git a/src/app/main/content/components/search-bar/search-bar.component.scss b/src/app/main/components/search-bar/search-bar.component.scss
similarity index 100%
rename from src/app/main/content/components/search-bar/search-bar.component.scss
rename to src/app/main/components/search-bar/search-bar.component.scss
diff --git a/src/app/main/content/components/search-bar/search-bar.component.ts b/src/app/main/components/search-bar/search-bar.component.ts
similarity index 100%
rename from src/app/main/content/components/search-bar/search-bar.component.ts
rename to src/app/main/components/search-bar/search-bar.component.ts
diff --git a/src/app/main/content/components/shortcuts/shortcuts.component.html b/src/app/main/components/shortcuts/shortcuts.component.html
similarity index 100%
rename from src/app/main/content/components/shortcuts/shortcuts.component.html
rename to src/app/main/components/shortcuts/shortcuts.component.html
diff --git a/src/app/main/content/components/shortcuts/shortcuts.component.scss b/src/app/main/components/shortcuts/shortcuts.component.scss
similarity index 100%
rename from src/app/main/content/components/shortcuts/shortcuts.component.scss
rename to src/app/main/components/shortcuts/shortcuts.component.scss
diff --git a/src/app/main/content/components/shortcuts/shortcuts.component.ts b/src/app/main/components/shortcuts/shortcuts.component.ts
similarity index 100%
rename from src/app/main/content/components/shortcuts/shortcuts.component.ts
rename to src/app/main/components/shortcuts/shortcuts.component.ts
diff --git a/src/app/main/content/components/sidebar/sidebar.component.html b/src/app/main/components/sidebar/sidebar.component.html
similarity index 100%
rename from src/app/main/content/components/sidebar/sidebar.component.html
rename to src/app/main/components/sidebar/sidebar.component.html
diff --git a/src/app/main/content/components/sidebar/sidebar.component.scss b/src/app/main/components/sidebar/sidebar.component.scss
similarity index 100%
rename from src/app/main/content/components/sidebar/sidebar.component.scss
rename to src/app/main/components/sidebar/sidebar.component.scss
diff --git a/src/app/main/content/components/sidebar/sidebar.component.ts b/src/app/main/components/sidebar/sidebar.component.ts
similarity index 100%
rename from src/app/main/content/components/sidebar/sidebar.component.ts
rename to src/app/main/components/sidebar/sidebar.component.ts
diff --git a/src/app/main/content/components/widget/widget.component.html b/src/app/main/components/widget/widget.component.html
similarity index 100%
rename from src/app/main/content/components/widget/widget.component.html
rename to src/app/main/components/widget/widget.component.html
diff --git a/src/app/main/content/components/widget/widget.component.scss b/src/app/main/components/widget/widget.component.scss
similarity index 100%
rename from src/app/main/content/components/widget/widget.component.scss
rename to src/app/main/components/widget/widget.component.scss
diff --git a/src/app/main/content/components/widget/widget.component.ts b/src/app/main/components/widget/widget.component.ts
similarity index 100%
rename from src/app/main/content/components/widget/widget.component.ts
rename to src/app/main/components/widget/widget.component.ts
diff --git a/src/app/main/content/content.component.html b/src/app/main/content/content.component.html
deleted file mode 100644
index 90c6b646..00000000
--- a/src/app/main/content/content.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
deleted file mode 100644
index add7433a..00000000
--- a/src/app/main/main.component.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Component, ElementRef, HostBinding, Inject, OnDestroy, Renderer2, ViewEncapsulation } from '@angular/core';
-import { DOCUMENT } from '@angular/common';
-import { Platform } from '@angular/cdk/platform';
-import { Subscription } from 'rxjs';
-
-import { FuseConfigService } from '@fuse/services/config.service';
-
-import { navigation } from 'app/navigation/navigation';
-
-@Component({
-    selector     : 'fuse-main',
-    templateUrl  : './main.component.html',
-    styleUrls    : ['./main.component.scss'],
-    encapsulation: ViewEncapsulation.None
-})
-export class FuseMainComponent implements OnDestroy
-{
-    onConfigChanged: Subscription;
-    fuseSettings: any;
-    navigation: any;
-
-    @HostBinding('attr.fuse-layout-mode') layoutMode;
-
-    constructor(
-        private _renderer: Renderer2,
-        private _elementRef: ElementRef,
-        private fuseConfig: FuseConfigService,
-        private platform: Platform,
-        @Inject(DOCUMENT) private document: any
-    )
-    {
-        this.onConfigChanged =
-            this.fuseConfig.onConfigChanged
-                .subscribe(
-                    (newSettings) => {
-                        this.fuseSettings = newSettings;
-                        this.layoutMode = this.fuseSettings.layout.mode;
-                    }
-                );
-
-        if ( this.platform.ANDROID || this.platform.IOS )
-        {
-            this.document.body.className += ' is-mobile';
-        }
-
-        this.navigation = navigation;
-    }
-
-    ngOnDestroy()
-    {
-        this.onConfigChanged.unsubscribe();
-    }
-
-    addClass(className: string)
-    {
-        this._renderer.addClass(this._elementRef.nativeElement, className);
-    }
-
-    removeClass(className: string)
-    {
-        this._renderer.removeClass(this._elementRef.nativeElement, className);
-    }
-}
diff --git a/src/app/main/main.module.ts b/src/app/main/main.module.ts
deleted file mode 100644
index f7c03c72..00000000
--- a/src/app/main/main.module.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { MatSidenavModule } from '@angular/material';
-
-import { FuseSharedModule } from '@fuse/shared.module';
-import { FuseNavigationModule, FuseSearchBarModule, FuseShortcutsModule, FuseSidebarModule, FuseThemeOptionsModule } from '@fuse/components';
-
-import { FuseContentModule } from 'app/main/content/content.module';
-import { FuseFooterModule } from 'app/main/footer/footer.module';
-import { FuseNavbarModule } from 'app/main/navbar/navbar.module';
-import { FuseQuickPanelModule } from 'app/main/quick-panel/quick-panel.module';
-import { FuseToolbarModule } from 'app/main/toolbar/toolbar.module';
-
-import { FuseMainComponent } from './main.component';
-
-
-@NgModule({
-    declarations: [
-        FuseMainComponent,
-    ],
-    imports     : [
-        RouterModule,
-
-        MatSidenavModule,
-
-        FuseSharedModule,
-
-        FuseThemeOptionsModule,
-        FuseNavigationModule,
-        FuseSearchBarModule,
-        FuseShortcutsModule,
-        FuseSidebarModule,
-
-        FuseContentModule,
-        FuseFooterModule,
-        FuseNavbarModule,
-        FuseQuickPanelModule,
-        FuseToolbarModule,
-    ],
-    exports     : [
-        FuseMainComponent
-    ]
-})
-export class FuseMainModule
-{
-}
diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.html b/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.html
rename to src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.html
diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss b/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.scss
rename to src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.scss
diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.ts b/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.component.ts
rename to src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.ts
diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts b/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts
rename to src/app/main/pages/authentication/forgot-password-2/forgot-password-2.module.ts
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/pages/authentication/forgot-password/forgot-password.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
rename to src/app/main/pages/authentication/forgot-password/forgot-password.component.html
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss b/src/app/main/pages/authentication/forgot-password/forgot-password.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password/forgot-password.component.scss
rename to src/app/main/pages/authentication/forgot-password/forgot-password.component.scss
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts b/src/app/main/pages/authentication/forgot-password/forgot-password.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password/forgot-password.component.ts
rename to src/app/main/pages/authentication/forgot-password/forgot-password.component.ts
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts b/src/app/main/pages/authentication/forgot-password/forgot-password.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts
rename to src/app/main/pages/authentication/forgot-password/forgot-password.module.ts
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.html b/src/app/main/pages/authentication/lock/lock.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/lock/lock.component.html
rename to src/app/main/pages/authentication/lock/lock.component.html
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.scss b/src/app/main/pages/authentication/lock/lock.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/lock/lock.component.scss
rename to src/app/main/pages/authentication/lock/lock.component.scss
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.ts b/src/app/main/pages/authentication/lock/lock.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/lock/lock.component.ts
rename to src/app/main/pages/authentication/lock/lock.component.ts
diff --git a/src/app/main/content/pages/authentication/lock/lock.module.ts b/src/app/main/pages/authentication/lock/lock.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/lock/lock.module.ts
rename to src/app/main/pages/authentication/lock/lock.module.ts
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.html b/src/app/main/pages/authentication/login-2/login-2.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/login-2/login-2.component.html
rename to src/app/main/pages/authentication/login-2/login-2.component.html
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.scss b/src/app/main/pages/authentication/login-2/login-2.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/login-2/login-2.component.scss
rename to src/app/main/pages/authentication/login-2/login-2.component.scss
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.ts b/src/app/main/pages/authentication/login-2/login-2.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/login-2/login-2.component.ts
rename to src/app/main/pages/authentication/login-2/login-2.component.ts
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.module.ts b/src/app/main/pages/authentication/login-2/login-2.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/login-2/login-2.module.ts
rename to src/app/main/pages/authentication/login-2/login-2.module.ts
diff --git a/src/app/main/content/pages/authentication/login/login.component.html b/src/app/main/pages/authentication/login/login.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/login/login.component.html
rename to src/app/main/pages/authentication/login/login.component.html
diff --git a/src/app/main/content/pages/authentication/login/login.component.scss b/src/app/main/pages/authentication/login/login.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/login/login.component.scss
rename to src/app/main/pages/authentication/login/login.component.scss
diff --git a/src/app/main/content/pages/authentication/login/login.component.ts b/src/app/main/pages/authentication/login/login.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/login/login.component.ts
rename to src/app/main/pages/authentication/login/login.component.ts
diff --git a/src/app/main/content/pages/authentication/login/login.module.ts b/src/app/main/pages/authentication/login/login.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/login/login.module.ts
rename to src/app/main/pages/authentication/login/login.module.ts
diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.html b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.html
rename to src/app/main/pages/authentication/mail-confirm/mail-confirm.component.html
diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.scss b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.scss
rename to src/app/main/pages/authentication/mail-confirm/mail-confirm.component.scss
diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.ts b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/mail-confirm/mail-confirm.component.ts
rename to src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts
diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts b/src/app/main/pages/authentication/mail-confirm/mail-confirm.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts
rename to src/app/main/pages/authentication/mail-confirm/mail-confirm.module.ts
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.html b/src/app/main/pages/authentication/register-2/register-2.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/register-2/register-2.component.html
rename to src/app/main/pages/authentication/register-2/register-2.component.html
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.scss b/src/app/main/pages/authentication/register-2/register-2.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/register-2/register-2.component.scss
rename to src/app/main/pages/authentication/register-2/register-2.component.scss
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.ts b/src/app/main/pages/authentication/register-2/register-2.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/register-2/register-2.component.ts
rename to src/app/main/pages/authentication/register-2/register-2.component.ts
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.module.ts b/src/app/main/pages/authentication/register-2/register-2.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/register-2/register-2.module.ts
rename to src/app/main/pages/authentication/register-2/register-2.module.ts
diff --git a/src/app/main/content/pages/authentication/register/register.component.html b/src/app/main/pages/authentication/register/register.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/register/register.component.html
rename to src/app/main/pages/authentication/register/register.component.html
diff --git a/src/app/main/content/pages/authentication/register/register.component.scss b/src/app/main/pages/authentication/register/register.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/register/register.component.scss
rename to src/app/main/pages/authentication/register/register.component.scss
diff --git a/src/app/main/content/pages/authentication/register/register.component.ts b/src/app/main/pages/authentication/register/register.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/register/register.component.ts
rename to src/app/main/pages/authentication/register/register.component.ts
diff --git a/src/app/main/content/pages/authentication/register/register.module.ts b/src/app/main/pages/authentication/register/register.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/register/register.module.ts
rename to src/app/main/pages/authentication/register/register.module.ts
diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.html b/src/app/main/pages/authentication/reset-password-2/reset-password-2.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.html
rename to src/app/main/pages/authentication/reset-password-2/reset-password-2.component.html
diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss b/src/app/main/pages/authentication/reset-password-2/reset-password-2.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.scss
rename to src/app/main/pages/authentication/reset-password-2/reset-password-2.component.scss
diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.ts b/src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password-2/reset-password-2.component.ts
rename to src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts
diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts b/src/app/main/pages/authentication/reset-password-2/reset-password-2.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts
rename to src/app/main/pages/authentication/reset-password-2/reset-password-2.module.ts
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html b/src/app/main/pages/authentication/reset-password/reset-password.component.html
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password/reset-password.component.html
rename to src/app/main/pages/authentication/reset-password/reset-password.component.html
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.scss b/src/app/main/pages/authentication/reset-password/reset-password.component.scss
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password/reset-password.component.scss
rename to src/app/main/pages/authentication/reset-password/reset-password.component.scss
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.ts b/src/app/main/pages/authentication/reset-password/reset-password.component.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password/reset-password.component.ts
rename to src/app/main/pages/authentication/reset-password/reset-password.component.ts
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts b/src/app/main/pages/authentication/reset-password/reset-password.module.ts
similarity index 100%
rename from src/app/main/content/pages/authentication/reset-password/reset-password.module.ts
rename to src/app/main/pages/authentication/reset-password/reset-password.module.ts
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.html b/src/app/main/pages/coming-soon/coming-soon.component.html
similarity index 100%
rename from src/app/main/content/pages/coming-soon/coming-soon.component.html
rename to src/app/main/pages/coming-soon/coming-soon.component.html
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.scss b/src/app/main/pages/coming-soon/coming-soon.component.scss
similarity index 100%
rename from src/app/main/content/pages/coming-soon/coming-soon.component.scss
rename to src/app/main/pages/coming-soon/coming-soon.component.scss
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.ts b/src/app/main/pages/coming-soon/coming-soon.component.ts
similarity index 100%
rename from src/app/main/content/pages/coming-soon/coming-soon.component.ts
rename to src/app/main/pages/coming-soon/coming-soon.component.ts
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.module.ts b/src/app/main/pages/coming-soon/coming-soon.module.ts
similarity index 100%
rename from src/app/main/content/pages/coming-soon/coming-soon.module.ts
rename to src/app/main/pages/coming-soon/coming-soon.module.ts
diff --git a/src/app/main/content/pages/errors/404/error-404.component.html b/src/app/main/pages/errors/404/error-404.component.html
similarity index 100%
rename from src/app/main/content/pages/errors/404/error-404.component.html
rename to src/app/main/pages/errors/404/error-404.component.html
diff --git a/src/app/main/content/pages/errors/404/error-404.component.scss b/src/app/main/pages/errors/404/error-404.component.scss
similarity index 100%
rename from src/app/main/content/pages/errors/404/error-404.component.scss
rename to src/app/main/pages/errors/404/error-404.component.scss
diff --git a/src/app/main/content/pages/errors/404/error-404.component.ts b/src/app/main/pages/errors/404/error-404.component.ts
similarity index 100%
rename from src/app/main/content/pages/errors/404/error-404.component.ts
rename to src/app/main/pages/errors/404/error-404.component.ts
diff --git a/src/app/main/content/pages/errors/404/error-404.module.ts b/src/app/main/pages/errors/404/error-404.module.ts
similarity index 100%
rename from src/app/main/content/pages/errors/404/error-404.module.ts
rename to src/app/main/pages/errors/404/error-404.module.ts
diff --git a/src/app/main/content/pages/errors/500/error-500.component.html b/src/app/main/pages/errors/500/error-500.component.html
similarity index 100%
rename from src/app/main/content/pages/errors/500/error-500.component.html
rename to src/app/main/pages/errors/500/error-500.component.html
diff --git a/src/app/main/content/pages/errors/500/error-500.component.scss b/src/app/main/pages/errors/500/error-500.component.scss
similarity index 100%
rename from src/app/main/content/pages/errors/500/error-500.component.scss
rename to src/app/main/pages/errors/500/error-500.component.scss
diff --git a/src/app/main/content/pages/errors/500/error-500.component.ts b/src/app/main/pages/errors/500/error-500.component.ts
similarity index 100%
rename from src/app/main/content/pages/errors/500/error-500.component.ts
rename to src/app/main/pages/errors/500/error-500.component.ts
diff --git a/src/app/main/content/pages/errors/500/error-500.module.ts b/src/app/main/pages/errors/500/error-500.module.ts
similarity index 100%
rename from src/app/main/content/pages/errors/500/error-500.module.ts
rename to src/app/main/pages/errors/500/error-500.module.ts
diff --git a/src/app/main/content/pages/faq/faq.component.html b/src/app/main/pages/faq/faq.component.html
similarity index 100%
rename from src/app/main/content/pages/faq/faq.component.html
rename to src/app/main/pages/faq/faq.component.html
diff --git a/src/app/main/content/pages/faq/faq.component.scss b/src/app/main/pages/faq/faq.component.scss
similarity index 100%
rename from src/app/main/content/pages/faq/faq.component.scss
rename to src/app/main/pages/faq/faq.component.scss
diff --git a/src/app/main/content/pages/faq/faq.component.ts b/src/app/main/pages/faq/faq.component.ts
similarity index 100%
rename from src/app/main/content/pages/faq/faq.component.ts
rename to src/app/main/pages/faq/faq.component.ts
diff --git a/src/app/main/content/pages/faq/faq.module.ts b/src/app/main/pages/faq/faq.module.ts
similarity index 100%
rename from src/app/main/content/pages/faq/faq.module.ts
rename to src/app/main/pages/faq/faq.module.ts
diff --git a/src/app/main/content/pages/faq/faq.service.ts b/src/app/main/pages/faq/faq.service.ts
similarity index 100%
rename from src/app/main/content/pages/faq/faq.service.ts
rename to src/app/main/pages/faq/faq.service.ts
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.html b/src/app/main/pages/invoices/compact/compact.component.html
similarity index 100%
rename from src/app/main/content/pages/invoices/compact/compact.component.html
rename to src/app/main/pages/invoices/compact/compact.component.html
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.scss b/src/app/main/pages/invoices/compact/compact.component.scss
similarity index 100%
rename from src/app/main/content/pages/invoices/compact/compact.component.scss
rename to src/app/main/pages/invoices/compact/compact.component.scss
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.ts b/src/app/main/pages/invoices/compact/compact.component.ts
similarity index 100%
rename from src/app/main/content/pages/invoices/compact/compact.component.ts
rename to src/app/main/pages/invoices/compact/compact.component.ts
diff --git a/src/app/main/content/pages/invoices/compact/compact.module.ts b/src/app/main/pages/invoices/compact/compact.module.ts
similarity index 100%
rename from src/app/main/content/pages/invoices/compact/compact.module.ts
rename to src/app/main/pages/invoices/compact/compact.module.ts
diff --git a/src/app/main/content/pages/invoices/invoice.service.ts b/src/app/main/pages/invoices/invoice.service.ts
similarity index 100%
rename from src/app/main/content/pages/invoices/invoice.service.ts
rename to src/app/main/pages/invoices/invoice.service.ts
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.html b/src/app/main/pages/invoices/modern/modern.component.html
similarity index 100%
rename from src/app/main/content/pages/invoices/modern/modern.component.html
rename to src/app/main/pages/invoices/modern/modern.component.html
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.scss b/src/app/main/pages/invoices/modern/modern.component.scss
similarity index 100%
rename from src/app/main/content/pages/invoices/modern/modern.component.scss
rename to src/app/main/pages/invoices/modern/modern.component.scss
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.ts b/src/app/main/pages/invoices/modern/modern.component.ts
similarity index 100%
rename from src/app/main/content/pages/invoices/modern/modern.component.ts
rename to src/app/main/pages/invoices/modern/modern.component.ts
diff --git a/src/app/main/content/pages/invoices/modern/modern.module.ts b/src/app/main/pages/invoices/modern/modern.module.ts
similarity index 100%
rename from src/app/main/content/pages/invoices/modern/modern.module.ts
rename to src/app/main/pages/invoices/modern/modern.module.ts
diff --git a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html b/src/app/main/pages/knowledge-base/dialogs/article/article.component.html
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html
rename to src/app/main/pages/knowledge-base/dialogs/article/article.component.html
diff --git a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.scss b/src/app/main/pages/knowledge-base/dialogs/article/article.component.scss
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/dialogs/article/article.component.scss
rename to src/app/main/pages/knowledge-base/dialogs/article/article.component.scss
diff --git a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.ts b/src/app/main/pages/knowledge-base/dialogs/article/article.component.ts
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/dialogs/article/article.component.ts
rename to src/app/main/pages/knowledge-base/dialogs/article/article.component.ts
diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.component.html b/src/app/main/pages/knowledge-base/knowledge-base.component.html
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/knowledge-base.component.html
rename to src/app/main/pages/knowledge-base/knowledge-base.component.html
diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.component.scss b/src/app/main/pages/knowledge-base/knowledge-base.component.scss
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/knowledge-base.component.scss
rename to src/app/main/pages/knowledge-base/knowledge-base.component.scss
diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.component.ts b/src/app/main/pages/knowledge-base/knowledge-base.component.ts
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/knowledge-base.component.ts
rename to src/app/main/pages/knowledge-base/knowledge-base.component.ts
diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts b/src/app/main/pages/knowledge-base/knowledge-base.module.ts
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/knowledge-base.module.ts
rename to src/app/main/pages/knowledge-base/knowledge-base.module.ts
diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.service.ts b/src/app/main/pages/knowledge-base/knowledge-base.service.ts
similarity index 100%
rename from src/app/main/content/pages/knowledge-base/knowledge-base.service.ts
rename to src/app/main/pages/knowledge-base/knowledge-base.service.ts
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.html b/src/app/main/pages/maintenance/maintenance.component.html
similarity index 100%
rename from src/app/main/content/pages/maintenance/maintenance.component.html
rename to src/app/main/pages/maintenance/maintenance.component.html
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.scss b/src/app/main/pages/maintenance/maintenance.component.scss
similarity index 100%
rename from src/app/main/content/pages/maintenance/maintenance.component.scss
rename to src/app/main/pages/maintenance/maintenance.component.scss
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.ts b/src/app/main/pages/maintenance/maintenance.component.ts
similarity index 100%
rename from src/app/main/content/pages/maintenance/maintenance.component.ts
rename to src/app/main/pages/maintenance/maintenance.component.ts
diff --git a/src/app/main/content/pages/maintenance/maintenence.module.ts b/src/app/main/pages/maintenance/maintenence.module.ts
similarity index 100%
rename from src/app/main/content/pages/maintenance/maintenence.module.ts
rename to src/app/main/pages/maintenance/maintenence.module.ts
diff --git a/src/app/main/content/pages/pages.module.ts b/src/app/main/pages/pages.module.ts
similarity index 100%
rename from src/app/main/content/pages/pages.module.ts
rename to src/app/main/pages/pages.module.ts
diff --git a/src/app/main/content/pages/pricing/pricing.module.ts b/src/app/main/pages/pricing/pricing.module.ts
similarity index 100%
rename from src/app/main/content/pages/pricing/pricing.module.ts
rename to src/app/main/pages/pricing/pricing.module.ts
diff --git a/src/app/main/content/pages/pricing/style-1/style-1.component.html b/src/app/main/pages/pricing/style-1/style-1.component.html
similarity index 100%
rename from src/app/main/content/pages/pricing/style-1/style-1.component.html
rename to src/app/main/pages/pricing/style-1/style-1.component.html
diff --git a/src/app/main/content/pages/pricing/style-1/style-1.component.scss b/src/app/main/pages/pricing/style-1/style-1.component.scss
similarity index 100%
rename from src/app/main/content/pages/pricing/style-1/style-1.component.scss
rename to src/app/main/pages/pricing/style-1/style-1.component.scss
diff --git a/src/app/main/content/pages/pricing/style-1/style-1.component.ts b/src/app/main/pages/pricing/style-1/style-1.component.ts
similarity index 100%
rename from src/app/main/content/pages/pricing/style-1/style-1.component.ts
rename to src/app/main/pages/pricing/style-1/style-1.component.ts
diff --git a/src/app/main/content/pages/pricing/style-2/style-2.component.html b/src/app/main/pages/pricing/style-2/style-2.component.html
similarity index 100%
rename from src/app/main/content/pages/pricing/style-2/style-2.component.html
rename to src/app/main/pages/pricing/style-2/style-2.component.html
diff --git a/src/app/main/content/pages/pricing/style-2/style-2.component.scss b/src/app/main/pages/pricing/style-2/style-2.component.scss
similarity index 100%
rename from src/app/main/content/pages/pricing/style-2/style-2.component.scss
rename to src/app/main/pages/pricing/style-2/style-2.component.scss
diff --git a/src/app/main/content/pages/pricing/style-2/style-2.component.ts b/src/app/main/pages/pricing/style-2/style-2.component.ts
similarity index 100%
rename from src/app/main/content/pages/pricing/style-2/style-2.component.ts
rename to src/app/main/pages/pricing/style-2/style-2.component.ts
diff --git a/src/app/main/content/pages/pricing/style-3/style-3.component.html b/src/app/main/pages/pricing/style-3/style-3.component.html
similarity index 100%
rename from src/app/main/content/pages/pricing/style-3/style-3.component.html
rename to src/app/main/pages/pricing/style-3/style-3.component.html
diff --git a/src/app/main/content/pages/pricing/style-3/style-3.component.scss b/src/app/main/pages/pricing/style-3/style-3.component.scss
similarity index 100%
rename from src/app/main/content/pages/pricing/style-3/style-3.component.scss
rename to src/app/main/pages/pricing/style-3/style-3.component.scss
diff --git a/src/app/main/content/pages/pricing/style-3/style-3.component.ts b/src/app/main/pages/pricing/style-3/style-3.component.ts
similarity index 100%
rename from src/app/main/content/pages/pricing/style-3/style-3.component.ts
rename to src/app/main/pages/pricing/style-3/style-3.component.ts
diff --git a/src/app/main/content/pages/profile/profile.component.html b/src/app/main/pages/profile/profile.component.html
similarity index 100%
rename from src/app/main/content/pages/profile/profile.component.html
rename to src/app/main/pages/profile/profile.component.html
diff --git a/src/app/main/content/pages/profile/profile.component.scss b/src/app/main/pages/profile/profile.component.scss
similarity index 100%
rename from src/app/main/content/pages/profile/profile.component.scss
rename to src/app/main/pages/profile/profile.component.scss
diff --git a/src/app/main/content/pages/profile/profile.component.ts b/src/app/main/pages/profile/profile.component.ts
similarity index 100%
rename from src/app/main/content/pages/profile/profile.component.ts
rename to src/app/main/pages/profile/profile.component.ts
diff --git a/src/app/main/content/pages/profile/profile.module.ts b/src/app/main/pages/profile/profile.module.ts
similarity index 100%
rename from src/app/main/content/pages/profile/profile.module.ts
rename to src/app/main/pages/profile/profile.module.ts
diff --git a/src/app/main/content/pages/profile/profile.service.ts b/src/app/main/pages/profile/profile.service.ts
similarity index 100%
rename from src/app/main/content/pages/profile/profile.service.ts
rename to src/app/main/pages/profile/profile.service.ts
diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.html b/src/app/main/pages/profile/tabs/about/about.component.html
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/about/about.component.html
rename to src/app/main/pages/profile/tabs/about/about.component.html
diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.scss b/src/app/main/pages/profile/tabs/about/about.component.scss
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/about/about.component.scss
rename to src/app/main/pages/profile/tabs/about/about.component.scss
diff --git a/src/app/main/content/pages/profile/tabs/about/about.component.ts b/src/app/main/pages/profile/tabs/about/about.component.ts
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/about/about.component.ts
rename to src/app/main/pages/profile/tabs/about/about.component.ts
diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html b/src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.html
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html
rename to src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.html
diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss b/src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.scss
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.scss
rename to src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.scss
diff --git a/src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts b/src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.ts
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.ts
rename to src/app/main/pages/profile/tabs/photos-videos/photos-videos.component.ts
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/pages/profile/tabs/timeline/timeline.component.html
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
rename to src/app/main/pages/profile/tabs/timeline/timeline.component.html
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss b/src/app/main/pages/profile/tabs/timeline/timeline.component.scss
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/timeline/timeline.component.scss
rename to src/app/main/pages/profile/tabs/timeline/timeline.component.scss
diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts b/src/app/main/pages/profile/tabs/timeline/timeline.component.ts
similarity index 100%
rename from src/app/main/content/pages/profile/tabs/timeline/timeline.component.ts
rename to src/app/main/pages/profile/tabs/timeline/timeline.component.ts
diff --git a/src/app/main/content/pages/search/search.component.html b/src/app/main/pages/search/search.component.html
similarity index 100%
rename from src/app/main/content/pages/search/search.component.html
rename to src/app/main/pages/search/search.component.html
diff --git a/src/app/main/content/pages/search/search.component.scss b/src/app/main/pages/search/search.component.scss
similarity index 100%
rename from src/app/main/content/pages/search/search.component.scss
rename to src/app/main/pages/search/search.component.scss
diff --git a/src/app/main/content/pages/search/search.component.ts b/src/app/main/pages/search/search.component.ts
similarity index 100%
rename from src/app/main/content/pages/search/search.component.ts
rename to src/app/main/pages/search/search.component.ts
diff --git a/src/app/main/content/pages/search/search.module.ts b/src/app/main/pages/search/search.module.ts
similarity index 100%
rename from src/app/main/content/pages/search/search.module.ts
rename to src/app/main/pages/search/search.module.ts
diff --git a/src/app/main/content/pages/search/search.service.ts b/src/app/main/pages/search/search.service.ts
similarity index 100%
rename from src/app/main/content/pages/search/search.service.ts
rename to src/app/main/pages/search/search.service.ts
diff --git a/src/app/main/content/pages/search/tabs/classic/classic.component.html b/src/app/main/pages/search/tabs/classic/classic.component.html
similarity index 100%
rename from src/app/main/content/pages/search/tabs/classic/classic.component.html
rename to src/app/main/pages/search/tabs/classic/classic.component.html
diff --git a/src/app/main/content/pages/search/tabs/classic/classic.component.scss b/src/app/main/pages/search/tabs/classic/classic.component.scss
similarity index 100%
rename from src/app/main/content/pages/search/tabs/classic/classic.component.scss
rename to src/app/main/pages/search/tabs/classic/classic.component.scss
diff --git a/src/app/main/content/pages/search/tabs/classic/classic.component.ts b/src/app/main/pages/search/tabs/classic/classic.component.ts
similarity index 100%
rename from src/app/main/content/pages/search/tabs/classic/classic.component.ts
rename to src/app/main/pages/search/tabs/classic/classic.component.ts
diff --git a/src/app/main/content/pages/search/tabs/table/table.component.html b/src/app/main/pages/search/tabs/table/table.component.html
similarity index 100%
rename from src/app/main/content/pages/search/tabs/table/table.component.html
rename to src/app/main/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/pages/search/tabs/table/table.component.scss
similarity index 100%
rename from src/app/main/content/pages/search/tabs/table/table.component.scss
rename to src/app/main/pages/search/tabs/table/table.component.scss
diff --git a/src/app/main/content/pages/search/tabs/table/table.component.ts b/src/app/main/pages/search/tabs/table/table.component.ts
similarity index 100%
rename from src/app/main/content/pages/search/tabs/table/table.component.ts
rename to src/app/main/pages/search/tabs/table/table.component.ts
diff --git a/src/app/main/content/services/config/config.component.html b/src/app/main/services/config/config.component.html
similarity index 100%
rename from src/app/main/content/services/config/config.component.html
rename to src/app/main/services/config/config.component.html
diff --git a/src/app/main/content/services/config/config.component.scss b/src/app/main/services/config/config.component.scss
similarity index 100%
rename from src/app/main/content/services/config/config.component.scss
rename to src/app/main/services/config/config.component.scss
diff --git a/src/app/main/content/services/config/config.component.ts b/src/app/main/services/config/config.component.ts
similarity index 100%
rename from src/app/main/content/services/config/config.component.ts
rename to src/app/main/services/config/config.component.ts
diff --git a/src/app/main/content/services/services.module.ts b/src/app/main/services/services.module.ts
similarity index 100%
rename from src/app/main/content/services/services.module.ts
rename to src/app/main/services/services.module.ts
diff --git a/src/app/main/content/services/splash-screen/splash-screen.component.html b/src/app/main/services/splash-screen/splash-screen.component.html
similarity index 100%
rename from src/app/main/content/services/splash-screen/splash-screen.component.html
rename to src/app/main/services/splash-screen/splash-screen.component.html
diff --git a/src/app/main/content/services/splash-screen/splash-screen.component.scss b/src/app/main/services/splash-screen/splash-screen.component.scss
similarity index 100%
rename from src/app/main/content/services/splash-screen/splash-screen.component.scss
rename to src/app/main/services/splash-screen/splash-screen.component.scss
diff --git a/src/app/main/content/services/splash-screen/splash-screen.component.ts b/src/app/main/services/splash-screen/splash-screen.component.ts
similarity index 100%
rename from src/app/main/content/services/splash-screen/splash-screen.component.ts
rename to src/app/main/services/splash-screen/splash-screen.component.ts
diff --git a/src/app/main/content/ui/colors/colors.component.html b/src/app/main/ui/colors/colors.component.html
similarity index 100%
rename from src/app/main/content/ui/colors/colors.component.html
rename to src/app/main/ui/colors/colors.component.html
diff --git a/src/app/main/content/ui/colors/colors.component.scss b/src/app/main/ui/colors/colors.component.scss
similarity index 100%
rename from src/app/main/content/ui/colors/colors.component.scss
rename to src/app/main/ui/colors/colors.component.scss
diff --git a/src/app/main/content/ui/colors/colors.component.ts b/src/app/main/ui/colors/colors.component.ts
similarity index 100%
rename from src/app/main/content/ui/colors/colors.component.ts
rename to src/app/main/ui/colors/colors.component.ts
diff --git a/src/app/main/content/ui/colors/colors.module.ts b/src/app/main/ui/colors/colors.module.ts
similarity index 100%
rename from src/app/main/content/ui/colors/colors.module.ts
rename to src/app/main/ui/colors/colors.module.ts
diff --git a/src/app/main/content/ui/forms/forms.component.html b/src/app/main/ui/forms/forms.component.html
similarity index 100%
rename from src/app/main/content/ui/forms/forms.component.html
rename to src/app/main/ui/forms/forms.component.html
diff --git a/src/app/main/content/ui/forms/forms.component.scss b/src/app/main/ui/forms/forms.component.scss
similarity index 100%
rename from src/app/main/content/ui/forms/forms.component.scss
rename to src/app/main/ui/forms/forms.component.scss
diff --git a/src/app/main/content/ui/forms/forms.component.ts b/src/app/main/ui/forms/forms.component.ts
similarity index 100%
rename from src/app/main/content/ui/forms/forms.component.ts
rename to src/app/main/ui/forms/forms.component.ts
diff --git a/src/app/main/content/ui/forms/forms.module.ts b/src/app/main/ui/forms/forms.module.ts
similarity index 100%
rename from src/app/main/content/ui/forms/forms.module.ts
rename to src/app/main/ui/forms/forms.module.ts
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.component.html b/src/app/main/ui/helper-classes/helper-classes.component.html
similarity index 100%
rename from src/app/main/content/ui/helper-classes/helper-classes.component.html
rename to src/app/main/ui/helper-classes/helper-classes.component.html
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.component.scss b/src/app/main/ui/helper-classes/helper-classes.component.scss
similarity index 100%
rename from src/app/main/content/ui/helper-classes/helper-classes.component.scss
rename to src/app/main/ui/helper-classes/helper-classes.component.scss
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.component.ts b/src/app/main/ui/helper-classes/helper-classes.component.ts
similarity index 100%
rename from src/app/main/content/ui/helper-classes/helper-classes.component.ts
rename to src/app/main/ui/helper-classes/helper-classes.component.ts
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.module.ts b/src/app/main/ui/helper-classes/helper-classes.module.ts
similarity index 100%
rename from src/app/main/content/ui/helper-classes/helper-classes.module.ts
rename to src/app/main/ui/helper-classes/helper-classes.module.ts
diff --git a/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html b/src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.html
similarity index 100%
rename from src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html
rename to src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.html
diff --git a/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.scss b/src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.scss
similarity index 100%
rename from src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.scss
rename to src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.scss
diff --git a/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts b/src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts
similarity index 100%
rename from src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts
rename to src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts
diff --git a/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html b/src/app/main/ui/helper-classes/tabs/width-height/width-height.component.html
similarity index 100%
rename from src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html
rename to src/app/main/ui/helper-classes/tabs/width-height/width-height.component.html
diff --git a/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.scss b/src/app/main/ui/helper-classes/tabs/width-height/width-height.component.scss
similarity index 100%
rename from src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.scss
rename to src/app/main/ui/helper-classes/tabs/width-height/width-height.component.scss
diff --git a/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.ts b/src/app/main/ui/helper-classes/tabs/width-height/width-height.component.ts
similarity index 100%
rename from src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.ts
rename to src/app/main/ui/helper-classes/tabs/width-height/width-height.component.ts
diff --git a/src/app/main/content/ui/icons/icons.component.html b/src/app/main/ui/icons/icons.component.html
similarity index 100%
rename from src/app/main/content/ui/icons/icons.component.html
rename to src/app/main/ui/icons/icons.component.html
diff --git a/src/app/main/content/ui/icons/icons.component.scss b/src/app/main/ui/icons/icons.component.scss
similarity index 100%
rename from src/app/main/content/ui/icons/icons.component.scss
rename to src/app/main/ui/icons/icons.component.scss
diff --git a/src/app/main/content/ui/icons/icons.component.ts b/src/app/main/ui/icons/icons.component.ts
similarity index 100%
rename from src/app/main/content/ui/icons/icons.component.ts
rename to src/app/main/ui/icons/icons.component.ts
diff --git a/src/app/main/content/ui/icons/icons.module.ts b/src/app/main/ui/icons/icons.module.ts
similarity index 100%
rename from src/app/main/content/ui/icons/icons.module.ts
rename to src/app/main/ui/icons/icons.module.ts
diff --git a/src/app/main/content/ui/page-layouts/blank/blank.component.html b/src/app/main/ui/page-layouts/blank/blank.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/blank/blank.component.html
rename to src/app/main/ui/page-layouts/blank/blank.component.html
diff --git a/src/app/main/content/ui/page-layouts/blank/blank.component.scss b/src/app/main/ui/page-layouts/blank/blank.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/blank/blank.component.scss
rename to src/app/main/ui/page-layouts/blank/blank.component.scss
diff --git a/src/app/main/content/ui/page-layouts/blank/blank.component.ts b/src/app/main/ui/page-layouts/blank/blank.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/blank/blank.component.ts
rename to src/app/main/ui/page-layouts/blank/blank.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html b/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
rename to src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss b/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss
rename to src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts b/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts
rename to src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html b/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
rename to src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.scss b/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.scss
rename to src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.ts b/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.ts
rename to src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html
rename to src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.scss b/src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.scss
rename to src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts
rename to src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
rename to src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss b/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss
rename to src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts
rename to src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html
rename to src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.scss b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.scss
rename to src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts
rename to src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
rename to src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss b/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss
rename to src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts
rename to src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html
rename to src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.scss b/src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.scss
rename to src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts
rename to src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
rename to src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss
rename to src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts
rename to src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html
rename to src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.scss b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.scss
rename to src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts
rename to src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
rename to src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss b/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss
rename to src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.scss
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts
rename to src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts
diff --git a/src/app/main/content/ui/page-layouts/page-layouts.module.ts b/src/app/main/ui/page-layouts/page-layouts.module.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/page-layouts.module.ts
rename to src/app/main/ui/page-layouts/page-layouts.module.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html b/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
rename to src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.scss b/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.scss
rename to src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.ts b/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.ts
rename to src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
rename to src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss b/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss
rename to src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts b/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts
rename to src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
rename to src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss
rename to src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts
rename to src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
rename to src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss b/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss
rename to src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts b/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts
rename to src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
rename to src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss b/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss
rename to src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts b/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts
rename to src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
rename to src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss b/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss
rename to src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts b/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts
rename to src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
rename to src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss b/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss
rename to src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts b/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts
rename to src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts
diff --git a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html b/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.html
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
rename to src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.html
diff --git a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.scss b/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.scss
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.scss
rename to src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.scss
diff --git a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.ts b/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts
similarity index 100%
rename from src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.ts
rename to src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts
diff --git a/src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.html b/src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.html
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.html
rename to src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.html
diff --git a/src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.scss b/src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.scss
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.scss
rename to src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.scss
diff --git a/src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts b/src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts
rename to src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts
diff --git a/src/app/main/content/ui/typography/tabs/headings/headings.component.html b/src/app/main/ui/typography/tabs/headings/headings.component.html
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/headings/headings.component.html
rename to src/app/main/ui/typography/tabs/headings/headings.component.html
diff --git a/src/app/main/content/ui/typography/tabs/headings/headings.component.scss b/src/app/main/ui/typography/tabs/headings/headings.component.scss
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/headings/headings.component.scss
rename to src/app/main/ui/typography/tabs/headings/headings.component.scss
diff --git a/src/app/main/content/ui/typography/tabs/headings/headings.component.ts b/src/app/main/ui/typography/tabs/headings/headings.component.ts
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/headings/headings.component.ts
rename to src/app/main/ui/typography/tabs/headings/headings.component.ts
diff --git a/src/app/main/content/ui/typography/tabs/helpers/helpers.component.html b/src/app/main/ui/typography/tabs/helpers/helpers.component.html
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/helpers/helpers.component.html
rename to src/app/main/ui/typography/tabs/helpers/helpers.component.html
diff --git a/src/app/main/content/ui/typography/tabs/helpers/helpers.component.scss b/src/app/main/ui/typography/tabs/helpers/helpers.component.scss
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/helpers/helpers.component.scss
rename to src/app/main/ui/typography/tabs/helpers/helpers.component.scss
diff --git a/src/app/main/content/ui/typography/tabs/helpers/helpers.component.ts b/src/app/main/ui/typography/tabs/helpers/helpers.component.ts
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/helpers/helpers.component.ts
rename to src/app/main/ui/typography/tabs/helpers/helpers.component.ts
diff --git a/src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.html b/src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.html
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.html
rename to src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.html
diff --git a/src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.scss b/src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.scss
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.scss
rename to src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.scss
diff --git a/src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts b/src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts
similarity index 100%
rename from src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts
rename to src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts
diff --git a/src/app/main/content/ui/typography/typography.component.html b/src/app/main/ui/typography/typography.component.html
similarity index 100%
rename from src/app/main/content/ui/typography/typography.component.html
rename to src/app/main/ui/typography/typography.component.html
diff --git a/src/app/main/content/ui/typography/typography.component.scss b/src/app/main/ui/typography/typography.component.scss
similarity index 100%
rename from src/app/main/content/ui/typography/typography.component.scss
rename to src/app/main/ui/typography/typography.component.scss
diff --git a/src/app/main/content/ui/typography/typography.component.ts b/src/app/main/ui/typography/typography.component.ts
similarity index 100%
rename from src/app/main/content/ui/typography/typography.component.ts
rename to src/app/main/ui/typography/typography.component.ts
diff --git a/src/app/main/content/ui/typography/typography.module.ts b/src/app/main/ui/typography/typography.module.ts
similarity index 100%
rename from src/app/main/content/ui/typography/typography.module.ts
rename to src/app/main/ui/typography/typography.module.ts
diff --git a/src/app/main/content/ui/ui.module.ts b/src/app/main/ui/ui.module.ts
similarity index 100%
rename from src/app/main/content/ui/ui.module.ts
rename to src/app/main/ui/ui.module.ts