diff --git a/src/app/demo/domain/customer.ts b/src/app/api/customer.ts
similarity index 100%
rename from src/app/demo/domain/customer.ts
rename to src/app/api/customer.ts
diff --git a/src/app/demo/domain/image.ts b/src/app/api/image.ts
similarity index 100%
rename from src/app/demo/domain/image.ts
rename to src/app/api/image.ts
diff --git a/src/app/demo/domain/product.ts b/src/app/api/product.ts
similarity index 100%
rename from src/app/demo/domain/product.ts
rename to src/app/api/product.ts
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 601dc5a..a21a601 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,56 +1,57 @@
 import {RouterModule} from '@angular/router';
 import {NgModule} from '@angular/core';
-import {DashboardDemoComponent} from './demo/view/dashboarddemo.component';
-import {FormLayoutDemoComponent} from './demo/view/formlayoutdemo.component';
-import {PanelsDemoComponent} from './demo/view/panelsdemo.component';
-import {OverlaysDemoComponent} from './demo/view/overlaysdemo.component';
-import {MediaDemoComponent} from './demo/view/mediademo.component';
-import {MessagesDemoComponent} from './demo/view/messagesdemo.component';
-import {MiscDemoComponent} from './demo/view/miscdemo.component';
-import {EmptyDemoComponent} from './demo/view/emptydemo.component';
-import {ChartsDemoComponent} from './demo/view/chartsdemo.component';
-import {FileDemoComponent} from './demo/view/filedemo.component';
-import {DocumentationComponent} from './demo/view/documentation.component';
+import {DashboardComponent} from './components/dashboard/dashboard.component';
+import {FormLayoutComponent} from './components/formlayout/formlayout.component';
+import {PanelsComponent} from './components/panels/panels.component';
+import {OverlaysComponent} from './components/overlays/overlays.component';
+import {MediaComponent} from './components/media/media.component';
+import {MessagesComponent} from './components/messages/messages.component';
+import {MiscComponent} from './components/misc/misc.component';
+import {EmptyComponent} from './components/empty/empty.component';
+import {ChartsComponent} from './components/charts/charts.component';
+import {FileComponent} from './components/file/file.component';
+import {DocumentationComponent} from './components/documentation/documentation.component';
 import {AppMainComponent} from './app.main.component';
-import {InputDemoComponent} from './demo/view/inputdemo.component';
-import {ButtonDemoComponent} from './demo/view/buttondemo.component';
-import {TableDemoComponent} from './demo/view/tabledemo.component';
-import {ListDemoComponent} from './demo/view/listdemo.component';
-import {TreeDemoComponent} from './demo/view/treedemo.component';
-import {AppCrudComponent} from './pages/app.crud.component';
-import {AppBlocksDemoComponent} from './demo/view/app.blocksdemo.component';
-import {FloatLabelDemoComponent} from './demo/view/floatlabeldemo.component';
-import {InvalidStateDemoComponent} from './demo/view/invalidstatedemo.component';
-import {AppTimelineDemoComponent} from './pages/app.timelinedemo.component';
-import {IconsDemoComponent} from './demo/view/iconsdemo.component';
+import {InputComponent} from './components/input/input.component';
+import {ButtonComponent} from './components/button/button.component';
+import {TableComponent} from './components/table/table.component';
+import {ListComponent} from './components/list/list.component';
+import {TreeComponent} from './components/tree/tree.component';
+import {CrudComponent} from './components/crud/crud.component';
+import {AppBlocksComponent} from './components/app-blocks/app-blocks.component';
+import {FloatLabelComponent} from './components/floatlabel/floatlabel.component';
+import {InvalidStateComponent} from './components/invalidstate/invalidstate.component';
+import {TimelineComponent} from './components/timeline/timeline.component';
+import {IconsComponent} from './components/icons/icons.component';
+import {MenusComponent} from './components/menus/menus.component';
 @NgModule({
     imports: [
         RouterModule.forRoot([
             {
                 path: '', component: AppMainComponent,
                 children: [
-                    {path: '', component: DashboardDemoComponent},
-                    {path: 'uikit/formlayout', component: FormLayoutDemoComponent},
-                    {path: 'uikit/input', component: InputDemoComponent},
-                    {path: 'uikit/floatlabel', component: FloatLabelDemoComponent},
-                    {path: 'uikit/invalidstate', component: InvalidStateDemoComponent},
-                    {path: 'uikit/button', component: ButtonDemoComponent},
-                    {path: 'uikit/table', component: TableDemoComponent},
-                    {path: 'uikit/list', component: ListDemoComponent},
-                    {path: 'uikit/tree', component: TreeDemoComponent},
-                    {path: 'uikit/panel', component: PanelsDemoComponent},
-                    {path: 'uikit/overlay', component: OverlaysDemoComponent},
-                    {path: 'uikit/media', component: MediaDemoComponent},
-                    {path: 'uikit/menu', loadChildren: () => import('./demo/view/menu/menudemo.module').then(m => m.MenudemoModule)},
-                    {path: 'uikit/message', component: MessagesDemoComponent},
-                    {path: 'uikit/misc', component: MiscDemoComponent},
-                    {path: 'uikit/charts', component: ChartsDemoComponent},
-                    {path: 'uikit/file', component: FileDemoComponent},
-                    {path: 'pages/crud', component: AppCrudComponent},
-                    {path: 'pages/timeline', component: AppTimelineDemoComponent},
-                    {path: 'pages/empty', component: EmptyDemoComponent},
-                    {path: 'icons', component: IconsDemoComponent},
-                    {path: 'blocks', component: AppBlocksDemoComponent},
+                    {path: '', component: DashboardComponent},
+                    {path: 'uikit/formlayout', component: FormLayoutComponent},
+                    {path: 'uikit/input', component: InputComponent},
+                    {path: 'uikit/floatlabel', component: FloatLabelComponent},
+                    {path: 'uikit/invalidstate', component: InvalidStateComponent},
+                    {path: 'uikit/button', component: ButtonComponent},
+                    {path: 'uikit/table', component: TableComponent},
+                    {path: 'uikit/list', component: ListComponent},
+                    {path: 'uikit/tree', component: TreeComponent},
+                    {path: 'uikit/panel', component: PanelsComponent},
+                    {path: 'uikit/overlay', component: OverlaysComponent},
+                    {path: 'uikit/media', component: MediaComponent},
+                    {path: 'uikit/menu', component: MenusComponent},
+                    {path: 'uikit/message', component: MessagesComponent},
+                    {path: 'uikit/misc', component: MiscComponent},
+                    {path: 'uikit/charts', component: ChartsComponent},
+                    {path: 'uikit/file', component: FileComponent},
+                    {path: 'pages/crud', component: CrudComponent},
+                    {path: 'pages/timeline', component: TimelineComponent},
+                    {path: 'pages/empty', component: EmptyComponent},
+                    {path: 'icons', component: IconsComponent},
+                    {path: 'blocks', component: AppBlocksComponent},
                     {path: 'documentation', component: DocumentationComponent}
                 ]
             },
diff --git a/src/app/app.menuitem.component.ts b/src/app/app.menuitem.component.ts
index 047b304..9222c33 100644
--- a/src/app/app.menuitem.component.ts
+++ b/src/app/app.menuitem.component.ts
@@ -3,7 +3,7 @@ import {NavigationEnd, Router} from '@angular/router';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {Subscription} from 'rxjs';
 import {filter} from 'rxjs/operators';
-import {MenuService} from './app.menu.service';
+import {MenuService} from './service/app.menu.service';
 import {AppMainComponent} from './app.main.component';
 
 @Component({
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5578196..54ea0c5 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -86,9 +86,9 @@ import {TreeModule} from 'primeng/tree';
 import {TreeSelectModule} from 'primeng/treeselect';
 import {TreeTableModule} from 'primeng/treetable';
 import {VirtualScrollerModule} from 'primeng/virtualscroller';
-import {BlockViewer} from './app.blockviewer.component'
+import {BlockViewer} from './components/app-blockviewer/app.blockviewer.component';
 
-import {AppCodeModule} from './app.code.component';
+import {AppCodeModule} from './components/app-code/app.code.component';
 import {AppComponent} from './app.component';
 import {AppMainComponent} from './app.main.component';
 import {AppTopBarComponent} from './app.topbar.component';
@@ -96,42 +96,38 @@ import {AppFooterComponent} from './app.footer.component';
 import {AppConfigComponent} from './app.config.component';
 import {AppMenuComponent} from './app.menu.component';
 import {AppMenuitemComponent} from './app.menuitem.component';
-import {DashboardDemoComponent} from './demo/view/dashboarddemo.component';
-import {FormLayoutDemoComponent} from './demo/view/formlayoutdemo.component';
-import {FloatLabelDemoComponent} from './demo/view/floatlabeldemo.component';
-import {InvalidStateDemoComponent} from './demo/view/invalidstatedemo.component';
-import {InputDemoComponent} from './demo/view/inputdemo.component';
-import {ButtonDemoComponent} from './demo/view/buttondemo.component';
-import {TableDemoComponent} from './demo/view/tabledemo.component';
-import {ListDemoComponent} from './demo/view/listdemo.component';
-import {TreeDemoComponent} from './demo/view/treedemo.component';
-import {PanelsDemoComponent} from './demo/view/panelsdemo.component';
-import {OverlaysDemoComponent} from './demo/view/overlaysdemo.component';
-import {MediaDemoComponent} from './demo/view/mediademo.component';
-import {MenusDemoComponent} from './demo/view/menusdemo.component';
-import {MessagesDemoComponent} from './demo/view/messagesdemo.component';
-import {MiscDemoComponent} from './demo/view/miscdemo.component';
-import {EmptyDemoComponent} from './demo/view/emptydemo.component';
-import {ChartsDemoComponent} from './demo/view/chartsdemo.component';
-import {FileDemoComponent} from './demo/view/filedemo.component';
-import {DocumentationComponent} from './demo/view/documentation.component';
-import {AppCrudComponent} from './pages/app.crud.component';
-import {AppTimelineDemoComponent} from './pages/app.timelinedemo.component';
-import {IconsDemoComponent} from './demo/view/iconsdemo.component';
-import {AppBlocksDemoComponent} from './demo/view/app.blocksdemo.component';
-import {SeatDemoComponent} from './demo/view/menu/seatdemo.component';
-import {PaymentDemoComponent} from './demo/view/menu/paymentdemo.component';
-import {PersonalDemoComponent} from './demo/view/menu/personaldemo.component';
-import {ConfirmationDemoComponent} from './demo/view/menu/confirmationdemo.component';
+import {DashboardComponent} from './components/dashboard/dashboard.component';
+import {FormLayoutComponent} from './components/formlayout/formlayout.component';
+import {FloatLabelComponent} from './components/floatlabel/floatlabel.component';
+import {InvalidStateComponent} from './components/invalidstate/invalidstate.component';
+import {InputComponent} from './components/input/input.component';
+import {ButtonComponent} from './components/button/button.component';
+import {TableComponent} from './components/table/table.component';
+import {ListComponent} from './components/list/list.component';
+import {TreeComponent} from './components/tree/tree.component';
+import {PanelsComponent} from './components/panels/panels.component';
+import {OverlaysComponent} from './components/overlays/overlays.component';
+import {MediaComponent} from './components/media/media.component';
+import {MenusComponent} from './components/menus/menus.component';
+import {MessagesComponent} from './components/messages/messages.component';
+import {MiscComponent} from './components/misc/misc.component';
+import {EmptyComponent} from './components/empty/empty.component';
+import {ChartsComponent} from './components/charts/charts.component';
+import {FileComponent} from './components/file/file.component';
+import {DocumentationComponent} from './components/documentation/documentation.component';
+import {CrudComponent} from './components/crud/crud.component';
+import {TimelineComponent} from './components/timeline/timeline.component';
+import {IconsComponent} from './components/icons/icons.component';
+import {AppBlocksComponent} from './components/app-blocks/app-blocks.component';
 
-import {CountryService} from './demo/service/countryservice';
-import {CustomerService} from './demo/service/customerservice';
-import {EventService} from './demo/service/eventservice';
-import {IconService} from './demo/service/iconservice';
-import {NodeService} from './demo/service/nodeservice';
-import {PhotoService} from './demo/service/photoservice';
-import {ProductService} from './demo/service/productservice';
-import {MenuService} from './app.menu.service';
+import {CountryService} from './service/countryservice';
+import {CustomerService} from './service/customerservice';
+import {EventService} from './service/eventservice';
+import {IconService} from './service/iconservice';
+import {NodeService} from './service/nodeservice';
+import {PhotoService} from './service/photoservice';
+import {ProductService} from './service/productservice';
+import {MenuService} from './service/app.menu.service';
 
 @NgModule({
     imports: [
@@ -230,35 +226,35 @@ import {MenuService} from './app.menu.service';
         AppConfigComponent,
         AppMenuComponent,
         AppMenuitemComponent,
-        DashboardDemoComponent,
-        FormLayoutDemoComponent,
-        FloatLabelDemoComponent,
-        InvalidStateDemoComponent,
-        InputDemoComponent,
-        ButtonDemoComponent,
-        TableDemoComponent,
-        ListDemoComponent,
-        TreeDemoComponent,
-        PanelsDemoComponent,
-        OverlaysDemoComponent,
-        MenusDemoComponent,
-        MessagesDemoComponent,
-        MessagesDemoComponent,
-        MiscDemoComponent,
-        ChartsDemoComponent,
-        EmptyDemoComponent,
-        FileDemoComponent,
-        IconsDemoComponent,
+        DashboardComponent,
+        FormLayoutComponent,
+        FloatLabelComponent,
+        InvalidStateComponent,
+        InputComponent,
+        ButtonComponent,
+        TableComponent,
+        ListComponent,
+        TreeComponent,
+        PanelsComponent,
+        OverlaysComponent,
+        MenusComponent,
+        MessagesComponent,
+        MessagesComponent,
+        MiscComponent,
+        ChartsComponent,
+        EmptyComponent,
+        FileComponent,
+        IconsComponent,
         DocumentationComponent,
-        AppCrudComponent,
-        AppTimelineDemoComponent,
-        AppBlocksDemoComponent,
+        CrudComponent,
+        TimelineComponent,
+        AppBlocksComponent,
         BlockViewer,
-        SeatDemoComponent,
-        PaymentDemoComponent,
-        PersonalDemoComponent,
-        ConfirmationDemoComponent,
-        MediaDemoComponent
+        // SeatDemoComponent,
+        // PaymentDemoComponent,
+        // PersonalDemoComponent,
+        // ConfirmationDemoComponent,
+        MediaComponent
     ],
     providers: [
         {provide: LocationStrategy, useClass: HashLocationStrategy},
diff --git a/src/app/demo/view/app.blocksdemo.component.html b/src/app/components/app-blocks/app-blocks.component.html
similarity index 100%
rename from src/app/demo/view/app.blocksdemo.component.html
rename to src/app/components/app-blocks/app-blocks.component.html
diff --git a/src/app/demo/view/app.blocksdemo.component.ts b/src/app/components/app-blocks/app-blocks.component.ts
similarity index 99%
rename from src/app/demo/view/app.blocksdemo.component.ts
rename to src/app/components/app-blocks/app-blocks.component.ts
index c4dba54..61b473b 100644
--- a/src/app/demo/view/app.blocksdemo.component.ts
+++ b/src/app/components/app-blocks/app-blocks.component.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 
 @Component({
-  templateUrl: './app.blocksdemo.component.html'
+  templateUrl: './app-blocks.component.html'
 })
-export class AppBlocksDemoComponent{
+export class AppBlocksComponent{
 
   block1: string = `
   <div class="grid grid-nogutter surface-section text-800">
diff --git a/src/app/app.blockviewer.component.scss b/src/app/components/app-blockviewer/app.blockviewer.component.scss
similarity index 100%
rename from src/app/app.blockviewer.component.scss
rename to src/app/components/app-blockviewer/app.blockviewer.component.scss
diff --git a/src/app/app.blockviewer.component.ts b/src/app/components/app-blockviewer/app.blockviewer.component.ts
similarity index 97%
rename from src/app/app.blockviewer.component.ts
rename to src/app/components/app-blockviewer/app.blockviewer.component.ts
index 64f7692..266a322 100644
--- a/src/app/app.blockviewer.component.ts
+++ b/src/app/components/app-blockviewer/app.blockviewer.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { environment } from '../environments/environment';
+import { environment } from '../../../environments/environment';
 
 enum BlockView {
   PREVIEW,
diff --git a/src/app/app.code.component.ts b/src/app/components/app-code/app.code.component.ts
similarity index 100%
rename from src/app/app.code.component.ts
rename to src/app/components/app-code/app.code.component.ts
diff --git a/src/app/demo/view/buttondemo.component.html b/src/app/components/button/button.component.html
similarity index 100%
rename from src/app/demo/view/buttondemo.component.html
rename to src/app/components/button/button.component.html
diff --git a/src/app/demo/view/buttondemo.component.ts b/src/app/components/button/button.component.ts
similarity index 86%
rename from src/app/demo/view/buttondemo.component.ts
rename to src/app/components/button/button.component.ts
index 3e4a058..d8eb595 100644
--- a/src/app/demo/view/buttondemo.component.ts
+++ b/src/app/components/button/button.component.ts
@@ -2,9 +2,9 @@ import {Component, OnInit} from '@angular/core';
 import {MenuItem} from 'primeng/api';
 
 @Component({
-    templateUrl: './buttondemo.component.html'
+    templateUrl: './button.component.html'
 })
-export class ButtonDemoComponent implements OnInit {
+export class ButtonComponent implements OnInit {
 
     items: MenuItem[];
 
diff --git a/src/app/demo/view/chartsdemo.component.html b/src/app/components/charts/charts.component.html
similarity index 100%
rename from src/app/demo/view/chartsdemo.component.html
rename to src/app/components/charts/charts.component.html
diff --git a/src/app/demo/view/chartsdemo.component.ts b/src/app/components/charts/charts.component.ts
similarity index 98%
rename from src/app/demo/view/chartsdemo.component.ts
rename to src/app/components/charts/charts.component.ts
index 6316b40..e2126a3 100755
--- a/src/app/demo/view/chartsdemo.component.ts
+++ b/src/app/components/charts/charts.component.ts
@@ -1,9 +1,9 @@
 import {Component, OnInit} from '@angular/core';
 
 @Component({
-    templateUrl: './chartsdemo.component.html'
+    templateUrl: './charts.component.html'
 })
-export class ChartsDemoComponent implements OnInit {
+export class ChartsComponent implements OnInit {
 
     lineData: any;
 
diff --git a/src/app/pages/app.crud.component.html b/src/app/components/crud/crud.component.html
similarity index 100%
rename from src/app/pages/app.crud.component.html
rename to src/app/components/crud/crud.component.html
diff --git a/src/app/pages/app.crud.component.ts b/src/app/components/crud/crud.component.ts
similarity index 94%
rename from src/app/pages/app.crud.component.ts
rename to src/app/components/crud/crud.component.ts
index 82a5b56..fd56ac3 100644
--- a/src/app/pages/app.crud.component.ts
+++ b/src/app/components/crud/crud.component.ts
@@ -1,14 +1,14 @@
 import {Component, OnInit} from '@angular/core';
-import {Product} from '../demo/domain/product';
-import {ProductService} from '../demo/service/productservice';
+import {Product} from '../../api/product';
+import {ProductService} from '../../service/productservice';
 import {ConfirmationService, MessageService} from 'primeng/api';
 
 @Component({
-    templateUrl: './app.crud.component.html',
+    templateUrl: './crud.component.html',
     providers: [MessageService, ConfirmationService],
-    styleUrls: ['../../assets/demo/badges.scss']
+    styleUrls: ['../../../assets/demo/badges.scss']
 })
-export class AppCrudComponent implements OnInit {
+export class CrudComponent implements OnInit {
 
     productDialog: boolean;
 
diff --git a/src/app/demo/view/dashboard.component.html b/src/app/components/dashboard/dashboard.component.html
similarity index 100%
rename from src/app/demo/view/dashboard.component.html
rename to src/app/components/dashboard/dashboard.component.html
diff --git a/src/app/demo/view/dashboarddemo.component.ts b/src/app/components/dashboard/dashboard.component.ts
similarity index 89%
rename from src/app/demo/view/dashboarddemo.component.ts
rename to src/app/components/dashboard/dashboard.component.ts
index 52bad4d..d6849c5 100755
--- a/src/app/demo/view/dashboarddemo.component.ts
+++ b/src/app/components/dashboard/dashboard.component.ts
@@ -1,13 +1,13 @@
 import {Component, OnInit} from '@angular/core';
 import {MenuModule} from 'primeng/menu';
 import {MenuItem} from 'primeng/api';
-import {Product} from '../domain/product';
-import {ProductService} from '../service/productservice';
+import {Product} from '../../api/product';
+import {ProductService} from '../../service/productservice';
  
 @Component({
     templateUrl: './dashboard.component.html',
 })
-export class DashboardDemoComponent implements OnInit {
+export class DashboardComponent implements OnInit {
 
     items: MenuItem[];
 
diff --git a/src/app/demo/view/documentation.component.html b/src/app/components/documentation/documentation.component.html
similarity index 100%
rename from src/app/demo/view/documentation.component.html
rename to src/app/components/documentation/documentation.component.html
diff --git a/src/app/demo/view/documentation.component.ts b/src/app/components/documentation/documentation.component.ts
similarity index 100%
rename from src/app/demo/view/documentation.component.ts
rename to src/app/components/documentation/documentation.component.ts
diff --git a/src/app/demo/view/emptydemo.component.html b/src/app/components/empty/empty.component.html
similarity index 100%
rename from src/app/demo/view/emptydemo.component.html
rename to src/app/components/empty/empty.component.html
diff --git a/src/app/components/empty/empty.component.ts b/src/app/components/empty/empty.component.ts
new file mode 100755
index 0000000..f319d14
--- /dev/null
+++ b/src/app/components/empty/empty.component.ts
@@ -0,0 +1,6 @@
+import {Component} from '@angular/core';
+
+@Component({
+    templateUrl: './empty.component.html'
+})
+export class EmptyComponent {}
diff --git a/src/app/demo/view/filedemo.component.html b/src/app/components/file/file.component.html
similarity index 100%
rename from src/app/demo/view/filedemo.component.html
rename to src/app/components/file/file.component.html
diff --git a/src/app/demo/view/filedemo.component.ts b/src/app/components/file/file.component.ts
similarity index 85%
rename from src/app/demo/view/filedemo.component.ts
rename to src/app/components/file/file.component.ts
index b2aada5..6d3166e 100755
--- a/src/app/demo/view/filedemo.component.ts
+++ b/src/app/components/file/file.component.ts
@@ -2,10 +2,10 @@ import {Component} from '@angular/core';
 import {MessageService} from 'primeng/api';
 
 @Component({
-    templateUrl: './filedemo.component.html',
+    templateUrl: './file.component.html',
     providers: [MessageService]
 })
-export class FileDemoComponent {
+export class FileComponent {
 
     uploadedFiles: any[] = [];
 
diff --git a/src/app/demo/view/floatlabeldemo.component.html b/src/app/components/floatlabel/floatlabel.component.html
similarity index 100%
rename from src/app/demo/view/floatlabeldemo.component.html
rename to src/app/components/floatlabel/floatlabel.component.html
diff --git a/src/app/demo/view/floatlabeldemo.component.ts b/src/app/components/floatlabel/floatlabel.component.ts
similarity index 89%
rename from src/app/demo/view/floatlabeldemo.component.ts
rename to src/app/components/floatlabel/floatlabel.component.ts
index 9d6130f..3eda93d 100644
--- a/src/app/demo/view/floatlabeldemo.component.ts
+++ b/src/app/components/floatlabel/floatlabel.component.ts
@@ -1,10 +1,10 @@
 import {Component, OnInit} from '@angular/core';
-import {CountryService} from '../service/countryservice';
+import {CountryService} from '../../service/countryservice';
 
 @Component({
-    templateUrl: './floatlabeldemo.component.html',
+    templateUrl: './floatlabel.component.html',
 })
-export class FloatLabelDemoComponent implements OnInit {
+export class FloatLabelComponent implements OnInit {
 
     countries: any[];
 
diff --git a/src/app/demo/view/formlayoutdemo.component.html b/src/app/components/formlayout/formlayout.component.html
similarity index 100%
rename from src/app/demo/view/formlayoutdemo.component.html
rename to src/app/components/formlayout/formlayout.component.html
diff --git a/src/app/demo/view/formlayoutdemo.component.ts b/src/app/components/formlayout/formlayout.component.ts
similarity index 74%
rename from src/app/demo/view/formlayoutdemo.component.ts
rename to src/app/components/formlayout/formlayout.component.ts
index 06d6254..6ef4fa4 100644
--- a/src/app/demo/view/formlayoutdemo.component.ts
+++ b/src/app/components/formlayout/formlayout.component.ts
@@ -1,9 +1,9 @@
 import {Component} from '@angular/core';
 
 @Component({
-    templateUrl: './formlayoutdemo.component.html'
+    templateUrl: './formlayout.component.html'
 })
-export class FormLayoutDemoComponent {
+export class FormLayoutComponent {
 
     selectedState:any;
     
diff --git a/src/app/demo/view/iconsdemo.component.html b/src/app/components/icons/icons.component.html
similarity index 100%
rename from src/app/demo/view/iconsdemo.component.html
rename to src/app/components/icons/icons.component.html
diff --git a/src/app/demo/view/iconsdemo.component.ts b/src/app/components/icons/icons.component.ts
similarity index 88%
rename from src/app/demo/view/iconsdemo.component.ts
rename to src/app/components/icons/icons.component.ts
index b03f26d..cb5bdea 100644
--- a/src/app/demo/view/iconsdemo.component.ts
+++ b/src/app/components/icons/icons.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import { IconService } from '../service/iconservice';
+import { IconService } from '../../service/iconservice';
 
 @Component({
   selector: 'app-iconsdemo',
-  templateUrl: './iconsdemo.component.html',
+  templateUrl: './icons.component.html',
   styleUrls: ['../../../assets/demo/documentation.scss']
 })
-export class IconsDemoComponent implements OnInit {
+export class IconsComponent implements OnInit {
 
   icons: any[];
 
diff --git a/src/app/demo/view/inputdemo.component.html b/src/app/components/input/input.component.html
similarity index 100%
rename from src/app/demo/view/inputdemo.component.html
rename to src/app/components/input/input.component.html
diff --git a/src/app/demo/view/inputdemo.component.ts b/src/app/components/input/input.component.ts
similarity index 93%
rename from src/app/demo/view/inputdemo.component.ts
rename to src/app/components/input/input.component.ts
index b353812..4f95f37 100644
--- a/src/app/demo/view/inputdemo.component.ts
+++ b/src/app/components/input/input.component.ts
@@ -1,10 +1,10 @@
 import {Component, OnInit} from '@angular/core';
-import {CountryService} from '../service/countryservice';
-import {NodeService} from '../service/nodeservice';
+import {CountryService} from '../../service/countryservice';
+import {NodeService} from '../../service/nodeservice';
 import {SelectItem} from 'primeng/api';
 
 @Component({
-    templateUrl: './inputdemo.component.html',
+    templateUrl: './input.component.html',
     styles: [`:host ::ng-deep .p-multiselect {
 		min-width: 15rem;
 	}
@@ -48,7 +48,7 @@ import {SelectItem} from 'primeng/api';
 
     `]
 })
-export class InputDemoComponent implements OnInit{
+export class InputComponent implements OnInit{
     countries: any[];
 
     filteredCountries: any[];
diff --git a/src/app/demo/view/invalidstatedemo.component.html b/src/app/components/invalidstate/invalidstate.component.html
similarity index 100%
rename from src/app/demo/view/invalidstatedemo.component.html
rename to src/app/components/invalidstate/invalidstate.component.html
diff --git a/src/app/demo/view/invalidstatedemo.component.ts b/src/app/components/invalidstate/invalidstate.component.ts
similarity index 88%
rename from src/app/demo/view/invalidstatedemo.component.ts
rename to src/app/components/invalidstate/invalidstate.component.ts
index fb62dab..59c7e79 100644
--- a/src/app/demo/view/invalidstatedemo.component.ts
+++ b/src/app/components/invalidstate/invalidstate.component.ts
@@ -1,10 +1,10 @@
 import {Component, OnInit} from '@angular/core';
-import {CountryService} from '../service/countryservice';
+import {CountryService} from '../../service/countryservice';
 
 @Component({
-    templateUrl: './invalidstatedemo.component.html'
+    templateUrl: './invalidstate.component.html'
 })
-export class InvalidStateDemoComponent implements OnInit {
+export class InvalidStateComponent implements OnInit {
 
 
     countries: any[];
diff --git a/src/app/demo/view/listdemo.component.html b/src/app/components/list/list.component.html
similarity index 100%
rename from src/app/demo/view/listdemo.component.html
rename to src/app/components/list/list.component.html
diff --git a/src/app/demo/view/listdemo.component.ts b/src/app/components/list/list.component.ts
similarity index 89%
rename from src/app/demo/view/listdemo.component.ts
rename to src/app/components/list/list.component.ts
index ef5681f..adc7495 100644
--- a/src/app/demo/view/listdemo.component.ts
+++ b/src/app/components/list/list.component.ts
@@ -1,13 +1,13 @@
 import {Component, OnInit} from '@angular/core';
 import {SelectItem} from 'primeng/api';
-import {Product} from '../domain/product';
-import {ProductService} from '../service/productservice';
+import {Product} from '../../api/product';
+import {ProductService} from '../../service/productservice';
 
 @Component({
-    templateUrl: './listdemo.component.html',
+    templateUrl: './list.component.html',
     styleUrls: ['../../../assets/demo/badges.scss']
 })
-export class ListDemoComponent implements OnInit {
+export class ListComponent implements OnInit {
 
     products: Product[];
 
diff --git a/src/app/demo/view/mediademo.component.html b/src/app/components/media/media.component.html
similarity index 100%
rename from src/app/demo/view/mediademo.component.html
rename to src/app/components/media/media.component.html
diff --git a/src/app/demo/view/mediademo.component.ts b/src/app/components/media/media.component.ts
similarity index 81%
rename from src/app/demo/view/mediademo.component.ts
rename to src/app/components/media/media.component.ts
index f73d653..fc15fc5 100644
--- a/src/app/demo/view/mediademo.component.ts
+++ b/src/app/components/media/media.component.ts
@@ -1,11 +1,11 @@
 import {Component, OnInit} from '@angular/core';
-import {ProductService} from '../service/productservice';
-import {PhotoService} from '../service/photoservice';
-import {Product} from '../domain/product';
+import {ProductService} from '../../service/productservice';
+import {PhotoService} from '../../service/photoservice';
+import {Product} from '../../api/product';
 
 @Component({
-  selector: 'app-mediademo',
-  templateUrl: './mediademo.component.html',
+  selector: 'app-media',
+  templateUrl: './media.component.html',
   styleUrls: ['../../../assets/demo/badges.scss'],
   styles:[`
     :host ::ng-deep .p-carousel-indicators .p-link{
@@ -13,7 +13,7 @@ import {Product} from '../domain/product';
     }
   `]
 })
-export class MediaDemoComponent implements OnInit {
+export class MediaComponent implements OnInit {
 
   products: Product[];
 
diff --git a/src/app/demo/view/menusdemo.component.html b/src/app/components/menus/menus.component.html
similarity index 100%
rename from src/app/demo/view/menusdemo.component.html
rename to src/app/components/menus/menus.component.html
diff --git a/src/app/demo/view/menusdemo.component.ts b/src/app/components/menus/menus.component.ts
similarity index 99%
rename from src/app/demo/view/menusdemo.component.ts
rename to src/app/components/menus/menus.component.ts
index ac9b046..fceb7e2 100755
--- a/src/app/demo/view/menusdemo.component.ts
+++ b/src/app/components/menus/menus.component.ts
@@ -2,10 +2,10 @@ import {Component, OnInit, ViewEncapsulation} from '@angular/core';
 import {MegaMenuItem, MenuItem} from 'primeng/api';
 
 @Component({
-    templateUrl: './menusdemo.component.html',
+    templateUrl: './menus.component.html',
     encapsulation: ViewEncapsulation.None
 })
-export class MenusDemoComponent implements OnInit {
+export class MenusComponent implements OnInit {
 
     breadcrumbItems: MenuItem[];
 
diff --git a/src/app/demo/view/menu/confirmationdemo.component.ts b/src/app/components/menus/stepsmenu/confirmationdemo.component.ts
similarity index 100%
rename from src/app/demo/view/menu/confirmationdemo.component.ts
rename to src/app/components/menus/stepsmenu/confirmationdemo.component.ts
diff --git a/src/app/demo/view/menu/paymentdemo.component.ts b/src/app/components/menus/stepsmenu/paymentdemo.component.ts
similarity index 100%
rename from src/app/demo/view/menu/paymentdemo.component.ts
rename to src/app/components/menus/stepsmenu/paymentdemo.component.ts
diff --git a/src/app/demo/view/menu/personaldemo.component.ts b/src/app/components/menus/stepsmenu/personaldemo.component.ts
similarity index 100%
rename from src/app/demo/view/menu/personaldemo.component.ts
rename to src/app/components/menus/stepsmenu/personaldemo.component.ts
diff --git a/src/app/demo/view/menu/seatdemo.component.ts b/src/app/components/menus/stepsmenu/seatdemo.component.ts
similarity index 100%
rename from src/app/demo/view/menu/seatdemo.component.ts
rename to src/app/components/menus/stepsmenu/seatdemo.component.ts
diff --git a/src/app/demo/view/menu/menudemo.module.ts b/src/app/components/menus/stepsmenu/stepsmenu.module.ts
similarity index 56%
rename from src/app/demo/view/menu/menudemo.module.ts
rename to src/app/components/menus/stepsmenu/stepsmenu.module.ts
index 0312a4b..5acc98e 100644
--- a/src/app/demo/view/menu/menudemo.module.ts
+++ b/src/app/components/menus/stepsmenu/stepsmenu.module.ts
@@ -6,20 +6,20 @@ import { PaymentDemoComponent } from './paymentdemo.component';
 import { SeatDemoComponent } from './seatdemo.component';
 import { PersonalDemoComponent } from './personaldemo.component';
 import { ConfirmationDemoComponent } from './confirmationdemo.component';
-import { MenusDemoComponent } from '../menusdemo.component';
+// import { MenusDemoComponent } from '../menusdemo.component';
 
 @NgModule({
   declarations: [],
   imports: [
     CommonModule,
     RouterModule.forChild([
-        {path:'',component: MenusDemoComponent, children:[
-				{path:'', redirectTo: 'personal', pathMatch: 'full'},
-				{path: 'personal', component: PersonalDemoComponent},
-				{path: 'confirmation', component: ConfirmationDemoComponent},
-				{path: 'seat', component: SeatDemoComponent},
-				{path: 'payment', component: PaymentDemoComponent}
-        ]}
+        // {path:'',component: MenusDemoComponent, children:[
+				// {path:'', redirectTo: 'personal', pathMatch: 'full'},
+				// {path: 'personal', component: PersonalDemoComponent},
+				// {path: 'confirmation', component: ConfirmationDemoComponent},
+				// {path: 'seat', component: SeatDemoComponent},
+				// {path: 'payment', component: PaymentDemoComponent}
+        // ]}
     ])
   ],
   exports: [RouterModule]
diff --git a/src/app/demo/view/messagesdemo.component.html b/src/app/components/messages/messages.component.html
similarity index 100%
rename from src/app/demo/view/messagesdemo.component.html
rename to src/app/components/messages/messages.component.html
diff --git a/src/app/demo/view/messagesdemo.component.ts b/src/app/components/messages/messages.component.ts
similarity index 94%
rename from src/app/demo/view/messagesdemo.component.ts
rename to src/app/components/messages/messages.component.ts
index 3a59904..9d7a843 100755
--- a/src/app/demo/view/messagesdemo.component.ts
+++ b/src/app/components/messages/messages.component.ts
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {Message, MessageService} from 'primeng/api';
 
 @Component({
-    templateUrl: './messagesdemo.component.html',
+    templateUrl: './messages.component.html',
     styles: [`
 		:host ::ng-deep .p-message {
 			margin-left: .25em;
@@ -15,7 +15,7 @@ import {Message, MessageService} from 'primeng/api';
     `],
     providers: [MessageService]
 })
-export class MessagesDemoComponent {
+export class MessagesComponent {
 
     msgs: Message[] = [];
 
diff --git a/src/app/demo/view/miscdemo.component.html b/src/app/components/misc/misc.component.html
similarity index 100%
rename from src/app/demo/view/miscdemo.component.html
rename to src/app/components/misc/misc.component.html
diff --git a/src/app/demo/view/miscdemo.component.ts b/src/app/components/misc/misc.component.ts
similarity index 79%
rename from src/app/demo/view/miscdemo.component.ts
rename to src/app/components/misc/misc.component.ts
index 8642455..9008e0c 100755
--- a/src/app/demo/view/miscdemo.component.ts
+++ b/src/app/components/misc/misc.component.ts
@@ -1,9 +1,9 @@
 import {Component, OnInit} from '@angular/core';
 
 @Component({
-    templateUrl: './miscdemo.component.html',
+    templateUrl: './misc.component.html',
 })
-export class MiscDemoComponent implements OnInit {
+export class MiscComponent implements OnInit {
 
     value = 0;
 
diff --git a/src/app/demo/view/overlaysdemo.component.html b/src/app/components/overlays/overlays.component.html
similarity index 100%
rename from src/app/demo/view/overlaysdemo.component.html
rename to src/app/components/overlays/overlays.component.html
diff --git a/src/app/demo/view/overlaysdemo.component.ts b/src/app/components/overlays/overlays.component.ts
similarity index 92%
rename from src/app/demo/view/overlaysdemo.component.ts
rename to src/app/components/overlays/overlays.component.ts
index 6f95b42..65a32d1 100755
--- a/src/app/demo/view/overlaysdemo.component.ts
+++ b/src/app/components/overlays/overlays.component.ts
@@ -1,14 +1,14 @@
 import {Component, OnInit} from '@angular/core';
 import {ConfirmationService, MessageService} from 'primeng/api';
-import {Product} from '../domain/product';
+import {Product} from '../../api/product';
 import {AppMainComponent} from 'src/app/app.main.component';
-import {ProductService} from '../service/productservice';
+import {ProductService} from '../../service/productservice';
 
 @Component({
-    templateUrl: './overlaysdemo.component.html',
+    templateUrl: './overlays.component.html',
     providers: [ConfirmationService, MessageService]
 })
-export class OverlaysDemoComponent implements OnInit {
+export class OverlaysComponent implements OnInit {
 
     images: any[];
 
diff --git a/src/app/demo/view/panelsdemo.component.html b/src/app/components/panels/panels.component.html
similarity index 100%
rename from src/app/demo/view/panelsdemo.component.html
rename to src/app/components/panels/panels.component.html
diff --git a/src/app/demo/view/panelsdemo.component.ts b/src/app/components/panels/panels.component.ts
similarity index 87%
rename from src/app/demo/view/panelsdemo.component.ts
rename to src/app/components/panels/panels.component.ts
index 6e3b2eb..45bcc06 100755
--- a/src/app/demo/view/panelsdemo.component.ts
+++ b/src/app/components/panels/panels.component.ts
@@ -2,9 +2,9 @@ import {Component, OnInit} from '@angular/core';
 import {MenuItem} from 'primeng/api';
 
 @Component({
-    templateUrl: './panelsdemo.component.html',
+    templateUrl: './panels.component.html',
 })
-export class PanelsDemoComponent implements OnInit {
+export class PanelsComponent implements OnInit {
 
     items: MenuItem[];
 
diff --git a/src/app/demo/view/tabledemo.component.html b/src/app/components/table/table.component.html
similarity index 100%
rename from src/app/demo/view/tabledemo.component.html
rename to src/app/components/table/table.component.html
diff --git a/src/app/demo/view/tabledemo.component.ts b/src/app/components/table/table.component.ts
similarity index 92%
rename from src/app/demo/view/tabledemo.component.ts
rename to src/app/components/table/table.component.ts
index 142a49d..a46837f 100644
--- a/src/app/demo/view/tabledemo.component.ts
+++ b/src/app/components/table/table.component.ts
@@ -1,14 +1,13 @@
 import {Component, OnInit, ViewChild, ChangeDetectorRef, ElementRef} from '@angular/core';
-import {Customer, Representative} from '../domain/customer';
-import {CustomerService} from '../service/customerservice';
-import {Product} from '../domain/product';
-import {ProductService} from '../service/productservice';
+import {Customer, Representative} from '../../api/customer';
+import {CustomerService} from '../../service/customerservice';
+import {Product} from '../../api/product';
+import {ProductService} from '../../service/productservice';
 import {Table} from 'primeng/table';
-import {InputText} from 'primeng/inputtext';
 import { MessageService, ConfirmationService } from 'primeng/api'
 
 @Component({
-    templateUrl: './tabledemo.component.html',
+    templateUrl: './table.component.html',
     providers: [MessageService, ConfirmationService],
     styleUrls: ['../../../assets/demo/badges.scss'],
     styles: [`
@@ -25,7 +24,7 @@ import { MessageService, ConfirmationService } from 'primeng/api'
         }
     `]
 })
-export class TableDemoComponent implements OnInit {
+export class TableComponent implements OnInit {
 
     customers1: Customer[];
 
diff --git a/src/app/pages/app.timelinedemo.component.html b/src/app/components/timeline/timeline.component.html
similarity index 98%
rename from src/app/pages/app.timelinedemo.component.html
rename to src/app/components/timeline/timeline.component.html
index a26b4d9..51c02fd 100644
--- a/src/app/pages/app.timelinedemo.component.html
+++ b/src/app/components/timeline/timeline.component.html
@@ -1,4 +1,4 @@
-<div class="grid timeline-demo">
+<div class="grid">
     <div class="col-12">
         <div class="card">
             <h4>Timeline</h4>
diff --git a/src/app/pages/app.timelinedemo.component.ts b/src/app/components/timeline/timeline.component.ts
similarity index 94%
rename from src/app/pages/app.timelinedemo.component.ts
rename to src/app/components/timeline/timeline.component.ts
index 2fe35e3..e6add27 100644
--- a/src/app/pages/app.timelinedemo.component.ts
+++ b/src/app/components/timeline/timeline.component.ts
@@ -2,7 +2,7 @@ import {Component, OnInit} from '@angular/core';
 import {PrimeIcons} from 'primeng/api';
 
 @Component({
-    templateUrl: './app.timelinedemo.component.html',
+    templateUrl: './timeline.component.html',
     styles: [`
         .custom-marker {
             display: flex;
@@ -45,7 +45,7 @@ import {PrimeIcons} from 'primeng/api';
         }    
     `]
 })
-export class AppTimelineDemoComponent implements OnInit{
+export class TimelineComponent implements OnInit{
 
     customEvents: any[];
 
diff --git a/src/app/demo/view/treedemo.component.html b/src/app/components/tree/tree.component.html
similarity index 100%
rename from src/app/demo/view/treedemo.component.html
rename to src/app/components/tree/tree.component.html
diff --git a/src/app/demo/view/treedemo.component.ts b/src/app/components/tree/tree.component.ts
similarity index 85%
rename from src/app/demo/view/treedemo.component.ts
rename to src/app/components/tree/tree.component.ts
index dafb919..6566cc2 100644
--- a/src/app/demo/view/treedemo.component.ts
+++ b/src/app/components/tree/tree.component.ts
@@ -1,11 +1,11 @@
 import {Component, OnInit} from '@angular/core';
-import {NodeService} from '../service/nodeservice';
+import {NodeService} from '../../service/nodeservice';
 import {TreeNode} from 'primeng/api';
 
 @Component({
-    templateUrl: './treedemo.component.html'
+    templateUrl: './tree.component.html'
 })
-export class TreeDemoComponent implements OnInit {
+export class TreeComponent implements OnInit {
 
 
     files1: TreeNode[];
diff --git a/src/app/demo/view/emptydemo.component.ts b/src/app/demo/view/emptydemo.component.ts
deleted file mode 100755
index e40f8c4..0000000
--- a/src/app/demo/view/emptydemo.component.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    templateUrl: './emptydemo.component.html'
-})
-export class EmptyDemoComponent {}
diff --git a/src/app/pages/app.empty.component.html b/src/app/pages/app.empty.component.html
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/pages/app.empty.component.ts b/src/app/pages/app.empty.component.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/app.menu.service.ts b/src/app/service/app.menu.service.ts
similarity index 100%
rename from src/app/app.menu.service.ts
rename to src/app/service/app.menu.service.ts
diff --git a/src/app/demo/service/countryservice.ts b/src/app/service/countryservice.ts
similarity index 100%
rename from src/app/demo/service/countryservice.ts
rename to src/app/service/countryservice.ts
diff --git a/src/app/demo/service/customerservice.ts b/src/app/service/customerservice.ts
similarity index 94%
rename from src/app/demo/service/customerservice.ts
rename to src/app/service/customerservice.ts
index fde5595..5b9370f 100644
--- a/src/app/demo/service/customerservice.ts
+++ b/src/app/service/customerservice.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Customer } from '../domain/customer';
+import { Customer } from '../api/customer';
 
 @Injectable()
 export class CustomerService {
diff --git a/src/app/demo/service/eventservice.ts b/src/app/service/eventservice.ts
similarity index 100%
rename from src/app/demo/service/eventservice.ts
rename to src/app/service/eventservice.ts
diff --git a/src/app/demo/service/iconservice.ts b/src/app/service/iconservice.ts
similarity index 100%
rename from src/app/demo/service/iconservice.ts
rename to src/app/service/iconservice.ts
diff --git a/src/app/demo/service/nodeservice.ts b/src/app/service/nodeservice.ts
similarity index 100%
rename from src/app/demo/service/nodeservice.ts
rename to src/app/service/nodeservice.ts
diff --git a/src/app/demo/service/photoservice.ts b/src/app/service/photoservice.ts
similarity index 89%
rename from src/app/demo/service/photoservice.ts
rename to src/app/service/photoservice.ts
index 745433c..4d73d13 100644
--- a/src/app/demo/service/photoservice.ts
+++ b/src/app/service/photoservice.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-import { Image } from '../domain/image';
+import { Image } from '../api/image';
 
 @Injectable()
 export class PhotoService {
diff --git a/src/app/demo/service/productservice.ts b/src/app/service/productservice.ts
similarity index 95%
rename from src/app/demo/service/productservice.ts
rename to src/app/service/productservice.ts
index fbf8342..7b0dbb3 100755
--- a/src/app/demo/service/productservice.ts
+++ b/src/app/service/productservice.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-import { Product } from '../domain/product';
+import { Product } from '../api/product';
 
 @Injectable()
 export class ProductService {