diff --git a/src/components/dashboard/recentsaleswidget.ts b/src/components/dashboard/recentsaleswidget.ts
index ec6ce5a..9156ab2 100644
--- a/src/components/dashboard/recentsaleswidget.ts
+++ b/src/components/dashboard/recentsaleswidget.ts
@@ -3,7 +3,7 @@ import { RippleModule } from 'primeng/ripple';
 import { TableModule } from 'primeng/table';
 import { ButtonModule } from 'primeng/button';
 import { CommonModule } from '@angular/common';
-import { Product, ProductService } from '@/src/service/product.service';
+import { Product, ProductService } from '@/src/service/demo/product.service';
 
 
 @Component({
diff --git a/src/components/dashboard/revenuestreamwidget.ts b/src/components/dashboard/revenuestreamwidget.ts
index 8946a51..2fed757 100644
--- a/src/components/dashboard/revenuestreamwidget.ts
+++ b/src/components/dashboard/revenuestreamwidget.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ChartModule } from 'primeng/chart';
 import { debounceTime, Subscription } from 'rxjs';
-import { LayoutService } from '@/src/service/layout.service';
+import { LayoutService } from '@/src/service/layout/layout.service';
 
 @Component({
     standalone:true,
diff --git a/src/components/floatingconfigurator.ts b/src/components/floatingconfigurator.ts
index 08c965b..1f36b0d 100644
--- a/src/components/floatingconfigurator.ts
+++ b/src/components/floatingconfigurator.ts
@@ -2,7 +2,7 @@ import { Component, computed, inject } from '@angular/core';
 import { ButtonModule } from 'primeng/button';
 import { StyleClassModule } from 'primeng/styleclass';
 import { AppConfigurator } from '@/src/layout/appconfigurator';
-import { LayoutService } from '@/src/service/layout.service';
+import { LayoutService } from '@/src/service/layout/layout.service';
 
 @Component({
   selector: 'floating-configurator',
diff --git a/src/components/landing/topbarwidget.component.ts b/src/components/landing/topbarwidget.component.ts
index 67cd0c1..559ae20 100644
--- a/src/components/landing/topbarwidget.component.ts
+++ b/src/components/landing/topbarwidget.component.ts
@@ -3,7 +3,6 @@ import { StyleClassModule } from 'primeng/styleclass';
 import { Router, RouterModule } from '@angular/router';
 import { RippleModule } from 'primeng/ripple';
 import { ButtonModule } from 'primeng/button';
-import { LayoutService } from '@/src/service/layout.service';
 
 @Component({
     selector: 'topbar-widget',
diff --git a/src/layout/appconfigurator.ts b/src/layout/appconfigurator.ts
index fc3e77f..d9421f3 100644
--- a/src/layout/appconfigurator.ts
+++ b/src/layout/appconfigurator.ts
@@ -10,7 +10,7 @@ import { InputSwitchModule } from 'primeng/inputswitch';
 import { RadioButtonModule } from 'primeng/radiobutton';
 import { SelectButtonModule } from 'primeng/selectbutton';
 import { ToggleSwitchModule } from 'primeng/toggleswitch';
-import { LayoutService } from '@/src/service/layout.service';
+import { LayoutService } from '@/src/service/layout/layout.service';
 
 const presets = {
     Aura,
diff --git a/src/layout/applayout.ts b/src/layout/applayout.ts
index fad7319..00bef5e 100644
--- a/src/layout/applayout.ts
+++ b/src/layout/applayout.ts
@@ -7,7 +7,7 @@ import { NavigationEnd, Router, RouterModule } from '@angular/router';
 import { AppConfigurator } from '@/src/layout/appconfigurator';
 import { AppFooter } from '@/src/layout/appfooter';
 import { filter, Subscription } from 'rxjs';
-import { LayoutService } from '@/src/service/layout.service';
+import { LayoutService } from '@/src/service/layout/layout.service';
 
 @Component({
     selector: 'app-layout',
diff --git a/src/layout/appmenuitem.ts b/src/layout/appmenuitem.ts
index 15d0ca5..01e52f6 100644
--- a/src/layout/appmenuitem.ts
+++ b/src/layout/appmenuitem.ts
@@ -3,7 +3,7 @@ import { NavigationEnd, Router, RouterModule } from '@angular/router';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { MenuService } from '@/src/service/menu.service';
+import { MenuService } from '@/src/service/layout/menu.service';
 import { CommonModule } from '@angular/common';
 import { RippleModule } from 'primeng/ripple';
 import { MenuItem} from 'primeng/api';
diff --git a/src/layout/apptopbar.ts b/src/layout/apptopbar.ts
index 2b34772..630d6d8 100644
--- a/src/layout/apptopbar.ts
+++ b/src/layout/apptopbar.ts
@@ -4,7 +4,7 @@ import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { StyleClassModule } from 'primeng/styleclass';
 import { AppConfigurator } from '@/src/layout/appconfigurator';
-import { LayoutService } from '@/src/service/layout.service';
+import { LayoutService } from '@/src/service/layout/layout.service';
 
 @Component({
     selector: 'app-topbar',
diff --git a/src/service/country.service.ts b/src/service/demo/country.service.ts
similarity index 100%
rename from src/service/country.service.ts
rename to src/service/demo/country.service.ts
diff --git a/src/service/customer.service.ts b/src/service/demo/customer.service.ts
similarity index 100%
rename from src/service/customer.service.ts
rename to src/service/demo/customer.service.ts
diff --git a/src/service/icon.service.ts b/src/service/demo/icon.service.ts
similarity index 100%
rename from src/service/icon.service.ts
rename to src/service/demo/icon.service.ts
diff --git a/src/service/node.service.ts b/src/service/demo/node.service.ts
similarity index 100%
rename from src/service/node.service.ts
rename to src/service/demo/node.service.ts
diff --git a/src/service/photo.service.ts b/src/service/demo/photo.service.ts
similarity index 100%
rename from src/service/photo.service.ts
rename to src/service/demo/photo.service.ts
diff --git a/src/service/product.service.ts b/src/service/demo/product.service.ts
similarity index 100%
rename from src/service/product.service.ts
rename to src/service/demo/product.service.ts
diff --git a/src/service/layout.service.ts b/src/service/layout/layout.service.ts
similarity index 100%
rename from src/service/layout.service.ts
rename to src/service/layout/layout.service.ts
diff --git a/src/service/menu.service.ts b/src/service/layout/menu.service.ts
similarity index 100%
rename from src/service/menu.service.ts
rename to src/service/layout/menu.service.ts
diff --git a/src/views/pages/crud.ts b/src/views/pages/crud.ts
index c8350ac..2691aca 100644
--- a/src/views/pages/crud.ts
+++ b/src/views/pages/crud.ts
@@ -1,8 +1,7 @@
-import { ChangeDetectorRef, Component, OnInit, signal, ViewChild } from '@angular/core';
+import { Component, OnInit, signal, ViewChild } from '@angular/core';
 import { ConfirmationService, MessageService } from 'primeng/api';
 import {Table, TableModule} from 'primeng/table';
 import {CommonModule} from '@angular/common';
-import {FileUploadModule} from 'primeng/fileupload';
 import {FormsModule} from '@angular/forms';
 import {ButtonModule} from 'primeng/button';
 import {RippleModule} from 'primeng/ripple';
@@ -15,11 +14,11 @@ import {SelectModule} from 'primeng/select';
 import {RadioButtonModule} from 'primeng/radiobutton';
 import {InputNumberModule} from 'primeng/inputnumber';
 import {DialogModule} from 'primeng/dialog';
-import { Product, ProductService } from '@/src/service/product.service';
 import { TagModule } from 'primeng/tag';
 import { InputIconModule } from 'primeng/inputicon';
 import { IconFieldModule } from 'primeng/iconfield';
 import { ConfirmDialogModule } from 'primeng/confirmdialog';
+import { Product, ProductService } from '@/src/service/demo/product.service';
 
 interface Column {
     field: string;
diff --git a/src/views/uikit/chartdoc.ts b/src/views/uikit/chartdoc.ts
index 92b1829..3fff8ec 100644
--- a/src/views/uikit/chartdoc.ts
+++ b/src/views/uikit/chartdoc.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { ChartModule } from 'primeng/chart';
 import { CommonModule } from '@angular/common';
 import { debounceTime, Subscription } from 'rxjs';
-import { LayoutService } from '@/src/service/layout.service';
+import { LayoutService } from '@/src/service/layout/layout.service';
 import { FluidModule } from 'primeng/fluid';
 
 @Component({
diff --git a/src/views/uikit/inputdoc.ts b/src/views/uikit/inputdoc.ts
index 417ff1c..5024d85 100644
--- a/src/views/uikit/inputdoc.ts
+++ b/src/views/uikit/inputdoc.ts
@@ -25,8 +25,8 @@ import {MultiSelectModule} from "primeng/multiselect";
 import {ListboxModule} from "primeng/listbox";
 import {InputGroupAddonModule} from "primeng/inputgroupaddon";
 import {TextareaModule} from "primeng/textarea";
-import { CountryService } from '@/src/service/country.service';
-import { NodeService } from '@/src/service/node.service';
+import { CountryService } from '@/src/service/demo/country.service';
+import { NodeService } from '@/src/service/demo/node.service';
 import { ToggleButtonModule } from 'primeng/togglebutton';
 
 @Component({
diff --git a/src/views/uikit/listdoc.ts b/src/views/uikit/listdoc.ts
index 7dc51d1..ede5fa6 100644
--- a/src/views/uikit/listdoc.ts
+++ b/src/views/uikit/listdoc.ts
@@ -8,7 +8,7 @@ import { PickListModule } from 'primeng/picklist';
 import { OrderListModule } from 'primeng/orderlist';
 import { TagModule } from 'primeng/tag';
 import { ButtonModule } from 'primeng/button';
-import { Product, ProductService } from '@/src/service/product.service';
+import { Product, ProductService } from '@/src/service/demo/product.service';
 
 @Component({
     standalone: true,
diff --git a/src/views/uikit/mediadoc.ts b/src/views/uikit/mediadoc.ts
index 4213a0e..e33c220 100644
--- a/src/views/uikit/mediadoc.ts
+++ b/src/views/uikit/mediadoc.ts
@@ -5,8 +5,8 @@ import { CarouselModule } from 'primeng/carousel';
 import { GalleriaModule } from 'primeng/galleria';
 import { ImageModule } from 'primeng/image';
 import { TagModule } from 'primeng/tag';
-import { Product, ProductService } from '@/src/service/product.service';
-import { PhotoService } from '@/src/service/photo.service';
+import { Product, ProductService } from '@/src/service/demo/product.service';
+import { PhotoService } from '@/src/service/demo/photo.service';
 
 @Component({
     standalone:true,
diff --git a/src/views/uikit/overlaydoc.ts b/src/views/uikit/overlaydoc.ts
index 7d9f026..6ba3fcc 100644
--- a/src/views/uikit/overlaydoc.ts
+++ b/src/views/uikit/overlaydoc.ts
@@ -8,8 +8,8 @@ import { Popover, PopoverModule } from 'primeng/popover';
 import { ConfirmPopupModule } from 'primeng/confirmpopup';
 import { InputTextModule } from 'primeng/inputtext';
 import { FormsModule } from '@angular/forms';
-import { Product, ProductService } from '@/src/service/product.service';
 import { TooltipModule } from 'primeng/tooltip';
+import { Product, ProductService } from '@/src/service/demo/product.service';
 
 @Component({
     standalone: true,
diff --git a/src/views/uikit/tabledoc.ts b/src/views/uikit/tabledoc.ts
index 0c66556..1a369dc 100644
--- a/src/views/uikit/tabledoc.ts
+++ b/src/views/uikit/tabledoc.ts
@@ -12,12 +12,12 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { ButtonModule } from 'primeng/button';
 import { RatingModule } from 'primeng/rating';
-import { Customer, CustomerService, Representative } from '@/src/service/customer.service';
-import { Product, ProductService } from '@/src/service/product.service';
 import { RippleModule } from 'primeng/ripple';
 import { InputIconModule } from 'primeng/inputicon';
 import { IconFieldModule } from 'primeng/iconfield';
 import { TagModule } from 'primeng/tag';
+import { Customer, CustomerService, Representative } from '@/src/service/demo/customer.service';
+import { Product, ProductService } from '@/src/service/demo/product.service';
 
 interface expandedRows {
     [key: string]: boolean;
diff --git a/src/views/uikit/treedoc.ts b/src/views/uikit/treedoc.ts
index c5782e5..83802dd 100644
--- a/src/views/uikit/treedoc.ts
+++ b/src/views/uikit/treedoc.ts
@@ -4,7 +4,7 @@ import {TreeModule} from "primeng/tree";
 import {FormsModule} from "@angular/forms";
 import {TreeTableModule} from "primeng/treetable";
 import {CommonModule} from "@angular/common";
-import { NodeService } from '@/src/service/node.service';
+import { NodeService } from '@/src/service/demo/node.service';
 
 @Component({
     standalone: true,