diff --git a/bookshop/srv/admin-service.cds b/bookshop/srv/admin-service.cds
index 9514c842..86895afa 100644
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -1,12 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-using { my.common.Hierarchy as Hierarchy } from './hierarchy';
-
-extend my.Genres with Hierarchy;
-
 service AdminService @(requires:'admin', path:'/admin') {
   entity Books          as projection on my.Books;
   entity Authors        as projection on my.Authors;
-  @readonly
-  @cds.search: {name}
-  entity GenreHierarchy as projection on my.Genres
 }
diff --git a/fiori/app/admin-books/fiori-service.cds b/fiori/app/admin-books/fiori-service.cds
index 431f23ee..68dbc758 100644
--- a/fiori/app/admin-books/fiori-service.cds
+++ b/fiori/app/admin-books/fiori-service.cds
@@ -1,6 +1,13 @@
 using { AdminService } from '@capire/bookstore';
+using { sap.capire.bookshop } from '../../db/hierarchy';
 using from '../common'; // to help UI linter get the complete annotations
 
+extend service AdminService with {
+  @readonly 
+  @cds.search: {name}
+  entity GenreHierarchy as projection on bookshop.Genres;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
diff --git a/fiori/app/common.cds b/fiori/app/common.cds
index f9cbdea0..1f9e664f 100644
--- a/fiori/app/common.cds
+++ b/fiori/app/common.cds
@@ -85,10 +85,6 @@ annotate my.Genres with @(
     }
 );
 
-annotate my.Genres with {
-  ID  @Common.Text : name  @Common.TextArrangement : #TextOnly;
-}
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
diff --git a/bookshop/srv/hierarchy.cds b/fiori/db/hierarchy.cds
similarity index 83%
rename from bookshop/srv/hierarchy.cds
rename to fiori/db/hierarchy.cds
index 963888e4..35593b92 100644
--- a/bookshop/srv/hierarchy.cds
+++ b/fiori/db/hierarchy.cds
@@ -1,4 +1,5 @@
-namespace my.common;
+namespace sap.capire.bookshop;
+using { sap.capire.bookshop.Genres } from '@capire/bookshop';
 
 aspect Hierarchy {
   LimitedDescendantCount : Integer64 = null;
@@ -27,3 +28,5 @@ annotate Hierarchy with @Capabilities.SortRestrictions.NonSortableProperties: [
   'MatchedDescendantCount',
   'LimitedRank'
 ];
+
+extend sap.capire.bookshop.Genres with Hierarchy;
\ No newline at end of file