diff --git a/apps/anchor-scrolling/.eslintrc.json b/apps/angular/anchor-scrolling/.eslintrc.json
similarity index 94%
rename from apps/anchor-scrolling/.eslintrc.json
rename to apps/angular/anchor-scrolling/.eslintrc.json
index b428c22..bf8df14 100644
--- a/apps/anchor-scrolling/.eslintrc.json
+++ b/apps/angular/anchor-scrolling/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
diff --git a/apps/anchor-scrolling/README.md b/apps/angular/anchor-scrolling/README.md
similarity index 85%
rename from apps/anchor-scrolling/README.md
rename to apps/angular/anchor-scrolling/README.md
index 97187a4..c6ffb7f 100644
--- a/apps/anchor-scrolling/README.md
+++ b/apps/angular/anchor-scrolling/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve anchor-scrolling
+npx nx serve angular-anchor-scrolling
 ```
 
 ### Documentation and Instruction
diff --git a/apps/anchor-scrolling/jest.config.ts b/apps/angular/anchor-scrolling/jest.config.ts
similarity index 78%
rename from apps/anchor-scrolling/jest.config.ts
rename to apps/angular/anchor-scrolling/jest.config.ts
index 44e5ebc..6915111 100644
--- a/apps/anchor-scrolling/jest.config.ts
+++ b/apps/angular/anchor-scrolling/jest.config.ts
@@ -1,9 +1,9 @@
 /* eslint-disable */
 export default {
-  displayName: 'anchor-scrolling',
-  preset: '../../jest.preset.js',
+  displayName: 'angular-anchor-scrolling',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  coverageDirectory: '../../coverage/apps/anchor-scrolling',
+  coverageDirectory: '../../../coverage/apps/angular/anchor-scrolling',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/anchor-scrolling/project.json b/apps/angular/anchor-scrolling/project.json
similarity index 65%
rename from apps/anchor-scrolling/project.json
rename to apps/angular/anchor-scrolling/project.json
index d4247e6..6c2aa05 100644
--- a/apps/anchor-scrolling/project.json
+++ b/apps/angular/anchor-scrolling/project.json
@@ -1,25 +1,25 @@
 {
-  "name": "anchor-scrolling",
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "name": "angular-anchor-scrolling",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/anchor-scrolling/src",
+  "sourceRoot": "apps/angular/anchor-scrolling/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/anchor-scrolling",
-        "index": "apps/anchor-scrolling/src/index.html",
-        "main": "apps/anchor-scrolling/src/main.ts",
+        "outputPath": "dist/apps/angular/anchor-scrolling",
+        "index": "apps/angular/anchor-scrolling/src/index.html",
+        "main": "apps/angular/anchor-scrolling/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/anchor-scrolling/tsconfig.app.json",
+        "tsConfig": "apps/angular/anchor-scrolling/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/anchor-scrolling/src/favicon.ico",
-          "apps/anchor-scrolling/src/assets"
+          "apps/angular/anchor-scrolling/src/favicon.ico",
+          "apps/angular/anchor-scrolling/src/assets"
         ],
-        "styles": ["apps/anchor-scrolling/src/styles.scss"],
+        "styles": ["apps/angular/anchor-scrolling/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -53,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "anchor-scrolling:build:production"
+          "browserTarget": "angular-anchor-scrolling:build:production"
         },
         "development": {
-          "browserTarget": "anchor-scrolling:build:development"
+          "browserTarget": "angular-anchor-scrolling:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -64,7 +64,7 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "anchor-scrolling:build"
+        "browserTarget": "angular-anchor-scrolling:build"
       }
     },
     "lint": {
@@ -72,8 +72,8 @@
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
-          "apps/anchor-scrolling/**/*.ts",
-          "apps/anchor-scrolling/**/*.html"
+          "apps/angular/anchor-scrolling/**/*.ts",
+          "apps/angular/anchor-scrolling/**/*.html"
         ]
       }
     },
@@ -81,7 +81,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/anchor-scrolling/jest.config.ts",
+        "jestConfig": "apps/angular/anchor-scrolling/jest.config.ts",
         "passWithNoTests": true
       },
       "configurations": {
diff --git a/apps/anchor-scrolling/src/app/app.component.ts b/apps/angular/anchor-scrolling/src/app/app.component.ts
similarity index 100%
rename from apps/anchor-scrolling/src/app/app.component.ts
rename to apps/angular/anchor-scrolling/src/app/app.component.ts
diff --git a/apps/anchor-scrolling/src/app/app.config.ts b/apps/angular/anchor-scrolling/src/app/app.config.ts
similarity index 100%
rename from apps/anchor-scrolling/src/app/app.config.ts
rename to apps/angular/anchor-scrolling/src/app/app.config.ts
diff --git a/apps/anchor-scrolling/src/app/app.routes.ts b/apps/angular/anchor-scrolling/src/app/app.routes.ts
similarity index 100%
rename from apps/anchor-scrolling/src/app/app.routes.ts
rename to apps/angular/anchor-scrolling/src/app/app.routes.ts
diff --git a/apps/anchor-scrolling/src/app/foo.component.ts b/apps/angular/anchor-scrolling/src/app/foo.component.ts
similarity index 100%
rename from apps/anchor-scrolling/src/app/foo.component.ts
rename to apps/angular/anchor-scrolling/src/app/foo.component.ts
diff --git a/apps/anchor-scrolling/src/app/home.component.ts b/apps/angular/anchor-scrolling/src/app/home.component.ts
similarity index 100%
rename from apps/anchor-scrolling/src/app/home.component.ts
rename to apps/angular/anchor-scrolling/src/app/home.component.ts
diff --git a/apps/anchor-scrolling/src/app/nav-button.component.ts b/apps/angular/anchor-scrolling/src/app/nav-button.component.ts
similarity index 100%
rename from apps/anchor-scrolling/src/app/nav-button.component.ts
rename to apps/angular/anchor-scrolling/src/app/nav-button.component.ts
diff --git a/apps/anchor-scrolling/src/assets/.gitkeep b/apps/angular/anchor-scrolling/src/assets/.gitkeep
similarity index 100%
rename from apps/anchor-scrolling/src/assets/.gitkeep
rename to apps/angular/anchor-scrolling/src/assets/.gitkeep
diff --git a/apps/anchor-scrolling/src/favicon.ico b/apps/angular/anchor-scrolling/src/favicon.ico
similarity index 100%
rename from apps/anchor-scrolling/src/favicon.ico
rename to apps/angular/anchor-scrolling/src/favicon.ico
diff --git a/apps/anchor-scrolling/src/index.html b/apps/angular/anchor-scrolling/src/index.html
similarity index 100%
rename from apps/anchor-scrolling/src/index.html
rename to apps/angular/anchor-scrolling/src/index.html
diff --git a/apps/anchor-scrolling/src/main.ts b/apps/angular/anchor-scrolling/src/main.ts
similarity index 100%
rename from apps/anchor-scrolling/src/main.ts
rename to apps/angular/anchor-scrolling/src/main.ts
diff --git a/apps/anchor-scrolling/src/styles.scss b/apps/angular/anchor-scrolling/src/styles.scss
similarity index 100%
rename from apps/anchor-scrolling/src/styles.scss
rename to apps/angular/anchor-scrolling/src/styles.scss
diff --git a/apps/anchor-scrolling/src/test-setup.ts b/apps/angular/anchor-scrolling/src/test-setup.ts
similarity index 100%
rename from apps/anchor-scrolling/src/test-setup.ts
rename to apps/angular/anchor-scrolling/src/test-setup.ts
diff --git a/apps/anchor-scrolling/tailwind.config.js b/apps/angular/anchor-scrolling/tailwind.config.js
similarity index 100%
rename from apps/anchor-scrolling/tailwind.config.js
rename to apps/angular/anchor-scrolling/tailwind.config.js
diff --git a/apps/anchor-scrolling/tsconfig.app.json b/apps/angular/anchor-scrolling/tsconfig.app.json
similarity index 84%
rename from apps/anchor-scrolling/tsconfig.app.json
rename to apps/angular/anchor-scrolling/tsconfig.app.json
index fff4a41..5822042 100644
--- a/apps/anchor-scrolling/tsconfig.app.json
+++ b/apps/angular/anchor-scrolling/tsconfig.app.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "types": []
   },
   "files": ["src/main.ts"],
diff --git a/apps/anchor-scrolling/tsconfig.editor.json b/apps/angular/anchor-scrolling/tsconfig.editor.json
similarity index 100%
rename from apps/anchor-scrolling/tsconfig.editor.json
rename to apps/angular/anchor-scrolling/tsconfig.editor.json
diff --git a/apps/anchor-scrolling/tsconfig.json b/apps/angular/anchor-scrolling/tsconfig.json
similarity index 94%
rename from apps/anchor-scrolling/tsconfig.json
rename to apps/angular/anchor-scrolling/tsconfig.json
index e01cf19..e85865c 100644
--- a/apps/anchor-scrolling/tsconfig.json
+++ b/apps/angular/anchor-scrolling/tsconfig.json
@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     }
   ],
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,
     "strictInjectionParameters": true,
diff --git a/apps/anchor-scrolling/tsconfig.spec.json b/apps/angular/anchor-scrolling/tsconfig.spec.json
similarity index 87%
rename from apps/anchor-scrolling/tsconfig.spec.json
rename to apps/angular/anchor-scrolling/tsconfig.spec.json
index f6a7d97..ca14cc6 100644
--- a/apps/anchor-scrolling/tsconfig.spec.json
+++ b/apps/angular/anchor-scrolling/tsconfig.spec.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"]
   },
diff --git a/docs/src/content/docs/challenges/angular/21-achor-scrolling.md b/docs/src/content/docs/challenges/angular/21-achor-scrolling.md
index 27d78d9..05cd68e 100644
--- a/docs/src/content/docs/challenges/angular/21-achor-scrolling.md
+++ b/docs/src/content/docs/challenges/angular/21-achor-scrolling.md
@@ -3,7 +3,7 @@ title: 🟢 Anchor Navigation
 description: Challenge 21 is about navigating inside the page with anchor
 author: Thomas Laforge
 challengeNumber: 21
-command: anchor-scrolling
+command: angular-anchor-scrolling
 sidebar:
   order: 4
 ---