diff --git a/apps/angular/16-master-dependency-injection/.eslintrc.json b/apps/angular/16-master-dependency-injection/.eslintrc.json
index f776d76..bd48864 100644
--- a/apps/angular/16-master-dependency-injection/.eslintrc.json
+++ b/apps/angular/16-master-dependency-injection/.eslintrc.json
@@ -4,23 +4,16 @@
   "overrides": [
     {
       "files": ["*.ts"],
+      "rules": {},
       "extends": [
         "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
-      ],
-      "rules": {}
+      ]
     },
     {
       "files": ["*.html"],
       "extends": ["plugin:@nx/angular-template"],
       "rules": {}
-    },
-    {
-      "files": ["*.json"],
-      "parser": "jsonc-eslint-parser",
-      "rules": {
-        "@nx/dependency-checks": "error"
-      }
     }
   ]
 }
diff --git a/apps/angular/16-master-dependency-injection/README.md b/apps/angular/16-master-dependency-injection/README.md
index 8006b8b..be19c1b 100644
--- a/apps/angular/16-master-dependency-injection/README.md
+++ b/apps/angular/16-master-dependency-injection/README.md
@@ -1,7 +1,13 @@
-# angular-master-dependency-injection
+# Master Dependancy Injection
 
-This library was generated with [Nx](https://nx.dev).
+> author: thomas-laforge
 
-## Running unit tests
+### Run Application
 
-Run `nx test angular-master-dependency-injection` to execute the unit tests.
+```bash
+npx nx serve angular-master-dependency-injection
+```
+
+### Documentation and Instruction
+
+Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/angular/16-di/).
diff --git a/apps/angular/16-master-dependency-injection/ng-package.json b/apps/angular/16-master-dependency-injection/ng-package.json
deleted file mode 100644
index 46dbaea..0000000
--- a/apps/angular/16-master-dependency-injection/ng-package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../../dist/apps/angular/16-master-dependency-injection",
-  "lib": {
-    "entryFile": "src/index.ts"
-  }
-}
diff --git a/apps/angular/16-master-dependency-injection/package.json b/apps/angular/16-master-dependency-injection/package.json
deleted file mode 100644
index 9601192..0000000
--- a/apps/angular/16-master-dependency-injection/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "angular-master-dependency-injection",
-  "version": "0.0.1",
-  "peerDependencies": {
-    "@angular/common": "^16.2.0",
-    "@angular/core": "^16.2.0"
-  },
-  "dependencies": {
-    "tslib": "^2.3.0"
-  },
-  "sideEffects": false
-}
diff --git a/apps/angular/16-master-dependency-injection/project.json b/apps/angular/16-master-dependency-injection/project.json
index dfa28e0..4050569 100644
--- a/apps/angular/16-master-dependency-injection/project.json
+++ b/apps/angular/16-master-dependency-injection/project.json
@@ -1,36 +1,77 @@
 {
   "name": "angular-master-dependency-injection",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
   "sourceRoot": "apps/angular/16-master-dependency-injection/src",
-  "prefix": "lib",
-  "tags": [],
-  "projectType": "library",
+  "prefix": "app",
   "targets": {
     "build": {
-      "executor": "@nx/angular:ng-packagr-lite",
-      "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
+      "executor": "@angular-devkit/build-angular:browser",
+      "outputs": ["{options.outputPath}"],
       "options": {
-        "project": "apps/angular/16-master-dependency-injection/ng-package.json"
+        "outputPath": "dist/apps/angular/16-master-dependency-injection",
+        "index": "apps/angular/16-master-dependency-injection/src/index.html",
+        "main": "apps/angular/16-master-dependency-injection/src/main.ts",
+        "polyfills": ["zone.js"],
+        "tsConfig": "apps/angular/16-master-dependency-injection/tsconfig.app.json",
+        "inlineStyleLanguage": "scss",
+        "assets": [
+          "apps/angular/16-master-dependency-injection/src/favicon.ico",
+          "apps/angular/16-master-dependency-injection/src/assets"
+        ],
+        "styles": [
+          "apps/angular/16-master-dependency-injection/src/styles.scss"
+        ],
+        "scripts": []
       },
       "configurations": {
         "production": {
-          "tsConfig": "apps/angular/16-master-dependency-injection/tsconfig.lib.prod.json"
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "500kb",
+              "maximumError": "1mb"
+            },
+            {
+              "type": "anyComponentStyle",
+              "maximumWarning": "2kb",
+              "maximumError": "4kb"
+            }
+          ],
+          "outputHashing": "all"
         },
         "development": {
-          "tsConfig": "apps/angular/16-master-dependency-injection/tsconfig.lib.json"
+          "buildOptimizer": false,
+          "optimization": false,
+          "vendorChunk": true,
+          "extractLicenses": false,
+          "sourceMap": true,
+          "namedChunks": true
         }
       },
       "defaultConfiguration": "production"
     },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+    "serve": {
+      "executor": "@angular-devkit/build-angular:dev-server",
+      "configurations": {
+        "production": {
+          "buildTarget": "angular-master-dependency-injection:build:production"
+        },
+        "development": {
+          "buildTarget": "angular-master-dependency-injection:build:development"
+        }
+      },
+      "defaultConfiguration": "development"
+    },
+    "extract-i18n": {
+      "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "jestConfig": "apps/angular/16-master-dependency-injection/jest.config.ts"
+        "buildTarget": "angular-master-dependency-injection:build"
       }
     },
     "lint": {
       "executor": "@nx/eslint:lint"
     }
-  }
+  },
+  "tags": []
 }
diff --git a/apps/angular/di/src/app/app.component.ts b/apps/angular/16-master-dependency-injection/src/app/app.component.ts
similarity index 95%
rename from apps/angular/di/src/app/app.component.ts
rename to apps/angular/16-master-dependency-injection/src/app/app.component.ts
index d18319b..f808517 100644
--- a/apps/angular/di/src/app/app.component.ts
+++ b/apps/angular/16-master-dependency-injection/src/app/app.component.ts
@@ -1,6 +1,6 @@
+import { TableComponent } from '@angular-challenges/shared/ui';
 import { AsyncPipe, NgFor } from '@angular/common';
 import { Component, Directive } from '@angular/core';
-import { TableComponent } from 'angular-master-dependency-injection';
 import { CurrencyPipe } from './currency.pipe';
 import { CurrencyService } from './currency.service';
 import { Product, products } from './product.model';
diff --git a/apps/angular/di/src/app/currency.pipe.ts b/apps/angular/16-master-dependency-injection/src/app/currency.pipe.ts
similarity index 100%
rename from apps/angular/di/src/app/currency.pipe.ts
rename to apps/angular/16-master-dependency-injection/src/app/currency.pipe.ts
diff --git a/apps/angular/di/src/app/currency.service.ts b/apps/angular/16-master-dependency-injection/src/app/currency.service.ts
similarity index 100%
rename from apps/angular/di/src/app/currency.service.ts
rename to apps/angular/16-master-dependency-injection/src/app/currency.service.ts
diff --git a/apps/angular/di/src/app/product.model.ts b/apps/angular/16-master-dependency-injection/src/app/product.model.ts
similarity index 100%
rename from apps/angular/di/src/app/product.model.ts
rename to apps/angular/16-master-dependency-injection/src/app/product.model.ts
diff --git a/apps/angular/di/src/assets/.gitkeep b/apps/angular/16-master-dependency-injection/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/di/src/assets/.gitkeep
rename to apps/angular/16-master-dependency-injection/src/assets/.gitkeep
diff --git a/apps/angular/context-outlet-type/src/favicon.ico b/apps/angular/16-master-dependency-injection/src/favicon.ico
similarity index 100%
rename from apps/angular/context-outlet-type/src/favicon.ico
rename to apps/angular/16-master-dependency-injection/src/favicon.ico
diff --git a/apps/angular/di/src/index.html b/apps/angular/16-master-dependency-injection/src/index.html
similarity index 100%
rename from apps/angular/di/src/index.html
rename to apps/angular/16-master-dependency-injection/src/index.html
diff --git a/apps/angular/context-outlet-type/src/main.ts b/apps/angular/16-master-dependency-injection/src/main.ts
similarity index 100%
rename from apps/angular/context-outlet-type/src/main.ts
rename to apps/angular/16-master-dependency-injection/src/main.ts
diff --git a/apps/angular/di/src/styles.scss b/apps/angular/16-master-dependency-injection/src/styles.scss
similarity index 100%
rename from apps/angular/di/src/styles.scss
rename to apps/angular/16-master-dependency-injection/src/styles.scss
diff --git a/apps/angular/16-master-dependency-injection/src/test-setup.ts b/apps/angular/16-master-dependency-injection/src/test-setup.ts
deleted file mode 100644
index ab1eeeb..0000000
--- a/apps/angular/16-master-dependency-injection/src/test-setup.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
-globalThis.ngJest = {
-  testEnvironmentOptions: {
-    errorOnUnknownElements: true,
-    errorOnUnknownProperties: true,
-  },
-};
-import 'jest-preset-angular/setup-jest';
diff --git a/apps/angular/di/tsconfig.app.json b/apps/angular/16-master-dependency-injection/tsconfig.app.json
similarity index 100%
rename from apps/angular/di/tsconfig.app.json
rename to apps/angular/16-master-dependency-injection/tsconfig.app.json
diff --git a/apps/angular/di/tsconfig.editor.json b/apps/angular/16-master-dependency-injection/tsconfig.editor.json
similarity index 100%
rename from apps/angular/di/tsconfig.editor.json
rename to apps/angular/16-master-dependency-injection/tsconfig.editor.json
diff --git a/apps/angular/16-master-dependency-injection/tsconfig.json b/apps/angular/16-master-dependency-injection/tsconfig.json
index 5cf0a16..51c7908 100644
--- a/apps/angular/16-master-dependency-injection/tsconfig.json
+++ b/apps/angular/16-master-dependency-injection/tsconfig.json
@@ -13,10 +13,10 @@
   "include": [],
   "references": [
     {
-      "path": "./tsconfig.lib.json"
+      "path": "./tsconfig.app.json"
     },
     {
-      "path": "./tsconfig.spec.json"
+      "path": "./tsconfig.editor.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/angular/16-master-dependency-injection/tsconfig.lib.prod.json b/apps/angular/16-master-dependency-injection/tsconfig.lib.prod.json
deleted file mode 100644
index 61b5237..0000000
--- a/apps/angular/16-master-dependency-injection/tsconfig.lib.prod.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.lib.json",
-  "compilerOptions": {
-    "declarationMap": false
-  },
-  "angularCompilerOptions": {}
-}
diff --git a/apps/angular/16-master-dependency-injection/tsconfig.spec.json b/apps/angular/16-master-dependency-injection/tsconfig.spec.json
deleted file mode 100644
index f858ef7..0000000
--- a/apps/angular/16-master-dependency-injection/tsconfig.spec.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "target": "es2016",
-    "types": ["jest", "node"]
-  },
-  "files": ["src/test-setup.ts"],
-  "include": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
-}
diff --git a/apps/angular/context-outlet-type/.eslintrc.json b/apps/angular/4-typed-context-outlet/.eslintrc.json
similarity index 100%
rename from apps/angular/context-outlet-type/.eslintrc.json
rename to apps/angular/4-typed-context-outlet/.eslintrc.json
diff --git a/apps/angular/context-outlet-type/README.md b/apps/angular/4-typed-context-outlet/README.md
similarity index 84%
rename from apps/angular/context-outlet-type/README.md
rename to apps/angular/4-typed-context-outlet/README.md
index d195baa..e819151 100644
--- a/apps/angular/context-outlet-type/README.md
+++ b/apps/angular/4-typed-context-outlet/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-context-outlet-type
+npx nx serve angular-typed-context-outlet
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/context-outlet-type/project.json b/apps/angular/4-typed-context-outlet/project.json
similarity index 63%
rename from apps/angular/context-outlet-type/project.json
rename to apps/angular/4-typed-context-outlet/project.json
index ee2f03c..620a179 100644
--- a/apps/angular/context-outlet-type/project.json
+++ b/apps/angular/4-typed-context-outlet/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-context-outlet-type",
+  "name": "angular-typed-context-outlet",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/context-outlet-type/src",
+  "sourceRoot": "apps/angular/4-typed-context-outlet/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/context-outlet-type",
-        "index": "apps/angular/context-outlet-type/src/index.html",
-        "main": "apps/angular/context-outlet-type/src/main.ts",
-        "polyfills": "apps/angular/context-outlet-type/src/polyfills.ts",
-        "tsConfig": "apps/angular/context-outlet-type/tsconfig.app.json",
+        "outputPath": "dist/apps/angular/4-typed-context-outlet",
+        "index": "apps/angular/4-typed-context-outlet/src/index.html",
+        "main": "apps/angular/4-typed-context-outlet/src/main.ts",
+        "polyfills": "apps/angular/4-typed-context-outlet/src/polyfills.ts",
+        "tsConfig": "apps/angular/4-typed-context-outlet/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/context-outlet-type/src/favicon.ico",
-          "apps/angular/context-outlet-type/src/assets"
+          "apps/angular/4-typed-context-outlet/src/favicon.ico",
+          "apps/angular/4-typed-context-outlet/src/assets"
         ],
-        "styles": ["apps/angular/context-outlet-type/src/styles.scss"],
+        "styles": ["apps/angular/4-typed-context-outlet/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-context-outlet-type:build:production"
+          "buildTarget": "angular-typed-context-outlet:build:production"
         },
         "development": {
-          "buildTarget": "angular-context-outlet-type:build:development"
+          "buildTarget": "angular-typed-context-outlet:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-context-outlet-type:build"
+        "buildTarget": "angular-typed-context-outlet:build"
       }
     },
     "lint": {
diff --git a/apps/angular/context-outlet-type/src/app/app.component.ts b/apps/angular/4-typed-context-outlet/src/app/app.component.ts
similarity index 100%
rename from apps/angular/context-outlet-type/src/app/app.component.ts
rename to apps/angular/4-typed-context-outlet/src/app/app.component.ts
diff --git a/apps/angular/context-outlet-type/src/app/list.component.ts b/apps/angular/4-typed-context-outlet/src/app/list.component.ts
similarity index 100%
rename from apps/angular/context-outlet-type/src/app/list.component.ts
rename to apps/angular/4-typed-context-outlet/src/app/list.component.ts
diff --git a/apps/angular/context-outlet-type/src/app/person.component.ts b/apps/angular/4-typed-context-outlet/src/app/person.component.ts
similarity index 100%
rename from apps/angular/context-outlet-type/src/app/person.component.ts
rename to apps/angular/4-typed-context-outlet/src/app/person.component.ts
diff --git a/apps/angular/di/src/favicon.ico b/apps/angular/4-typed-context-outlet/src/favicon.ico
similarity index 100%
rename from apps/angular/di/src/favicon.ico
rename to apps/angular/4-typed-context-outlet/src/favicon.ico
diff --git a/apps/angular/context-outlet-type/src/index.html b/apps/angular/4-typed-context-outlet/src/index.html
similarity index 100%
rename from apps/angular/context-outlet-type/src/index.html
rename to apps/angular/4-typed-context-outlet/src/index.html
diff --git a/apps/angular/di/src/main.ts b/apps/angular/4-typed-context-outlet/src/main.ts
similarity index 100%
rename from apps/angular/di/src/main.ts
rename to apps/angular/4-typed-context-outlet/src/main.ts
diff --git a/apps/angular/context-outlet-type/src/polyfills.ts b/apps/angular/4-typed-context-outlet/src/polyfills.ts
similarity index 100%
rename from apps/angular/context-outlet-type/src/polyfills.ts
rename to apps/angular/4-typed-context-outlet/src/polyfills.ts
diff --git a/apps/angular/context-outlet-type/src/styles.scss b/apps/angular/4-typed-context-outlet/src/styles.scss
similarity index 100%
rename from apps/angular/context-outlet-type/src/styles.scss
rename to apps/angular/4-typed-context-outlet/src/styles.scss
diff --git a/apps/angular/context-outlet-type/tsconfig.app.json b/apps/angular/4-typed-context-outlet/tsconfig.app.json
similarity index 100%
rename from apps/angular/context-outlet-type/tsconfig.app.json
rename to apps/angular/4-typed-context-outlet/tsconfig.app.json
diff --git a/apps/angular/context-outlet-type/tsconfig.editor.json b/apps/angular/4-typed-context-outlet/tsconfig.editor.json
similarity index 100%
rename from apps/angular/context-outlet-type/tsconfig.editor.json
rename to apps/angular/4-typed-context-outlet/tsconfig.editor.json
diff --git a/apps/angular/context-outlet-type/tsconfig.json b/apps/angular/4-typed-context-outlet/tsconfig.json
similarity index 100%
rename from apps/angular/context-outlet-type/tsconfig.json
rename to apps/angular/4-typed-context-outlet/tsconfig.json
diff --git a/apps/angular/view-transition/.eslintrc.json b/apps/angular/44-view-transition/.eslintrc.json
similarity index 100%
rename from apps/angular/view-transition/.eslintrc.json
rename to apps/angular/44-view-transition/.eslintrc.json
diff --git a/apps/angular/view-transition/README.md b/apps/angular/44-view-transition/README.md
similarity index 100%
rename from apps/angular/view-transition/README.md
rename to apps/angular/44-view-transition/README.md
diff --git a/apps/angular/view-transition/project.json b/apps/angular/44-view-transition/project.json
similarity index 77%
rename from apps/angular/view-transition/project.json
rename to apps/angular/44-view-transition/project.json
index d0a27fd..27fc865 100644
--- a/apps/angular/view-transition/project.json
+++ b/apps/angular/44-view-transition/project.json
@@ -3,24 +3,24 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/view-transition/src",
+  "sourceRoot": "apps/angular/44-view-transition/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/view-transition",
-        "index": "apps/angular/view-transition/src/index.html",
-        "browser": "apps/angular/view-transition/src/main.ts",
+        "outputPath": "dist/apps/angular/44-view-transition",
+        "index": "apps/angular/44-view-transition/src/index.html",
+        "browser": "apps/angular/44-view-transition/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/view-transition/tsconfig.app.json",
+        "tsConfig": "apps/angular/44-view-transition/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/view-transition/src/favicon.ico",
-          "apps/angular/view-transition/src/assets"
+          "apps/angular/44-view-transition/src/favicon.ico",
+          "apps/angular/44-view-transition/src/assets"
         ],
-        "styles": ["apps/angular/view-transition/src/styles.scss"],
+        "styles": ["apps/angular/44-view-transition/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
diff --git a/apps/angular/view-transition/src/app/app.component.ts b/apps/angular/44-view-transition/src/app/app.component.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/app.component.ts
rename to apps/angular/44-view-transition/src/app/app.component.ts
diff --git a/apps/angular/view-transition/src/app/app.config.ts b/apps/angular/44-view-transition/src/app/app.config.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/app.config.ts
rename to apps/angular/44-view-transition/src/app/app.config.ts
diff --git a/apps/angular/view-transition/src/app/blog/blog.component.ts b/apps/angular/44-view-transition/src/app/blog/blog.component.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/blog/blog.component.ts
rename to apps/angular/44-view-transition/src/app/blog/blog.component.ts
diff --git a/apps/angular/view-transition/src/app/blog/thumbnail-header.component.ts b/apps/angular/44-view-transition/src/app/blog/thumbnail-header.component.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/blog/thumbnail-header.component.ts
rename to apps/angular/44-view-transition/src/app/blog/thumbnail-header.component.ts
diff --git a/apps/angular/view-transition/src/app/blog/thumbnail.component.ts b/apps/angular/44-view-transition/src/app/blog/thumbnail.component.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/blog/thumbnail.component.ts
rename to apps/angular/44-view-transition/src/app/blog/thumbnail.component.ts
diff --git a/apps/angular/view-transition/src/app/data.ts b/apps/angular/44-view-transition/src/app/data.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/data.ts
rename to apps/angular/44-view-transition/src/app/data.ts
diff --git a/apps/angular/view-transition/src/app/post.model.ts b/apps/angular/44-view-transition/src/app/post.model.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/post.model.ts
rename to apps/angular/44-view-transition/src/app/post.model.ts
diff --git a/apps/angular/view-transition/src/app/post/post-header.component.ts b/apps/angular/44-view-transition/src/app/post/post-header.component.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/post/post-header.component.ts
rename to apps/angular/44-view-transition/src/app/post/post-header.component.ts
diff --git a/apps/angular/view-transition/src/app/post/post.component.ts b/apps/angular/44-view-transition/src/app/post/post.component.ts
similarity index 100%
rename from apps/angular/view-transition/src/app/post/post.component.ts
rename to apps/angular/44-view-transition/src/app/post/post.component.ts
diff --git a/apps/angular/react-in-angular/src/assets/.gitkeep b/apps/angular/44-view-transition/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/react-in-angular/src/assets/.gitkeep
rename to apps/angular/44-view-transition/src/assets/.gitkeep
diff --git a/apps/angular/view-transition/src/assets/angular.webp b/apps/angular/44-view-transition/src/assets/angular.webp
similarity index 100%
rename from apps/angular/view-transition/src/assets/angular.webp
rename to apps/angular/44-view-transition/src/assets/angular.webp
diff --git a/apps/angular/view-transition/src/assets/guard.full.webp b/apps/angular/44-view-transition/src/assets/guard.full.webp
similarity index 100%
rename from apps/angular/view-transition/src/assets/guard.full.webp
rename to apps/angular/44-view-transition/src/assets/guard.full.webp
diff --git a/apps/angular/view-transition/src/assets/highly-custom.full.webp b/apps/angular/44-view-transition/src/assets/highly-custom.full.webp
similarity index 100%
rename from apps/angular/view-transition/src/assets/highly-custom.full.webp
rename to apps/angular/44-view-transition/src/assets/highly-custom.full.webp
diff --git a/apps/angular/view-transition/src/assets/profil.webp b/apps/angular/44-view-transition/src/assets/profil.webp
similarity index 100%
rename from apps/angular/view-transition/src/assets/profil.webp
rename to apps/angular/44-view-transition/src/assets/profil.webp
diff --git a/apps/angular/view-transition/src/assets/signal-cd.full.webp b/apps/angular/44-view-transition/src/assets/signal-cd.full.webp
similarity index 100%
rename from apps/angular/view-transition/src/assets/signal-cd.full.webp
rename to apps/angular/44-view-transition/src/assets/signal-cd.full.webp
diff --git a/apps/angular/react-in-angular/src/favicon.ico b/apps/angular/44-view-transition/src/favicon.ico
similarity index 100%
rename from apps/angular/react-in-angular/src/favicon.ico
rename to apps/angular/44-view-transition/src/favicon.ico
diff --git a/apps/angular/view-transition/src/index.html b/apps/angular/44-view-transition/src/index.html
similarity index 100%
rename from apps/angular/view-transition/src/index.html
rename to apps/angular/44-view-transition/src/index.html
diff --git a/apps/angular/react-in-angular/src/main.ts b/apps/angular/44-view-transition/src/main.ts
similarity index 100%
rename from apps/angular/react-in-angular/src/main.ts
rename to apps/angular/44-view-transition/src/main.ts
diff --git a/apps/angular/view-transition/src/styles.scss b/apps/angular/44-view-transition/src/styles.scss
similarity index 98%
rename from apps/angular/view-transition/src/styles.scss
rename to apps/angular/44-view-transition/src/styles.scss
index a90f074..b5c61c9 100644
--- a/apps/angular/view-transition/src/styles.scss
+++ b/apps/angular/44-view-transition/src/styles.scss
@@ -1,4 +1,3 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-
diff --git a/apps/angular/react-in-angular/tailwind.config.js b/apps/angular/44-view-transition/tailwind.config.js
similarity index 100%
rename from apps/angular/react-in-angular/tailwind.config.js
rename to apps/angular/44-view-transition/tailwind.config.js
diff --git a/apps/angular/react-in-angular/tsconfig.app.json b/apps/angular/44-view-transition/tsconfig.app.json
similarity index 100%
rename from apps/angular/react-in-angular/tsconfig.app.json
rename to apps/angular/44-view-transition/tsconfig.app.json
diff --git a/apps/angular/view-transition/tsconfig.editor.json b/apps/angular/44-view-transition/tsconfig.editor.json
similarity index 100%
rename from apps/angular/view-transition/tsconfig.editor.json
rename to apps/angular/44-view-transition/tsconfig.editor.json
diff --git a/apps/performance/ngfor-biglist/tsconfig.json b/apps/angular/44-view-transition/tsconfig.json
similarity index 96%
rename from apps/performance/ngfor-biglist/tsconfig.json
rename to apps/angular/44-view-transition/tsconfig.json
index 51c7908..b94f883 100644
--- a/apps/performance/ngfor-biglist/tsconfig.json
+++ b/apps/angular/44-view-transition/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "es2022",
     "useDefineForClassFields": false,
+    "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,
diff --git a/apps/angular/react-in-angular/.eslintrc.json b/apps/angular/45-react-in-angular/.eslintrc.json
similarity index 100%
rename from apps/angular/react-in-angular/.eslintrc.json
rename to apps/angular/45-react-in-angular/.eslintrc.json
diff --git a/apps/angular/react-in-angular/README.md b/apps/angular/45-react-in-angular/README.md
similarity index 100%
rename from apps/angular/react-in-angular/README.md
rename to apps/angular/45-react-in-angular/README.md
diff --git a/apps/angular/react-in-angular/jest.config.ts b/apps/angular/45-react-in-angular/jest.config.ts
similarity index 89%
rename from apps/angular/react-in-angular/jest.config.ts
rename to apps/angular/45-react-in-angular/jest.config.ts
index 92d5f25..cda19a6 100644
--- a/apps/angular/react-in-angular/jest.config.ts
+++ b/apps/angular/45-react-in-angular/jest.config.ts
@@ -3,7 +3,7 @@ export default {
   displayName: 'angular-react-in-angular',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/angular/react-in-angular',
+  coverageDirectory: '../../../coverage/apps/angular/45-react-in-angular',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/angular/react-in-angular/project.json b/apps/angular/45-react-in-angular/project.json
similarity index 75%
rename from apps/angular/react-in-angular/project.json
rename to apps/angular/45-react-in-angular/project.json
index 8153ec8..d23e540 100644
--- a/apps/angular/react-in-angular/project.json
+++ b/apps/angular/45-react-in-angular/project.json
@@ -3,24 +3,24 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/react-in-angular/src",
+  "sourceRoot": "apps/angular/45-react-in-angular/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/react-in-angular",
-        "index": "apps/angular/react-in-angular/src/index.html",
-        "browser": "apps/angular/react-in-angular/src/main.ts",
+        "outputPath": "dist/apps/angular/45-react-in-angular",
+        "index": "apps/angular/45-react-in-angular/src/index.html",
+        "browser": "apps/angular/45-react-in-angular/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/react-in-angular/tsconfig.app.json",
+        "tsConfig": "apps/angular/45-react-in-angular/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/react-in-angular/src/favicon.ico",
-          "apps/angular/react-in-angular/src/assets"
+          "apps/angular/45-react-in-angular/src/favicon.ico",
+          "apps/angular/45-react-in-angular/src/assets"
         ],
-        "styles": ["apps/angular/react-in-angular/src/styles.scss"],
+        "styles": ["apps/angular/45-react-in-angular/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -73,7 +73,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/angular/react-in-angular/jest.config.ts"
+        "jestConfig": "apps/angular/45-react-in-angular/jest.config.ts"
       }
     }
   }
diff --git a/apps/angular/react-in-angular/src/app/app.component.ts b/apps/angular/45-react-in-angular/src/app/app.component.ts
similarity index 100%
rename from apps/angular/react-in-angular/src/app/app.component.ts
rename to apps/angular/45-react-in-angular/src/app/app.component.ts
diff --git a/apps/angular/react-in-angular/src/app/app.config.ts b/apps/angular/45-react-in-angular/src/app/app.config.ts
similarity index 100%
rename from apps/angular/react-in-angular/src/app/app.config.ts
rename to apps/angular/45-react-in-angular/src/app/app.config.ts
diff --git a/apps/angular/45-react-in-angular/src/app/react/ReactPost.tsx b/apps/angular/45-react-in-angular/src/app/react/ReactPost.tsx
new file mode 100644
index 0000000..3f6b9e4
--- /dev/null
+++ b/apps/angular/45-react-in-angular/src/app/react/ReactPost.tsx
@@ -0,0 +1,29 @@
+// import React from 'react';
+
+export default function ReactPost(props: {
+  title?: string;
+  description?: string;
+  pictureLink?: string;
+  selected?: boolean;
+  handleClick: () => void;
+}) {
+  return (
+    <div className={props.selected ? 'bg-blue-100' : 'bg-white'}>
+      <div className="max-w-sm overflow-hidden rounded shadow-lg">
+        <img
+          className="h-32 w-full object-cover"
+          src={props.pictureLink}
+          alt={props.title}></img>
+        <div className="flex flex-col gap-2 px-6 py-4">
+          <div className="mb-2 text-xl font-bold">{props.title}</div>
+          <p className="text-base text-gray-700">{props.description}</p>
+          <button
+            className="rounded bg-blue-500 px-4 py-2 font-bold text-white hover:bg-blue-700"
+            onClick={props.handleClick}>
+            Select
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/angular/react-in-angular/src/app/react/post.component.ts b/apps/angular/45-react-in-angular/src/app/react/post.component.ts
similarity index 100%
rename from apps/angular/react-in-angular/src/app/react/post.component.ts
rename to apps/angular/45-react-in-angular/src/app/react/post.component.ts
diff --git a/apps/angular/simple-animations/src/assets/.gitkeep b/apps/angular/45-react-in-angular/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/simple-animations/src/assets/.gitkeep
rename to apps/angular/45-react-in-angular/src/assets/.gitkeep
diff --git a/apps/angular/simple-animations/src/favicon.ico b/apps/angular/45-react-in-angular/src/favicon.ico
similarity index 100%
rename from apps/angular/simple-animations/src/favicon.ico
rename to apps/angular/45-react-in-angular/src/favicon.ico
diff --git a/apps/angular/react-in-angular/src/index.html b/apps/angular/45-react-in-angular/src/index.html
similarity index 100%
rename from apps/angular/react-in-angular/src/index.html
rename to apps/angular/45-react-in-angular/src/index.html
diff --git a/apps/angular/simple-animations/src/main.ts b/apps/angular/45-react-in-angular/src/main.ts
similarity index 100%
rename from apps/angular/simple-animations/src/main.ts
rename to apps/angular/45-react-in-angular/src/main.ts
diff --git a/apps/angular/react-in-angular/src/styles.scss b/apps/angular/45-react-in-angular/src/styles.scss
similarity index 100%
rename from apps/angular/react-in-angular/src/styles.scss
rename to apps/angular/45-react-in-angular/src/styles.scss
diff --git a/apps/angular/react-in-angular/src/test-setup.ts b/apps/angular/45-react-in-angular/src/test-setup.ts
similarity index 100%
rename from apps/angular/react-in-angular/src/test-setup.ts
rename to apps/angular/45-react-in-angular/src/test-setup.ts
diff --git a/apps/angular/simple-animations/tailwind.config.js b/apps/angular/45-react-in-angular/tailwind.config.js
similarity index 100%
rename from apps/angular/simple-animations/tailwind.config.js
rename to apps/angular/45-react-in-angular/tailwind.config.js
diff --git a/apps/angular/simple-animations/tsconfig.app.json b/apps/angular/45-react-in-angular/tsconfig.app.json
similarity index 100%
rename from apps/angular/simple-animations/tsconfig.app.json
rename to apps/angular/45-react-in-angular/tsconfig.app.json
diff --git a/apps/angular/react-in-angular/tsconfig.editor.json b/apps/angular/45-react-in-angular/tsconfig.editor.json
similarity index 100%
rename from apps/angular/react-in-angular/tsconfig.editor.json
rename to apps/angular/45-react-in-angular/tsconfig.editor.json
diff --git a/apps/forms/control-value-accessor/tsconfig.json b/apps/angular/45-react-in-angular/tsconfig.json
similarity index 100%
rename from apps/forms/control-value-accessor/tsconfig.json
rename to apps/angular/45-react-in-angular/tsconfig.json
diff --git a/apps/angular/react-in-angular/tsconfig.spec.json b/apps/angular/45-react-in-angular/tsconfig.spec.json
similarity index 100%
rename from apps/angular/react-in-angular/tsconfig.spec.json
rename to apps/angular/45-react-in-angular/tsconfig.spec.json
diff --git a/apps/angular/simple-animations/.eslintrc.json b/apps/angular/46-simple-animations/.eslintrc.json
similarity index 100%
rename from apps/angular/simple-animations/.eslintrc.json
rename to apps/angular/46-simple-animations/.eslintrc.json
diff --git a/apps/angular/simple-animations/README.md b/apps/angular/46-simple-animations/README.md
similarity index 100%
rename from apps/angular/simple-animations/README.md
rename to apps/angular/46-simple-animations/README.md
diff --git a/apps/angular/simple-animations/jest.config.ts b/apps/angular/46-simple-animations/jest.config.ts
similarity index 89%
rename from apps/angular/simple-animations/jest.config.ts
rename to apps/angular/46-simple-animations/jest.config.ts
index 8f5d36c..2ad2083 100644
--- a/apps/angular/simple-animations/jest.config.ts
+++ b/apps/angular/46-simple-animations/jest.config.ts
@@ -3,7 +3,7 @@ export default {
   displayName: 'angular-simple-animations',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/angular/simple-animations',
+  coverageDirectory: '../../../coverage/apps/angular/46-simple-animations',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/angular/simple-animations/project.json b/apps/angular/46-simple-animations/project.json
similarity index 75%
rename from apps/angular/simple-animations/project.json
rename to apps/angular/46-simple-animations/project.json
index 4ba302d..e10aba4 100644
--- a/apps/angular/simple-animations/project.json
+++ b/apps/angular/46-simple-animations/project.json
@@ -3,24 +3,24 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/simple-animations/src",
+  "sourceRoot": "apps/angular/46-simple-animations/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/simple-animations",
-        "index": "apps/angular/simple-animations/src/index.html",
-        "browser": "apps/angular/simple-animations/src/main.ts",
+        "outputPath": "dist/apps/angular/46-simple-animations",
+        "index": "apps/angular/46-simple-animations/src/index.html",
+        "browser": "apps/angular/46-simple-animations/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/simple-animations/tsconfig.app.json",
+        "tsConfig": "apps/angular/46-simple-animations/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/simple-animations/src/favicon.ico",
-          "apps/angular/simple-animations/src/assets"
+          "apps/angular/46-simple-animations/src/favicon.ico",
+          "apps/angular/46-simple-animations/src/assets"
         ],
-        "styles": ["apps/angular/simple-animations/src/styles.scss"],
+        "styles": ["apps/angular/46-simple-animations/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -73,7 +73,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/angular/simple-animations/jest.config.ts"
+        "jestConfig": "apps/angular/46-simple-animations/jest.config.ts"
       }
     }
   }
diff --git a/apps/angular/simple-animations/src/app/app.component.ts b/apps/angular/46-simple-animations/src/app/app.component.ts
similarity index 100%
rename from apps/angular/simple-animations/src/app/app.component.ts
rename to apps/angular/46-simple-animations/src/app/app.component.ts
diff --git a/apps/angular/simple-animations/src/app/app.config.ts b/apps/angular/46-simple-animations/src/app/app.config.ts
similarity index 100%
rename from apps/angular/simple-animations/src/app/app.config.ts
rename to apps/angular/46-simple-animations/src/app/app.config.ts
diff --git a/apps/angular/view-transition/src/assets/.gitkeep b/apps/angular/46-simple-animations/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/view-transition/src/assets/.gitkeep
rename to apps/angular/46-simple-animations/src/assets/.gitkeep
diff --git a/apps/angular/view-transition/src/favicon.ico b/apps/angular/46-simple-animations/src/favicon.ico
similarity index 100%
rename from apps/angular/view-transition/src/favicon.ico
rename to apps/angular/46-simple-animations/src/favicon.ico
diff --git a/apps/angular/simple-animations/src/index.html b/apps/angular/46-simple-animations/src/index.html
similarity index 100%
rename from apps/angular/simple-animations/src/index.html
rename to apps/angular/46-simple-animations/src/index.html
diff --git a/apps/angular/view-transition/src/main.ts b/apps/angular/46-simple-animations/src/main.ts
similarity index 100%
rename from apps/angular/view-transition/src/main.ts
rename to apps/angular/46-simple-animations/src/main.ts
diff --git a/apps/angular/simple-animations/src/styles.scss b/apps/angular/46-simple-animations/src/styles.scss
similarity index 100%
rename from apps/angular/simple-animations/src/styles.scss
rename to apps/angular/46-simple-animations/src/styles.scss
diff --git a/apps/angular/simple-animations/src/test-setup.ts b/apps/angular/46-simple-animations/src/test-setup.ts
similarity index 100%
rename from apps/angular/simple-animations/src/test-setup.ts
rename to apps/angular/46-simple-animations/src/test-setup.ts
diff --git a/apps/angular/view-transition/tailwind.config.js b/apps/angular/46-simple-animations/tailwind.config.js
similarity index 100%
rename from apps/angular/view-transition/tailwind.config.js
rename to apps/angular/46-simple-animations/tailwind.config.js
diff --git a/apps/angular/view-transition/tsconfig.app.json b/apps/angular/46-simple-animations/tsconfig.app.json
similarity index 100%
rename from apps/angular/view-transition/tsconfig.app.json
rename to apps/angular/46-simple-animations/tsconfig.app.json
diff --git a/apps/angular/simple-animations/tsconfig.editor.json b/apps/angular/46-simple-animations/tsconfig.editor.json
similarity index 100%
rename from apps/angular/simple-animations/tsconfig.editor.json
rename to apps/angular/46-simple-animations/tsconfig.editor.json
diff --git a/apps/angular/46-simple-animations/tsconfig.json b/apps/angular/46-simple-animations/tsconfig.json
new file mode 100644
index 0000000..25ca437
--- /dev/null
+++ b/apps/angular/46-simple-animations/tsconfig.json
@@ -0,0 +1,33 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "useDefineForClassFields": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./tsconfig.editor.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json",
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  }
+}
diff --git a/apps/angular/simple-animations/tsconfig.spec.json b/apps/angular/46-simple-animations/tsconfig.spec.json
similarity index 100%
rename from apps/angular/simple-animations/tsconfig.spec.json
rename to apps/angular/46-simple-animations/tsconfig.spec.json
diff --git a/apps/angular/di/README.md b/apps/angular/di/README.md
deleted file mode 100644
index 032601c..0000000
--- a/apps/angular/di/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Master Dependancy Injection
-
-> author: thomas-laforge
-
-### Run Application
-
-```bash
-npx nx serve angular-di
-```
-
-### Documentation and Instruction
-
-Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/angular/16-di/).
diff --git a/apps/angular/di/project.json b/apps/angular/di/project.json
deleted file mode 100644
index 6002637..0000000
--- a/apps/angular/di/project.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "name": "angular-di",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
-  "sourceRoot": "apps/angular/di/src",
-  "prefix": "app",
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:browser",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/apps/angular/di",
-        "index": "apps/angular/di/src/index.html",
-        "main": "apps/angular/di/src/main.ts",
-        "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/di/tsconfig.app.json",
-        "inlineStyleLanguage": "scss",
-        "assets": [
-          "apps/angular/di/src/favicon.ico",
-          "apps/angular/di/src/assets"
-        ],
-        "styles": ["apps/angular/di/src/styles.scss"],
-        "scripts": []
-      },
-      "configurations": {
-        "production": {
-          "budgets": [
-            {
-              "type": "initial",
-              "maximumWarning": "500kb",
-              "maximumError": "1mb"
-            },
-            {
-              "type": "anyComponentStyle",
-              "maximumWarning": "2kb",
-              "maximumError": "4kb"
-            }
-          ],
-          "outputHashing": "all"
-        },
-        "development": {
-          "buildOptimizer": false,
-          "optimization": false,
-          "vendorChunk": true,
-          "extractLicenses": false,
-          "sourceMap": true,
-          "namedChunks": true
-        }
-      },
-      "defaultConfiguration": "production"
-    },
-    "serve": {
-      "executor": "@angular-devkit/build-angular:dev-server",
-      "configurations": {
-        "production": {
-          "buildTarget": "angular-di:build:production"
-        },
-        "development": {
-          "buildTarget": "angular-di:build:development"
-        }
-      },
-      "defaultConfiguration": "development"
-    },
-    "extract-i18n": {
-      "executor": "@angular-devkit/build-angular:extract-i18n",
-      "options": {
-        "buildTarget": "angular-di:build"
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    }
-  },
-  "tags": []
-}
diff --git a/apps/angular/react-in-angular/src/app/react/ReactPost.tsx b/apps/angular/react-in-angular/src/app/react/ReactPost.tsx
deleted file mode 100644
index 6ff7b4d..0000000
--- a/apps/angular/react-in-angular/src/app/react/ReactPost.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-// import React from 'react';
-
-export default function ReactPost(props: {
-  title?: string,
-  description?: string,
-  pictureLink?: string,
-  selected?: boolean,
-  handleClick: () => void
-}) {
-  return (
-    <div className={props.selected ? 'bg-blue-100' : 'bg-white'}>
-      <div className="max-w-sm rounded overflow-hidden shadow-lg">
-        <img className="w-full h-32 object-cover" src={props.pictureLink} alt={props.title}></img>
-        <div className="px-6 py-4 flex flex-col gap-2">
-          <div className="font-bold text-xl mb-2">{props.title}</div>
-          <p className="text-gray-700 text-base">
-            {props.description}
-          </p>
-          <button className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded"
-                  onClick={props.handleClick}>
-            Select
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/angular/react-in-angular/tsconfig.json b/apps/angular/react-in-angular/tsconfig.json
deleted file mode 100644
index 7a9f4b7..0000000
--- a/apps/angular/react-in-angular/tsconfig.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "useDefineForClassFields": false,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json",
-    },
-    {
-      "path": "./tsconfig.spec.json",
-    },
-    {
-      "path": "./tsconfig.editor.json",
-    },
-  ],
-  "extends": "../../../tsconfig.base.json",
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true,
-  },
-}
diff --git a/apps/angular/simple-animations/tsconfig.json b/apps/angular/simple-animations/tsconfig.json
deleted file mode 100644
index 7a9f4b7..0000000
--- a/apps/angular/simple-animations/tsconfig.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "useDefineForClassFields": false,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json",
-    },
-    {
-      "path": "./tsconfig.spec.json",
-    },
-    {
-      "path": "./tsconfig.editor.json",
-    },
-  ],
-  "extends": "../../../tsconfig.base.json",
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true,
-  },
-}
diff --git a/apps/angular/view-transition/tsconfig.json b/apps/angular/view-transition/tsconfig.json
deleted file mode 100644
index db0ec0f..0000000
--- a/apps/angular/view-transition/tsconfig.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "useDefineForClassFields": false,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json",
-    },
-    {
-      "path": "./tsconfig.editor.json",
-    },
-  ],
-  "extends": "../../../tsconfig.base.json",
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true,
-  },
-}
diff --git a/apps/forms/avoid-losing-form-data/.eslintrc.json b/apps/forms/41-control-value-accessor/.eslintrc.json
similarity index 100%
rename from apps/forms/avoid-losing-form-data/.eslintrc.json
rename to apps/forms/41-control-value-accessor/.eslintrc.json
diff --git a/apps/forms/control-value-accessor/README.md b/apps/forms/41-control-value-accessor/README.md
similarity index 100%
rename from apps/forms/control-value-accessor/README.md
rename to apps/forms/41-control-value-accessor/README.md
diff --git a/apps/forms/control-value-accessor/jest.config.ts b/apps/forms/41-control-value-accessor/jest.config.ts
similarity index 89%
rename from apps/forms/control-value-accessor/jest.config.ts
rename to apps/forms/41-control-value-accessor/jest.config.ts
index 4af08e1..48769ac 100644
--- a/apps/forms/control-value-accessor/jest.config.ts
+++ b/apps/forms/41-control-value-accessor/jest.config.ts
@@ -3,7 +3,7 @@ export default {
   displayName: 'forms-control-value-accessor',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/forms/control-value-accessor',
+  coverageDirectory: '../../../coverage/apps/forms/41-control-value-accessor',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/forms/control-value-accessor/project.json b/apps/forms/41-control-value-accessor/project.json
similarity index 74%
rename from apps/forms/control-value-accessor/project.json
rename to apps/forms/41-control-value-accessor/project.json
index 70b8025..006ae8d 100644
--- a/apps/forms/control-value-accessor/project.json
+++ b/apps/forms/41-control-value-accessor/project.json
@@ -3,24 +3,24 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/forms/control-value-accessor/src",
+  "sourceRoot": "apps/forms/41-control-value-accessor/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/forms/control-value-accessor",
-        "index": "apps/forms/control-value-accessor/src/index.html",
-        "browser": "apps/forms/control-value-accessor/src/main.ts",
+        "outputPath": "dist/apps/forms/41-control-value-accessor",
+        "index": "apps/forms/41-control-value-accessor/src/index.html",
+        "browser": "apps/forms/41-control-value-accessor/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/forms/control-value-accessor/tsconfig.app.json",
+        "tsConfig": "apps/forms/41-control-value-accessor/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/forms/control-value-accessor/src/favicon.ico",
-          "apps/forms/control-value-accessor/src/assets"
+          "apps/forms/41-control-value-accessor/src/favicon.ico",
+          "apps/forms/41-control-value-accessor/src/assets"
         ],
-        "styles": ["apps/forms/control-value-accessor/src/styles.scss"],
+        "styles": ["apps/forms/41-control-value-accessor/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -72,7 +72,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/forms/control-value-accessor/jest.config.ts"
+        "jestConfig": "apps/forms/41-control-value-accessor/jest.config.ts"
       }
     }
   }
diff --git a/apps/forms/control-value-accessor/src/app/app.component.ts b/apps/forms/41-control-value-accessor/src/app/app.component.ts
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/app.component.ts
rename to apps/forms/41-control-value-accessor/src/app/app.component.ts
diff --git a/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.html b/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.html
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.html
rename to apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.html
diff --git a/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.scss b/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.scss
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.scss
rename to apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.scss
diff --git a/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.ts b/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.ts
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.ts
rename to apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.ts
diff --git a/apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.html b/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.html
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.html
rename to apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.html
diff --git a/apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.scss b/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.scss
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.scss
rename to apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.scss
diff --git a/apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.ts b/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.ts
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.ts
rename to apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.ts
diff --git a/apps/forms/avoid-losing-form-data/src/assets/.gitkeep b/apps/forms/41-control-value-accessor/src/assets/.gitkeep
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/assets/.gitkeep
rename to apps/forms/41-control-value-accessor/src/assets/.gitkeep
diff --git a/apps/forms/avoid-losing-form-data/src/favicon.ico b/apps/forms/41-control-value-accessor/src/favicon.ico
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/favicon.ico
rename to apps/forms/41-control-value-accessor/src/favicon.ico
diff --git a/apps/forms/control-value-accessor/src/index.html b/apps/forms/41-control-value-accessor/src/index.html
similarity index 100%
rename from apps/forms/control-value-accessor/src/index.html
rename to apps/forms/41-control-value-accessor/src/index.html
diff --git a/apps/forms/control-value-accessor/src/main.ts b/apps/forms/41-control-value-accessor/src/main.ts
similarity index 100%
rename from apps/forms/control-value-accessor/src/main.ts
rename to apps/forms/41-control-value-accessor/src/main.ts
diff --git a/apps/forms/avoid-losing-form-data/src/styles.scss b/apps/forms/41-control-value-accessor/src/styles.scss
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/styles.scss
rename to apps/forms/41-control-value-accessor/src/styles.scss
diff --git a/apps/forms/control-value-accessor/src/test-setup.ts b/apps/forms/41-control-value-accessor/src/test-setup.ts
similarity index 100%
rename from apps/forms/control-value-accessor/src/test-setup.ts
rename to apps/forms/41-control-value-accessor/src/test-setup.ts
diff --git a/apps/forms/control-value-accessor/tailwind.config.js b/apps/forms/41-control-value-accessor/tailwind.config.js
similarity index 100%
rename from apps/forms/control-value-accessor/tailwind.config.js
rename to apps/forms/41-control-value-accessor/tailwind.config.js
diff --git a/apps/forms/avoid-losing-form-data/tsconfig.app.json b/apps/forms/41-control-value-accessor/tsconfig.app.json
similarity index 100%
rename from apps/forms/avoid-losing-form-data/tsconfig.app.json
rename to apps/forms/41-control-value-accessor/tsconfig.app.json
diff --git a/apps/forms/control-value-accessor/tsconfig.editor.json b/apps/forms/41-control-value-accessor/tsconfig.editor.json
similarity index 100%
rename from apps/forms/control-value-accessor/tsconfig.editor.json
rename to apps/forms/41-control-value-accessor/tsconfig.editor.json
diff --git a/apps/forms/41-control-value-accessor/tsconfig.json b/apps/forms/41-control-value-accessor/tsconfig.json
new file mode 100644
index 0000000..25ca437
--- /dev/null
+++ b/apps/forms/41-control-value-accessor/tsconfig.json
@@ -0,0 +1,33 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "useDefineForClassFields": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./tsconfig.editor.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json",
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  }
+}
diff --git a/apps/forms/control-value-accessor/tsconfig.spec.json b/apps/forms/41-control-value-accessor/tsconfig.spec.json
similarity index 100%
rename from apps/forms/control-value-accessor/tsconfig.spec.json
rename to apps/forms/41-control-value-accessor/tsconfig.spec.json
diff --git a/apps/forms/control-value-accessor/.eslintrc.json b/apps/forms/48-avoid-losing-form-data/.eslintrc.json
similarity index 100%
rename from apps/forms/control-value-accessor/.eslintrc.json
rename to apps/forms/48-avoid-losing-form-data/.eslintrc.json
diff --git a/apps/forms/avoid-losing-form-data/README.md b/apps/forms/48-avoid-losing-form-data/README.md
similarity index 64%
rename from apps/forms/avoid-losing-form-data/README.md
rename to apps/forms/48-avoid-losing-form-data/README.md
index 9a3d0ac..1c0e90b 100644
--- a/apps/forms/avoid-losing-form-data/README.md
+++ b/apps/forms/48-avoid-losing-form-data/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve avoid-losing-form-data
+npx nx serve forms-avoid-losing-form-data
 ```
 
-Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/forms/48-avoid-losing-form-data/).
+Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/forms/48-forms-avoid-losing-form-data/).
diff --git a/apps/forms/avoid-losing-form-data/project.json b/apps/forms/48-avoid-losing-form-data/project.json
similarity index 66%
rename from apps/forms/avoid-losing-form-data/project.json
rename to apps/forms/48-avoid-losing-form-data/project.json
index ab6f2ca..d7d4673 100644
--- a/apps/forms/avoid-losing-form-data/project.json
+++ b/apps/forms/48-avoid-losing-form-data/project.json
@@ -1,27 +1,27 @@
 {
-  "name": "avoid-losing-form-data",
+  "name": "forms-avoid-losing-form-data",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/forms/avoid-losing-form-data/src",
+  "sourceRoot": "apps/forms/48-avoid-losing-form-data/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/forms/avoid-losing-form-data",
-        "index": "apps/forms/avoid-losing-form-data/src/index.html",
-        "browser": "apps/forms/avoid-losing-form-data/src/main.ts",
+        "outputPath": "dist/apps/forms/48-avoid-losing-form-data",
+        "index": "apps/forms/48-avoid-losing-form-data/src/index.html",
+        "browser": "apps/forms/48-avoid-losing-form-data/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/forms/avoid-losing-form-data/tsconfig.app.json",
+        "tsConfig": "apps/forms/48-avoid-losing-form-data/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/forms/avoid-losing-form-data/src/favicon.ico",
-          "apps/forms/avoid-losing-form-data/src/assets"
+          "apps/forms/48-avoid-losing-form-data/src/favicon.ico",
+          "apps/forms/48-avoid-losing-form-data/src/assets"
         ],
         "styles": [
-          "apps/forms/avoid-losing-form-data/src/styles.scss",
+          "apps/forms/48-avoid-losing-form-data/src/styles.scss",
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
         ],
         "scripts": []
@@ -54,10 +54,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "avoid-losing-form-data:build:production"
+          "buildTarget": "forms-avoid-losing-form-data:build:production"
         },
         "development": {
-          "buildTarget": "avoid-losing-form-data:build:development"
+          "buildTarget": "forms-avoid-losing-form-data:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -65,7 +65,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "avoid-losing-form-data:build"
+        "buildTarget": "forms-avoid-losing-form-data:build"
       }
     },
     "lint": {
diff --git a/apps/forms/avoid-losing-form-data/src/app/app.component.ts b/apps/forms/48-avoid-losing-form-data/src/app/app.component.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/app.component.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/app.component.ts
diff --git a/apps/forms/avoid-losing-form-data/src/app/app.config.ts b/apps/forms/48-avoid-losing-form-data/src/app/app.config.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/app.config.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/app.config.ts
diff --git a/apps/forms/avoid-losing-form-data/src/app/app.routes.ts b/apps/forms/48-avoid-losing-form-data/src/app/app.routes.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/app.routes.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/app.routes.ts
diff --git a/apps/forms/avoid-losing-form-data/src/app/pages/join.component.ts b/apps/forms/48-avoid-losing-form-data/src/app/pages/join.component.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/pages/join.component.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/pages/join.component.ts
diff --git a/apps/forms/avoid-losing-form-data/src/app/pages/page.component.ts b/apps/forms/48-avoid-losing-form-data/src/app/pages/page.component.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/pages/page.component.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/pages/page.component.ts
diff --git a/apps/forms/avoid-losing-form-data/src/app/ui/dialog.component.ts b/apps/forms/48-avoid-losing-form-data/src/app/ui/dialog.component.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/ui/dialog.component.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/ui/dialog.component.ts
diff --git a/apps/forms/avoid-losing-form-data/src/app/ui/form.component.ts b/apps/forms/48-avoid-losing-form-data/src/app/ui/form.component.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/ui/form.component.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/ui/form.component.ts
diff --git a/apps/forms/avoid-losing-form-data/src/app/ui/nav.component.ts b/apps/forms/48-avoid-losing-form-data/src/app/ui/nav.component.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/app/ui/nav.component.ts
rename to apps/forms/48-avoid-losing-form-data/src/app/ui/nav.component.ts
diff --git a/apps/forms/control-value-accessor/src/assets/.gitkeep b/apps/forms/48-avoid-losing-form-data/src/assets/.gitkeep
similarity index 100%
rename from apps/forms/control-value-accessor/src/assets/.gitkeep
rename to apps/forms/48-avoid-losing-form-data/src/assets/.gitkeep
diff --git a/apps/forms/control-value-accessor/src/favicon.ico b/apps/forms/48-avoid-losing-form-data/src/favicon.ico
similarity index 100%
rename from apps/forms/control-value-accessor/src/favicon.ico
rename to apps/forms/48-avoid-losing-form-data/src/favicon.ico
diff --git a/apps/forms/avoid-losing-form-data/src/index.html b/apps/forms/48-avoid-losing-form-data/src/index.html
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/index.html
rename to apps/forms/48-avoid-losing-form-data/src/index.html
diff --git a/apps/forms/avoid-losing-form-data/src/main.ts b/apps/forms/48-avoid-losing-form-data/src/main.ts
similarity index 100%
rename from apps/forms/avoid-losing-form-data/src/main.ts
rename to apps/forms/48-avoid-losing-form-data/src/main.ts
diff --git a/apps/forms/control-value-accessor/src/styles.scss b/apps/forms/48-avoid-losing-form-data/src/styles.scss
similarity index 100%
rename from apps/forms/control-value-accessor/src/styles.scss
rename to apps/forms/48-avoid-losing-form-data/src/styles.scss
diff --git a/apps/testing/todos-list/tailwind.config.js b/apps/forms/48-avoid-losing-form-data/tailwind.config.js
similarity index 88%
rename from apps/testing/todos-list/tailwind.config.js
rename to apps/forms/48-avoid-losing-form-data/tailwind.config.js
index 38183db..16f83c7 100644
--- a/apps/testing/todos-list/tailwind.config.js
+++ b/apps/forms/48-avoid-losing-form-data/tailwind.config.js
@@ -10,5 +10,5 @@ module.exports = {
   theme: {
     extend: {},
   },
-  plugins: [],
+  plugins: [require('@tailwindcss/forms')],
 };
diff --git a/apps/forms/control-value-accessor/tsconfig.app.json b/apps/forms/48-avoid-losing-form-data/tsconfig.app.json
similarity index 100%
rename from apps/forms/control-value-accessor/tsconfig.app.json
rename to apps/forms/48-avoid-losing-form-data/tsconfig.app.json
diff --git a/apps/forms/avoid-losing-form-data/tsconfig.editor.json b/apps/forms/48-avoid-losing-form-data/tsconfig.editor.json
similarity index 100%
rename from apps/forms/avoid-losing-form-data/tsconfig.editor.json
rename to apps/forms/48-avoid-losing-form-data/tsconfig.editor.json
diff --git a/apps/forms/avoid-losing-form-data/tsconfig.json b/apps/forms/48-avoid-losing-form-data/tsconfig.json
similarity index 100%
rename from apps/forms/avoid-losing-form-data/tsconfig.json
rename to apps/forms/48-avoid-losing-form-data/tsconfig.json
diff --git a/apps/forms/avoid-losing-form-data/tailwind.config.js b/apps/forms/avoid-losing-form-data/tailwind.config.js
deleted file mode 100644
index 42860ce..0000000
--- a/apps/forms/avoid-losing-form-data/tailwind.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
-const { join } = require('path');
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: [
-    join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
-    ...createGlobPatternsForDependencies(__dirname),
-  ],
-  theme: {
-    extend: {},
-  },
-  plugins: [
-    require('@tailwindcss/forms'),
-  ],
-};
diff --git a/apps/ngrx/effect-selector/.eslintrc.json b/apps/ngrx/2-effect-vs-selector/.eslintrc.json
similarity index 100%
rename from apps/ngrx/effect-selector/.eslintrc.json
rename to apps/ngrx/2-effect-vs-selector/.eslintrc.json
diff --git a/apps/ngrx/effect-selector/README.md b/apps/ngrx/2-effect-vs-selector/README.md
similarity index 85%
rename from apps/ngrx/effect-selector/README.md
rename to apps/ngrx/2-effect-vs-selector/README.md
index b12a534..4464073 100644
--- a/apps/ngrx/effect-selector/README.md
+++ b/apps/ngrx/2-effect-vs-selector/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve ngrx-effect-selector
+npx nx serve ngrx-effect-vs-selector
 ```
 
 ### Documentation and Instruction
diff --git a/apps/ngrx/effect-selector/jest.config.ts b/apps/ngrx/2-effect-vs-selector/jest.config.ts
similarity index 84%
rename from apps/ngrx/effect-selector/jest.config.ts
rename to apps/ngrx/2-effect-vs-selector/jest.config.ts
index 86ed38d..9581054 100644
--- a/apps/ngrx/effect-selector/jest.config.ts
+++ b/apps/ngrx/2-effect-vs-selector/jest.config.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
 export default {
-  displayName: 'ngrx-effect-selector',
+  displayName: 'ngrx-effect-vs-selector',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: {},
-  coverageDirectory: '../../../coverage/apps/ngrx/effect-selector',
+  coverageDirectory: '../../../coverage/apps/ngrx/2-effect-vs-selector',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/ngrx/effect-selector/project.json b/apps/ngrx/2-effect-vs-selector/project.json
similarity index 66%
rename from apps/ngrx/effect-selector/project.json
rename to apps/ngrx/2-effect-vs-selector/project.json
index 8cd2d72..d6ae9aa 100644
--- a/apps/ngrx/effect-selector/project.json
+++ b/apps/ngrx/2-effect-vs-selector/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "ngrx-effect-selector",
+  "name": "ngrx-effect-vs-selector",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/ngrx/effect-selector/src",
+  "sourceRoot": "apps/ngrx/2-effect-vs-selector/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/ngrx/effect-selector",
-        "index": "apps/ngrx/effect-selector/src/index.html",
-        "main": "apps/ngrx/effect-selector/src/main.ts",
-        "polyfills": "apps/ngrx/effect-selector/src/polyfills.ts",
-        "tsConfig": "apps/ngrx/effect-selector/tsconfig.app.json",
+        "outputPath": "dist/apps/ngrx/2-effect-vs-selector",
+        "index": "apps/ngrx/2-effect-vs-selector/src/index.html",
+        "main": "apps/ngrx/2-effect-vs-selector/src/main.ts",
+        "polyfills": "apps/ngrx/2-effect-vs-selector/src/polyfills.ts",
+        "tsConfig": "apps/ngrx/2-effect-vs-selector/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/ngrx/effect-selector/src/favicon.ico",
-          "apps/ngrx/effect-selector/src/assets"
+          "apps/ngrx/2-effect-vs-selector/src/favicon.ico",
+          "apps/ngrx/2-effect-vs-selector/src/assets"
         ],
-        "styles": ["apps/ngrx/effect-selector/src/styles.scss"],
+        "styles": ["apps/ngrx/2-effect-vs-selector/src/styles.scss"],
         "scripts": [],
         "allowedCommonJsDependencies": ["seedrandom"]
       },
@@ -54,10 +54,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "ngrx-effect-selector:build:production"
+          "buildTarget": "ngrx-effect-vs-selector:build:production"
         },
         "development": {
-          "buildTarget": "ngrx-effect-selector:build:development"
+          "buildTarget": "ngrx-effect-vs-selector:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -65,7 +65,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "ngrx-effect-selector:build"
+        "buildTarget": "ngrx-effect-vs-selector:build"
       }
     },
     "lint": {
@@ -75,7 +75,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/ngrx/effect-selector/jest.config.ts"
+        "jestConfig": "apps/ngrx/2-effect-vs-selector/jest.config.ts"
       }
     }
   },
diff --git a/apps/ngrx/effect-selector/src/app/app.component.ts b/apps/ngrx/2-effect-vs-selector/src/app/app.component.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/app.component.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/app.component.ts
diff --git a/apps/ngrx/effect-selector/src/app/app.config.ts b/apps/ngrx/2-effect-vs-selector/src/app/app.config.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/app.config.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/app.config.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/activity/activity.actions.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.actions.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/activity/activity.actions.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.actions.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/activity/activity.effects.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.effects.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/activity/activity.effects.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.effects.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/activity/activity.model.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.model.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/activity/activity.model.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.model.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/activity/activity.reducer.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.reducer.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/activity/activity.reducer.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.reducer.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/activity/activity.selectors.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.selectors.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/activity/activity.selectors.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.selectors.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/activity/activity.service.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.service.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/activity/activity.service.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/activity/activity.service.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/status/status.actions.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/status/status.actions.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/status/status.actions.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/status/status.actions.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/status/status.effects.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/status/status.effects.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/status/status.effects.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/status/status.effects.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/status/status.model.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/status/status.model.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/status/status.model.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/status/status.model.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/status/status.reducer.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/status/status.reducer.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/status/status.reducer.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/status/status.reducer.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/status/status.selectors.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/status/status.selectors.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/status/status.selectors.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/status/status.selectors.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/user/user.actions.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/user/user.actions.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/user/user.actions.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/user/user.actions.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/user/user.effects.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/user/user.effects.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/user/user.effects.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/user/user.effects.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/user/user.model.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/user/user.model.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/user/user.model.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/user/user.model.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/user/user.reducer.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/user/user.reducer.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/user/user.reducer.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/user/user.reducer.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/user/user.selectors.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/user/user.selectors.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/user/user.selectors.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/user/user.selectors.ts
diff --git a/apps/ngrx/effect-selector/src/app/store/user/user.service.ts b/apps/ngrx/2-effect-vs-selector/src/app/store/user/user.service.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/app/store/user/user.service.ts
rename to apps/ngrx/2-effect-vs-selector/src/app/store/user/user.service.ts
diff --git a/apps/ngrx/effect-selector/src/assets/.gitkeep b/apps/ngrx/2-effect-vs-selector/src/assets/.gitkeep
similarity index 100%
rename from apps/ngrx/effect-selector/src/assets/.gitkeep
rename to apps/ngrx/2-effect-vs-selector/src/assets/.gitkeep
diff --git a/apps/ngrx/effect-selector/src/favicon.ico b/apps/ngrx/2-effect-vs-selector/src/favicon.ico
similarity index 100%
rename from apps/ngrx/effect-selector/src/favicon.ico
rename to apps/ngrx/2-effect-vs-selector/src/favicon.ico
diff --git a/apps/ngrx/effect-selector/src/index.html b/apps/ngrx/2-effect-vs-selector/src/index.html
similarity index 100%
rename from apps/ngrx/effect-selector/src/index.html
rename to apps/ngrx/2-effect-vs-selector/src/index.html
diff --git a/apps/ngrx/effect-selector/src/main.ts b/apps/ngrx/2-effect-vs-selector/src/main.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/main.ts
rename to apps/ngrx/2-effect-vs-selector/src/main.ts
diff --git a/apps/ngrx/effect-selector/src/polyfills.ts b/apps/ngrx/2-effect-vs-selector/src/polyfills.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/polyfills.ts
rename to apps/ngrx/2-effect-vs-selector/src/polyfills.ts
diff --git a/apps/ngrx/effect-selector/src/styles.scss b/apps/ngrx/2-effect-vs-selector/src/styles.scss
similarity index 100%
rename from apps/ngrx/effect-selector/src/styles.scss
rename to apps/ngrx/2-effect-vs-selector/src/styles.scss
diff --git a/apps/ngrx/effect-selector/src/test-setup.ts b/apps/ngrx/2-effect-vs-selector/src/test-setup.ts
similarity index 100%
rename from apps/ngrx/effect-selector/src/test-setup.ts
rename to apps/ngrx/2-effect-vs-selector/src/test-setup.ts
diff --git a/apps/ngrx/effect-selector/tsconfig.app.json b/apps/ngrx/2-effect-vs-selector/tsconfig.app.json
similarity index 100%
rename from apps/ngrx/effect-selector/tsconfig.app.json
rename to apps/ngrx/2-effect-vs-selector/tsconfig.app.json
diff --git a/apps/ngrx/effect-selector/tsconfig.editor.json b/apps/ngrx/2-effect-vs-selector/tsconfig.editor.json
similarity index 100%
rename from apps/ngrx/effect-selector/tsconfig.editor.json
rename to apps/ngrx/2-effect-vs-selector/tsconfig.editor.json
diff --git a/apps/ngrx/effect-selector/tsconfig.json b/apps/ngrx/2-effect-vs-selector/tsconfig.json
similarity index 100%
rename from apps/ngrx/effect-selector/tsconfig.json
rename to apps/ngrx/2-effect-vs-selector/tsconfig.json
diff --git a/apps/ngrx/effect-selector/tsconfig.spec.json b/apps/ngrx/2-effect-vs-selector/tsconfig.spec.json
similarity index 100%
rename from apps/ngrx/effect-selector/tsconfig.spec.json
rename to apps/ngrx/2-effect-vs-selector/tsconfig.spec.json
diff --git a/apps/ngrx/notification/.eslintrc.json b/apps/ngrx/7-power-of-effect/.eslintrc.json
similarity index 100%
rename from apps/ngrx/notification/.eslintrc.json
rename to apps/ngrx/7-power-of-effect/.eslintrc.json
diff --git a/apps/ngrx/notification/README.md b/apps/ngrx/7-power-of-effect/README.md
similarity index 86%
rename from apps/ngrx/notification/README.md
rename to apps/ngrx/7-power-of-effect/README.md
index 36acdab..b185004 100644
--- a/apps/ngrx/notification/README.md
+++ b/apps/ngrx/7-power-of-effect/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve ngrx-notification
+npx nx serve ngrx-power-of-effect
 ```
 
 ### Documentation and Instruction
diff --git a/apps/ngrx/notification/project.json b/apps/ngrx/7-power-of-effect/project.json
similarity index 68%
rename from apps/ngrx/notification/project.json
rename to apps/ngrx/7-power-of-effect/project.json
index 3f8a851..ffec53a 100644
--- a/apps/ngrx/notification/project.json
+++ b/apps/ngrx/7-power-of-effect/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "ngrx-notification",
+  "name": "ngrx-power-of-effect",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/ngrx/notification/src",
+  "sourceRoot": "apps/ngrx/7-power-of-effect/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/ngrx/notification",
-        "index": "apps/ngrx/notification/src/index.html",
-        "main": "apps/ngrx/notification/src/main.ts",
-        "polyfills": "apps/ngrx/notification/src/polyfills.ts",
-        "tsConfig": "apps/ngrx/notification/tsconfig.app.json",
+        "outputPath": "dist/apps/ngrx/7-power-of-effect",
+        "index": "apps/ngrx/7-power-of-effect/src/index.html",
+        "main": "apps/ngrx/7-power-of-effect/src/main.ts",
+        "polyfills": "apps/ngrx/7-power-of-effect/src/polyfills.ts",
+        "tsConfig": "apps/ngrx/7-power-of-effect/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/ngrx/notification/src/favicon.ico",
-          "apps/ngrx/notification/src/assets"
+          "apps/ngrx/7-power-of-effect/src/favicon.ico",
+          "apps/ngrx/7-power-of-effect/src/assets"
         ],
         "styles": [
-          "apps/ngrx/notification/src/styles.scss",
+          "apps/ngrx/7-power-of-effect/src/styles.scss",
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
         ],
         "scripts": [],
@@ -57,10 +57,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "ngrx-notification:build:production"
+          "buildTarget": "ngrx-power-of-effect:build:production"
         },
         "development": {
-          "buildTarget": "ngrx-notification:build:development"
+          "buildTarget": "ngrx-power-of-effect:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -68,7 +68,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "ngrx-notification:build"
+        "buildTarget": "ngrx-power-of-effect:build"
       }
     },
     "lint": {
diff --git a/apps/ngrx/notification/src/app/app.actions.ts b/apps/ngrx/7-power-of-effect/src/app/app.actions.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/app.actions.ts
rename to apps/ngrx/7-power-of-effect/src/app/app.actions.ts
diff --git a/apps/ngrx/notification/src/app/app.component.ts b/apps/ngrx/7-power-of-effect/src/app/app.component.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/app.component.ts
rename to apps/ngrx/7-power-of-effect/src/app/app.component.ts
diff --git a/apps/ngrx/notification/src/app/app.config.ts b/apps/ngrx/7-power-of-effect/src/app/app.config.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/app.config.ts
rename to apps/ngrx/7-power-of-effect/src/app/app.config.ts
diff --git a/apps/ngrx/notification/src/app/data-access/http.service.ts b/apps/ngrx/7-power-of-effect/src/app/data-access/http.service.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/data-access/http.service.ts
rename to apps/ngrx/7-power-of-effect/src/app/data-access/http.service.ts
diff --git a/apps/ngrx/notification/src/app/data-access/notification.service.ts b/apps/ngrx/7-power-of-effect/src/app/data-access/notification.service.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/data-access/notification.service.ts
rename to apps/ngrx/7-power-of-effect/src/app/data-access/notification.service.ts
diff --git a/apps/ngrx/notification/src/app/routes.ts b/apps/ngrx/7-power-of-effect/src/app/routes.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/routes.ts
rename to apps/ngrx/7-power-of-effect/src/app/routes.ts
diff --git a/apps/ngrx/notification/src/app/school/school.component.ts b/apps/ngrx/7-power-of-effect/src/app/school/school.component.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/school/school.component.ts
rename to apps/ngrx/7-power-of-effect/src/app/school/school.component.ts
diff --git a/apps/ngrx/notification/src/app/school/school.store.ts b/apps/ngrx/7-power-of-effect/src/app/school/school.store.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/school/school.store.ts
rename to apps/ngrx/7-power-of-effect/src/app/school/school.store.ts
diff --git a/apps/ngrx/notification/src/app/student/store/student.actions.ts b/apps/ngrx/7-power-of-effect/src/app/student/store/student.actions.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/student/store/student.actions.ts
rename to apps/ngrx/7-power-of-effect/src/app/student/store/student.actions.ts
diff --git a/apps/ngrx/notification/src/app/student/store/student.effects.ts b/apps/ngrx/7-power-of-effect/src/app/student/store/student.effects.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/student/store/student.effects.ts
rename to apps/ngrx/7-power-of-effect/src/app/student/store/student.effects.ts
diff --git a/apps/ngrx/notification/src/app/student/store/student.reducer.ts b/apps/ngrx/7-power-of-effect/src/app/student/store/student.reducer.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/student/store/student.reducer.ts
rename to apps/ngrx/7-power-of-effect/src/app/student/store/student.reducer.ts
diff --git a/apps/ngrx/notification/src/app/student/store/student.selectors.ts b/apps/ngrx/7-power-of-effect/src/app/student/store/student.selectors.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/student/store/student.selectors.ts
rename to apps/ngrx/7-power-of-effect/src/app/student/store/student.selectors.ts
diff --git a/apps/ngrx/notification/src/app/student/student.component.ts b/apps/ngrx/7-power-of-effect/src/app/student/student.component.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/student/student.component.ts
rename to apps/ngrx/7-power-of-effect/src/app/student/student.component.ts
diff --git a/apps/ngrx/notification/src/app/teacher/store/teacher.actions.ts b/apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.actions.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/teacher/store/teacher.actions.ts
rename to apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.actions.ts
diff --git a/apps/ngrx/notification/src/app/teacher/store/teacher.effects.ts b/apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.effects.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/teacher/store/teacher.effects.ts
rename to apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.effects.ts
diff --git a/apps/ngrx/notification/src/app/teacher/store/teacher.reducer.ts b/apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.reducer.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/teacher/store/teacher.reducer.ts
rename to apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.reducer.ts
diff --git a/apps/ngrx/notification/src/app/teacher/store/teacher.selectors.ts b/apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.selectors.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/teacher/store/teacher.selectors.ts
rename to apps/ngrx/7-power-of-effect/src/app/teacher/store/teacher.selectors.ts
diff --git a/apps/ngrx/notification/src/app/teacher/teacher.component.ts b/apps/ngrx/7-power-of-effect/src/app/teacher/teacher.component.ts
similarity index 100%
rename from apps/ngrx/notification/src/app/teacher/teacher.component.ts
rename to apps/ngrx/7-power-of-effect/src/app/teacher/teacher.component.ts
diff --git a/apps/ngrx/notification/src/assets/.gitkeep b/apps/ngrx/7-power-of-effect/src/assets/.gitkeep
similarity index 100%
rename from apps/ngrx/notification/src/assets/.gitkeep
rename to apps/ngrx/7-power-of-effect/src/assets/.gitkeep
diff --git a/apps/ngrx/notification/src/favicon.ico b/apps/ngrx/7-power-of-effect/src/favicon.ico
similarity index 100%
rename from apps/ngrx/notification/src/favicon.ico
rename to apps/ngrx/7-power-of-effect/src/favicon.ico
diff --git a/apps/ngrx/notification/src/index.html b/apps/ngrx/7-power-of-effect/src/index.html
similarity index 100%
rename from apps/ngrx/notification/src/index.html
rename to apps/ngrx/7-power-of-effect/src/index.html
diff --git a/apps/ngrx/notification/src/main.ts b/apps/ngrx/7-power-of-effect/src/main.ts
similarity index 100%
rename from apps/ngrx/notification/src/main.ts
rename to apps/ngrx/7-power-of-effect/src/main.ts
diff --git a/apps/ngrx/notification/src/polyfills.ts b/apps/ngrx/7-power-of-effect/src/polyfills.ts
similarity index 100%
rename from apps/ngrx/notification/src/polyfills.ts
rename to apps/ngrx/7-power-of-effect/src/polyfills.ts
diff --git a/apps/ngrx/notification/src/styles.scss b/apps/ngrx/7-power-of-effect/src/styles.scss
similarity index 100%
rename from apps/ngrx/notification/src/styles.scss
rename to apps/ngrx/7-power-of-effect/src/styles.scss
diff --git a/apps/ngrx/notification/tsconfig.app.json b/apps/ngrx/7-power-of-effect/tsconfig.app.json
similarity index 100%
rename from apps/ngrx/notification/tsconfig.app.json
rename to apps/ngrx/7-power-of-effect/tsconfig.app.json
diff --git a/apps/ngrx/notification/tsconfig.editor.json b/apps/ngrx/7-power-of-effect/tsconfig.editor.json
similarity index 100%
rename from apps/ngrx/notification/tsconfig.editor.json
rename to apps/ngrx/7-power-of-effect/tsconfig.editor.json
diff --git a/apps/ngrx/notification/tsconfig.json b/apps/ngrx/7-power-of-effect/tsconfig.json
similarity index 100%
rename from apps/ngrx/notification/tsconfig.json
rename to apps/ngrx/7-power-of-effect/tsconfig.json
diff --git a/apps/performance/default-onpush/.eslintrc.json b/apps/performance/12-optimize-change-detection/.eslintrc.json
similarity index 100%
rename from apps/performance/default-onpush/.eslintrc.json
rename to apps/performance/12-optimize-change-detection/.eslintrc.json
diff --git a/apps/performance/scroll-cd/README.md b/apps/performance/12-optimize-change-detection/README.md
similarity index 59%
rename from apps/performance/scroll-cd/README.md
rename to apps/performance/12-optimize-change-detection/README.md
index dc0c313..52fe319 100644
--- a/apps/performance/scroll-cd/README.md
+++ b/apps/performance/12-optimize-change-detection/README.md
@@ -5,9 +5,9 @@
 ### Run Application
 
 ```bash
-npx nx serve performance-scroll-cd
+npx nx serve performance-optimize-change-detection
 ```
 
 ### Documentation and Instruction
 
-Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/performance/12-performance-scroll-cd/).
+Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/performance/12-performance-optimize-change-detection/).
diff --git a/apps/angular/16-master-dependency-injection/jest.config.ts b/apps/performance/12-optimize-change-detection/jest.config.ts
similarity index 81%
rename from apps/angular/16-master-dependency-injection/jest.config.ts
rename to apps/performance/12-optimize-change-detection/jest.config.ts
index d2e0abf..dc22d99 100644
--- a/apps/angular/16-master-dependency-injection/jest.config.ts
+++ b/apps/performance/12-optimize-change-detection/jest.config.ts
@@ -1,10 +1,11 @@
 /* eslint-disable */
 export default {
-  displayName: 'angular-master-dependency-injection',
+  displayName: 'performance-optimize-change-detection',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+  globals: {},
   coverageDirectory:
-    '../../../coverage/apps/angular/16-master-dependency-injection',
+    '../../../coverage/apps/performance/12-optimize-change-detection',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/performance/scroll-cd/project.json b/apps/performance/12-optimize-change-detection/project.json
similarity index 62%
rename from apps/performance/scroll-cd/project.json
rename to apps/performance/12-optimize-change-detection/project.json
index fb455b7..e787ad4 100644
--- a/apps/performance/scroll-cd/project.json
+++ b/apps/performance/12-optimize-change-detection/project.json
@@ -1,25 +1,27 @@
 {
-  "name": "performance-scroll-cd",
+  "name": "performance-optimize-change-detection",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/performance/scroll-cd/src",
+  "sourceRoot": "apps/performance/12-optimize-change-detection/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/performance/scroll-cd",
-        "index": "apps/performance/scroll-cd/src/index.html",
-        "main": "apps/performance/scroll-cd/src/main.ts",
+        "outputPath": "dist/apps/performance/12-optimize-change-detection",
+        "index": "apps/performance/12-optimize-change-detection/src/index.html",
+        "main": "apps/performance/12-optimize-change-detection/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/performance/scroll-cd/tsconfig.app.json",
+        "tsConfig": "apps/performance/12-optimize-change-detection/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/performance/scroll-cd/src/favicon.ico",
-          "apps/performance/scroll-cd/src/assets"
+          "apps/performance/12-optimize-change-detection/src/favicon.ico",
+          "apps/performance/12-optimize-change-detection/src/assets"
+        ],
+        "styles": [
+          "apps/performance/12-optimize-change-detection/src/styles.scss"
         ],
-        "styles": ["apps/performance/scroll-cd/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +55,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "performance-scroll-cd:build:production"
+          "buildTarget": "performance-optimize-change-detection:build:production"
         },
         "development": {
-          "buildTarget": "performance-scroll-cd:build:development"
+          "buildTarget": "performance-optimize-change-detection:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +66,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "performance-scroll-cd:build"
+        "buildTarget": "performance-optimize-change-detection:build"
       }
     },
     "lint": {
@@ -74,7 +76,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/performance/scroll-cd/jest.config.ts"
+        "jestConfig": "apps/performance/12-optimize-change-detection/jest.config.ts"
       }
     }
   },
diff --git a/apps/performance/scroll-cd/src/app/app.component.ts b/apps/performance/12-optimize-change-detection/src/app/app.component.ts
similarity index 100%
rename from apps/performance/scroll-cd/src/app/app.component.ts
rename to apps/performance/12-optimize-change-detection/src/app/app.component.ts
diff --git a/apps/performance/christmas-web-worker/src/assets/.gitkeep b/apps/performance/12-optimize-change-detection/src/assets/.gitkeep
similarity index 100%
rename from apps/performance/christmas-web-worker/src/assets/.gitkeep
rename to apps/performance/12-optimize-change-detection/src/assets/.gitkeep
diff --git a/apps/performance/christmas-web-worker/src/favicon.ico b/apps/performance/12-optimize-change-detection/src/favicon.ico
similarity index 100%
rename from apps/performance/christmas-web-worker/src/favicon.ico
rename to apps/performance/12-optimize-change-detection/src/favicon.ico
diff --git a/apps/performance/scroll-cd/src/index.html b/apps/performance/12-optimize-change-detection/src/index.html
similarity index 100%
rename from apps/performance/scroll-cd/src/index.html
rename to apps/performance/12-optimize-change-detection/src/index.html
diff --git a/apps/performance/christmas-web-worker/src/main.ts b/apps/performance/12-optimize-change-detection/src/main.ts
similarity index 100%
rename from apps/performance/christmas-web-worker/src/main.ts
rename to apps/performance/12-optimize-change-detection/src/main.ts
diff --git a/apps/performance/scroll-cd/src/styles.scss b/apps/performance/12-optimize-change-detection/src/styles.scss
similarity index 100%
rename from apps/performance/scroll-cd/src/styles.scss
rename to apps/performance/12-optimize-change-detection/src/styles.scss
diff --git a/apps/performance/scroll-cd/src/test-setup.ts b/apps/performance/12-optimize-change-detection/src/test-setup.ts
similarity index 100%
rename from apps/performance/scroll-cd/src/test-setup.ts
rename to apps/performance/12-optimize-change-detection/src/test-setup.ts
diff --git a/apps/performance/christmas-web-worker/tsconfig.app.json b/apps/performance/12-optimize-change-detection/tsconfig.app.json
similarity index 100%
rename from apps/performance/christmas-web-worker/tsconfig.app.json
rename to apps/performance/12-optimize-change-detection/tsconfig.app.json
diff --git a/apps/performance/ngfor-optimize/tsconfig.editor.json b/apps/performance/12-optimize-change-detection/tsconfig.editor.json
similarity index 100%
rename from apps/performance/ngfor-optimize/tsconfig.editor.json
rename to apps/performance/12-optimize-change-detection/tsconfig.editor.json
diff --git a/apps/performance/ngfor-optimize/tsconfig.json b/apps/performance/12-optimize-change-detection/tsconfig.json
similarity index 100%
rename from apps/performance/ngfor-optimize/tsconfig.json
rename to apps/performance/12-optimize-change-detection/tsconfig.json
diff --git a/apps/performance/scroll-cd/tsconfig.spec.json b/apps/performance/12-optimize-change-detection/tsconfig.spec.json
similarity index 100%
rename from apps/performance/scroll-cd/tsconfig.spec.json
rename to apps/performance/12-optimize-change-detection/tsconfig.spec.json
diff --git a/apps/performance/memoized/.eslintrc.json b/apps/performance/34-default-vs-onpush/.eslintrc.json
similarity index 100%
rename from apps/performance/memoized/.eslintrc.json
rename to apps/performance/34-default-vs-onpush/.eslintrc.json
diff --git a/apps/performance/default-onpush/README.md b/apps/performance/34-default-vs-onpush/README.md
similarity index 84%
rename from apps/performance/default-onpush/README.md
rename to apps/performance/34-default-vs-onpush/README.md
index 29d7696..ab82704 100644
--- a/apps/performance/default-onpush/README.md
+++ b/apps/performance/34-default-vs-onpush/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve performance-default-onpush
+npx nx serve performance-default-vs-onpush
 ```
 
 ### Documentation and Instruction
diff --git a/apps/performance/memoized/project.json b/apps/performance/34-default-vs-onpush/project.json
similarity index 67%
rename from apps/performance/memoized/project.json
rename to apps/performance/34-default-vs-onpush/project.json
index fff792d..b806f96 100644
--- a/apps/performance/memoized/project.json
+++ b/apps/performance/34-default-vs-onpush/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "performance-memoized",
+  "name": "performance-default-vs-onpush",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/performance/memoized/src",
+  "sourceRoot": "apps/performance/34-default-vs-onpush/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/performance/memoized",
-        "index": "apps/performance/memoized/src/index.html",
-        "main": "apps/performance/memoized/src/main.ts",
+        "outputPath": "dist/apps/performance/34-default-vs-onpush",
+        "index": "apps/performance/34-default-vs-onpush/src/index.html",
+        "main": "apps/performance/34-default-vs-onpush/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/performance/memoized/tsconfig.app.json",
+        "tsConfig": "apps/performance/34-default-vs-onpush/tsconfig.app.json",
         "assets": [
-          "apps/performance/memoized/src/favicon.ico",
-          "apps/performance/memoized/src/assets"
+          "apps/performance/34-default-vs-onpush/src/favicon.ico",
+          "apps/performance/34-default-vs-onpush/src/assets"
         ],
         "styles": [
-          "apps/performance/memoized/src/styles.scss",
+          "apps/performance/34-default-vs-onpush/src/styles.scss",
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
         ],
         "scripts": [],
@@ -57,10 +57,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "performance-memoized:build:production"
+          "buildTarget": "performance-default-vs-onpush:build:production"
         },
         "development": {
-          "buildTarget": "performance-memoized:build:development"
+          "buildTarget": "performance-default-vs-onpush:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -68,7 +68,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "performance-memoized:build"
+        "buildTarget": "performance-default-vs-onpush:build"
       }
     },
     "lint": {
diff --git a/apps/performance/default-onpush/src/app/app.component.ts b/apps/performance/34-default-vs-onpush/src/app/app.component.ts
similarity index 100%
rename from apps/performance/default-onpush/src/app/app.component.ts
rename to apps/performance/34-default-vs-onpush/src/app/app.component.ts
diff --git a/apps/performance/default-onpush/src/app/app.config.ts b/apps/performance/34-default-vs-onpush/src/app/app.config.ts
similarity index 100%
rename from apps/performance/default-onpush/src/app/app.config.ts
rename to apps/performance/34-default-vs-onpush/src/app/app.config.ts
diff --git a/apps/performance/default-onpush/src/app/person-list.component.ts b/apps/performance/34-default-vs-onpush/src/app/person-list.component.ts
similarity index 100%
rename from apps/performance/default-onpush/src/app/person-list.component.ts
rename to apps/performance/34-default-vs-onpush/src/app/person-list.component.ts
diff --git a/apps/performance/default-onpush/src/app/random.component.ts b/apps/performance/34-default-vs-onpush/src/app/random.component.ts
similarity index 100%
rename from apps/performance/default-onpush/src/app/random.component.ts
rename to apps/performance/34-default-vs-onpush/src/app/random.component.ts
diff --git a/apps/performance/default-onpush/src/assets/.gitkeep b/apps/performance/34-default-vs-onpush/src/assets/.gitkeep
similarity index 100%
rename from apps/performance/default-onpush/src/assets/.gitkeep
rename to apps/performance/34-default-vs-onpush/src/assets/.gitkeep
diff --git a/apps/performance/default-onpush/src/favicon.ico b/apps/performance/34-default-vs-onpush/src/favicon.ico
similarity index 100%
rename from apps/performance/default-onpush/src/favicon.ico
rename to apps/performance/34-default-vs-onpush/src/favicon.ico
diff --git a/apps/performance/default-onpush/src/index.html b/apps/performance/34-default-vs-onpush/src/index.html
similarity index 100%
rename from apps/performance/default-onpush/src/index.html
rename to apps/performance/34-default-vs-onpush/src/index.html
diff --git a/apps/performance/default-onpush/src/main.ts b/apps/performance/34-default-vs-onpush/src/main.ts
similarity index 100%
rename from apps/performance/default-onpush/src/main.ts
rename to apps/performance/34-default-vs-onpush/src/main.ts
diff --git a/apps/performance/christmas-web-worker/src/styles.scss b/apps/performance/34-default-vs-onpush/src/styles.scss
similarity index 100%
rename from apps/performance/christmas-web-worker/src/styles.scss
rename to apps/performance/34-default-vs-onpush/src/styles.scss
diff --git a/apps/performance/christmas-web-worker/tailwind.config.js b/apps/performance/34-default-vs-onpush/tailwind.config.js
similarity index 100%
rename from apps/performance/christmas-web-worker/tailwind.config.js
rename to apps/performance/34-default-vs-onpush/tailwind.config.js
diff --git a/apps/performance/default-onpush/tsconfig.app.json b/apps/performance/34-default-vs-onpush/tsconfig.app.json
similarity index 100%
rename from apps/performance/default-onpush/tsconfig.app.json
rename to apps/performance/34-default-vs-onpush/tsconfig.app.json
diff --git a/apps/performance/default-onpush/tsconfig.editor.json b/apps/performance/34-default-vs-onpush/tsconfig.editor.json
similarity index 100%
rename from apps/performance/default-onpush/tsconfig.editor.json
rename to apps/performance/34-default-vs-onpush/tsconfig.editor.json
diff --git a/apps/angular/di/tsconfig.json b/apps/performance/34-default-vs-onpush/tsconfig.json
similarity index 100%
rename from apps/angular/di/tsconfig.json
rename to apps/performance/34-default-vs-onpush/tsconfig.json
diff --git a/apps/performance/ngfor-biglist/.eslintrc.json b/apps/performance/35-memoization/.eslintrc.json
similarity index 100%
rename from apps/performance/ngfor-biglist/.eslintrc.json
rename to apps/performance/35-memoization/.eslintrc.json
diff --git a/apps/performance/memoized/README.md b/apps/performance/35-memoization/README.md
similarity index 85%
rename from apps/performance/memoized/README.md
rename to apps/performance/35-memoization/README.md
index 520efb1..a06a0e9 100644
--- a/apps/performance/memoized/README.md
+++ b/apps/performance/35-memoization/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve performance-memoized
+npx nx serve performance-memoization
 ```
 
 ### Documentation and Instruction
diff --git a/apps/performance/default-onpush/project.json b/apps/performance/35-memoization/project.json
similarity index 69%
rename from apps/performance/default-onpush/project.json
rename to apps/performance/35-memoization/project.json
index 14faaab..80e54bc 100644
--- a/apps/performance/default-onpush/project.json
+++ b/apps/performance/35-memoization/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "performance-default-onpush",
+  "name": "performance-memoization",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/performance/default-onpush/src",
+  "sourceRoot": "apps/performance/35-memoization/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/performance/default-onpush",
-        "index": "apps/performance/default-onpush/src/index.html",
-        "main": "apps/performance/default-onpush/src/main.ts",
+        "outputPath": "dist/apps/performance/35-memoization",
+        "index": "apps/performance/35-memoization/src/index.html",
+        "main": "apps/performance/35-memoization/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/performance/default-onpush/tsconfig.app.json",
+        "tsConfig": "apps/performance/35-memoization/tsconfig.app.json",
         "assets": [
-          "apps/performance/default-onpush/src/favicon.ico",
-          "apps/performance/default-onpush/src/assets"
+          "apps/performance/35-memoization/src/favicon.ico",
+          "apps/performance/35-memoization/src/assets"
         ],
         "styles": [
-          "apps/performance/default-onpush/src/styles.scss",
+          "apps/performance/35-memoization/src/styles.scss",
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
         ],
         "scripts": [],
@@ -57,10 +57,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "performance-default-onpush:build:production"
+          "buildTarget": "performance-memoization:build:production"
         },
         "development": {
-          "buildTarget": "performance-default-onpush:build:development"
+          "buildTarget": "performance-memoization:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -68,7 +68,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "performance-default-onpush:build"
+        "buildTarget": "performance-memoization:build"
       }
     },
     "lint": {
diff --git a/apps/performance/memoized/src/app/app.component.ts b/apps/performance/35-memoization/src/app/app.component.ts
similarity index 100%
rename from apps/performance/memoized/src/app/app.component.ts
rename to apps/performance/35-memoization/src/app/app.component.ts
diff --git a/apps/performance/memoized/src/app/app.config.ts b/apps/performance/35-memoization/src/app/app.config.ts
similarity index 100%
rename from apps/performance/memoized/src/app/app.config.ts
rename to apps/performance/35-memoization/src/app/app.config.ts
diff --git a/apps/performance/memoized/src/app/generateList.ts b/apps/performance/35-memoization/src/app/generateList.ts
similarity index 100%
rename from apps/performance/memoized/src/app/generateList.ts
rename to apps/performance/35-memoization/src/app/generateList.ts
diff --git a/apps/performance/memoized/src/app/person-list.component.ts b/apps/performance/35-memoization/src/app/person-list.component.ts
similarity index 100%
rename from apps/performance/memoized/src/app/person-list.component.ts
rename to apps/performance/35-memoization/src/app/person-list.component.ts
diff --git a/apps/performance/memoized/src/app/person.model.ts b/apps/performance/35-memoization/src/app/person.model.ts
similarity index 100%
rename from apps/performance/memoized/src/app/person.model.ts
rename to apps/performance/35-memoization/src/app/person.model.ts
diff --git a/apps/performance/memoized/src/assets/.gitkeep b/apps/performance/35-memoization/src/assets/.gitkeep
similarity index 100%
rename from apps/performance/memoized/src/assets/.gitkeep
rename to apps/performance/35-memoization/src/assets/.gitkeep
diff --git a/apps/performance/memoized/src/favicon.ico b/apps/performance/35-memoization/src/favicon.ico
similarity index 100%
rename from apps/performance/memoized/src/favicon.ico
rename to apps/performance/35-memoization/src/favicon.ico
diff --git a/apps/performance/memoized/src/index.html b/apps/performance/35-memoization/src/index.html
similarity index 100%
rename from apps/performance/memoized/src/index.html
rename to apps/performance/35-memoization/src/index.html
diff --git a/apps/performance/memoized/src/main.ts b/apps/performance/35-memoization/src/main.ts
similarity index 100%
rename from apps/performance/memoized/src/main.ts
rename to apps/performance/35-memoization/src/main.ts
diff --git a/apps/performance/default-onpush/src/styles.scss b/apps/performance/35-memoization/src/styles.scss
similarity index 100%
rename from apps/performance/default-onpush/src/styles.scss
rename to apps/performance/35-memoization/src/styles.scss
diff --git a/apps/performance/default-onpush/tailwind.config.js b/apps/performance/35-memoization/tailwind.config.js
similarity index 100%
rename from apps/performance/default-onpush/tailwind.config.js
rename to apps/performance/35-memoization/tailwind.config.js
diff --git a/apps/performance/memoized/tsconfig.app.json b/apps/performance/35-memoization/tsconfig.app.json
similarity index 100%
rename from apps/performance/memoized/tsconfig.app.json
rename to apps/performance/35-memoization/tsconfig.app.json
diff --git a/apps/performance/christmas-web-worker/tsconfig.editor.json b/apps/performance/35-memoization/tsconfig.editor.json
similarity index 100%
rename from apps/performance/christmas-web-worker/tsconfig.editor.json
rename to apps/performance/35-memoization/tsconfig.editor.json
diff --git a/apps/performance/christmas-web-worker/tsconfig.json b/apps/performance/35-memoization/tsconfig.json
similarity index 100%
rename from apps/performance/christmas-web-worker/tsconfig.json
rename to apps/performance/35-memoization/tsconfig.json
diff --git a/apps/performance/ngfor-optimize/.eslintrc.json b/apps/performance/36-ngfor-optimization/.eslintrc.json
similarity index 100%
rename from apps/performance/ngfor-optimize/.eslintrc.json
rename to apps/performance/36-ngfor-optimization/.eslintrc.json
diff --git a/apps/performance/ngfor-optimize/README.md b/apps/performance/36-ngfor-optimization/README.md
similarity index 84%
rename from apps/performance/ngfor-optimize/README.md
rename to apps/performance/36-ngfor-optimization/README.md
index 1e9b2f8..2ee0bb2 100644
--- a/apps/performance/ngfor-optimize/README.md
+++ b/apps/performance/36-ngfor-optimization/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve performance-ngfor-optimize
+npx nx serve performance-ngfor-optimization
 ```
 
 ### Documentation and Instruction
diff --git a/apps/performance/36-ngfor-optimization/jest.config.ts b/apps/performance/36-ngfor-optimization/jest.config.ts
new file mode 100644
index 0000000..2e138df
--- /dev/null
+++ b/apps/performance/36-ngfor-optimization/jest.config.ts
@@ -0,0 +1,22 @@
+/* eslint-disable */
+export default {
+  displayName: 'performance-ngfor-optimization',
+  preset: '../../../jest.preset.js',
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+  coverageDirectory: '../../../coverage/apps/performance/36-ngfor-optimization',
+  transform: {
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
+  snapshotSerializers: [
+    'jest-preset-angular/build/serializers/no-ng-attributes',
+    'jest-preset-angular/build/serializers/ng-snapshot',
+    'jest-preset-angular/build/serializers/html-comment',
+  ],
+};
diff --git a/apps/performance/ngfor-optimize/project.json b/apps/performance/36-ngfor-optimization/project.json
similarity index 67%
rename from apps/performance/ngfor-optimize/project.json
rename to apps/performance/36-ngfor-optimization/project.json
index 20ac3a6..ede8b36 100644
--- a/apps/performance/ngfor-optimize/project.json
+++ b/apps/performance/36-ngfor-optimization/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "performance-ngfor-optimize",
+  "name": "performance-ngfor-optimization",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/performance/ngfor-optimize/src",
+  "sourceRoot": "apps/performance/36-ngfor-optimization/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/performance/ngfor-optimize",
-        "index": "apps/performance/ngfor-optimize/src/index.html",
-        "main": "apps/performance/ngfor-optimize/src/main.ts",
+        "outputPath": "dist/apps/performance/36-ngfor-optimization",
+        "index": "apps/performance/36-ngfor-optimization/src/index.html",
+        "main": "apps/performance/36-ngfor-optimization/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/performance/ngfor-optimize/tsconfig.app.json",
+        "tsConfig": "apps/performance/36-ngfor-optimization/tsconfig.app.json",
         "assets": [
-          "apps/performance/ngfor-optimize/src/favicon.ico",
-          "apps/performance/ngfor-optimize/src/assets"
+          "apps/performance/36-ngfor-optimization/src/favicon.ico",
+          "apps/performance/36-ngfor-optimization/src/assets"
         ],
         "styles": [
-          "apps/performance/ngfor-optimize/src/styles.scss",
+          "apps/performance/36-ngfor-optimization/src/styles.scss",
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
         ],
         "scripts": [],
@@ -57,10 +57,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "performance-ngfor-optimize:build:production"
+          "buildTarget": "performance-ngfor-optimization:build:production"
         },
         "development": {
-          "buildTarget": "performance-ngfor-optimize:build:development"
+          "buildTarget": "performance-ngfor-optimization:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -68,7 +68,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "performance-ngfor-optimize:build"
+        "buildTarget": "performance-ngfor-optimization:build"
       }
     },
     "lint": {
@@ -78,7 +78,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/performance/ngfor-optimize/jest.config.ts"
+        "jestConfig": "apps/performance/36-ngfor-optimization/jest.config.ts"
       }
     }
   }
diff --git a/apps/performance/ngfor-optimize/src/app/app.component.ts b/apps/performance/36-ngfor-optimization/src/app/app.component.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/app/app.component.ts
rename to apps/performance/36-ngfor-optimization/src/app/app.component.ts
diff --git a/apps/performance/ngfor-biglist/src/app/app.config.ts b/apps/performance/36-ngfor-optimization/src/app/app.config.ts
similarity index 100%
rename from apps/performance/ngfor-biglist/src/app/app.config.ts
rename to apps/performance/36-ngfor-optimization/src/app/app.config.ts
diff --git a/apps/performance/ngfor-optimize/src/app/generateList.ts b/apps/performance/36-ngfor-optimization/src/app/generateList.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/app/generateList.ts
rename to apps/performance/36-ngfor-optimization/src/app/generateList.ts
diff --git a/apps/performance/ngfor-biglist/src/app/list.service.ts b/apps/performance/36-ngfor-optimization/src/app/list.service.ts
similarity index 100%
rename from apps/performance/ngfor-biglist/src/app/list.service.ts
rename to apps/performance/36-ngfor-optimization/src/app/list.service.ts
diff --git a/apps/performance/ngfor-optimize/src/app/person-list.component.ts b/apps/performance/36-ngfor-optimization/src/app/person-list.component.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/app/person-list.component.ts
rename to apps/performance/36-ngfor-optimization/src/app/person-list.component.ts
diff --git a/apps/performance/ngfor-biglist/src/app/person.model.ts b/apps/performance/36-ngfor-optimization/src/app/person.model.ts
similarity index 100%
rename from apps/performance/ngfor-biglist/src/app/person.model.ts
rename to apps/performance/36-ngfor-optimization/src/app/person.model.ts
diff --git a/apps/performance/ngfor-biglist/src/assets/.gitkeep b/apps/performance/36-ngfor-optimization/src/assets/.gitkeep
similarity index 100%
rename from apps/performance/ngfor-biglist/src/assets/.gitkeep
rename to apps/performance/36-ngfor-optimization/src/assets/.gitkeep
diff --git a/apps/performance/ngfor-biglist/src/favicon.ico b/apps/performance/36-ngfor-optimization/src/favicon.ico
similarity index 100%
rename from apps/performance/ngfor-biglist/src/favicon.ico
rename to apps/performance/36-ngfor-optimization/src/favicon.ico
diff --git a/apps/performance/ngfor-optimize/src/index.html b/apps/performance/36-ngfor-optimization/src/index.html
similarity index 100%
rename from apps/performance/ngfor-optimize/src/index.html
rename to apps/performance/36-ngfor-optimization/src/index.html
diff --git a/apps/performance/ngfor-biglist/src/main.ts b/apps/performance/36-ngfor-optimization/src/main.ts
similarity index 100%
rename from apps/performance/ngfor-biglist/src/main.ts
rename to apps/performance/36-ngfor-optimization/src/main.ts
diff --git a/apps/performance/memoized/src/styles.scss b/apps/performance/36-ngfor-optimization/src/styles.scss
similarity index 100%
rename from apps/performance/memoized/src/styles.scss
rename to apps/performance/36-ngfor-optimization/src/styles.scss
diff --git a/apps/performance/ngfor-optimize/src/test-setup.ts b/apps/performance/36-ngfor-optimization/src/test-setup.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/test-setup.ts
rename to apps/performance/36-ngfor-optimization/src/test-setup.ts
diff --git a/apps/performance/memoized/tailwind.config.js b/apps/performance/36-ngfor-optimization/tailwind.config.js
similarity index 100%
rename from apps/performance/memoized/tailwind.config.js
rename to apps/performance/36-ngfor-optimization/tailwind.config.js
diff --git a/apps/performance/ngfor-biglist/tsconfig.app.json b/apps/performance/36-ngfor-optimization/tsconfig.app.json
similarity index 100%
rename from apps/performance/ngfor-biglist/tsconfig.app.json
rename to apps/performance/36-ngfor-optimization/tsconfig.app.json
diff --git a/apps/performance/scroll-cd/tsconfig.editor.json b/apps/performance/36-ngfor-optimization/tsconfig.editor.json
similarity index 100%
rename from apps/performance/scroll-cd/tsconfig.editor.json
rename to apps/performance/36-ngfor-optimization/tsconfig.editor.json
diff --git a/apps/performance/scroll-cd/tsconfig.json b/apps/performance/36-ngfor-optimization/tsconfig.json
similarity index 100%
rename from apps/performance/scroll-cd/tsconfig.json
rename to apps/performance/36-ngfor-optimization/tsconfig.json
diff --git a/apps/performance/ngfor-optimize/tsconfig.spec.json b/apps/performance/36-ngfor-optimization/tsconfig.spec.json
similarity index 100%
rename from apps/performance/ngfor-optimize/tsconfig.spec.json
rename to apps/performance/36-ngfor-optimization/tsconfig.spec.json
diff --git a/apps/performance/scroll-cd/.eslintrc.json b/apps/performance/37-optimize-big-list/.eslintrc.json
similarity index 100%
rename from apps/performance/scroll-cd/.eslintrc.json
rename to apps/performance/37-optimize-big-list/.eslintrc.json
diff --git a/apps/performance/ngfor-biglist/README.md b/apps/performance/37-optimize-big-list/README.md
similarity index 84%
rename from apps/performance/ngfor-biglist/README.md
rename to apps/performance/37-optimize-big-list/README.md
index 4d164f0..1d8e134 100644
--- a/apps/performance/ngfor-biglist/README.md
+++ b/apps/performance/37-optimize-big-list/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve performance-ngfor-biglist
+npx nx serve performance-optimize-big-list
 ```
 
 ### Documentation and Instruction
diff --git a/apps/performance/ngfor-biglist/project.json b/apps/performance/37-optimize-big-list/project.json
similarity index 67%
rename from apps/performance/ngfor-biglist/project.json
rename to apps/performance/37-optimize-big-list/project.json
index f6701da..1df96d8 100644
--- a/apps/performance/ngfor-biglist/project.json
+++ b/apps/performance/37-optimize-big-list/project.json
@@ -1,27 +1,27 @@
 {
-  "name": "performance-ngfor-biglist",
+  "name": "performance-optimize-big-list",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/performance/ngfor-biglist/src",
+  "sourceRoot": "apps/performance/37-optimize-big-list/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/performance/ngfor-biglist",
-        "index": "apps/performance/ngfor-biglist/src/index.html",
-        "main": "apps/performance/ngfor-biglist/src/main.ts",
+        "outputPath": "dist/apps/performance/37-optimize-big-list",
+        "index": "apps/performance/37-optimize-big-list/src/index.html",
+        "main": "apps/performance/37-optimize-big-list/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/performance/ngfor-biglist/tsconfig.app.json",
+        "tsConfig": "apps/performance/37-optimize-big-list/tsconfig.app.json",
         "assets": [
-          "apps/performance/ngfor-biglist/src/favicon.ico",
-          "apps/performance/ngfor-biglist/src/assets"
+          "apps/performance/37-optimize-big-list/src/favicon.ico",
+          "apps/performance/37-optimize-big-list/src/assets"
         ],
         "styles": [
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-          "apps/performance/ngfor-biglist/src/styles.scss"
+          "apps/performance/37-optimize-big-list/src/styles.scss"
         ],
         "scripts": [],
         "allowedCommonJsDependencies": ["seedrandom"]
@@ -57,10 +57,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "performance-ngfor-biglist:build:production"
+          "buildTarget": "performance-optimize-big-list:build:production"
         },
         "development": {
-          "buildTarget": "performance-ngfor-biglist:build:development"
+          "buildTarget": "performance-optimize-big-list:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -68,7 +68,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "performance-ngfor-biglist:build"
+        "buildTarget": "performance-optimize-big-list:build"
       }
     },
     "lint": {
diff --git a/apps/performance/ngfor-biglist/src/app/app.component.ts b/apps/performance/37-optimize-big-list/src/app/app.component.ts
similarity index 100%
rename from apps/performance/ngfor-biglist/src/app/app.component.ts
rename to apps/performance/37-optimize-big-list/src/app/app.component.ts
diff --git a/apps/performance/ngfor-optimize/src/app/app.config.ts b/apps/performance/37-optimize-big-list/src/app/app.config.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/app/app.config.ts
rename to apps/performance/37-optimize-big-list/src/app/app.config.ts
diff --git a/apps/performance/ngfor-biglist/src/app/generateList.ts b/apps/performance/37-optimize-big-list/src/app/generateList.ts
similarity index 100%
rename from apps/performance/ngfor-biglist/src/app/generateList.ts
rename to apps/performance/37-optimize-big-list/src/app/generateList.ts
diff --git a/apps/performance/ngfor-optimize/src/app/list.service.ts b/apps/performance/37-optimize-big-list/src/app/list.service.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/app/list.service.ts
rename to apps/performance/37-optimize-big-list/src/app/list.service.ts
diff --git a/apps/performance/ngfor-biglist/src/app/person-list.component.ts b/apps/performance/37-optimize-big-list/src/app/person-list.component.ts
similarity index 100%
rename from apps/performance/ngfor-biglist/src/app/person-list.component.ts
rename to apps/performance/37-optimize-big-list/src/app/person-list.component.ts
diff --git a/apps/performance/ngfor-optimize/src/app/person.model.ts b/apps/performance/37-optimize-big-list/src/app/person.model.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/app/person.model.ts
rename to apps/performance/37-optimize-big-list/src/app/person.model.ts
diff --git a/apps/performance/ngfor-optimize/src/assets/.gitkeep b/apps/performance/37-optimize-big-list/src/assets/.gitkeep
similarity index 100%
rename from apps/performance/ngfor-optimize/src/assets/.gitkeep
rename to apps/performance/37-optimize-big-list/src/assets/.gitkeep
diff --git a/apps/performance/ngfor-optimize/src/favicon.ico b/apps/performance/37-optimize-big-list/src/favicon.ico
similarity index 100%
rename from apps/performance/ngfor-optimize/src/favicon.ico
rename to apps/performance/37-optimize-big-list/src/favicon.ico
diff --git a/apps/performance/ngfor-biglist/src/index.html b/apps/performance/37-optimize-big-list/src/index.html
similarity index 100%
rename from apps/performance/ngfor-biglist/src/index.html
rename to apps/performance/37-optimize-big-list/src/index.html
diff --git a/apps/performance/ngfor-optimize/src/main.ts b/apps/performance/37-optimize-big-list/src/main.ts
similarity index 100%
rename from apps/performance/ngfor-optimize/src/main.ts
rename to apps/performance/37-optimize-big-list/src/main.ts
diff --git a/apps/performance/ngfor-biglist/src/styles.scss b/apps/performance/37-optimize-big-list/src/styles.scss
similarity index 100%
rename from apps/performance/ngfor-biglist/src/styles.scss
rename to apps/performance/37-optimize-big-list/src/styles.scss
diff --git a/apps/performance/ngfor-biglist/tailwind.config.js b/apps/performance/37-optimize-big-list/tailwind.config.js
similarity index 100%
rename from apps/performance/ngfor-biglist/tailwind.config.js
rename to apps/performance/37-optimize-big-list/tailwind.config.js
diff --git a/apps/performance/ngfor-optimize/tsconfig.app.json b/apps/performance/37-optimize-big-list/tsconfig.app.json
similarity index 100%
rename from apps/performance/ngfor-optimize/tsconfig.app.json
rename to apps/performance/37-optimize-big-list/tsconfig.app.json
diff --git a/apps/performance/memoized/tsconfig.editor.json b/apps/performance/37-optimize-big-list/tsconfig.editor.json
similarity index 100%
rename from apps/performance/memoized/tsconfig.editor.json
rename to apps/performance/37-optimize-big-list/tsconfig.editor.json
diff --git a/apps/performance/default-onpush/tsconfig.json b/apps/performance/37-optimize-big-list/tsconfig.json
similarity index 100%
rename from apps/performance/default-onpush/tsconfig.json
rename to apps/performance/37-optimize-big-list/tsconfig.json
diff --git a/apps/performance/christmas-web-worker/.eslintrc.json b/apps/performance/40-web-workers/.eslintrc.json
similarity index 100%
rename from apps/performance/christmas-web-worker/.eslintrc.json
rename to apps/performance/40-web-workers/.eslintrc.json
diff --git a/apps/performance/christmas-web-worker/README.md b/apps/performance/40-web-workers/README.md
similarity index 83%
rename from apps/performance/christmas-web-worker/README.md
rename to apps/performance/40-web-workers/README.md
index 6da9394..067777a 100644
--- a/apps/performance/christmas-web-worker/README.md
+++ b/apps/performance/40-web-workers/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve performance-christmas-web-worker
+npx nx serve performance-web-workers
 ```
 
 ### Documentation and Instruction
diff --git a/apps/performance/christmas-web-worker/project.json b/apps/performance/40-web-workers/project.json
similarity index 63%
rename from apps/performance/christmas-web-worker/project.json
rename to apps/performance/40-web-workers/project.json
index 13b7edd..4bbd519 100644
--- a/apps/performance/christmas-web-worker/project.json
+++ b/apps/performance/40-web-workers/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "performance-christmas-web-worker",
+  "name": "performance-web-workers",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/performance/christmas-web-worker/src",
+  "sourceRoot": "apps/performance/40-web-workers/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/performance/christmas-web-worker",
-        "index": "apps/performance/christmas-web-worker/src/index.html",
-        "browser": "apps/performance/christmas-web-worker/src/main.ts",
+        "outputPath": "dist/apps/performance/40-web-workers",
+        "index": "apps/performance/40-web-workers/src/index.html",
+        "browser": "apps/performance/40-web-workers/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/performance/christmas-web-worker/tsconfig.app.json",
+        "tsConfig": "apps/performance/40-web-workers/tsconfig.app.json",
         "assets": [
-          "apps/performance/christmas-web-worker/src/favicon.ico",
-          "apps/performance/christmas-web-worker/src/assets"
+          "apps/performance/40-web-workers/src/favicon.ico",
+          "apps/performance/40-web-workers/src/assets"
         ],
-        "styles": ["apps/performance/christmas-web-worker/src/styles.scss"],
+        "styles": ["apps/performance/40-web-workers/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -51,10 +51,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "performance-christmas-web-worker:build:production"
+          "buildTarget": "performance-web-workers:build:production"
         },
         "development": {
-          "buildTarget": "performance-christmas-web-worker:build:development"
+          "buildTarget": "performance-web-workers:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -62,7 +62,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "performance-christmas-web-worker:build"
+        "browserTarget": "performance-web-workers:build"
       }
     },
     "lint": {
diff --git a/apps/performance/christmas-web-worker/src/app/app.component.ts b/apps/performance/40-web-workers/src/app/app.component.ts
similarity index 100%
rename from apps/performance/christmas-web-worker/src/app/app.component.ts
rename to apps/performance/40-web-workers/src/app/app.component.ts
diff --git a/apps/performance/christmas-web-worker/src/app/heavy-calculation.service.ts b/apps/performance/40-web-workers/src/app/heavy-calculation.service.ts
similarity index 100%
rename from apps/performance/christmas-web-worker/src/app/heavy-calculation.service.ts
rename to apps/performance/40-web-workers/src/app/heavy-calculation.service.ts
diff --git a/apps/performance/christmas-web-worker/src/app/unknown-person/unknown-person.component.css b/apps/performance/40-web-workers/src/app/unknown-person/unknown-person.component.css
similarity index 100%
rename from apps/performance/christmas-web-worker/src/app/unknown-person/unknown-person.component.css
rename to apps/performance/40-web-workers/src/app/unknown-person/unknown-person.component.css
diff --git a/apps/performance/christmas-web-worker/src/app/unknown-person/unknown-person.component.ts b/apps/performance/40-web-workers/src/app/unknown-person/unknown-person.component.ts
similarity index 100%
rename from apps/performance/christmas-web-worker/src/app/unknown-person/unknown-person.component.ts
rename to apps/performance/40-web-workers/src/app/unknown-person/unknown-person.component.ts
diff --git a/apps/performance/scroll-cd/src/assets/.gitkeep b/apps/performance/40-web-workers/src/assets/.gitkeep
similarity index 100%
rename from apps/performance/scroll-cd/src/assets/.gitkeep
rename to apps/performance/40-web-workers/src/assets/.gitkeep
diff --git a/apps/performance/scroll-cd/src/favicon.ico b/apps/performance/40-web-workers/src/favicon.ico
similarity index 100%
rename from apps/performance/scroll-cd/src/favicon.ico
rename to apps/performance/40-web-workers/src/favicon.ico
diff --git a/apps/performance/christmas-web-worker/src/index.html b/apps/performance/40-web-workers/src/index.html
similarity index 100%
rename from apps/performance/christmas-web-worker/src/index.html
rename to apps/performance/40-web-workers/src/index.html
diff --git a/apps/performance/scroll-cd/src/main.ts b/apps/performance/40-web-workers/src/main.ts
similarity index 100%
rename from apps/performance/scroll-cd/src/main.ts
rename to apps/performance/40-web-workers/src/main.ts
diff --git a/apps/performance/ngfor-optimize/src/styles.scss b/apps/performance/40-web-workers/src/styles.scss
similarity index 100%
rename from apps/performance/ngfor-optimize/src/styles.scss
rename to apps/performance/40-web-workers/src/styles.scss
diff --git a/apps/performance/ngfor-optimize/tailwind.config.js b/apps/performance/40-web-workers/tailwind.config.js
similarity index 100%
rename from apps/performance/ngfor-optimize/tailwind.config.js
rename to apps/performance/40-web-workers/tailwind.config.js
diff --git a/apps/performance/scroll-cd/tsconfig.app.json b/apps/performance/40-web-workers/tsconfig.app.json
similarity index 100%
rename from apps/performance/scroll-cd/tsconfig.app.json
rename to apps/performance/40-web-workers/tsconfig.app.json
diff --git a/apps/performance/ngfor-biglist/tsconfig.editor.json b/apps/performance/40-web-workers/tsconfig.editor.json
similarity index 100%
rename from apps/performance/ngfor-biglist/tsconfig.editor.json
rename to apps/performance/40-web-workers/tsconfig.editor.json
diff --git a/apps/performance/memoized/tsconfig.json b/apps/performance/40-web-workers/tsconfig.json
similarity index 100%
rename from apps/performance/memoized/tsconfig.json
rename to apps/performance/40-web-workers/tsconfig.json
diff --git a/apps/performance/ngfor-optimize/jest.config.ts b/apps/performance/ngfor-optimize/jest.config.ts
deleted file mode 100644
index 5b2ccae..0000000
--- a/apps/performance/ngfor-optimize/jest.config.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'performance-ngfor-optimize',
-  preset: '../../../jest.preset.js',
-  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/performance/ngfor-optimize',
-  transform: {
-    '^.+\\.(ts|mjs|js|html)$': [
-      'jest-preset-angular',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-        stringifyContentPathRegex: '\\.(html|svg)$',
-      },
-    ],
-  },
-  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
-  snapshotSerializers: [
-    'jest-preset-angular/build/serializers/no-ng-attributes',
-    'jest-preset-angular/build/serializers/ng-snapshot',
-    'jest-preset-angular/build/serializers/html-comment',
-  ],
-};
diff --git a/apps/performance/scroll-cd/jest.config.ts b/apps/performance/scroll-cd/jest.config.ts
deleted file mode 100644
index 4c91050..0000000
--- a/apps/performance/scroll-cd/jest.config.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'performance-scroll-cd',
-  preset: '../../../jest.preset.js',
-  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {},
-  coverageDirectory: '../../../coverage/apps/performance/scroll-cd',
-  transform: {
-    '^.+\\.(ts|mjs|js|html)$': [
-      'jest-preset-angular',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-        stringifyContentPathRegex: '\\.(html|svg)$',
-      },
-    ],
-  },
-  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
-  snapshotSerializers: [
-    'jest-preset-angular/build/serializers/no-ng-attributes',
-    'jest-preset-angular/build/serializers/ng-snapshot',
-    'jest-preset-angular/build/serializers/html-comment',
-  ],
-};
diff --git a/apps/rxjs/hold-to-save-btn/.eslintrc.json b/apps/rxjs/11-high-order-operator-bug/.eslintrc.json
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/.eslintrc.json
rename to apps/rxjs/11-high-order-operator-bug/.eslintrc.json
diff --git a/apps/rxjs/pipe-bug/README.md b/apps/rxjs/11-high-order-operator-bug/README.md
similarity index 85%
rename from apps/rxjs/pipe-bug/README.md
rename to apps/rxjs/11-high-order-operator-bug/README.md
index cad896a..5a4fa55 100644
--- a/apps/rxjs/pipe-bug/README.md
+++ b/apps/rxjs/11-high-order-operator-bug/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve rxjs-pipe-bug
+npx nx serve rxjs-high-order-operator-bug
 ```
 
 ### Documentation and Instruction
diff --git a/apps/rxjs/pipe-bug/project.json b/apps/rxjs/11-high-order-operator-bug/project.json
similarity index 66%
rename from apps/rxjs/pipe-bug/project.json
rename to apps/rxjs/11-high-order-operator-bug/project.json
index 44f1f29..998c86d 100644
--- a/apps/rxjs/pipe-bug/project.json
+++ b/apps/rxjs/11-high-order-operator-bug/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "rxjs-pipe-bug",
+  "name": "rxjs-high-order-operator-bug",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/rxjs/pipe-bug/src",
+  "sourceRoot": "apps/rxjs/11-high-order-operator-bug/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/rxjs/pipe-bug",
-        "index": "apps/rxjs/pipe-bug/src/index.html",
-        "main": "apps/rxjs/pipe-bug/src/main.ts",
+        "outputPath": "dist/apps/rxjs/11-high-order-operator-bug",
+        "index": "apps/rxjs/11-high-order-operator-bug/src/index.html",
+        "main": "apps/rxjs/11-high-order-operator-bug/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/rxjs/pipe-bug/tsconfig.app.json",
+        "tsConfig": "apps/rxjs/11-high-order-operator-bug/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/rxjs/pipe-bug/src/favicon.ico",
-          "apps/rxjs/pipe-bug/src/assets"
+          "apps/rxjs/11-high-order-operator-bug/src/favicon.ico",
+          "apps/rxjs/11-high-order-operator-bug/src/assets"
         ],
-        "styles": ["apps/rxjs/pipe-bug/src/styles.scss"],
+        "styles": ["apps/rxjs/11-high-order-operator-bug/src/styles.scss"],
         "scripts": [],
         "allowedCommonJsDependencies": ["seedrandom"]
       },
@@ -54,10 +54,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "rxjs-pipe-bug:build:production"
+          "buildTarget": "rxjs-high-order-operator-bug:build:production"
         },
         "development": {
-          "buildTarget": "rxjs-pipe-bug:build:development"
+          "buildTarget": "rxjs-high-order-operator-bug:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -65,7 +65,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "rxjs-pipe-bug:build"
+        "buildTarget": "rxjs-high-order-operator-bug:build"
       }
     },
     "lint": {
diff --git a/apps/rxjs/pipe-bug/src/app/app.component.ts b/apps/rxjs/11-high-order-operator-bug/src/app/app.component.ts
similarity index 100%
rename from apps/rxjs/pipe-bug/src/app/app.component.ts
rename to apps/rxjs/11-high-order-operator-bug/src/app/app.component.ts
diff --git a/apps/rxjs/pipe-bug/src/app/app.service.ts b/apps/rxjs/11-high-order-operator-bug/src/app/app.service.ts
similarity index 100%
rename from apps/rxjs/pipe-bug/src/app/app.service.ts
rename to apps/rxjs/11-high-order-operator-bug/src/app/app.service.ts
diff --git a/apps/rxjs/pipe-bug/src/app/localDB.service.ts b/apps/rxjs/11-high-order-operator-bug/src/app/localDB.service.ts
similarity index 100%
rename from apps/rxjs/pipe-bug/src/app/localDB.service.ts
rename to apps/rxjs/11-high-order-operator-bug/src/app/localDB.service.ts
diff --git a/apps/rxjs/catch-error/src/assets/.gitkeep b/apps/rxjs/11-high-order-operator-bug/src/assets/.gitkeep
similarity index 100%
rename from apps/rxjs/catch-error/src/assets/.gitkeep
rename to apps/rxjs/11-high-order-operator-bug/src/assets/.gitkeep
diff --git a/apps/rxjs/catch-error/src/favicon.ico b/apps/rxjs/11-high-order-operator-bug/src/favicon.ico
similarity index 100%
rename from apps/rxjs/catch-error/src/favicon.ico
rename to apps/rxjs/11-high-order-operator-bug/src/favicon.ico
diff --git a/apps/rxjs/pipe-bug/src/index.html b/apps/rxjs/11-high-order-operator-bug/src/index.html
similarity index 100%
rename from apps/rxjs/pipe-bug/src/index.html
rename to apps/rxjs/11-high-order-operator-bug/src/index.html
diff --git a/apps/rxjs/pipe-bug/src/main.ts b/apps/rxjs/11-high-order-operator-bug/src/main.ts
similarity index 100%
rename from apps/rxjs/pipe-bug/src/main.ts
rename to apps/rxjs/11-high-order-operator-bug/src/main.ts
diff --git a/apps/rxjs/pipe-bug/src/styles.scss b/apps/rxjs/11-high-order-operator-bug/src/styles.scss
similarity index 100%
rename from apps/rxjs/pipe-bug/src/styles.scss
rename to apps/rxjs/11-high-order-operator-bug/src/styles.scss
diff --git a/apps/rxjs/pipe-bug/tsconfig.app.json b/apps/rxjs/11-high-order-operator-bug/tsconfig.app.json
similarity index 100%
rename from apps/rxjs/pipe-bug/tsconfig.app.json
rename to apps/rxjs/11-high-order-operator-bug/tsconfig.app.json
diff --git a/apps/rxjs/pipe-bug/tsconfig.editor.json b/apps/rxjs/11-high-order-operator-bug/tsconfig.editor.json
similarity index 100%
rename from apps/rxjs/pipe-bug/tsconfig.editor.json
rename to apps/rxjs/11-high-order-operator-bug/tsconfig.editor.json
diff --git a/apps/rxjs/pipe-bug/tsconfig.json b/apps/rxjs/11-high-order-operator-bug/tsconfig.json
similarity index 100%
rename from apps/rxjs/pipe-bug/tsconfig.json
rename to apps/rxjs/11-high-order-operator-bug/tsconfig.json
diff --git a/apps/rxjs/catch-error/.eslintrc.json b/apps/rxjs/14-race-condition/.eslintrc.json
similarity index 100%
rename from apps/rxjs/catch-error/.eslintrc.json
rename to apps/rxjs/14-race-condition/.eslintrc.json
diff --git a/apps/rxjs/race-condition/README.md b/apps/rxjs/14-race-condition/README.md
similarity index 100%
rename from apps/rxjs/race-condition/README.md
rename to apps/rxjs/14-race-condition/README.md
diff --git a/apps/rxjs/race-condition/cypress.config.ts b/apps/rxjs/14-race-condition/cypress.config.ts
similarity index 100%
rename from apps/rxjs/race-condition/cypress.config.ts
rename to apps/rxjs/14-race-condition/cypress.config.ts
diff --git a/apps/rxjs/race-condition/cypress/fixtures/example.json b/apps/rxjs/14-race-condition/cypress/fixtures/example.json
similarity index 100%
rename from apps/rxjs/race-condition/cypress/fixtures/example.json
rename to apps/rxjs/14-race-condition/cypress/fixtures/example.json
diff --git a/apps/rxjs/race-condition/cypress/support/commands.ts b/apps/rxjs/14-race-condition/cypress/support/commands.ts
similarity index 100%
rename from apps/rxjs/race-condition/cypress/support/commands.ts
rename to apps/rxjs/14-race-condition/cypress/support/commands.ts
diff --git a/apps/rxjs/race-condition/cypress/support/component-index.html b/apps/rxjs/14-race-condition/cypress/support/component-index.html
similarity index 100%
rename from apps/rxjs/race-condition/cypress/support/component-index.html
rename to apps/rxjs/14-race-condition/cypress/support/component-index.html
diff --git a/apps/rxjs/race-condition/cypress/support/component.ts b/apps/rxjs/14-race-condition/cypress/support/component.ts
similarity index 100%
rename from apps/rxjs/race-condition/cypress/support/component.ts
rename to apps/rxjs/14-race-condition/cypress/support/component.ts
diff --git a/apps/rxjs/race-condition/cypress/tsconfig.json b/apps/rxjs/14-race-condition/cypress/tsconfig.json
similarity index 100%
rename from apps/rxjs/race-condition/cypress/tsconfig.json
rename to apps/rxjs/14-race-condition/cypress/tsconfig.json
diff --git a/apps/rxjs/race-condition/jest.config.ts b/apps/rxjs/14-race-condition/jest.config.ts
similarity index 90%
rename from apps/rxjs/race-condition/jest.config.ts
rename to apps/rxjs/14-race-condition/jest.config.ts
index 2e2e892..493fb24 100644
--- a/apps/rxjs/race-condition/jest.config.ts
+++ b/apps/rxjs/14-race-condition/jest.config.ts
@@ -4,7 +4,7 @@ export default {
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: {},
-  coverageDirectory: '../../../coverage/apps/rxjs/race-condition',
+  coverageDirectory: '../../../coverage/apps/rxjs/14-race-condition',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/rxjs/race-condition/project.json b/apps/rxjs/14-race-condition/project.json
similarity index 77%
rename from apps/rxjs/race-condition/project.json
rename to apps/rxjs/14-race-condition/project.json
index 2f91c36..8f55cf2 100644
--- a/apps/rxjs/race-condition/project.json
+++ b/apps/rxjs/14-race-condition/project.json
@@ -2,24 +2,24 @@
   "name": "rxjs-race-condition",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/rxjs/race-condition/src",
+  "sourceRoot": "apps/rxjs/14-race-condition/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/rxjs/race-condition",
-        "index": "apps/rxjs/race-condition/src/index.html",
-        "main": "apps/rxjs/race-condition/src/main.ts",
+        "outputPath": "dist/apps/rxjs/14-race-condition",
+        "index": "apps/rxjs/14-race-condition/src/index.html",
+        "main": "apps/rxjs/14-race-condition/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/rxjs/race-condition/tsconfig.app.json",
+        "tsConfig": "apps/rxjs/14-race-condition/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/rxjs/race-condition/src/favicon.ico",
-          "apps/rxjs/race-condition/src/assets"
+          "apps/rxjs/14-race-condition/src/favicon.ico",
+          "apps/rxjs/14-race-condition/src/assets"
         ],
-        "styles": ["apps/rxjs/race-condition/src/styles.scss"],
+        "styles": ["apps/rxjs/14-race-condition/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -74,13 +74,13 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/rxjs/race-condition/jest.config.ts"
+        "jestConfig": "apps/rxjs/14-race-condition/jest.config.ts"
       }
     },
     "component-test": {
       "executor": "@nx/cypress:cypress",
       "options": {
-        "cypressConfig": "apps/rxjs/race-condition/cypress.config.ts",
+        "cypressConfig": "apps/rxjs/14-race-condition/cypress.config.ts",
         "testingType": "component",
         "skipServe": true,
         "devServerTarget": "rxjs-race-condition:build"
diff --git a/apps/rxjs/race-condition/src/app/app.component.cy.ts b/apps/rxjs/14-race-condition/src/app/app.component.cy.ts
similarity index 100%
rename from apps/rxjs/race-condition/src/app/app.component.cy.ts
rename to apps/rxjs/14-race-condition/src/app/app.component.cy.ts
diff --git a/apps/rxjs/race-condition/src/app/app.component.ts b/apps/rxjs/14-race-condition/src/app/app.component.ts
similarity index 100%
rename from apps/rxjs/race-condition/src/app/app.component.ts
rename to apps/rxjs/14-race-condition/src/app/app.component.ts
diff --git a/apps/rxjs/race-condition/src/app/app.config.ts b/apps/rxjs/14-race-condition/src/app/app.config.ts
similarity index 100%
rename from apps/rxjs/race-condition/src/app/app.config.ts
rename to apps/rxjs/14-race-condition/src/app/app.config.ts
diff --git a/apps/rxjs/race-condition/src/app/topic-dialog.component.ts b/apps/rxjs/14-race-condition/src/app/topic-dialog.component.ts
similarity index 100%
rename from apps/rxjs/race-condition/src/app/topic-dialog.component.ts
rename to apps/rxjs/14-race-condition/src/app/topic-dialog.component.ts
diff --git a/apps/rxjs/race-condition/src/app/topic.service.ts b/apps/rxjs/14-race-condition/src/app/topic.service.ts
similarity index 100%
rename from apps/rxjs/race-condition/src/app/topic.service.ts
rename to apps/rxjs/14-race-condition/src/app/topic.service.ts
diff --git a/apps/rxjs/hold-to-save-btn/src/assets/.gitkeep b/apps/rxjs/14-race-condition/src/assets/.gitkeep
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/assets/.gitkeep
rename to apps/rxjs/14-race-condition/src/assets/.gitkeep
diff --git a/apps/rxjs/hold-to-save-btn/src/favicon.ico b/apps/rxjs/14-race-condition/src/favicon.ico
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/favicon.ico
rename to apps/rxjs/14-race-condition/src/favicon.ico
diff --git a/apps/rxjs/race-condition/src/index.html b/apps/rxjs/14-race-condition/src/index.html
similarity index 100%
rename from apps/rxjs/race-condition/src/index.html
rename to apps/rxjs/14-race-condition/src/index.html
diff --git a/apps/rxjs/race-condition/src/main.ts b/apps/rxjs/14-race-condition/src/main.ts
similarity index 100%
rename from apps/rxjs/race-condition/src/main.ts
rename to apps/rxjs/14-race-condition/src/main.ts
diff --git a/apps/rxjs/race-condition/src/styles.scss b/apps/rxjs/14-race-condition/src/styles.scss
similarity index 100%
rename from apps/rxjs/race-condition/src/styles.scss
rename to apps/rxjs/14-race-condition/src/styles.scss
diff --git a/apps/rxjs/race-condition/src/test-setup.ts b/apps/rxjs/14-race-condition/src/test-setup.ts
similarity index 100%
rename from apps/rxjs/race-condition/src/test-setup.ts
rename to apps/rxjs/14-race-condition/src/test-setup.ts
diff --git a/apps/rxjs/race-condition/tsconfig.app.json b/apps/rxjs/14-race-condition/tsconfig.app.json
similarity index 100%
rename from apps/rxjs/race-condition/tsconfig.app.json
rename to apps/rxjs/14-race-condition/tsconfig.app.json
diff --git a/apps/rxjs/catch-error/tsconfig.editor.json b/apps/rxjs/14-race-condition/tsconfig.editor.json
similarity index 100%
rename from apps/rxjs/catch-error/tsconfig.editor.json
rename to apps/rxjs/14-race-condition/tsconfig.editor.json
diff --git a/apps/testing/input-output/tsconfig.json b/apps/rxjs/14-race-condition/tsconfig.json
similarity index 94%
rename from apps/testing/input-output/tsconfig.json
rename to apps/rxjs/14-race-condition/tsconfig.json
index 3879b94..8a0cb05 100644
--- a/apps/testing/input-output/tsconfig.json
+++ b/apps/rxjs/14-race-condition/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.json"
+      "path": "./cypress/tsconfig.base.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/rxjs/race-condition/tsconfig.spec.json b/apps/rxjs/14-race-condition/tsconfig.spec.json
similarity index 100%
rename from apps/rxjs/race-condition/tsconfig.spec.json
rename to apps/rxjs/14-race-condition/tsconfig.spec.json
diff --git a/apps/rxjs/race-condition/.eslintrc.json b/apps/rxjs/38-catch-error/.eslintrc.json
similarity index 100%
rename from apps/rxjs/race-condition/.eslintrc.json
rename to apps/rxjs/38-catch-error/.eslintrc.json
diff --git a/apps/rxjs/catch-error/README.md b/apps/rxjs/38-catch-error/README.md
similarity index 100%
rename from apps/rxjs/catch-error/README.md
rename to apps/rxjs/38-catch-error/README.md
diff --git a/apps/rxjs/catch-error/jest.config.ts b/apps/rxjs/38-catch-error/jest.config.ts
similarity index 90%
rename from apps/rxjs/catch-error/jest.config.ts
rename to apps/rxjs/38-catch-error/jest.config.ts
index f823420..52f0448 100644
--- a/apps/rxjs/catch-error/jest.config.ts
+++ b/apps/rxjs/38-catch-error/jest.config.ts
@@ -3,7 +3,7 @@ export default {
   displayName: 'rxjs-catch-error',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/rxjs/catch-error',
+  coverageDirectory: '../../../coverage/apps/rxjs/38-catch-error',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/rxjs/catch-error/project.json b/apps/rxjs/38-catch-error/project.json
similarity index 78%
rename from apps/rxjs/catch-error/project.json
rename to apps/rxjs/38-catch-error/project.json
index 6776c69..d40802a 100644
--- a/apps/rxjs/catch-error/project.json
+++ b/apps/rxjs/38-catch-error/project.json
@@ -3,23 +3,23 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/rxjs/catch-error/src",
+  "sourceRoot": "apps/rxjs/38-catch-error/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/rxjs/catch-error",
-        "index": "apps/rxjs/catch-error/src/index.html",
-        "main": "apps/rxjs/catch-error/src/main.ts",
+        "outputPath": "dist/apps/rxjs/38-catch-error",
+        "index": "apps/rxjs/38-catch-error/src/index.html",
+        "main": "apps/rxjs/38-catch-error/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/rxjs/catch-error/tsconfig.app.json",
+        "tsConfig": "apps/rxjs/38-catch-error/tsconfig.app.json",
         "assets": [
-          "apps/rxjs/catch-error/src/favicon.ico",
-          "apps/rxjs/catch-error/src/assets"
+          "apps/rxjs/38-catch-error/src/favicon.ico",
+          "apps/rxjs/38-catch-error/src/assets"
         ],
-        "styles": ["apps/rxjs/catch-error/src/styles.scss"],
+        "styles": ["apps/rxjs/38-catch-error/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -74,7 +74,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/rxjs/catch-error/jest.config.ts"
+        "jestConfig": "apps/rxjs/38-catch-error/jest.config.ts"
       }
     }
   }
diff --git a/apps/rxjs/catch-error/src/app/app.component.css b/apps/rxjs/38-catch-error/src/app/app.component.css
similarity index 100%
rename from apps/rxjs/catch-error/src/app/app.component.css
rename to apps/rxjs/38-catch-error/src/app/app.component.css
diff --git a/apps/rxjs/catch-error/src/app/app.component.spec.ts b/apps/rxjs/38-catch-error/src/app/app.component.spec.ts
similarity index 100%
rename from apps/rxjs/catch-error/src/app/app.component.spec.ts
rename to apps/rxjs/38-catch-error/src/app/app.component.spec.ts
diff --git a/apps/rxjs/catch-error/src/app/app.component.ts b/apps/rxjs/38-catch-error/src/app/app.component.ts
similarity index 100%
rename from apps/rxjs/catch-error/src/app/app.component.ts
rename to apps/rxjs/38-catch-error/src/app/app.component.ts
diff --git a/apps/rxjs/catch-error/src/app/app.config.ts b/apps/rxjs/38-catch-error/src/app/app.config.ts
similarity index 100%
rename from apps/rxjs/catch-error/src/app/app.config.ts
rename to apps/rxjs/38-catch-error/src/app/app.config.ts
diff --git a/apps/rxjs/pipe-bug/src/assets/.gitkeep b/apps/rxjs/38-catch-error/src/assets/.gitkeep
similarity index 100%
rename from apps/rxjs/pipe-bug/src/assets/.gitkeep
rename to apps/rxjs/38-catch-error/src/assets/.gitkeep
diff --git a/apps/rxjs/pipe-bug/src/favicon.ico b/apps/rxjs/38-catch-error/src/favicon.ico
similarity index 100%
rename from apps/rxjs/pipe-bug/src/favicon.ico
rename to apps/rxjs/38-catch-error/src/favicon.ico
diff --git a/apps/rxjs/catch-error/src/index.html b/apps/rxjs/38-catch-error/src/index.html
similarity index 100%
rename from apps/rxjs/catch-error/src/index.html
rename to apps/rxjs/38-catch-error/src/index.html
diff --git a/apps/rxjs/catch-error/src/main.ts b/apps/rxjs/38-catch-error/src/main.ts
similarity index 100%
rename from apps/rxjs/catch-error/src/main.ts
rename to apps/rxjs/38-catch-error/src/main.ts
diff --git a/apps/rxjs/catch-error/src/styles.scss b/apps/rxjs/38-catch-error/src/styles.scss
similarity index 100%
rename from apps/rxjs/catch-error/src/styles.scss
rename to apps/rxjs/38-catch-error/src/styles.scss
diff --git a/apps/rxjs/catch-error/src/test-setup.ts b/apps/rxjs/38-catch-error/src/test-setup.ts
similarity index 100%
rename from apps/rxjs/catch-error/src/test-setup.ts
rename to apps/rxjs/38-catch-error/src/test-setup.ts
diff --git a/apps/rxjs/catch-error/tailwind.config.js b/apps/rxjs/38-catch-error/tailwind.config.js
similarity index 100%
rename from apps/rxjs/catch-error/tailwind.config.js
rename to apps/rxjs/38-catch-error/tailwind.config.js
diff --git a/apps/rxjs/catch-error/tsconfig.app.json b/apps/rxjs/38-catch-error/tsconfig.app.json
similarity index 100%
rename from apps/rxjs/catch-error/tsconfig.app.json
rename to apps/rxjs/38-catch-error/tsconfig.app.json
diff --git a/apps/rxjs/race-condition/tsconfig.editor.json b/apps/rxjs/38-catch-error/tsconfig.editor.json
similarity index 100%
rename from apps/rxjs/race-condition/tsconfig.editor.json
rename to apps/rxjs/38-catch-error/tsconfig.editor.json
diff --git a/apps/rxjs/catch-error/tsconfig.json b/apps/rxjs/38-catch-error/tsconfig.json
similarity index 100%
rename from apps/rxjs/catch-error/tsconfig.json
rename to apps/rxjs/38-catch-error/tsconfig.json
diff --git a/apps/rxjs/catch-error/tsconfig.spec.json b/apps/rxjs/38-catch-error/tsconfig.spec.json
similarity index 100%
rename from apps/rxjs/catch-error/tsconfig.spec.json
rename to apps/rxjs/38-catch-error/tsconfig.spec.json
diff --git a/apps/rxjs/pipe-bug/.eslintrc.json b/apps/rxjs/49-hold-to-save-button/.eslintrc.json
similarity index 100%
rename from apps/rxjs/pipe-bug/.eslintrc.json
rename to apps/rxjs/49-hold-to-save-button/.eslintrc.json
diff --git a/apps/rxjs/hold-to-save-btn/README.md b/apps/rxjs/49-hold-to-save-button/README.md
similarity index 85%
rename from apps/rxjs/hold-to-save-btn/README.md
rename to apps/rxjs/49-hold-to-save-button/README.md
index 3c0c6ca..e0d4c01 100644
--- a/apps/rxjs/hold-to-save-btn/README.md
+++ b/apps/rxjs/49-hold-to-save-button/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve rxjs-hold-to-save-btn
+npx nx serve rxjs-hold-to-save-button
 ```
 
 ### Documentation and Instruction
diff --git a/apps/rxjs/hold-to-save-btn/jest.config.ts b/apps/rxjs/49-hold-to-save-button/jest.config.ts
similarity index 83%
rename from apps/rxjs/hold-to-save-btn/jest.config.ts
rename to apps/rxjs/49-hold-to-save-button/jest.config.ts
index 4604a77..1071a58 100644
--- a/apps/rxjs/hold-to-save-btn/jest.config.ts
+++ b/apps/rxjs/49-hold-to-save-button/jest.config.ts
@@ -1,9 +1,9 @@
 /* eslint-disable */
 export default {
-  displayName: 'rxjs-hold-to-save-btn',
+  displayName: 'rxjs-hold-to-save-button',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/rxjs/hold-to-save-btn',
+  coverageDirectory: '../../../coverage/apps/rxjs/49-hold-to-save-button',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/rxjs/hold-to-save-btn/project.json b/apps/rxjs/49-hold-to-save-button/project.json
similarity index 65%
rename from apps/rxjs/hold-to-save-btn/project.json
rename to apps/rxjs/49-hold-to-save-button/project.json
index 2a2bfa9..737101e 100644
--- a/apps/rxjs/hold-to-save-btn/project.json
+++ b/apps/rxjs/49-hold-to-save-button/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "rxjs-hold-to-save-btn",
+  "name": "rxjs-hold-to-save-button",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/rxjs/hold-to-save-btn/src",
+  "sourceRoot": "apps/rxjs/49-hold-to-save-button/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/rxjs/hold-to-save-btn",
-        "index": "apps/rxjs/hold-to-save-btn/src/index.html",
-        "browser": "apps/rxjs/hold-to-save-btn/src/main.ts",
+        "outputPath": "dist/apps/rxjs/49-hold-to-save-button",
+        "index": "apps/rxjs/49-hold-to-save-button/src/index.html",
+        "browser": "apps/rxjs/49-hold-to-save-button/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/rxjs/hold-to-save-btn/tsconfig.app.json",
+        "tsConfig": "apps/rxjs/49-hold-to-save-button/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/rxjs/hold-to-save-btn/src/favicon.ico",
-          "apps/rxjs/hold-to-save-btn/src/assets"
+          "apps/rxjs/49-hold-to-save-button/src/favicon.ico",
+          "apps/rxjs/49-hold-to-save-button/src/assets"
         ],
-        "styles": ["apps/rxjs/hold-to-save-btn/src/styles.scss"],
+        "styles": ["apps/rxjs/49-hold-to-save-button/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -51,10 +51,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "rxjs-hold-to-save-btn:build:production"
+          "buildTarget": "rxjs-hold-to-save-button:build:production"
         },
         "development": {
-          "buildTarget": "rxjs-hold-to-save-btn:build:development"
+          "buildTarget": "rxjs-hold-to-save-button:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -62,7 +62,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "rxjs-hold-to-save-btn:build"
+        "buildTarget": "rxjs-hold-to-save-button:build"
       }
     },
     "lint": {
@@ -72,7 +72,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/rxjs/hold-to-save-btn/jest.config.ts"
+        "jestConfig": "apps/rxjs/49-hold-to-save-button/jest.config.ts"
       }
     }
   }
diff --git a/apps/rxjs/hold-to-save-btn/src/app/app.component.ts b/apps/rxjs/49-hold-to-save-button/src/app/app.component.ts
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/app/app.component.ts
rename to apps/rxjs/49-hold-to-save-button/src/app/app.component.ts
diff --git a/apps/rxjs/hold-to-save-btn/src/app/app.config.ts b/apps/rxjs/49-hold-to-save-button/src/app/app.config.ts
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/app/app.config.ts
rename to apps/rxjs/49-hold-to-save-button/src/app/app.config.ts
diff --git a/apps/rxjs/race-condition/src/assets/.gitkeep b/apps/rxjs/49-hold-to-save-button/src/assets/.gitkeep
similarity index 100%
rename from apps/rxjs/race-condition/src/assets/.gitkeep
rename to apps/rxjs/49-hold-to-save-button/src/assets/.gitkeep
diff --git a/apps/rxjs/race-condition/src/favicon.ico b/apps/rxjs/49-hold-to-save-button/src/favicon.ico
similarity index 100%
rename from apps/rxjs/race-condition/src/favicon.ico
rename to apps/rxjs/49-hold-to-save-button/src/favicon.ico
diff --git a/apps/rxjs/hold-to-save-btn/src/index.html b/apps/rxjs/49-hold-to-save-button/src/index.html
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/index.html
rename to apps/rxjs/49-hold-to-save-button/src/index.html
diff --git a/apps/rxjs/hold-to-save-btn/src/main.ts b/apps/rxjs/49-hold-to-save-button/src/main.ts
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/main.ts
rename to apps/rxjs/49-hold-to-save-button/src/main.ts
diff --git a/apps/rxjs/hold-to-save-btn/src/styles.scss b/apps/rxjs/49-hold-to-save-button/src/styles.scss
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/styles.scss
rename to apps/rxjs/49-hold-to-save-button/src/styles.scss
diff --git a/apps/rxjs/hold-to-save-btn/src/test-setup.ts b/apps/rxjs/49-hold-to-save-button/src/test-setup.ts
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/src/test-setup.ts
rename to apps/rxjs/49-hold-to-save-button/src/test-setup.ts
diff --git a/apps/rxjs/hold-to-save-btn/tailwind.config.js b/apps/rxjs/49-hold-to-save-button/tailwind.config.js
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/tailwind.config.js
rename to apps/rxjs/49-hold-to-save-button/tailwind.config.js
diff --git a/apps/rxjs/hold-to-save-btn/tsconfig.app.json b/apps/rxjs/49-hold-to-save-button/tsconfig.app.json
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/tsconfig.app.json
rename to apps/rxjs/49-hold-to-save-button/tsconfig.app.json
diff --git a/apps/rxjs/hold-to-save-btn/tsconfig.editor.json b/apps/rxjs/49-hold-to-save-button/tsconfig.editor.json
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/tsconfig.editor.json
rename to apps/rxjs/49-hold-to-save-button/tsconfig.editor.json
diff --git a/apps/rxjs/hold-to-save-btn/tsconfig.json b/apps/rxjs/49-hold-to-save-button/tsconfig.json
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/tsconfig.json
rename to apps/rxjs/49-hold-to-save-button/tsconfig.json
diff --git a/apps/rxjs/hold-to-save-btn/tsconfig.spec.json b/apps/rxjs/49-hold-to-save-button/tsconfig.spec.json
similarity index 100%
rename from apps/rxjs/hold-to-save-btn/tsconfig.spec.json
rename to apps/rxjs/49-hold-to-save-button/tsconfig.spec.json
diff --git a/apps/testing/checkbox/.eslintrc.json b/apps/testing/17-router/.eslintrc.json
similarity index 100%
rename from apps/testing/checkbox/.eslintrc.json
rename to apps/testing/17-router/.eslintrc.json
diff --git a/apps/testing/router-outlet/README.md b/apps/testing/17-router/README.md
similarity index 85%
rename from apps/testing/router-outlet/README.md
rename to apps/testing/17-router/README.md
index 7749159..fe9a754 100644
--- a/apps/testing/router-outlet/README.md
+++ b/apps/testing/17-router/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve testing-router-outlet
+npx nx serve testing-router
 ```
 
 ### Documentation and Instruction
diff --git a/apps/testing/input-output/cypress.config.ts b/apps/testing/17-router/cypress.config.ts
similarity index 100%
rename from apps/testing/input-output/cypress.config.ts
rename to apps/testing/17-router/cypress.config.ts
diff --git a/apps/testing/input-output/cypress/fixtures/example.json b/apps/testing/17-router/cypress/fixtures/example.json
similarity index 100%
rename from apps/testing/input-output/cypress/fixtures/example.json
rename to apps/testing/17-router/cypress/fixtures/example.json
diff --git a/apps/testing/input-output/cypress/support/commands.ts b/apps/testing/17-router/cypress/support/commands.ts
similarity index 100%
rename from apps/testing/input-output/cypress/support/commands.ts
rename to apps/testing/17-router/cypress/support/commands.ts
diff --git a/apps/testing/router-outlet/cypress/support/component-index.html b/apps/testing/17-router/cypress/support/component-index.html
similarity index 100%
rename from apps/testing/router-outlet/cypress/support/component-index.html
rename to apps/testing/17-router/cypress/support/component-index.html
diff --git a/apps/testing/input-output/cypress/support/component.ts b/apps/testing/17-router/cypress/support/component.ts
similarity index 100%
rename from apps/testing/input-output/cypress/support/component.ts
rename to apps/testing/17-router/cypress/support/component.ts
diff --git a/apps/testing/input-output/cypress/tsconfig.json b/apps/testing/17-router/cypress/tsconfig.json
similarity index 100%
rename from apps/testing/input-output/cypress/tsconfig.json
rename to apps/testing/17-router/cypress/tsconfig.json
diff --git a/apps/testing/router-outlet/jest.config.ts b/apps/testing/17-router/jest.config.ts
similarity index 93%
rename from apps/testing/router-outlet/jest.config.ts
rename to apps/testing/17-router/jest.config.ts
index 0bca8ae..997c99f 100644
--- a/apps/testing/router-outlet/jest.config.ts
+++ b/apps/testing/17-router/jest.config.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
 export default {
-  displayName: 'testing-router-outlet',
+  displayName: 'testing-router',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: {},
diff --git a/apps/testing/nested/project.json b/apps/testing/17-router/project.json
similarity index 69%
rename from apps/testing/nested/project.json
rename to apps/testing/17-router/project.json
index 2c60724..28077fb 100644
--- a/apps/testing/nested/project.json
+++ b/apps/testing/17-router/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "testing-nested",
+  "name": "testing-router",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/testing/nested/src",
+  "sourceRoot": "apps/testing/17-router/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing/nested",
-        "index": "apps/testing/nested/src/index.html",
-        "main": "apps/testing/nested/src/main.ts",
+        "outputPath": "dist/apps/testing/17-router",
+        "index": "apps/testing/17-router/src/index.html",
+        "main": "apps/testing/17-router/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/nested/tsconfig.app.json",
+        "tsConfig": "apps/testing/17-router/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/testing/nested/src/favicon.ico",
-          "apps/testing/nested/src/assets"
+          "apps/testing/17-router/src/favicon.ico",
+          "apps/testing/17-router/src/assets"
         ],
-        "styles": ["apps/testing/nested/src/styles.scss"],
+        "styles": ["apps/testing/17-router/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "testing-nested:build:production"
+          "buildTarget": "testing-router:build:production"
         },
         "development": {
-          "buildTarget": "testing-nested:build:development"
+          "buildTarget": "testing-router:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "testing-nested:build"
+        "buildTarget": "testing-router:build"
       }
     },
     "lint": {
@@ -74,16 +74,16 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing/nested/jest.config.ts"
+        "jestConfig": "apps/testing/17-router/jest.config.ts"
       }
     },
     "component-test": {
       "executor": "@nx/cypress:cypress",
       "options": {
-        "cypressConfig": "apps/testing/nested/cypress.config.ts",
+        "cypressConfig": "apps/testing/17-router/cypress.config.ts",
         "testingType": "component",
         "skipServe": true,
-        "devServerTarget": "testing-nested:build"
+        "devServerTarget": "testing-router:build"
       }
     }
   },
diff --git a/apps/testing/router-outlet/src/app/app.component.cy.ts b/apps/testing/17-router/src/app/app.component.cy.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/app.component.cy.ts
rename to apps/testing/17-router/src/app/app.component.cy.ts
diff --git a/apps/testing/router-outlet/src/app/app.component.spec.ts b/apps/testing/17-router/src/app/app.component.spec.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/app.component.spec.ts
rename to apps/testing/17-router/src/app/app.component.spec.ts
diff --git a/apps/testing/router-outlet/src/app/app.component.ts b/apps/testing/17-router/src/app/app.component.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/app.component.ts
rename to apps/testing/17-router/src/app/app.component.ts
diff --git a/apps/testing/router-outlet/src/app/app.config.ts b/apps/testing/17-router/src/app/app.config.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/app.config.ts
rename to apps/testing/17-router/src/app/app.config.ts
diff --git a/apps/testing/router-outlet/src/app/app.routes.ts b/apps/testing/17-router/src/app/app.routes.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/app.routes.ts
rename to apps/testing/17-router/src/app/app.routes.ts
diff --git a/apps/testing/router-outlet/src/app/book.guard.ts b/apps/testing/17-router/src/app/book.guard.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/book.guard.ts
rename to apps/testing/17-router/src/app/book.guard.ts
diff --git a/apps/testing/router-outlet/src/app/book.model.ts b/apps/testing/17-router/src/app/book.model.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/book.model.ts
rename to apps/testing/17-router/src/app/book.model.ts
diff --git a/apps/testing/router-outlet/src/app/no-book-search.component.ts b/apps/testing/17-router/src/app/no-book-search.component.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/no-book-search.component.ts
rename to apps/testing/17-router/src/app/no-book-search.component.ts
diff --git a/apps/testing/router-outlet/src/app/search.component.ts b/apps/testing/17-router/src/app/search.component.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/search.component.ts
rename to apps/testing/17-router/src/app/search.component.ts
diff --git a/apps/testing/router-outlet/src/app/shelf.component.ts b/apps/testing/17-router/src/app/shelf.component.ts
similarity index 100%
rename from apps/testing/router-outlet/src/app/shelf.component.ts
rename to apps/testing/17-router/src/app/shelf.component.ts
diff --git a/apps/testing/checkbox/src/assets/.gitkeep b/apps/testing/17-router/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/checkbox/src/assets/.gitkeep
rename to apps/testing/17-router/src/assets/.gitkeep
diff --git a/apps/testing/checkbox/src/favicon.ico b/apps/testing/17-router/src/favicon.ico
similarity index 100%
rename from apps/testing/checkbox/src/favicon.ico
rename to apps/testing/17-router/src/favicon.ico
diff --git a/apps/testing/router-outlet/src/index.html b/apps/testing/17-router/src/index.html
similarity index 100%
rename from apps/testing/router-outlet/src/index.html
rename to apps/testing/17-router/src/index.html
diff --git a/apps/testing/modal/src/main.ts b/apps/testing/17-router/src/main.ts
similarity index 100%
rename from apps/testing/modal/src/main.ts
rename to apps/testing/17-router/src/main.ts
diff --git a/apps/testing/input-output/src/styles.scss b/apps/testing/17-router/src/styles.scss
similarity index 100%
rename from apps/testing/input-output/src/styles.scss
rename to apps/testing/17-router/src/styles.scss
diff --git a/apps/testing/checkbox/src/test-setup.ts b/apps/testing/17-router/src/test-setup.ts
similarity index 100%
rename from apps/testing/checkbox/src/test-setup.ts
rename to apps/testing/17-router/src/test-setup.ts
diff --git a/apps/testing/input-output/tsconfig.app.json b/apps/testing/17-router/tsconfig.app.json
similarity index 100%
rename from apps/testing/input-output/tsconfig.app.json
rename to apps/testing/17-router/tsconfig.app.json
diff --git a/apps/testing/checkbox/tsconfig.editor.json b/apps/testing/17-router/tsconfig.editor.json
similarity index 100%
rename from apps/testing/checkbox/tsconfig.editor.json
rename to apps/testing/17-router/tsconfig.editor.json
diff --git a/apps/rxjs/race-condition/tsconfig.json b/apps/testing/17-router/tsconfig.json
similarity index 94%
rename from apps/rxjs/race-condition/tsconfig.json
rename to apps/testing/17-router/tsconfig.json
index 3879b94..8a0cb05 100644
--- a/apps/rxjs/race-condition/tsconfig.json
+++ b/apps/testing/17-router/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.json"
+      "path": "./cypress/tsconfig.base.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/testing/checkbox/tsconfig.spec.json b/apps/testing/17-router/tsconfig.spec.json
similarity index 100%
rename from apps/testing/checkbox/tsconfig.spec.json
rename to apps/testing/17-router/tsconfig.spec.json
diff --git a/apps/angular/di/.eslintrc.json b/apps/testing/18-nested-components/.eslintrc.json
similarity index 100%
rename from apps/angular/di/.eslintrc.json
rename to apps/testing/18-nested-components/.eslintrc.json
diff --git a/apps/testing/nested/README.md b/apps/testing/18-nested-components/README.md
similarity index 85%
rename from apps/testing/nested/README.md
rename to apps/testing/18-nested-components/README.md
index 8e1876a..659b9e3 100644
--- a/apps/testing/nested/README.md
+++ b/apps/testing/18-nested-components/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve testing-nested
+npx nx serve testing-nested-components
 ```
 
 ### Documentation and Instruction
diff --git a/apps/testing/modal/cypress.config.ts b/apps/testing/18-nested-components/cypress.config.ts
similarity index 100%
rename from apps/testing/modal/cypress.config.ts
rename to apps/testing/18-nested-components/cypress.config.ts
diff --git a/apps/testing/modal/cypress/fixtures/example.json b/apps/testing/18-nested-components/cypress/fixtures/example.json
similarity index 100%
rename from apps/testing/modal/cypress/fixtures/example.json
rename to apps/testing/18-nested-components/cypress/fixtures/example.json
diff --git a/apps/testing/modal/cypress/support/commands.ts b/apps/testing/18-nested-components/cypress/support/commands.ts
similarity index 100%
rename from apps/testing/modal/cypress/support/commands.ts
rename to apps/testing/18-nested-components/cypress/support/commands.ts
diff --git a/apps/testing/nested/cypress/support/component-index.html b/apps/testing/18-nested-components/cypress/support/component-index.html
similarity index 100%
rename from apps/testing/nested/cypress/support/component-index.html
rename to apps/testing/18-nested-components/cypress/support/component-index.html
diff --git a/apps/testing/modal/cypress/support/component.ts b/apps/testing/18-nested-components/cypress/support/component.ts
similarity index 100%
rename from apps/testing/modal/cypress/support/component.ts
rename to apps/testing/18-nested-components/cypress/support/component.ts
diff --git a/apps/testing/modal/cypress/tsconfig.json b/apps/testing/18-nested-components/cypress/tsconfig.json
similarity index 100%
rename from apps/testing/modal/cypress/tsconfig.json
rename to apps/testing/18-nested-components/cypress/tsconfig.json
diff --git a/apps/testing/nested/jest.config.ts b/apps/testing/18-nested-components/jest.config.ts
similarity index 93%
rename from apps/testing/nested/jest.config.ts
rename to apps/testing/18-nested-components/jest.config.ts
index a89947b..c77df55 100644
--- a/apps/testing/nested/jest.config.ts
+++ b/apps/testing/18-nested-components/jest.config.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
 export default {
-  displayName: 'testing-nested',
+  displayName: 'testing-nested-components',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   transform: {
diff --git a/apps/testing/18-nested-components/project.json b/apps/testing/18-nested-components/project.json
new file mode 100644
index 0000000..3a25646
--- /dev/null
+++ b/apps/testing/18-nested-components/project.json
@@ -0,0 +1,91 @@
+{
+  "name": "testing-nested-components",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "sourceRoot": "apps/testing/18-nested-components/src",
+  "prefix": "app",
+  "targets": {
+    "build": {
+      "executor": "@angular-devkit/build-angular:browser",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/apps/testing/18-nested-components",
+        "index": "apps/testing/18-nested-components/src/index.html",
+        "main": "apps/testing/18-nested-components/src/main.ts",
+        "polyfills": ["zone.js"],
+        "tsConfig": "apps/testing/18-nested-components/tsconfig.app.json",
+        "inlineStyleLanguage": "scss",
+        "assets": [
+          "apps/testing/18-nested-components/src/favicon.ico",
+          "apps/testing/18-nested-components/src/assets"
+        ],
+        "styles": ["apps/testing/18-nested-components/src/styles.scss"],
+        "scripts": []
+      },
+      "configurations": {
+        "production": {
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "500kb",
+              "maximumError": "1mb"
+            },
+            {
+              "type": "anyComponentStyle",
+              "maximumWarning": "2kb",
+              "maximumError": "4kb"
+            }
+          ],
+          "outputHashing": "all"
+        },
+        "development": {
+          "buildOptimizer": false,
+          "optimization": false,
+          "vendorChunk": true,
+          "extractLicenses": false,
+          "sourceMap": true,
+          "namedChunks": true
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "serve": {
+      "executor": "@angular-devkit/build-angular:dev-server",
+      "configurations": {
+        "production": {
+          "buildTarget": "testing-nested-components:build:production"
+        },
+        "development": {
+          "buildTarget": "testing-nested-components:build:development"
+        }
+      },
+      "defaultConfiguration": "development"
+    },
+    "extract-i18n": {
+      "executor": "@angular-devkit/build-angular:extract-i18n",
+      "options": {
+        "buildTarget": "testing-nested-components:build"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "apps/testing/18-nested-components/jest.config.ts"
+      }
+    },
+    "component-test": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/testing/18-nested-components/cypress.config.ts",
+        "testingType": "component",
+        "skipServe": true,
+        "devServerTarget": "testing-nested-components:build"
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/apps/testing/nested/src/app/app.component.ts b/apps/testing/18-nested-components/src/app/app.component.ts
similarity index 100%
rename from apps/testing/nested/src/app/app.component.ts
rename to apps/testing/18-nested-components/src/app/app.component.ts
diff --git a/apps/testing/nested/src/app/child.component.cy.ts b/apps/testing/18-nested-components/src/app/child.component.cy.ts
similarity index 100%
rename from apps/testing/nested/src/app/child.component.cy.ts
rename to apps/testing/18-nested-components/src/app/child.component.cy.ts
diff --git a/apps/testing/nested/src/app/child.component.spec.ts b/apps/testing/18-nested-components/src/app/child.component.spec.ts
similarity index 100%
rename from apps/testing/nested/src/app/child.component.spec.ts
rename to apps/testing/18-nested-components/src/app/child.component.spec.ts
diff --git a/apps/testing/nested/src/app/child.component.ts b/apps/testing/18-nested-components/src/app/child.component.ts
similarity index 100%
rename from apps/testing/nested/src/app/child.component.ts
rename to apps/testing/18-nested-components/src/app/child.component.ts
diff --git a/apps/testing/nested/src/app/http.service.ts b/apps/testing/18-nested-components/src/app/http.service.ts
similarity index 100%
rename from apps/testing/nested/src/app/http.service.ts
rename to apps/testing/18-nested-components/src/app/http.service.ts
diff --git a/apps/testing/create-harness/src/assets/.gitkeep b/apps/testing/18-nested-components/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/create-harness/src/assets/.gitkeep
rename to apps/testing/18-nested-components/src/assets/.gitkeep
diff --git a/apps/testing/create-harness/src/favicon.ico b/apps/testing/18-nested-components/src/favicon.ico
similarity index 100%
rename from apps/testing/create-harness/src/favicon.ico
rename to apps/testing/18-nested-components/src/favicon.ico
diff --git a/apps/testing/nested/src/index.html b/apps/testing/18-nested-components/src/index.html
similarity index 100%
rename from apps/testing/nested/src/index.html
rename to apps/testing/18-nested-components/src/index.html
diff --git a/apps/testing/checkbox/src/main.ts b/apps/testing/18-nested-components/src/main.ts
similarity index 100%
rename from apps/testing/checkbox/src/main.ts
rename to apps/testing/18-nested-components/src/main.ts
diff --git a/apps/testing/nested/src/styles.scss b/apps/testing/18-nested-components/src/styles.scss
similarity index 100%
rename from apps/testing/nested/src/styles.scss
rename to apps/testing/18-nested-components/src/styles.scss
diff --git a/apps/testing/create-harness/src/test-setup.ts b/apps/testing/18-nested-components/src/test-setup.ts
similarity index 100%
rename from apps/testing/create-harness/src/test-setup.ts
rename to apps/testing/18-nested-components/src/test-setup.ts
diff --git a/apps/testing/modal/tsconfig.app.json b/apps/testing/18-nested-components/tsconfig.app.json
similarity index 100%
rename from apps/testing/modal/tsconfig.app.json
rename to apps/testing/18-nested-components/tsconfig.app.json
diff --git a/apps/testing/input-output/tsconfig.editor.json b/apps/testing/18-nested-components/tsconfig.editor.json
similarity index 100%
rename from apps/testing/input-output/tsconfig.editor.json
rename to apps/testing/18-nested-components/tsconfig.editor.json
diff --git a/apps/testing/nested/tsconfig.json b/apps/testing/18-nested-components/tsconfig.json
similarity index 94%
rename from apps/testing/nested/tsconfig.json
rename to apps/testing/18-nested-components/tsconfig.json
index 3879b94..8a0cb05 100644
--- a/apps/testing/nested/tsconfig.json
+++ b/apps/testing/18-nested-components/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.json"
+      "path": "./cypress/tsconfig.base.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/testing/input-output/tsconfig.spec.json b/apps/testing/18-nested-components/tsconfig.spec.json
similarity index 100%
rename from apps/testing/input-output/tsconfig.spec.json
rename to apps/testing/18-nested-components/tsconfig.spec.json
diff --git a/apps/testing/create-harness/.eslintrc.json b/apps/testing/19-input-output/.eslintrc.json
similarity index 100%
rename from apps/testing/create-harness/.eslintrc.json
rename to apps/testing/19-input-output/.eslintrc.json
diff --git a/apps/testing/input-output/README.md b/apps/testing/19-input-output/README.md
similarity index 100%
rename from apps/testing/input-output/README.md
rename to apps/testing/19-input-output/README.md
diff --git a/apps/testing/nested/cypress.config.ts b/apps/testing/19-input-output/cypress.config.ts
similarity index 100%
rename from apps/testing/nested/cypress.config.ts
rename to apps/testing/19-input-output/cypress.config.ts
diff --git a/apps/testing/nested/cypress/fixtures/example.json b/apps/testing/19-input-output/cypress/fixtures/example.json
similarity index 100%
rename from apps/testing/nested/cypress/fixtures/example.json
rename to apps/testing/19-input-output/cypress/fixtures/example.json
diff --git a/apps/testing/nested/cypress/support/commands.ts b/apps/testing/19-input-output/cypress/support/commands.ts
similarity index 100%
rename from apps/testing/nested/cypress/support/commands.ts
rename to apps/testing/19-input-output/cypress/support/commands.ts
diff --git a/apps/testing/input-output/cypress/support/component-index.html b/apps/testing/19-input-output/cypress/support/component-index.html
similarity index 100%
rename from apps/testing/input-output/cypress/support/component-index.html
rename to apps/testing/19-input-output/cypress/support/component-index.html
diff --git a/apps/testing/nested/cypress/support/component.ts b/apps/testing/19-input-output/cypress/support/component.ts
similarity index 100%
rename from apps/testing/nested/cypress/support/component.ts
rename to apps/testing/19-input-output/cypress/support/component.ts
diff --git a/apps/testing/nested/cypress/tsconfig.json b/apps/testing/19-input-output/cypress/tsconfig.json
similarity index 100%
rename from apps/testing/nested/cypress/tsconfig.json
rename to apps/testing/19-input-output/cypress/tsconfig.json
diff --git a/apps/testing/input-output/jest.config.ts b/apps/testing/19-input-output/jest.config.ts
similarity index 100%
rename from apps/testing/input-output/jest.config.ts
rename to apps/testing/19-input-output/jest.config.ts
diff --git a/apps/testing/input-output/project.json b/apps/testing/19-input-output/project.json
similarity index 77%
rename from apps/testing/input-output/project.json
rename to apps/testing/19-input-output/project.json
index 4863e5e..50b3b0c 100644
--- a/apps/testing/input-output/project.json
+++ b/apps/testing/19-input-output/project.json
@@ -2,24 +2,24 @@
   "name": "testing-input-output",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/testing/input-output/src",
+  "sourceRoot": "apps/testing/19-input-output/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing/input-output",
-        "index": "apps/testing/input-output/src/index.html",
-        "main": "apps/testing/input-output/src/main.ts",
+        "outputPath": "dist/apps/testing/19-input-output",
+        "index": "apps/testing/19-input-output/src/index.html",
+        "main": "apps/testing/19-input-output/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/input-output/tsconfig.app.json",
+        "tsConfig": "apps/testing/19-input-output/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/testing/input-output/src/favicon.ico",
-          "apps/testing/input-output/src/assets"
+          "apps/testing/19-input-output/src/favicon.ico",
+          "apps/testing/19-input-output/src/assets"
         ],
-        "styles": ["apps/testing/input-output/src/styles.scss"],
+        "styles": ["apps/testing/19-input-output/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -74,13 +74,13 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing/input-output/jest.config.ts"
+        "jestConfig": "apps/testing/19-input-output/jest.config.ts"
       }
     },
     "component-test": {
       "executor": "@nx/cypress:cypress",
       "options": {
-        "cypressConfig": "apps/testing/input-output/cypress.config.ts",
+        "cypressConfig": "apps/testing/19-input-output/cypress.config.ts",
         "testingType": "component",
         "skipServe": true,
         "devServerTarget": "testing-input-output:build"
diff --git a/apps/testing/input-output/src/app/app.component.ts b/apps/testing/19-input-output/src/app/app.component.ts
similarity index 100%
rename from apps/testing/input-output/src/app/app.component.ts
rename to apps/testing/19-input-output/src/app/app.component.ts
diff --git a/apps/testing/input-output/src/app/counter.component.cy.ts b/apps/testing/19-input-output/src/app/counter.component.cy.ts
similarity index 100%
rename from apps/testing/input-output/src/app/counter.component.cy.ts
rename to apps/testing/19-input-output/src/app/counter.component.cy.ts
diff --git a/apps/testing/input-output/src/app/counter.component.spec.ts b/apps/testing/19-input-output/src/app/counter.component.spec.ts
similarity index 100%
rename from apps/testing/input-output/src/app/counter.component.spec.ts
rename to apps/testing/19-input-output/src/app/counter.component.spec.ts
diff --git a/apps/testing/input-output/src/app/counter.component.ts b/apps/testing/19-input-output/src/app/counter.component.ts
similarity index 100%
rename from apps/testing/input-output/src/app/counter.component.ts
rename to apps/testing/19-input-output/src/app/counter.component.ts
diff --git a/apps/testing/harness/src/assets/.gitkeep b/apps/testing/19-input-output/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/harness/src/assets/.gitkeep
rename to apps/testing/19-input-output/src/assets/.gitkeep
diff --git a/apps/testing/harness/src/favicon.ico b/apps/testing/19-input-output/src/favicon.ico
similarity index 100%
rename from apps/testing/harness/src/favicon.ico
rename to apps/testing/19-input-output/src/favicon.ico
diff --git a/apps/testing/input-output/src/index.html b/apps/testing/19-input-output/src/index.html
similarity index 100%
rename from apps/testing/input-output/src/index.html
rename to apps/testing/19-input-output/src/index.html
diff --git a/apps/testing/input-output/src/main.ts b/apps/testing/19-input-output/src/main.ts
similarity index 100%
rename from apps/testing/input-output/src/main.ts
rename to apps/testing/19-input-output/src/main.ts
diff --git a/apps/testing/router-outlet/src/styles.scss b/apps/testing/19-input-output/src/styles.scss
similarity index 100%
rename from apps/testing/router-outlet/src/styles.scss
rename to apps/testing/19-input-output/src/styles.scss
diff --git a/apps/testing/harness/src/test-setup.ts b/apps/testing/19-input-output/src/test-setup.ts
similarity index 100%
rename from apps/testing/harness/src/test-setup.ts
rename to apps/testing/19-input-output/src/test-setup.ts
diff --git a/apps/testing/nested/tsconfig.app.json b/apps/testing/19-input-output/tsconfig.app.json
similarity index 100%
rename from apps/testing/nested/tsconfig.app.json
rename to apps/testing/19-input-output/tsconfig.app.json
diff --git a/apps/testing/modal/tsconfig.editor.json b/apps/testing/19-input-output/tsconfig.editor.json
similarity index 100%
rename from apps/testing/modal/tsconfig.editor.json
rename to apps/testing/19-input-output/tsconfig.editor.json
diff --git a/apps/testing/modal/tsconfig.json b/apps/testing/19-input-output/tsconfig.json
similarity index 94%
rename from apps/testing/modal/tsconfig.json
rename to apps/testing/19-input-output/tsconfig.json
index 3879b94..8a0cb05 100644
--- a/apps/testing/modal/tsconfig.json
+++ b/apps/testing/19-input-output/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.json"
+      "path": "./cypress/tsconfig.base.json"
     }
   ],
   "extends": "../../../tsconfig.base.json",
diff --git a/apps/testing/modal/tsconfig.spec.json b/apps/testing/19-input-output/tsconfig.spec.json
similarity index 100%
rename from apps/testing/modal/tsconfig.spec.json
rename to apps/testing/19-input-output/tsconfig.spec.json
diff --git a/apps/testing/harness/.eslintrc.json b/apps/testing/20-modal/.eslintrc.json
similarity index 100%
rename from apps/testing/harness/.eslintrc.json
rename to apps/testing/20-modal/.eslintrc.json
diff --git a/apps/testing/modal/README.md b/apps/testing/20-modal/README.md
similarity index 100%
rename from apps/testing/modal/README.md
rename to apps/testing/20-modal/README.md
diff --git a/apps/testing/router-outlet/cypress.config.ts b/apps/testing/20-modal/cypress.config.ts
similarity index 100%
rename from apps/testing/router-outlet/cypress.config.ts
rename to apps/testing/20-modal/cypress.config.ts
diff --git a/apps/testing/router-outlet/cypress/fixtures/example.json b/apps/testing/20-modal/cypress/fixtures/example.json
similarity index 100%
rename from apps/testing/router-outlet/cypress/fixtures/example.json
rename to apps/testing/20-modal/cypress/fixtures/example.json
diff --git a/apps/testing/router-outlet/cypress/support/commands.ts b/apps/testing/20-modal/cypress/support/commands.ts
similarity index 100%
rename from apps/testing/router-outlet/cypress/support/commands.ts
rename to apps/testing/20-modal/cypress/support/commands.ts
diff --git a/apps/testing/modal/cypress/support/component-index.html b/apps/testing/20-modal/cypress/support/component-index.html
similarity index 100%
rename from apps/testing/modal/cypress/support/component-index.html
rename to apps/testing/20-modal/cypress/support/component-index.html
diff --git a/apps/testing/router-outlet/cypress/support/component.ts b/apps/testing/20-modal/cypress/support/component.ts
similarity index 100%
rename from apps/testing/router-outlet/cypress/support/component.ts
rename to apps/testing/20-modal/cypress/support/component.ts
diff --git a/apps/testing/router-outlet/cypress/tsconfig.json b/apps/testing/20-modal/cypress/tsconfig.json
similarity index 100%
rename from apps/testing/router-outlet/cypress/tsconfig.json
rename to apps/testing/20-modal/cypress/tsconfig.json
diff --git a/apps/testing/modal/jest.config.ts b/apps/testing/20-modal/jest.config.ts
similarity index 100%
rename from apps/testing/modal/jest.config.ts
rename to apps/testing/20-modal/jest.config.ts
diff --git a/apps/testing/modal/project.json b/apps/testing/20-modal/project.json
similarity index 80%
rename from apps/testing/modal/project.json
rename to apps/testing/20-modal/project.json
index 55c019c..a275b08 100644
--- a/apps/testing/modal/project.json
+++ b/apps/testing/20-modal/project.json
@@ -2,25 +2,25 @@
   "name": "testing-modal",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/testing/modal/src",
+  "sourceRoot": "apps/testing/20-modal/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing/modal",
-        "index": "apps/testing/modal/src/index.html",
-        "main": "apps/testing/modal/src/main.ts",
+        "outputPath": "dist/apps/testing/20-modal",
+        "index": "apps/testing/20-modal/src/index.html",
+        "main": "apps/testing/20-modal/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/modal/tsconfig.app.json",
+        "tsConfig": "apps/testing/20-modal/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/testing/modal/src/favicon.ico",
-          "apps/testing/modal/src/assets"
+          "apps/testing/20-modal/src/favicon.ico",
+          "apps/testing/20-modal/src/assets"
         ],
         "styles": [
-          "apps/testing/modal/src/styles.scss",
+          "apps/testing/20-modal/src/styles.scss",
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
         ],
         "scripts": []
@@ -77,13 +77,13 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing/modal/jest.config.ts"
+        "jestConfig": "apps/testing/20-modal/jest.config.ts"
       }
     },
     "component-test": {
       "executor": "@nx/cypress:cypress",
       "options": {
-        "cypressConfig": "apps/testing/modal/cypress.config.ts",
+        "cypressConfig": "apps/testing/20-modal/cypress.config.ts",
         "testingType": "component",
         "skipServe": true,
         "devServerTarget": "testing-modal:build"
diff --git a/apps/testing/modal/src/app/app.component.cy.ts b/apps/testing/20-modal/src/app/app.component.cy.ts
similarity index 100%
rename from apps/testing/modal/src/app/app.component.cy.ts
rename to apps/testing/20-modal/src/app/app.component.cy.ts
diff --git a/apps/testing/modal/src/app/app.component.spec.ts b/apps/testing/20-modal/src/app/app.component.spec.ts
similarity index 100%
rename from apps/testing/modal/src/app/app.component.spec.ts
rename to apps/testing/20-modal/src/app/app.component.spec.ts
diff --git a/apps/testing/modal/src/app/app.component.ts b/apps/testing/20-modal/src/app/app.component.ts
similarity index 100%
rename from apps/testing/modal/src/app/app.component.ts
rename to apps/testing/20-modal/src/app/app.component.ts
diff --git a/apps/testing/modal/src/app/app.config.ts b/apps/testing/20-modal/src/app/app.config.ts
similarity index 100%
rename from apps/testing/modal/src/app/app.config.ts
rename to apps/testing/20-modal/src/app/app.config.ts
diff --git a/apps/testing/modal/src/app/error.dialog.ts b/apps/testing/20-modal/src/app/error.dialog.ts
similarity index 100%
rename from apps/testing/modal/src/app/error.dialog.ts
rename to apps/testing/20-modal/src/app/error.dialog.ts
diff --git a/apps/testing/modal/src/app/profil-confirmation.dialog.ts b/apps/testing/20-modal/src/app/profil-confirmation.dialog.ts
similarity index 100%
rename from apps/testing/modal/src/app/profil-confirmation.dialog.ts
rename to apps/testing/20-modal/src/app/profil-confirmation.dialog.ts
diff --git a/apps/testing/input-output/src/assets/.gitkeep b/apps/testing/20-modal/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/input-output/src/assets/.gitkeep
rename to apps/testing/20-modal/src/assets/.gitkeep
diff --git a/apps/testing/input-output/src/favicon.ico b/apps/testing/20-modal/src/favicon.ico
similarity index 100%
rename from apps/testing/input-output/src/favicon.ico
rename to apps/testing/20-modal/src/favicon.ico
diff --git a/apps/testing/modal/src/index.html b/apps/testing/20-modal/src/index.html
similarity index 100%
rename from apps/testing/modal/src/index.html
rename to apps/testing/20-modal/src/index.html
diff --git a/apps/testing/router-outlet/src/main.ts b/apps/testing/20-modal/src/main.ts
similarity index 100%
rename from apps/testing/router-outlet/src/main.ts
rename to apps/testing/20-modal/src/main.ts
diff --git a/apps/testing/checkbox/src/styles.scss b/apps/testing/20-modal/src/styles.scss
similarity index 100%
rename from apps/testing/checkbox/src/styles.scss
rename to apps/testing/20-modal/src/styles.scss
diff --git a/apps/testing/input-output/src/test-setup.ts b/apps/testing/20-modal/src/test-setup.ts
similarity index 100%
rename from apps/testing/input-output/src/test-setup.ts
rename to apps/testing/20-modal/src/test-setup.ts
diff --git a/apps/testing/checkbox/tailwind.config.js b/apps/testing/20-modal/tailwind.config.js
similarity index 100%
rename from apps/testing/checkbox/tailwind.config.js
rename to apps/testing/20-modal/tailwind.config.js
diff --git a/apps/testing/router-outlet/tsconfig.app.json b/apps/testing/20-modal/tsconfig.app.json
similarity index 100%
rename from apps/testing/router-outlet/tsconfig.app.json
rename to apps/testing/20-modal/tsconfig.app.json
diff --git a/apps/testing/nested/tsconfig.editor.json b/apps/testing/20-modal/tsconfig.editor.json
similarity index 100%
rename from apps/testing/nested/tsconfig.editor.json
rename to apps/testing/20-modal/tsconfig.editor.json
diff --git a/apps/testing/20-modal/tsconfig.json b/apps/testing/20-modal/tsconfig.json
new file mode 100644
index 0000000..8a0cb05
--- /dev/null
+++ b/apps/testing/20-modal/tsconfig.json
@@ -0,0 +1,35 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "useDefineForClassFields": false,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./tsconfig.editor.json"
+    },
+    {
+      "path": "./cypress/tsconfig.base.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json",
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  }
+}
diff --git a/apps/testing/nested/tsconfig.spec.json b/apps/testing/20-modal/tsconfig.spec.json
similarity index 100%
rename from apps/testing/nested/tsconfig.spec.json
rename to apps/testing/20-modal/tsconfig.spec.json
diff --git a/apps/testing/input-output/.eslintrc.json b/apps/testing/23-harness/.eslintrc.json
similarity index 100%
rename from apps/testing/input-output/.eslintrc.json
rename to apps/testing/23-harness/.eslintrc.json
diff --git a/apps/testing/harness/README.md b/apps/testing/23-harness/README.md
similarity index 100%
rename from apps/testing/harness/README.md
rename to apps/testing/23-harness/README.md
diff --git a/apps/testing/harness/jest.config.ts b/apps/testing/23-harness/jest.config.ts
similarity index 100%
rename from apps/testing/harness/jest.config.ts
rename to apps/testing/23-harness/jest.config.ts
diff --git a/apps/testing/harness/project.json b/apps/testing/23-harness/project.json
similarity index 78%
rename from apps/testing/harness/project.json
rename to apps/testing/23-harness/project.json
index 6312e83..5b21a7f 100644
--- a/apps/testing/harness/project.json
+++ b/apps/testing/23-harness/project.json
@@ -3,23 +3,23 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/testing/harness/src",
+  "sourceRoot": "apps/testing/23-harness/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing/harness",
-        "index": "apps/testing/harness/src/index.html",
-        "main": "apps/testing/harness/src/main.ts",
+        "outputPath": "dist/apps/testing/23-harness",
+        "index": "apps/testing/23-harness/src/index.html",
+        "main": "apps/testing/23-harness/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/harness/tsconfig.app.json",
+        "tsConfig": "apps/testing/23-harness/tsconfig.app.json",
         "assets": [
-          "apps/testing/harness/src/favicon.ico",
-          "apps/testing/harness/src/assets"
+          "apps/testing/23-harness/src/favicon.ico",
+          "apps/testing/23-harness/src/assets"
         ],
-        "styles": ["apps/testing/harness/src/styles.scss"],
+        "styles": ["apps/testing/23-harness/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -71,7 +71,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing/harness/jest.config.ts"
+        "jestConfig": "apps/testing/23-harness/jest.config.ts"
       }
     },
     "lint": {
diff --git a/apps/testing/harness/src/app/app.component.ts b/apps/testing/23-harness/src/app/app.component.ts
similarity index 100%
rename from apps/testing/harness/src/app/app.component.ts
rename to apps/testing/23-harness/src/app/app.component.ts
diff --git a/apps/testing/create-harness/src/app/app.config.ts b/apps/testing/23-harness/src/app/app.config.ts
similarity index 100%
rename from apps/testing/create-harness/src/app/app.config.ts
rename to apps/testing/23-harness/src/app/app.config.ts
diff --git a/apps/testing/harness/src/app/child.component.spec.ts b/apps/testing/23-harness/src/app/child.component.spec.ts
similarity index 100%
rename from apps/testing/harness/src/app/child.component.spec.ts
rename to apps/testing/23-harness/src/app/child.component.spec.ts
diff --git a/apps/testing/harness/src/app/child.component.ts b/apps/testing/23-harness/src/app/child.component.ts
similarity index 100%
rename from apps/testing/harness/src/app/child.component.ts
rename to apps/testing/23-harness/src/app/child.component.ts
diff --git a/apps/testing/modal/src/assets/.gitkeep b/apps/testing/23-harness/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/modal/src/assets/.gitkeep
rename to apps/testing/23-harness/src/assets/.gitkeep
diff --git a/apps/testing/modal/src/favicon.ico b/apps/testing/23-harness/src/favicon.ico
similarity index 100%
rename from apps/testing/modal/src/favicon.ico
rename to apps/testing/23-harness/src/favicon.ico
diff --git a/apps/testing/harness/src/index.html b/apps/testing/23-harness/src/index.html
similarity index 100%
rename from apps/testing/harness/src/index.html
rename to apps/testing/23-harness/src/index.html
diff --git a/apps/testing/create-harness/src/main.ts b/apps/testing/23-harness/src/main.ts
similarity index 100%
rename from apps/testing/create-harness/src/main.ts
rename to apps/testing/23-harness/src/main.ts
diff --git a/apps/testing/harness/src/styles.scss b/apps/testing/23-harness/src/styles.scss
similarity index 100%
rename from apps/testing/harness/src/styles.scss
rename to apps/testing/23-harness/src/styles.scss
diff --git a/apps/testing/modal/src/test-setup.ts b/apps/testing/23-harness/src/test-setup.ts
similarity index 100%
rename from apps/testing/modal/src/test-setup.ts
rename to apps/testing/23-harness/src/test-setup.ts
diff --git a/apps/testing/create-harness/tailwind.config.js b/apps/testing/23-harness/tailwind.config.js
similarity index 100%
rename from apps/testing/create-harness/tailwind.config.js
rename to apps/testing/23-harness/tailwind.config.js
diff --git a/apps/testing/checkbox/tsconfig.app.json b/apps/testing/23-harness/tsconfig.app.json
similarity index 100%
rename from apps/testing/checkbox/tsconfig.app.json
rename to apps/testing/23-harness/tsconfig.app.json
diff --git a/apps/testing/harness/tsconfig.editor.json b/apps/testing/23-harness/tsconfig.editor.json
similarity index 100%
rename from apps/testing/harness/tsconfig.editor.json
rename to apps/testing/23-harness/tsconfig.editor.json
diff --git a/apps/testing/create-harness/tsconfig.json b/apps/testing/23-harness/tsconfig.json
similarity index 100%
rename from apps/testing/create-harness/tsconfig.json
rename to apps/testing/23-harness/tsconfig.json
diff --git a/apps/testing/create-harness/tsconfig.spec.json b/apps/testing/23-harness/tsconfig.spec.json
similarity index 100%
rename from apps/testing/create-harness/tsconfig.spec.json
rename to apps/testing/23-harness/tsconfig.spec.json
diff --git a/apps/testing/modal/.eslintrc.json b/apps/testing/24-harness-creation/.eslintrc.json
similarity index 100%
rename from apps/testing/modal/.eslintrc.json
rename to apps/testing/24-harness-creation/.eslintrc.json
diff --git a/apps/testing/create-harness/README.md b/apps/testing/24-harness-creation/README.md
similarity index 85%
rename from apps/testing/create-harness/README.md
rename to apps/testing/24-harness-creation/README.md
index 600f340..928bb1a 100644
--- a/apps/testing/create-harness/README.md
+++ b/apps/testing/24-harness-creation/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve testing-create-harness
+npx nx serve testing-harness-creation
 ```
 
 ### Documentation and Instruction
diff --git a/apps/testing/todos-list/jest.config.ts b/apps/testing/24-harness-creation/jest.config.ts
similarity index 93%
rename from apps/testing/todos-list/jest.config.ts
rename to apps/testing/24-harness-creation/jest.config.ts
index eb61074..c4b9f08 100644
--- a/apps/testing/todos-list/jest.config.ts
+++ b/apps/testing/24-harness-creation/jest.config.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
 export default {
-  displayName: 'testing-todos-list',
+  displayName: 'testing-harness-creation',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   transform: {
diff --git a/apps/testing/create-harness/project.json b/apps/testing/24-harness-creation/project.json
similarity index 66%
rename from apps/testing/create-harness/project.json
rename to apps/testing/24-harness-creation/project.json
index 800c4d5..7b1c735 100644
--- a/apps/testing/create-harness/project.json
+++ b/apps/testing/24-harness-creation/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "testing-create-harness",
+  "name": "testing-harness-creation",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/testing/create-harness/src",
+  "sourceRoot": "apps/testing/24-harness-creation/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing/create-harness",
-        "index": "apps/testing/create-harness/src/index.html",
-        "main": "apps/testing/create-harness/src/main.ts",
+        "outputPath": "dist/apps/testing/24-harness-creation",
+        "index": "apps/testing/24-harness-creation/src/index.html",
+        "main": "apps/testing/24-harness-creation/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/create-harness/tsconfig.app.json",
+        "tsConfig": "apps/testing/24-harness-creation/tsconfig.app.json",
         "assets": [
-          "apps/testing/create-harness/src/favicon.ico",
-          "apps/testing/create-harness/src/assets"
+          "apps/testing/24-harness-creation/src/favicon.ico",
+          "apps/testing/24-harness-creation/src/assets"
         ],
-        "styles": ["apps/testing/create-harness/src/styles.scss"],
+        "styles": ["apps/testing/24-harness-creation/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "testing-create-harness:build:production"
+          "buildTarget": "testing-harness-creation:build:production"
         },
         "development": {
-          "buildTarget": "testing-create-harness:build:development"
+          "buildTarget": "testing-harness-creation:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,14 +64,14 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "testing-create-harness:build"
+        "buildTarget": "testing-harness-creation:build"
       }
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing/create-harness/jest.config.ts"
+        "jestConfig": "apps/testing/24-harness-creation/jest.config.ts"
       }
     },
     "lint": {
diff --git a/apps/testing/create-harness/src/app/app.component.spec.ts b/apps/testing/24-harness-creation/src/app/app.component.spec.ts
similarity index 100%
rename from apps/testing/create-harness/src/app/app.component.spec.ts
rename to apps/testing/24-harness-creation/src/app/app.component.spec.ts
diff --git a/apps/testing/create-harness/src/app/app.component.ts b/apps/testing/24-harness-creation/src/app/app.component.ts
similarity index 100%
rename from apps/testing/create-harness/src/app/app.component.ts
rename to apps/testing/24-harness-creation/src/app/app.component.ts
diff --git a/apps/testing/harness/src/app/app.config.ts b/apps/testing/24-harness-creation/src/app/app.config.ts
similarity index 100%
rename from apps/testing/harness/src/app/app.config.ts
rename to apps/testing/24-harness-creation/src/app/app.config.ts
diff --git a/apps/testing/create-harness/src/app/slider.component.ts b/apps/testing/24-harness-creation/src/app/slider.component.ts
similarity index 100%
rename from apps/testing/create-harness/src/app/slider.component.ts
rename to apps/testing/24-harness-creation/src/app/slider.component.ts
diff --git a/apps/testing/create-harness/src/app/slider.harness.ts b/apps/testing/24-harness-creation/src/app/slider.harness.ts
similarity index 100%
rename from apps/testing/create-harness/src/app/slider.harness.ts
rename to apps/testing/24-harness-creation/src/app/slider.harness.ts
diff --git a/apps/testing/nested/src/assets/.gitkeep b/apps/testing/24-harness-creation/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/nested/src/assets/.gitkeep
rename to apps/testing/24-harness-creation/src/assets/.gitkeep
diff --git a/apps/testing/nested/src/favicon.ico b/apps/testing/24-harness-creation/src/favicon.ico
similarity index 100%
rename from apps/testing/nested/src/favicon.ico
rename to apps/testing/24-harness-creation/src/favicon.ico
diff --git a/apps/testing/create-harness/src/index.html b/apps/testing/24-harness-creation/src/index.html
similarity index 100%
rename from apps/testing/create-harness/src/index.html
rename to apps/testing/24-harness-creation/src/index.html
diff --git a/apps/testing/harness/src/main.ts b/apps/testing/24-harness-creation/src/main.ts
similarity index 100%
rename from apps/testing/harness/src/main.ts
rename to apps/testing/24-harness-creation/src/main.ts
diff --git a/apps/testing/create-harness/src/styles.scss b/apps/testing/24-harness-creation/src/styles.scss
similarity index 100%
rename from apps/testing/create-harness/src/styles.scss
rename to apps/testing/24-harness-creation/src/styles.scss
diff --git a/apps/testing/nested/src/test-setup.ts b/apps/testing/24-harness-creation/src/test-setup.ts
similarity index 100%
rename from apps/testing/nested/src/test-setup.ts
rename to apps/testing/24-harness-creation/src/test-setup.ts
diff --git a/apps/testing/harness/tailwind.config.js b/apps/testing/24-harness-creation/tailwind.config.js
similarity index 100%
rename from apps/testing/harness/tailwind.config.js
rename to apps/testing/24-harness-creation/tailwind.config.js
diff --git a/apps/testing/create-harness/tsconfig.app.json b/apps/testing/24-harness-creation/tsconfig.app.json
similarity index 100%
rename from apps/testing/create-harness/tsconfig.app.json
rename to apps/testing/24-harness-creation/tsconfig.app.json
diff --git a/apps/testing/create-harness/tsconfig.editor.json b/apps/testing/24-harness-creation/tsconfig.editor.json
similarity index 100%
rename from apps/testing/create-harness/tsconfig.editor.json
rename to apps/testing/24-harness-creation/tsconfig.editor.json
diff --git a/apps/testing/harness/tsconfig.json b/apps/testing/24-harness-creation/tsconfig.json
similarity index 100%
rename from apps/testing/harness/tsconfig.json
rename to apps/testing/24-harness-creation/tsconfig.json
diff --git a/apps/testing/harness/tsconfig.spec.json b/apps/testing/24-harness-creation/tsconfig.spec.json
similarity index 100%
rename from apps/testing/harness/tsconfig.spec.json
rename to apps/testing/24-harness-creation/tsconfig.spec.json
diff --git a/apps/testing/router-outlet/.eslintrc.json b/apps/testing/28-checkbox/.eslintrc.json
similarity index 100%
rename from apps/testing/router-outlet/.eslintrc.json
rename to apps/testing/28-checkbox/.eslintrc.json
diff --git a/apps/testing/checkbox/README.md b/apps/testing/28-checkbox/README.md
similarity index 100%
rename from apps/testing/checkbox/README.md
rename to apps/testing/28-checkbox/README.md
diff --git a/apps/testing/checkbox/jest.config.ts b/apps/testing/28-checkbox/jest.config.ts
similarity index 90%
rename from apps/testing/checkbox/jest.config.ts
rename to apps/testing/28-checkbox/jest.config.ts
index 0c59029..c27a02c 100644
--- a/apps/testing/checkbox/jest.config.ts
+++ b/apps/testing/28-checkbox/jest.config.ts
@@ -3,7 +3,7 @@ export default {
   displayName: 'testing-checkbox',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/testing/checkbox',
+  coverageDirectory: '../../../coverage/apps/testing/28-checkbox',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/testing/checkbox/project.json b/apps/testing/28-checkbox/project.json
similarity index 78%
rename from apps/testing/checkbox/project.json
rename to apps/testing/28-checkbox/project.json
index 7a7ae0f..ddd61cd 100644
--- a/apps/testing/checkbox/project.json
+++ b/apps/testing/28-checkbox/project.json
@@ -3,23 +3,23 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/testing/checkbox/src",
+  "sourceRoot": "apps/testing/28-checkbox/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing/checkbox",
-        "index": "apps/testing/checkbox/src/index.html",
-        "main": "apps/testing/checkbox/src/main.ts",
+        "outputPath": "dist/apps/testing/28-checkbox",
+        "index": "apps/testing/28-checkbox/src/index.html",
+        "main": "apps/testing/28-checkbox/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/checkbox/tsconfig.app.json",
+        "tsConfig": "apps/testing/28-checkbox/tsconfig.app.json",
         "assets": [
-          "apps/testing/checkbox/src/favicon.ico",
-          "apps/testing/checkbox/src/assets"
+          "apps/testing/28-checkbox/src/favicon.ico",
+          "apps/testing/28-checkbox/src/assets"
         ],
-        "styles": ["apps/testing/checkbox/src/styles.scss"],
+        "styles": ["apps/testing/28-checkbox/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -74,7 +74,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing/checkbox/jest.config.ts"
+        "jestConfig": "apps/testing/28-checkbox/jest.config.ts"
       }
     }
   }
diff --git a/apps/testing/checkbox/src/app/app.component.spec.ts b/apps/testing/28-checkbox/src/app/app.component.spec.ts
similarity index 100%
rename from apps/testing/checkbox/src/app/app.component.spec.ts
rename to apps/testing/28-checkbox/src/app/app.component.spec.ts
diff --git a/apps/testing/checkbox/src/app/app.component.ts b/apps/testing/28-checkbox/src/app/app.component.ts
similarity index 100%
rename from apps/testing/checkbox/src/app/app.component.ts
rename to apps/testing/28-checkbox/src/app/app.component.ts
diff --git a/apps/testing/router-outlet/src/assets/.gitkeep b/apps/testing/28-checkbox/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/router-outlet/src/assets/.gitkeep
rename to apps/testing/28-checkbox/src/assets/.gitkeep
diff --git a/apps/testing/router-outlet/src/favicon.ico b/apps/testing/28-checkbox/src/favicon.ico
similarity index 100%
rename from apps/testing/router-outlet/src/favicon.ico
rename to apps/testing/28-checkbox/src/favicon.ico
diff --git a/apps/testing/checkbox/src/index.html b/apps/testing/28-checkbox/src/index.html
similarity index 100%
rename from apps/testing/checkbox/src/index.html
rename to apps/testing/28-checkbox/src/index.html
diff --git a/apps/testing/nested/src/main.ts b/apps/testing/28-checkbox/src/main.ts
similarity index 100%
rename from apps/testing/nested/src/main.ts
rename to apps/testing/28-checkbox/src/main.ts
diff --git a/apps/testing/modal/src/styles.scss b/apps/testing/28-checkbox/src/styles.scss
similarity index 100%
rename from apps/testing/modal/src/styles.scss
rename to apps/testing/28-checkbox/src/styles.scss
diff --git a/apps/testing/router-outlet/src/test-setup.ts b/apps/testing/28-checkbox/src/test-setup.ts
similarity index 100%
rename from apps/testing/router-outlet/src/test-setup.ts
rename to apps/testing/28-checkbox/src/test-setup.ts
diff --git a/apps/testing/modal/tailwind.config.js b/apps/testing/28-checkbox/tailwind.config.js
similarity index 100%
rename from apps/testing/modal/tailwind.config.js
rename to apps/testing/28-checkbox/tailwind.config.js
diff --git a/apps/testing/harness/tsconfig.app.json b/apps/testing/28-checkbox/tsconfig.app.json
similarity index 100%
rename from apps/testing/harness/tsconfig.app.json
rename to apps/testing/28-checkbox/tsconfig.app.json
diff --git a/apps/testing/router-outlet/tsconfig.editor.json b/apps/testing/28-checkbox/tsconfig.editor.json
similarity index 100%
rename from apps/testing/router-outlet/tsconfig.editor.json
rename to apps/testing/28-checkbox/tsconfig.editor.json
diff --git a/apps/testing/checkbox/tsconfig.json b/apps/testing/28-checkbox/tsconfig.json
similarity index 100%
rename from apps/testing/checkbox/tsconfig.json
rename to apps/testing/28-checkbox/tsconfig.json
diff --git a/apps/testing/router-outlet/tsconfig.spec.json b/apps/testing/28-checkbox/tsconfig.spec.json
similarity index 100%
rename from apps/testing/router-outlet/tsconfig.spec.json
rename to apps/testing/28-checkbox/tsconfig.spec.json
diff --git a/apps/testing/table/.eslintrc.json b/apps/testing/29-real-life-application/.eslintrc.json
similarity index 100%
rename from apps/testing/table/.eslintrc.json
rename to apps/testing/29-real-life-application/.eslintrc.json
diff --git a/apps/testing/todos-list/README.md b/apps/testing/29-real-life-application/README.md
similarity index 84%
rename from apps/testing/todos-list/README.md
rename to apps/testing/29-real-life-application/README.md
index 37a8e93..8dcfe21 100644
--- a/apps/testing/todos-list/README.md
+++ b/apps/testing/29-real-life-application/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve testing-todos-list
+npx nx serve testing-real-life-application
 ```
 
 ### Documentation and Instruction
diff --git a/apps/testing/table/cypress.config.ts b/apps/testing/29-real-life-application/cypress.config.ts
similarity index 100%
rename from apps/testing/table/cypress.config.ts
rename to apps/testing/29-real-life-application/cypress.config.ts
diff --git a/apps/testing/table/cypress/fixtures/example.json b/apps/testing/29-real-life-application/cypress/fixtures/example.json
similarity index 100%
rename from apps/testing/table/cypress/fixtures/example.json
rename to apps/testing/29-real-life-application/cypress/fixtures/example.json
diff --git a/apps/testing/table/cypress/support/commands.ts b/apps/testing/29-real-life-application/cypress/support/commands.ts
similarity index 100%
rename from apps/testing/table/cypress/support/commands.ts
rename to apps/testing/29-real-life-application/cypress/support/commands.ts
diff --git a/apps/testing/todos-list/cypress/support/component-index.html b/apps/testing/29-real-life-application/cypress/support/component-index.html
similarity index 100%
rename from apps/testing/todos-list/cypress/support/component-index.html
rename to apps/testing/29-real-life-application/cypress/support/component-index.html
diff --git a/apps/testing/table/cypress/support/component.ts b/apps/testing/29-real-life-application/cypress/support/component.ts
similarity index 100%
rename from apps/testing/table/cypress/support/component.ts
rename to apps/testing/29-real-life-application/cypress/support/component.ts
diff --git a/apps/testing/table/cypress/tsconfig.json b/apps/testing/29-real-life-application/cypress/tsconfig.json
similarity index 100%
rename from apps/testing/table/cypress/tsconfig.json
rename to apps/testing/29-real-life-application/cypress/tsconfig.json
diff --git a/apps/testing/create-harness/jest.config.ts b/apps/testing/29-real-life-application/jest.config.ts
similarity index 92%
rename from apps/testing/create-harness/jest.config.ts
rename to apps/testing/29-real-life-application/jest.config.ts
index 1178b8a..b78a065 100644
--- a/apps/testing/create-harness/jest.config.ts
+++ b/apps/testing/29-real-life-application/jest.config.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
 export default {
-  displayName: 'testing-create-harness',
+  displayName: 'testing-real-life-application',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   transform: {
diff --git a/apps/testing/todos-list/project.json b/apps/testing/29-real-life-application/project.json
similarity index 65%
rename from apps/testing/todos-list/project.json
rename to apps/testing/29-real-life-application/project.json
index b20c00d..a95f206 100644
--- a/apps/testing/todos-list/project.json
+++ b/apps/testing/29-real-life-application/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "testing-todos-list",
+  "name": "testing-real-life-application",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/testing/todos-list/src",
+  "sourceRoot": "apps/testing/29-real-life-application/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/testing/todos-list",
-        "index": "apps/testing/todos-list/src/index.html",
-        "main": "apps/testing/todos-list/src/main.ts",
+        "outputPath": "dist/apps/testing/29-real-life-application",
+        "index": "apps/testing/29-real-life-application/src/index.html",
+        "main": "apps/testing/29-real-life-application/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/todos-list/tsconfig.app.json",
+        "tsConfig": "apps/testing/29-real-life-application/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/testing/todos-list/src/favicon.ico",
-          "apps/testing/todos-list/src/assets"
+          "apps/testing/29-real-life-application/src/favicon.ico",
+          "apps/testing/29-real-life-application/src/assets"
         ],
         "styles": [
-          "apps/testing/todos-list/src/styles.scss",
+          "apps/testing/29-real-life-application/src/styles.scss",
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
         ],
         "scripts": []
@@ -56,10 +56,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "testing-todos-list:build:production"
+          "buildTarget": "testing-real-life-application:build:production"
         },
         "development": {
-          "buildTarget": "testing-todos-list:build:development"
+          "buildTarget": "testing-real-life-application:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -67,7 +67,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "testing-todos-list:build"
+        "buildTarget": "testing-real-life-application:build"
       }
     },
     "lint": {
@@ -77,16 +77,16 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/testing/todos-list/jest.config.ts"
+        "jestConfig": "apps/testing/29-real-life-application/jest.config.ts"
       }
     },
     "component-test": {
       "executor": "@nx/cypress:cypress",
       "options": {
-        "cypressConfig": "apps/testing/todos-list/cypress.config.ts",
+        "cypressConfig": "apps/testing/29-real-life-application/cypress.config.ts",
         "testingType": "component",
         "skipServe": true,
-        "devServerTarget": "testing-todos-list:build"
+        "devServerTarget": "testing-real-life-application:build"
       }
     }
   },
diff --git a/apps/testing/todos-list/src/app/app.component.ts b/apps/testing/29-real-life-application/src/app/app.component.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/app.component.ts
rename to apps/testing/29-real-life-application/src/app/app.component.ts
diff --git a/apps/testing/todos-list/src/app/app.config.ts b/apps/testing/29-real-life-application/src/app/app.config.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/app.config.ts
rename to apps/testing/29-real-life-application/src/app/app.config.ts
diff --git a/apps/testing/todos-list/src/app/app.route.ts b/apps/testing/29-real-life-application/src/app/app.route.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/app.route.ts
rename to apps/testing/29-real-life-application/src/app/app.route.ts
diff --git a/apps/testing/todos-list/src/app/backend.service.ts b/apps/testing/29-real-life-application/src/app/backend.service.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/backend.service.ts
rename to apps/testing/29-real-life-application/src/app/backend.service.ts
diff --git a/apps/testing/todos-list/src/app/detail/detail.component.ts b/apps/testing/29-real-life-application/src/app/detail/detail.component.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/detail/detail.component.ts
rename to apps/testing/29-real-life-application/src/app/detail/detail.component.ts
diff --git a/apps/testing/todos-list/src/app/detail/detail.store.ts b/apps/testing/29-real-life-application/src/app/detail/detail.store.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/detail/detail.store.ts
rename to apps/testing/29-real-life-application/src/app/detail/detail.store.ts
diff --git a/apps/testing/todos-list/src/app/list/list.component.spec.ts b/apps/testing/29-real-life-application/src/app/list/list.component.spec.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/list/list.component.spec.ts
rename to apps/testing/29-real-life-application/src/app/list/list.component.spec.ts
diff --git a/apps/testing/todos-list/src/app/list/list.component.ts b/apps/testing/29-real-life-application/src/app/list/list.component.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/list/list.component.ts
rename to apps/testing/29-real-life-application/src/app/list/list.component.ts
diff --git a/apps/testing/todos-list/src/app/list/ticket.store.spec.ts b/apps/testing/29-real-life-application/src/app/list/ticket.store.spec.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/list/ticket.store.spec.ts
rename to apps/testing/29-real-life-application/src/app/list/ticket.store.spec.ts
diff --git a/apps/testing/todos-list/src/app/list/ticket.store.ts b/apps/testing/29-real-life-application/src/app/list/ticket.store.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/list/ticket.store.ts
rename to apps/testing/29-real-life-application/src/app/list/ticket.store.ts
diff --git a/apps/testing/todos-list/src/app/list/ui/add.component.ts b/apps/testing/29-real-life-application/src/app/list/ui/add.component.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/list/ui/add.component.ts
rename to apps/testing/29-real-life-application/src/app/list/ui/add.component.ts
diff --git a/apps/testing/todos-list/src/app/list/ui/row.component.spec.ts b/apps/testing/29-real-life-application/src/app/list/ui/row.component.spec.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/list/ui/row.component.spec.ts
rename to apps/testing/29-real-life-application/src/app/list/ui/row.component.spec.ts
diff --git a/apps/testing/todos-list/src/app/list/ui/row.component.ts b/apps/testing/29-real-life-application/src/app/list/ui/row.component.ts
similarity index 100%
rename from apps/testing/todos-list/src/app/list/ui/row.component.ts
rename to apps/testing/29-real-life-application/src/app/list/ui/row.component.ts
diff --git a/apps/testing/table/src/assets/.gitkeep b/apps/testing/29-real-life-application/src/assets/.gitkeep
similarity index 100%
rename from apps/testing/table/src/assets/.gitkeep
rename to apps/testing/29-real-life-application/src/assets/.gitkeep
diff --git a/apps/testing/table/src/favicon.ico b/apps/testing/29-real-life-application/src/favicon.ico
similarity index 100%
rename from apps/testing/table/src/favicon.ico
rename to apps/testing/29-real-life-application/src/favicon.ico
diff --git a/apps/testing/todos-list/src/index.html b/apps/testing/29-real-life-application/src/index.html
similarity index 100%
rename from apps/testing/todos-list/src/index.html
rename to apps/testing/29-real-life-application/src/index.html
diff --git a/apps/testing/todos-list/src/main.ts b/apps/testing/29-real-life-application/src/main.ts
similarity index 100%
rename from apps/testing/todos-list/src/main.ts
rename to apps/testing/29-real-life-application/src/main.ts
diff --git a/apps/testing/todos-list/src/styles.scss b/apps/testing/29-real-life-application/src/styles.scss
similarity index 100%
rename from apps/testing/todos-list/src/styles.scss
rename to apps/testing/29-real-life-application/src/styles.scss
diff --git a/apps/testing/table/src/test-setup.ts b/apps/testing/29-real-life-application/src/test-setup.ts
similarity index 100%
rename from apps/testing/table/src/test-setup.ts
rename to apps/testing/29-real-life-application/src/test-setup.ts
diff --git a/apps/testing/table/tailwind.config.js b/apps/testing/29-real-life-application/tailwind.config.js
similarity index 100%
rename from apps/testing/table/tailwind.config.js
rename to apps/testing/29-real-life-application/tailwind.config.js
diff --git a/apps/testing/table/tsconfig.app.json b/apps/testing/29-real-life-application/tsconfig.app.json
similarity index 100%
rename from apps/testing/table/tsconfig.app.json
rename to apps/testing/29-real-life-application/tsconfig.app.json
diff --git a/apps/testing/table/tsconfig.editor.json b/apps/testing/29-real-life-application/tsconfig.editor.json
similarity index 100%
rename from apps/testing/table/tsconfig.editor.json
rename to apps/testing/29-real-life-application/tsconfig.editor.json
diff --git a/apps/testing/29-real-life-application/tsconfig.json b/apps/testing/29-real-life-application/tsconfig.json
new file mode 100644
index 0000000..8a0cb05
--- /dev/null
+++ b/apps/testing/29-real-life-application/tsconfig.json
@@ -0,0 +1,35 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "useDefineForClassFields": false,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./tsconfig.editor.json"
+    },
+    {
+      "path": "./cypress/tsconfig.base.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json",
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  }
+}
diff --git a/apps/testing/todos-list/tsconfig.spec.json b/apps/testing/29-real-life-application/tsconfig.spec.json
similarity index 100%
rename from apps/testing/todos-list/tsconfig.spec.json
rename to apps/testing/29-real-life-application/tsconfig.spec.json
diff --git a/apps/testing/nested/.eslintrc.json b/apps/testing/nested/.eslintrc.json
deleted file mode 100644
index bd48864..0000000
--- a/apps/testing/nested/.eslintrc.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "extends": ["../../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts"],
-      "rules": {},
-      "extends": [
-        "plugin:@nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ]
-    },
-    {
-      "files": ["*.html"],
-      "extends": ["plugin:@nx/angular-template"],
-      "rules": {}
-    }
-  ]
-}
diff --git a/apps/testing/router-outlet/project.json b/apps/testing/router-outlet/project.json
deleted file mode 100644
index 41697e1..0000000
--- a/apps/testing/router-outlet/project.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "name": "testing-router-outlet",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
-  "sourceRoot": "apps/testing/router-outlet/src",
-  "prefix": "app",
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:browser",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/apps/testing/router-outlet",
-        "index": "apps/testing/router-outlet/src/index.html",
-        "main": "apps/testing/router-outlet/src/main.ts",
-        "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/router-outlet/tsconfig.app.json",
-        "inlineStyleLanguage": "scss",
-        "assets": [
-          "apps/testing/router-outlet/src/favicon.ico",
-          "apps/testing/router-outlet/src/assets"
-        ],
-        "styles": ["apps/testing/router-outlet/src/styles.scss"],
-        "scripts": []
-      },
-      "configurations": {
-        "production": {
-          "budgets": [
-            {
-              "type": "initial",
-              "maximumWarning": "500kb",
-              "maximumError": "1mb"
-            },
-            {
-              "type": "anyComponentStyle",
-              "maximumWarning": "2kb",
-              "maximumError": "4kb"
-            }
-          ],
-          "outputHashing": "all"
-        },
-        "development": {
-          "buildOptimizer": false,
-          "optimization": false,
-          "vendorChunk": true,
-          "extractLicenses": false,
-          "sourceMap": true,
-          "namedChunks": true
-        }
-      },
-      "defaultConfiguration": "production"
-    },
-    "serve": {
-      "executor": "@angular-devkit/build-angular:dev-server",
-      "configurations": {
-        "production": {
-          "buildTarget": "testing-router-outlet:build:production"
-        },
-        "development": {
-          "buildTarget": "testing-router-outlet:build:development"
-        }
-      },
-      "defaultConfiguration": "development"
-    },
-    "extract-i18n": {
-      "executor": "@angular-devkit/build-angular:extract-i18n",
-      "options": {
-        "buildTarget": "testing-router-outlet:build"
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "apps/testing/router-outlet/jest.config.ts"
-      }
-    },
-    "component-test": {
-      "executor": "@nx/cypress:cypress",
-      "options": {
-        "cypressConfig": "apps/testing/router-outlet/cypress.config.ts",
-        "testingType": "component",
-        "skipServe": true,
-        "devServerTarget": "testing-router-outlet:build"
-      }
-    }
-  },
-  "tags": []
-}
diff --git a/apps/testing/router-outlet/tsconfig.json b/apps/testing/router-outlet/tsconfig.json
deleted file mode 100644
index 3879b94..0000000
--- a/apps/testing/router-outlet/tsconfig.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "useDefineForClassFields": false,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./tsconfig.editor.json"
-    },
-    {
-      "path": "./cypress/tsconfig.json"
-    }
-  ],
-  "extends": "../../../tsconfig.base.json",
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }
-}
diff --git a/apps/testing/table/README.md b/apps/testing/table/README.md
deleted file mode 100644
index ff3b4b5..0000000
--- a/apps/testing/table/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-<h1>Table testing</h1>
-
-> author: thomas-laforge
-
-## Statement:
-
-NOT IMPLEMENTED YET
-
-<!-- We have a small application that send a title to a fake backend that you type inside a input.
-If the title is correctly typed, you can send the request otherwise you get a nice error and the request is not sent.
-You can play with it by running : `npx nx serve testing-table`.
-
-The goal is to subscription this behavior with Testing library and Cypress
-
-The file named `child.component.spec.ts` will let subscription your application using Testing Library. To run the subscription suits, you need to run `npx nx subscription testing-table`. You can also install [Jest Runner](https://marketplace.visualstudio.com/items?itemName=firsttris.vscode-jest-runner) to execute your subscription by clicking on the `Run` button above each `describe` or `it` blocks.
-
-For testing cypress, you will execute your subscription inside the `child.component.cy.ts` and run `npx nx component-subscription testing-table` to execute your subscription suits. You can add the `--watch` flag to execute your subscription in watch mode.
-
-I created some `it` blocks but feel free to add more subscription if you like to. -->
-
-### Submitting your work
-
-1. Fork the project
-2. clone it
-3. npm ci
-4. `npx nx serve testing-table` to play with the application
-5. `npx nx test testing-table` to test your application with Testing Library
-6. `npx nx component-test testing-table --watch` to test your application with Cypress
-7. _...work on it_
-8. Commit your work
-9. Submit a PR with a title beginning with **Answer:22** that I will review and other dev can review.
-
-<a href="https://github.com/tomalaforge/angular-challenges/pulls?q=label%3A22+label%3Aanswer"><img src="https://img.shields.io/badge/-Solutions-green" alt="nested testing"/></a>
-<a href='https://github.com/tomalaforge/angular-challenges/pulls?q=label%3A22+label%3A"answer+author"'><img src="https://img.shields.io/badge/-Author solution-important" alt="nested testing solution author"/></a>
-
-<!-- <a href="{Blog post url}" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/badge/-Blog post explanation-blue" alt="nested testing blog article"/></a> -->
-
-_You can ask any question on_ <a href="https://twitter.com/laforge_toma" target="_blank" rel="noopener noreferrer"><img src="./../../logo/twitter.svg" height=20px alt="twitter"/></a>
diff --git a/apps/testing/table/cypress/support/component-index.html b/apps/testing/table/cypress/support/component-index.html
deleted file mode 100644
index c0a4681..0000000
--- a/apps/testing/table/cypress/support/component-index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <title>testing-table Components App</title>
-  </head>
-  <body>
-    <div data-cy-root></div>
-  </body>
-</html>
diff --git a/apps/testing/table/jest.config.ts b/apps/testing/table/jest.config.ts
deleted file mode 100644
index 56b0e7d..0000000
--- a/apps/testing/table/jest.config.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'testing-table',
-  preset: '../../../jest.preset.js',
-  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  transform: {
-    '^.+\\.(ts|mjs|js|html)$': [
-      'jest-preset-angular',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-        stringifyContentPathRegex: '\\.(html|svg)$',
-      },
-    ],
-  },
-  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
-  snapshotSerializers: [
-    'jest-preset-angular/build/serializers/no-ng-attributes',
-    'jest-preset-angular/build/serializers/ng-snapshot',
-    'jest-preset-angular/build/serializers/html-comment',
-  ],
-};
diff --git a/apps/testing/table/project.json b/apps/testing/table/project.json
deleted file mode 100644
index db95cb4..0000000
--- a/apps/testing/table/project.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "name": "testing-table",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
-  "sourceRoot": "apps/testing/table/src",
-  "prefix": "app",
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:browser",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/apps/testing/table",
-        "index": "apps/testing/table/src/index.html",
-        "main": "apps/testing/table/src/main.ts",
-        "polyfills": ["zone.js"],
-        "tsConfig": "apps/testing/table/tsconfig.app.json",
-        "inlineStyleLanguage": "scss",
-        "assets": [
-          "apps/testing/table/src/favicon.ico",
-          "apps/testing/table/src/assets"
-        ],
-        "styles": ["apps/testing/table/src/styles.scss"],
-        "scripts": [],
-        "allowedCommonJsDependencies": ["seedrandom"]
-      },
-      "configurations": {
-        "production": {
-          "budgets": [
-            {
-              "type": "initial",
-              "maximumWarning": "500kb",
-              "maximumError": "1mb"
-            },
-            {
-              "type": "anyComponentStyle",
-              "maximumWarning": "2kb",
-              "maximumError": "4kb"
-            }
-          ],
-          "outputHashing": "all"
-        },
-        "development": {
-          "buildOptimizer": false,
-          "optimization": false,
-          "vendorChunk": true,
-          "extractLicenses": false,
-          "sourceMap": true,
-          "namedChunks": true
-        }
-      },
-      "defaultConfiguration": "production"
-    },
-    "serve": {
-      "executor": "@angular-devkit/build-angular:dev-server",
-      "configurations": {
-        "production": {
-          "buildTarget": "testing-table:build:production"
-        },
-        "development": {
-          "buildTarget": "testing-table:build:development"
-        }
-      },
-      "defaultConfiguration": "development"
-    },
-    "extract-i18n": {
-      "executor": "@angular-devkit/build-angular:extract-i18n",
-      "options": {
-        "buildTarget": "testing-table:build"
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "apps/testing/table/jest.config.ts"
-      }
-    },
-    "component-test": {
-      "executor": "@nx/cypress:cypress",
-      "options": {
-        "cypressConfig": "apps/testing/table/cypress.config.ts",
-        "testingType": "component",
-        "skipServe": true,
-        "devServerTarget": "testing-table:build"
-      }
-    }
-  },
-  "tags": []
-}
diff --git a/apps/testing/table/src/app/app.component.ts b/apps/testing/table/src/app/app.component.ts
deleted file mode 100644
index 236bc50..0000000
--- a/apps/testing/table/src/app/app.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { TableComponent } from './table.component';
-
-@Component({
-  standalone: true,
-  imports: [TableComponent],
-  selector: 'app-root',
-  template: `
-    <app-table />
-  `,
-})
-export class AppComponent {}
diff --git a/apps/testing/table/src/app/table.component.spec.ts b/apps/testing/table/src/app/table.component.spec.ts
deleted file mode 100644
index db4015d..0000000
--- a/apps/testing/table/src/app/table.component.spec.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
-import { MatTableHarness } from '@angular/material/table/testing';
-import { render } from '@testing-library/angular';
-import userEvent from '@testing-library/user-event';
-import { TableComponent } from './table.component';
-
-describe('AppComponent', () => {
-  // let loader: HarnessLoader;
-  // let fixture: ComponentFixture<TableComponent>;
-  // let loader: HarnessLoader;
-
-  // beforeEach(async () => {
-  //   const view = await render(TableComponent);
-  //   fixture = view.fixture;
-  //   loader = TestbedHarnessEnvironment.loader(fixture);
-  // });
-  it('error modal is displayed if you click on "Confirm" without inputing a name', async () => {
-    userEvent.setup();
-    const { fixture } = await render(TableComponent);
-    const loader = TestbedHarnessEnvironment.loader(fixture);
-
-    const tables = await loader.getAllHarnesses(MatTableHarness);
-    expect(tables.length).toBe(1);
-
-    // const confirmButton = await screen.findByRole('button', {
-    //   name: /confirm/i,
-    // });
-    // await userEvent.click(confirmButton);
-
-    // const dialogControl = await screen.findByRole('dialog');
-    // expect(dialogControl).toBeInTheDocument();
-    // const errorTitle = await screen.findByRole('heading', {
-    //   name: /error/i,
-    // });
-    // expect(errorTitle).toBeInTheDocument();
-
-    // const okButton = await screen.findByRole('button', {
-    //   name: /ok/i,
-    // });
-    // await userEvent.click(okButton);
-  });
-
-  // subscription('error message is shown if you click "Cancel" in the confirmation modal after submitting a name', async () => {
-  //   userEvent.setup();
-  //   await render(AppComponent);
-
-  //   const inputControl = await screen.getByRole('textbox');
-  //   await userEvent.type(inputControl, 'toto');
-
-  //   const confirmButton = await screen.findByRole('button', {
-  //     name: /confirm/i,
-  //   });
-  //   await userEvent.click(confirmButton);
-
-  //   const dialogControl = await screen.findByRole('dialog');
-  //   expect(dialogControl).toBeInTheDocument();
-  //   const profilTitle = await screen.findByRole('heading', {
-  //     name: /profil/i,
-  //   });
-  //   expect(profilTitle).toBeInTheDocument();
-
-  //   const cancelButton = await screen.findByRole('button', {
-  //     name: /cancel/i,
-  //   });
-  //   await userEvent.click(cancelButton);
-
-  //   const errorText = await screen.getByText('Name is invalid !!');
-  //   expect(errorText).toBeInTheDocument();
-  // });
-
-  // subscription('confirm message is shown if you click "Confirm" in the confirmation modal after submitting a name', async () => {
-  //   userEvent.setup();
-  //   await render(AppComponent);
-
-  //   const inputControl = await screen.getByRole('textbox');
-  //   await userEvent.type(inputControl, 'toto');
-
-  //   const confirmButton = await screen.findByRole('button', {
-  //     name: /confirm/i,
-  //   });
-  //   await userEvent.click(confirmButton);
-
-  //   const dialogControl = await screen.findByRole('dialog');
-  //   expect(dialogControl).toBeInTheDocument();
-  //   const profilTitle = await screen.findByRole('heading', {
-  //     name: /profil/i,
-  //   });
-  //   expect(profilTitle).toBeInTheDocument();
-
-  //   const confirmDialogButton = await screen.findByRole('button', {
-  //     name: /confirm/i,
-  //   });
-  //   await userEvent.click(confirmDialogButton);
-
-  //   const confirmText = await screen.getByText('Name has been submitted');
-  //   expect(confirmText).toBeInTheDocument();
-  // });
-});
diff --git a/apps/testing/table/src/app/table.component.ts b/apps/testing/table/src/app/table.component.ts
deleted file mode 100644
index 74df216..0000000
--- a/apps/testing/table/src/app/table.component.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { FakeBackendService } from '@angular-challenges/testing-table/backend';
-import { AsyncPipe, DatePipe, NgIf } from '@angular/common';
-import { AfterViewInit, Component, ViewChild, inject } from '@angular/core';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSort, MatSortModule, SortDirection } from '@angular/material/sort';
-import { MatTableModule } from '@angular/material/table';
-import { User } from '@ngneat/falso';
-import { LetDirective } from '@ngrx/component';
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
-import { map, pipe, startWith, switchMap, tap } from 'rxjs';
-
-interface TableState {
-  loading: boolean;
-  error?: string;
-  users: User[];
-}
-
-@Component({
-  selector: 'app-table',
-  standalone: true,
-  imports: [
-    MatFormFieldModule,
-    MatInputModule,
-    MatTableModule,
-    MatSortModule,
-    MatPaginatorModule,
-    MatProgressSpinnerModule,
-    LetDirective,
-    NgIf,
-    AsyncPipe,
-    DatePipe,
-  ],
-  template: `
-    <div class="example-container mat-elevation-z8">
-      <div class="example-loading-shade" *ngIf="loading$ | async">
-        <mat-spinner></mat-spinner>
-        <!-- <div class="example-rate-limit-reached" *ngIf="isRateLimitReached">
-          GitHub's API rate limit has been reached. It will be reset in one
-          minute.
-        </div> -->
-      </div>
-
-      <div class="example-table-container">
-        <table
-          mat-table
-          [dataSource]="(issues$ | async) ?? []"
-          class="example-table"
-          matSort>
-          <!-- Number Column -->
-          <ng-container matColumnDef="firstName">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header>FirstName</th>
-            <td mat-cell *matCellDef="let row">{{ row.firstName }}</td>
-          </ng-container>
-
-          <!-- Title Column -->
-          <ng-container matColumnDef="lastName">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header>LastName</th>
-            <td mat-cell *matCellDef="let row">{{ row.lastName }}</td>
-          </ng-container>
-
-          <!-- State Column -->
-          <ng-container matColumnDef="email">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header>Email</th>
-            <td mat-cell *matCellDef="let row">{{ row.email }}</td>
-          </ng-container>
-
-          <!-- Created Column -->
-          <!-- <ng-container matColumnDef="created">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header>Created</th>
-            <td mat-cell *matCellDef="let row">{{ row.created_at | date }}</td>
-          </ng-container> -->
-
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
-        </table>
-      </div>
-
-      <mat-paginator
-        [length]="resultsLength$ | async"
-        [pageSize]="30"
-        aria-label="Select page of GitHub search results"></mat-paginator>
-    </div>
-  `,
-})
-export class TableComponent
-  extends ComponentStore<TableState>
-  implements AfterViewInit
-{
-  readonly displayedColumns = ['firstName', 'lastName', 'email'];
-
-  private api = inject(FakeBackendService);
-
-  readonly issues$ = this.select((s) => s.users).pipe(
-    tap((t) => console.log('UserNEw ', t)),
-  );
-  readonly loading$ = this.select((s) => s.loading);
-  readonly error$ = this.select((s) => s.error);
-  readonly resultsLength$ = this.select((s) => 100);
-
-  // resultsLength = 0;
-  // isLoadingResults = true;
-  // isRateLimitReached = false;
-
-  @ViewChild(MatPaginator) paginator!: MatPaginator;
-  @ViewChild(MatSort) sort!: MatSort;
-
-  constructor() {
-    super({ loading: false, users: [] });
-  }
-
-  readonly loadData = this.effect<{
-    sortActive: keyof User;
-    sortDir: SortDirection;
-    pageIndex: number;
-  }>(
-    pipe(
-      tap((t) => console.log('cocou', t)),
-      tap(() => this.patchState({ loading: true, users: [] })),
-      switchMap(({ sortActive, sortDir, pageIndex }) =>
-        this.api.getUsers(sortActive, sortDir, pageIndex).pipe(
-          tap((t) => console.log('user', t)),
-          tapResponse(
-            (data) => this.patchState({ users: data, loading: false }),
-            (err) => this.patchState({ error: err as string, loading: false }),
-          ),
-        ),
-      ),
-    ),
-  );
-
-  ngAfterViewInit(): void {
-    // due to ExpressionChangedAfterItHasBeenCheckedError
-    console.log('cocuo', this.sort, this.paginator);
-    this.loadData(
-      this.select({
-        sortActive: this.sort.sortChange.pipe(
-          map((s) => s.active as keyof User),
-        ),
-        sortDir: this.sort.sortChange.pipe(map((s) => s.direction)),
-        pageIndex: this.paginator.page.pipe(map((p) => p.pageIndex)),
-      }).pipe(
-        startWith({
-          sortActive: this.sort.active as keyof User,
-          sortDir: this.sort.direction,
-          pageIndex: 1,
-        }),
-      ),
-    );
-  }
-
-  // applyFilter(event: Event) {
-  //   const filterValue = (event.target as HTMLInputElement).value;
-  //   this.dataSource.filter = filterValue.trim().toLowerCase();
-
-  //   if (this.dataSource.paginator) {
-  //     this.dataSource.paginator.firstPage();
-  //   }
-  // }
-}
diff --git a/apps/testing/table/src/index.html b/apps/testing/table/src/index.html
deleted file mode 100644
index 11da4b0..0000000
--- a/apps/testing/table/src/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>TestingTable</title>
-    <base href="/" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-  </head>
-  <body>
-    <app-root></app-root>
-  </body>
-</html>
diff --git a/apps/testing/table/src/main.ts b/apps/testing/table/src/main.ts
deleted file mode 100644
index b0ca80b..0000000
--- a/apps/testing/table/src/main.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { provideHttpClient } from '@angular/common/http';
-import { bootstrapApplication } from '@angular/platform-browser';
-import { provideAnimations } from '@angular/platform-browser/animations';
-import { AppComponent } from './app/app.component';
-
-bootstrapApplication(AppComponent, {
-  providers: [provideAnimations(), provideHttpClient()],
-}).catch((err) => console.error(err));
diff --git a/apps/testing/table/src/styles.scss b/apps/testing/table/src/styles.scss
deleted file mode 100644
index ce5105b..0000000
--- a/apps/testing/table/src/styles.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-@use '@angular/material' as mat;
-
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-/* You can add global styles to this file, and also import other style files */
-
-@include mat.core();
-
-$theme-primary: mat.define-palette(mat.$indigo-palette);
-$theme-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
-
-$theme-warn: mat.define-palette(mat.$red-palette);
-
-$theme: mat.define-light-theme(
-  (
-    color: (
-      primary: $theme-primary,
-      accent: $theme-accent,
-      warn: $theme-warn,
-    ),
-    typography: mat.define-typography-config(),
-  )
-);
-
-@include mat.core-theme($theme);
-@include mat.all-component-themes($theme);
-// @include mat.form-field-theme($theme);
-// @include mat.input-theme($theme);
-// @include mat.paginator-theme($theme);
diff --git a/apps/testing/table/tsconfig.json b/apps/testing/table/tsconfig.json
deleted file mode 100644
index 3879b94..0000000
--- a/apps/testing/table/tsconfig.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "useDefineForClassFields": false,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./tsconfig.editor.json"
-    },
-    {
-      "path": "./cypress/tsconfig.json"
-    }
-  ],
-  "extends": "../../../tsconfig.base.json",
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }
-}
diff --git a/apps/testing/table/tsconfig.spec.json b/apps/testing/table/tsconfig.spec.json
deleted file mode 100644
index a578b46..0000000
--- a/apps/testing/table/tsconfig.spec.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node", "@testing-library/jest-dom"],
-    "target": "ES2016"
-  },
-  "files": ["src/test-setup.ts"],
-  "include": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
-}
diff --git a/apps/testing/todos-list/cypress.config.ts b/apps/testing/todos-list/cypress.config.ts
deleted file mode 100644
index 1abef9c..0000000
--- a/apps/testing/todos-list/cypress.config.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
-import { defineConfig } from 'cypress';
-
-export default defineConfig({
-  component: nxComponentTestingPreset(__filename),
-});
diff --git a/apps/testing/todos-list/cypress/fixtures/example.json b/apps/testing/todos-list/cypress/fixtures/example.json
deleted file mode 100644
index 02e4254..0000000
--- a/apps/testing/todos-list/cypress/fixtures/example.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}
diff --git a/apps/testing/todos-list/cypress/support/commands.ts b/apps/testing/todos-list/cypress/support/commands.ts
deleted file mode 100644
index e6c8976..0000000
--- a/apps/testing/todos-list/cypress/support/commands.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/// <reference types="cypress" />
-import { mount } from 'cypress/angular';
-
-// ***********************************************
-// This example commands.ts shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Cypress {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    interface Chainable<Subject> {
-      login(email: string, password: string): void;
-      mount: typeof mount;
-    }
-  }
-}
-
-Cypress.Commands.add('mount', mount);
-
-//
-// -- This is a parent command --
-Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password);
-});
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/apps/testing/todos-list/cypress/support/component.ts b/apps/testing/todos-list/cypress/support/component.ts
deleted file mode 100644
index e7c3e3c..0000000
--- a/apps/testing/todos-list/cypress/support/component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***********************************************************
-// This example support/component.ts is processed and
-// loaded automatically before your subscription files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.ts using ES2015 syntax:
-import './commands';
diff --git a/apps/testing/todos-list/cypress/tsconfig.json b/apps/testing/todos-list/cypress/tsconfig.json
deleted file mode 100644
index 918d963..0000000
--- a/apps/testing/todos-list/cypress/tsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["cypress", "node"],
-    "sourceMap": false
-  },
-  "include": [
-    "support/**/*.ts",
-    "../cypress.config.ts",
-    "../**/*.cy.ts",
-    "../**/*.cy.tsx",
-    "../**/*.cy.js",
-    "../**/*.cy.jsx",
-    "../**/*.d.ts"
-  ]
-}
diff --git a/apps/testing/todos-list/src/assets/.gitkeep b/apps/testing/todos-list/src/assets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/apps/testing/todos-list/src/favicon.ico b/apps/testing/todos-list/src/favicon.ico
deleted file mode 100644
index 317ebcb..0000000
Binary files a/apps/testing/todos-list/src/favicon.ico and /dev/null differ
diff --git a/apps/testing/todos-list/src/test-setup.ts b/apps/testing/todos-list/src/test-setup.ts
deleted file mode 100644
index 15de72a..0000000
--- a/apps/testing/todos-list/src/test-setup.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@testing-library/jest-dom';
-import 'jest-preset-angular/setup-jest';
diff --git a/apps/testing/todos-list/tsconfig.app.json b/apps/testing/todos-list/tsconfig.app.json
deleted file mode 100644
index 01a02ed..0000000
--- a/apps/testing/todos-list/tsconfig.app.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "types": []
-  },
-  "files": ["src/main.ts"],
-  "include": ["src/**/*.d.ts"],
-  "exclude": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "cypress/**/*",
-    "cypress.config.ts",
-    "**/*.cy.ts",
-    "**/*.cy.js",
-    "**/*.cy.tsx",
-    "**/*.cy.jsx"
-  ]
-}
diff --git a/apps/testing/todos-list/tsconfig.editor.json b/apps/testing/todos-list/tsconfig.editor.json
deleted file mode 100644
index 8ae117d..0000000
--- a/apps/testing/todos-list/tsconfig.editor.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["src/**/*.ts"],
-  "compilerOptions": {
-    "types": ["jest", "node"]
-  }
-}
diff --git a/apps/testing/todos-list/tsconfig.json b/apps/testing/todos-list/tsconfig.json
deleted file mode 100644
index 3879b94..0000000
--- a/apps/testing/todos-list/tsconfig.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "useDefineForClassFields": false,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./tsconfig.editor.json"
-    },
-    {
-      "path": "./cypress/tsconfig.json"
-    }
-  ],
-  "extends": "../../../tsconfig.base.json",
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }
-}
diff --git a/docs/src/content/docs/challenges/angular/4-context-outlet-typed.md b/docs/src/content/docs/challenges/angular/4-typed-context-outlet.md
similarity index 97%
rename from docs/src/content/docs/challenges/angular/4-context-outlet-typed.md
rename to docs/src/content/docs/challenges/angular/4-typed-context-outlet.md
index 1663f1b..2df8dea 100644
--- a/docs/src/content/docs/challenges/angular/4-context-outlet-typed.md
+++ b/docs/src/content/docs/challenges/angular/4-typed-context-outlet.md
@@ -8,7 +8,7 @@ contributors:
   - svenson95
   - jdegand
 challengeNumber: 4
-command: angular-context-outlet-type
+command: angular-typed-context-outlet
 blogLink: https://medium.com/@thomas.laforge/ngtemplateoutlet-type-checking-5d2dcb07a2c6
 sidebar:
   order: 201
diff --git a/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md b/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md
index bbaa486..5f37f91 100644
--- a/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md
+++ b/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md
@@ -6,7 +6,7 @@ contributors:
   - alcaidio
   - svenson95
 challengeNumber: 48
-command: avoid-losing-form-data
+command: forms-avoid-losing-form-data
 sidebar:
   order: 121
   badge: New
diff --git a/docs/src/content/docs/challenges/ngrx/2-effect-selector.md b/docs/src/content/docs/challenges/ngrx/2-effect-selector.md
index d4b13e5..d473409 100644
--- a/docs/src/content/docs/challenges/ngrx/2-effect-selector.md
+++ b/docs/src/content/docs/challenges/ngrx/2-effect-selector.md
@@ -8,7 +8,7 @@ contributors:
   - svenson95
   - jdegand
 challengeNumber: 2
-command: ngrx-effect-selector
+command: ngrx-effect-vs-selector
 blogLink: https://medium.com/@thomas.laforge/ngrx-effect-vs-reducer-vs-selector-58337ab59043
 sidebar:
   order: 113
diff --git a/docs/src/content/docs/challenges/ngrx/7-power-effect.md b/docs/src/content/docs/challenges/ngrx/7-power-effect.md
index cc646e8..305ba50 100644
--- a/docs/src/content/docs/challenges/ngrx/7-power-effect.md
+++ b/docs/src/content/docs/challenges/ngrx/7-power-effect.md
@@ -7,7 +7,7 @@ contributors:
   - tomer953
   - jdegand
 challengeNumber: 7
-command: ngrx-notification
+command: ngrx-power-of-effect
 sidebar:
   order: 206
 ---
diff --git a/docs/src/content/docs/challenges/performance/12-scroll-cd.md b/docs/src/content/docs/challenges/performance/12-optimize-change-detection.md
similarity index 97%
rename from docs/src/content/docs/challenges/performance/12-scroll-cd.md
rename to docs/src/content/docs/challenges/performance/12-optimize-change-detection.md
index e1d5bd1..71276be 100644
--- a/docs/src/content/docs/challenges/performance/12-scroll-cd.md
+++ b/docs/src/content/docs/challenges/performance/12-optimize-change-detection.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 12
-command: performance-scroll-cd
+command: performance-optimize-change-detection
 sidebar:
   order: 107
 ---
diff --git a/docs/src/content/docs/challenges/performance/34-default-onpush.md b/docs/src/content/docs/challenges/performance/34-default-vs-onpush.md
similarity index 98%
rename from docs/src/content/docs/challenges/performance/34-default-onpush.md
rename to docs/src/content/docs/challenges/performance/34-default-vs-onpush.md
index 2817fe7..779af53 100644
--- a/docs/src/content/docs/challenges/performance/34-default-onpush.md
+++ b/docs/src/content/docs/challenges/performance/34-default-vs-onpush.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 34
-command: performance-default-onpush
+command: performance-default-vs-onpush
 sidebar:
   order: 7
 ---
diff --git a/docs/src/content/docs/challenges/performance/35-memoize.md b/docs/src/content/docs/challenges/performance/35-memoization.md
similarity index 98%
rename from docs/src/content/docs/challenges/performance/35-memoize.md
rename to docs/src/content/docs/challenges/performance/35-memoization.md
index c40a4ae..5acff60 100644
--- a/docs/src/content/docs/challenges/performance/35-memoize.md
+++ b/docs/src/content/docs/challenges/performance/35-memoization.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 35
-command: performance-memoized
+command: performance-memoization
 sidebar:
   order: 8
 ---
diff --git a/docs/src/content/docs/challenges/performance/36-ngfor-optimize.md b/docs/src/content/docs/challenges/performance/36-ngfor-optimization.md
similarity index 97%
rename from docs/src/content/docs/challenges/performance/36-ngfor-optimize.md
rename to docs/src/content/docs/challenges/performance/36-ngfor-optimization.md
index 8ac1181..2749a95 100644
--- a/docs/src/content/docs/challenges/performance/36-ngfor-optimize.md
+++ b/docs/src/content/docs/challenges/performance/36-ngfor-optimization.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 36
-command: performance-ngfor-optimize
+command: performance-ngfor-optimization
 sidebar:
   order: 13
 ---
diff --git a/docs/src/content/docs/challenges/performance/37-ngfor-biglist.md b/docs/src/content/docs/challenges/performance/37-optimize-big-list.md
similarity index 97%
rename from docs/src/content/docs/challenges/performance/37-ngfor-biglist.md
rename to docs/src/content/docs/challenges/performance/37-optimize-big-list.md
index cbf07db..5cda87b 100644
--- a/docs/src/content/docs/challenges/performance/37-ngfor-biglist.md
+++ b/docs/src/content/docs/challenges/performance/37-optimize-big-list.md
@@ -6,7 +6,7 @@ contributors:
   - tomalaforge
   - jdegand
 challengeNumber: 37
-command: performance-ngfor-biglist
+command: performance-optimize-big-list
 sidebar:
   order: 117
 ---
diff --git a/docs/src/content/docs/challenges/performance/40-christmas-web-worker.md b/docs/src/content/docs/challenges/performance/40-web-worker.md
similarity index 97%
rename from docs/src/content/docs/challenges/performance/40-christmas-web-worker.md
rename to docs/src/content/docs/challenges/performance/40-web-worker.md
index e25f062..522e19d 100644
--- a/docs/src/content/docs/challenges/performance/40-christmas-web-worker.md
+++ b/docs/src/content/docs/challenges/performance/40-web-worker.md
@@ -6,7 +6,7 @@ contributors:
   - tomalaforge
   - jdegand
 challengeNumber: 40
-command: performance-christmas-web-worker
+command: performance-web-workers
 sidebar:
   order: 119
 ---
diff --git a/docs/src/content/docs/challenges/performance/index.mdx b/docs/src/content/docs/challenges/performance/index.mdx
index 362f7ed..7292737 100644
--- a/docs/src/content/docs/challenges/performance/index.mdx
+++ b/docs/src/content/docs/challenges/performance/index.mdx
@@ -36,17 +36,17 @@ Now that you know how to use the <b>Angular DevTool</b>, you can choose a challe
 <LinkCard
   title="🟢 Default vs OnPush"
   description="Learn the difference between Default and OnPush change detection strategies."
-  href="/challenges/performance/34-default-onpush/"
+  href="/challenges/performance/34-default-vs-onpush/"
 />
 
 <LinkCard
   title="🟢 Memoization"
   description="Learn the power of pure pipes."
-  href="/challenges/performance/35-memoize/"
+  href="/challenges/performance/35-memoization/"
 />
 
 <LinkCard
   title="🟠 Optimize Change Detection"
   description="Learn how to remove zone pollution."
-  href="/challenges/performance/12-scroll-cd/"
+  href="/challenges/performance/12-optimize-change-detection/"
 />
diff --git a/docs/src/content/docs/challenges/rxjs/11-bug-chaining-operator.md b/docs/src/content/docs/challenges/rxjs/11-high-order-operator-bug.md
similarity index 96%
rename from docs/src/content/docs/challenges/rxjs/11-bug-chaining-operator.md
rename to docs/src/content/docs/challenges/rxjs/11-high-order-operator-bug.md
index 25edabb..5523896 100644
--- a/docs/src/content/docs/challenges/rxjs/11-bug-chaining-operator.md
+++ b/docs/src/content/docs/challenges/rxjs/11-high-order-operator-bug.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 11
-command: rxjs-pipe-bug
+command: rxjs-high-order-operator-bug
 sidebar:
   order: 114
 ---
diff --git a/docs/src/content/docs/challenges/rxjs/49-hold-to-send-btn.md b/docs/src/content/docs/challenges/rxjs/49-hold-to-save-button.md
similarity index 98%
rename from docs/src/content/docs/challenges/rxjs/49-hold-to-send-btn.md
rename to docs/src/content/docs/challenges/rxjs/49-hold-to-save-button.md
index ee3f2eb..3081a4d 100644
--- a/docs/src/content/docs/challenges/rxjs/49-hold-to-send-btn.md
+++ b/docs/src/content/docs/challenges/rxjs/49-hold-to-save-button.md
@@ -5,7 +5,7 @@ author: timothy-alcaide
 contributors:
   - alcaidio
 challengeNumber: 49
-command: rxjs-hold-to-save-btn
+command: rxjs-hold-to-save-button
 sidebar:
   order: 19
 ---
diff --git a/docs/src/content/docs/challenges/testing/17-router.md b/docs/src/content/docs/challenges/testing/17-router.md
index 6a282ae..77355ce 100644
--- a/docs/src/content/docs/challenges/testing/17-router.md
+++ b/docs/src/content/docs/challenges/testing/17-router.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 17
-command: testing-router-outlet
+command: testing-router
 sidebar:
   order: 108
 ---
diff --git a/docs/src/content/docs/challenges/testing/18-nested-comp.md b/docs/src/content/docs/challenges/testing/18-nested-components.md
similarity index 98%
rename from docs/src/content/docs/challenges/testing/18-nested-comp.md
rename to docs/src/content/docs/challenges/testing/18-nested-components.md
index 7293121..97f6110 100644
--- a/docs/src/content/docs/challenges/testing/18-nested-comp.md
+++ b/docs/src/content/docs/challenges/testing/18-nested-components.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 18
-command: testing-nested
+command: testing-nested-components
 sidebar:
   order: 109
 ---
diff --git a/docs/src/content/docs/challenges/testing/24-harness-creation.md b/docs/src/content/docs/challenges/testing/24-harness-creation.md
index 26a0ca3..d60456b 100644
--- a/docs/src/content/docs/challenges/testing/24-harness-creation.md
+++ b/docs/src/content/docs/challenges/testing/24-harness-creation.md
@@ -7,7 +7,7 @@ contributors:
   - tomer953
   - jdegand
 challengeNumber: 24
-command: testing-create-harness
+command: testing-harness-creation
 sidebar:
   order: 112
 ---
diff --git a/docs/src/content/docs/challenges/testing/29-real-application.md b/docs/src/content/docs/challenges/testing/29-real-life-application.md
similarity index 98%
rename from docs/src/content/docs/challenges/testing/29-real-application.md
rename to docs/src/content/docs/challenges/testing/29-real-life-application.md
index 1d3c5e4..11b284b 100644
--- a/docs/src/content/docs/challenges/testing/29-real-application.md
+++ b/docs/src/content/docs/challenges/testing/29-real-life-application.md
@@ -7,7 +7,7 @@ contributors:
   - tomer953
   - svenson95
 challengeNumber: 29
-command: testing-todos-list
+command: testing-real-life-application
 sidebar:
   order: 205
 ---
diff --git a/docs/src/content/docs/challenges/testing/index.mdx b/docs/src/content/docs/challenges/testing/index.mdx
index d99f604..97dc590 100644
--- a/docs/src/content/docs/challenges/testing/index.mdx
+++ b/docs/src/content/docs/challenges/testing/index.mdx
@@ -45,7 +45,7 @@ Here is a series of 8 challenges that you can take in any order.
 <LinkCard
   title="🟠 Nested Components"
   description="Learn how to test nested components"
-  href="/challenges/testing/18-nested-comp/"
+  href="/challenges/testing/18-nested-components/"
 />
 
 <LinkCard
@@ -69,5 +69,5 @@ Here is a series of 8 challenges that you can take in any order.
 <LinkCard
   title="🔴 Real-life Application"
   description="Learn how to write a series of test for a real-life applications"
-  href="/challenges/testing/29-real-application/"
+  href="/challenges/testing/29-real-life-application/"
 />
diff --git a/docs/src/content/docs/es/challenges/angular/4-context-outlet-typed.md b/docs/src/content/docs/es/challenges/angular/4-typed-context-outlet.md
similarity index 97%
rename from docs/src/content/docs/es/challenges/angular/4-context-outlet-typed.md
rename to docs/src/content/docs/es/challenges/angular/4-typed-context-outlet.md
index 915aae7..7cd7e95 100644
--- a/docs/src/content/docs/es/challenges/angular/4-context-outlet-typed.md
+++ b/docs/src/content/docs/es/challenges/angular/4-typed-context-outlet.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 4
-command: angular-context-outlet-type
+command: angular-typed-context-outlet
 blogLink: https://medium.com/@thomas.laforge/ngtemplateoutlet-type-checking-5d2dcb07a2c6
 sidebar:
   order: 201
diff --git a/docs/src/content/docs/es/challenges/performance/12-scroll-cd.md b/docs/src/content/docs/es/challenges/performance/12-optimize-change-detection.md
similarity index 97%
rename from docs/src/content/docs/es/challenges/performance/12-scroll-cd.md
rename to docs/src/content/docs/es/challenges/performance/12-optimize-change-detection.md
index 39fed75..7990d89 100644
--- a/docs/src/content/docs/es/challenges/performance/12-scroll-cd.md
+++ b/docs/src/content/docs/es/challenges/performance/12-optimize-change-detection.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - nelsongutidev
 challengeNumber: 12
-command: performance-scroll-cd
+command: performance-optimize-change-detection
 sidebar:
   order: 107
 ---
diff --git a/docs/src/content/docs/es/challenges/performance/34-default-onpush.md b/docs/src/content/docs/es/challenges/performance/34-default-vs-onpush.md
similarity index 98%
rename from docs/src/content/docs/es/challenges/performance/34-default-onpush.md
rename to docs/src/content/docs/es/challenges/performance/34-default-vs-onpush.md
index d33d007..d963672 100644
--- a/docs/src/content/docs/es/challenges/performance/34-default-onpush.md
+++ b/docs/src/content/docs/es/challenges/performance/34-default-vs-onpush.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - nelsongutidev
 challengeNumber: 34
-command: performance-default-onpush
+command: performance-default-vs-onpush
 sidebar:
   order: 7
 ---
diff --git a/docs/src/content/docs/es/challenges/performance/35-memoize.md b/docs/src/content/docs/es/challenges/performance/35-memoization.md
similarity index 98%
rename from docs/src/content/docs/es/challenges/performance/35-memoize.md
rename to docs/src/content/docs/es/challenges/performance/35-memoization.md
index 4cd9b39..89a657f 100644
--- a/docs/src/content/docs/es/challenges/performance/35-memoize.md
+++ b/docs/src/content/docs/es/challenges/performance/35-memoization.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - nelsongutidev
 challengeNumber: 35
-command: performance-memoized
+command: performance-memoization
 sidebar:
   order: 8
 ---
diff --git a/docs/src/content/docs/es/challenges/performance/36-ngfor-optimize.md b/docs/src/content/docs/es/challenges/performance/36-ngfor-optimization.md
similarity index 97%
rename from docs/src/content/docs/es/challenges/performance/36-ngfor-optimize.md
rename to docs/src/content/docs/es/challenges/performance/36-ngfor-optimization.md
index 7b70859..ae7ae79 100644
--- a/docs/src/content/docs/es/challenges/performance/36-ngfor-optimize.md
+++ b/docs/src/content/docs/es/challenges/performance/36-ngfor-optimization.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - nelsongutidev
 challengeNumber: 36
-command: performance-ngfor-optimize
+command: performance-ngfor-optimization
 sidebar:
   order: 13
 ---
diff --git a/docs/src/content/docs/es/challenges/performance/37-ngfor-biglist.md b/docs/src/content/docs/es/challenges/performance/37-optimize-big-list.md
similarity index 97%
rename from docs/src/content/docs/es/challenges/performance/37-ngfor-biglist.md
rename to docs/src/content/docs/es/challenges/performance/37-optimize-big-list.md
index 93ea09e..e1ac099 100644
--- a/docs/src/content/docs/es/challenges/performance/37-ngfor-biglist.md
+++ b/docs/src/content/docs/es/challenges/performance/37-optimize-big-list.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - nelsongutidev
 challengeNumber: 37
-command: performance-ngfor-biglist
+command: performance-optimize-big-list
 sidebar:
   order: 117
 ---
diff --git a/docs/src/content/docs/es/challenges/performance/index.mdx b/docs/src/content/docs/es/challenges/performance/index.mdx
index 6a15106..b5a6903 100644
--- a/docs/src/content/docs/es/challenges/performance/index.mdx
+++ b/docs/src/content/docs/es/challenges/performance/index.mdx
@@ -35,17 +35,17 @@ Ahora que sabes cómo usar la Angular DevTool, puedes elegir un desafío, perfil
 <LinkCard
   title="🟢 Default vs OnPush"
   description="Aprende la diferencia entre las estrategias de detección de cambios Default y OnPush."
-  href="/es/challenges/performance/34-default-onpush/"
+  href="/es/challenges/performance/34-default-vs-onpush/"
 />
 
 <LinkCard
   title="🟢 Memoización"
   description="Aprende sobre el poder de los pure pipes."
-  href="/es/challenges/performance/35-memoize/"
+  href="/es/challenges/performance/35-memoization/"
 />
 
 <LinkCard
   title="🟠 Optimizando el Change Detection"
   description="Aprende sobre como optimizar tu aplicacion entendiendo bien el change detection en Angular"
-  href="/es/challenges/performance/12-scroll-cd/"
+  href="/es/challenges/performance/12-optimize-change-detection/"
 />
diff --git a/docs/src/content/docs/pt/challenges/angular/4-context-outlet-typed.md b/docs/src/content/docs/pt/challenges/angular/4-typed-context-outlet.md
similarity index 97%
rename from docs/src/content/docs/pt/challenges/angular/4-context-outlet-typed.md
rename to docs/src/content/docs/pt/challenges/angular/4-typed-context-outlet.md
index 0a52b68..63dff6a 100644
--- a/docs/src/content/docs/pt/challenges/angular/4-context-outlet-typed.md
+++ b/docs/src/content/docs/pt/challenges/angular/4-typed-context-outlet.md
@@ -8,7 +8,7 @@ contributors:
   - svenson95
   - jdegand
 challengeNumber: 4
-command: angular-context-outlet-type
+command: angular-typed-context-outlet
 blogLink: https://medium.com/@thomas.laforge/ngtemplateoutlet-type-checking-5d2dcb07a2c6
 sidebar:
   order: 201
diff --git a/docs/src/content/docs/ru/challenges/angular/4-context-outlet-typed.md b/docs/src/content/docs/ru/challenges/angular/4-typed-context-outlet.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/angular/4-context-outlet-typed.md
rename to docs/src/content/docs/ru/challenges/angular/4-typed-context-outlet.md
index ca73a05..7ff155e 100644
--- a/docs/src/content/docs/ru/challenges/angular/4-context-outlet-typed.md
+++ b/docs/src/content/docs/ru/challenges/angular/4-typed-context-outlet.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - stillst
 challengeNumber: 4
-command: angular-context-outlet-type
+command: angular-typed-context-outlet
 blogLink: https://medium.com/@thomas.laforge/ngtemplateoutlet-type-checking-5d2dcb07a2c6
 sidebar:
   order: 201
diff --git a/docs/src/content/docs/ru/challenges/performance/12-scroll-cd.md b/docs/src/content/docs/ru/challenges/performance/12-optimize-change-detection.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/performance/12-scroll-cd.md
rename to docs/src/content/docs/ru/challenges/performance/12-optimize-change-detection.md
index d23106b..e79736b 100644
--- a/docs/src/content/docs/ru/challenges/performance/12-scroll-cd.md
+++ b/docs/src/content/docs/ru/challenges/performance/12-optimize-change-detection.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - Dinozavvvr
 challengeNumber: 12
-command: performance-scroll-cd
+command: performance-optimize-change-detection
 sidebar:
   order: 107
 ---
diff --git a/docs/src/content/docs/ru/challenges/performance/34-default-onpush.md b/docs/src/content/docs/ru/challenges/performance/34-default-vs-onpush.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/performance/34-default-onpush.md
rename to docs/src/content/docs/ru/challenges/performance/34-default-vs-onpush.md
index c049bf9..44f3be4 100644
--- a/docs/src/content/docs/ru/challenges/performance/34-default-onpush.md
+++ b/docs/src/content/docs/ru/challenges/performance/34-default-vs-onpush.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - webbomj
 challengeNumber: 34
-command: performance-default-onpush
+command: performance-default-vs-onpush
 sidebar:
   order: 7
 ---
diff --git a/docs/src/content/docs/ru/challenges/performance/35-memoize.md b/docs/src/content/docs/ru/challenges/performance/35-memoization.md
similarity index 99%
rename from docs/src/content/docs/ru/challenges/performance/35-memoize.md
rename to docs/src/content/docs/ru/challenges/performance/35-memoization.md
index 5ff5d5a..5240262 100644
--- a/docs/src/content/docs/ru/challenges/performance/35-memoize.md
+++ b/docs/src/content/docs/ru/challenges/performance/35-memoization.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - webbomj
 challengeNumber: 35
-command: performance-memoized
+command: performance-memoization
 sidebar:
   order: 8
 ---
diff --git a/docs/src/content/docs/ru/challenges/performance/36-ngfor-optimize.md b/docs/src/content/docs/ru/challenges/performance/36-ngfor-optimization.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/performance/36-ngfor-optimize.md
rename to docs/src/content/docs/ru/challenges/performance/36-ngfor-optimization.md
index 244d14f..60949b7 100644
--- a/docs/src/content/docs/ru/challenges/performance/36-ngfor-optimize.md
+++ b/docs/src/content/docs/ru/challenges/performance/36-ngfor-optimization.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - webbomj
 challengeNumber: 36
-command: performance-ngfor-optimize
+command: performance-ngfor-optimization
 sidebar:
   order: 13
 ---
diff --git a/docs/src/content/docs/ru/challenges/performance/37-ngfor-biglist.md b/docs/src/content/docs/ru/challenges/performance/37-optimize-big-list.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/performance/37-ngfor-biglist.md
rename to docs/src/content/docs/ru/challenges/performance/37-optimize-big-list.md
index 3624ba9..97f41b7 100644
--- a/docs/src/content/docs/ru/challenges/performance/37-ngfor-biglist.md
+++ b/docs/src/content/docs/ru/challenges/performance/37-optimize-big-list.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - Dinozavvvr
 challengeNumber: 37
-command: performance-ngfor-biglist
+command: performance-optimize-big-list
 sidebar:
   order: 117
 ---
diff --git a/docs/src/content/docs/ru/challenges/performance/40-christmas-web-worker.md b/docs/src/content/docs/ru/challenges/performance/40-web-worker.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/performance/40-christmas-web-worker.md
rename to docs/src/content/docs/ru/challenges/performance/40-web-worker.md
index 25eda47..3d595a1 100644
--- a/docs/src/content/docs/ru/challenges/performance/40-christmas-web-worker.md
+++ b/docs/src/content/docs/ru/challenges/performance/40-web-worker.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - stillst
 challengeNumber: 40
-command: performance-christmas-web-worker
+command: performance-web-worker
 sidebar:
   order: 119
 ---
diff --git a/docs/src/content/docs/ru/challenges/performance/index.mdx b/docs/src/content/docs/ru/challenges/performance/index.mdx
index 2a7236e..53a7dc7 100644
--- a/docs/src/content/docs/ru/challenges/performance/index.mdx
+++ b/docs/src/content/docs/ru/challenges/performance/index.mdx
@@ -35,17 +35,17 @@ import { LinkCard } from '@astrojs/starlight/components';
 <LinkCard
   title="🟢 Default vs OnPush"
   description="Узнайте разницу между стратегиями обнаружения изменений по умолчанию и OnPush."
-  href="/challenges/performance/34-default-onpush/"
+  href="/challenges/performance/34-default-vs-onpush/"
 />
 
 <LinkCard
   title="🟢 Мемоизация"
   description="Узнайте силу чистых каналов."
-  href="/challenges/performance/35-memoize/"
+  href="/challenges/performance/35-memoization/"
 />
 
 <LinkCard
   title="🟠 Оптимизация обнаружения изменений"
   description="Узнайте, как убрать загрязнение зон."
-  href="/challenges/performance/12-scroll-cd/"
+  href="/challenges/performance/12-optimize-change-detection/"
 />
diff --git a/docs/src/content/docs/ru/challenges/rxjs/11-bug-chaining-operator.md b/docs/src/content/docs/ru/challenges/rxjs/11-high-order-operator-bug.md
similarity index 97%
rename from docs/src/content/docs/ru/challenges/rxjs/11-bug-chaining-operator.md
rename to docs/src/content/docs/ru/challenges/rxjs/11-high-order-operator-bug.md
index 18cd74e..f714016 100644
--- a/docs/src/content/docs/ru/challenges/rxjs/11-bug-chaining-operator.md
+++ b/docs/src/content/docs/ru/challenges/rxjs/11-high-order-operator-bug.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - Dinozavvvr
 challengeNumber: 11
-command: rxjs-pipe-bug
+command: rxjs-high-order-operator-bug
 sidebar:
   order: 114
 ---
diff --git a/docs/src/content/docs/ru/challenges/testing/17-router.md b/docs/src/content/docs/ru/challenges/testing/17-router.md
index 31f112c..118d52e 100644
--- a/docs/src/content/docs/ru/challenges/testing/17-router.md
+++ b/docs/src/content/docs/ru/challenges/testing/17-router.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - Dinozavvvr
 challengeNumber: 17
-command: testing-router-outlet
+command: testing-router
 sidebar:
   order: 108
 ---
diff --git a/docs/src/content/docs/ru/challenges/testing/18-nested-comp.md b/docs/src/content/docs/ru/challenges/testing/18-nested-components.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/testing/18-nested-comp.md
rename to docs/src/content/docs/ru/challenges/testing/18-nested-components.md
index 4635ad5..5458378 100644
--- a/docs/src/content/docs/ru/challenges/testing/18-nested-comp.md
+++ b/docs/src/content/docs/ru/challenges/testing/18-nested-components.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - Dinozavvvr
 challengeNumber: 18
-command: testing-nested
+command: testing-nested-components
 sidebar:
   order: 109
 ---
diff --git a/docs/src/content/docs/ru/challenges/testing/24-harness-creation.md b/docs/src/content/docs/ru/challenges/testing/24-harness-creation.md
index e0c0cab..130d57c 100644
--- a/docs/src/content/docs/ru/challenges/testing/24-harness-creation.md
+++ b/docs/src/content/docs/ru/challenges/testing/24-harness-creation.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - Dinozavvvr
 challengeNumber: 24
-command: testing-create-harness
+command: testing-harness-creation
 sidebar:
   order: 112
 ---
diff --git a/docs/src/content/docs/ru/challenges/testing/29-real-application.md b/docs/src/content/docs/ru/challenges/testing/29-real-life-application.md
similarity index 99%
rename from docs/src/content/docs/ru/challenges/testing/29-real-application.md
rename to docs/src/content/docs/ru/challenges/testing/29-real-life-application.md
index e9cbef0..f03c089 100644
--- a/docs/src/content/docs/ru/challenges/testing/29-real-application.md
+++ b/docs/src/content/docs/ru/challenges/testing/29-real-life-application.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - Dinozavvvr
 challengeNumber: 29
-command: testing-todos-list
+command: testing-real-life-application
 sidebar:
   order: 205
 ---
diff --git a/docs/src/content/docs/ru/challenges/testing/index.mdx b/docs/src/content/docs/ru/challenges/testing/index.mdx
index 7af2693..508c4b5 100644
--- a/docs/src/content/docs/ru/challenges/testing/index.mdx
+++ b/docs/src/content/docs/ru/challenges/testing/index.mdx
@@ -45,7 +45,7 @@ import { LinkCard } from '@astrojs/starlight/components';
 <LinkCard
   title="🟠 Nested Components"
   description="Узнайте, как тестировать вложенные компоненты"
-  href="/challenges/testing/18-nested-comp/"
+  href="/challenges/testing/18-nested-components/"
 />
 
 <LinkCard
@@ -69,5 +69,5 @@ import { LinkCard } from '@astrojs/starlight/components';
 <LinkCard
   title="🔴 Реальное приложение"
   description="Узнайте, как написать серию тестов для реальных приложений"
-  href="/challenges/testing/29-real-application/"
+  href="/challenges/testing/29-real-life-application/"
 />
diff --git a/apps/testing/todos-list/.eslintrc.json b/libs/shared/ui/.eslintrc.json
similarity index 90%
rename from apps/testing/todos-list/.eslintrc.json
rename to libs/shared/ui/.eslintrc.json
index bf8df14..9247a6e 100644
--- a/apps/testing/todos-list/.eslintrc.json
+++ b/libs/shared/ui/.eslintrc.json
@@ -4,12 +4,16 @@
   "overrides": [
     {
       "files": ["*.ts"],
+      "extends": [
+        "plugin:@nx/angular",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
           {
             "type": "attribute",
-            "prefix": "app",
+            "prefix": "lib",
             "style": "camelCase"
           }
         ],
@@ -17,15 +21,11 @@
           "error",
           {
             "type": "element",
-            "prefix": "app",
+            "prefix": "lib",
             "style": "kebab-case"
           }
         ]
-      },
-      "extends": [
-        "plugin:@nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ]
+      }
     },
     {
       "files": ["*.html"],
diff --git a/libs/shared/ui/README.md b/libs/shared/ui/README.md
new file mode 100644
index 0000000..5975fa4
--- /dev/null
+++ b/libs/shared/ui/README.md
@@ -0,0 +1,3 @@
+# ui
+
+This library was generated with [Nx](https://nx.dev).
diff --git a/libs/shared/ui/project.json b/libs/shared/ui/project.json
new file mode 100644
index 0000000..874c0b0
--- /dev/null
+++ b/libs/shared/ui/project.json
@@ -0,0 +1,13 @@
+{
+  "name": "ui",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/shared/ui/src",
+  "prefix": "lib",
+  "tags": [],
+  "projectType": "library",
+  "targets": {
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    }
+  }
+}
diff --git a/apps/angular/16-master-dependency-injection/src/index.ts b/libs/shared/ui/src/index.ts
similarity index 100%
rename from apps/angular/16-master-dependency-injection/src/index.ts
rename to libs/shared/ui/src/index.ts
diff --git a/apps/angular/16-master-dependency-injection/src/lib/table.component.ts b/libs/shared/ui/src/lib/table.component.ts
similarity index 100%
rename from apps/angular/16-master-dependency-injection/src/lib/table.component.ts
rename to libs/shared/ui/src/lib/table.component.ts
diff --git a/libs/shared/ui/tsconfig.json b/libs/shared/ui/tsconfig.json
new file mode 100644
index 0000000..8e62d6d
--- /dev/null
+++ b/libs/shared/ui/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "useDefineForClassFields": false,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json",
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  }
+}
diff --git a/apps/angular/16-master-dependency-injection/tsconfig.lib.json b/libs/shared/ui/tsconfig.lib.json
similarity index 66%
rename from apps/angular/16-master-dependency-injection/tsconfig.lib.json
rename to libs/shared/ui/tsconfig.lib.json
index 9b49be7..f68063a 100644
--- a/apps/angular/16-master-dependency-injection/tsconfig.lib.json
+++ b/libs/shared/ui/tsconfig.lib.json
@@ -7,11 +7,6 @@
     "inlineSources": true,
     "types": []
   },
-  "exclude": [
-    "src/**/*.spec.ts",
-    "src/test-setup.ts",
-    "jest.config.ts",
-    "src/**/*.test.ts"
-  ],
+  "exclude": ["src/**/*.spec.ts", "jest.config.ts", "src/**/*.test.ts"],
   "include": ["src/**/*.ts"]
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 8c59d87..9425ed0 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -66,6 +66,7 @@
       "@angular-challenges/shared/directives": [
         "libs/shared/directives/src/index.ts"
       ],
+      "@angular-challenges/shared/ui": ["libs/shared/ui/src/index.ts"],
       "@angular-challenges/shared/utils": ["libs/shared/utils/src/index.ts"],
       "@angular-challenges/static-dynamic-import/users": [
         "libs/static-dynamic-import/users/src/index.ts"