diff --git a/bookshop/.vscode/launch.json b/books/.vscode/launch.json
similarity index 100%
rename from bookshop/.vscode/launch.json
rename to books/.vscode/launch.json
diff --git a/bookshop/app/index.cds b/books/app/index.cds
similarity index 100%
rename from bookshop/app/index.cds
rename to books/app/index.cds
diff --git a/bookshop/app/vue/app.js b/books/app/vue/app.js
similarity index 100%
rename from bookshop/app/vue/app.js
rename to books/app/vue/app.js
diff --git a/bookshop/app/vue/index.html b/books/app/vue/index.html
similarity index 100%
rename from bookshop/app/vue/index.html
rename to books/app/vue/index.html
diff --git a/bookshop/db/data/sap.capire.bookshop-Authors.csv b/books/db/data/sap.capire.bookshop-Authors.csv
similarity index 100%
rename from bookshop/db/data/sap.capire.bookshop-Authors.csv
rename to books/db/data/sap.capire.bookshop-Authors.csv
diff --git a/bookshop/db/data/sap.capire.bookshop-Books.csv b/books/db/data/sap.capire.bookshop-Books.csv
similarity index 100%
rename from bookshop/db/data/sap.capire.bookshop-Books.csv
rename to books/db/data/sap.capire.bookshop-Books.csv
diff --git a/bookshop/db/data/sap.capire.bookshop-Books_texts.csv b/books/db/data/sap.capire.bookshop-Books_texts.csv
similarity index 100%
rename from bookshop/db/data/sap.capire.bookshop-Books_texts.csv
rename to books/db/data/sap.capire.bookshop-Books_texts.csv
diff --git a/bookshop/db/data/sap.capire.bookshop-Genres.csv b/books/db/data/sap.capire.bookshop-Genres.csv
similarity index 100%
rename from bookshop/db/data/sap.capire.bookshop-Genres.csv
rename to books/db/data/sap.capire.bookshop-Genres.csv
diff --git a/bookshop/db/schema.cds b/books/db/schema.cds
similarity index 100%
rename from bookshop/db/schema.cds
rename to books/db/schema.cds
diff --git a/bookshop/index.cds b/books/index.cds
similarity index 100%
rename from bookshop/index.cds
rename to books/index.cds
diff --git a/bookshop/index.js b/books/index.js
similarity index 100%
rename from bookshop/index.js
rename to books/index.js
diff --git a/bookshop/package.json b/books/package.json
similarity index 100%
rename from bookshop/package.json
rename to books/package.json
diff --git a/bookshop/readme.md b/books/readme.md
similarity index 100%
rename from bookshop/readme.md
rename to books/readme.md
diff --git a/bookshop/srv/admin-service.cds b/books/srv/admin-service.cds
similarity index 100%
rename from bookshop/srv/admin-service.cds
rename to books/srv/admin-service.cds
diff --git a/bookshop/srv/admin-service.js b/books/srv/admin-service.js
similarity index 100%
rename from bookshop/srv/admin-service.js
rename to books/srv/admin-service.js
diff --git a/bookshop/srv/cat-service.cds b/books/srv/cat-service.cds
similarity index 100%
rename from bookshop/srv/cat-service.cds
rename to books/srv/cat-service.cds
diff --git a/bookshop/srv/cat-service.js b/books/srv/cat-service.js
similarity index 100%
rename from bookshop/srv/cat-service.js
rename to books/srv/cat-service.js
diff --git a/bookshop/test/genres.cds b/books/test/genres.cds
similarity index 100%
rename from bookshop/test/genres.cds
rename to books/test/genres.cds
diff --git a/bookshop/test/genres.http b/books/test/genres.http
similarity index 100%
rename from bookshop/test/genres.http
rename to books/test/genres.http
diff --git a/bookshop/test/requests.http b/books/test/requests.http
similarity index 100%
rename from bookshop/test/requests.http
rename to books/test/requests.http
diff --git a/fiori/.env b/bookstore/.env
similarity index 100%
rename from fiori/.env
rename to bookstore/.env
diff --git a/fiori/app/_i18n/i18n.properties b/bookstore/app/_i18n/i18n.properties
similarity index 100%
rename from fiori/app/_i18n/i18n.properties
rename to bookstore/app/_i18n/i18n.properties
diff --git a/fiori/app/_i18n/i18n_de.properties b/bookstore/app/_i18n/i18n_de.properties
similarity index 100%
rename from fiori/app/_i18n/i18n_de.properties
rename to bookstore/app/_i18n/i18n_de.properties
diff --git a/fiori/app/admin-fiori.html b/bookstore/app/admin-fiori.html
similarity index 100%
rename from fiori/app/admin-fiori.html
rename to bookstore/app/admin-fiori.html
diff --git a/fiori/app/admin/fiori-service.cds b/bookstore/app/admin/fiori-service.cds
similarity index 100%
rename from fiori/app/admin/fiori-service.cds
rename to bookstore/app/admin/fiori-service.cds
diff --git a/fiori/app/admin/webapp/Component.js b/bookstore/app/admin/webapp/Component.js
similarity index 100%
rename from fiori/app/admin/webapp/Component.js
rename to bookstore/app/admin/webapp/Component.js
diff --git a/fiori/app/admin/webapp/i18n/i18n.properties b/bookstore/app/admin/webapp/i18n/i18n.properties
similarity index 100%
rename from fiori/app/admin/webapp/i18n/i18n.properties
rename to bookstore/app/admin/webapp/i18n/i18n.properties
diff --git a/fiori/app/admin/webapp/manifest.json b/bookstore/app/admin/webapp/manifest.json
similarity index 100%
rename from fiori/app/admin/webapp/manifest.json
rename to bookstore/app/admin/webapp/manifest.json
diff --git a/fiori/app/bookshop.html b/bookstore/app/bookshop.html
similarity index 100%
rename from fiori/app/bookshop.html
rename to bookstore/app/bookshop.html
diff --git a/fiori/app/browse/fiori-service.cds b/bookstore/app/browse/fiori-service.cds
similarity index 100%
rename from fiori/app/browse/fiori-service.cds
rename to bookstore/app/browse/fiori-service.cds
diff --git a/fiori/app/browse/webapp/Component.js b/bookstore/app/browse/webapp/Component.js
similarity index 100%
rename from fiori/app/browse/webapp/Component.js
rename to bookstore/app/browse/webapp/Component.js
diff --git a/fiori/app/browse/webapp/i18n/i18n.properties b/bookstore/app/browse/webapp/i18n/i18n.properties
similarity index 100%
rename from fiori/app/browse/webapp/i18n/i18n.properties
rename to bookstore/app/browse/webapp/i18n/i18n.properties
diff --git a/fiori/app/browse/webapp/manifest.json b/bookstore/app/browse/webapp/manifest.json
similarity index 100%
rename from fiori/app/browse/webapp/manifest.json
rename to bookstore/app/browse/webapp/manifest.json
diff --git a/fiori/app/common.cds b/bookstore/app/common.cds
similarity index 100%
rename from fiori/app/common.cds
rename to bookstore/app/common.cds
diff --git a/fiori/app/index.cds b/bookstore/app/index.cds
similarity index 100%
rename from fiori/app/index.cds
rename to bookstore/app/index.cds
diff --git a/fiori/app/reviews.html b/bookstore/app/reviews.html
similarity index 100%
rename from fiori/app/reviews.html
rename to bookstore/app/reviews.html
diff --git a/fiori/package.json b/bookstore/package.json
similarity index 100%
rename from fiori/package.json
rename to bookstore/package.json
diff --git a/fiori/server.js b/bookstore/server.js
similarity index 100%
rename from fiori/server.js
rename to bookstore/server.js
diff --git a/fiori/srv/mashup.cds b/bookstore/srv/mashup.cds
similarity index 100%
rename from fiori/srv/mashup.cds
rename to bookstore/srv/mashup.cds
diff --git a/fiori/srv/mashup.js b/bookstore/srv/mashup.js
similarity index 100%
rename from fiori/srv/mashup.js
rename to bookstore/srv/mashup.js
diff --git a/fiori/test/requests.http b/bookstore/test/requests.http
similarity index 100%
rename from fiori/test/requests.http
rename to bookstore/test/requests.http
diff --git a/chinook/.env b/chinook/.env
new file mode 100644
index 00000000..661be29a
--- /dev/null
+++ b/chinook/.env
@@ -0,0 +1,3 @@
+# REVISIT: This is not a good practice -> don't do it that way, we just did it to save some time :)
+ACCESS_TOKEN_SECRET=secret
+REFRESH_TOKEN_SECRET=refresh-secret
diff --git a/media-store/.eslintrc b/chinook/.eslintrc
similarity index 100%
rename from media-store/.eslintrc
rename to chinook/.eslintrc
diff --git a/media-store/.gitignore b/chinook/.gitignore
similarity index 100%
rename from media-store/.gitignore
rename to chinook/.gitignore
diff --git a/media-store/.vscode/extensions.json b/chinook/.vscode/extensions.json
similarity index 100%
rename from media-store/.vscode/extensions.json
rename to chinook/.vscode/extensions.json
diff --git a/media-store/.vscode/launch.json b/chinook/.vscode/launch.json
similarity index 100%
rename from media-store/.vscode/launch.json
rename to chinook/.vscode/launch.json
diff --git a/media-store/.vscode/settings.json b/chinook/.vscode/settings.json
similarity index 100%
rename from media-store/.vscode/settings.json
rename to chinook/.vscode/settings.json
diff --git a/media-store/.vscode/tasks.json b/chinook/.vscode/tasks.json
similarity index 100%
rename from media-store/.vscode/tasks.json
rename to chinook/.vscode/tasks.json
diff --git a/media-store/README.md b/chinook/README.md
similarity index 100%
rename from media-store/README.md
rename to chinook/README.md
diff --git a/media-store/app/deployers/approuter/package.json b/chinook/app/deployers/approuter/package.json
similarity index 100%
rename from media-store/app/deployers/approuter/package.json
rename to chinook/app/deployers/approuter/package.json
diff --git a/media-store/app/deployers/approuter/xs-app.json b/chinook/app/deployers/approuter/xs-app.json
similarity index 100%
rename from media-store/app/deployers/approuter/xs-app.json
rename to chinook/app/deployers/approuter/xs-app.json
diff --git a/media-store/app/deployers/html5Deployer/package.json b/chinook/app/deployers/html5Deployer/package.json
similarity index 100%
rename from media-store/app/deployers/html5Deployer/package.json
rename to chinook/app/deployers/html5Deployer/package.json
diff --git a/media-store/app/deployers/xs-security.json b/chinook/app/deployers/xs-security.json
similarity index 100%
rename from media-store/app/deployers/xs-security.json
rename to chinook/app/deployers/xs-security.json
diff --git a/media-store/app/react/.babelrc b/chinook/app/react/.babelrc
similarity index 100%
rename from media-store/app/react/.babelrc
rename to chinook/app/react/.babelrc
diff --git a/media-store/app/react/.eslintrc.json b/chinook/app/react/.eslintrc.json
similarity index 100%
rename from media-store/app/react/.eslintrc.json
rename to chinook/app/react/.eslintrc.json
diff --git a/media-store/app/react/.gitignore b/chinook/app/react/.gitignore
similarity index 100%
rename from media-store/app/react/.gitignore
rename to chinook/app/react/.gitignore
diff --git a/media-store/app/react/.prettierrc b/chinook/app/react/.prettierrc
similarity index 100%
rename from media-store/app/react/.prettierrc
rename to chinook/app/react/.prettierrc
diff --git a/media-store/app/react/.vscode/launch.json b/chinook/app/react/.vscode/launch.json
similarity index 100%
rename from media-store/app/react/.vscode/launch.json
rename to chinook/app/react/.vscode/launch.json
diff --git a/media-store/app/react/README.md b/chinook/app/react/README.md
similarity index 100%
rename from media-store/app/react/README.md
rename to chinook/app/react/README.md
diff --git a/media-store/app/react/package.json b/chinook/app/react/package.json
similarity index 100%
rename from media-store/app/react/package.json
rename to chinook/app/react/package.json
diff --git a/media-store/app/react/public/index.html b/chinook/app/react/public/index.html
similarity index 100%
rename from media-store/app/react/public/index.html
rename to chinook/app/react/public/index.html
diff --git a/media-store/app/react/public/logo192.png b/chinook/app/react/public/logo192.png
similarity index 100%
rename from media-store/app/react/public/logo192.png
rename to chinook/app/react/public/logo192.png
diff --git a/media-store/app/react/public/logo512.png b/chinook/app/react/public/logo512.png
similarity index 100%
rename from media-store/app/react/public/logo512.png
rename to chinook/app/react/public/logo512.png
diff --git a/media-store/app/react/public/manifest.json b/chinook/app/react/public/manifest.json
similarity index 100%
rename from media-store/app/react/public/manifest.json
rename to chinook/app/react/public/manifest.json
diff --git a/media-store/app/react/public/robots.txt b/chinook/app/react/public/robots.txt
similarity index 100%
rename from media-store/app/react/public/robots.txt
rename to chinook/app/react/public/robots.txt
diff --git a/media-store/app/react/public/xs-app.json b/chinook/app/react/public/xs-app.json
similarity index 100%
rename from media-store/app/react/public/xs-app.json
rename to chinook/app/react/public/xs-app.json
diff --git a/media-store/app/react/src/App.css b/chinook/app/react/src/App.css
similarity index 100%
rename from media-store/app/react/src/App.css
rename to chinook/app/react/src/App.css
diff --git a/media-store/app/react/src/App.jsx b/chinook/app/react/src/App.jsx
similarity index 100%
rename from media-store/app/react/src/App.jsx
rename to chinook/app/react/src/App.jsx
diff --git a/media-store/app/react/src/api/axiosInstance.js b/chinook/app/react/src/api/axiosInstance.js
similarity index 100%
rename from media-store/app/react/src/api/axiosInstance.js
rename to chinook/app/react/src/api/axiosInstance.js
diff --git a/media-store/app/react/src/api/calls.js b/chinook/app/react/src/api/calls.js
similarity index 100%
rename from media-store/app/react/src/api/calls.js
rename to chinook/app/react/src/api/calls.js
diff --git a/media-store/app/react/src/components/ErrorPage.jsx b/chinook/app/react/src/components/ErrorPage.jsx
similarity index 100%
rename from media-store/app/react/src/components/ErrorPage.jsx
rename to chinook/app/react/src/components/ErrorPage.jsx
diff --git a/media-store/app/react/src/components/Header.css b/chinook/app/react/src/components/Header.css
similarity index 100%
rename from media-store/app/react/src/components/Header.css
rename to chinook/app/react/src/components/Header.css
diff --git a/media-store/app/react/src/components/Header.jsx b/chinook/app/react/src/components/Header.jsx
similarity index 100%
rename from media-store/app/react/src/components/Header.jsx
rename to chinook/app/react/src/components/Header.jsx
diff --git a/media-store/app/react/src/components/InvoicePage.jsx b/chinook/app/react/src/components/InvoicePage.jsx
similarity index 100%
rename from media-store/app/react/src/components/InvoicePage.jsx
rename to chinook/app/react/src/components/InvoicePage.jsx
diff --git a/media-store/app/react/src/components/Login.jsx b/chinook/app/react/src/components/Login.jsx
similarity index 100%
rename from media-store/app/react/src/components/Login.jsx
rename to chinook/app/react/src/components/Login.jsx
diff --git a/media-store/app/react/src/components/ManageStore.jsx b/chinook/app/react/src/components/ManageStore.jsx
similarity index 100%
rename from media-store/app/react/src/components/ManageStore.jsx
rename to chinook/app/react/src/components/ManageStore.jsx
diff --git a/media-store/app/react/src/components/MyInvoicesPage.jsx b/chinook/app/react/src/components/MyInvoicesPage.jsx
similarity index 100%
rename from media-store/app/react/src/components/MyInvoicesPage.jsx
rename to chinook/app/react/src/components/MyInvoicesPage.jsx
diff --git a/media-store/app/react/src/components/PersonPage.jsx b/chinook/app/react/src/components/PersonPage.jsx
similarity index 100%
rename from media-store/app/react/src/components/PersonPage.jsx
rename to chinook/app/react/src/components/PersonPage.jsx
diff --git a/media-store/app/react/src/components/Router.jsx b/chinook/app/react/src/components/Router.jsx
similarity index 100%
rename from media-store/app/react/src/components/Router.jsx
rename to chinook/app/react/src/components/Router.jsx
diff --git a/media-store/app/react/src/components/TracksPage.css b/chinook/app/react/src/components/TracksPage.css
similarity index 100%
rename from media-store/app/react/src/components/TracksPage.css
rename to chinook/app/react/src/components/TracksPage.css
diff --git a/media-store/app/react/src/components/TracksPage.jsx b/chinook/app/react/src/components/TracksPage.jsx
similarity index 100%
rename from media-store/app/react/src/components/TracksPage.jsx
rename to chinook/app/react/src/components/TracksPage.jsx
diff --git a/media-store/app/react/src/components/manage-store/AddAlbumForm.jsx b/chinook/app/react/src/components/manage-store/AddAlbumForm.jsx
similarity index 100%
rename from media-store/app/react/src/components/manage-store/AddAlbumForm.jsx
rename to chinook/app/react/src/components/manage-store/AddAlbumForm.jsx
diff --git a/media-store/app/react/src/components/manage-store/AddArtistForm.jsx b/chinook/app/react/src/components/manage-store/AddArtistForm.jsx
similarity index 100%
rename from media-store/app/react/src/components/manage-store/AddArtistForm.jsx
rename to chinook/app/react/src/components/manage-store/AddArtistForm.jsx
diff --git a/media-store/app/react/src/components/manage-store/TrackForm.jsx b/chinook/app/react/src/components/manage-store/TrackForm.jsx
similarity index 100%
rename from media-store/app/react/src/components/manage-store/TrackForm.jsx
rename to chinook/app/react/src/components/manage-store/TrackForm.jsx
diff --git a/media-store/app/react/src/components/tracks/DeleteAction.jsx b/chinook/app/react/src/components/tracks/DeleteAction.jsx
similarity index 100%
rename from media-store/app/react/src/components/tracks/DeleteAction.jsx
rename to chinook/app/react/src/components/tracks/DeleteAction.jsx
diff --git a/media-store/app/react/src/components/tracks/EditAction.jsx b/chinook/app/react/src/components/tracks/EditAction.jsx
similarity index 100%
rename from media-store/app/react/src/components/tracks/EditAction.jsx
rename to chinook/app/react/src/components/tracks/EditAction.jsx
diff --git a/media-store/app/react/src/components/tracks/ManagedTrack.css b/chinook/app/react/src/components/tracks/ManagedTrack.css
similarity index 100%
rename from media-store/app/react/src/components/tracks/ManagedTrack.css
rename to chinook/app/react/src/components/tracks/ManagedTrack.css
diff --git a/media-store/app/react/src/components/tracks/ManagedTrack.jsx b/chinook/app/react/src/components/tracks/ManagedTrack.jsx
similarity index 100%
rename from media-store/app/react/src/components/tracks/ManagedTrack.jsx
rename to chinook/app/react/src/components/tracks/ManagedTrack.jsx
diff --git a/media-store/app/react/src/components/tracks/Track.jsx b/chinook/app/react/src/components/tracks/Track.jsx
similarity index 100%
rename from media-store/app/react/src/components/tracks/Track.jsx
rename to chinook/app/react/src/components/tracks/Track.jsx
diff --git a/media-store/app/react/src/components/tracks/TrackCardBody.jsx b/chinook/app/react/src/components/tracks/TrackCardBody.jsx
similarity index 100%
rename from media-store/app/react/src/components/tracks/TrackCardBody.jsx
rename to chinook/app/react/src/components/tracks/TrackCardBody.jsx
diff --git a/media-store/app/react/src/contexts/AppStateContext.jsx b/chinook/app/react/src/contexts/AppStateContext.jsx
similarity index 100%
rename from media-store/app/react/src/contexts/AppStateContext.jsx
rename to chinook/app/react/src/contexts/AppStateContext.jsx
diff --git a/media-store/app/react/src/hocs/withRestrictions.jsx b/chinook/app/react/src/hocs/withRestrictions.jsx
similarity index 100%
rename from media-store/app/react/src/hocs/withRestrictions.jsx
rename to chinook/app/react/src/hocs/withRestrictions.jsx
diff --git a/media-store/app/react/src/hooks/useAbortableEffect.js b/chinook/app/react/src/hooks/useAbortableEffect.js
similarity index 100%
rename from media-store/app/react/src/hooks/useAbortableEffect.js
rename to chinook/app/react/src/hooks/useAbortableEffect.js
diff --git a/media-store/app/react/src/hooks/useAppState.js b/chinook/app/react/src/hooks/useAppState.js
similarity index 100%
rename from media-store/app/react/src/hooks/useAppState.js
rename to chinook/app/react/src/hooks/useAppState.js
diff --git a/media-store/app/react/src/hooks/useErrors.js b/chinook/app/react/src/hooks/useErrors.js
similarity index 100%
rename from media-store/app/react/src/hooks/useErrors.js
rename to chinook/app/react/src/hooks/useErrors.js
diff --git a/media-store/app/react/src/index.jsx b/chinook/app/react/src/index.jsx
similarity index 100%
rename from media-store/app/react/src/index.jsx
rename to chinook/app/react/src/index.jsx
diff --git a/media-store/app/react/src/logo.svg b/chinook/app/react/src/logo.svg
similarity index 100%
rename from media-store/app/react/src/logo.svg
rename to chinook/app/react/src/logo.svg
diff --git a/media-store/app/react/src/serviceWorker.js b/chinook/app/react/src/serviceWorker.js
similarity index 100%
rename from media-store/app/react/src/serviceWorker.js
rename to chinook/app/react/src/serviceWorker.js
diff --git a/media-store/app/react/src/setupTests.js b/chinook/app/react/src/setupTests.js
similarity index 100%
rename from media-store/app/react/src/setupTests.js
rename to chinook/app/react/src/setupTests.js
diff --git a/media-store/app/react/src/util/EventEmitter.js b/chinook/app/react/src/util/EventEmitter.js
similarity index 100%
rename from media-store/app/react/src/util/EventEmitter.js
rename to chinook/app/react/src/util/EventEmitter.js
diff --git a/media-store/app/react/src/util/constants.js b/chinook/app/react/src/util/constants.js
similarity index 100%
rename from media-store/app/react/src/util/constants.js
rename to chinook/app/react/src/util/constants.js
diff --git a/media-store/app/react/src/util/localStorageService.js b/chinook/app/react/src/util/localStorageService.js
similarity index 100%
rename from media-store/app/react/src/util/localStorageService.js
rename to chinook/app/react/src/util/localStorageService.js
diff --git a/media-store/app/react/src/util/validateUser.js b/chinook/app/react/src/util/validateUser.js
similarity index 100%
rename from media-store/app/react/src/util/validateUser.js
rename to chinook/app/react/src/util/validateUser.js
diff --git a/media-store/app/react/webpack/common-plugins.js b/chinook/app/react/webpack/common-plugins.js
similarity index 100%
rename from media-store/app/react/webpack/common-plugins.js
rename to chinook/app/react/webpack/common-plugins.js
diff --git a/media-store/app/react/webpack/common-rules.js b/chinook/app/react/webpack/common-rules.js
similarity index 100%
rename from media-store/app/react/webpack/common-rules.js
rename to chinook/app/react/webpack/common-rules.js
diff --git a/media-store/app/react/webpack/webpack-dev-server.js b/chinook/app/react/webpack/webpack-dev-server.js
similarity index 100%
rename from media-store/app/react/webpack/webpack-dev-server.js
rename to chinook/app/react/webpack/webpack-dev-server.js
diff --git a/media-store/app/react/webpack/webpack.common.js b/chinook/app/react/webpack/webpack.common.js
similarity index 100%
rename from media-store/app/react/webpack/webpack.common.js
rename to chinook/app/react/webpack/webpack.common.js
diff --git a/media-store/app/react/webpack/webpack.dev.js b/chinook/app/react/webpack/webpack.dev.js
similarity index 100%
rename from media-store/app/react/webpack/webpack.dev.js
rename to chinook/app/react/webpack/webpack.dev.js
diff --git a/media-store/app/react/webpack/webpack.prod.js b/chinook/app/react/webpack/webpack.prod.js
similarity index 100%
rename from media-store/app/react/webpack/webpack.prod.js
rename to chinook/app/react/webpack/webpack.prod.js
diff --git a/media-store/db/data/sap.capire.media.store-Albums.csv b/chinook/db/data/sap.capire.media.store-Albums.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Albums.csv
rename to chinook/db/data/sap.capire.media.store-Albums.csv
diff --git a/media-store/db/data/sap.capire.media.store-Artists.csv b/chinook/db/data/sap.capire.media.store-Artists.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Artists.csv
rename to chinook/db/data/sap.capire.media.store-Artists.csv
diff --git a/media-store/db/data/sap.capire.media.store-Customers.csv b/chinook/db/data/sap.capire.media.store-Customers.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Customers.csv
rename to chinook/db/data/sap.capire.media.store-Customers.csv
diff --git a/media-store/db/data/sap.capire.media.store-Employees.csv b/chinook/db/data/sap.capire.media.store-Employees.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Employees.csv
rename to chinook/db/data/sap.capire.media.store-Employees.csv
diff --git a/media-store/db/data/sap.capire.media.store-Genres.csv b/chinook/db/data/sap.capire.media.store-Genres.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Genres.csv
rename to chinook/db/data/sap.capire.media.store-Genres.csv
diff --git a/media-store/db/data/sap.capire.media.store-Genres_texts.csv b/chinook/db/data/sap.capire.media.store-Genres_texts.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Genres_texts.csv
rename to chinook/db/data/sap.capire.media.store-Genres_texts.csv
diff --git a/media-store/db/data/sap.capire.media.store-InvoiceItems.csv b/chinook/db/data/sap.capire.media.store-InvoiceItems.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-InvoiceItems.csv
rename to chinook/db/data/sap.capire.media.store-InvoiceItems.csv
diff --git a/media-store/db/data/sap.capire.media.store-Invoices.csv b/chinook/db/data/sap.capire.media.store-Invoices.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Invoices.csv
rename to chinook/db/data/sap.capire.media.store-Invoices.csv
diff --git a/media-store/db/data/sap.capire.media.store-PlaylistTrack.csv b/chinook/db/data/sap.capire.media.store-PlaylistTrack.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-PlaylistTrack.csv
rename to chinook/db/data/sap.capire.media.store-PlaylistTrack.csv
diff --git a/media-store/db/data/sap.capire.media.store-Playlists.csv b/chinook/db/data/sap.capire.media.store-Playlists.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Playlists.csv
rename to chinook/db/data/sap.capire.media.store-Playlists.csv
diff --git a/media-store/db/data/sap.capire.media.store-Tracks.csv b/chinook/db/data/sap.capire.media.store-Tracks.csv
similarity index 100%
rename from media-store/db/data/sap.capire.media.store-Tracks.csv
rename to chinook/db/data/sap.capire.media.store-Tracks.csv
diff --git a/media-store/db/schema.cds b/chinook/db/schema.cds
similarity index 100%
rename from media-store/db/schema.cds
rename to chinook/db/schema.cds
diff --git a/media-store/mta.yaml b/chinook/mta.yaml
similarity index 100%
rename from media-store/mta.yaml
rename to chinook/mta.yaml
diff --git a/media-store/package.json b/chinook/package.json
similarity index 91%
rename from media-store/package.json
rename to chinook/package.json
index 8015f55f..082b4851 100644
--- a/media-store/package.json
+++ b/chinook/package.json
@@ -26,8 +26,6 @@
     "test": "mocha test/media-store.test.js --verbose --timeout 10000"
   },
   "cds": {
-    "ACCESS_TOKEN_SECRET": "secret",
-    "REFRESH_TOKEN_SECRET": "refresh-secret",
     "requires": {
       "db": {
         "kind": "sqlite",
@@ -41,4 +39,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/media-store/server.js b/chinook/server.js
similarity index 100%
rename from media-store/server.js
rename to chinook/server.js
diff --git a/media-store/srv/auth.js b/chinook/srv/auth.js
similarity index 93%
rename from media-store/srv/auth.js
rename to chinook/srv/auth.js
index 0a69fc1f..143c7673 100644
--- a/media-store/srv/auth.js
+++ b/chinook/srv/auth.js
@@ -1,7 +1,7 @@
 const cds = require("@sap/cds");
 const jwt = require("jsonwebtoken");
 
-const { ACCESS_TOKEN_SECRET } = cds.env;
+const { ACCESS_TOKEN_SECRET } = process.env;
 
 class MyUser extends cds.User {
   constructor(attr, roles, id) {
diff --git a/media-store/srv/browse-invoices-service.cds b/chinook/srv/browse-invoices-service.cds
similarity index 100%
rename from media-store/srv/browse-invoices-service.cds
rename to chinook/srv/browse-invoices-service.cds
diff --git a/media-store/srv/browse-invoices-service.js b/chinook/srv/browse-invoices-service.js
similarity index 100%
rename from media-store/srv/browse-invoices-service.js
rename to chinook/srv/browse-invoices-service.js
diff --git a/media-store/srv/browse-tracks-service.cds b/chinook/srv/browse-tracks-service.cds
similarity index 100%
rename from media-store/srv/browse-tracks-service.cds
rename to chinook/srv/browse-tracks-service.cds
diff --git a/media-store/srv/browse-tracks-service.js b/chinook/srv/browse-tracks-service.js
similarity index 100%
rename from media-store/srv/browse-tracks-service.js
rename to chinook/srv/browse-tracks-service.js
diff --git a/media-store/srv/manage-store-service.cds b/chinook/srv/manage-store-service.cds
similarity index 100%
rename from media-store/srv/manage-store-service.cds
rename to chinook/srv/manage-store-service.cds
diff --git a/media-store/srv/manage-store-service.js b/chinook/srv/manage-store-service.js
similarity index 100%
rename from media-store/srv/manage-store-service.js
rename to chinook/srv/manage-store-service.js
diff --git a/media-store/srv/user-service.cds b/chinook/srv/user-service.cds
similarity index 100%
rename from media-store/srv/user-service.cds
rename to chinook/srv/user-service.cds
diff --git a/media-store/srv/user-service.js b/chinook/srv/user-service.js
similarity index 97%
rename from media-store/srv/user-service.js
rename to chinook/srv/user-service.js
index 75e3f7b0..c253b1cd 100644
--- a/media-store/srv/user-service.js
+++ b/chinook/srv/user-service.js
@@ -2,7 +2,7 @@ const cds = require("@sap/cds");
 const jwt = require("jsonwebtoken");
 const bcrypt = require("bcryptjs");
 
-const { ACCESS_TOKEN_SECRET, REFRESH_TOKEN_SECRET } = cds.env;
+const { ACCESS_TOKEN_SECRET, REFRESH_TOKEN_SECRET } = process.env;
 
 const ACCESS_TOKEN_EXP_IN = "10m";
 const REFRESH_TOKEN_EXPIRES_IN = "20m";
diff --git a/media-store/test/data/media-store.mock.js b/chinook/test/data/media-store.mock.js
similarity index 100%
rename from media-store/test/data/media-store.mock.js
rename to chinook/test/data/media-store.mock.js
diff --git a/media-store/test/media-store.test.js b/chinook/test/media-store.test.js
similarity index 100%
rename from media-store/test/media-store.test.js
rename to chinook/test/media-store.test.js
diff --git a/media-store/test/test.http b/chinook/test/test.http
similarity index 100%
rename from media-store/test/test.http
rename to chinook/test/test.http