chore: Merged fiori into bookstore and tests into subprojects

2025-07-17 13:54:32 +02:00
parent dcb0c0394a
commit c10ca17546
83 changed files with 2817 additions and 538 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -18,8 +18,8 @@
      ]
    },
    {
-      "name": "Fiori App",
-      "command": "npx cds watch fiori",
+      "name": "bookstore",
+      "command": "npx cds watch bookstore",
      "type": "node-terminal",
      "request": "launch",
      "skipFiles": [
@@ -29,29 +29,6 @@
        "**/cds/lib/req/cds-context.js",
        "**/odata-v4/okra/**"
      ]
-    },
-    {
-      "name": "Debug Mocha Tests",
-      "type": "node",
-      "request": "attach",
-      "port": 9229,
-      "continueOnAttach": true,
-      "skipFiles": [
-        "<node_internals>/**",
-        "**/node_modules/**",
-        "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cds-context.js",
-        "**/odata-v4/okra/**",
-      ]
-    },
-  ],
-  "inputs": [
-    {
-      "type": "pickString",
-      "id": "sample",
-      "description": "Which sample do you want to start?",
-      "options": [ "bookshop", "fiori", "reviews", "reviews" ],
-      "default": "bookshop"
    }
  ]
 }
--- a/bookshop/cds.ql.test.js
+++ b/bookshop/cds.ql.test.js
--- a/bookshop/test/consuming-actions.test.js
+++ b/bookshop/test/consuming-actions.test.js
--- a/bookshop/test/consuming-services.test.js
+++ b/bookshop/test/consuming-services.test.js
--- a/bookshop/test/custom-handlers.test.js
+++ b/bookshop/test/custom-handlers.test.js
@@ -1,5 +1,5 @@
 const cds = require('@sap/cds')
-const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
+const { GET, POST, expect } = cds.test(__dirname+'/..')
 cds.User.default = cds.User.Privileged // hard core monkey patch

 describe('cap/samples - Custom Handlers', () => {
--- a/bookshop/test/hierarchical-data/hierarchical-data.test.js
+++ b/bookshop/test/hierarchical-data/hierarchical-data.test.js
@@ -1,5 +1,5 @@
 const cds = require('@sap/cds')
-const { expect } = cds.test.in(__dirname,'..')
+const { expect } = cds.test.in(__dirname,'..','..')

 describe('cap/samples - Hierarchical Data', ()=>{

--- a/bookshop/test/hierarchical-data/requests.http
+++ b/bookshop/test/hierarchical-data/requests.http
--- a/bookshop/test/hierarchical-data/services.cds
+++ b/bookshop/test/hierarchical-data/services.cds
@@ -1,4 +1,4 @@
-using { sap.capire.bookshop as my } from '../db/schema';
+using { sap.capire.bookshop as my } from '../../db/schema';
 service TestService {
  entity Genres as projection on my.Genres;
 }
--- a/bookshop/test/localized-data/package.json
+++ b/bookshop/test/localized-data/package.json
--- a/bookshop/test/localized-data/services.cds
+++ b/bookshop/test/localized-data/services.cds
--- a/bookshop/test/localized-data/services.test.js
+++ b/bookshop/test/localized-data/services.test.js
--- a/bookshop/test/messaging.test.js
+++ b/bookshop/test/messaging.test.js
--- a/bookshop/test/odata.test.js
+++ b/bookshop/test/odata.test.js
--- a/bookshop/test/protocols/bookshop.http
+++ b/bookshop/test/protocols/bookshop.http
--- a/bookshop/test/protocols/hcql-adapter.test.js
+++ b/bookshop/test/protocols/hcql-adapter.test.js
@@ -0,0 +1,126 @@
+const cds = require('@sap/cds/lib')
+const { GET, expect, axios } = cds.test(__dirname)
+
+// Fetch API disallows GET|HEAD requests with body
+if (axios.constructor.name === 'Naxios') it = it.skip
+
+describe ('GET w/ query in body', () => {
+
+  it ('serves CQN query objects in body', async () => {
+    const {data:books} = await GET ('/hcql/admin', {
+      headers: { 'Content-Type': 'application/json' },
+      data: cds.ql `SELECT from Books`
+    })
+    expect(books).to.be.an('array').of.length(5)
+  })
+
+  it ('serves plain CQL strings in body', async () => {
+    const {data:books} = await GET ('/hcql/admin', {
+      headers: { 'Content-Type': 'text/plain' },
+      data: `SELECT from Books`
+    })
+    expect(books).to.be.an('array').of.length(5)
+  })
+
+  it ('serves complex and deep queries', async () => {
+    const {data:books} = await GET ('/hcql/admin', {
+      headers: { 'Content-Type': 'text/plain' },
+      data: `SELECT from Authors {
+        name,
+        books [order by title] {
+          title,
+          genre.name as genre
+        }
+      }`
+    })
+    expect(books).to.deep.equal([
+      {
+        name: "Emily Brontë",
+        books: [
+          { title: "Wuthering Heights", genre: 'Drama' }
+        ]
+      },
+      {
+        name: "Charlotte Brontë",
+        books: [
+          { title: "Jane Eyre", genre: 'Drama' }
+        ]
+      },
+      {
+        name: "Edgar Allen Poe",
+        books: [
+          { title: "Eleonora", genre: 'Romance' },
+          { title: "The Raven", genre: 'Mystery' },
+        ]
+      },
+      {
+        name: "Richard Carpenter",
+        books: [
+          { title: "Catweazle", genre: 'Fantasy' }
+        ]
+      }
+    ])
+  })
+
+})
+
+
+describe ('Sluggified variants', () => {
+
+  test ('GET /Books', async () => {
+    const {data:books} = await GET ('/hcql/admin/Books')
+    expect(books).to.be.an('array').of.length(5)
+    expect(books.length).to.eql(5) //.of.length(5)
+  })
+
+
+  test ('GET /Books/201', async () => {
+    const {data:book} = await GET ('/hcql/admin/Books/201')
+    expect(book).to.be.an('object')
+    expect(book).to.have.property ('title', "Wuthering Heights")
+  })
+
+  test ('GET /Books { title, author.name as author }' , async () => {
+    const {data:books} = await GET ('/hcql/admin/Books { title, author.name as author } order by ID')
+    expect(books).to.deep.equal ([
+      { title: "Wuthering Heights", author: "Emily Brontë" },
+      { title: "Jane Eyre", author: "Charlotte Brontë" },
+      { title: "The Raven", author: "Edgar Allen Poe" },
+      { title: "Eleonora", author: "Edgar Allen Poe" },
+      { title: "Catweazle", author: "Richard Carpenter" }
+    ])
+  })
+
+  test ('GET /Books/201 w/ CQL tail in URL' , async () => {
+    const {data:book} = await GET ('/hcql/admin/Books/201 { title, author.name as author } order by ID')
+    expect(book).to.deep.equal ({ title: "Wuthering Heights", author: "Emily Brontë" })
+  })
+
+  it ('GET /Books/201 w/ CQL fragment in body' , async () => {
+    const {data:book} = await GET ('/hcql/admin/Books/201', {
+      headers: { 'Content-Type': 'text/plain' },
+      data: `{ title, author.name as author }`
+    })
+    expect(book).to.deep.equal ({ title: "Wuthering Heights", author: "Emily Brontë" })
+  })
+
+  it ('GET /Books/201 w/ CQN fragment in body' , async () => {
+    const {data:book} = await GET ('/hcql/admin/Books/201', {
+      data: cds.ql `SELECT title, author.name as author` .SELECT
+    })
+    expect(book).to.deep.equal ({ title: "Wuthering Heights", author: "Emily Brontë" })
+  })
+
+  it ('GET /Books/201 w/ tail in URL plus CQL/CQN fragments in body' , async () => {
+    const {data:[b1]} = await GET ('/hcql/admin/Books where ID=201', {
+      data: cds.ql `SELECT title, author.name as author` .SELECT
+    })
+    expect(b1).to.deep.equal ({ title: "Wuthering Heights", author: "Emily Brontë" })
+    const {data:[b2]} = await GET ('/hcql/admin/Books where ID=201', {
+      headers: { 'Content-Type': 'text/plain' },
+      data: `{ title, author.name as author }`
+    })
+    expect(b2).to.deep.equal ({ title: "Wuthering Heights", author: "Emily Brontë" })
+  })
+
+})
--- a/bookshop/test/protocols/hcql.http
+++ b/bookshop/test/protocols/hcql.http
@@ -0,0 +1,225 @@
+@server = http://localhost:4004
+
+GET {{server}}/odata/v4/admin/Authors?
+&$select=ID,name
+&$expand=books($select=ID,title)
+&$count=true
+###
+
+#
+#  The basic variant expects a CQN object passed as an application/json body
+#  to a POST request. This is also the fastest one, as it doesn't need CQL parsing.
+#  Note: $count is returned in X-Total-Count response header
+#
+GET {{server}}/hcql/admin
+Content-Type: application/json
+# Accept-Language: de
+
+{ "SELECT": {
+  "from": { "ref": [ "Authors" ] },
+  "columns": [
+    { "ref": [ "name" ] },
+    { "ref": [ "books" ], "expand": [
+      { "ref": [ "ID" ] },
+      { "ref": [ "title" ] }
+    ]}
+  ],
+  "count": true
+}}
+###
+
+POST {{server}}/hcql/browse/submitOrder?book=201&quantity=2
+Authorization: Basic alice:
+###
+
+POST {{server}}/hcql/browse/submitOrder
+Authorization: Basic alice:
+Content-Type: application/json
+
+{
+  "book": 201,
+  "quantity": 2
+}
+###
+
+GET {{server}}/hcql/browse/submitOrder?book=201&quantity=2
+Authorization: Basic alice:
+###
+
+#
+#   Alternatively you can pass a CQL string as plain/text body
+#
+GET {{server}}/hcql/admin
+Content-Type: text/plain
+# X-Total-Count: true
+
+SELECT from Authors { name, books { title }}
+# SELECT from Books { title, currency }
+###
+
+#
+# In addition we offer convenience slug routes...
+# .e.g. /srv/entity routes
+#
+
+
+GET {{server}}/hcql/admin/Books
+###
+
+GET {{server}}/hcql/admin/Books/201
+###
+
+GET {{server}}/hcql/admin/Books { ID, title, author.name as author }
+###
+
+GET {{server}}/hcql/admin/Books order by stock desc
+Content-Type: text/plain
+
+{ title, stock }
+###
+
+GET {{server}}/hcql/admin/Books/201 { ID, title, author.name }
+###
+
+GET {{server}}/hcql/admin/Books/201 { ID, title, author{name} }
+###
+
+
+POST {{server}}/hcql/admin/Books?title=The Black Cat&author_ID=101
+###
+
+
+POST {{server}}/hcql/admin/Books?title=The Black Cat
+Content-Type: application/json
+
+{
+  "author_ID": 101
+}
+###
+
+POST {{server}}/hcql/admin/Books
+Content-Type: application/json
+
+{
+  "title": "The Black Cat",
+  "author": { "ID": 101 }
+}
+###
+
+PUT {{server}}/hcql/admin/Books/275?title=Catastrophe
+###
+
+PATCH {{server}}/hcql/admin/Books/275
+Content-Type: application/json
+
+{
+  "title": "Catastrophe"
+}
+###
+
+GET {{server}}/hcql/admin/Authors { name, books { ID, title }}
+###
+
+GET {{server}}/hcql/admin/Books { ID, title, author.name as author } order by ID desc
+###
+
+
+
+// ------------------------------------
+
+POST {{server}}/hcql/admin
+Content-Type: application/json
+
+{"SELECT": { "from": { "ref": ["Books"] }}}
+###
+
+POST {{server}}/hcql/admin
+Content-Type: text/plain
+
+SELECT from Authors {
+  name as author,
+  books {
+    title,
+    stock,
+    price,
+    currency { * }
+  }
+}
+where name like '%Bro%'
+order by name asc
+###
+
+
+#
+#   Simple REST-style URLs as supported as well
+#
+
+GET {{server}}/hcql/admin/Books
+###
+
+GET {{server}}/hcql/admin/Books/201
+###
+
+
+#
+#   REST-style URLs can be combined with trailing CQL in the path, in plain
+#   text body, or with projections sent as application/json array
+#
+
+GET {{server}}/hcql/admin/Books order by stock desc
+###
+
+GET {{server}}/hcql/admin/Books { title as book, stock } order by stock desc
+###
+
+GET {{server}}/hcql/admin/Authors
+Content-Type: text/plain
+Accept-Language: fr
+
+{
+  ID, name as author,
+  books {
+    title,
+    stock,
+    currency { * }
+  }
+}
+where name like '%Bro%'
+order by name asc
+###
+
+
+GET {{server}}/hcql/admin/Books/201 { title, stock }
+###
+
+GET {{server}}/hcql/admin/Books order by stock desc
+Content-Type: text/plain
+
+{ title, stock }
+###
+
+
+#
+#   CQL adaptor also provides access to the underlying CSN schema
+#
+
+GET {{server}}/hcql/admin/$csn
+###
+
+
+
+#
+#   CQL adaptor also supports INSERTs, UPDATEs, DELETEs ...
+#
+
+POST {{server}}/hcql/admin
+Content-Type: application/jsonin wonderland
+
+{ "INSERT": {
+  "into": "Books",
+  "entries": [{
+    "title": "The Black Cat",
+    "author": { "ID": 150 }
+  }]
+}}
+###
--- a/bookshop/test/protocols/odata.http
+++ b/bookshop/test/protocols/odata.http
@@ -0,0 +1,26 @@
+@server = http://localhost:4004
+
+GET {{server}}/odata/v2/admin/Authors
+Authorization: Basic alice:
+###
+
+GET {{server}}/odata/v2/admin/Authors?$select=ID,name&$expand=books($select=ID,title)
+Authorization: Basic alice:
+###
+
+GET {{server}}/odata/v4/admin/Authors
+Authorization: Basic alice:
+###
+
+GET {{server}}/odata/v4/admin/Authors?$select=ID,name&$expand=books($select=ID,title)
+Authorization: Basic alice:
+###
+
+
+GET {{server}}/rest/admin/Authors
+Authorization: Basic alice:
+###
+
+GET {{server}}/rest/admin/Authors?$select=ID,name&$expand=books($select=ID,title)
+Authorization: Basic alice:
+###
--- a/bookshop/test/protocols/rest.http
+++ b/bookshop/test/protocols/rest.http
@@ -0,0 +1,9 @@
+@server = http://localhost:4004
+
+GET {{server}}/rest/admin/Authors
+Authorization: Basic alice:
+###
+
+GET {{server}}/rest/admin/Authors?$select=ID,name&$expand=books($select=ID,title)
+Authorization: Basic alice:
+###
--- a/bookshop/test/protocols/services.cds
+++ b/bookshop/test/protocols/services.cds
@@ -0,0 +1,4 @@
+
+using { CatalogService, AdminService } from '@capire/bookstore';
+annotate CatalogService with @hcql @odata @path:'browse' @requires:[];
+annotate AdminService with @hcql @odata @path:'admin';
--- a/bookstore/app/_i18n/i18n_de.properties
+++ b/bookstore/app/_i18n/i18n_de.properties
--- a/bookstore/app/_i18n/i18n_en.properties
+++ b/bookstore/app/_i18n/i18n_en.properties
--- a/bookstore/app/admin-authors/fiori-service.cds
+++ b/bookstore/app/admin-authors/fiori-service.cds
--- a/bookstore/app/admin-authors/webapp/Component.js
+++ b/bookstore/app/admin-authors/webapp/Component.js
--- a/bookstore/app/admin-authors/webapp/i18n/i18n.properties
+++ b/bookstore/app/admin-authors/webapp/i18n/i18n.properties
--- a/bookstore/app/admin-authors/webapp/manifest.json
+++ b/bookstore/app/admin-authors/webapp/manifest.json
--- a/bookstore/app/admin-books/fiori-service.cds
+++ b/bookstore/app/admin-books/fiori-service.cds
--- a/bookstore/app/admin-books/webapp/Component.js
+++ b/bookstore/app/admin-books/webapp/Component.js
--- a/bookstore/app/admin-books/webapp/i18n/i18n.properties
+++ b/bookstore/app/admin-books/webapp/i18n/i18n.properties
--- a/bookstore/app/admin-books/webapp/manifest.json
+++ b/bookstore/app/admin-books/webapp/manifest.json
--- a/bookstore/app/appconfig/fioriSandboxConfig.json
+++ b/bookstore/app/appconfig/fioriSandboxConfig.json
--- a/bookstore/app/browse/fiori-service.cds
+++ b/bookstore/app/browse/fiori-service.cds
--- a/bookstore/app/browse/webapp/Component.js
+++ b/bookstore/app/browse/webapp/Component.js
--- a/bookstore/app/browse/webapp/i18n/i18n.properties
+++ b/bookstore/app/browse/webapp/i18n/i18n.properties
--- a/bookstore/app/browse/webapp/manifest.json
+++ b/bookstore/app/browse/webapp/manifest.json
--- a/bookstore/app/common.cds
+++ b/bookstore/app/common.cds
--- a/bookstore/app/fiori-apps.html
+++ b/bookstore/app/fiori-apps.html
--- a/bookstore/app/genres/fiori-service.cds
+++ b/bookstore/app/genres/fiori-service.cds
--- a/bookstore/app/genres/tree-view.cds
+++ b/bookstore/app/genres/tree-view.cds
--- a/bookstore/app/genres/value-help.cds
+++ b/bookstore/app/genres/value-help.cds
--- a/bookstore/app/genres/webapp/Component.js
+++ b/bookstore/app/genres/webapp/Component.js
--- a/bookstore/app/genres/webapp/i18n/i18n.properties
+++ b/bookstore/app/genres/webapp/i18n/i18n.properties
--- a/bookstore/app/genres/webapp/i18n/i18n_de.properties
+++ b/bookstore/app/genres/webapp/i18n/i18n_de.properties
--- a/bookstore/app/genres/webapp/manifest.json
+++ b/bookstore/app/genres/webapp/manifest.json
--- a/bookstore/app/services.cds
+++ b/bookstore/app/services.cds
--- a/bookstore/cds-plugin.js
+++ b/bookstore/cds-plugin.js
@@ -1 +0,0 @@
-require('./srv/server')
--- a/bookstore/db/hana/index.cds
+++ b/bookstore/db/hana/index.cds
--- a/bookstore/db/sqlite/index.cds
+++ b/bookstore/db/sqlite/index.cds
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -7,11 +7,18 @@
    "@capire/orders": "*",
    "@capire/common": "*",
    "@capire/data-viewer": "*",
+    "@cap-js/hana": ">=1",
    "@sap-cloud-sdk/http-client": "^4",
    "@sap-cloud-sdk/resilience": "^4",
    "@sap/cds": ">=5",
-    "express": "^4.17.1",
-    "@cap-js/hana": ">=1"
+    "express": "^4.17.1"
+  },
+  "devDependencies": {
+    "@cap-js/sqlite": ">=1"
+  },
+  "scripts": {
+    "start": "cds-serve",
+    "watch": "cds watch"
  },
  "cds": {
    "requires": {
@@ -24,11 +31,21 @@
        "model": "@capire/orders"
      },
      "messaging": true,
-      "db": true
+      "db": true,
+      "db-ext": {
+        "[development]": {
+          "model": "db/sqlite"
+        },
+        "[production]": {
+          "model": "db/hana"
+        }
+      }
    },
    "log": { "service": true }
  },
-  "scripts": {
-    "start": "cds-serve"
-  }
+  "sapux": [
+    "app/admin-authors",
+    "app/admin-books",
+    "app/browse"
+  ]
 }
--- a/bookstore/server.js
+++ b/bookstore/server.js
@@ -0,0 +1,2 @@
+require('./srv/mashup')
+require('./srv/trees')
--- a/bookstore/srv/mashup.js
+++ b/bookstore/srv/mashup.js
--- a/bookstore/srv/trees.js
+++ b/bookstore/srv/trees.js
--- a/etc/dark.drawio.svg
+++ b/etc/dark.drawio.svg
@@ -1,195 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="357px" height="283px" viewBox="-0.5 -0.5 357 283" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7VrZcqM4FP0av7q0L4+T9DIvU9VVeZhnFtlQwRYly7HTX98XgzBgOpNJG7eZGlKVwNECuudwdSSyoI+b41cXldlfNjXFgqD0uKCfFoQIIuF3BbzWACO6BtYuT2sInYGn/LupQRzQfZ6aXYPVkLe28HnZBxO73ZrE97DIOXvoV1vZIu0BZbQ2vceogKckKsxFtb/z1Gc1qsKwKvxPk6+zcGcsmvHFUfK8dna/be63IBQxXpdtotBRc9NdFqX20IHo5wV9dNb6+mxzfDRFFdd+zL78pLR9aGe2/j0NSN3gJSr2zbgXDCVRmTtTNSIi2pQL+rCNd9UfuC6g24fYwdnad5EAxNY+7zJbhgLoJT5XPg3Zv4YYw+jL6jQzx2htt1ClNC7fGG/cGf0WIAjOwyHLvXkqo6RqdgDhAZb5TQFXGE5X+dEELVXXu2fjkyri6FRYFI+2sO50c7paGZEkVSXv7LPplKRSxwi1JYF+0g6hG98m5C/GeXPsQE28vxoLD+9eoUpTSiSrm4QXQ9L6+nCWmW7kkXUUphosaoS9bns+8wsnDcXjdNNJ6Pa2an73fKvEjPMdK874zfimktyMb3Ztvp15yQ2k1rtnO+VGpWyMbUViKsRUbFOB+2xjfTO2+bXZTuxmA8TdPdkrXv1UuN36Dl4fYyIQp+NWImDhRbyBCMS1RWBdatwc3vjIqNVofheJMvFqKrKxEr+NbHlJ9pATs03/qOwwXCVFtNvlST/EvZBeBgiaN/GXp/LI+d71INRfTsdbgd3ZvUtML2FBp2vjew7FpMGd/yT4neDykeAGzJki8vlL39OPRby5wzebw/OeuSW4P3lzRPp91MNpmnWN9kVPYmD7+KCnOgoXPZ0k0A78XapQ81aFuHdVwKu75Iq2B+knAKrJslNKqfyYZIhmS4ZFewzXDQgvO6VC0Kn0pOetJzJzPTH+NtHX0hN7W7bX01PY4pmroNjMBcWHgppET3ygJzaZnIJlu5rl3e3Lssj/d73/wvXecp2LyUj+GFD4BJ2A4tD9M2hwys1oVtJC0miyRaoeEHjDbSk8sg85pwkgCLA7A4QsNI8pYOgp5CA7T+QpyGCqueIkMLLVOXdJibtSFAaqJVKcICw1ZIuw+dAuRzQoQSKGKFeSsY+aVIyXRGMmtSJIEBk+jrRrKw2yJpprwTAYmek86shm6qz0FL6Z3q1JxVpAClKnL8MaCc4HmUMuYaUDVhXWuUroD267EFClolhKLhHSlA1uwtmSUsGY4lphitRkarr6ruwqty7/T5ubCyczovl3f3Qjt3Q3974rO0gA/5hL6IjbEb/V3Ei9FFIpyBuKcKF0f5KozA3lEqYQLDimUvyCuaGQSSFzYMkoHtwFvI1gkGGwokwJWHBdKXvA5fkfQOrq5/+woZ9/AA==&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(0, 68, 85);">
-    <defs/>
-    <g>
-        <path d="M 199 202 L 249 202 L 269 242 L 249 282 L 199 282 L 179 242 Z" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 242px; margin-left: 180px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    bookshop
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="224" y="246" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 199 101 L 249 101 L 269 141 L 249 181 L 199 181 L 179 141 Z" fill="#f8cecc" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 141px; margin-left: 180px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    bookstore
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="224" y="145" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 286 48 L 336 48 L 356 88 L 336 128 L 286 128 L 266 88 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 88px; margin-left: 267px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    reviews
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="311" y="92" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 286 153 L 336 153 L 356 193 L 336 233 L 286 233 L 266 193 Z" fill="#f5f5f5" stroke="#666666" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 193px; margin-left: 267px;">
-                        <div data-drawio-colors="color: #333333; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(51, 51, 51); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    common
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="311" y="197" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 111 153 L 161 153 L 181 193 L 161 233 L 111 233 L 91 193 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 193px; margin-left: 92px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    orders
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="136" y="197" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 276.35 172.29 L 266.36 166.32" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 260.57 162.86 L 270.6 163.61 L 266.36 166.32 L 265.98 171.34 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 170.74 172.47 L 181.53 166.1" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 187.34 162.66 L 181.88 171.12 L 181.53 166.1 L 177.3 163.37 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 224 202 L 224 189.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 224 183.24 L 228.5 192.24 L 224 189.99 L 219.5 192.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 276.51 109.01 L 266.17 115.31" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 260.4 118.82 L 265.75 110.3 L 266.17 115.31 L 270.43 117.98 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 111 48 L 161 48 L 181 88 L 161 128 L 111 128 L 91 88 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 88px; margin-left: 92px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    suppliers
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="136" y="92" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 21 101 L 71 101 L 91 141 L 71 181 L 21 181 L 1 141 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 141px; margin-left: 2px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <b>
-                                    S/4
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="46" y="145" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    S/4
-                </text>
-            </switch>
-        </g>
-        <path d="M 80.76 120.53 L 93.49 113.03" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 99.31 109.61 L 93.84 118.05 L 93.49 113.03 L 89.27 110.3 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 80.91 161.17 L 93.31 168.33" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 99.15 171.71 L 89.11 171.1 L 93.31 168.33 L 93.61 163.31 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 170.59 108.83 L 181.72 115.53" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 187.5 119.02 L 177.47 118.23 L 181.72 115.53 L 182.11 110.52 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 199 1 L 249 1 L 269 41 L 249 81 L 199 81 L 179 41 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 180px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    fiori
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="224" y="45" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 224 101 L 224 89.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 224 83.24 L 228.5 92.24 L 224 89.99 L 219.5 92.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Text is not SVG - cannot display
-            </text>
-        </a>
-    </switch>
-</svg>
--- a/etc/samples.drawio.svg
+++ b/etc/samples.drawio.svg
@@ -1,212 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="368px" height="282px" viewBox="-0.5 -0.5 368 282" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7Zpbc9o4FIB/DY9hdL88JqRJH9ppd9mZndk3YwvwxCBXmIT01+9xLNvYMaEl4ZIUeLB1JOt2viMdXXp0MFvduiCdfrWRSXoERaseve4RgpnU8Mglj4VEIF4IJi6OChGqBcP4p/FfltJlHJmFlxWizNoki9OmMLTzuQmzhixwzj40k41tEjUEaTAxzwTDMEieS/+No2xaSBWRtfyziSfTsmQsfINnQZnYt2QxDSL7sCain3p04KzNirfZamCSvPOa/XKzIbaqmDPz7Fc+mJDb2+X19NuX/778vEB/LX+gO3vhc7kPkqVvcI+IBPK7GuVVzh59P4gfy7yeV2M7zy4WT1q6hAQYp6Dpqzoe3ib588rau8XUpmVuUK1RGVeV4F5VxGWa+o6tsiDQx2n+OjWrYGLnkCo1Lp6ZzLha+r0UgQquHqZxZoZpEOafPQDDIJtmswRCOK9MvDIllUU4SQY2se6pPDoeGxGGIF9kzt6ZtZhI6hFCVUzJDvENvAlmcZKbxMDO4hAaMQzmC3h8HfoEZZm4DPtGoqceaGu+VKNxmVmtiTwJt8ZCg90jJPGxhPtPvFlSLYrwQw259uBO1/hWXhZ4s5pUOdfkwYuH7zdAJBtBXKTB/FWgvHlGowblmXVmHelm2i7wQVbUZQ3kNzGJDQUc30xUaLrNZKQ443syE+iCMJ5P/oFRiF7z/dgN0fK4dkP3bzevmwn+NvexgVl4fxPB0Lj7ODQf3IYiblTEumxIkREVYh829Hp7oaxlL0wd117YSw5PoWrop5nNTWcbs4XkOsiCo9NhMPAhu+jQQtLgndBBGT8uHfzUR9NvLjLuPJj+mYMpFidmLqLDXFqaNfPoMl+GQyhMgsUiDpuKanZzLoEvfCcW41ngska4pTA+yP/7U8/CLl1ots8oUM+JybavcEzU2HB4ruw1ZfIOZZYyZ5Igi++b2xRdGvYlfLcxtKxmCesmTKzc0ijzKBruP1vfV2jnRNqjuGzlVHTNs5yekKsavjuF8kxhNXO9MwoJl32uaPUjokkSlv21WEp3RJRI3GdYVD/JmsUQ0V+LFYIelF915rfaiPxg/MqXwXorfsXLZrJnfvWZ32of5mPxyw7DLzsuv+VR0+mu+obLNE3i88LvvPDrncYuGt58bvhqkxlCjdjJ8hMYNe48yRChMqPxRn7aeGznyTey45z3t/kRvOkvIHxkfMjZZaiNaKvPUE5Q78NpaDu95WS/Z6e3rMWhnIaug7czwpsS8pMiGANaEikOs5DUVJJy66tEizIgTyKGKFeSsR29XqxUn+j8CpQiSBApabMUwsCMiOZaMEw4P7DT23UQ9ufxi36R39NatmFJYYhV+aat1kjw1vQuSR+WapxjhrASmuyKr4ABFkvJJUK6OmuoCtF9SgVjimuFKVKHpffkD+puYuvifd9++9BLtfF4TDbcrRMjwfeyVDvMpSF87Mt2+HxwV4/p293v03JeCBd9wmE8Fk+neKp1+IZ1n2kYjyV4FAIcmJ237FBfMsEZlVIphHXLd4ElABIaE8byKyak5ePvPPxDsL4RXSSv75XTT/8D&lt;/diagram&gt;&lt;/mxfile&gt;">
-    <defs/>
-    <g>
-        <path d="M 207 201 L 257 201 L 277 241 L 257 281 L 207 281 L 187 241 Z" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 241px; margin-left: 188px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <b style="font-size: 11px;">
-                                    Bookshop
-                                </b>
-                                <br style="font-size: 11px;"/>
-                                App
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="232" y="244" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle">
-                    Bookshop...
-                </text>
-            </switch>
-        </g>
-        <path d="M 207 102 L 257 102 L 277 142 L 257 182 L 207 182 L 187 142 Z" fill="#f8cecc" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 145px; margin-left: 188px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <span style="font-size: 11px;">
-                                    <span style="font-size: 11px;">
-                                        <b>
-                                            Bookstore
-                                            <br/>
-                                        </b>
-                                    </span>
-                                    App
-                                    <br style="font-size: 11px;"/>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="232" y="148" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle">
-                    Bookstore...
-                </text>
-            </switch>
-        </g>
-        <path d="M 297 53 L 347 53 L 367 93 L 347 133 L 297 133 L 277 93 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 93px; margin-left: 278px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <span style="font-size: 11px;">
-                                    <b style="font-size: 11px;">
-                                        Reviews
-                                    </b>
-                                    <br style="font-size: 11px;"/>
-                                    Service
-                                    <br style="font-size: 11px;"/>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="322" y="96" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle">
-                    Reviews...
-                </text>
-            </switch>
-        </g>
-        <path d="M 297 150 L 347 150 L 367 190 L 347 230 L 297 230 L 277 190 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 190px; margin-left: 278px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <b>
-                                    Common
-                                </b>
-                                <br/>
-                                Data
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="322" y="193" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle">
-                    Common...
-                </text>
-            </switch>
-        </g>
-        <path d="M 117 150 L 167 150 L 187 190 L 167 230 L 117 230 L 97 190 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 190px; margin-left: 98px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <span style="font-size: 11px;">
-                                    <b style="font-size: 11px;">
-                                        Orders
-                                    </b>
-                                    <br style="font-size: 11px;"/>
-                                    Service
-                                    <br style="font-size: 11px;"/>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="142" y="193" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle">
-                    Orders...
-                </text>
-            </switch>
-        </g>
-        <path d="M 286.47 171.05 L 273.81 164.3" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 268.51 161.47 L 277.45 161.71 L 273.81 164.3 L 273.69 168.77 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 177.53 171.05 L 190.19 164.3" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 195.49 161.47 L 190.31 168.77 L 190.19 164.3 L 186.55 161.71 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 232 201 L 232 189.12" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 232 183.12 L 236 191.12 L 232 189.12 L 228 191.12 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 286.63 112.26 L 273.62 119.34" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 268.35 122.21 L 273.47 114.87 L 273.62 119.34 L 277.29 121.9 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 117 53 L 167 53 L 187 93 L 167 133 L 117 133 L 97 93 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 93px; margin-left: 98px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <span style="font-size: 11px;">
-                                    <b style="font-size: 11px;">
-                                        Suppliers
-                                    </b>
-                                    <br style="font-size: 11px;"/>
-                                    Service
-                                    <br style="font-size: 11px;"/>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="142" y="96" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle">
-                    Suppliers...
-                </text>
-            </switch>
-        </g>
-        <path d="M 21 106 L 71 106 L 91 146 L 71 186 L 21 186 L 1 146 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 146px; margin-left: 2px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                <span style="font-size: 11px;">
-                                    S/4
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="46" y="149" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle" font-weight="bold">
-                    S/4
-                </text>
-            </switch>
-        </g>
-        <path d="M 81.27 126.53 L 100.5 115.91" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 105.76 113.01 L 100.69 120.38 L 100.5 115.91 L 96.82 113.37 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 82.61 162.78 L 98.92 170.25" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 104.37 172.75 L 95.43 173.06 L 98.92 170.25 L 98.77 165.79 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 177.37 112.26 L 190.38 119.34" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 195.65 122.21 L 186.71 121.9 L 190.38 119.34 L 190.53 114.87 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 207 1 L 257 1 L 277 41 L 257 81 L 207 81 L 187 41 Z" fill="#fff2cc" stroke="#d6b656" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 44px; margin-left: 188px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <span style="font-size: 11px;">
-                                    <b style="font-size: 11px;">
-                                        Fiori
-                                    </b>
-                                    <br style="font-size: 11px;"/>
-                                    App
-                                    <br style="font-size: 11px;"/>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="232" y="47" fill="rgb(0, 0, 0)" font-family="Comic Sans MS" font-size="11px" text-anchor="middle">
-                    Fiori...
-                </text>
-            </switch>
-        </g>
-        <path d="M 232 102 L 232 88.12" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 232 82.12 L 236 90.12 L 232 88.12 L 228 90.12 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all"/>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Text is not SVG - cannot display
-            </text>
-        </a>
-    </switch>
-</svg>
--- a/fiori/.env
+++ b/fiori/.env
@@ -1 +0,0 @@
-cds.requires.[hybrid].messaging.kind=file-based-messaging
--- a/fiori/index.cds
+++ b/fiori/index.cds
@@ -1 +0,0 @@
-using from './db/common';
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -1,43 +0,0 @@
-{
-  "name": "@capire/fiori",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookstore": "*",
-    "@sap/cds": ">=5",
-    "express": "^4.17.1"
-  },
-  "devDependencies": {
-    "@cap-js/sqlite": ">=1"
-  },
-  "scripts": {
-    "start": "cds-serve",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "ReviewsService": {
-        "kind": "odata",
-        "model": "@capire/reviews"
-      },
-      "OrdersService": {
-        "kind": "odata",
-        "model": "@capire/orders"
-      },
-      "messaging": true,
-      "db": true,
-      "db-ext": {
-        "[development]": {
-          "model": "db/sqlite"
-        },
-        "[production]": {
-          "model": "db/hana"
-        }
-      }
-    }
-  },
-  "sapux": [
-    "app/admin-authors",
-    "app/admin-books",
-    "app/browse"
-  ]
-}
--- a/1
+++ b/1
--- a/etc/data-viewer/app/viewer/app.js
+++ b/etc/data-viewer/app/viewer/app.js
--- a/etc/data-viewer/app/viewer/index.html
+++ b/etc/data-viewer/app/viewer/index.html
--- a/etc/data-viewer/cds-plugin.js
+++ b/etc/data-viewer/cds-plugin.js
--- a/etc/data-viewer/index.cds
+++ b/etc/data-viewer/index.cds
--- a/etc/data-viewer/package.json
+++ b/etc/data-viewer/package.json
--- a/etc/data-viewer/srv/data-service.cds
+++ b/etc/data-viewer/srv/data-service.cds
--- a/etc/data-viewer/srv/data-service.js
+++ b/etc/data-viewer/srv/data-service.js
--- a/etc/loggers/app/loggers.html
+++ b/etc/loggers/app/loggers.html
--- a/etc/loggers/package.json
+++ b/etc/loggers/package.json
--- a/etc/loggers/readme.md
+++ b/etc/loggers/readme.md
--- a/etc/loggers/srv/dummy.cds
+++ b/etc/loggers/srv/dummy.cds
--- a/etc/loggers/srv/loggers.cds
+++ b/etc/loggers/srv/loggers.cds
--- a/etc/loggers/srv/loggers.js
+++ b/etc/loggers/srv/loggers.js
--- a/etc/loggers/test/requests.http
+++ b/etc/loggers/test/requests.http
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,15 +5,7 @@
  "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
  "author": "daniel.hutzel@sap.com",
  "workspaces": [
-    "bookshop",
-    "bookstore",
-    "common",
-    "fiori",
-    "orders",
-    "reviews",
-    "shared-db",
-    "etc/data-viewer",
-    "etc/loggers"
+    "*"
  ],
  "devDependencies": {
    "@cap-js/cds-test": "^0"
@@ -22,7 +14,6 @@
    "start": "cds watch bookshop --open http://localhost:4004",
    "bookstore": "cds watch bookstore",
    "bookshop": "cds watch bookshop",
-    "fiori": "cds watch fiori",
    "orders": "cds watch orders",
    "reviews": "cds watch reviews",
    "lint": "npx eslint",
--- a/readme.md
+++ b/readme.md
@@ -2,14 +2,14 @@

 # Welcome to cap/samples

-Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo).
+Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](readme/samples.md#all-in-one-monorepo).

 ![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)

 ## Get Started

 Assumed you did your [initial setup of CAP Node.js](https://cap.cloud.sap/docs/get-started/#setup), simply copy & paste these lines to a terminal for a jumpstart:
-    
+
 ```sh
 git clone -q https://github.com/sap-samples/cloud-cap-samples cap/samples
 cd cap/samples
@@ -21,7 +21,7 @@ npm start
 After download and setup this starts the bookshop server and opens a browser window on _http://localhost:4004_ looking like that:

 <p align="center">
-   <img width=480 src="etc/index-html.png" alt="bookshop showing up in browser" />
+   <img width=480 src="readme/index-html.png" alt="bookshop showing up in browser" />
 </p>

 Click on the *[/vue](http:/localhost:4004/vue)* link at the top to display the bookshop app (when asked to log in, type `alice` as user and leave the password field blank).
@@ -35,14 +35,13 @@ After the jumpstart, have a look into the enclosed sub folders/projects, which a
 - [orders](orders) - a generic reuse service
 - [common](common) - a reuse content package
 - [bookstore](bookstore) - a composite app of the above
- [fiori](fiori) - Fiori elements UIs for the bookstore
- [etc/*](etc) - Plugins adding cross-cutting concerns
+- [etc/*](readme) - Plugins adding cross-cutting concerns
 - [test](test) - Tests for all the above

-> _see also [samples.md](samples.md)_
+> _see also [samples.md](readme/samples.md)_

 <p align="center">
-  <img width=480 src="etc/samples.drawio.svg">
+  <img width=480 src="readme/samples.drawio.svg">
 </p>

 ## Get Help
--- a/readme/bookshop.drawio.svg
+++ b/readme/bookshop.drawio.svg
--- a/readme/dark.drawio.svg
+++ b/readme/dark.drawio.svg
@@ -0,0 +1,215 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" style="background: #045; background-color: light-dark(#045, #000000);" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="357px" height="236px" viewBox="-0.5 -0.5 357 236" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7VnLjqM4FP2abCO/H8upmn5sWmqpFrPmcRNQkRgZp5Karx8TMAFCl3pKIROkIYvYxy98z/H1tVnR593pm43K7IdJoVgRlJ5W9M8VIRhj7f9q5L1BuEYNsLV52kA94CX/G9qWAT3kKVQt1kDOmMLl5RBMzH4PiRtgkbXmOKy2MUU6AMpoC4PXqIGXJCrgqtpfeeqyBlVEXvDvkG+zMDIW7YTjKHndWnPYt+OtCEWMN2W7KHTUDlplUWqOPYh+WdFna4xrUrvTMxS1YYc2+/qL0u6lLezd7zQgTYO3qDi0814xlERlbqFuRES0K1f0aR9X9Z/PF77bp9j61Nb1kQDExrxWmSlDge8lvlQ+T9m9Bxv72Zd1MoNTtDV7X6UEm+/Agb2gPwPkjfN0zHIHL2WU1M2OXnkey9yu8Dnsk5v8BEFLdb56BZfUFkfnwqJ4NoWx58HpZgMiSepKzppX6JWkUscIdSWBftJNoW/f1uRvYB2celBr729g/Mvbd1+lLSWSNU3ahcEkbfLHi8zCWsl6ClMtFrXC3nY9X/j1iZbiabrpLHQ7Uzd/eL5VAtN8x4ozfje+qSR345vdmm8Lbzl41/rwbKccVMqm2FYkpkLMxTYVeMh22AfvwDa/NduJ2e08cQ9P9obXvxo3e9fDm2dKBOL83EsELCzEO4hA3FoExqZgl7DiI1CbSf8uEgXxZi6ysRL/GdnymuwxJ7BP/6jDYZ9Liqiq8mRo4oFJrw3km7f2l+fyyLpBfmTqr+fnI8NW5mATGDgs3+kW3CBCgTRE578wfs+4fMK4AbNQRC5/G8b0UxZvR/hpcv++F24JHm7eHJFhH8102mb9QPuqJzEK+/iop8YKVz2dJdBN/LdUoZatCvHoqvBLd80V7R4ydABUk3WvlFL5OckQzdYMi+4ZnxsQXvdKhaBz6UkvW09k4Xpi/GOib6Un9rFsb6encMWzVEGxhQuKjwU1i574SE9sNjmFkO1mIW91KMsi/z/q/RdR7z3PuZhM+I8RhS++E6849PgMAk45THolLSSNZjuk6hGBd7yWwhP3kEvaAIIA+ztA8ELL2ALGMYUceeeZYgoy2mpuuAlMXHUuXVLioRSFPdUSKU4Qltp7i3D50B1HtFeCRAxRriRjnw1SMV4TjZnUiiBBZPg40p2ttJc10VwLhn0gM1+MOnGZuig9hW+mDxukYi28C1L1hZnWSHA+8hxy7U86PlT151wl9CevXYhXpaJYSi4R0pSNBuFsTalgTHGtMEXqRmry2csn3Kb65SM5/fIP&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <rect fill="#045" width="100%" height="100%" x="0" y="0" style="fill: light-dark(rgb(0, 68, 85), rgb(0, 0, 0));"/>
+    <g>
+        <g>
+            <path d="M 199 155 L 249 155 L 269 195 L 249 235 L 199 235 L 179 195 Z" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 230, 204), rgb(54, 33, 10)); stroke: light-dark(rgb(215, 155, 0), rgb(153, 101, 0));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 195px; margin-left: 180px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 12px; font-family: &quot;Helvetica&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    @capire/
+                                    <br/>
+                                    <b>
+                                        bookshop
+                                    </b>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="224" y="199" fill="light-dark(#000000, #ffffff)" font-family="&quot;Helvetica&quot;" font-size="12px" text-anchor="middle">
+                        @capire/...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 199 54 L 249 54 L 269 94 L 249 134 L 199 134 L 179 94 Z" fill="#f8cecc" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(248, 206, 204), rgb(81, 45, 43)); stroke: light-dark(rgb(184, 84, 80), rgb(215, 129, 126));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 94px; margin-left: 180px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 12px; font-family: &quot;Helvetica&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    @capire/
+                                    <br/>
+                                    <b>
+                                        bookstore
+                                    </b>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="224" y="98" fill="light-dark(#000000, #ffffff)" font-family="&quot;Helvetica&quot;" font-size="12px" text-anchor="middle">
+                        @capire/...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 286 1 L 336 1 L 356 41 L 336 81 L 286 81 L 266 41 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(213, 232, 212), rgb(31, 47, 30)); stroke: light-dark(rgb(130, 179, 102), rgb(68, 110, 44));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 267px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 12px; font-family: &quot;Helvetica&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    @capire/
+                                    <br/>
+                                    <b>
+                                        reviews
+                                    </b>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="311" y="45" fill="light-dark(#000000, #ffffff)" font-family="&quot;Helvetica&quot;" font-size="12px" text-anchor="middle">
+                        @capire/...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 286 106 L 336 106 L 356 146 L 336 186 L 286 186 L 266 146 Z" fill="#f5f5f5" stroke="#666666" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(245, 245, 245), rgb(26, 26, 26)); stroke: light-dark(rgb(102, 102, 102), rgb(149, 149, 149));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 146px; margin-left: 267px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #333333; ">
+                                <div style="display: inline-block; font-size: 12px; font-family: &quot;Helvetica&quot;; color: light-dark(#333333, #c1c1c1); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    @capire/
+                                    <br/>
+                                    <b>
+                                        common
+                                    </b>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="311" y="150" fill="#333333" font-family="&quot;Helvetica&quot;" font-size="12px" text-anchor="middle">
+                        @capire/...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 111 106 L 161 106 L 181 146 L 161 186 L 111 186 L 91 146 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(218, 232, 252), rgb(29, 41, 59)); stroke: light-dark(rgb(108, 142, 191), rgb(92, 121, 163));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 146px; margin-left: 92px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 12px; font-family: &quot;Helvetica&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    @capire/
+                                    <br/>
+                                    <b>
+                                        orders
+                                    </b>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="136" y="150" fill="light-dark(#000000, #ffffff)" font-family="&quot;Helvetica&quot;" font-size="12px" text-anchor="middle">
+                        @capire/...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 276.35 125.29 L 266.36 119.32" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+            <path d="M 260.57 115.86 L 270.6 116.61 L 266.36 119.32 L 265.98 124.34 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 255, 255), rgb(18, 18, 18)); stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+        </g>
+        <g>
+            <path d="M 170.74 125.47 L 181.53 119.1" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+            <path d="M 187.34 115.66 L 181.88 124.12 L 181.53 119.1 L 177.3 116.37 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 255, 255), rgb(18, 18, 18)); stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+        </g>
+        <g>
+            <path d="M 224 155 L 224 142.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+            <path d="M 224 136.24 L 228.5 145.24 L 224 142.99 L 219.5 145.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 255, 255), rgb(18, 18, 18)); stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+        </g>
+        <g>
+            <path d="M 276.51 62.01 L 266.17 68.31" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+            <path d="M 260.4 71.82 L 265.75 63.3 L 266.17 68.31 L 270.43 70.98 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 255, 255), rgb(18, 18, 18)); stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+        </g>
+        <g>
+            <path d="M 111 1 L 161 1 L 181 41 L 161 81 L 111 81 L 91 41 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(218, 232, 252), rgb(29, 41, 59)); stroke: light-dark(rgb(108, 142, 191), rgb(92, 121, 163));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 92px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 12px; font-family: &quot;Helvetica&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    @capire/
+                                    <br/>
+                                    <b>
+                                        suppliers
+                                    </b>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="136" y="45" fill="light-dark(#000000, #ffffff)" font-family="&quot;Helvetica&quot;" font-size="12px" text-anchor="middle">
+                        @capire/...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 21 54 L 71 54 L 91 94 L 71 134 L 21 134 L 1 94 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(225, 213, 231), rgb(57, 47, 63)); stroke: light-dark(rgb(150, 115, 166), rgb(149, 119, 163));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 94px; margin-left: 2px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 12px; font-family: &quot;Helvetica&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    <b>
+                                        S/4
+                                    </b>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="46" y="98" fill="light-dark(#000000, #ffffff)" font-family="&quot;Helvetica&quot;" font-size="12px" text-anchor="middle">
+                        S/4
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 80.76 73.53 L 93.49 66.03" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+            <path d="M 99.31 62.61 L 93.84 71.05 L 93.49 66.03 L 89.27 63.3 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 255, 255), rgb(18, 18, 18)); stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+        </g>
+        <g>
+            <path d="M 80.91 114.17 L 93.31 121.33" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+            <path d="M 99.15 124.71 L 89.11 124.1 L 93.31 121.33 L 93.61 116.31 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 255, 255), rgb(18, 18, 18)); stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+        </g>
+        <g>
+            <path d="M 170.59 61.83 L 181.72 68.53" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+            <path d="M 187.5 72.02 L 177.47 71.23 L 181.72 68.53 L 182.11 63.52 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 255, 255), rgb(18, 18, 18)); stroke: light-dark(rgb(255, 255, 255), rgb(18, 18, 18));"/>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.drawio.com/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
--- a/readme/incidents.drawio.svg
+++ b/readme/incidents.drawio.svg
--- a/readme/index-html.png
+++ b/readme/index-html.png
--- a/readme/samples.drawio.svg
+++ b/readme/samples.drawio.svg
@@ -0,0 +1,228 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" style="background: transparent; background-color: transparent;" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="368px" height="230px" viewBox="-0.5 -0.5 368 230" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7ZpLc9o6GIZ/Dcsw1l1aBtKmi3Z64cycmbMTtsCeGOTKJpD++iPHkrEdE9okBJICC6xXsm7f8+nKAI0Xm2sjs/iLjlQ6gEG0GaCrAYQAAGF/SuWuUogIKmFukqiSGsIk+aXcm15dJZHKnVZJhdZpkWRtMdTLpQqLliaN0et2splOo5aQybl6IExCmT5U/02iIq5UDtlW/6SSeexLBtQ1eCF9YteSPJaRXjck9GGAxkbronpabMYqLTuv3S8fd8TWFTNqWfzOC3N4fb26ir9+/u/zr4vg++pncKMvXC63Ml25Bg8gTW1+o2lZ5eLO9QP9uSrrOZrpZXGR31vp0iYAILOWHm3j7dO8/B1pfZPHOvO52WpNfVxdgnlWEZdZ5jq2zgLaPs7Kx1ht5FwvbapMmWShCmW26jcvWROM1nFSqEkmw/K1tWXYanGxSG0IlJVJNspTWYXTdKxTbe7LQ7OZomFo9bww+kY1YiImpkFQx3h2oGvgR7lI0tIlxnqRhLYRE7nM7c+XiUvgywQ+7BoZ3PdA1/LejMoUatOQHAnXStsGmzubxMVC4l5xbokErcLrLeTeU+MG39xp0rnVvM55S559cPD9AYhwJ4h5JpfPAuXFM5q2KC+0UU2k22n7wLdaVZcGyC/iEjsKOL6b8FD1u8mUE0wO5Ca2C8JkOf/HjkLoihzGb6Bgx/UbdHi/ed5M8EPdJsrOwoebCCbK3Caheuc+FBHFI9znQxxOEaWH8KHn+wvCHX/B/Lj+gh9b8FSmtv200KXr7GO2Uq5kIY9OhwKWD9ZHh6AMyTdCB8LkuHSQUx9Nv5pImfNg+ncOpoCemLvQHnfpWFYto8tyG25DYSrzPAnbhmp3c6nYN1wnVuOZNEUr3DEYGZffw5kn1ysTqv0ziq3nXBX7dzgqah04PDR2w5ikx5heMyqVRXLbPqbos7Ar4ZtObMu2LAHRhgn7Iw2fR9Vw91rzXKGbE+yO4qyTU9U1D3K6R65u+NMpZGcK65nrjVEICRsSjuoPpG2SABs2YhF6IqKQgSEGtP4w3C4G0mEjllL0qvzyM7/1QeQ745c9DtZL8Usfd5MD8yvO/NbnMO+LX/w6/OLj8uuvmk531zdZZVmanDd+543f4DRO0cDue8Nnu8zE1gifLD9S8VnvTQYNuZrOdvLTxWM/T66RPfe8f8wPJe31QgCOjA88Lxm2TrR3zeAnqLexaOguev1kf+BFr6/Fay0a+i7ezgjvSkhOimBg0WIBJ3YWYgIx6I++PFoIW/JYgANEOMP4iatewPkQCoCZ4DCgkDHULgVi60ZQEEExgIS88qK37yLs7+M3+E1+T2vbBhiyQywvD22FCCjpTO8MDu1WjRCAA8CpgE/Fl9oBFjBGWBCI+q6hLkQMEaIYcyI4QAF/IXptcPuXuCr59o+F6MP/&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <g>
+            <path d="M 207 149 L 257 149 L 277 189 L 257 229 L 207 229 L 187 189 Z" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(255, 230, 204), rgb(54, 33, 10)); stroke: light-dark(rgb(215, 155, 0), rgb(153, 101, 0));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 189px; margin-left: 188px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    <b style="font-size: 11px;">
+                                        Bookshop
+                                    </b>
+                                    <br style="font-size: 11px;"/>
+                                    App
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="232" y="192" fill="light-dark(#000000, #ffffff)" font-family="&quot;Comic Sans MS&quot;" font-size="11px" text-anchor="middle">
+                        Bookshop...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 207 50 L 257 50 L 277 90 L 257 130 L 207 130 L 187 90 Z" fill="#f8cecc" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(248, 206, 204), rgb(81, 45, 43)); stroke: light-dark(rgb(184, 84, 80), rgb(215, 129, 126));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 93px; margin-left: 188px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    <span style="font-size: 11px;">
+                                        <span style="font-size: 11px;">
+                                            <b>
+                                                Bookstore
+                                                <br/>
+                                            </b>
+                                        </span>
+                                        App
+                                        <br style="font-size: 11px;"/>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="232" y="96" fill="light-dark(#000000, #ffffff)" font-family="&quot;Comic Sans MS&quot;" font-size="11px" text-anchor="middle">
+                        Bookstore...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 297 1 L 347 1 L 367 41 L 347 81 L 297 81 L 277 41 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(213, 232, 212), rgb(31, 47, 30)); stroke: light-dark(rgb(130, 179, 102), rgb(68, 110, 44));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 278px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    <span style="font-size: 11px;">
+                                        <b style="font-size: 11px;">
+                                            Reviews
+                                        </b>
+                                        <br style="font-size: 11px;"/>
+                                        Service
+                                        <br style="font-size: 11px;"/>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="322" y="44" fill="light-dark(#000000, #ffffff)" font-family="&quot;Comic Sans MS&quot;" font-size="11px" text-anchor="middle">
+                        Reviews...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 297 98 L 347 98 L 367 138 L 347 178 L 297 178 L 277 138 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(225, 213, 231), rgb(57, 47, 63)); stroke: light-dark(rgb(150, 115, 166), rgb(149, 119, 163));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 138px; margin-left: 278px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    <b>
+                                        Common
+                                    </b>
+                                    <br/>
+                                    Data
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="322" y="141" fill="light-dark(#000000, #ffffff)" font-family="&quot;Comic Sans MS&quot;" font-size="11px" text-anchor="middle">
+                        Common...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 117 98 L 167 98 L 187 138 L 167 178 L 117 178 L 97 138 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(213, 232, 212), rgb(31, 47, 30)); stroke: light-dark(rgb(130, 179, 102), rgb(68, 110, 44));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 138px; margin-left: 98px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    <span style="font-size: 11px;">
+                                        <b style="font-size: 11px;">
+                                            Orders
+                                        </b>
+                                        <br style="font-size: 11px;"/>
+                                        Service
+                                        <br style="font-size: 11px;"/>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="142" y="141" fill="light-dark(#000000, #ffffff)" font-family="&quot;Comic Sans MS&quot;" font-size="11px" text-anchor="middle">
+                        Orders...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 286.47 119.05 L 273.81 112.3" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+            <path d="M 268.51 109.47 L 277.45 109.71 L 273.81 112.3 L 273.69 116.77 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(92, 92, 92), rgb(158, 158, 158)); stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+        </g>
+        <g>
+            <path d="M 177.53 119.05 L 190.19 112.3" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+            <path d="M 195.49 109.47 L 190.31 116.77 L 190.19 112.3 L 186.55 109.71 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(92, 92, 92), rgb(158, 158, 158)); stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+        </g>
+        <g>
+            <path d="M 232 149 L 232 137.12" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+            <path d="M 232 131.12 L 236 139.12 L 232 137.12 L 228 139.12 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(92, 92, 92), rgb(158, 158, 158)); stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+        </g>
+        <g>
+            <path d="M 286.63 60.26 L 273.62 67.34" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+            <path d="M 268.35 70.21 L 273.47 62.87 L 273.62 67.34 L 277.29 69.9 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(92, 92, 92), rgb(158, 158, 158)); stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+        </g>
+        <g>
+            <path d="M 117 1 L 167 1 L 187 41 L 167 81 L 117 81 L 97 41 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(213, 232, 212), rgb(31, 47, 30)); stroke: light-dark(rgb(130, 179, 102), rgb(68, 110, 44));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 98px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                    <span style="font-size: 11px;">
+                                        <b style="font-size: 11px;">
+                                            Suppliers
+                                        </b>
+                                        <br style="font-size: 11px;"/>
+                                        Service
+                                        <br style="font-size: 11px;"/>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="142" y="44" fill="light-dark(#000000, #ffffff)" font-family="&quot;Comic Sans MS&quot;" font-size="11px" text-anchor="middle">
+                        Suppliers...
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 21 54 L 71 54 L 91 94 L 71 134 L 21 134 L 1 94 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(218, 232, 252), rgb(29, 41, 59)); stroke: light-dark(rgb(108, 142, 191), rgb(92, 121, 163));"/>
+        </g>
+        <g>
+            <g transform="translate(-0.5 -0.5)">
+                <switch>
+                    <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                        <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 94px; margin-left: 2px;">
+                            <div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; ">
+                                <div style="display: inline-block; font-size: 11px; font-family: &quot;Comic Sans MS&quot;; color: light-dark(#000000, #ffffff); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; word-wrap: normal; ">
+                                    <span style="font-size: 11px;">
+                                        S/4
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                    </foreignObject>
+                    <text x="46" y="97" fill="light-dark(#000000, #ffffff)" font-family="&quot;Comic Sans MS&quot;" font-size="11px" text-anchor="middle" font-weight="bold">
+                        S/4
+                    </text>
+                </switch>
+            </g>
+        </g>
+        <g>
+            <path d="M 81.27 74.53 L 100.5 63.91" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+            <path d="M 105.76 61.01 L 100.69 68.38 L 100.5 63.91 L 96.82 61.37 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(92, 92, 92), rgb(158, 158, 158)); stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+        </g>
+        <g>
+            <path d="M 82.61 110.78 L 98.92 118.25" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+            <path d="M 104.37 120.75 L 95.43 121.06 L 98.92 118.25 L 98.77 113.79 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(92, 92, 92), rgb(158, 158, 158)); stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+        </g>
+        <g>
+            <path d="M 177.37 60.26 L 190.38 67.34" fill="none" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="stroke" style="stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+            <path d="M 195.65 70.21 L 186.71 69.9 L 190.38 67.34 L 190.53 62.87 Z" fill="#5c5c5c" stroke="#5c5c5c" stroke-miterlimit="10" pointer-events="all" style="fill: light-dark(rgb(92, 92, 92), rgb(158, 158, 158)); stroke: light-dark(rgb(92, 92, 92), rgb(158, 158, 158));"/>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.drawio.com/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
--- a/readme/samples.md
+++ b/readme/samples.md
@@ -3,10 +3,10 @@
 The following list gives an overview of the samples provided in subdirectories.
 Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](#all-in-one-monorepo) umbrella setup.

-![](etc/samples.drawio.svg)
+![](samples.drawio.svg)


-## [@capire/bookshop](bookshop)
+## [@capire/bookshop](../bookshop)

 - [Getting Started](https://cap.cloud.sap/docs/get-started/in-a-nutshell) with CAP, briefly introducing:
 - [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)
@@ -17,24 +17,24 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 - [Using Databases](https://cap.cloud.sap/docs/guides/databases)


-## [@capire/common](common)
+## [@capire/common](../common)

 - Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:
 - Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)
 - Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)
 - [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)
 - Using [Aspects](https://cap.cloud.sap/docs/cds/cdl#aspects)
- Used in the [fiori app sample](#fiori)
+- Used in the [bookstore sample](#capire-bookstore)


-## [@capire/orders](orders)
+## [@capire/orders](../orders)

 - A standalone orders management service, demonstrating:
 - Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with
 - [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)


-## [@capire/reviews](reviews)
+## [@capire/reviews](../reviews)

 - Shows how to implement a modular service to manage product reviews, including:
 - Consuming other services synchronously and asynchronously
@@ -47,22 +47,18 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 - As well as managed data, input validations, and authorization


-## [@capire/bookstore](bookstore)
+## [@capire/bookstore](../bookstore)

 - A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/extensibility/composition) these packages:
-  - [@capire/bookshop](bookshop)
-  - [@capire/reviews](reviews)
-  - [@capire/orders](orders)
-  - [@capire/common](common)
-  - [@capire/data-viewer](etc/data-viewer)
- [The Vue.js app](bookshop/app/vue) imported from `bookshop` is served as well
- [The Vue.js app](reviews/app/vue) imported from `reviews` is served as well
- [The Vue.js app](etc/data-viewer/app/data) imported from `data-viewer` is served as well
- [The Fiori app](orders/app) imported from `orders` is served as well
-
-
-## [@capire/fiori](fiori)
-
+  - [@capire/bookshop](../bookshop)
+  - [@capire/reviews](../reviews)
+  - [@capire/orders](../orders)
+  - [@capire/common](../common)
+  - [@capire/data-viewer](data-viewer)
+- [The Vue.js app](../bookshop/app/vue) imported from `bookshop` is served as well
+- [The Vue.js app](../reviews/app/vue) imported from `reviews` is served as well
+- [The Vue.js app](data-viewer/app/data) imported from `data-viewer` is served as well
+- [The Fiori app](../orders/app) imported from `orders` is served as well
 - Adds an SAP Fiori elements application to bookstore, thereby introducing:
 - OData Annotations in `.cds` files
 - Support for Fiori Draft
@@ -75,4 +71,4 @@ See the [Serving Fiori UIs](https://cap.cloud.sap/docs/advanced/fiori) documenta

 # All-in-one Monorepo

-Each sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder and acts like a local npm registry to the individual sample packages.
+Each sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](../package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder and acts like a local npm registry to the individual sample packages.
--- a/1
+++ b/1
--- a/1
+++ b/1
--- a/1
+++ b/1
				`@@ -1 +0,0 @@`
				`cds.requires.[hybrid].messaging.kind=file-based-messaging`