diff --git a/packages/officesupplies/db/csv/images/box.png b/packages/officesupplies/app/products/images/box.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/box.png
rename to packages/officesupplies/app/products/images/box.png
diff --git a/packages/officesupplies/db/csv/images/envelopes.png b/packages/officesupplies/app/products/images/envelopes.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/envelopes.png
rename to packages/officesupplies/app/products/images/envelopes.png
diff --git a/packages/officesupplies/db/csv/images/eraser.png b/packages/officesupplies/app/products/images/eraser.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/eraser.png
rename to packages/officesupplies/app/products/images/eraser.png
diff --git a/packages/officesupplies/db/csv/images/hanger1.png b/packages/officesupplies/app/products/images/hanger1.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/hanger1.png
rename to packages/officesupplies/app/products/images/hanger1.png
diff --git a/packages/officesupplies/db/csv/images/hanger2.png b/packages/officesupplies/app/products/images/hanger2.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/hanger2.png
rename to packages/officesupplies/app/products/images/hanger2.png
diff --git a/packages/officesupplies/db/csv/images/hanger3.png b/packages/officesupplies/app/products/images/hanger3.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/hanger3.png
rename to packages/officesupplies/app/products/images/hanger3.png
diff --git a/packages/officesupplies/db/csv/images/hanger4.png b/packages/officesupplies/app/products/images/hanger4.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/hanger4.png
rename to packages/officesupplies/app/products/images/hanger4.png
diff --git a/packages/officesupplies/db/csv/images/magnets.png b/packages/officesupplies/app/products/images/magnets.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/magnets.png
rename to packages/officesupplies/app/products/images/magnets.png
diff --git a/packages/officesupplies/db/csv/images/mug.png b/packages/officesupplies/app/products/images/mug.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/mug.png
rename to packages/officesupplies/app/products/images/mug.png
diff --git a/packages/officesupplies/db/csv/images/pen.png b/packages/officesupplies/app/products/images/pen.png
similarity index 100%
rename from packages/officesupplies/db/csv/images/pen.png
rename to packages/officesupplies/app/products/images/pen.png
diff --git a/packages/officesupplies/db/csv/sap.capire.officesupplies-Products.csv b/packages/officesupplies/db/csv/sap.capire.officesupplies-Products.csv
index c376aecb..78cec3b6 100644
--- a/packages/officesupplies/db/csv/sap.capire.officesupplies-Products.csv
+++ b/packages/officesupplies/db/csv/sap.capire.officesupplies-Products.csv
@@ -1,7 +1,7 @@
 ID,IDENTIFIER,TITLE,DESCRIPTION,AVAILABILITY,STORAGE_CAPACITY,CRITICALITY,PRICE,CURRENCY_CODE,SUPPLIER_ID,IMAGE_URL
-844ede5c-071e-34ed-907f-f99cb3a4693d,MC-CM-1003,Tea- / Coffee-Mug,Robust high-quality ceramic mug for every-day use in two unobstrusive colours.,153,200,0,2.65,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,https://github.com/SAP-samples/cloud-cap-samples/blob/openSAP-week3-unit2/packages/officesupplies/db/csv/images/mug.png
-64d40922-ea0d-30f9-9b83-eb4448ee4c2e,MC-CH-1000,Coat Hangers,"Set of high-quality hangers with coated surface, trouser bar - anti slip. Super slim design - space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: turquoise.",10,200,3,2.6,USD,12726eec-165c-3713-a674-3d2fc4f5127f,https://github.com/SAP-samples/cloud-cap-samples/blob/openSAP-week3-unit2/packages/officesupplies/db/csv/images/hanger1.png
-a6756d40-792e-34c9-8b2e-df3acb0c54b4,MC-CH-1001,Coat Hangers,"Set of high-quality hangers with coated surface, trouser bar - anti slip. Super slim design - space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: assorted (2 of each pink, grey, blue green, black).",34,200,2,21.73,USD,12726eec-165c-3713-a674-3d2fc4f5127f,https://github.com/SAP-samples/cloud-cap-samples/blob/openSAP-week3-unit2/packages/officesupplies/db/csv/images/hanger2.png
-37f028f0-1dd5-30ae-9cdd-a7f543e4d61d,MC-CH-1002,Wooden Coat Hangers - Pack of 5,"Pack of 5 quality wooden hangers with trouser bar. Slim design for space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: assorted (2 of each pink, grey, blue green, black).",5,200,2,6.4,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,https://github.com/SAP-samples/cloud-cap-samples/blob/openSAP-week3-unit2/packages/officesupplies/db/csv/images/hanger3.png
-a376e380-00e8-3d90-ba9f-c332c2df0f28,MC-CH-1003,Designer Coat Hooks - Pack of 3,Pack of 3 designer coat hook. Heavy-duty stainless steel hooks in a stylish shape.,6,200,1,6.49,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,https://github.com/SAP-samples/cloud-cap-samples/blob/openSAP-week3-unit2/packages/officesupplies/db/csv/images/hanger4.png
-fc16c43d-bb4e-30db-8b7e-98b3fdc7f0b9,MC-CH-1004,Vacuum Wall Hook - Pack of 6,"Big suction cup with diameter of 70mm, can load more than 10kg; bright contemporary colour; Principle of work: Atmospheric pressure, safely and easy to install and tear off, no need to drill a hole or add glue, without any damage to the surface; can be used on a variety of surfaces, including paint, glasses, wood, ceramic tile, gypsum, and any other smooth surface.",17,200,0,5.76,USD,12726eec-165c-3713-a674-3d2fc4f5127f,https://github.com/SAP-samples/cloud-cap-samples/blob/openSAP-week3-unit2/packages/officesupplies/db/csv/images/hanger4.png
+844ede5c-071e-34ed-907f-f99cb3a4693d,MC-CM-1003,Tea- / Coffee-Mug,Robust high-quality ceramic mug for every-day use in two unobstrusive colours.,153,200,0,2.65,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,../images/mug.png
+64d40922-ea0d-30f9-9b83-eb4448ee4c2e,MC-CH-1000,Coat Hangers,"Set of high-quality hangers with coated surface, trouser bar - anti slip. Super slim design - space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: turquoise.",10,200,3,2.6,USD,12726eec-165c-3713-a674-3d2fc4f5127f,../images/hanger1.png
+a6756d40-792e-34c9-8b2e-df3acb0c54b4,MC-CH-1001,Coat Hangers,"Set of high-quality hangers with coated surface, trouser bar - anti slip. Super slim design - space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: assorted (2 of each pink, grey, blue green, black).",34,200,2,21.73,USD,12726eec-165c-3713-a674-3d2fc4f5127f,../images/hanger2.png
+37f028f0-1dd5-30ae-9cdd-a7f543e4d61d,MC-CH-1002,Wooden Coat Hangers - Pack of 5,"Pack of 5 quality wooden hangers with trouser bar. Slim design for space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: assorted (2 of each pink, grey, blue green, black).",5,200,2,6.4,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,../images/hanger3.png
+a376e380-00e8-3d90-ba9f-c332c2df0f28,MC-CH-1003,Designer Coat Hooks - Pack of 3,Pack of 3 designer coat hook. Heavy-duty stainless steel hooks in a stylish shape.,6,200,1,6.49,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,../images/hanger4.png
+fc16c43d-bb4e-30db-8b7e-98b3fdc7f0b9,MC-CH-1004,Vacuum Wall Hook - Pack of 6,"Big suction cup with diameter of 70mm, can load more than 10kg; bright contemporary colour; Principle of work: Atmospheric pressure, safely and easy to install and tear off, no need to drill a hole or add glue, without any damage to the surface; can be used on a variety of surfaces, including paint, glasses, wood, ceramic tile, gypsum, and any other smooth surface.",17,200,0,5.76,USD,12726eec-165c-3713-a674-3d2fc4f5127f,../images/hanger4.png
diff --git a/packages/officesupplies/images/box.png b/packages/officesupplies/images/box.png
deleted file mode 100644
index 4556b5af..00000000
Binary files a/packages/officesupplies/images/box.png and /dev/null differ
diff --git a/packages/officesupplies/images/envelopes.png b/packages/officesupplies/images/envelopes.png
deleted file mode 100644
index 547881b7..00000000
Binary files a/packages/officesupplies/images/envelopes.png and /dev/null differ
diff --git a/packages/officesupplies/images/eraser.png b/packages/officesupplies/images/eraser.png
deleted file mode 100644
index 1ddee188..00000000
Binary files a/packages/officesupplies/images/eraser.png and /dev/null differ
diff --git a/packages/officesupplies/images/hanger1.png b/packages/officesupplies/images/hanger1.png
deleted file mode 100644
index 70e1dc5d..00000000
Binary files a/packages/officesupplies/images/hanger1.png and /dev/null differ
diff --git a/packages/officesupplies/images/hanger2.png b/packages/officesupplies/images/hanger2.png
deleted file mode 100644
index d61c87b0..00000000
Binary files a/packages/officesupplies/images/hanger2.png and /dev/null differ
diff --git a/packages/officesupplies/images/hanger3.png b/packages/officesupplies/images/hanger3.png
deleted file mode 100644
index 652d467e..00000000
Binary files a/packages/officesupplies/images/hanger3.png and /dev/null differ
diff --git a/packages/officesupplies/images/hanger4.png b/packages/officesupplies/images/hanger4.png
deleted file mode 100644
index 36bacc12..00000000
Binary files a/packages/officesupplies/images/hanger4.png and /dev/null differ
diff --git a/packages/officesupplies/images/magnets.png b/packages/officesupplies/images/magnets.png
deleted file mode 100644
index f1573694..00000000
Binary files a/packages/officesupplies/images/magnets.png and /dev/null differ
diff --git a/packages/officesupplies/images/mug.png b/packages/officesupplies/images/mug.png
deleted file mode 100644
index a295417f..00000000
Binary files a/packages/officesupplies/images/mug.png and /dev/null differ
diff --git a/packages/officesupplies/images/pen.png b/packages/officesupplies/images/pen.png
deleted file mode 100644
index f3cc7446..00000000
Binary files a/packages/officesupplies/images/pen.png and /dev/null differ