diff --git a/fiori/app/genres/fiori-service.cds b/fiori/app/genres/fiori-service.cds
index 1a3bd159..908ffdcc 100644
--- a/fiori/app/genres/fiori-service.cds
+++ b/fiori/app/genres/fiori-service.cds
@@ -1,13 +1,4 @@
-namespace sap.capire.bookshop;
-
-using { sap.capire.bookshop } from '@capire/bookstore/srv/mashup';
-
-entity GenreHierarchy : bookshop.Genres {
-  hierarchyLevel : Integer default 0;
-  drillState     : String default 'leaf';
-  parent         : Association to GenreHierarchy;
-  children       : Composition of many GenreHierarchy on children.parent = $self;
-}
+using { sap.capire.bookshop } from '../../db/common';
 
 annotate bookshop.GenreHierarchy {
   ID             @sap.hierarchy.node.for;
@@ -15,7 +6,3 @@ annotate bookshop.GenreHierarchy {
   hierarchyLevel @sap.hierarchy.level.for;
   drillState     @sap.hierarchy.drill.state.for;
 }
-
-extend service CatalogService with {
-  @readonly entity GenreHierarchy as projection on bookshop.GenreHierarchy;
-}
diff --git a/fiori/db/common.cds b/fiori/db/common.cds
new file mode 100644
index 00000000..38438e78
--- /dev/null
+++ b/fiori/db/common.cds
@@ -0,0 +1,14 @@
+namespace sap.capire.bookshop;
+
+using { sap.capire.bookshop } from '@capire/bookstore/srv/mashup';
+
+entity GenreHierarchy : bookshop.Genres {
+  hierarchyLevel : Integer default 0;
+  drillState     : String default 'leaf';
+  parent         : Association to GenreHierarchy;
+  children       : Composition of many GenreHierarchy on children.parent = $self;
+}
+
+extend service CatalogService with {
+  @readonly entity GenreHierarchy as projection on bookshop.GenreHierarchy;
+}