diff --git a/src/app/demo/service/country.service.ts b/src/service/country.service.ts
similarity index 100%
rename from src/app/demo/service/country.service.ts
rename to src/service/country.service.ts
diff --git a/src/app/demo/service/customer.service.ts b/src/service/customer.service.ts
similarity index 70%
rename from src/app/demo/service/customer.service.ts
rename to src/service/customer.service.ts
index d8d81df..f0716a8 100644
--- a/src/app/demo/service/customer.service.ts
+++ b/src/service/customer.service.ts
@@ -1,6 +1,26 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Customer } from '../api/customer';
+
+export interface Country {
+    name?: string;
+    code?: string;
+}
+
+export interface Representative {
+    name?: string;
+    image?: string;
+}
+
+export interface Customer {
+    id?: number;
+    name?: string;
+    country?: Country;
+    company?: string;
+    date?: string;
+    status?: string;
+    activity?: number;
+    representative?: Representative;
+}
 
 @Injectable()
 export class CustomerService {
diff --git a/src/app/demo/service/event.service.ts b/src/service/event.service.ts
similarity index 100%
rename from src/app/demo/service/event.service.ts
rename to src/service/event.service.ts
diff --git a/src/app/demo/service/icon.service.ts b/src/service/icon.service.ts
similarity index 100%
rename from src/app/demo/service/icon.service.ts
rename to src/service/icon.service.ts
diff --git a/src/app/demo/service/node.service.ts b/src/service/node.service.ts
similarity index 100%
rename from src/app/demo/service/node.service.ts
rename to src/service/node.service.ts
diff --git a/src/app/demo/service/photo.service.ts b/src/service/photo.service.ts
similarity index 77%
rename from src/app/demo/service/photo.service.ts
rename to src/service/photo.service.ts
index 05c5656..648dd33 100644
--- a/src/app/demo/service/photo.service.ts
+++ b/src/service/photo.service.ts
@@ -1,6 +1,12 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Image } from '../api/image';
+
+export interface Image {
+    previewImageSrc?:any;
+    thumbnailImageSrc?:any;
+    alt?:any;
+    title?:any;
+}
 
 @Injectable()
 export class PhotoService {
diff --git a/src/app/demo/service/product.service.ts b/src/service/product.service.ts
similarity index 76%
rename from src/app/demo/service/product.service.ts
rename to src/service/product.service.ts
index b08cf75..544127e 100644
--- a/src/app/demo/service/product.service.ts
+++ b/src/service/product.service.ts
@@ -1,6 +1,23 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Product } from '../api/product';
+
+interface InventoryStatus {
+    label: string;
+    value: string;
+}
+
+export interface Product {
+    id?: string;
+    code?: string;
+    name?: string;
+    description?: string;
+    price?: number;
+    quantity?: number;
+    inventoryStatus?: InventoryStatus;
+    category?: string;
+    image?: string;
+    rating?: number;
+}
 
 @Injectable()
 export class ProductService {