diff --git a/README.md b/README.md
index e883a04d..835c7ff8 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ npm install
 
 With that you're ready to run the samples, for example:
 ```sh
-npm run bookshop # or...
-cd bookshop; cds watch
+cd bookshop
+cds watch
 ```
 
 After that open this link in your browser: <http://localhost:4004>
diff --git a/bookshop/package.json b/bookshop/package.json
index 1e0a334d..f8d6f799 100644
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -1,14 +1,10 @@
 {
   "name": "@capire/bookshop",
   "version": "1.0.0",
-  "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
-  "dependencies": {
-    "@capire/common": "*"
-  },
+  "description": "A simple self-contained bookshop service.",
   "scripts": {
     "test:genres": "cds serve tests/genres.cds --in-memory",
     "start": "cds run --in-memory?",
     "watch": "cds watch"
-  },
-  "license": "SAP SAMPLE CODE LICENSE"
+  }
 }
\ No newline at end of file
diff --git a/common/package.json b/common/package.json
index 8cb5b2bc..d5c6dc24 100644
--- a/common/package.json
+++ b/common/package.json
@@ -1,7 +1,4 @@
 {
   "name": "@capire/common",
-  "version": "1.0.0",
-  "description": "A reuse package providing common domain models and services for common data.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
-  "license": "SAP SAMPLE CODE LICENSE"
+  "version": "1.0.0"
 }
diff --git a/fiori/package.json b/fiori/package.json
index 84da4ecb..29b65631 100644
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@capire/fiori",
   "version": "1.0.0",
-  "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
   "dependencies": {
     "@capire/bookshop": "*",
     "@capire/orders": "*",
@@ -10,6 +9,5 @@
   "scripts": {
     "start": "cds run --in-memory?",
     "watch": "cds watch"
-  },
-  "license": "SAP SAMPLE CODE LICENSE"
+  }
 }
\ No newline at end of file
diff --git a/hello/package.json b/hello/package.json
index 3282f8bf..ef9c6602 100644
--- a/hello/package.json
+++ b/hello/package.json
@@ -1,20 +1,7 @@
 {
-  "name": "@capire/reviews",
+  "name": "@capire/hello-world",
   "version": "1.0.0",
-  "description": "A reuse service providing generic means to add reviews and ratings to target objects, e.g. products.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
   "scripts": {
     "watch": "cds serve world.cds"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      },
-      "messaging": {
-        "kind": "file-based-messaging"
-      }
-    }
-  },
-  "license": "SAP SAMPLE CODE LICENSE"
+  }
 }
\ No newline at end of file
diff --git a/media/package.json b/media/package.json
index 9453255f..8fb8100a 100644
--- a/media/package.json
+++ b/media/package.json
@@ -1,9 +1,6 @@
 {
   "name": "@capire/media",
   "version": "1.0.0",
-  "description": "A generic platform service to manage and serve media content on behalf of other services and apps.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
-  "license": "SAP SAMPLE CODE LICENSE",
   "dependencies": {
     "lokijs": "^1.5.6"
   },
diff --git a/orders/package.json b/orders/package.json
index f8d2c6c6..242aefc4 100644
--- a/orders/package.json
+++ b/orders/package.json
@@ -1,5 +1,4 @@
 {
   "name": "@capire/orders",
-  "version": "1.0.0",
-  "license": "SAP SAMPLE CODE LICENSE"
+  "version": "1.0.0"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 76386cd0..be257a94 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,14 @@
 {
   "name": "@capire/samples",
-  "description": "The umbrella project for all samples to easily setup for local development and tests.",
+  "description": "A monorepo with several samples for CAP.",
   "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
   "author": "daniel.hutzel@sap.com",
-  "scripts": {
-    "bookshop": "cds watch fiori"
-  },
   "dependencies": {
     "@capire/bookshop": "file:bookshop",
     "@capire/common": "file:common",
+    "@capire/events": "file:events",
     "@capire/fiori": "file:fiori",
+    "@capire/media": "file:media",
     "@capire/orders": "file:orders",
     "@capire/reviews": "file:reviews"
   },
@@ -17,6 +16,5 @@
     "chai": "^4.2.0",
     "chai-subset": "^1.6.0"
   },
-  "license": "SAP SAMPLE CODE LICENSE",
-  "private": true
+  "license": "SAP SAMPLE CODE LICENSE"
 }
diff --git a/reviews/package.json b/reviews/package.json
index d1142aad..74ba2373 100644
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -1,8 +1,6 @@
 {
   "name": "@capire/reviews",
   "version": "1.0.0",
-  "description": "A reuse service providing generic means to add reviews and ratings to target objects, e.g. products.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
   "files": [
     "db",
     "srv",
@@ -20,6 +18,5 @@
         "kind": "file-based-messaging"
       }
     }
-  },
-  "license": "SAP SAMPLE CODE LICENSE"
+  }
 }
\ No newline at end of file