diff --git a/.bitmap b/.bitmap
index 579c841..09f4487 100644
--- a/.bitmap
+++ b/.bitmap
@@ -12,42 +12,42 @@
     "angular-env": {
         "name": "angular-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/angular-env"
     },
     "app-types/angular-app-type": {
         "name": "app-types/angular-app-type",
         "scope": "bitdev.angular",
-        "version": "6.0.9",
+        "version": "6.0.11",
         "mainFile": "index.ts",
         "rootDir": "angular/app-types/angular-app-type"
     },
     "dev-services/common": {
         "name": "dev-services/common",
         "scope": "bitdev.angular",
-        "version": "6.0.6",
+        "version": "6.0.8",
         "mainFile": "index.ts",
         "rootDir": "angular/devkit/common"
     },
     "dev-services/compiler/elements": {
         "name": "dev-services/compiler/elements",
         "scope": "bitdev.angular",
-        "version": "6.0.6",
+        "version": "6.0.8",
         "mainFile": "index.ts",
         "rootDir": "angular/devkit/compiler/elements"
     },
     "dev-services/compiler/multi-compiler": {
         "name": "dev-services/compiler/multi-compiler",
         "scope": "bitdev.angular",
-        "version": "6.0.7",
+        "version": "6.0.9",
         "mainFile": "index.ts",
         "rootDir": "angular/devkit/compiler/multi-compiler"
     },
     "dev-services/compiler/ng-packagr": {
         "name": "dev-services/compiler/ng-packagr",
         "scope": "bitdev.angular",
-        "version": "6.0.7",
+        "version": "6.0.9",
         "mainFile": "index.ts",
         "rootDir": "angular/devkit/compiler/ng-packagr"
     },
@@ -75,7 +75,7 @@
     "dev-services/preview/preview": {
         "name": "dev-services/preview/preview",
         "scope": "bitdev.angular",
-        "version": "6.0.6",
+        "version": "6.0.8",
         "mainFile": "index.ts",
         "rootDir": "angular/devkit/preview/preview"
     },
@@ -96,149 +96,163 @@
     "dev-services/webpack": {
         "name": "dev-services/webpack",
         "scope": "bitdev.angular",
-        "version": "6.0.6",
+        "version": "6.0.8",
         "mainFile": "index.ts",
         "rootDir": "angular/devkit/webpack"
     },
     "envs/angular-v13-env": {
         "name": "envs/angular-v13-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/angular-v13-env"
     },
     "envs/angular-v14-env": {
         "name": "envs/angular-v14-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/angular-v14-env"
     },
     "envs/angular-v15-env": {
         "name": "envs/angular-v15-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/angular-v15-env"
     },
     "envs/angular-v16-env": {
         "name": "envs/angular-v16-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/angular-v16-env"
     },
     "envs/angular-v17-env": {
         "name": "envs/angular-v17-env",
         "scope": "bitdev.angular",
-        "version": "5.0.11",
+        "version": "5.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/angular-v17-env"
     },
     "envs/angular-v18-env": {
         "name": "envs/angular-v18-env",
         "scope": "bitdev.angular",
-        "version": "1.0.11",
+        "version": "1.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/angular-v18-env"
     },
     "envs/base-env": {
         "name": "envs/base-env",
         "scope": "bitdev.angular",
-        "version": "6.0.9",
+        "version": "6.0.11",
         "mainFile": "index.ts",
         "rootDir": "angular/envs/base-env"
     },
     "examples/my-angular-env": {
         "name": "examples/my-angular-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-env"
     },
     "examples/my-angular-v13-env": {
         "name": "examples/my-angular-v13-env",
         "scope": "bitdev.angular",
-        "version": "5.0.11",
+        "version": "5.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-v13-env"
     },
     "examples/my-angular-v14-env": {
         "name": "examples/my-angular-v14-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-v14-env"
     },
     "examples/my-angular-v15-env": {
         "name": "examples/my-angular-v15-env",
         "scope": "bitdev.angular",
-        "version": "6.0.11",
+        "version": "6.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-v15-env"
     },
     "examples/my-angular-v16-env": {
         "name": "examples/my-angular-v16-env",
         "scope": "bitdev.angular",
-        "version": "5.0.11",
+        "version": "5.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-v16-env"
     },
     "examples/my-angular-v17-env": {
         "name": "examples/my-angular-v17-env",
         "scope": "bitdev.angular",
-        "version": "5.0.11",
+        "version": "5.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-v17-env"
     },
     "examples/my-angular-v18-env": {
         "name": "examples/my-angular-v18-env",
         "scope": "bitdev.angular",
-        "version": "1.0.11",
+        "version": "1.0.13",
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-v18-env"
     },
     "integration/demo-app": {
         "name": "integration/demo-app",
         "scope": "bitdev.angular",
-        "version": "0.0.3",
+        "version": "0.0.5",
         "mainFile": "index.ts",
         "rootDir": "angular/integration/demo-app"
     },
     "integration/demo-lib": {
         "name": "integration/demo-lib",
         "scope": "bitdev.angular",
-        "version": "0.0.8",
+        "version": "0.0.10",
         "mainFile": "public-api.ts",
         "rootDir": "angular/integration/demo-lib"
     },
     "integration/demo-lib-v15": {
         "name": "integration/demo-lib-v15",
         "scope": "bitdev.angular",
-        "version": "0.0.8",
+        "version": "0.0.10",
         "mainFile": "public-api.ts",
         "rootDir": "angular/integration/demo-lib-v15"
     },
     "integration/demo-lib-v16": {
         "name": "integration/demo-lib-v16",
         "scope": "bitdev.angular",
-        "version": "0.0.8",
+        "version": "0.0.10",
         "mainFile": "public-api.ts",
         "rootDir": "angular/integration/demo-lib-v16"
     },
     "integration/demo-lib-v17": {
         "name": "integration/demo-lib-v17",
         "scope": "bitdev.angular",
-        "version": "0.0.8",
+        "version": "0.0.10",
         "mainFile": "public-api.ts",
         "rootDir": "angular/integration/demo-lib-v17"
     },
     "integration/demo-lib-v18": {
         "name": "integration/demo-lib-v18",
         "scope": "bitdev.angular",
-        "version": "0.0.8",
+        "version": "0.0.10",
         "mainFile": "public-api.ts",
         "rootDir": "angular/integration/demo-lib-v18"
     },
+    "templates/generators": {
+        "name": "templates/generators",
+        "scope": "bitdev.angular",
+        "version": "6.0.2",
+        "mainFile": "index.ts",
+        "rootDir": "angular/templates/generators"
+    },
+    "templates/starters": {
+        "name": "templates/starters",
+        "scope": "bitdev.angular",
+        "version": "6.0.2",
+        "mainFile": "index.ts",
+        "rootDir": "angular/templates/starters"
+    },
     "$schema-version": "17.0.0"
 }
\ No newline at end of file
diff --git a/angular/app-types/angular-app-type/component.json b/angular/app-types/angular-app-type/component.json
index 50e2e32..96268c3 100644
--- a/angular/app-types/angular-app-type/component.json
+++ b/angular/app-types/angular-app-type/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "app-types/angular-app-type",
-    "version": "6.0.9"
+    "version": "6.0.11"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/devkit/common/component.json b/angular/devkit/common/component.json
index 68eefbc..276a307 100644
--- a/angular/devkit/common/component.json
+++ b/angular/devkit/common/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "dev-services/common",
-    "version": "6.0.6"
+    "version": "6.0.8"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/devkit/common/utils.ts b/angular/devkit/common/utils.ts
index 5eb49b1..4e9e798 100644
--- a/angular/devkit/common/utils.ts
+++ b/angular/devkit/common/utils.ts
@@ -231,41 +231,43 @@ export async function writeTsconfig(
   }
 
   // get the list of files for existing component compositions to include in the compilation
-  components.forEach((component: Component) => {
+  // eslint-disable-next-line no-restricted-syntax
+  for (const component of components) {
     // we only want angular components
     if (component.config.main === 'public-api.ts') {
       let outputPath: string;
-
       const isApp = componentIsApp(component, application);
-      if (isApp) {
-        return;
-      }
-      if (isBuildContext(context)) {
-        const capsules = context.capsuleNetwork.graphCapsules;
-        const capsule = capsules.getCapsule(component.id);
-        if (!capsule) {
-          throw new Error(`No capsule found for ${component.id} in network graph`);
+      if (!isApp) {
+        if (isBuildContext(context)) {
+          // eslint-disable-next-line no-await-in-loop
+          const capsule = context.capsuleNetwork.graphCapsules.getCapsule(component.id);
+          if (!capsule) {
+            // eslint-disable-next-line no-console
+            console.warn(`No capsule found for ${component.id} in the network graph`);
+            // eslint-disable-next-line no-continue
+            continue;
+          }
+          outputPath = normalizePath(capsule.path);
+        } else {
+          outputPath = normalizePath(workspace?.componentDir(component.id, {
+            ignoreVersion: true
+          }) || '');
         }
-        outputPath = normalizePath(capsule.path);
-      } else {
-        outputPath = normalizePath(workspace?.componentDir(component.id, {
-          ignoreVersion: true
-        }) || '');
+        // map the package names to the workspace component paths for typescript in case a package references another local package
+        const pkgName = pkg.getPackageName(component);
+        tsPaths[pkgName] = [`${outputPath}/public-api.ts`];
+        tsPaths[`${pkgName}/*`] = [`${outputPath}/*`];
+
+        includePaths.add(outputPath);
+
+        // get the list of spec patterns
+        const devPatterns: string[] = devFilesMain.getDevPatterns(component, TesterAspect.id);
+        devPatterns.forEach(specPattern => {
+          excludePaths.add(posix.join(outputPath, specPattern));
+        });
       }
-      // map the package names to the workspace component paths for typescript in case a package references another local package
-      const pkgName = pkg.getPackageName(component);
-      tsPaths[pkgName] = [`${outputPath}/public-api.ts`];
-      tsPaths[`${pkgName}/*`] = [`${outputPath}/*`];
-
-      includePaths.add(outputPath);
-
-      // get the list of spec patterns
-      const devPatterns: string[] = devFilesMain.getDevPatterns(component, TesterAspect.id);
-      devPatterns.forEach(specPattern => {
-        excludePaths.add(posix.join(outputPath, specPattern));
-      });
     }
-  });
+  }
 
   const pAppPath = normalizePath(rootPath);
   const tsConfigAppPath = tsConfigPath ?? join(rootPath, 'tsconfig.app.json');
diff --git a/angular/devkit/compiler/elements/component.json b/angular/devkit/compiler/elements/component.json
index ccd0b2a..8541581 100644
--- a/angular/devkit/compiler/elements/component.json
+++ b/angular/devkit/compiler/elements/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "dev-services/compiler/elements",
-    "version": "6.0.6"
+    "version": "6.0.8"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/devkit/compiler/multi-compiler/component.json b/angular/devkit/compiler/multi-compiler/component.json
index 1763990..ea4a249 100644
--- a/angular/devkit/compiler/multi-compiler/component.json
+++ b/angular/devkit/compiler/multi-compiler/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "dev-services/compiler/multi-compiler",
-    "version": "6.0.7"
+    "version": "6.0.9"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/devkit/compiler/ng-packagr/component.json b/angular/devkit/compiler/ng-packagr/component.json
index 9255ac6..386d37d 100644
--- a/angular/devkit/compiler/ng-packagr/component.json
+++ b/angular/devkit/compiler/ng-packagr/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "dev-services/compiler/ng-packagr",
-    "version": "6.0.7"
+    "version": "6.0.9"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/devkit/preview/preview/component.json b/angular/devkit/preview/preview/component.json
index 8ed7f4d..b845029 100644
--- a/angular/devkit/preview/preview/component.json
+++ b/angular/devkit/preview/preview/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "dev-services/preview/preview",
-    "version": "6.0.6"
+    "version": "6.0.8"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/devkit/webpack/component.json b/angular/devkit/webpack/component.json
index ffee999..cce3c5a 100644
--- a/angular/devkit/webpack/component.json
+++ b/angular/devkit/webpack/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "dev-services/webpack",
-    "version": "6.0.6"
+    "version": "6.0.8"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/angular-env/component.json b/angular/envs/angular-env/component.json
index ccfd86a..d119616 100644
--- a/angular/envs/angular-env/component.json
+++ b/angular/envs/angular-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "angular-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/angular-v13-env/component.json b/angular/envs/angular-v13-env/component.json
index c53b278..12b9883 100644
--- a/angular/envs/angular-v13-env/component.json
+++ b/angular/envs/angular-v13-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "envs/angular-v13-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/angular-v14-env/component.json b/angular/envs/angular-v14-env/component.json
index 91fe380..c1a57cb 100644
--- a/angular/envs/angular-v14-env/component.json
+++ b/angular/envs/angular-v14-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "envs/angular-v14-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/angular-v15-env/component.json b/angular/envs/angular-v15-env/component.json
index 3fbaa30..2ed17f6 100644
--- a/angular/envs/angular-v15-env/component.json
+++ b/angular/envs/angular-v15-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "envs/angular-v15-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/angular-v16-env/component.json b/angular/envs/angular-v16-env/component.json
index 86cc6b7..01e03b8 100644
--- a/angular/envs/angular-v16-env/component.json
+++ b/angular/envs/angular-v16-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "envs/angular-v16-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/angular-v17-env/component.json b/angular/envs/angular-v17-env/component.json
index c5c1cb7..34a2955 100644
--- a/angular/envs/angular-v17-env/component.json
+++ b/angular/envs/angular-v17-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "envs/angular-v17-env",
-    "version": "5.0.11"
+    "version": "5.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/angular-v18-env/component.json b/angular/envs/angular-v18-env/component.json
index 79692fe..7257cbe 100644
--- a/angular/envs/angular-v18-env/component.json
+++ b/angular/envs/angular-v18-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "envs/angular-v18-env",
-    "version": "1.0.11"
+    "version": "1.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/envs/base-env/component.json b/angular/envs/base-env/component.json
index b9176fe..dff090b 100644
--- a/angular/envs/base-env/component.json
+++ b/angular/envs/base-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "envs/base-env",
-    "version": "6.0.9"
+    "version": "6.0.11"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/examples/my-angular-env/component.json b/angular/examples/my-angular-env/component.json
index 581ef1f..d70a334 100644
--- a/angular/examples/my-angular-env/component.json
+++ b/angular/examples/my-angular-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "examples/my-angular-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/examples/my-angular-v13-env/component.json b/angular/examples/my-angular-v13-env/component.json
index b386055..fb497a1 100644
--- a/angular/examples/my-angular-v13-env/component.json
+++ b/angular/examples/my-angular-v13-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "examples/my-angular-v13-env",
-    "version": "5.0.11"
+    "version": "5.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/examples/my-angular-v14-env/component.json b/angular/examples/my-angular-v14-env/component.json
index 14030a7..d29a175 100644
--- a/angular/examples/my-angular-v14-env/component.json
+++ b/angular/examples/my-angular-v14-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "examples/my-angular-v14-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/examples/my-angular-v15-env/component.json b/angular/examples/my-angular-v15-env/component.json
index d0b2445..964fb7a 100644
--- a/angular/examples/my-angular-v15-env/component.json
+++ b/angular/examples/my-angular-v15-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "examples/my-angular-v15-env",
-    "version": "6.0.11"
+    "version": "6.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/examples/my-angular-v16-env/component.json b/angular/examples/my-angular-v16-env/component.json
index 51ce552..87d78ba 100644
--- a/angular/examples/my-angular-v16-env/component.json
+++ b/angular/examples/my-angular-v16-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "examples/my-angular-v16-env",
-    "version": "5.0.11"
+    "version": "5.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/examples/my-angular-v17-env/component.json b/angular/examples/my-angular-v17-env/component.json
index 2365c39..a442c1a 100644
--- a/angular/examples/my-angular-v17-env/component.json
+++ b/angular/examples/my-angular-v17-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "examples/my-angular-v17-env",
-    "version": "5.0.11"
+    "version": "5.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/angular/examples/my-angular-v18-env/component.json b/angular/examples/my-angular-v18-env/component.json
index 06fbc8c..c5c42a4 100644
--- a/angular/examples/my-angular-v18-env/component.json
+++ b/angular/examples/my-angular-v18-env/component.json
@@ -2,7 +2,7 @@
   "componentId": {
     "scope": "bitdev.angular",
     "name": "examples/my-angular-v18-env",
-    "version": "1.0.11"
+    "version": "1.0.13"
   },
   "propagate": false,
   "extensions": {
diff --git a/workspace.jsonc b/workspace.jsonc
index 4fcce2e..35a55fa 100644
--- a/workspace.jsonc
+++ b/workspace.jsonc
@@ -35,9 +35,6 @@
     "packageManager": "teambit.dependencies/pnpm",
     "policy": {
       "dependencies": {
-        "@angular/forms": "^18.2.2",
-        "@bitdev/general.envs.bit-env": "^1.0.2",
-        "@bitdev/node.node-env": "2.0.2",
         "@clack/prompts": "^0.7.0",
         "@teambit/community.ui.bit-cli.command-example": "0.0.8",
         "@teambit/community.ui.bit-cli.terminal": "0.0.30",
@@ -90,10 +87,10 @@
   },
   "teambit.generator/generator": {
     "envs": [
-      //            "bitdev.angular/angular-env",
+//                  "bitdev.angular/angular-env",
       "bitdev.angular/envs/angular-v18-env"
-      //      "bitdev.angular/envs/angular-v17-env"
-      //      "bitdev.angular/envs/angular-v16-env",
+//            "bitdev.angular/envs/angular-v17-env"
+//            "bitdev.angular/envs/angular-v16-env",
       //      "bitdev.angular/envs/angular-v15-env",
       //      "bitdev.angular/envs/angular-v14-env",
       //      "bitdev.angular/envs/angular-v13-env"
@@ -103,9 +100,9 @@
   "bitdev.angular/envs/angular-v18-env": {},
   "bitdev.angular/envs/angular-v17-env": {},
   "bitdev.angular/envs/angular-v16-env": {},
-  "bitdev.angular/envs/angular-v15-env": {},
-  "bitdev.angular/envs/angular-v14-env": {},
-  "bitdev.angular/envs/angular-v13-env": {},
+//  "bitdev.angular/envs/angular-v15-env": {},
+//  "bitdev.angular/envs/angular-v14-env": {},
+//  "bitdev.angular/envs/angular-v13-env": {},
   // Add angular apps (until this is no longer necessary)
   //  "integration.examples/demo-app": {},
   /**
@@ -128,33 +125,24 @@
         "env": "teambit.community/envs/community-mdx"
       }
     },
-    "integration/custom-env": {
+    "angular/integration/custom-env": {
       "teambit.envs/env": {}
     },
-    "integration/demo-app": {
+    "angular/integration/demo-app": {
       //            "bitdev.angular/angular-env": {}
       "bitdev.angular/envs/angular-v18-env": {}
     },
-    "integration/demo-lib": {
+    "angular/integration/demo-lib": {
       "bitdev.angular/angular-env": {}
     },
-    "integration/demo-lib-v18": {
+    "angular/integration/demo-lib-v18": {
       "bitdev.angular/envs/angular-v18-env": {}
     },
-    "integration/demo-lib-v17": {
+    "angular/integration/demo-lib-v17": {
       "bitdev.angular/envs/angular-v17-env": {}
     },
-    "integration/demo-lib-v16": {
+    "angular/integration/demo-lib-v16": {
       "bitdev.angular/envs/angular-v16-env": {}
-    },
-    "integration/demo-lib-v15": {
-      "bitdev.angular/envs/angular-v15-env": {}
-    },
-    "integration/demo-lib-v14": {
-      "bitdev.angular/envs/angular-v14-env": {}
-    },
-    "integration/demo-lib-v13": {
-      "bitdev.angular/envs/angular-v13-env": {}
     }
   }
   //  "integration.examples/demo-app": {}