diff --git a/angular.json b/angular.json
index 4f9ad3dc..37ba479d 100644
--- a/angular.json
+++ b/angular.json
@@ -25,7 +25,7 @@
                         "assets": [
                             "src/favicon.ico",
                             "src/assets",
-                            "src/app/main/components/angular-material"
+                            "src/app/main/angular-material-elements"
                         ],
                         "styles": [
                             "src/styles.scss"
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 06374179..c1394600 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -34,16 +34,12 @@ const appRoutes: Routes = [
         loadChildren: './main/ui/ui.module#UIModule'
     },
     {
-        path        : 'services',
-        loadChildren: './main/services/services.module#ServicesModule'
+        path        : 'documentation',
+        loadChildren: './main/documentation/documentation.module#DocumentationModule'
     },
     {
-        path        : 'components',
-        loadChildren: './main/components/components.module#ComponentsModule'
-    },
-    {
-        path        : 'components-third-party',
-        loadChildren: './main/components-third-party/components-third-party.module#ComponentsThirdPartyModule'
+        path        : 'angular-material-elements',
+        loadChildren: './main/angular-material-elements/angular-material-elements.module#AngularMaterialElementsModule'
     },
     {
         path      : '**',
diff --git a/src/app/main/components/angular-material/angular-material-examples.component.html b/src/app/main/angular-material-elements/angular-material-elements.component.html
similarity index 86%
rename from src/app/main/components/angular-material/angular-material-examples.component.html
rename to src/app/main/angular-material-elements/angular-material-elements.component.html
index 2339f025..06e8b93c 100644
--- a/src/app/main/components/angular-material/angular-material-examples.component.html
+++ b/src/app/main/angular-material-elements/angular-material-elements.component.html
@@ -1,7 +1,8 @@
-<div class="page-layout simple fullwidth angular-material-element" fusePerfectScrollbar>
+<div class="page-layout simple fullwidth angular-material-elements">
 
     <!-- HEADER -->
-    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
+    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row"
+         fxLayoutAlign.gt-xs="space-between center">
 
         <div fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="column" fxLayoutAlign.gt-xs="center start">
             <div class="black-fg" fxLayout="row" fxLayoutAlign="start center">
@@ -14,7 +15,8 @@
             <div class="h2 mt-16">{{title}}</div>
         </div>
 
-        <a mat-raised-button class="reference-button mat-white-bg mt-16 mt-sm-0" href="https://material.angular.io/" target="_blank">
+        <a mat-raised-button class="reference-button mat-white-bg mt-16 mt-sm-0" href="https://material.angular.io/"
+           target="_blank">
             <mat-icon class="mr-8">link</mat-icon>
             <span>Reference</span>
         </a>
diff --git a/src/app/main/components/angular-material/angular-material-examples.component.scss b/src/app/main/angular-material-elements/angular-material-elements.component.scss
similarity index 70%
rename from src/app/main/components/angular-material/angular-material-examples.component.scss
rename to src/app/main/angular-material-elements/angular-material-elements.component.scss
index bf992809..a6a83d1f 100644
--- a/src/app/main/components/angular-material/angular-material-examples.component.scss
+++ b/src/app/main/angular-material-elements/angular-material-elements.component.scss
@@ -1,6 +1,6 @@
 :host {
 
-    .angular-material-element {
+    .angular-material-elements {
 
         > .content {
             max-width: 960px;
diff --git a/src/app/main/components/angular-material/angular-material-examples.component.ts b/src/app/main/angular-material-elements/angular-material-elements.component.ts
similarity index 81%
rename from src/app/main/components/angular-material/angular-material-examples.component.ts
rename to src/app/main/angular-material-elements/angular-material-elements.component.ts
index d8d34a26..2db4f309 100644
--- a/src/app/main/components/angular-material/angular-material-examples.component.ts
+++ b/src/app/main/angular-material-elements/angular-material-elements.component.ts
@@ -3,14 +3,14 @@ import { ActivatedRoute } from '@angular/router';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
-import { COMPONENT_MAP } from 'app/main/components/angular-material/example-components';
+import { COMPONENT_MAP } from 'app/main/angular-material-elements/example-components';
 
 @Component({
     selector   : 'angular-material',
-    templateUrl: './angular-material-examples.component.html',
-    styleUrls  : ['./angular-material-examples.component.scss']
+    templateUrl: './angular-material-elements.component.html',
+    styleUrls  : ['./angular-material-elements.component.scss']
 })
-export class AngularMaterialExamplesComponent implements OnInit, OnDestroy
+export class AngularMaterialElementsComponent implements OnInit, OnDestroy
 {
     id: string;
     title: string;
diff --git a/src/app/main/components/angular-material/angular-material-examples.module.ts b/src/app/main/angular-material-elements/angular-material-elements.module.ts
similarity index 51%
rename from src/app/main/components/angular-material/angular-material-examples.module.ts
rename to src/app/main/angular-material-elements/angular-material-elements.module.ts
index 3da6959e..d4ac41b4 100644
--- a/src/app/main/components/angular-material/angular-material-examples.module.ts
+++ b/src/app/main/angular-material-elements/angular-material-elements.module.ts
@@ -2,21 +2,21 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { FuseSharedModule } from '@fuse/shared.module';
-import { FuseHighlightModule } from '@fuse/components';
+import { FuseHighlightModule } from '@fuse/components/index';
 import { FuseWidgetModule } from '@fuse/components/widget/widget.module';
 
-import { MaterialModule } from 'app/main/components/angular-material/material.module';
-import { EXAMPLE_LIST } from 'app/main/components/angular-material/example-components';
-import { AngularMaterialExamplesComponent } from 'app/main/components/angular-material/angular-material-examples.component';
-import { ExampleViewerComponent } from 'app/main/components/angular-material/example-viewer/example-viewer';
+import { MaterialModule } from 'app/main/angular-material-elements/material.module';
+import { EXAMPLE_LIST } from 'app/main/angular-material-elements/example-components';
+import { AngularMaterialElementsComponent } from 'app/main/angular-material-elements/angular-material-elements.component';
+import { ExampleViewerComponent } from 'app/main/angular-material-elements/example-viewer/example-viewer';
 
 const routes: Routes = [
     {
-        path    : 'angular-material',
+        path    : '',
         children: [
             {
                 path     : ':id',
-                component: AngularMaterialExamplesComponent
+                component: AngularMaterialElementsComponent
             }
         ]
     }
@@ -25,7 +25,7 @@ const routes: Routes = [
 @NgModule({
     declarations   : [
         [...EXAMPLE_LIST],
-        AngularMaterialExamplesComponent,
+        AngularMaterialElementsComponent,
         ExampleViewerComponent
     ],
     imports        : [
@@ -39,7 +39,7 @@ const routes: Routes = [
     ],
     entryComponents: EXAMPLE_LIST,
 })
-export class AngularMaterialExamplesModule
+export class AngularMaterialElementsModule
 {
 }
 
diff --git a/src/app/main/components/angular-material/example-components.ts b/src/app/main/angular-material-elements/example-components.ts
similarity index 100%
rename from src/app/main/components/angular-material/example-components.ts
rename to src/app/main/angular-material-elements/example-components.ts
diff --git a/src/app/main/components/angular-material/example-viewer/example-viewer.html b/src/app/main/angular-material-elements/example-viewer/example-viewer.html
similarity index 100%
rename from src/app/main/components/angular-material/example-viewer/example-viewer.html
rename to src/app/main/angular-material-elements/example-viewer/example-viewer.html
diff --git a/src/app/main/components/angular-material/example-viewer/example-viewer.scss b/src/app/main/angular-material-elements/example-viewer/example-viewer.scss
similarity index 97%
rename from src/app/main/components/angular-material/example-viewer/example-viewer.scss
rename to src/app/main/angular-material-elements/example-viewer/example-viewer.scss
index 244aed9c..096de499 100644
--- a/src/app/main/components/angular-material/example-viewer/example-viewer.scss
+++ b/src/app/main/angular-material-elements/example-viewer/example-viewer.scss
@@ -1,4 +1,4 @@
-@import "src/@fuse/scss/fuse";
+@import "../../../../@fuse/scss/fuse";
 
 example-viewer {
     display: block;
diff --git a/src/app/main/components/angular-material/example-viewer/example-viewer.ts b/src/app/main/angular-material-elements/example-viewer/example-viewer.ts
similarity index 96%
rename from src/app/main/components/angular-material/example-viewer/example-viewer.ts
rename to src/app/main/angular-material-elements/example-viewer/example-viewer.ts
index 8bbfac1c..1f76b447 100644
--- a/src/app/main/components/angular-material/example-viewer/example-viewer.ts
+++ b/src/app/main/angular-material-elements/example-viewer/example-viewer.ts
@@ -3,10 +3,10 @@ import { MatSnackBar } from '@angular/material';
 import 'prismjs/components/prism-scss';
 import 'prismjs/components/prism-typescript';
 
-import { fuseAnimations } from '@fuse/animations';
+import { fuseAnimations } from '@fuse/animations/index';
 import { FuseCopierService } from '@fuse/services/copier.service';
 
-import { EXAMPLE_COMPONENTS } from 'app/main/components/angular-material/example-components';
+import { EXAMPLE_COMPONENTS } from 'app/main/angular-material-elements/example-components';
 
 export interface LiveExample
 {
diff --git a/src/app/main/components/angular-material/material.module.ts b/src/app/main/angular-material-elements/material.module.ts
similarity index 100%
rename from src/app/main/components/angular-material/material.module.ts
rename to src/app/main/angular-material-elements/material.module.ts
diff --git a/src/app/main/components-third-party/components-third-party.module.ts b/src/app/main/documentation/components-third-party/components-third-party.module.ts
similarity index 76%
rename from src/app/main/components-third-party/components-third-party.module.ts
rename to src/app/main/documentation/components-third-party/components-third-party.module.ts
index 028e8771..8d756afe 100644
--- a/src/app/main/components-third-party/components-third-party.module.ts
+++ b/src/app/main/documentation/components-third-party/components-third-party.module.ts
@@ -5,8 +5,8 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable';
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
-import { GoogleMapsModule } from 'app/main/components-third-party/google-maps/google-maps.module';
-import { NgxDatatableDocsComponent } from 'app/main/components-third-party/datatable/ngx-datatable.component';
+import { GoogleMapsModule } from 'app/main/documentation/components-third-party/google-maps/google-maps.module';
+import { NgxDatatableDocsComponent } from 'app/main/documentation/components-third-party/datatable/ngx-datatable.component';
 
 const routes = [
     {
diff --git a/src/app/main/components-third-party/datatable/ngx-datatable.component.html b/src/app/main/documentation/components-third-party/datatable/ngx-datatable.component.html
similarity index 94%
rename from src/app/main/components-third-party/datatable/ngx-datatable.component.html
rename to src/app/main/documentation/components-third-party/datatable/ngx-datatable.component.html
index 93c23710..397162a2 100644
--- a/src/app/main/components-third-party/datatable/ngx-datatable.component.html
+++ b/src/app/main/documentation/components-third-party/datatable/ngx-datatable.component.html
@@ -1,7 +1,8 @@
-<div id="ngx-datatable" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="ngx-datatable" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
-    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
+    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row"
+         fxLayoutAlign.gt-xs="space-between center">
         <div fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="column" fxLayoutAlign.gt-xs="center start">
             <div class="black-fg" fxLayout="row" fxLayoutAlign="start center">
                 <mat-icon class="secondary-text s-16">home</mat-icon>
diff --git a/src/app/main/components-third-party/datatable/ngx-datatable.component.scss b/src/app/main/documentation/components-third-party/datatable/ngx-datatable.component.scss
similarity index 100%
rename from src/app/main/components-third-party/datatable/ngx-datatable.component.scss
rename to src/app/main/documentation/components-third-party/datatable/ngx-datatable.component.scss
diff --git a/src/app/main/components-third-party/datatable/ngx-datatable.component.ts b/src/app/main/documentation/components-third-party/datatable/ngx-datatable.component.ts
similarity index 100%
rename from src/app/main/components-third-party/datatable/ngx-datatable.component.ts
rename to src/app/main/documentation/components-third-party/datatable/ngx-datatable.component.ts
diff --git a/src/app/main/components-third-party/google-maps/google-maps.component.html b/src/app/main/documentation/components-third-party/google-maps/google-maps.component.html
similarity index 92%
rename from src/app/main/components-third-party/google-maps/google-maps.component.html
rename to src/app/main/documentation/components-third-party/google-maps/google-maps.component.html
index 9f9fe7b5..5b6891c3 100644
--- a/src/app/main/components-third-party/google-maps/google-maps.component.html
+++ b/src/app/main/documentation/components-third-party/google-maps/google-maps.component.html
@@ -1,7 +1,8 @@
-<div id="countdown" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="countdown" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
-    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
+    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row"
+         fxLayoutAlign.gt-xs="space-between center">
         <div fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="column" fxLayoutAlign.gt-xs="center start">
             <div class="black-fg" fxLayout="row" fxLayoutAlign="start center">
                 <mat-icon class="secondary-text s-16">home</mat-icon>
diff --git a/src/app/main/components-third-party/google-maps/google-maps.component.scss b/src/app/main/documentation/components-third-party/google-maps/google-maps.component.scss
similarity index 100%
rename from src/app/main/components-third-party/google-maps/google-maps.component.scss
rename to src/app/main/documentation/components-third-party/google-maps/google-maps.component.scss
diff --git a/src/app/main/components-third-party/google-maps/google-maps.component.ts b/src/app/main/documentation/components-third-party/google-maps/google-maps.component.ts
similarity index 100%
rename from src/app/main/components-third-party/google-maps/google-maps.component.ts
rename to src/app/main/documentation/components-third-party/google-maps/google-maps.component.ts
diff --git a/src/app/main/components-third-party/google-maps/google-maps.module.ts b/src/app/main/documentation/components-third-party/google-maps/google-maps.module.ts
similarity index 93%
rename from src/app/main/components-third-party/google-maps/google-maps.module.ts
rename to src/app/main/documentation/components-third-party/google-maps/google-maps.module.ts
index a47d10d3..5c750539 100644
--- a/src/app/main/components-third-party/google-maps/google-maps.module.ts
+++ b/src/app/main/documentation/components-third-party/google-maps/google-maps.module.ts
@@ -6,7 +6,7 @@ import { MatButtonModule, MatIconModule } from '@angular/material';
 import { AgmCoreModule } from '@agm/core';
 
 import { FuseSharedModule } from '@fuse/shared.module';
-import { FuseHighlightModule } from '@fuse/components';
+import { FuseHighlightModule } from '@fuse/components/index';
 
 import { GoogleMapsDocsComponent } from './google-maps.component';
 
diff --git a/src/app/main/components/cards/cards.component.html b/src/app/main/documentation/components/cards/cards.component.html
similarity index 99%
rename from src/app/main/components/cards/cards.component.html
rename to src/app/main/documentation/components/cards/cards.component.html
index 8b50a74e..45f7315e 100644
--- a/src/app/main/components/cards/cards.component.html
+++ b/src/app/main/documentation/components/cards/cards.component.html
@@ -1,4 +1,4 @@
-<div id="cards" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="cards" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/components/cards/cards.component.scss b/src/app/main/documentation/components/cards/cards.component.scss
similarity index 100%
rename from src/app/main/components/cards/cards.component.scss
rename to src/app/main/documentation/components/cards/cards.component.scss
diff --git a/src/app/main/components/cards/cards.component.ts b/src/app/main/documentation/components/cards/cards.component.ts
similarity index 99%
rename from src/app/main/components/cards/cards.component.ts
rename to src/app/main/documentation/components/cards/cards.component.ts
index 4f0578b9..2bc1036b 100644
--- a/src/app/main/components/cards/cards.component.ts
+++ b/src/app/main/documentation/components/cards/cards.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import * as shape from 'd3-shape';
 
-import { fuseAnimations } from '@fuse/animations';
+import { fuseAnimations } from '@fuse/animations/index';
 
 @Component({
     selector   : 'cards-docs',
diff --git a/src/app/main/components/components.module.ts b/src/app/main/documentation/components/components.module.ts
similarity index 65%
rename from src/app/main/components/components.module.ts
rename to src/app/main/documentation/components/components.module.ts
index 9e4e3717..f36c34a8 100644
--- a/src/app/main/components/components.module.ts
+++ b/src/app/main/documentation/components/components.module.ts
@@ -5,19 +5,17 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { FuseSharedModule } from '@fuse/shared.module';
 
-import { AngularMaterialExamplesModule } from 'app/main/components/angular-material/angular-material-examples.module';
-
-import { FuseCountdownModule, FuseHighlightModule, FuseMaterialColorPickerModule, FuseWidgetModule } from '@fuse/components';
-import { CardsDocsComponent } from 'app/main/components/cards/cards.component';
-import { CountdownDocsComponent } from 'app/main/components/countdown/countdown.component';
-import { HighlightDocsComponent } from 'app/main/components/highlight/highlight.component';
-import { MaterialColorPickerDocsComponent } from 'app/main/components/material-color-picker/material-color-picker.component';
-import { MultiLanguageDocsComponent } from 'app/main/components/multi-language/multi-language.component';
-import { NavigationDocsComponent } from 'app/main/components/navigation/navigation.component';
-import { SearchBarDocsComponent } from 'app/main/components/search-bar/search-bar.component';
-import { SidebarDocsComponent } from 'app/main/components/sidebar/sidebar.component';
-import { ShortcutsDocsComponent } from 'app/main/components/shortcuts/shortcuts.component';
-import { WidgetDocsComponent } from 'app/main/components/widget/widget.component';
+import { FuseCountdownModule, FuseHighlightModule, FuseMaterialColorPickerModule, FuseWidgetModule } from '@fuse/components/index';
+import { CardsDocsComponent } from 'app/main/documentation/components/cards/cards.component';
+import { CountdownDocsComponent } from 'app/main/documentation/components/countdown/countdown.component';
+import { HighlightDocsComponent } from 'app/main/documentation/components/highlight/highlight.component';
+import { MaterialColorPickerDocsComponent } from 'app/main/documentation/components/material-color-picker/material-color-picker.component';
+import { MultiLanguageDocsComponent } from 'app/main/documentation/components/multi-language/multi-language.component';
+import { NavigationDocsComponent } from 'app/main/documentation/components/navigation/navigation.component';
+import { SearchBarDocsComponent } from 'app/main/documentation/components/search-bar/search-bar.component';
+import { SidebarDocsComponent } from 'app/main/documentation/components/sidebar/sidebar.component';
+import { ShortcutsDocsComponent } from 'app/main/documentation/components/shortcuts/shortcuts.component';
+import { WidgetDocsComponent } from 'app/main/documentation/components/widget/widget.component';
 
 const routes = [
     {
@@ -95,9 +93,7 @@ const routes = [
         FuseCountdownModule,
         FuseHighlightModule,
         FuseMaterialColorPickerModule,
-        FuseWidgetModule,
-
-        AngularMaterialExamplesModule
+        FuseWidgetModule
     ]
 })
 export class ComponentsModule
diff --git a/src/app/main/components/countdown/countdown.component.html b/src/app/main/documentation/components/countdown/countdown.component.html
similarity index 95%
rename from src/app/main/components/countdown/countdown.component.html
rename to src/app/main/documentation/components/countdown/countdown.component.html
index bffd539c..26aa888c 100644
--- a/src/app/main/components/countdown/countdown.component.html
+++ b/src/app/main/documentation/components/countdown/countdown.component.html
@@ -1,4 +1,4 @@
-<div id="countdown" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="countdown" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/countdown/countdown.component.scss b/src/app/main/documentation/components/countdown/countdown.component.scss
similarity index 100%
rename from src/app/main/components/countdown/countdown.component.scss
rename to src/app/main/documentation/components/countdown/countdown.component.scss
diff --git a/src/app/main/components/countdown/countdown.component.ts b/src/app/main/documentation/components/countdown/countdown.component.ts
similarity index 100%
rename from src/app/main/components/countdown/countdown.component.ts
rename to src/app/main/documentation/components/countdown/countdown.component.ts
diff --git a/src/app/main/components/highlight/highlight.component.html b/src/app/main/documentation/components/highlight/highlight.component.html
similarity index 96%
rename from src/app/main/components/highlight/highlight.component.html
rename to src/app/main/documentation/components/highlight/highlight.component.html
index 175abdb0..231f83ef 100644
--- a/src/app/main/components/highlight/highlight.component.html
+++ b/src/app/main/documentation/components/highlight/highlight.component.html
@@ -1,4 +1,4 @@
-<div id="highlight" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="highlight" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/highlight/highlight.component.scss b/src/app/main/documentation/components/highlight/highlight.component.scss
similarity index 100%
rename from src/app/main/components/highlight/highlight.component.scss
rename to src/app/main/documentation/components/highlight/highlight.component.scss
diff --git a/src/app/main/components/highlight/highlight.component.ts b/src/app/main/documentation/components/highlight/highlight.component.ts
similarity index 100%
rename from src/app/main/components/highlight/highlight.component.ts
rename to src/app/main/documentation/components/highlight/highlight.component.ts
diff --git a/src/app/main/components/material-color-picker/material-color-picker.component.html b/src/app/main/documentation/components/material-color-picker/material-color-picker.component.html
similarity index 99%
rename from src/app/main/components/material-color-picker/material-color-picker.component.html
rename to src/app/main/documentation/components/material-color-picker/material-color-picker.component.html
index d27ee235..07382997 100644
--- a/src/app/main/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/main/documentation/components/material-color-picker/material-color-picker.component.html
@@ -1,4 +1,4 @@
-<div id="material-color-picker" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="material-color-picker" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/material-color-picker/material-color-picker.component.scss b/src/app/main/documentation/components/material-color-picker/material-color-picker.component.scss
similarity index 100%
rename from src/app/main/components/material-color-picker/material-color-picker.component.scss
rename to src/app/main/documentation/components/material-color-picker/material-color-picker.component.scss
diff --git a/src/app/main/components/material-color-picker/material-color-picker.component.ts b/src/app/main/documentation/components/material-color-picker/material-color-picker.component.ts
similarity index 100%
rename from src/app/main/components/material-color-picker/material-color-picker.component.ts
rename to src/app/main/documentation/components/material-color-picker/material-color-picker.component.ts
diff --git a/src/app/main/components/multi-language/multi-language.component.html b/src/app/main/documentation/components/multi-language/multi-language.component.html
similarity index 98%
rename from src/app/main/components/multi-language/multi-language.component.html
rename to src/app/main/documentation/components/multi-language/multi-language.component.html
index 5032fe83..4308d6d9 100644
--- a/src/app/main/components/multi-language/multi-language.component.html
+++ b/src/app/main/documentation/components/multi-language/multi-language.component.html
@@ -1,4 +1,4 @@
-<div id="multi-language" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="multi-language" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/multi-language/multi-language.component.scss b/src/app/main/documentation/components/multi-language/multi-language.component.scss
similarity index 100%
rename from src/app/main/components/multi-language/multi-language.component.scss
rename to src/app/main/documentation/components/multi-language/multi-language.component.scss
diff --git a/src/app/main/components/multi-language/multi-language.component.ts b/src/app/main/documentation/components/multi-language/multi-language.component.ts
similarity index 100%
rename from src/app/main/components/multi-language/multi-language.component.ts
rename to src/app/main/documentation/components/multi-language/multi-language.component.ts
diff --git a/src/app/main/components/navigation/navigation.component.html b/src/app/main/documentation/components/navigation/navigation.component.html
similarity index 99%
rename from src/app/main/components/navigation/navigation.component.html
rename to src/app/main/documentation/components/navigation/navigation.component.html
index 25f6d333..52d327fc 100644
--- a/src/app/main/components/navigation/navigation.component.html
+++ b/src/app/main/documentation/components/navigation/navigation.component.html
@@ -1,4 +1,4 @@
-<div id="navigation" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="navigation" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/navigation/navigation.component.scss b/src/app/main/documentation/components/navigation/navigation.component.scss
similarity index 100%
rename from src/app/main/components/navigation/navigation.component.scss
rename to src/app/main/documentation/components/navigation/navigation.component.scss
diff --git a/src/app/main/components/navigation/navigation.component.ts b/src/app/main/documentation/components/navigation/navigation.component.ts
similarity index 100%
rename from src/app/main/components/navigation/navigation.component.ts
rename to src/app/main/documentation/components/navigation/navigation.component.ts
diff --git a/src/app/main/components/search-bar/search-bar.component.html b/src/app/main/documentation/components/search-bar/search-bar.component.html
similarity index 95%
rename from src/app/main/components/search-bar/search-bar.component.html
rename to src/app/main/documentation/components/search-bar/search-bar.component.html
index bd0f5ab9..bcf31bd2 100644
--- a/src/app/main/components/search-bar/search-bar.component.html
+++ b/src/app/main/documentation/components/search-bar/search-bar.component.html
@@ -1,4 +1,4 @@
-<div id="search-bar" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="search-bar" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/search-bar/search-bar.component.scss b/src/app/main/documentation/components/search-bar/search-bar.component.scss
similarity index 100%
rename from src/app/main/components/search-bar/search-bar.component.scss
rename to src/app/main/documentation/components/search-bar/search-bar.component.scss
diff --git a/src/app/main/components/search-bar/search-bar.component.ts b/src/app/main/documentation/components/search-bar/search-bar.component.ts
similarity index 100%
rename from src/app/main/components/search-bar/search-bar.component.ts
rename to src/app/main/documentation/components/search-bar/search-bar.component.ts
diff --git a/src/app/main/components/shortcuts/shortcuts.component.html b/src/app/main/documentation/components/shortcuts/shortcuts.component.html
similarity index 95%
rename from src/app/main/components/shortcuts/shortcuts.component.html
rename to src/app/main/documentation/components/shortcuts/shortcuts.component.html
index 2e8c87eb..b7289064 100644
--- a/src/app/main/components/shortcuts/shortcuts.component.html
+++ b/src/app/main/documentation/components/shortcuts/shortcuts.component.html
@@ -1,4 +1,4 @@
-<div id="shortcuts" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="shortcuts" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/shortcuts/shortcuts.component.scss b/src/app/main/documentation/components/shortcuts/shortcuts.component.scss
similarity index 100%
rename from src/app/main/components/shortcuts/shortcuts.component.scss
rename to src/app/main/documentation/components/shortcuts/shortcuts.component.scss
diff --git a/src/app/main/components/shortcuts/shortcuts.component.ts b/src/app/main/documentation/components/shortcuts/shortcuts.component.ts
similarity index 100%
rename from src/app/main/components/shortcuts/shortcuts.component.ts
rename to src/app/main/documentation/components/shortcuts/shortcuts.component.ts
diff --git a/src/app/main/components/sidebar/sidebar.component.html b/src/app/main/documentation/components/sidebar/sidebar.component.html
similarity index 96%
rename from src/app/main/components/sidebar/sidebar.component.html
rename to src/app/main/documentation/components/sidebar/sidebar.component.html
index 5091261a..d57af7c8 100644
--- a/src/app/main/components/sidebar/sidebar.component.html
+++ b/src/app/main/documentation/components/sidebar/sidebar.component.html
@@ -1,4 +1,4 @@
-<div id="sidebar" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="sidebar" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/sidebar/sidebar.component.scss b/src/app/main/documentation/components/sidebar/sidebar.component.scss
similarity index 100%
rename from src/app/main/components/sidebar/sidebar.component.scss
rename to src/app/main/documentation/components/sidebar/sidebar.component.scss
diff --git a/src/app/main/components/sidebar/sidebar.component.ts b/src/app/main/documentation/components/sidebar/sidebar.component.ts
similarity index 100%
rename from src/app/main/components/sidebar/sidebar.component.ts
rename to src/app/main/documentation/components/sidebar/sidebar.component.ts
diff --git a/src/app/main/components/widget/widget.component.html b/src/app/main/documentation/components/widget/widget.component.html
similarity index 98%
rename from src/app/main/components/widget/widget.component.html
rename to src/app/main/documentation/components/widget/widget.component.html
index a8b2f951..9b7d1afd 100644
--- a/src/app/main/components/widget/widget.component.html
+++ b/src/app/main/documentation/components/widget/widget.component.html
@@ -1,4 +1,4 @@
-<div id="widget" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="widget" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/components/widget/widget.component.scss b/src/app/main/documentation/components/widget/widget.component.scss
similarity index 100%
rename from src/app/main/components/widget/widget.component.scss
rename to src/app/main/documentation/components/widget/widget.component.scss
diff --git a/src/app/main/components/widget/widget.component.ts b/src/app/main/documentation/components/widget/widget.component.ts
similarity index 100%
rename from src/app/main/components/widget/widget.component.ts
rename to src/app/main/documentation/components/widget/widget.component.ts
diff --git a/src/app/main/documentation/documentation.module.ts b/src/app/main/documentation/documentation.module.ts
new file mode 100644
index 00000000..c1e8af71
--- /dev/null
+++ b/src/app/main/documentation/documentation.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+
+import { RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [
+    {
+        path        : 'components',
+        loadChildren: './components/components.module#ComponentsModule'
+    },
+    {
+        path        : 'components-third-party',
+        loadChildren: './components-third-party/components-third-party.module#ComponentsThirdPartyModule'
+    },
+    {
+        path        : 'services',
+        loadChildren: './services/services.module#ServicesModule'
+    }
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ]
+})
+export class DocumentationModule
+{
+}
diff --git a/src/app/main/services/config/config.component.html b/src/app/main/documentation/services/config/config.component.html
similarity index 97%
rename from src/app/main/services/config/config.component.html
rename to src/app/main/documentation/services/config/config.component.html
index f7006f05..625ebb15 100644
--- a/src/app/main/services/config/config.component.html
+++ b/src/app/main/documentation/services/config/config.component.html
@@ -1,4 +1,4 @@
-<div id="config" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="config" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/services/config/config.component.scss b/src/app/main/documentation/services/config/config.component.scss
similarity index 100%
rename from src/app/main/services/config/config.component.scss
rename to src/app/main/documentation/services/config/config.component.scss
diff --git a/src/app/main/services/config/config.component.ts b/src/app/main/documentation/services/config/config.component.ts
similarity index 100%
rename from src/app/main/services/config/config.component.ts
rename to src/app/main/documentation/services/config/config.component.ts
diff --git a/src/app/main/services/services.module.ts b/src/app/main/documentation/services/services.module.ts
similarity index 71%
rename from src/app/main/services/services.module.ts
rename to src/app/main/documentation/services/services.module.ts
index d4a4d036..75a16b06 100644
--- a/src/app/main/services/services.module.ts
+++ b/src/app/main/documentation/services/services.module.ts
@@ -3,10 +3,10 @@ import { RouterModule } from '@angular/router';
 import { MatIconModule } from '@angular/material';
 
 import { FuseSharedModule } from '@fuse/shared.module';
-import { FuseHighlightModule } from '@fuse/components';
+import { FuseHighlightModule } from '@fuse/components/index';
 
-import { ConfigServiceDocsComponent } from 'app/main/services/config/config.component';
-import { SplashScreenServiceDocsComponent } from 'app/main/services/splash-screen/splash-screen.component';
+import { ConfigServiceDocsComponent } from 'app/main/documentation/services/config/config.component';
+import { SplashScreenServiceDocsComponent } from 'app/main/documentation/services/splash-screen/splash-screen.component';
 
 const routes = [
     {
diff --git a/src/app/main/services/splash-screen/splash-screen.component.html b/src/app/main/documentation/services/splash-screen/splash-screen.component.html
similarity index 95%
rename from src/app/main/services/splash-screen/splash-screen.component.html
rename to src/app/main/documentation/services/splash-screen/splash-screen.component.html
index 8b72d5ef..bfcfa493 100644
--- a/src/app/main/services/splash-screen/splash-screen.component.html
+++ b/src/app/main/documentation/services/splash-screen/splash-screen.component.html
@@ -1,4 +1,4 @@
-<div id="splash-screen" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="splash-screen" class="page-layout simple fullwidth">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/services/splash-screen/splash-screen.component.scss b/src/app/main/documentation/services/splash-screen/splash-screen.component.scss
similarity index 100%
rename from src/app/main/services/splash-screen/splash-screen.component.scss
rename to src/app/main/documentation/services/splash-screen/splash-screen.component.scss
diff --git a/src/app/main/services/splash-screen/splash-screen.component.ts b/src/app/main/documentation/services/splash-screen/splash-screen.component.ts
similarity index 100%
rename from src/app/main/services/splash-screen/splash-screen.component.ts
rename to src/app/main/documentation/services/splash-screen/splash-screen.component.ts
diff --git a/src/app/main/ui/colors/colors.component.html b/src/app/main/ui/colors/colors.component.html
index 9c11ccf5..3e58a926 100644
--- a/src/app/main/ui/colors/colors.component.html
+++ b/src/app/main/ui/colors/colors.component.html
@@ -1,7 +1,8 @@
-<div id="material-colors" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
+<div id="material-colors" class="page-layout simple tabbed" fxLayout="column">
 
     <!-- HEADER -->
-    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
+    <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row"
+         fxLayoutAlign.gt-xs="space-between center">
 
         <div fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="column" fxLayoutAlign.gt-xs="center start">
             <div class="black-fg" fxLayout="row" fxLayoutAlign="start center">
@@ -76,7 +77,8 @@
                 </div>
             </div>
 
-            <div class="color" fxLayout="column" fxFlex="1 0 auto" *ngIf="selectedColor != 'black' && selectedColor != 'white'">
+            <div class="color" fxLayout="column" fxFlex="1 0 auto"
+                 *ngIf="selectedColor != 'black' && selectedColor != 'white'">
 
                 <div class="colored-bg p-8"
                      *ngFor="let hue of ['50','100','200','300','400','500','600','700','800','900','A100','A200','A400','A700']"
diff --git a/src/app/main/ui/colors/colors.component.scss b/src/app/main/ui/colors/colors.component.scss
index b05c10da..fa80e445 100644
--- a/src/app/main/ui/colors/colors.component.scss
+++ b/src/app/main/ui/colors/colors.component.scss
@@ -2,14 +2,6 @@
 
     .content {
 
-        .color-tabs {
-
-            .mat-tab-body {
-
-            }
-
-        }
-
         .color-tabs-content {
 
             .color {
diff --git a/src/app/main/ui/forms/forms.component.html b/src/app/main/ui/forms/forms.component.html
index 4a342bfe..2454284e 100644
--- a/src/app/main/ui/forms/forms.component.html
+++ b/src/app/main/ui/forms/forms.component.html
@@ -1,4 +1,4 @@
-<div id="forms" class="page-layout simple fullwidth" fxLayout="column" fusePerfectScrollbar>
+<div id="forms" class="page-layout simple fullwidth" fxLayout="column">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/ui/helper-classes/helper-classes.component.html b/src/app/main/ui/helper-classes/helper-classes.component.html
index a470baa4..54db7757 100644
--- a/src/app/main/ui/helper-classes/helper-classes.component.html
+++ b/src/app/main/ui/helper-classes/helper-classes.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/ui/icons/icons.component.html b/src/app/main/ui/icons/icons.component.html
index e8e02e4c..886eaa7b 100644
--- a/src/app/main/ui/icons/icons.component.html
+++ b/src/app/main/ui/icons/icons.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-xs="row"
diff --git a/src/app/main/ui/typography/typography.component.html b/src/app/main/ui/typography/typography.component.html
index 7762f434..094dc755 100644
--- a/src/app/main/ui/typography/typography.component.html
+++ b/src/app/main/ui/typography/typography.component.html
@@ -1,4 +1,4 @@
-<div id="typography" class="page-layout simple tabbed" fxLayout="column" fusePerfectScrollbar>
+<div id="typography" class="page-layout simple tabbed" fxLayout="column">
 
     <!-- HEADER -->
     <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts
index c5abfdc2..e02ec9af 100644
--- a/src/app/navigation/navigation.ts
+++ b/src/app/navigation/navigation.ts
@@ -571,7 +571,7 @@ export const navigation: FuseNavigation[] = [
         ]
     },
     {
-        id      : 'angular-material-elements',
+        id      : 'angular-material-elements-elements',
         title   : 'Angular Material Elements',
         type    : 'group',
         children: [
@@ -585,55 +585,55 @@ export const navigation: FuseNavigation[] = [
                         id   : 'autocomplete',
                         title: 'Autocomplete',
                         type : 'item',
-                        url  : '/components/angular-material/autocomplete'
+                        url  : '/angular-material-elements/autocomplete'
                     },
                     {
                         id   : 'checkbox',
                         title: 'Checkbox',
                         type : 'item',
-                        url  : '/components/angular-material/checkbox'
+                        url  : '/angular-material-elements/checkbox'
                     },
                     {
                         id   : 'datepicker',
                         title: 'Datepicker',
                         type : 'item',
-                        url  : '/components/angular-material/datepicker'
+                        url  : '/angular-material-elements/datepicker'
                     },
                     {
                         id   : 'form-field',
                         title: 'Form field',
                         type : 'item',
-                        url  : '/components/angular-material/form-field'
+                        url  : '/angular-material-elements/form-field'
                     },
                     {
                         id   : 'input',
                         title: 'Input',
                         type : 'item',
-                        url  : '/components/angular-material/input'
+                        url  : '/angular-material-elements/input'
                     },
                     {
                         id   : 'radio-button',
                         title: 'Radio button',
                         type : 'item',
-                        url  : '/components/angular-material/radio-button'
+                        url  : '/angular-material-elements/radio-button'
                     },
                     {
                         id   : 'select',
                         title: 'Select',
                         type : 'item',
-                        url  : '/components/angular-material/select'
+                        url  : '/angular-material-elements/select'
                     },
                     {
                         id   : 'slider',
                         title: 'Slider',
                         type : 'item',
-                        url  : '/components/angular-material/slider'
+                        url  : '/angular-material-elements/slider'
                     },
                     {
                         id   : 'slide-toggle',
                         title: 'Slide toggle',
                         type : 'item',
-                        url  : '/components/angular-material/slide-toggle'
+                        url  : '/angular-material-elements/slide-toggle'
                     }
                 ]
             },
@@ -647,19 +647,19 @@ export const navigation: FuseNavigation[] = [
                         id   : 'menu',
                         title: 'Menu',
                         type : 'item',
-                        url  : '/components/angular-material/menu'
+                        url  : '/angular-material-elements/menu'
                     },
                     {
                         id   : 'sidenav',
                         title: 'Sidebar',
                         type : 'item',
-                        url  : '/components/angular-material/sidenav'
+                        url  : '/angular-material-elements/sidenav'
                     },
                     {
                         id   : 'toolbar',
                         title: 'Toolbar',
                         type : 'item',
-                        url  : '/components/angular-material/toolbar'
+                        url  : '/angular-material-elements/toolbar'
                     }
                 ]
             },
@@ -673,67 +673,67 @@ export const navigation: FuseNavigation[] = [
                         id   : 'badge',
                         title: 'Badge',
                         type : 'item',
-                        url  : '/components/angular-material/badge'
+                        url  : '/angular-material-elements/badge'
                     },
                     {
                         id   : 'bottom-sheet',
                         title: 'Bottom Sheet',
                         type : 'item',
-                        url  : '/components/angular-material/bottom-sheet'
+                        url  : '/angular-material-elements/bottom-sheet'
                     },
                     {
                         id   : 'card',
                         title: 'Card',
                         type : 'item',
-                        url  : '/components/angular-material/card'
+                        url  : '/angular-material-elements/card'
                     },
                     {
                         id   : 'divider',
                         title: 'Divider',
                         type : 'item',
-                        url  : '/components/angular-material/divider'
+                        url  : '/angular-material-elements/divider'
                     },
                     {
                         id   : 'elevation',
                         title: 'Elevation',
                         type : 'item',
-                        url  : '/components/angular-material/elevation'
+                        url  : '/angular-material-elements/elevation'
                     },
                     {
                         id   : 'expansion-panel',
                         title: 'Expansion Panel',
                         type : 'item',
-                        url  : '/components/angular-material/expansion-panel'
+                        url  : '/angular-material-elements/expansion-panel'
                     },
                     {
                         id   : 'grid-list',
                         title: 'Grid list',
                         type : 'item',
-                        url  : '/components/angular-material/grid-list'
+                        url  : '/angular-material-elements/grid-list'
                     },
                     {
                         id   : 'list',
                         title: 'List',
                         type : 'item',
-                        url  : '/components/angular-material/list'
+                        url  : '/angular-material-elements/list'
                     },
                     {
                         id   : 'stepper',
                         title: 'Stepper',
                         type : 'item',
-                        url  : '/components/angular-material/stepper'
+                        url  : '/angular-material-elements/stepper'
                     },
                     {
                         id   : 'tabs',
                         title: 'Tabs',
                         type : 'item',
-                        url  : '/components/angular-material/tabs'
+                        url  : '/angular-material-elements/tabs'
                     },
                     {
                         id   : 'tree',
                         title: 'Tree',
                         type : 'item',
-                        url  : '/components/angular-material/tree'
+                        url  : '/angular-material-elements/tree'
                     }
                 ]
             },
@@ -747,37 +747,37 @@ export const navigation: FuseNavigation[] = [
                         id   : 'button',
                         title: 'Button',
                         type : 'item',
-                        url  : '/components/angular-material/button'
+                        url  : '/angular-material-elements/button'
                     },
                     {
                         id   : 'button-toggle',
                         title: 'Button toggle',
                         type : 'item',
-                        url  : '/components/angular-material/button-toggle'
+                        url  : '/angular-material-elements/button-toggle'
                     },
                     {
                         id   : 'chips',
                         title: 'Chips',
                         type : 'item',
-                        url  : '/components/angular-material/chips'
+                        url  : '/angular-material-elements/chips'
                     },
                     {
                         id   : 'icon',
                         title: 'icon',
                         type : 'item',
-                        url  : '/components/angular-material/icon'
+                        url  : '/angular-material-elements/icon'
                     },
                     {
                         id   : 'progress-spinner',
                         title: 'Progress spinner',
                         type : 'item',
-                        url  : '/components/angular-material/progress-spinner'
+                        url  : '/angular-material-elements/progress-spinner'
                     },
                     {
                         id   : 'progress-bar',
                         title: 'Progress bar',
                         type : 'item',
-                        url  : '/components/angular-material/progress-bar'
+                        url  : '/angular-material-elements/progress-bar'
                     }
                 ]
             },
@@ -791,19 +791,19 @@ export const navigation: FuseNavigation[] = [
                         id   : 'dialog',
                         title: 'Dialog',
                         type : 'item',
-                        url  : '/components/angular-material/dialog'
+                        url  : '/angular-material-elements/dialog'
                     },
                     {
                         id   : 'snackbar',
                         title: 'Snackbar',
                         type : 'item',
-                        url  : '/components/angular-material/snackbar'
+                        url  : '/angular-material-elements/snackbar'
                     },
                     {
                         id   : 'tooltip',
                         title: 'Tooltip',
                         type : 'item',
-                        url  : '/components/angular-material/tooltip'
+                        url  : '/angular-material-elements/tooltip'
                     }
                 ]
             },
@@ -817,151 +817,253 @@ export const navigation: FuseNavigation[] = [
                         id   : 'paginator',
                         title: 'Paginator',
                         type : 'item',
-                        url  : '/components/angular-material/paginator'
+                        url  : '/angular-material-elements/paginator'
                     },
                     {
                         id   : 'sort-header',
                         title: 'Sort header',
                         type : 'item',
-                        url  : '/components/angular-material/sort-header'
+                        url  : '/angular-material-elements/sort-header'
                     },
                     {
                         id   : 'table',
                         title: 'Table',
                         type : 'item',
-                        url  : '/components/angular-material/table'
+                        url  : '/angular-material-elements/table'
                     }
                 ]
             }
         ]
     },
     {
-        id      : 'components',
-        title   : 'Components',
+        id      : 'documentation',
+        title   : 'Documentation',
         type    : 'group',
-        icon    : 'settings_input_component',
         children: [
             {
-                id   : 'cards',
-                title: 'Cards',
+                id   : 'changelog',
+                title: 'Changelog',
                 type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/cards'
+                icon : 'update',
+                url  : '/documentation/changelog',
+                badge    : {
+                    title    : '6.1.0',
+                    bg       : '#EC0C8E',
+                    fg       : '#FFFFFF'
+                }
             },
             {
-                id   : 'countdown',
-                title: 'Countdown',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/countdown'
-            },
-            {
-                id   : 'highlight',
-                title: 'Highlight',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/highlight'
-            },
-            {
-                id   : 'material-color-picker',
-                title: 'Material Color Picker',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/material-color-picker'
-            },
-            {
-                id   : 'multi-language',
-                title: 'Multi Language',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/multi-language'
-            },
-            {
-                id   : 'navigation',
-                title: 'Navigation',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/navigation'
-            },
-            {
-                id   : 'search-bar',
-                title: 'Search Bar',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/search-bar'
-            },
-            {
-                id   : 'sidebar',
-                title: 'Sidebar',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/sidebar'
-            },
-            {
-                id   : 'shortcuts',
-                title: 'Shortcuts',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/shortcuts'
-            },
-            {
-                id   : 'widget',
-                title: 'Widget',
-                type : 'item',
-                icon : 'settings_input_component',
-                url  : '/components/widget'
-            }
-        ]
-    },
-    {
-        id      : '3rd-party-components',
-        title   : '3rd Party components',
-        type    : 'group',
-        icon    : 'settings_input_component',
-        children: [
-            {
-                id      : 'datatables',
-                title   : 'Datatables',
+                id      : 'getting-started',
+                title   : 'Getting Started',
                 type    : 'collapsable',
-                icon    : 'border_all',
+                icon    : 'import_contacts',
                 children: [
                     {
-                        id   : 'ngxdatatable',
-                        title: 'ngx-datatable',
+                        id   : 'introduction',
+                        title: 'Introduction',
                         type : 'item',
-                        url  : '/components-third-party/datatables/ngx-datatable'
+                        url  : '/documentation/getting-started/introduction'
+                    },
+                    {
+                        id   : 'installation',
+                        title: 'Installation',
+                        type : 'item',
+                        url  : '/documentation/getting-started/installation'
                     }
                 ]
             },
             {
-                id   : 'google-maps',
-                title: 'Google Maps',
-                type : 'item',
-                icon : 'place',
-                url  : '/components-third-party/google-maps'
-            }
-        ]
-    },
-    {
-        id      : 'services',
-        title   : 'Services',
-        type    : 'group',
-        icon    : 'settings',
-        children: [
-            {
-                id   : 'config',
-                title: 'Config',
-                type : 'item',
-                icon : 'settings',
-                url  : '/services/config'
+                id      : 'working-with-fuse',
+                title   : 'Working with Fuse',
+                type    : 'collapsable',
+                icon    : 'import_contacts',
+                children: [
+                    {
+                        id   : 'server',
+                        title: 'Server',
+                        type : 'item',
+                        url  : '/documentation/working-with-fuse/server'
+                    },
+                    {
+                        id   : 'production',
+                        title: 'Production',
+                        type : 'item',
+                        url  : '/documentation/working-with-fuse/production'
+                    },
+                    {
+                        id   : 'directory-structure',
+                        title: 'Directory structure',
+                        type : 'item',
+                        url  : '/documentation/working-with-fuse/directory-structure'
+                    },
+                    {
+                        id   : 'updating-fuse',
+                        title: 'Updating Fuse',
+                        type : 'item',
+                        url  : '/documentation/working-with-fuse/directory-structure'
+                    },
+                    {
+                        id   : 'template-layouts',
+                        title: 'Template Layouts',
+                        type : 'item',
+                        url  : '/documentation/working-with-fuse/template-layouts'
+                    },
+                    {
+                        id   : 'page-layouts',
+                        title: 'Page Layouts',
+                        type : 'item',
+                        url  : '/documentation/working-with-fuse/page-layouts'
+                    }
+                ]
             },
             {
-                id   : 'splash-screen',
-                title: 'Splash Screen',
-                type : 'item',
-                icon : 'settings',
-                url  : '/services/splash-screen'
+                id      : 'components',
+                title   : 'Components',
+                type    : 'collapsable',
+                icon    : 'import_contacts',
+                children: [
+                    {
+                        id   : 'cards',
+                        title: 'Cards',
+                        type : 'item',
+                        url  : '/documentation/components/cards'
+                    },
+                    {
+                        id   : 'countdown',
+                        title: 'Countdown',
+                        type : 'item',
+                        url  : '/documentation/components/countdown'
+                    },
+                    {
+                        id   : 'highlight',
+                        title: 'Highlight',
+                        type : 'item',
+                        url  : '/documentation/components/highlight'
+                    },
+                    {
+                        id   : 'material-color-picker',
+                        title: 'Material Color Picker',
+                        type : 'item',
+                        url  : '/documentation/components/material-color-picker'
+                    },
+                    {
+                        id   : 'multi-language',
+                        title: 'Multi Language',
+                        type : 'item',
+                        url  : '/documentation/components/multi-language'
+                    },
+                    {
+                        id   : 'navigation',
+                        title: 'Navigation',
+                        type : 'item',
+                        url  : '/documentation/components/navigation'
+                    },
+                    {
+                        id   : 'search-bar',
+                        title: 'Search Bar',
+                        type : 'item',
+                        url  : '/documentation/components/search-bar'
+                    },
+                    {
+                        id   : 'sidebar',
+                        title: 'Sidebar',
+                        type : 'item',
+                        url  : '/documentation/components/sidebar'
+                    },
+                    {
+                        id   : 'shortcuts',
+                        title: 'Shortcuts',
+                        type : 'item',
+                        url  : '/documentation/components/shortcuts'
+                    },
+                    {
+                        id   : 'widget',
+                        title: 'Widget',
+                        type : 'item',
+                        url  : '/documentation/components/widget'
+                    }
+                ]
+            },
+            {
+                id      : '3rd-party-components',
+                title   : '3rd Party components',
+                type    : 'collapsable',
+                icon    : 'import_contacts',
+                children: [
+                    {
+                        id      : 'datatables',
+                        title   : 'Datatables',
+                        type    : 'collapsable',
+                        children: [
+                            {
+                                id   : 'ngxdatatable',
+                                title: 'ngx-datatable',
+                                type : 'item',
+                                url  : '/documentation/components-third-party/datatables/ngx-datatable'
+                            }
+                        ]
+                    },
+                    {
+                        id   : 'google-maps',
+                        title: 'Google Maps',
+                        type : 'item',
+                        url  : '/documentation/components-third-party/google-maps'
+                    }
+                ]
+            },
+            {
+                id      : 'directives',
+                title   : 'Directives',
+                type    : 'collapsable',
+                icon    : 'import_contacts',
+                children: [
+                    {
+                        id   : 'fuse-if-on-dom',
+                        title: 'fuseIfOnDom',
+                        type : 'item',
+                        url  : '/documentation/directives/fuse-if-on-dom'
+                    },
+                    {
+                        id   : 'fuse-inner-scroll',
+                        title: 'fuseInnerScroll',
+                        type : 'item',
+                        url  : '/documentation/directives/fuse-inner-scroll'
+                    },
+                    {
+                        id   : 'fuse-mat-sidenav',
+                        title: 'fuseMatSidenav',
+                        type : 'item',
+                        url  : '/documentation/directives/fuse-mat-sidenav'
+                    },
+                    {
+                        id   : 'fuse-perfect-scrollbar',
+                        title: 'fusePerfectScrollbar',
+                        type : 'item',
+                        url  : '/documentation/directives/fuse-perfect-scrollbar'
+                    }
+                ]
+            },
+            {
+                id      : 'services',
+                title   : 'Services',
+                type    : 'collapsable',
+                icon    : 'import_contacts',
+                children: [
+                    {
+                        id   : 'config',
+                        title: 'Config',
+                        type : 'item',
+                        url  : '/documentation/services/config'
+                    },
+                    {
+                        id   : 'splash-screen',
+                        title: 'Splash Screen',
+                        type : 'item',
+                        url  : '/documentation/services/splash-screen'
+                    }
+                ]
             }
         ]
     }
+
 ];