diff --git a/apps/angular/crud/.eslintrc.json b/apps/angular/10-utility-wrapper-pipe/.eslintrc.json
similarity index 100%
rename from apps/angular/crud/.eslintrc.json
rename to apps/angular/10-utility-wrapper-pipe/.eslintrc.json
diff --git a/apps/angular/pipe-hard/README.md b/apps/angular/10-utility-wrapper-pipe/README.md
similarity index 84%
rename from apps/angular/pipe-hard/README.md
rename to apps/angular/10-utility-wrapper-pipe/README.md
index ba801bd..aac4262 100644
--- a/apps/angular/pipe-hard/README.md
+++ b/apps/angular/10-utility-wrapper-pipe/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-pipe-hard
+npx nx serve angular-utility-wrapper-pipe
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/ngfor-enhancement/project.json b/apps/angular/10-utility-wrapper-pipe/project.json
similarity index 63%
rename from apps/angular/ngfor-enhancement/project.json
rename to apps/angular/10-utility-wrapper-pipe/project.json
index 80c089c..4946170 100644
--- a/apps/angular/ngfor-enhancement/project.json
+++ b/apps/angular/10-utility-wrapper-pipe/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-ngfor-enhancement",
+  "name": "angular-utility-wrapper-pipe",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/ngfor-enhancement/src",
+  "sourceRoot": "apps/angular/10-utility-wrapper-pipe/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/ngfor-enhancement",
-        "index": "apps/angular/ngfor-enhancement/src/index.html",
-        "main": "apps/angular/ngfor-enhancement/src/main.ts",
-        "polyfills": "apps/angular/ngfor-enhancement/src/polyfills.ts",
-        "tsConfig": "apps/angular/ngfor-enhancement/tsconfig.app.json",
+        "outputPath": "dist/apps/angular/10-utility-wrapper-pipe",
+        "index": "apps/angular/10-utility-wrapper-pipe/src/index.html",
+        "main": "apps/angular/10-utility-wrapper-pipe/src/main.ts",
+        "polyfills": "apps/angular/10-utility-wrapper-pipe/src/polyfills.ts",
+        "tsConfig": "apps/angular/10-utility-wrapper-pipe/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/ngfor-enhancement/src/favicon.ico",
-          "apps/angular/ngfor-enhancement/src/assets"
+          "apps/angular/10-utility-wrapper-pipe/src/favicon.ico",
+          "apps/angular/10-utility-wrapper-pipe/src/assets"
         ],
-        "styles": ["apps/angular/ngfor-enhancement/src/styles.scss"],
+        "styles": ["apps/angular/10-utility-wrapper-pipe/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-ngfor-enhancement:build:production"
+          "buildTarget": "angular-utility-wrapper-pipe:build:production"
         },
         "development": {
-          "buildTarget": "angular-ngfor-enhancement:build:development"
+          "buildTarget": "angular-utility-wrapper-pipe:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-ngfor-enhancement:build"
+        "buildTarget": "angular-utility-wrapper-pipe:build"
       }
     },
     "lint": {
diff --git a/apps/angular/pipe-hard/src/app/app.component.ts b/apps/angular/10-utility-wrapper-pipe/src/app/app.component.ts
similarity index 100%
rename from apps/angular/pipe-hard/src/app/app.component.ts
rename to apps/angular/10-utility-wrapper-pipe/src/app/app.component.ts
diff --git a/apps/angular/pipe-hard/src/app/person.utils.ts b/apps/angular/10-utility-wrapper-pipe/src/app/person.utils.ts
similarity index 100%
rename from apps/angular/pipe-hard/src/app/person.utils.ts
rename to apps/angular/10-utility-wrapper-pipe/src/app/person.utils.ts
diff --git a/apps/angular/bug-cd/src/assets/.gitkeep b/apps/angular/10-utility-wrapper-pipe/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/bug-cd/src/assets/.gitkeep
rename to apps/angular/10-utility-wrapper-pipe/src/assets/.gitkeep
diff --git a/apps/angular/bug-cd/src/favicon.ico b/apps/angular/10-utility-wrapper-pipe/src/favicon.ico
similarity index 100%
rename from apps/angular/bug-cd/src/favicon.ico
rename to apps/angular/10-utility-wrapper-pipe/src/favicon.ico
diff --git a/apps/angular/pipe-hard/src/index.html b/apps/angular/10-utility-wrapper-pipe/src/index.html
similarity index 100%
rename from apps/angular/pipe-hard/src/index.html
rename to apps/angular/10-utility-wrapper-pipe/src/index.html
diff --git a/apps/angular/decoupling/src/main.ts b/apps/angular/10-utility-wrapper-pipe/src/main.ts
similarity index 100%
rename from apps/angular/decoupling/src/main.ts
rename to apps/angular/10-utility-wrapper-pipe/src/main.ts
diff --git a/apps/angular/crud/src/polyfills.ts b/apps/angular/10-utility-wrapper-pipe/src/polyfills.ts
similarity index 100%
rename from apps/angular/crud/src/polyfills.ts
rename to apps/angular/10-utility-wrapper-pipe/src/polyfills.ts
diff --git a/apps/angular/ngfor-enhancement/src/styles.scss b/apps/angular/10-utility-wrapper-pipe/src/styles.scss
similarity index 100%
rename from apps/angular/ngfor-enhancement/src/styles.scss
rename to apps/angular/10-utility-wrapper-pipe/src/styles.scss
diff --git a/apps/angular/crud/tsconfig.app.json b/apps/angular/10-utility-wrapper-pipe/tsconfig.app.json
similarity index 100%
rename from apps/angular/crud/tsconfig.app.json
rename to apps/angular/10-utility-wrapper-pipe/tsconfig.app.json
diff --git a/apps/angular/crud/tsconfig.editor.json b/apps/angular/10-utility-wrapper-pipe/tsconfig.editor.json
similarity index 100%
rename from apps/angular/crud/tsconfig.editor.json
rename to apps/angular/10-utility-wrapper-pipe/tsconfig.editor.json
diff --git a/apps/angular/ngfor-enhancement/tsconfig.json b/apps/angular/10-utility-wrapper-pipe/tsconfig.json
similarity index 100%
rename from apps/angular/ngfor-enhancement/tsconfig.json
rename to apps/angular/10-utility-wrapper-pipe/tsconfig.json
diff --git a/apps/angular/bug-cd/.eslintrc.json b/apps/angular/13-highly-customizable-css/.eslintrc.json
similarity index 100%
rename from apps/angular/bug-cd/.eslintrc.json
rename to apps/angular/13-highly-customizable-css/.eslintrc.json
diff --git a/apps/angular/styling/README.md b/apps/angular/13-highly-customizable-css/README.md
similarity index 83%
rename from apps/angular/styling/README.md
rename to apps/angular/13-highly-customizable-css/README.md
index d47efe3..d63171a 100644
--- a/apps/angular/styling/README.md
+++ b/apps/angular/13-highly-customizable-css/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-styling
+npx nx serve angular-highly-customizable-css
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/styling/project.json b/apps/angular/13-highly-customizable-css/project.json
similarity index 64%
rename from apps/angular/styling/project.json
rename to apps/angular/13-highly-customizable-css/project.json
index de96846..aa4ecb3 100644
--- a/apps/angular/styling/project.json
+++ b/apps/angular/13-highly-customizable-css/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-styling",
+  "name": "angular-highly-customizable-css",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/styling/src",
+  "sourceRoot": "apps/angular/13-highly-customizable-css/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/styling",
-        "index": "apps/angular/styling/src/index.html",
-        "main": "apps/angular/styling/src/main.ts",
+        "outputPath": "dist/apps/angular/13-highly-customizable-css",
+        "index": "apps/angular/13-highly-customizable-css/src/index.html",
+        "main": "apps/angular/13-highly-customizable-css/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/styling/tsconfig.app.json",
+        "tsConfig": "apps/angular/13-highly-customizable-css/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/styling/src/favicon.ico",
-          "apps/angular/styling/src/assets"
+          "apps/angular/13-highly-customizable-css/src/favicon.ico",
+          "apps/angular/13-highly-customizable-css/src/assets"
         ],
-        "styles": ["apps/angular/styling/src/styles.scss"],
+        "styles": ["apps/angular/13-highly-customizable-css/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-styling:build:production"
+          "buildTarget": "angular-highly-customizable-css:build:production"
         },
         "development": {
-          "buildTarget": "angular-styling:build:development"
+          "buildTarget": "angular-highly-customizable-css:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-styling:build"
+        "buildTarget": "angular-highly-customizable-css:build"
       }
     },
     "lint": {
diff --git a/apps/angular/styling/src/app/page.component.ts b/apps/angular/13-highly-customizable-css/src/app/page.component.ts
similarity index 100%
rename from apps/angular/styling/src/app/page.component.ts
rename to apps/angular/13-highly-customizable-css/src/app/page.component.ts
diff --git a/apps/angular/styling/src/app/static-text.component.ts b/apps/angular/13-highly-customizable-css/src/app/static-text.component.ts
similarity index 100%
rename from apps/angular/styling/src/app/static-text.component.ts
rename to apps/angular/13-highly-customizable-css/src/app/static-text.component.ts
diff --git a/apps/angular/styling/src/app/text.component.ts b/apps/angular/13-highly-customizable-css/src/app/text.component.ts
similarity index 100%
rename from apps/angular/styling/src/app/text.component.ts
rename to apps/angular/13-highly-customizable-css/src/app/text.component.ts
diff --git a/apps/angular/crud/src/assets/.gitkeep b/apps/angular/13-highly-customizable-css/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/crud/src/assets/.gitkeep
rename to apps/angular/13-highly-customizable-css/src/assets/.gitkeep
diff --git a/apps/angular/crud/src/favicon.ico b/apps/angular/13-highly-customizable-css/src/favicon.ico
similarity index 100%
rename from apps/angular/crud/src/favicon.ico
rename to apps/angular/13-highly-customizable-css/src/favicon.ico
diff --git a/apps/angular/styling/src/index.html b/apps/angular/13-highly-customizable-css/src/index.html
similarity index 100%
rename from apps/angular/styling/src/index.html
rename to apps/angular/13-highly-customizable-css/src/index.html
diff --git a/apps/angular/styling/src/main.ts b/apps/angular/13-highly-customizable-css/src/main.ts
similarity index 100%
rename from apps/angular/styling/src/main.ts
rename to apps/angular/13-highly-customizable-css/src/main.ts
diff --git a/apps/angular/pipe-easy/src/styles.scss b/apps/angular/13-highly-customizable-css/src/styles.scss
similarity index 100%
rename from apps/angular/pipe-easy/src/styles.scss
rename to apps/angular/13-highly-customizable-css/src/styles.scss
diff --git a/apps/angular/bug-cd/tsconfig.app.json b/apps/angular/13-highly-customizable-css/tsconfig.app.json
similarity index 100%
rename from apps/angular/bug-cd/tsconfig.app.json
rename to apps/angular/13-highly-customizable-css/tsconfig.app.json
diff --git a/apps/angular/router-input/tsconfig.editor.json b/apps/angular/13-highly-customizable-css/tsconfig.editor.json
similarity index 100%
rename from apps/angular/router-input/tsconfig.editor.json
rename to apps/angular/13-highly-customizable-css/tsconfig.editor.json
diff --git a/apps/angular/decoupling/tsconfig.json b/apps/angular/13-highly-customizable-css/tsconfig.json
similarity index 100%
rename from apps/angular/decoupling/tsconfig.json
rename to apps/angular/13-highly-customizable-css/tsconfig.json
diff --git a/libs/angular/di/.eslintrc.json b/apps/angular/16-master-dependency-injection/.eslintrc.json
similarity index 100%
rename from libs/angular/di/.eslintrc.json
rename to apps/angular/16-master-dependency-injection/.eslintrc.json
diff --git a/apps/angular/16-master-dependency-injection/README.md b/apps/angular/16-master-dependency-injection/README.md
new file mode 100644
index 0000000..8006b8b
--- /dev/null
+++ b/apps/angular/16-master-dependency-injection/README.md
@@ -0,0 +1,7 @@
+# angular-master-dependency-injection
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test angular-master-dependency-injection` to execute the unit tests.
diff --git a/apps/angular/16-master-dependency-injection/jest.config.ts b/apps/angular/16-master-dependency-injection/jest.config.ts
new file mode 100644
index 0000000..d2e0abf
--- /dev/null
+++ b/apps/angular/16-master-dependency-injection/jest.config.ts
@@ -0,0 +1,23 @@
+/* eslint-disable */
+export default {
+  displayName: 'angular-master-dependency-injection',
+  preset: '../../../jest.preset.js',
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+  coverageDirectory:
+    '../../../coverage/apps/angular/16-master-dependency-injection',
+  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/libs/angular/di/ng-package.json b/apps/angular/16-master-dependency-injection/ng-package.json
similarity index 63%
rename from libs/angular/di/ng-package.json
rename to apps/angular/16-master-dependency-injection/ng-package.json
index 312bafb..46dbaea 100644
--- a/libs/angular/di/ng-package.json
+++ b/apps/angular/16-master-dependency-injection/ng-package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../../dist/libs/angular/di",
+  "dest": "../../../dist/apps/angular/16-master-dependency-injection",
   "lib": {
     "entryFile": "src/index.ts"
   }
diff --git a/libs/angular/di/package.json b/apps/angular/16-master-dependency-injection/package.json
similarity index 79%
rename from libs/angular/di/package.json
rename to apps/angular/16-master-dependency-injection/package.json
index cc70af2..9601192 100644
--- a/libs/angular/di/package.json
+++ b/apps/angular/16-master-dependency-injection/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "angular/di",
+  "name": "angular-master-dependency-injection",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^16.2.0",
diff --git a/libs/angular/di/project.json b/apps/angular/16-master-dependency-injection/project.json
similarity index 58%
rename from libs/angular/di/project.json
rename to apps/angular/16-master-dependency-injection/project.json
index e2ed556..dfa28e0 100644
--- a/libs/angular/di/project.json
+++ b/apps/angular/16-master-dependency-injection/project.json
@@ -1,7 +1,7 @@
 {
-  "name": "angular/di",
+  "name": "angular-master-dependency-injection",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/angular/di/src",
+  "sourceRoot": "apps/angular/16-master-dependency-injection/src",
   "prefix": "lib",
   "tags": [],
   "projectType": "library",
@@ -10,14 +10,14 @@
       "executor": "@nx/angular:ng-packagr-lite",
       "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
       "options": {
-        "project": "libs/angular/di/ng-package.json"
+        "project": "apps/angular/16-master-dependency-injection/ng-package.json"
       },
       "configurations": {
         "production": {
-          "tsConfig": "libs/angular/di/tsconfig.lib.prod.json"
+          "tsConfig": "apps/angular/16-master-dependency-injection/tsconfig.lib.prod.json"
         },
         "development": {
-          "tsConfig": "libs/angular/di/tsconfig.lib.json"
+          "tsConfig": "apps/angular/16-master-dependency-injection/tsconfig.lib.json"
         }
       },
       "defaultConfiguration": "production"
@@ -26,7 +26,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/angular/di/jest.config.ts"
+        "jestConfig": "apps/angular/16-master-dependency-injection/jest.config.ts"
       }
     },
     "lint": {
diff --git a/libs/angular/di/src/index.ts b/apps/angular/16-master-dependency-injection/src/index.ts
similarity index 100%
rename from libs/angular/di/src/index.ts
rename to apps/angular/16-master-dependency-injection/src/index.ts
diff --git a/libs/angular/di/src/lib/table.component.ts b/apps/angular/16-master-dependency-injection/src/lib/table.component.ts
similarity index 100%
rename from libs/angular/di/src/lib/table.component.ts
rename to apps/angular/16-master-dependency-injection/src/lib/table.component.ts
diff --git a/libs/angular/di/src/test-setup.ts b/apps/angular/16-master-dependency-injection/src/test-setup.ts
similarity index 100%
rename from libs/angular/di/src/test-setup.ts
rename to apps/angular/16-master-dependency-injection/src/test-setup.ts
diff --git a/libs/angular/di/tsconfig.json b/apps/angular/16-master-dependency-injection/tsconfig.json
similarity index 100%
rename from libs/angular/di/tsconfig.json
rename to apps/angular/16-master-dependency-injection/tsconfig.json
diff --git a/libs/angular/di/tsconfig.lib.json b/apps/angular/16-master-dependency-injection/tsconfig.lib.json
similarity index 100%
rename from libs/angular/di/tsconfig.lib.json
rename to apps/angular/16-master-dependency-injection/tsconfig.lib.json
diff --git a/libs/angular/di/tsconfig.lib.prod.json b/apps/angular/16-master-dependency-injection/tsconfig.lib.prod.json
similarity index 100%
rename from libs/angular/di/tsconfig.lib.prod.json
rename to apps/angular/16-master-dependency-injection/tsconfig.lib.prod.json
diff --git a/libs/angular/di/tsconfig.spec.json b/apps/angular/16-master-dependency-injection/tsconfig.spec.json
similarity index 100%
rename from libs/angular/di/tsconfig.spec.json
rename to apps/angular/16-master-dependency-injection/tsconfig.spec.json
diff --git a/apps/angular/decoupling/.eslintrc.json b/apps/angular/22-router-input/.eslintrc.json
similarity index 100%
rename from apps/angular/decoupling/.eslintrc.json
rename to apps/angular/22-router-input/.eslintrc.json
diff --git a/apps/angular/router-input/README.md b/apps/angular/22-router-input/README.md
similarity index 100%
rename from apps/angular/router-input/README.md
rename to apps/angular/22-router-input/README.md
diff --git a/apps/angular/router-input/project.json b/apps/angular/22-router-input/project.json
similarity index 78%
rename from apps/angular/router-input/project.json
rename to apps/angular/22-router-input/project.json
index 523fff0..1f14dbe 100644
--- a/apps/angular/router-input/project.json
+++ b/apps/angular/22-router-input/project.json
@@ -3,23 +3,23 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/router-input/src",
+  "sourceRoot": "apps/angular/22-router-input/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/router-input",
-        "index": "apps/angular/router-input/src/index.html",
-        "main": "apps/angular/router-input/src/main.ts",
+        "outputPath": "dist/apps/angular/22-router-input",
+        "index": "apps/angular/22-router-input/src/index.html",
+        "main": "apps/angular/22-router-input/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/router-input/tsconfig.app.json",
+        "tsConfig": "apps/angular/22-router-input/tsconfig.app.json",
         "assets": [
-          "apps/angular/router-input/src/favicon.ico",
-          "apps/angular/router-input/src/assets"
+          "apps/angular/22-router-input/src/favicon.ico",
+          "apps/angular/22-router-input/src/assets"
         ],
-        "styles": ["apps/angular/router-input/src/styles.scss"],
+        "styles": ["apps/angular/22-router-input/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
diff --git a/apps/angular/router-input/src/app/app.component.ts b/apps/angular/22-router-input/src/app/app.component.ts
similarity index 100%
rename from apps/angular/router-input/src/app/app.component.ts
rename to apps/angular/22-router-input/src/app/app.component.ts
diff --git a/apps/angular/router-input/src/app/app.config.ts b/apps/angular/22-router-input/src/app/app.config.ts
similarity index 100%
rename from apps/angular/router-input/src/app/app.config.ts
rename to apps/angular/22-router-input/src/app/app.config.ts
diff --git a/apps/angular/router-input/src/app/app.routes.ts b/apps/angular/22-router-input/src/app/app.routes.ts
similarity index 100%
rename from apps/angular/router-input/src/app/app.routes.ts
rename to apps/angular/22-router-input/src/app/app.routes.ts
diff --git a/apps/angular/router-input/src/app/home.component.ts b/apps/angular/22-router-input/src/app/home.component.ts
similarity index 100%
rename from apps/angular/router-input/src/app/home.component.ts
rename to apps/angular/22-router-input/src/app/home.component.ts
diff --git a/apps/angular/router-input/src/app/test.component.ts b/apps/angular/22-router-input/src/app/test.component.ts
similarity index 100%
rename from apps/angular/router-input/src/app/test.component.ts
rename to apps/angular/22-router-input/src/app/test.component.ts
diff --git a/apps/angular/decoupling/src/assets/.gitkeep b/apps/angular/22-router-input/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/decoupling/src/assets/.gitkeep
rename to apps/angular/22-router-input/src/assets/.gitkeep
diff --git a/apps/angular/decoupling/src/favicon.ico b/apps/angular/22-router-input/src/favicon.ico
similarity index 100%
rename from apps/angular/decoupling/src/favicon.ico
rename to apps/angular/22-router-input/src/favicon.ico
diff --git a/apps/angular/router-input/src/index.html b/apps/angular/22-router-input/src/index.html
similarity index 100%
rename from apps/angular/router-input/src/index.html
rename to apps/angular/22-router-input/src/index.html
diff --git a/apps/angular/bug-cd/src/main.ts b/apps/angular/22-router-input/src/main.ts
similarity index 100%
rename from apps/angular/bug-cd/src/main.ts
rename to apps/angular/22-router-input/src/main.ts
diff --git a/apps/angular/pipe-hard/src/styles.scss b/apps/angular/22-router-input/src/styles.scss
similarity index 100%
rename from apps/angular/pipe-hard/src/styles.scss
rename to apps/angular/22-router-input/src/styles.scss
diff --git a/apps/angular/decoupling/tsconfig.app.json b/apps/angular/22-router-input/tsconfig.app.json
similarity index 100%
rename from apps/angular/decoupling/tsconfig.app.json
rename to apps/angular/22-router-input/tsconfig.app.json
diff --git a/apps/angular/signal-input/tsconfig.editor.json b/apps/angular/22-router-input/tsconfig.editor.json
similarity index 100%
rename from apps/angular/signal-input/tsconfig.editor.json
rename to apps/angular/22-router-input/tsconfig.editor.json
diff --git a/apps/angular/module-to-standalone/tsconfig.json b/apps/angular/22-router-input/tsconfig.json
similarity index 100%
rename from apps/angular/module-to-standalone/tsconfig.json
rename to apps/angular/22-router-input/tsconfig.json
diff --git a/apps/angular/ngfor-enhancement/.eslintrc.json b/apps/angular/3-directive-enhancement/.eslintrc.json
similarity index 100%
rename from apps/angular/ngfor-enhancement/.eslintrc.json
rename to apps/angular/3-directive-enhancement/.eslintrc.json
diff --git a/apps/angular/ngfor-enhancement/README.md b/apps/angular/3-directive-enhancement/README.md
similarity index 84%
rename from apps/angular/ngfor-enhancement/README.md
rename to apps/angular/3-directive-enhancement/README.md
index 937dfb5..f89eb48 100644
--- a/apps/angular/ngfor-enhancement/README.md
+++ b/apps/angular/3-directive-enhancement/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-ngfor-enhancement
+npx nx serve angular-directive-enhancement
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/pipe-hard/project.json b/apps/angular/3-directive-enhancement/project.json
similarity index 63%
rename from apps/angular/pipe-hard/project.json
rename to apps/angular/3-directive-enhancement/project.json
index 677edcc..4401f45 100644
--- a/apps/angular/pipe-hard/project.json
+++ b/apps/angular/3-directive-enhancement/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-pipe-hard",
+  "name": "angular-directive-enhancement",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/pipe-hard/src",
+  "sourceRoot": "apps/angular/3-directive-enhancement/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/pipe-hard",
-        "index": "apps/angular/pipe-hard/src/index.html",
-        "main": "apps/angular/pipe-hard/src/main.ts",
-        "polyfills": "apps/angular/pipe-hard/src/polyfills.ts",
-        "tsConfig": "apps/angular/pipe-hard/tsconfig.app.json",
+        "outputPath": "dist/apps/angular/3-directive-enhancement",
+        "index": "apps/angular/3-directive-enhancement/src/index.html",
+        "main": "apps/angular/3-directive-enhancement/src/main.ts",
+        "polyfills": "apps/angular/3-directive-enhancement/src/polyfills.ts",
+        "tsConfig": "apps/angular/3-directive-enhancement/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/pipe-hard/src/favicon.ico",
-          "apps/angular/pipe-hard/src/assets"
+          "apps/angular/3-directive-enhancement/src/favicon.ico",
+          "apps/angular/3-directive-enhancement/src/assets"
         ],
-        "styles": ["apps/angular/pipe-hard/src/styles.scss"],
+        "styles": ["apps/angular/3-directive-enhancement/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-pipe-hard:build:production"
+          "buildTarget": "angular-directive-enhancement:build:production"
         },
         "development": {
-          "buildTarget": "angular-pipe-hard:build:development"
+          "buildTarget": "angular-directive-enhancement:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-pipe-hard:build"
+        "buildTarget": "angular-directive-enhancement:build"
       }
     },
     "lint": {
diff --git a/apps/angular/ngfor-enhancement/src/app/app.component.ts b/apps/angular/3-directive-enhancement/src/app/app.component.ts
similarity index 100%
rename from apps/angular/ngfor-enhancement/src/app/app.component.ts
rename to apps/angular/3-directive-enhancement/src/app/app.component.ts
diff --git a/apps/angular/injection-token/src/assets/.gitkeep b/apps/angular/3-directive-enhancement/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/injection-token/src/assets/.gitkeep
rename to apps/angular/3-directive-enhancement/src/assets/.gitkeep
diff --git a/apps/angular/injection-token/src/favicon.ico b/apps/angular/3-directive-enhancement/src/favicon.ico
similarity index 100%
rename from apps/angular/injection-token/src/favicon.ico
rename to apps/angular/3-directive-enhancement/src/favicon.ico
diff --git a/apps/angular/ngfor-enhancement/src/index.html b/apps/angular/3-directive-enhancement/src/index.html
similarity index 100%
rename from apps/angular/ngfor-enhancement/src/index.html
rename to apps/angular/3-directive-enhancement/src/index.html
diff --git a/apps/angular/ngfor-enhancement/src/main.ts b/apps/angular/3-directive-enhancement/src/main.ts
similarity index 100%
rename from apps/angular/ngfor-enhancement/src/main.ts
rename to apps/angular/3-directive-enhancement/src/main.ts
diff --git a/apps/angular/ngfor-enhancement/src/polyfills.ts b/apps/angular/3-directive-enhancement/src/polyfills.ts
similarity index 100%
rename from apps/angular/ngfor-enhancement/src/polyfills.ts
rename to apps/angular/3-directive-enhancement/src/polyfills.ts
diff --git a/apps/angular/pipe-intermediate/src/styles.scss b/apps/angular/3-directive-enhancement/src/styles.scss
similarity index 100%
rename from apps/angular/pipe-intermediate/src/styles.scss
rename to apps/angular/3-directive-enhancement/src/styles.scss
diff --git a/apps/angular/ngfor-enhancement/tsconfig.app.json b/apps/angular/3-directive-enhancement/tsconfig.app.json
similarity index 100%
rename from apps/angular/ngfor-enhancement/tsconfig.app.json
rename to apps/angular/3-directive-enhancement/tsconfig.app.json
diff --git a/apps/angular/ngfor-enhancement/tsconfig.editor.json b/apps/angular/3-directive-enhancement/tsconfig.editor.json
similarity index 100%
rename from apps/angular/ngfor-enhancement/tsconfig.editor.json
rename to apps/angular/3-directive-enhancement/tsconfig.editor.json
diff --git a/apps/angular/permissions/tsconfig.json b/apps/angular/3-directive-enhancement/tsconfig.json
similarity index 100%
rename from apps/angular/permissions/tsconfig.json
rename to apps/angular/3-directive-enhancement/tsconfig.json
diff --git a/apps/angular/interop-rxjs-signal/.eslintrc.json b/apps/angular/31-module-to-standalone/.eslintrc.json
similarity index 100%
rename from apps/angular/interop-rxjs-signal/.eslintrc.json
rename to apps/angular/31-module-to-standalone/.eslintrc.json
diff --git a/apps/angular/module-to-standalone/README.md b/apps/angular/31-module-to-standalone/README.md
similarity index 100%
rename from apps/angular/module-to-standalone/README.md
rename to apps/angular/31-module-to-standalone/README.md
diff --git a/apps/angular/module-to-standalone/project.json b/apps/angular/31-module-to-standalone/project.json
similarity index 76%
rename from apps/angular/module-to-standalone/project.json
rename to apps/angular/31-module-to-standalone/project.json
index 61fbd27..d0a41e5 100644
--- a/apps/angular/module-to-standalone/project.json
+++ b/apps/angular/31-module-to-standalone/project.json
@@ -3,23 +3,23 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/module-to-standalone/src",
+  "sourceRoot": "apps/angular/31-module-to-standalone/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/module-to-standalone",
-        "index": "apps/angular/module-to-standalone/src/index.html",
-        "main": "apps/angular/module-to-standalone/src/main.ts",
+        "outputPath": "dist/apps/angular/31-module-to-standalone",
+        "index": "apps/angular/31-module-to-standalone/src/index.html",
+        "main": "apps/angular/31-module-to-standalone/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/module-to-standalone/tsconfig.app.json",
+        "tsConfig": "apps/angular/31-module-to-standalone/tsconfig.app.json",
         "assets": [
-          "apps/angular/module-to-standalone/src/favicon.ico",
-          "apps/angular/module-to-standalone/src/assets"
+          "apps/angular/31-module-to-standalone/src/favicon.ico",
+          "apps/angular/31-module-to-standalone/src/assets"
         ],
-        "styles": ["apps/angular/module-to-standalone/src/styles.scss"],
+        "styles": ["apps/angular/31-module-to-standalone/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
diff --git a/apps/angular/module-to-standalone/src/app/app.component.ts b/apps/angular/31-module-to-standalone/src/app/app.component.ts
similarity index 100%
rename from apps/angular/module-to-standalone/src/app/app.component.ts
rename to apps/angular/31-module-to-standalone/src/app/app.component.ts
diff --git a/apps/angular/module-to-standalone/src/app/app.module.ts b/apps/angular/31-module-to-standalone/src/app/app.module.ts
similarity index 100%
rename from apps/angular/module-to-standalone/src/app/app.module.ts
rename to apps/angular/31-module-to-standalone/src/app/app.module.ts
diff --git a/apps/angular/interop-rxjs-signal/src/assets/.gitkeep b/apps/angular/31-module-to-standalone/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/assets/.gitkeep
rename to apps/angular/31-module-to-standalone/src/assets/.gitkeep
diff --git a/apps/angular/interop-rxjs-signal/src/favicon.ico b/apps/angular/31-module-to-standalone/src/favicon.ico
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/favicon.ico
rename to apps/angular/31-module-to-standalone/src/favicon.ico
diff --git a/apps/angular/module-to-standalone/src/index.html b/apps/angular/31-module-to-standalone/src/index.html
similarity index 100%
rename from apps/angular/module-to-standalone/src/index.html
rename to apps/angular/31-module-to-standalone/src/index.html
diff --git a/apps/angular/module-to-standalone/src/main.ts b/apps/angular/31-module-to-standalone/src/main.ts
similarity index 100%
rename from apps/angular/module-to-standalone/src/main.ts
rename to apps/angular/31-module-to-standalone/src/main.ts
diff --git a/apps/angular/bug-cd/src/styles.scss b/apps/angular/31-module-to-standalone/src/styles.scss
similarity index 100%
rename from apps/angular/bug-cd/src/styles.scss
rename to apps/angular/31-module-to-standalone/src/styles.scss
diff --git a/apps/angular/module-to-standalone/tailwind.config.js b/apps/angular/31-module-to-standalone/tailwind.config.js
similarity index 100%
rename from apps/angular/module-to-standalone/tailwind.config.js
rename to apps/angular/31-module-to-standalone/tailwind.config.js
diff --git a/apps/angular/injection-token/tsconfig.app.json b/apps/angular/31-module-to-standalone/tsconfig.app.json
similarity index 100%
rename from apps/angular/injection-token/tsconfig.app.json
rename to apps/angular/31-module-to-standalone/tsconfig.app.json
diff --git a/apps/angular/module-to-standalone/tsconfig.editor.json b/apps/angular/31-module-to-standalone/tsconfig.editor.json
similarity index 100%
rename from apps/angular/module-to-standalone/tsconfig.editor.json
rename to apps/angular/31-module-to-standalone/tsconfig.editor.json
diff --git a/apps/angular/router-input/tsconfig.json b/apps/angular/31-module-to-standalone/tsconfig.json
similarity index 100%
rename from apps/angular/router-input/tsconfig.json
rename to apps/angular/31-module-to-standalone/tsconfig.json
diff --git a/apps/angular/module-to-standalone/.eslintrc.json b/apps/angular/32-change-detection-bug/.eslintrc.json
similarity index 100%
rename from apps/angular/module-to-standalone/.eslintrc.json
rename to apps/angular/32-change-detection-bug/.eslintrc.json
diff --git a/apps/angular/bug-cd/README.md b/apps/angular/32-change-detection-bug/README.md
similarity index 84%
rename from apps/angular/bug-cd/README.md
rename to apps/angular/32-change-detection-bug/README.md
index cb42e77..41e5333 100644
--- a/apps/angular/bug-cd/README.md
+++ b/apps/angular/32-change-detection-bug/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-bug-cd
+npx nx serve angular-change-detection-bug
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/interop-rxjs-signal/jest.config.ts b/apps/angular/32-change-detection-bug/jest.config.ts
similarity index 82%
rename from apps/angular/interop-rxjs-signal/jest.config.ts
rename to apps/angular/32-change-detection-bug/jest.config.ts
index 23956eb..d0412f0 100644
--- a/apps/angular/interop-rxjs-signal/jest.config.ts
+++ b/apps/angular/32-change-detection-bug/jest.config.ts
@@ -1,9 +1,9 @@
 /* eslint-disable */
 export default {
-  displayName: 'angular-interop-rxjs-signal',
+  displayName: 'angular-change-detection-bug',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/angular/interop-rxjs-signal',
+  coverageDirectory: '../../../coverage/apps/angular/32-change-detection-bug',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/angular/bug-cd/project.json b/apps/angular/32-change-detection-bug/project.json
similarity index 65%
rename from apps/angular/bug-cd/project.json
rename to apps/angular/32-change-detection-bug/project.json
index 1ba6cdf..ad8f089 100644
--- a/apps/angular/bug-cd/project.json
+++ b/apps/angular/32-change-detection-bug/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-bug-cd",
+  "name": "angular-change-detection-bug",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/bug-cd/src",
+  "sourceRoot": "apps/angular/32-change-detection-bug/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/bug-cd",
-        "index": "apps/angular/bug-cd/src/index.html",
-        "main": "apps/angular/bug-cd/src/main.ts",
+        "outputPath": "dist/apps/angular/32-change-detection-bug",
+        "index": "apps/angular/32-change-detection-bug/src/index.html",
+        "main": "apps/angular/32-change-detection-bug/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/bug-cd/tsconfig.app.json",
+        "tsConfig": "apps/angular/32-change-detection-bug/tsconfig.app.json",
         "assets": [
-          "apps/angular/bug-cd/src/favicon.ico",
-          "apps/angular/bug-cd/src/assets"
+          "apps/angular/32-change-detection-bug/src/favicon.ico",
+          "apps/angular/32-change-detection-bug/src/assets"
         ],
-        "styles": ["apps/angular/bug-cd/src/styles.scss"],
+        "styles": ["apps/angular/32-change-detection-bug/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-bug-cd:build:production"
+          "buildTarget": "angular-change-detection-bug:build:production"
         },
         "development": {
-          "buildTarget": "angular-bug-cd:build:development"
+          "buildTarget": "angular-change-detection-bug:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-bug-cd:build"
+        "buildTarget": "angular-change-detection-bug:build"
       }
     },
     "lint": {
@@ -74,7 +74,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/angular/bug-cd/jest.config.ts"
+        "jestConfig": "apps/angular/32-change-detection-bug/jest.config.ts"
       }
     }
   }
diff --git a/apps/angular/bug-cd/src/app/app.component.ts b/apps/angular/32-change-detection-bug/src/app/app.component.ts
similarity index 100%
rename from apps/angular/bug-cd/src/app/app.component.ts
rename to apps/angular/32-change-detection-bug/src/app/app.component.ts
diff --git a/apps/angular/bug-cd/src/app/app.config.ts b/apps/angular/32-change-detection-bug/src/app/app.config.ts
similarity index 100%
rename from apps/angular/bug-cd/src/app/app.config.ts
rename to apps/angular/32-change-detection-bug/src/app/app.config.ts
diff --git a/apps/angular/bug-cd/src/app/bar.component.ts b/apps/angular/32-change-detection-bug/src/app/bar.component.ts
similarity index 100%
rename from apps/angular/bug-cd/src/app/bar.component.ts
rename to apps/angular/32-change-detection-bug/src/app/bar.component.ts
diff --git a/apps/angular/bug-cd/src/app/fake.service.ts b/apps/angular/32-change-detection-bug/src/app/fake.service.ts
similarity index 100%
rename from apps/angular/bug-cd/src/app/fake.service.ts
rename to apps/angular/32-change-detection-bug/src/app/fake.service.ts
diff --git a/apps/angular/bug-cd/src/app/foo.component.ts b/apps/angular/32-change-detection-bug/src/app/foo.component.ts
similarity index 100%
rename from apps/angular/bug-cd/src/app/foo.component.ts
rename to apps/angular/32-change-detection-bug/src/app/foo.component.ts
diff --git a/apps/angular/bug-cd/src/app/main-navigation.component.ts b/apps/angular/32-change-detection-bug/src/app/main-navigation.component.ts
similarity index 100%
rename from apps/angular/bug-cd/src/app/main-navigation.component.ts
rename to apps/angular/32-change-detection-bug/src/app/main-navigation.component.ts
diff --git a/apps/angular/module-to-standalone/src/assets/.gitkeep b/apps/angular/32-change-detection-bug/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/module-to-standalone/src/assets/.gitkeep
rename to apps/angular/32-change-detection-bug/src/assets/.gitkeep
diff --git a/apps/angular/module-to-standalone/src/favicon.ico b/apps/angular/32-change-detection-bug/src/favicon.ico
similarity index 100%
rename from apps/angular/module-to-standalone/src/favicon.ico
rename to apps/angular/32-change-detection-bug/src/favicon.ico
diff --git a/apps/angular/bug-cd/src/index.html b/apps/angular/32-change-detection-bug/src/index.html
similarity index 100%
rename from apps/angular/bug-cd/src/index.html
rename to apps/angular/32-change-detection-bug/src/index.html
diff --git a/apps/angular/injection-token/src/main.ts b/apps/angular/32-change-detection-bug/src/main.ts
similarity index 100%
rename from apps/angular/injection-token/src/main.ts
rename to apps/angular/32-change-detection-bug/src/main.ts
diff --git a/apps/angular/decoupling/src/styles.scss b/apps/angular/32-change-detection-bug/src/styles.scss
similarity index 100%
rename from apps/angular/decoupling/src/styles.scss
rename to apps/angular/32-change-detection-bug/src/styles.scss
diff --git a/apps/angular/bug-cd/src/test-setup.ts b/apps/angular/32-change-detection-bug/src/test-setup.ts
similarity index 100%
rename from apps/angular/bug-cd/src/test-setup.ts
rename to apps/angular/32-change-detection-bug/src/test-setup.ts
diff --git a/apps/angular/bug-cd/tailwind.config.js b/apps/angular/32-change-detection-bug/tailwind.config.js
similarity index 100%
rename from apps/angular/bug-cd/tailwind.config.js
rename to apps/angular/32-change-detection-bug/tailwind.config.js
diff --git a/apps/angular/interop-rxjs-signal/tsconfig.app.json b/apps/angular/32-change-detection-bug/tsconfig.app.json
similarity index 100%
rename from apps/angular/interop-rxjs-signal/tsconfig.app.json
rename to apps/angular/32-change-detection-bug/tsconfig.app.json
diff --git a/apps/angular/bug-cd/tsconfig.editor.json b/apps/angular/32-change-detection-bug/tsconfig.editor.json
similarity index 100%
rename from apps/angular/bug-cd/tsconfig.editor.json
rename to apps/angular/32-change-detection-bug/tsconfig.editor.json
diff --git a/apps/angular/bug-cd/tsconfig.json b/apps/angular/32-change-detection-bug/tsconfig.json
similarity index 100%
rename from apps/angular/bug-cd/tsconfig.json
rename to apps/angular/32-change-detection-bug/tsconfig.json
diff --git a/apps/angular/bug-cd/tsconfig.spec.json b/apps/angular/32-change-detection-bug/tsconfig.spec.json
similarity index 100%
rename from apps/angular/bug-cd/tsconfig.spec.json
rename to apps/angular/32-change-detection-bug/tsconfig.spec.json
diff --git a/apps/angular/router-input/.eslintrc.json b/apps/angular/33-decoupling-components/.eslintrc.json
similarity index 100%
rename from apps/angular/router-input/.eslintrc.json
rename to apps/angular/33-decoupling-components/.eslintrc.json
diff --git a/apps/angular/decoupling/README.md b/apps/angular/33-decoupling-components/README.md
similarity index 84%
rename from apps/angular/decoupling/README.md
rename to apps/angular/33-decoupling-components/README.md
index 0ba00e7..4af7045 100644
--- a/apps/angular/decoupling/README.md
+++ b/apps/angular/33-decoupling-components/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-decoupling
+npx nx serve angular-decoupling-components
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/decoupling/project.json b/apps/angular/33-decoupling-components/project.json
similarity index 65%
rename from apps/angular/decoupling/project.json
rename to apps/angular/33-decoupling-components/project.json
index 5a76f01..88bad94 100644
--- a/apps/angular/decoupling/project.json
+++ b/apps/angular/33-decoupling-components/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-decoupling",
+  "name": "angular-decoupling-components",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/decoupling/src",
+  "sourceRoot": "apps/angular/33-decoupling-components/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/decoupling",
-        "index": "apps/angular/decoupling/src/index.html",
-        "main": "apps/angular/decoupling/src/main.ts",
+        "outputPath": "dist/apps/angular/33-decoupling-components",
+        "index": "apps/angular/33-decoupling-components/src/index.html",
+        "main": "apps/angular/33-decoupling-components/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/decoupling/tsconfig.app.json",
+        "tsConfig": "apps/angular/33-decoupling-components/tsconfig.app.json",
         "assets": [
-          "apps/angular/decoupling/src/favicon.ico",
-          "apps/angular/decoupling/src/assets"
+          "apps/angular/33-decoupling-components/src/favicon.ico",
+          "apps/angular/33-decoupling-components/src/assets"
         ],
-        "styles": ["apps/angular/decoupling/src/styles.scss"],
+        "styles": ["apps/angular/33-decoupling-components/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-decoupling:build:production"
+          "buildTarget": "angular-decoupling-components:build:production"
         },
         "development": {
-          "buildTarget": "angular-decoupling:build:development"
+          "buildTarget": "angular-decoupling-components:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-decoupling:build"
+        "buildTarget": "angular-decoupling-components:build"
       }
     },
     "lint": {
diff --git a/apps/angular/decoupling/src/app/app.component.ts b/apps/angular/33-decoupling-components/src/app/app.component.ts
similarity index 100%
rename from apps/angular/decoupling/src/app/app.component.ts
rename to apps/angular/33-decoupling-components/src/app/app.component.ts
diff --git a/apps/angular/ngfor-enhancement/src/assets/.gitkeep b/apps/angular/33-decoupling-components/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/ngfor-enhancement/src/assets/.gitkeep
rename to apps/angular/33-decoupling-components/src/assets/.gitkeep
diff --git a/apps/angular/ngfor-enhancement/src/favicon.ico b/apps/angular/33-decoupling-components/src/favicon.ico
similarity index 100%
rename from apps/angular/ngfor-enhancement/src/favicon.ico
rename to apps/angular/33-decoupling-components/src/favicon.ico
diff --git a/apps/angular/decoupling/src/index.html b/apps/angular/33-decoupling-components/src/index.html
similarity index 100%
rename from apps/angular/decoupling/src/index.html
rename to apps/angular/33-decoupling-components/src/index.html
diff --git a/apps/angular/pipe-easy/src/main.ts b/apps/angular/33-decoupling-components/src/main.ts
similarity index 100%
rename from apps/angular/pipe-easy/src/main.ts
rename to apps/angular/33-decoupling-components/src/main.ts
diff --git a/apps/angular/injection-token/src/styles.scss b/apps/angular/33-decoupling-components/src/styles.scss
similarity index 100%
rename from apps/angular/injection-token/src/styles.scss
rename to apps/angular/33-decoupling-components/src/styles.scss
diff --git a/apps/angular/decoupling/tailwind.config.js b/apps/angular/33-decoupling-components/tailwind.config.js
similarity index 100%
rename from apps/angular/decoupling/tailwind.config.js
rename to apps/angular/33-decoupling-components/tailwind.config.js
diff --git a/apps/angular/module-to-standalone/tsconfig.app.json b/apps/angular/33-decoupling-components/tsconfig.app.json
similarity index 100%
rename from apps/angular/module-to-standalone/tsconfig.app.json
rename to apps/angular/33-decoupling-components/tsconfig.app.json
diff --git a/apps/angular/decoupling/tsconfig.editor.json b/apps/angular/33-decoupling-components/tsconfig.editor.json
similarity index 100%
rename from apps/angular/decoupling/tsconfig.editor.json
rename to apps/angular/33-decoupling-components/tsconfig.editor.json
diff --git a/apps/angular/styling/tsconfig.json b/apps/angular/33-decoupling-components/tsconfig.json
similarity index 100%
rename from apps/angular/styling/tsconfig.json
rename to apps/angular/33-decoupling-components/tsconfig.json
diff --git a/apps/angular/injection-token/.eslintrc.json b/apps/angular/39-injection-token/.eslintrc.json
similarity index 100%
rename from apps/angular/injection-token/.eslintrc.json
rename to apps/angular/39-injection-token/.eslintrc.json
diff --git a/apps/angular/injection-token/README.md b/apps/angular/39-injection-token/README.md
similarity index 100%
rename from apps/angular/injection-token/README.md
rename to apps/angular/39-injection-token/README.md
diff --git a/apps/angular/injection-token/jest.config.ts b/apps/angular/39-injection-token/jest.config.ts
similarity index 89%
rename from apps/angular/injection-token/jest.config.ts
rename to apps/angular/39-injection-token/jest.config.ts
index d7105f8..541d663 100644
--- a/apps/angular/injection-token/jest.config.ts
+++ b/apps/angular/39-injection-token/jest.config.ts
@@ -3,7 +3,7 @@ export default {
   displayName: 'angular-injection-token',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/angular/injection-token',
+  coverageDirectory: '../../../coverage/apps/angular/39-injection-token',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/angular/injection-token/project.json b/apps/angular/39-injection-token/project.json
similarity index 76%
rename from apps/angular/injection-token/project.json
rename to apps/angular/39-injection-token/project.json
index e800af1..03f203b 100644
--- a/apps/angular/injection-token/project.json
+++ b/apps/angular/39-injection-token/project.json
@@ -3,23 +3,23 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/injection-token/src",
+  "sourceRoot": "apps/angular/39-injection-token/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/injection-token",
-        "index": "apps/angular/injection-token/src/index.html",
-        "main": "apps/angular/injection-token/src/main.ts",
+        "outputPath": "dist/apps/angular/39-injection-token",
+        "index": "apps/angular/39-injection-token/src/index.html",
+        "main": "apps/angular/39-injection-token/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/injection-token/tsconfig.app.json",
+        "tsConfig": "apps/angular/39-injection-token/tsconfig.app.json",
         "assets": [
-          "apps/angular/injection-token/src/favicon.ico",
-          "apps/angular/injection-token/src/assets"
+          "apps/angular/39-injection-token/src/favicon.ico",
+          "apps/angular/39-injection-token/src/assets"
         ],
-        "styles": ["apps/angular/injection-token/src/styles.scss"],
+        "styles": ["apps/angular/39-injection-token/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -74,7 +74,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/angular/injection-token/jest.config.ts"
+        "jestConfig": "apps/angular/39-injection-token/jest.config.ts"
       }
     }
   }
diff --git a/apps/angular/injection-token/src/app/app.component.ts b/apps/angular/39-injection-token/src/app/app.component.ts
similarity index 100%
rename from apps/angular/injection-token/src/app/app.component.ts
rename to apps/angular/39-injection-token/src/app/app.component.ts
diff --git a/apps/angular/injection-token/src/app/app.config.ts b/apps/angular/39-injection-token/src/app/app.config.ts
similarity index 100%
rename from apps/angular/injection-token/src/app/app.config.ts
rename to apps/angular/39-injection-token/src/app/app.config.ts
diff --git a/apps/angular/injection-token/src/app/data.ts b/apps/angular/39-injection-token/src/app/data.ts
similarity index 100%
rename from apps/angular/injection-token/src/app/data.ts
rename to apps/angular/39-injection-token/src/app/data.ts
diff --git a/apps/angular/injection-token/src/app/phone.component.ts b/apps/angular/39-injection-token/src/app/phone.component.ts
similarity index 100%
rename from apps/angular/injection-token/src/app/phone.component.ts
rename to apps/angular/39-injection-token/src/app/phone.component.ts
diff --git a/apps/angular/injection-token/src/app/timer-container.component.ts b/apps/angular/39-injection-token/src/app/timer-container.component.ts
similarity index 100%
rename from apps/angular/injection-token/src/app/timer-container.component.ts
rename to apps/angular/39-injection-token/src/app/timer-container.component.ts
diff --git a/apps/angular/injection-token/src/app/timer.component.ts b/apps/angular/39-injection-token/src/app/timer.component.ts
similarity index 100%
rename from apps/angular/injection-token/src/app/timer.component.ts
rename to apps/angular/39-injection-token/src/app/timer.component.ts
diff --git a/apps/angular/injection-token/src/app/video.component.ts b/apps/angular/39-injection-token/src/app/video.component.ts
similarity index 100%
rename from apps/angular/injection-token/src/app/video.component.ts
rename to apps/angular/39-injection-token/src/app/video.component.ts
diff --git a/apps/angular/permissions/src/assets/.gitkeep b/apps/angular/39-injection-token/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/permissions/src/assets/.gitkeep
rename to apps/angular/39-injection-token/src/assets/.gitkeep
diff --git a/apps/angular/permissions/src/favicon.ico b/apps/angular/39-injection-token/src/favicon.ico
similarity index 100%
rename from apps/angular/permissions/src/favicon.ico
rename to apps/angular/39-injection-token/src/favicon.ico
diff --git a/apps/angular/injection-token/src/index.html b/apps/angular/39-injection-token/src/index.html
similarity index 100%
rename from apps/angular/injection-token/src/index.html
rename to apps/angular/39-injection-token/src/index.html
diff --git a/apps/angular/interop-rxjs-signal/src/main.ts b/apps/angular/39-injection-token/src/main.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/main.ts
rename to apps/angular/39-injection-token/src/main.ts
diff --git a/apps/angular/interop-rxjs-signal/src/styles.scss b/apps/angular/39-injection-token/src/styles.scss
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/styles.scss
rename to apps/angular/39-injection-token/src/styles.scss
diff --git a/apps/angular/crud/src/test-setup.ts b/apps/angular/39-injection-token/src/test-setup.ts
similarity index 100%
rename from apps/angular/crud/src/test-setup.ts
rename to apps/angular/39-injection-token/src/test-setup.ts
diff --git a/apps/angular/injection-token/tailwind.config.js b/apps/angular/39-injection-token/tailwind.config.js
similarity index 100%
rename from apps/angular/injection-token/tailwind.config.js
rename to apps/angular/39-injection-token/tailwind.config.js
diff --git a/apps/angular/router-input/tsconfig.app.json b/apps/angular/39-injection-token/tsconfig.app.json
similarity index 100%
rename from apps/angular/router-input/tsconfig.app.json
rename to apps/angular/39-injection-token/tsconfig.app.json
diff --git a/apps/angular/injection-token/tsconfig.editor.json b/apps/angular/39-injection-token/tsconfig.editor.json
similarity index 100%
rename from apps/angular/injection-token/tsconfig.editor.json
rename to apps/angular/39-injection-token/tsconfig.editor.json
diff --git a/apps/angular/injection-token/tsconfig.json b/apps/angular/39-injection-token/tsconfig.json
similarity index 100%
rename from apps/angular/injection-token/tsconfig.json
rename to apps/angular/39-injection-token/tsconfig.json
diff --git a/apps/angular/injection-token/tsconfig.spec.json b/apps/angular/39-injection-token/tsconfig.spec.json
similarity index 100%
rename from apps/angular/injection-token/tsconfig.spec.json
rename to apps/angular/39-injection-token/tsconfig.spec.json
diff --git a/apps/angular/permissions/.eslintrc.json b/apps/angular/5-crud-application/.eslintrc.json
similarity index 100%
rename from apps/angular/permissions/.eslintrc.json
rename to apps/angular/5-crud-application/.eslintrc.json
diff --git a/apps/angular/crud/README.md b/apps/angular/5-crud-application/README.md
similarity index 85%
rename from apps/angular/crud/README.md
rename to apps/angular/5-crud-application/README.md
index 0a6518b..8992014 100644
--- a/apps/angular/crud/README.md
+++ b/apps/angular/5-crud-application/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-crud
+npx nx serve angular-crud-application
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/crud/jest.config.ts b/apps/angular/5-crud-application/jest.config.ts
similarity index 84%
rename from apps/angular/crud/jest.config.ts
rename to apps/angular/5-crud-application/jest.config.ts
index 74a17f1..f290dd7 100644
--- a/apps/angular/crud/jest.config.ts
+++ b/apps/angular/5-crud-application/jest.config.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
 export default {
-  displayName: 'angular-crud',
+  displayName: 'angular-crud-application',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: {},
-  coverageDirectory: '../../../coverage/apps/angular/crud',
+  coverageDirectory: '../../../coverage/apps/angular/5-crud-application',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/angular/crud/project.json b/apps/angular/5-crud-application/project.json
similarity index 67%
rename from apps/angular/crud/project.json
rename to apps/angular/5-crud-application/project.json
index cb694bb..701cabe 100644
--- a/apps/angular/crud/project.json
+++ b/apps/angular/5-crud-application/project.json
@@ -1,27 +1,27 @@
 {
-  "name": "angular-crud",
+  "name": "angular-crud-application",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/crud/src",
+  "sourceRoot": "apps/angular/5-crud-application/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/crud",
-        "index": "apps/angular/crud/src/index.html",
-        "main": "apps/angular/crud/src/main.ts",
-        "polyfills": "apps/angular/crud/src/polyfills.ts",
-        "tsConfig": "apps/angular/crud/tsconfig.app.json",
+        "outputPath": "dist/apps/angular/5-crud-application",
+        "index": "apps/angular/5-crud-application/src/index.html",
+        "main": "apps/angular/5-crud-application/src/main.ts",
+        "polyfills": "apps/angular/5-crud-application/src/polyfills.ts",
+        "tsConfig": "apps/angular/5-crud-application/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/crud/src/favicon.ico",
-          "apps/angular/crud/src/assets"
+          "apps/angular/5-crud-application/src/favicon.ico",
+          "apps/angular/5-crud-application/src/assets"
         ],
         "styles": [
           "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-          "apps/angular/crud/src/styles.scss"
+          "apps/angular/5-crud-application/src/styles.scss"
         ],
         "scripts": [],
         "allowedCommonJsDependencies": ["seedrandom"]
@@ -57,10 +57,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-crud:build:production"
+          "buildTarget": "angular-crud-application:build:production"
         },
         "development": {
-          "buildTarget": "angular-crud:build:development"
+          "buildTarget": "angular-crud-application:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -68,7 +68,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-crud:build"
+        "buildTarget": "angular-crud-application:build"
       }
     },
     "lint": {
@@ -78,7 +78,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/angular/crud/jest.config.ts"
+        "jestConfig": "apps/angular/5-crud-application/jest.config.ts"
       }
     }
   },
diff --git a/apps/angular/crud/src/app/app.component.ts b/apps/angular/5-crud-application/src/app/app.component.ts
similarity index 100%
rename from apps/angular/crud/src/app/app.component.ts
rename to apps/angular/5-crud-application/src/app/app.component.ts
diff --git a/apps/angular/crud/src/app/app.config.ts b/apps/angular/5-crud-application/src/app/app.config.ts
similarity index 100%
rename from apps/angular/crud/src/app/app.config.ts
rename to apps/angular/5-crud-application/src/app/app.config.ts
diff --git a/apps/angular/pipe-easy/src/assets/.gitkeep b/apps/angular/5-crud-application/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/pipe-easy/src/assets/.gitkeep
rename to apps/angular/5-crud-application/src/assets/.gitkeep
diff --git a/apps/angular/pipe-easy/src/favicon.ico b/apps/angular/5-crud-application/src/favicon.ico
similarity index 100%
rename from apps/angular/pipe-easy/src/favicon.ico
rename to apps/angular/5-crud-application/src/favicon.ico
diff --git a/apps/angular/crud/src/index.html b/apps/angular/5-crud-application/src/index.html
similarity index 100%
rename from apps/angular/crud/src/index.html
rename to apps/angular/5-crud-application/src/index.html
diff --git a/apps/angular/crud/src/main.ts b/apps/angular/5-crud-application/src/main.ts
similarity index 100%
rename from apps/angular/crud/src/main.ts
rename to apps/angular/5-crud-application/src/main.ts
diff --git a/apps/angular/permissions/src/polyfills.ts b/apps/angular/5-crud-application/src/polyfills.ts
similarity index 100%
rename from apps/angular/permissions/src/polyfills.ts
rename to apps/angular/5-crud-application/src/polyfills.ts
diff --git a/apps/angular/crud/src/styles.scss b/apps/angular/5-crud-application/src/styles.scss
similarity index 100%
rename from apps/angular/crud/src/styles.scss
rename to apps/angular/5-crud-application/src/styles.scss
diff --git a/apps/angular/injection-token/src/test-setup.ts b/apps/angular/5-crud-application/src/test-setup.ts
similarity index 100%
rename from apps/angular/injection-token/src/test-setup.ts
rename to apps/angular/5-crud-application/src/test-setup.ts
diff --git a/apps/angular/permissions/tsconfig.app.json b/apps/angular/5-crud-application/tsconfig.app.json
similarity index 100%
rename from apps/angular/permissions/tsconfig.app.json
rename to apps/angular/5-crud-application/tsconfig.app.json
diff --git a/apps/angular/permissions/tsconfig.editor.json b/apps/angular/5-crud-application/tsconfig.editor.json
similarity index 100%
rename from apps/angular/permissions/tsconfig.editor.json
rename to apps/angular/5-crud-application/tsconfig.editor.json
diff --git a/apps/angular/crud/tsconfig.json b/apps/angular/5-crud-application/tsconfig.json
similarity index 100%
rename from apps/angular/crud/tsconfig.json
rename to apps/angular/5-crud-application/tsconfig.json
diff --git a/apps/angular/crud/tsconfig.spec.json b/apps/angular/5-crud-application/tsconfig.spec.json
similarity index 100%
rename from apps/angular/crud/tsconfig.spec.json
rename to apps/angular/5-crud-application/tsconfig.spec.json
diff --git a/apps/angular/pipe-easy/.eslintrc.json b/apps/angular/6-structural-directive/.eslintrc.json
similarity index 100%
rename from apps/angular/pipe-easy/.eslintrc.json
rename to apps/angular/6-structural-directive/.eslintrc.json
diff --git a/apps/angular/permissions/README.md b/apps/angular/6-structural-directive/README.md
similarity index 84%
rename from apps/angular/permissions/README.md
rename to apps/angular/6-structural-directive/README.md
index 99b2e55..775b409 100644
--- a/apps/angular/permissions/README.md
+++ b/apps/angular/6-structural-directive/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-permissions
+npx nx serve angular-structural-directive
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/pipe-intermediate/project.json b/apps/angular/6-structural-directive/project.json
similarity index 63%
rename from apps/angular/pipe-intermediate/project.json
rename to apps/angular/6-structural-directive/project.json
index 6897315..fb02e88 100644
--- a/apps/angular/pipe-intermediate/project.json
+++ b/apps/angular/6-structural-directive/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-pipe-intermediate",
+  "name": "angular-structural-directive",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/pipe-intermediate/src",
+  "sourceRoot": "apps/angular/6-structural-directive/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/pipe-intermediate",
-        "index": "apps/angular/pipe-intermediate/src/index.html",
-        "main": "apps/angular/pipe-intermediate/src/main.ts",
-        "polyfills": "apps/angular/pipe-intermediate/src/polyfills.ts",
-        "tsConfig": "apps/angular/pipe-intermediate/tsconfig.app.json",
+        "outputPath": "dist/apps/angular/6-structural-directive",
+        "index": "apps/angular/6-structural-directive/src/index.html",
+        "main": "apps/angular/6-structural-directive/src/main.ts",
+        "polyfills": "apps/angular/6-structural-directive/src/polyfills.ts",
+        "tsConfig": "apps/angular/6-structural-directive/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/pipe-intermediate/src/favicon.ico",
-          "apps/angular/pipe-intermediate/src/assets"
+          "apps/angular/6-structural-directive/src/favicon.ico",
+          "apps/angular/6-structural-directive/src/assets"
         ],
-        "styles": ["apps/angular/pipe-intermediate/src/styles.scss"],
+        "styles": ["apps/angular/6-structural-directive/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-pipe-intermediate:build:production"
+          "buildTarget": "angular-structural-directive:build:production"
         },
         "development": {
-          "buildTarget": "angular-pipe-intermediate:build:development"
+          "buildTarget": "angular-structural-directive:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-pipe-intermediate:build"
+        "buildTarget": "angular-structural-directive:build"
       }
     },
     "lint": {
diff --git a/apps/angular/permissions/src/app/app.component.ts b/apps/angular/6-structural-directive/src/app/app.component.ts
similarity index 100%
rename from apps/angular/permissions/src/app/app.component.ts
rename to apps/angular/6-structural-directive/src/app/app.component.ts
diff --git a/apps/angular/permissions/src/app/app.config.ts b/apps/angular/6-structural-directive/src/app/app.config.ts
similarity index 100%
rename from apps/angular/permissions/src/app/app.config.ts
rename to apps/angular/6-structural-directive/src/app/app.config.ts
diff --git a/apps/angular/permissions/src/app/button.component.ts b/apps/angular/6-structural-directive/src/app/button.component.ts
similarity index 100%
rename from apps/angular/permissions/src/app/button.component.ts
rename to apps/angular/6-structural-directive/src/app/button.component.ts
diff --git a/apps/angular/permissions/src/app/dashboard/admin.component.ts b/apps/angular/6-structural-directive/src/app/dashboard/admin.component.ts
similarity index 100%
rename from apps/angular/permissions/src/app/dashboard/admin.component.ts
rename to apps/angular/6-structural-directive/src/app/dashboard/admin.component.ts
diff --git a/apps/angular/permissions/src/app/dashboard/manager.component.ts b/apps/angular/6-structural-directive/src/app/dashboard/manager.component.ts
similarity index 100%
rename from apps/angular/permissions/src/app/dashboard/manager.component.ts
rename to apps/angular/6-structural-directive/src/app/dashboard/manager.component.ts
diff --git a/apps/angular/permissions/src/app/information.component.ts b/apps/angular/6-structural-directive/src/app/information.component.ts
similarity index 100%
rename from apps/angular/permissions/src/app/information.component.ts
rename to apps/angular/6-structural-directive/src/app/information.component.ts
diff --git a/apps/angular/permissions/src/app/login.component.ts b/apps/angular/6-structural-directive/src/app/login.component.ts
similarity index 100%
rename from apps/angular/permissions/src/app/login.component.ts
rename to apps/angular/6-structural-directive/src/app/login.component.ts
diff --git a/apps/angular/permissions/src/app/routes.ts b/apps/angular/6-structural-directive/src/app/routes.ts
similarity index 100%
rename from apps/angular/permissions/src/app/routes.ts
rename to apps/angular/6-structural-directive/src/app/routes.ts
diff --git a/apps/angular/permissions/src/app/user.model.ts b/apps/angular/6-structural-directive/src/app/user.model.ts
similarity index 100%
rename from apps/angular/permissions/src/app/user.model.ts
rename to apps/angular/6-structural-directive/src/app/user.model.ts
diff --git a/apps/angular/permissions/src/app/user.store.ts b/apps/angular/6-structural-directive/src/app/user.store.ts
similarity index 100%
rename from apps/angular/permissions/src/app/user.store.ts
rename to apps/angular/6-structural-directive/src/app/user.store.ts
diff --git a/apps/angular/pipe-hard/src/assets/.gitkeep b/apps/angular/6-structural-directive/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/pipe-hard/src/assets/.gitkeep
rename to apps/angular/6-structural-directive/src/assets/.gitkeep
diff --git a/apps/angular/pipe-hard/src/favicon.ico b/apps/angular/6-structural-directive/src/favicon.ico
similarity index 100%
rename from apps/angular/pipe-hard/src/favicon.ico
rename to apps/angular/6-structural-directive/src/favicon.ico
diff --git a/apps/angular/permissions/src/index.html b/apps/angular/6-structural-directive/src/index.html
similarity index 100%
rename from apps/angular/permissions/src/index.html
rename to apps/angular/6-structural-directive/src/index.html
diff --git a/apps/angular/permissions/src/main.ts b/apps/angular/6-structural-directive/src/main.ts
similarity index 100%
rename from apps/angular/permissions/src/main.ts
rename to apps/angular/6-structural-directive/src/main.ts
diff --git a/apps/angular/pipe-easy/src/polyfills.ts b/apps/angular/6-structural-directive/src/polyfills.ts
similarity index 100%
rename from apps/angular/pipe-easy/src/polyfills.ts
rename to apps/angular/6-structural-directive/src/polyfills.ts
diff --git a/apps/angular/module-to-standalone/src/styles.scss b/apps/angular/6-structural-directive/src/styles.scss
similarity index 100%
rename from apps/angular/module-to-standalone/src/styles.scss
rename to apps/angular/6-structural-directive/src/styles.scss
diff --git a/apps/angular/interop-rxjs-signal/tailwind.config.js b/apps/angular/6-structural-directive/tailwind.config.js
similarity index 100%
rename from apps/angular/interop-rxjs-signal/tailwind.config.js
rename to apps/angular/6-structural-directive/tailwind.config.js
diff --git a/apps/angular/pipe-easy/tsconfig.app.json b/apps/angular/6-structural-directive/tsconfig.app.json
similarity index 100%
rename from apps/angular/pipe-easy/tsconfig.app.json
rename to apps/angular/6-structural-directive/tsconfig.app.json
diff --git a/apps/angular/pipe-easy/tsconfig.editor.json b/apps/angular/6-structural-directive/tsconfig.editor.json
similarity index 100%
rename from apps/angular/pipe-easy/tsconfig.editor.json
rename to apps/angular/6-structural-directive/tsconfig.editor.json
diff --git a/apps/angular/pipe-easy/tsconfig.json b/apps/angular/6-structural-directive/tsconfig.json
similarity index 100%
rename from apps/angular/pipe-easy/tsconfig.json
rename to apps/angular/6-structural-directive/tsconfig.json
diff --git a/apps/angular/pipe-hard/.eslintrc.json b/apps/angular/8-pure-pipe/.eslintrc.json
similarity index 100%
rename from apps/angular/pipe-hard/.eslintrc.json
rename to apps/angular/8-pure-pipe/.eslintrc.json
diff --git a/apps/angular/pipe-easy/README.md b/apps/angular/8-pure-pipe/README.md
similarity index 87%
rename from apps/angular/pipe-easy/README.md
rename to apps/angular/8-pure-pipe/README.md
index 8501be8..a65a33f 100644
--- a/apps/angular/pipe-easy/README.md
+++ b/apps/angular/8-pure-pipe/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-pipe-easy
+npx nx serve angular-pure-pipe
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/pipe-easy/project.json b/apps/angular/8-pure-pipe/project.json
similarity index 67%
rename from apps/angular/pipe-easy/project.json
rename to apps/angular/8-pure-pipe/project.json
index b1fda11..c9c5275 100644
--- a/apps/angular/pipe-easy/project.json
+++ b/apps/angular/8-pure-pipe/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-pipe-easy",
+  "name": "angular-pure-pipe",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/pipe-easy/src",
+  "sourceRoot": "apps/angular/8-pure-pipe/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/pipe-easy",
-        "index": "apps/angular/pipe-easy/src/index.html",
-        "main": "apps/angular/pipe-easy/src/main.ts",
-        "polyfills": "apps/angular/pipe-easy/src/polyfills.ts",
-        "tsConfig": "apps/angular/pipe-easy/tsconfig.app.json",
+        "outputPath": "dist/apps/angular/8-pure-pipe",
+        "index": "apps/angular/8-pure-pipe/src/index.html",
+        "main": "apps/angular/8-pure-pipe/src/main.ts",
+        "polyfills": "apps/angular/8-pure-pipe/src/polyfills.ts",
+        "tsConfig": "apps/angular/8-pure-pipe/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/pipe-easy/src/favicon.ico",
-          "apps/angular/pipe-easy/src/assets"
+          "apps/angular/8-pure-pipe/src/favicon.ico",
+          "apps/angular/8-pure-pipe/src/assets"
         ],
-        "styles": ["apps/angular/pipe-easy/src/styles.scss"],
+        "styles": ["apps/angular/8-pure-pipe/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-pipe-easy:build:production"
+          "buildTarget": "angular-pure-pipe:build:production"
         },
         "development": {
-          "buildTarget": "angular-pipe-easy:build:development"
+          "buildTarget": "angular-pure-pipe:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-pipe-easy:build"
+        "buildTarget": "angular-pure-pipe:build"
       }
     },
     "lint": {
diff --git a/apps/angular/pipe-easy/src/app/app.component.ts b/apps/angular/8-pure-pipe/src/app/app.component.ts
similarity index 100%
rename from apps/angular/pipe-easy/src/app/app.component.ts
rename to apps/angular/8-pure-pipe/src/app/app.component.ts
diff --git a/apps/angular/pipe-intermediate/src/assets/.gitkeep b/apps/angular/8-pure-pipe/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/pipe-intermediate/src/assets/.gitkeep
rename to apps/angular/8-pure-pipe/src/assets/.gitkeep
diff --git a/apps/angular/pipe-intermediate/src/favicon.ico b/apps/angular/8-pure-pipe/src/favicon.ico
similarity index 100%
rename from apps/angular/pipe-intermediate/src/favicon.ico
rename to apps/angular/8-pure-pipe/src/favicon.ico
diff --git a/apps/angular/pipe-easy/src/index.html b/apps/angular/8-pure-pipe/src/index.html
similarity index 100%
rename from apps/angular/pipe-easy/src/index.html
rename to apps/angular/8-pure-pipe/src/index.html
diff --git a/apps/angular/pipe-hard/src/main.ts b/apps/angular/8-pure-pipe/src/main.ts
similarity index 100%
rename from apps/angular/pipe-hard/src/main.ts
rename to apps/angular/8-pure-pipe/src/main.ts
diff --git a/apps/angular/pipe-hard/src/polyfills.ts b/apps/angular/8-pure-pipe/src/polyfills.ts
similarity index 100%
rename from apps/angular/pipe-hard/src/polyfills.ts
rename to apps/angular/8-pure-pipe/src/polyfills.ts
diff --git a/apps/angular/router-input/src/styles.scss b/apps/angular/8-pure-pipe/src/styles.scss
similarity index 100%
rename from apps/angular/router-input/src/styles.scss
rename to apps/angular/8-pure-pipe/src/styles.scss
diff --git a/apps/angular/pipe-hard/tsconfig.app.json b/apps/angular/8-pure-pipe/tsconfig.app.json
similarity index 100%
rename from apps/angular/pipe-hard/tsconfig.app.json
rename to apps/angular/8-pure-pipe/tsconfig.app.json
diff --git a/apps/angular/pipe-hard/tsconfig.editor.json b/apps/angular/8-pure-pipe/tsconfig.editor.json
similarity index 100%
rename from apps/angular/pipe-hard/tsconfig.editor.json
rename to apps/angular/8-pure-pipe/tsconfig.editor.json
diff --git a/apps/angular/pipe-hard/tsconfig.json b/apps/angular/8-pure-pipe/tsconfig.json
similarity index 100%
rename from apps/angular/pipe-hard/tsconfig.json
rename to apps/angular/8-pure-pipe/tsconfig.json
diff --git a/apps/angular/pipe-intermediate/.eslintrc.json b/apps/angular/9-wrap-function-pipe/.eslintrc.json
similarity index 100%
rename from apps/angular/pipe-intermediate/.eslintrc.json
rename to apps/angular/9-wrap-function-pipe/.eslintrc.json
diff --git a/apps/angular/pipe-intermediate/README.md b/apps/angular/9-wrap-function-pipe/README.md
similarity index 84%
rename from apps/angular/pipe-intermediate/README.md
rename to apps/angular/9-wrap-function-pipe/README.md
index 72809fd..1491e7d 100644
--- a/apps/angular/pipe-intermediate/README.md
+++ b/apps/angular/9-wrap-function-pipe/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-pipe-intermediate
+npx nx serve angular-wrap-function-pipe
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/permissions/project.json b/apps/angular/9-wrap-function-pipe/project.json
similarity index 64%
rename from apps/angular/permissions/project.json
rename to apps/angular/9-wrap-function-pipe/project.json
index a594781..4480279 100644
--- a/apps/angular/permissions/project.json
+++ b/apps/angular/9-wrap-function-pipe/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "angular-permissions",
+  "name": "angular-wrap-function-pipe",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/angular/permissions/src",
+  "sourceRoot": "apps/angular/9-wrap-function-pipe/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/permissions",
-        "index": "apps/angular/permissions/src/index.html",
-        "main": "apps/angular/permissions/src/main.ts",
-        "polyfills": "apps/angular/permissions/src/polyfills.ts",
-        "tsConfig": "apps/angular/permissions/tsconfig.app.json",
+        "outputPath": "dist/apps/angular/9-wrap-function-pipe",
+        "index": "apps/angular/9-wrap-function-pipe/src/index.html",
+        "main": "apps/angular/9-wrap-function-pipe/src/main.ts",
+        "polyfills": "apps/angular/9-wrap-function-pipe/src/polyfills.ts",
+        "tsConfig": "apps/angular/9-wrap-function-pipe/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/permissions/src/favicon.ico",
-          "apps/angular/permissions/src/assets"
+          "apps/angular/9-wrap-function-pipe/src/favicon.ico",
+          "apps/angular/9-wrap-function-pipe/src/assets"
         ],
-        "styles": ["apps/angular/permissions/src/styles.scss"],
+        "styles": ["apps/angular/9-wrap-function-pipe/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-permissions:build:production"
+          "buildTarget": "angular-wrap-function-pipe:build:production"
         },
         "development": {
-          "buildTarget": "angular-permissions:build:development"
+          "buildTarget": "angular-wrap-function-pipe:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-permissions:build"
+        "buildTarget": "angular-wrap-function-pipe:build"
       }
     },
     "lint": {
diff --git a/apps/angular/pipe-intermediate/src/app/app.component.ts b/apps/angular/9-wrap-function-pipe/src/app/app.component.ts
similarity index 100%
rename from apps/angular/pipe-intermediate/src/app/app.component.ts
rename to apps/angular/9-wrap-function-pipe/src/app/app.component.ts
diff --git a/apps/angular/router-input/src/assets/.gitkeep b/apps/angular/9-wrap-function-pipe/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/router-input/src/assets/.gitkeep
rename to apps/angular/9-wrap-function-pipe/src/assets/.gitkeep
diff --git a/apps/angular/router-input/src/favicon.ico b/apps/angular/9-wrap-function-pipe/src/favicon.ico
similarity index 100%
rename from apps/angular/router-input/src/favicon.ico
rename to apps/angular/9-wrap-function-pipe/src/favicon.ico
diff --git a/apps/angular/pipe-intermediate/src/index.html b/apps/angular/9-wrap-function-pipe/src/index.html
similarity index 100%
rename from apps/angular/pipe-intermediate/src/index.html
rename to apps/angular/9-wrap-function-pipe/src/index.html
diff --git a/apps/angular/pipe-intermediate/src/main.ts b/apps/angular/9-wrap-function-pipe/src/main.ts
similarity index 100%
rename from apps/angular/pipe-intermediate/src/main.ts
rename to apps/angular/9-wrap-function-pipe/src/main.ts
diff --git a/apps/angular/pipe-intermediate/src/polyfills.ts b/apps/angular/9-wrap-function-pipe/src/polyfills.ts
similarity index 100%
rename from apps/angular/pipe-intermediate/src/polyfills.ts
rename to apps/angular/9-wrap-function-pipe/src/polyfills.ts
diff --git a/apps/angular/styling/src/styles.scss b/apps/angular/9-wrap-function-pipe/src/styles.scss
similarity index 100%
rename from apps/angular/styling/src/styles.scss
rename to apps/angular/9-wrap-function-pipe/src/styles.scss
diff --git a/apps/angular/pipe-intermediate/tsconfig.app.json b/apps/angular/9-wrap-function-pipe/tsconfig.app.json
similarity index 100%
rename from apps/angular/pipe-intermediate/tsconfig.app.json
rename to apps/angular/9-wrap-function-pipe/tsconfig.app.json
diff --git a/apps/angular/pipe-intermediate/tsconfig.editor.json b/apps/angular/9-wrap-function-pipe/tsconfig.editor.json
similarity index 100%
rename from apps/angular/pipe-intermediate/tsconfig.editor.json
rename to apps/angular/9-wrap-function-pipe/tsconfig.editor.json
diff --git a/apps/angular/pipe-intermediate/tsconfig.json b/apps/angular/9-wrap-function-pipe/tsconfig.json
similarity index 100%
rename from apps/angular/pipe-intermediate/tsconfig.json
rename to apps/angular/9-wrap-function-pipe/tsconfig.json
diff --git a/apps/angular/di/src/app/app.component.ts b/apps/angular/di/src/app/app.component.ts
index e57a5a5..d18319b 100644
--- a/apps/angular/di/src/app/app.component.ts
+++ b/apps/angular/di/src/app/app.component.ts
@@ -1,6 +1,6 @@
-import { TableComponent } from '@angular-challenges/angular/di';
 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/styling/.eslintrc.json b/apps/signal/30-interop-rxjs-signal/.eslintrc.json
similarity index 100%
rename from apps/angular/styling/.eslintrc.json
rename to apps/signal/30-interop-rxjs-signal/.eslintrc.json
diff --git a/apps/angular/interop-rxjs-signal/README.md b/apps/signal/30-interop-rxjs-signal/README.md
similarity index 85%
rename from apps/angular/interop-rxjs-signal/README.md
rename to apps/signal/30-interop-rxjs-signal/README.md
index 9cf32ef..f726d1b 100644
--- a/apps/angular/interop-rxjs-signal/README.md
+++ b/apps/signal/30-interop-rxjs-signal/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-interop-rxjs-signal
+npx nx serve signal-interop-rxjs-signal
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/bug-cd/jest.config.ts b/apps/signal/30-interop-rxjs-signal/jest.config.ts
similarity index 83%
rename from apps/angular/bug-cd/jest.config.ts
rename to apps/signal/30-interop-rxjs-signal/jest.config.ts
index 1f24a7c..9f20017 100644
--- a/apps/angular/bug-cd/jest.config.ts
+++ b/apps/signal/30-interop-rxjs-signal/jest.config.ts
@@ -1,9 +1,9 @@
 /* eslint-disable */
 export default {
-  displayName: 'angular-bug-cd',
+  displayName: 'signal-interop-rxjs-signal',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/apps/angular/bug-cd',
+  coverageDirectory: '../../../coverage/apps/signal/30-interop-rxjs-signal',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/angular/interop-rxjs-signal/project.json b/apps/signal/30-interop-rxjs-signal/project.json
similarity index 67%
rename from apps/angular/interop-rxjs-signal/project.json
rename to apps/signal/30-interop-rxjs-signal/project.json
index 5009d47..e0fdf37 100644
--- a/apps/angular/interop-rxjs-signal/project.json
+++ b/apps/signal/30-interop-rxjs-signal/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "angular-interop-rxjs-signal",
+  "name": "signal-interop-rxjs-signal",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/interop-rxjs-signal/src",
+  "sourceRoot": "apps/signal/30-interop-rxjs-signal/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/interop-rxjs-signal",
-        "index": "apps/angular/interop-rxjs-signal/src/index.html",
-        "main": "apps/angular/interop-rxjs-signal/src/main.ts",
+        "outputPath": "dist/apps/signal/30-interop-rxjs-signal",
+        "index": "apps/signal/30-interop-rxjs-signal/src/index.html",
+        "main": "apps/signal/30-interop-rxjs-signal/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/interop-rxjs-signal/tsconfig.app.json",
+        "tsConfig": "apps/signal/30-interop-rxjs-signal/tsconfig.app.json",
         "assets": [
-          "apps/angular/interop-rxjs-signal/src/favicon.ico",
-          "apps/angular/interop-rxjs-signal/src/assets"
+          "apps/signal/30-interop-rxjs-signal/src/favicon.ico",
+          "apps/signal/30-interop-rxjs-signal/src/assets"
         ],
         "styles": [
-          "apps/angular/interop-rxjs-signal/src/styles.scss",
+          "apps/signal/30-interop-rxjs-signal/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": "angular-interop-rxjs-signal:build:production"
+          "buildTarget": "signal-interop-rxjs-signal:build:production"
         },
         "development": {
-          "buildTarget": "angular-interop-rxjs-signal:build:development"
+          "buildTarget": "signal-interop-rxjs-signal:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -67,7 +67,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-interop-rxjs-signal:build"
+        "buildTarget": "signal-interop-rxjs-signal:build"
       }
     },
     "lint": {
@@ -77,7 +77,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/angular/interop-rxjs-signal/jest.config.ts"
+        "jestConfig": "apps/signal/30-interop-rxjs-signal/jest.config.ts"
       }
     }
   }
diff --git a/apps/angular/interop-rxjs-signal/src/app/app.component.ts b/apps/signal/30-interop-rxjs-signal/src/app/app.component.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/app/app.component.ts
rename to apps/signal/30-interop-rxjs-signal/src/app/app.component.ts
diff --git a/apps/angular/interop-rxjs-signal/src/app/app.config.ts b/apps/signal/30-interop-rxjs-signal/src/app/app.config.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/app/app.config.ts
rename to apps/signal/30-interop-rxjs-signal/src/app/app.config.ts
diff --git a/apps/angular/interop-rxjs-signal/src/app/detail/detail.component.ts b/apps/signal/30-interop-rxjs-signal/src/app/detail/detail.component.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/app/detail/detail.component.ts
rename to apps/signal/30-interop-rxjs-signal/src/app/detail/detail.component.ts
diff --git a/apps/angular/interop-rxjs-signal/src/app/list/photos.component.ts b/apps/signal/30-interop-rxjs-signal/src/app/list/photos.component.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/app/list/photos.component.ts
rename to apps/signal/30-interop-rxjs-signal/src/app/list/photos.component.ts
diff --git a/apps/angular/interop-rxjs-signal/src/app/list/photos.store.ts b/apps/signal/30-interop-rxjs-signal/src/app/list/photos.store.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/app/list/photos.store.ts
rename to apps/signal/30-interop-rxjs-signal/src/app/list/photos.store.ts
diff --git a/apps/angular/interop-rxjs-signal/src/app/photo.model.ts b/apps/signal/30-interop-rxjs-signal/src/app/photo.model.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/app/photo.model.ts
rename to apps/signal/30-interop-rxjs-signal/src/app/photo.model.ts
diff --git a/apps/angular/interop-rxjs-signal/src/app/photos.service.ts b/apps/signal/30-interop-rxjs-signal/src/app/photos.service.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/app/photos.service.ts
rename to apps/signal/30-interop-rxjs-signal/src/app/photos.service.ts
diff --git a/apps/angular/signal-input/src/assets/.gitkeep b/apps/signal/30-interop-rxjs-signal/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/signal-input/src/assets/.gitkeep
rename to apps/signal/30-interop-rxjs-signal/src/assets/.gitkeep
diff --git a/apps/angular/signal-input/src/favicon.ico b/apps/signal/30-interop-rxjs-signal/src/favicon.ico
similarity index 100%
rename from apps/angular/signal-input/src/favicon.ico
rename to apps/signal/30-interop-rxjs-signal/src/favicon.ico
diff --git a/apps/angular/interop-rxjs-signal/src/index.html b/apps/signal/30-interop-rxjs-signal/src/index.html
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/index.html
rename to apps/signal/30-interop-rxjs-signal/src/index.html
diff --git a/apps/angular/router-input/src/main.ts b/apps/signal/30-interop-rxjs-signal/src/main.ts
similarity index 100%
rename from apps/angular/router-input/src/main.ts
rename to apps/signal/30-interop-rxjs-signal/src/main.ts
diff --git a/apps/angular/permissions/src/styles.scss b/apps/signal/30-interop-rxjs-signal/src/styles.scss
similarity index 100%
rename from apps/angular/permissions/src/styles.scss
rename to apps/signal/30-interop-rxjs-signal/src/styles.scss
diff --git a/apps/angular/interop-rxjs-signal/src/test-setup.ts b/apps/signal/30-interop-rxjs-signal/src/test-setup.ts
similarity index 100%
rename from apps/angular/interop-rxjs-signal/src/test-setup.ts
rename to apps/signal/30-interop-rxjs-signal/src/test-setup.ts
diff --git a/apps/angular/permissions/tailwind.config.js b/apps/signal/30-interop-rxjs-signal/tailwind.config.js
similarity index 100%
rename from apps/angular/permissions/tailwind.config.js
rename to apps/signal/30-interop-rxjs-signal/tailwind.config.js
diff --git a/apps/angular/signal-input/tsconfig.app.json b/apps/signal/30-interop-rxjs-signal/tsconfig.app.json
similarity index 100%
rename from apps/angular/signal-input/tsconfig.app.json
rename to apps/signal/30-interop-rxjs-signal/tsconfig.app.json
diff --git a/apps/angular/interop-rxjs-signal/tsconfig.editor.json b/apps/signal/30-interop-rxjs-signal/tsconfig.editor.json
similarity index 100%
rename from apps/angular/interop-rxjs-signal/tsconfig.editor.json
rename to apps/signal/30-interop-rxjs-signal/tsconfig.editor.json
diff --git a/apps/angular/interop-rxjs-signal/tsconfig.json b/apps/signal/30-interop-rxjs-signal/tsconfig.json
similarity index 100%
rename from apps/angular/interop-rxjs-signal/tsconfig.json
rename to apps/signal/30-interop-rxjs-signal/tsconfig.json
diff --git a/apps/angular/interop-rxjs-signal/tsconfig.spec.json b/apps/signal/30-interop-rxjs-signal/tsconfig.spec.json
similarity index 100%
rename from apps/angular/interop-rxjs-signal/tsconfig.spec.json
rename to apps/signal/30-interop-rxjs-signal/tsconfig.spec.json
diff --git a/apps/angular/signal-input/.eslintrc.json b/apps/signal/43-signal-input/.eslintrc.json
similarity index 100%
rename from apps/angular/signal-input/.eslintrc.json
rename to apps/signal/43-signal-input/.eslintrc.json
diff --git a/apps/angular/signal-input/README.md b/apps/signal/43-signal-input/README.md
similarity index 86%
rename from apps/angular/signal-input/README.md
rename to apps/signal/43-signal-input/README.md
index 78ef74d..f9acf39 100644
--- a/apps/angular/signal-input/README.md
+++ b/apps/signal/43-signal-input/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve angular-signal-input
+npx nx serve signal-signal-input
 ```
 
 ### Documentation and Instruction
diff --git a/apps/angular/signal-input/project.json b/apps/signal/43-signal-input/project.json
similarity index 68%
rename from apps/angular/signal-input/project.json
rename to apps/signal/43-signal-input/project.json
index 00f1a67..bea0333 100644
--- a/apps/angular/signal-input/project.json
+++ b/apps/signal/43-signal-input/project.json
@@ -1,26 +1,26 @@
 {
-  "name": "angular-signal-input",
+  "name": "signal-signal-input",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "prefix": "app",
-  "sourceRoot": "apps/angular/signal-input/src",
+  "sourceRoot": "apps/signal/43-signal-input/src",
   "tags": [],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:application",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/angular/signal-input",
-        "index": "apps/angular/signal-input/src/index.html",
-        "browser": "apps/angular/signal-input/src/main.ts",
+        "outputPath": "dist/apps/signal/43-signal-input",
+        "index": "apps/signal/43-signal-input/src/index.html",
+        "browser": "apps/signal/43-signal-input/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/angular/signal-input/tsconfig.app.json",
+        "tsConfig": "apps/signal/43-signal-input/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/angular/signal-input/src/favicon.ico",
-          "apps/angular/signal-input/src/assets"
+          "apps/signal/43-signal-input/src/favicon.ico",
+          "apps/signal/43-signal-input/src/assets"
         ],
-        "styles": ["apps/angular/signal-input/src/styles.scss"],
+        "styles": ["apps/signal/43-signal-input/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -51,10 +51,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "buildTarget": "angular-signal-input:build:production"
+          "buildTarget": "signal-signal-input:build:production"
         },
         "development": {
-          "buildTarget": "angular-signal-input:build:development"
+          "buildTarget": "signal-signal-input:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -62,7 +62,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "buildTarget": "angular-signal-input:build"
+        "buildTarget": "signal-signal-input:build"
       }
     },
     "lint": {
diff --git a/apps/angular/signal-input/src/app/app.component.ts b/apps/signal/43-signal-input/src/app/app.component.ts
similarity index 100%
rename from apps/angular/signal-input/src/app/app.component.ts
rename to apps/signal/43-signal-input/src/app/app.component.ts
diff --git a/apps/angular/signal-input/src/app/app.config.ts b/apps/signal/43-signal-input/src/app/app.config.ts
similarity index 100%
rename from apps/angular/signal-input/src/app/app.config.ts
rename to apps/signal/43-signal-input/src/app/app.config.ts
diff --git a/apps/angular/signal-input/src/app/user.component.ts b/apps/signal/43-signal-input/src/app/user.component.ts
similarity index 100%
rename from apps/angular/signal-input/src/app/user.component.ts
rename to apps/signal/43-signal-input/src/app/user.component.ts
diff --git a/apps/angular/styling/src/assets/.gitkeep b/apps/signal/43-signal-input/src/assets/.gitkeep
similarity index 100%
rename from apps/angular/styling/src/assets/.gitkeep
rename to apps/signal/43-signal-input/src/assets/.gitkeep
diff --git a/apps/angular/styling/src/favicon.ico b/apps/signal/43-signal-input/src/favicon.ico
similarity index 100%
rename from apps/angular/styling/src/favicon.ico
rename to apps/signal/43-signal-input/src/favicon.ico
diff --git a/apps/angular/signal-input/src/index.html b/apps/signal/43-signal-input/src/index.html
similarity index 100%
rename from apps/angular/signal-input/src/index.html
rename to apps/signal/43-signal-input/src/index.html
diff --git a/apps/angular/signal-input/src/main.ts b/apps/signal/43-signal-input/src/main.ts
similarity index 100%
rename from apps/angular/signal-input/src/main.ts
rename to apps/signal/43-signal-input/src/main.ts
diff --git a/apps/angular/signal-input/src/styles.scss b/apps/signal/43-signal-input/src/styles.scss
similarity index 100%
rename from apps/angular/signal-input/src/styles.scss
rename to apps/signal/43-signal-input/src/styles.scss
diff --git a/apps/angular/signal-input/tailwind.config.js b/apps/signal/43-signal-input/tailwind.config.js
similarity index 100%
rename from apps/angular/signal-input/tailwind.config.js
rename to apps/signal/43-signal-input/tailwind.config.js
diff --git a/apps/angular/styling/tsconfig.app.json b/apps/signal/43-signal-input/tsconfig.app.json
similarity index 100%
rename from apps/angular/styling/tsconfig.app.json
rename to apps/signal/43-signal-input/tsconfig.app.json
diff --git a/apps/angular/styling/tsconfig.editor.json b/apps/signal/43-signal-input/tsconfig.editor.json
similarity index 100%
rename from apps/angular/styling/tsconfig.editor.json
rename to apps/signal/43-signal-input/tsconfig.editor.json
diff --git a/apps/angular/signal-input/tsconfig.json b/apps/signal/43-signal-input/tsconfig.json
similarity index 100%
rename from apps/angular/signal-input/tsconfig.json
rename to apps/signal/43-signal-input/tsconfig.json
diff --git a/docs/src/content/docs/challenges/angular/10-pipe-utility.md b/docs/src/content/docs/challenges/angular/10-utility-wrapper-pipe.md
similarity index 97%
rename from docs/src/content/docs/challenges/angular/10-pipe-utility.md
rename to docs/src/content/docs/challenges/angular/10-utility-wrapper-pipe.md
index 3dd9797..ea5d109 100644
--- a/docs/src/content/docs/challenges/angular/10-pipe-utility.md
+++ b/docs/src/content/docs/challenges/angular/10-utility-wrapper-pipe.md
@@ -7,7 +7,7 @@ contributors:
   - tomer953
   - svenson95
 challengeNumber: 10
-command: angular-pipe-hard
+command: angular-utility-wrapper-pipe
 sidebar:
   order: 202
 ---
diff --git a/docs/src/content/docs/challenges/angular/13-styling.md b/docs/src/content/docs/challenges/angular/13-highly-customizable-css.md
similarity index 95%
rename from docs/src/content/docs/challenges/angular/13-styling.md
rename to docs/src/content/docs/challenges/angular/13-highly-customizable-css.md
index 5210448..7508c11 100644
--- a/docs/src/content/docs/challenges/angular/13-styling.md
+++ b/docs/src/content/docs/challenges/angular/13-highly-customizable-css.md
@@ -7,7 +7,7 @@ contributors:
   - tomer953
   - kabrunko-dev
 challengeNumber: 13
-command: angular-styling
+command: angular-highly-customizable-css
 sidebar:
   order: 104
 ---
diff --git a/docs/src/content/docs/challenges/angular/16-di.md b/docs/src/content/docs/challenges/angular/16-master-dependency-injection.md
similarity index 95%
rename from docs/src/content/docs/challenges/angular/16-di.md
rename to docs/src/content/docs/challenges/angular/16-master-dependency-injection.md
index c0dddf9..caf99bd 100644
--- a/docs/src/content/docs/challenges/angular/16-di.md
+++ b/docs/src/content/docs/challenges/angular/16-master-dependency-injection.md
@@ -7,7 +7,7 @@ contributors:
   - tomer953
   - kabrunko-dev
 challengeNumber: 16
-command: angular-di
+command: angular-master-dependency-injection
 sidebar:
   order: 203
 ---
diff --git a/docs/src/content/docs/challenges/angular/3-directive-enhancement.md b/docs/src/content/docs/challenges/angular/3-directive-enhancement.md
index 6d5ede9..72e4cd0 100644
--- a/docs/src/content/docs/challenges/angular/3-directive-enhancement.md
+++ b/docs/src/content/docs/challenges/angular/3-directive-enhancement.md
@@ -8,7 +8,7 @@ contributors:
   - kabrunko-dev
   - svenson95
 challengeNumber: 3
-command: angular-ngfor-enhancement
+command: angular-directive-enhancement
 blogLink: https://medium.com/@thomas.laforge/ngfor-enhancement-716b44656a6c
 sidebar:
   order: 101
diff --git a/docs/src/content/docs/challenges/angular/32-bug-cd.md b/docs/src/content/docs/challenges/angular/32-change-detection-bug.md
similarity index 97%
rename from docs/src/content/docs/challenges/angular/32-bug-cd.md
rename to docs/src/content/docs/challenges/angular/32-change-detection-bug.md
index 6d5ebdb..cd88f3b 100644
--- a/docs/src/content/docs/challenges/angular/32-bug-cd.md
+++ b/docs/src/content/docs/challenges/angular/32-change-detection-bug.md
@@ -7,7 +7,7 @@ contributors:
   - tomer953
   - jdegand
 challengeNumber: 32
-command: angular-bug-cd
+command: angular-change-detection-bug
 blogLink: https://medium.com/ngconf/function-calls-inside-template-are-dangerous-15f9822a6629
 sidebar:
   order: 105
diff --git a/docs/src/content/docs/challenges/angular/33-decoupling.md b/docs/src/content/docs/challenges/angular/33-decoupling-components.md
similarity index 98%
rename from docs/src/content/docs/challenges/angular/33-decoupling.md
rename to docs/src/content/docs/challenges/angular/33-decoupling-components.md
index 5a2ea6c..8310462 100644
--- a/docs/src/content/docs/challenges/angular/33-decoupling.md
+++ b/docs/src/content/docs/challenges/angular/33-decoupling-components.md
@@ -6,7 +6,7 @@ contributors:
   - tomalaforge
   - jdegand
 challengeNumber: 33
-command: angular-decoupling
+command: angular-decoupling-components
 sidebar:
   order: 106
 ---
diff --git a/docs/src/content/docs/challenges/angular/5-crud.md b/docs/src/content/docs/challenges/angular/5-crud-application.md
similarity index 98%
rename from docs/src/content/docs/challenges/angular/5-crud.md
rename to docs/src/content/docs/challenges/angular/5-crud-application.md
index 9139e1a..6b36c30 100644
--- a/docs/src/content/docs/challenges/angular/5-crud.md
+++ b/docs/src/content/docs/challenges/angular/5-crud-application.md
@@ -8,7 +8,7 @@ contributors:
   - svenson95
   - jdegand
 challengeNumber: 5
-command: angular-crud
+command: angular-crud-application
 sidebar:
   order: 2
 ---
diff --git a/docs/src/content/docs/challenges/angular/6-permissions.md b/docs/src/content/docs/challenges/angular/6-structural-directive.md
similarity index 98%
rename from docs/src/content/docs/challenges/angular/6-permissions.md
rename to docs/src/content/docs/challenges/angular/6-structural-directive.md
index f6c4f50..48cae6f 100644
--- a/docs/src/content/docs/challenges/angular/6-permissions.md
+++ b/docs/src/content/docs/challenges/angular/6-structural-directive.md
@@ -8,7 +8,7 @@ contributors:
   - kabrunko-dev
   - svenson95
 challengeNumber: 6
-command: angular-permissions
+command: angular-structural-directive
 blogLink: https://medium.com/@thomas.laforge/create-a-custom-structural-directive-to-manage-permissions-like-a-pro-11a1acad30ad
 sidebar:
   order: 102
diff --git a/docs/src/content/docs/challenges/angular/8-pipe-pure.md b/docs/src/content/docs/challenges/angular/8-pure-pipe.md
similarity index 98%
rename from docs/src/content/docs/challenges/angular/8-pipe-pure.md
rename to docs/src/content/docs/challenges/angular/8-pure-pipe.md
index 9530053..e022888 100644
--- a/docs/src/content/docs/challenges/angular/8-pipe-pure.md
+++ b/docs/src/content/docs/challenges/angular/8-pure-pipe.md
@@ -8,7 +8,7 @@ contributors:
   - kabrunko-dev
   - svenson95
 challengeNumber: 8
-command: angular-pipe-easy
+command: angular-pure-pipe
 blogLink: https://medium.com/ngconf/deep-dive-into-angular-pipes-c040588cd15d
 sidebar:
   order: 3
diff --git a/docs/src/content/docs/challenges/angular/9-pipe-wrapFn.md b/docs/src/content/docs/challenges/angular/9-wrap-function-pipe.md
similarity index 98%
rename from docs/src/content/docs/challenges/angular/9-pipe-wrapFn.md
rename to docs/src/content/docs/challenges/angular/9-wrap-function-pipe.md
index 23d43ea..a9c2545 100644
--- a/docs/src/content/docs/challenges/angular/9-pipe-wrapFn.md
+++ b/docs/src/content/docs/challenges/angular/9-wrap-function-pipe.md
@@ -8,7 +8,7 @@ contributors:
   - kabrunko-dev
   - svenson95
 challengeNumber: 9
-command: angular-pipe-intermediate
+command: angular-wrap-function-pipe
 blogLink: https://medium.com/ngconf/boost-your-apps-performance-by-wrapping-your-functions-inside-a-pipe-7e889a901d1d
 sidebar:
   order: 103
diff --git a/docs/src/content/docs/challenges/angular/30-interop-rxjs-signal.md b/docs/src/content/docs/challenges/signal/30-interop-rxjs-signal.md
similarity index 95%
rename from docs/src/content/docs/challenges/angular/30-interop-rxjs-signal.md
rename to docs/src/content/docs/challenges/signal/30-interop-rxjs-signal.md
index 223dff5..08489c8 100644
--- a/docs/src/content/docs/challenges/angular/30-interop-rxjs-signal.md
+++ b/docs/src/content/docs/challenges/signal/30-interop-rxjs-signal.md
@@ -6,7 +6,7 @@ contributors:
   - tomalaforge
   - tomer953
 challengeNumber: 30
-command: angular-interop-rxjs-signal
+command: signal-interop-rxjs-signal
 sidebar:
   order: 204
 ---
diff --git a/docs/src/content/docs/challenges/angular/43-signal-input.md b/docs/src/content/docs/challenges/signal/43-signal-input.md
similarity index 97%
rename from docs/src/content/docs/challenges/angular/43-signal-input.md
rename to docs/src/content/docs/challenges/signal/43-signal-input.md
index 79c6d12..0ab0498 100644
--- a/docs/src/content/docs/challenges/angular/43-signal-input.md
+++ b/docs/src/content/docs/challenges/signal/43-signal-input.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - tomalaforge
 challengeNumber: 43
-command: angular-signal-input
+command: signal-signal-input
 sidebar:
   order: 16
 ---
diff --git a/docs/src/content/docs/es/challenges/angular/10-pipe-utility.md b/docs/src/content/docs/es/challenges/angular/10-utility-wrapper-pipe.md
similarity index 96%
rename from docs/src/content/docs/es/challenges/angular/10-pipe-utility.md
rename to docs/src/content/docs/es/challenges/angular/10-utility-wrapper-pipe.md
index c3698a6..1afacbd 100644
--- a/docs/src/content/docs/es/challenges/angular/10-pipe-utility.md
+++ b/docs/src/content/docs/es/challenges/angular/10-utility-wrapper-pipe.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 10
-command: angular-pipe-hard
+command: angular-utility-wrapper-pipe
 sidebar:
   order: 202
 ---
diff --git a/docs/src/content/docs/es/challenges/angular/13-styling.md b/docs/src/content/docs/es/challenges/angular/13-highly-customizable-css.md
similarity index 96%
rename from docs/src/content/docs/es/challenges/angular/13-styling.md
rename to docs/src/content/docs/es/challenges/angular/13-highly-customizable-css.md
index 1d7d49e..a3aaa71 100644
--- a/docs/src/content/docs/es/challenges/angular/13-styling.md
+++ b/docs/src/content/docs/es/challenges/angular/13-highly-customizable-css.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 13
-command: angular-styling
+command: angular-highly-customizable-css
 sidebar:
   order: 104
 ---
diff --git a/docs/src/content/docs/es/challenges/angular/16-di.md b/docs/src/content/docs/es/challenges/angular/16-master-dependency-injection.md
similarity index 96%
rename from docs/src/content/docs/es/challenges/angular/16-di.md
rename to docs/src/content/docs/es/challenges/angular/16-master-dependency-injection.md
index 547a732..8822f6f 100644
--- a/docs/src/content/docs/es/challenges/angular/16-di.md
+++ b/docs/src/content/docs/es/challenges/angular/16-master-dependency-injection.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 16
-command: angular-di
+command: angular-master-dependency-injection
 sidebar:
   order: 203
 ---
diff --git a/docs/src/content/docs/es/challenges/angular/3-directive-enhancement.md b/docs/src/content/docs/es/challenges/angular/3-directive-enhancement.md
index 8708bb4..71bd239 100644
--- a/docs/src/content/docs/es/challenges/angular/3-directive-enhancement.md
+++ b/docs/src/content/docs/es/challenges/angular/3-directive-enhancement.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 3
-command: angular-ngfor-enhancement
+command: angular-directive-enhancement
 blogLink: https://medium.com/@thomas.laforge/ngfor-enhancement-716b44656a6c
 sidebar:
   order: 101
diff --git a/docs/src/content/docs/es/challenges/angular/32-bug-cd.md b/docs/src/content/docs/es/challenges/angular/32-change-detection-bug.md
similarity index 97%
rename from docs/src/content/docs/es/challenges/angular/32-bug-cd.md
rename to docs/src/content/docs/es/challenges/angular/32-change-detection-bug.md
index cdc3866..f1dee14 100644
--- a/docs/src/content/docs/es/challenges/angular/32-bug-cd.md
+++ b/docs/src/content/docs/es/challenges/angular/32-change-detection-bug.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 32
-command: angular-bug-cd
+command: angular-change-detection-bug
 blogLink: https://medium.com/ngconf/function-calls-inside-template-are-dangerous-15f9822a6629
 sidebar:
   order: 105
diff --git a/docs/src/content/docs/es/challenges/angular/33-decoupling.md b/docs/src/content/docs/es/challenges/angular/33-decoupling-components.md
similarity index 98%
rename from docs/src/content/docs/es/challenges/angular/33-decoupling.md
rename to docs/src/content/docs/es/challenges/angular/33-decoupling-components.md
index 8629a5f..1af6a2d 100644
--- a/docs/src/content/docs/es/challenges/angular/33-decoupling.md
+++ b/docs/src/content/docs/es/challenges/angular/33-decoupling-components.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 33
-command: angular-decoupling
+command: angular-decoupling-components
 sidebar:
   order: 106
 ---
diff --git a/docs/src/content/docs/es/challenges/angular/5-crud.md b/docs/src/content/docs/es/challenges/angular/5-crud-application.md
similarity index 98%
rename from docs/src/content/docs/es/challenges/angular/5-crud.md
rename to docs/src/content/docs/es/challenges/angular/5-crud-application.md
index 05e069d..803a33d 100644
--- a/docs/src/content/docs/es/challenges/angular/5-crud.md
+++ b/docs/src/content/docs/es/challenges/angular/5-crud-application.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 5
-command: angular-crud
+command: angular-crud-application
 sidebar:
   order: 2
 ---
diff --git a/docs/src/content/docs/es/challenges/angular/6-permissions.md b/docs/src/content/docs/es/challenges/angular/6-structural-directive.md
similarity index 97%
rename from docs/src/content/docs/es/challenges/angular/6-permissions.md
rename to docs/src/content/docs/es/challenges/angular/6-structural-directive.md
index d0e604a..c819673 100644
--- a/docs/src/content/docs/es/challenges/angular/6-permissions.md
+++ b/docs/src/content/docs/es/challenges/angular/6-structural-directive.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 6
-command: angular-permissions
+command: angular-structural-directive
 blogLink: https://medium.com/@thomas.laforge/create-a-custom-structural-directive-to-manage-permissions-like-a-pro-11a1acad30ad
 sidebar:
   order: 102
diff --git a/docs/src/content/docs/es/challenges/angular/8-pipe-pure.md b/docs/src/content/docs/es/challenges/angular/8-pure-pipe.md
similarity index 96%
rename from docs/src/content/docs/es/challenges/angular/8-pipe-pure.md
rename to docs/src/content/docs/es/challenges/angular/8-pure-pipe.md
index 40a4022..814783e 100644
--- a/docs/src/content/docs/es/challenges/angular/8-pipe-pure.md
+++ b/docs/src/content/docs/es/challenges/angular/8-pure-pipe.md
@@ -6,7 +6,7 @@ contributors:
   - ErickRodrCodes
   - kabrunko - dev
 challengeNumber: 8
-command: angular-pipe-easy
+command: angular-pure-pipe
 blogLink: https://medium.com/ngconf/deep-dive-into-angular-pipes-c040588cd15d
 sidebar:
   order: 3
diff --git a/docs/src/content/docs/es/challenges/angular/9-pipe-wrapFn.md b/docs/src/content/docs/es/challenges/angular/9-wrap-function-pipe.md
similarity index 97%
rename from docs/src/content/docs/es/challenges/angular/9-pipe-wrapFn.md
rename to docs/src/content/docs/es/challenges/angular/9-wrap-function-pipe.md
index ef9c9ec..11b652f 100644
--- a/docs/src/content/docs/es/challenges/angular/9-pipe-wrapFn.md
+++ b/docs/src/content/docs/es/challenges/angular/9-wrap-function-pipe.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 9
-command: angular-pipe-intermediate
+command: angular-wrap-function-pipe
 blogLink: https://medium.com/ngconf/boost-your-apps-performance-by-wrapping-your-functions-inside-a-pipe-7e889a901d1d
 sidebar:
   order: 103
diff --git a/docs/src/content/docs/es/challenges/angular/30-interop-rxjs-signal.md b/docs/src/content/docs/es/challenges/signal/30-interop-rxjs-signal.md
similarity index 95%
rename from docs/src/content/docs/es/challenges/angular/30-interop-rxjs-signal.md
rename to docs/src/content/docs/es/challenges/signal/30-interop-rxjs-signal.md
index 2bceced..0f6f853 100644
--- a/docs/src/content/docs/es/challenges/angular/30-interop-rxjs-signal.md
+++ b/docs/src/content/docs/es/challenges/signal/30-interop-rxjs-signal.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - ErickRodrCodes
 challengeNumber: 30
-command: angular-interop-rxjs-signal
+command: signal-interop-rxjs-signal
 sidebar:
   order: 204
 ---
diff --git a/docs/src/content/docs/pt/challenges/angular/10-pipe-utility.md b/docs/src/content/docs/pt/challenges/angular/10-utility-wrapper-pipe.md
similarity index 97%
rename from docs/src/content/docs/pt/challenges/angular/10-pipe-utility.md
rename to docs/src/content/docs/pt/challenges/angular/10-utility-wrapper-pipe.md
index 6e4f355..6b01356 100644
--- a/docs/src/content/docs/pt/challenges/angular/10-pipe-utility.md
+++ b/docs/src/content/docs/pt/challenges/angular/10-utility-wrapper-pipe.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 10
-command: angular-pipe-hard
+command: angular-utility-wrapper-pipe
 sidebar:
   order: 202
 ---
diff --git a/docs/src/content/docs/pt/challenges/angular/13-styling.md b/docs/src/content/docs/pt/challenges/angular/13-highly-customizable-css.md
similarity index 95%
rename from docs/src/content/docs/pt/challenges/angular/13-styling.md
rename to docs/src/content/docs/pt/challenges/angular/13-highly-customizable-css.md
index f6e48bb..de0b96b 100644
--- a/docs/src/content/docs/pt/challenges/angular/13-styling.md
+++ b/docs/src/content/docs/pt/challenges/angular/13-highly-customizable-css.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 13
-command: angular-styling
+command: angular-highly-customizable-css
 sidebar:
   order: 104
 ---
diff --git a/docs/src/content/docs/pt/challenges/angular/16-di.md b/docs/src/content/docs/pt/challenges/angular/16-master-dependency-injection.md
similarity index 95%
rename from docs/src/content/docs/pt/challenges/angular/16-di.md
rename to docs/src/content/docs/pt/challenges/angular/16-master-dependency-injection.md
index 8814798..008e8b2 100644
--- a/docs/src/content/docs/pt/challenges/angular/16-di.md
+++ b/docs/src/content/docs/pt/challenges/angular/16-master-dependency-injection.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 16
-command: angular-di
+command: angular-master-dependency-injection
 sidebar:
   order: 203
 ---
diff --git a/docs/src/content/docs/pt/challenges/angular/3-directive-enhancement.md b/docs/src/content/docs/pt/challenges/angular/3-directive-enhancement.md
index 330410b..97541bc 100644
--- a/docs/src/content/docs/pt/challenges/angular/3-directive-enhancement.md
+++ b/docs/src/content/docs/pt/challenges/angular/3-directive-enhancement.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 3
-command: angular-ngfor-enhancement
+command: angular-directive-enhancement
 blogLink: https://medium.com/@thomas.laforge/ngfor-enhancement-716b44656a6c
 sidebar:
   order: 101
diff --git a/docs/src/content/docs/pt/challenges/angular/32-bug-cd.md b/docs/src/content/docs/pt/challenges/angular/32-change-detection-bug.md
similarity index 97%
rename from docs/src/content/docs/pt/challenges/angular/32-bug-cd.md
rename to docs/src/content/docs/pt/challenges/angular/32-change-detection-bug.md
index fb4d32a..534a250 100644
--- a/docs/src/content/docs/pt/challenges/angular/32-bug-cd.md
+++ b/docs/src/content/docs/pt/challenges/angular/32-change-detection-bug.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 32
-command: angular-bug-cd
+command: angular-change-detection-bug
 blogLink: https://medium.com/ngconf/function-calls-inside-template-are-dangerous-15f9822a6629
 sidebar:
   order: 105
diff --git a/docs/src/content/docs/pt/challenges/angular/5-crud.md b/docs/src/content/docs/pt/challenges/angular/5-crud-application.md
similarity index 98%
rename from docs/src/content/docs/pt/challenges/angular/5-crud.md
rename to docs/src/content/docs/pt/challenges/angular/5-crud-application.md
index b67ffda..3c6a04f 100644
--- a/docs/src/content/docs/pt/challenges/angular/5-crud.md
+++ b/docs/src/content/docs/pt/challenges/angular/5-crud-application.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 5
-command: angular-crud
+command: angular-crud-application
 sidebar:
   order: 2
 ---
diff --git a/docs/src/content/docs/pt/challenges/angular/6-permissions.md b/docs/src/content/docs/pt/challenges/angular/6-structural-directive.md
similarity index 97%
rename from docs/src/content/docs/pt/challenges/angular/6-permissions.md
rename to docs/src/content/docs/pt/challenges/angular/6-structural-directive.md
index 42dd00b..f8607b0 100644
--- a/docs/src/content/docs/pt/challenges/angular/6-permissions.md
+++ b/docs/src/content/docs/pt/challenges/angular/6-structural-directive.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 6
-command: angular-permissions
+command: angular-structural-directive
 blogLink: https://medium.com/@thomas.laforge/create-a-custom-structural-directive-to-manage-permissions-like-a-pro-11a1acad30ad
 sidebar:
   order: 102
diff --git a/docs/src/content/docs/pt/challenges/angular/8-pipe-pure.md b/docs/src/content/docs/pt/challenges/angular/8-pure-pipe.md
similarity index 98%
rename from docs/src/content/docs/pt/challenges/angular/8-pipe-pure.md
rename to docs/src/content/docs/pt/challenges/angular/8-pure-pipe.md
index 8791492..65dea73 100644
--- a/docs/src/content/docs/pt/challenges/angular/8-pipe-pure.md
+++ b/docs/src/content/docs/pt/challenges/angular/8-pure-pipe.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 8
-command: angular-pipe-easy
+command: angular-pure-pipe
 blogLink: https://medium.com/ngconf/deep-dive-into-angular-pipes-c040588cd15d
 sidebar:
   order: 3
diff --git a/docs/src/content/docs/pt/challenges/angular/9-pipe-wrapFn.md b/docs/src/content/docs/pt/challenges/angular/9-wrap-function-pipe.md
similarity index 98%
rename from docs/src/content/docs/pt/challenges/angular/9-pipe-wrapFn.md
rename to docs/src/content/docs/pt/challenges/angular/9-wrap-function-pipe.md
index 5a5c5e7..c72b7b4 100644
--- a/docs/src/content/docs/pt/challenges/angular/9-pipe-wrapFn.md
+++ b/docs/src/content/docs/pt/challenges/angular/9-wrap-function-pipe.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 9
-command: angular-pipe-intermediate
+command: angular-wrap-function-pipe
 blogLink: https://medium.com/ngconf/boost-your-apps-performance-by-wrapping-your-functions-inside-a-pipe-7e889a901d1d
 sidebar:
   order: 103
diff --git a/docs/src/content/docs/pt/challenges/angular/30-interop-rxjs-signal.md b/docs/src/content/docs/pt/challenges/signal/30-interop-rxjs-signal.md
similarity index 95%
rename from docs/src/content/docs/pt/challenges/angular/30-interop-rxjs-signal.md
rename to docs/src/content/docs/pt/challenges/signal/30-interop-rxjs-signal.md
index 23bed1c..b70f54d 100644
--- a/docs/src/content/docs/pt/challenges/angular/30-interop-rxjs-signal.md
+++ b/docs/src/content/docs/pt/challenges/signal/30-interop-rxjs-signal.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 30
-command: angular-interop-rxjs-signal
+command: signal-interop-rxjs-signal
 sidebar:
   order: 204
 ---
diff --git a/docs/src/content/docs/pt/challenges/angular/43-signal-input.md b/docs/src/content/docs/pt/challenges/signal/43-signal-input.md
similarity index 97%
rename from docs/src/content/docs/pt/challenges/angular/43-signal-input.md
rename to docs/src/content/docs/pt/challenges/signal/43-signal-input.md
index a654a8e..810175b 100644
--- a/docs/src/content/docs/pt/challenges/angular/43-signal-input.md
+++ b/docs/src/content/docs/pt/challenges/signal/43-signal-input.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - kabrunko-dev
 challengeNumber: 43
-command: angular-signal-input
+command: signal-signal-input
 sidebar:
   order: 16
 ---
diff --git a/docs/src/content/docs/ru/challenges/angular/5-crud.md b/docs/src/content/docs/ru/challenges/angular/5-crud-application.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/angular/5-crud.md
rename to docs/src/content/docs/ru/challenges/angular/5-crud-application.md
index dd991e4..ae25d5c 100644
--- a/docs/src/content/docs/ru/challenges/angular/5-crud.md
+++ b/docs/src/content/docs/ru/challenges/angular/5-crud-application.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - webbomj
 challengeNumber: 5
-command: angular-crud
+command: angular-crud-application
 sidebar:
   order: 2
 ---
diff --git a/docs/src/content/docs/ru/challenges/angular/8-pipe-pure.md b/docs/src/content/docs/ru/challenges/angular/8-pure-pipe.md
similarity index 99%
rename from docs/src/content/docs/ru/challenges/angular/8-pipe-pure.md
rename to docs/src/content/docs/ru/challenges/angular/8-pure-pipe.md
index facf723..182262d 100644
--- a/docs/src/content/docs/ru/challenges/angular/8-pipe-pure.md
+++ b/docs/src/content/docs/ru/challenges/angular/8-pure-pipe.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - stillst
 challengeNumber: 8
-command: angular-pipe-easy
+command: angular-pure-pipe
 blogLink: https://medium.com/ngconf/deep-dive-into-angular-pipes-c040588cd15d
 sidebar:
   order: 3
diff --git a/docs/src/content/docs/ru/challenges/angular/43-signal-input.md b/docs/src/content/docs/ru/challenges/signal/43-signal-input.md
similarity index 98%
rename from docs/src/content/docs/ru/challenges/angular/43-signal-input.md
rename to docs/src/content/docs/ru/challenges/signal/43-signal-input.md
index 3ae8658..b0d88ee 100644
--- a/docs/src/content/docs/ru/challenges/angular/43-signal-input.md
+++ b/docs/src/content/docs/ru/challenges/signal/43-signal-input.md
@@ -5,7 +5,7 @@ author: thomas-laforge
 contributors:
   - stillst
 challengeNumber: 43
-command: angular-signal-input
+command: signal-signal-input
 sidebar:
   order: 16
 ---
diff --git a/libs/angular/di/README.md b/libs/angular/di/README.md
deleted file mode 100644
index 824450f..0000000
--- a/libs/angular/di/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# angular/di
-
-This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test angular/di` to execute the unit tests.
diff --git a/libs/angular/di/jest.config.ts b/libs/angular/di/jest.config.ts
deleted file mode 100644
index 79303be..0000000
--- a/libs/angular/di/jest.config.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'angular/di',
-  preset: '../../../jest.preset.js',
-  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../../coverage/libs/angular/di',
-  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/tsconfig.base.json b/tsconfig.base.json
index e6d425a..8c59d87 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -15,7 +15,6 @@
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
     "paths": {
-      "@angular-challenges/angular/di": ["libs/angular/di/src/index.ts"],
       "@angular-challenges/cli": ["libs/cli/src/index.ts"],
       "@angular-challenges/custom-plugin": ["libs/custom-plugin/src/index.ts"],
       "@angular-challenges/decoupling/brain": [
@@ -79,6 +78,9 @@
       ],
       "@tomalaforge/ngrx-callstate-store": [
         "libs/shared/ngrx-callstate-store/src/index.ts"
+      ],
+      "angular-master-dependency-injection": [
+        "apps/angular/16-master-dependency-injection/src/index.ts"
       ]
     }
   },