diff --git a/.github/shared-actions/windows-bazel-test/action.yml b/.github/shared-actions/windows-bazel-test/action.yml
index 5e2ec1777892..7a5cf7c0297b 100644
--- a/.github/shared-actions/windows-bazel-test/action.yml
+++ b/.github/shared-actions/windows-bazel-test/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Convert symlinks for Windows host
       shell: pwsh
       run: |
-        $runfiles_dir = "./dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles"
+        $runfiles_dir = "./dist/bin/tests/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles"
 
         # Needed for resolution because Aspect/Bazel looks for repositories at `<workspace>/external`.
         # TODO(devversion): consult with Aspect on why this is needed.
@@ -38,5 +38,5 @@ runs:
         E2E_TEMP: ${{ inputs.e2e_temp_dir }}
       run: |
         node ./scripts/windows-testing/parallel-executor.mjs \
-          "./dist/bin/tests/legacy-cli/${{ inputs.test_target_name }}_/${{ inputs.test_target_name }}.bat.runfiles" \
+          "./dist/bin/tests/${{ inputs.test_target_name }}_/${{ inputs.test_target_name }}.bat.runfiles" \
           ${{ inputs.test_target_name }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c0fc8ccca3f..5c4efa8f3a86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,7 +71,7 @@ jobs:
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Run module and package tests
-        run: pnpm bazel test -- //... -//tests/legacy-cli/...
+        run: pnpm bazel test -- //... -//tests/...
 
   e2e:
     needs: test
@@ -94,7 +94,7 @@ jobs:
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   build-e2e-windows:
     runs-on: ubuntu-latest
@@ -113,15 +113,15 @@ jobs:
         run: |
           pnpm bazel build \
             --config=e2e \
-            //tests/legacy-cli:e2e.webpack_node22 \
-            //tests/legacy-cli:e2e.esbuild_node22 \
+            //tests:e2e.webpack_node22 \
+            //tests:e2e.esbuild_node22 \
             --platforms=tools:windows_x64
       - name: Store built Windows E2E tests
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: win-e2e-build-artifacts
           path: |
-            dist/bin/tests/legacy-cli/**
+            dist/bin/tests/**
             !**/node_modules/**
           retention-days: 1
           if-no-files-found: 'error'
@@ -144,7 +144,7 @@ jobs:
         uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: win-e2e-build-artifacts
-          path: dist/bin/tests/legacy-cli/
+          path: dist/bin/tests/
       - name: Run CLI E2E tests
         uses: ./.github/shared-actions/windows-bazel-test
         with:
@@ -174,7 +174,7 @@ jobs:
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-snapshots:
     needs: test
@@ -198,7 +198,7 @@ jobs:
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
+        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
 
   browsers:
     needs: build
@@ -229,7 +229,7 @@ jobs:
         run: |
           ./scripts/saucelabs/start-tunnel.sh &
           ./scripts/saucelabs/wait-for-tunnel.sh
-          pnpm bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
+          pnpm bazel test --config=saucelabs //tests:e2e.saucelabs
           ./scripts/saucelabs/stop-tunnel.sh
       - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: ${{ failure() }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 7962dda3c8fb..dc7c21d3b0a6 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           filters: |
             snapshots:
-              - 'tests/legacy-cli/e2e/ng-snapshot/package.json'
+              - 'tests/e2e/ng-snapshot/package.json'
 
   lint:
     runs-on: ubuntu-latest
@@ -101,7 +101,7 @@ jobs:
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Run module and package tests
-        run: pnpm bazel test -- //... -//tests/legacy-cli/...
+        run: pnpm bazel test -- //... -//tests/...
 
   e2e:
     needs: build
@@ -122,7 +122,7 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@2562f2bd84bf2b992d4742d2f36895fd904d696a
       - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   build-e2e-windows-subset:
     runs-on: ubuntu-latest
@@ -139,14 +139,14 @@ jobs:
         run: |
           pnpm bazel build \
             --config=e2e \
-            //tests/legacy-cli:e2e.esbuild_node22 \
+            //tests:e2e.esbuild_node22 \
             --platforms=tools:windows_x64
       - name: Store built Windows E2E tests
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: win-e2e-build-artifacts
           path: |
-            dist/bin/tests/legacy-cli/**
+            dist/bin/tests/**
             !**/node_modules/**
           retention-days: 1
           if-no-files-found: 'error'
@@ -163,7 +163,7 @@ jobs:
         uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: win-e2e-build-artifacts
-          path: dist/bin/tests/legacy-cli/
+          path: dist/bin/tests/
       - name: Run CLI E2E tests
         uses: ./.github/shared-actions/windows-bazel-test
         with:
@@ -191,7 +191,7 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@2562f2bd84bf2b992d4742d2f36895fd904d696a
       - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
+        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
   e2e-snapshots:
     needs: [analyze, build]
@@ -213,4 +213,4 @@ jobs:
       - name: Setup Bazel RBE
         uses: angular/dev-infra/github-actions/bazel/configure-remote@2562f2bd84bf2b992d4742d2f36895fd904d696a
       - name: Run CLI E2E tests
-        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
+        run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
diff --git a/.prettierignore b/.prettierignore
index b0b71acaf241..1adbf7759080 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -11,8 +11,7 @@
 /packages/schematics/angular/third_party/
 /README.md
 /CONTRIBUTING.md
-.yarn/
 dist/
-/tests/legacy-cli/e2e/assets/
+/tests/e2e/assets/
 /tools/test/*.json
 pnpm-lock.yaml
diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
index bd0c9bdf1ee3..8204bd7dcbce 100644
--- a/docs/DEVELOPER.md
+++ b/docs/DEVELOPER.md
@@ -89,8 +89,8 @@ You can find more info about debugging [tests with Bazel in the docs.](https://g
 ### End to end tests
 
 - For a complete list of test targets use the following Bazel query: `pnpm bazel query "tests(//tests/...)"`
-- Run a subset of the tests: `pnpm bazel test //tests/legacy-cli:e2e_node22 --config=e2e --test_filter="tests/i18n/ivy-localize-*"`
-- Use `bazel run` to debug failing tests debugging: `pnpm bazel run //tests/legacy-cli:e2e_node22 --config=e2e --test_arg="--glob=tests/basic/aot.ts"`
+- Run a subset of the tests: `pnpm bazel test //tests:e2e_node22 --config=e2e --test_filter="tests/i18n/ivy-localize-*"`
+- Use `bazel run` to debug failing tests debugging: `pnpm bazel run //tests:e2e_node22 --config=e2e --test_arg="--glob=tests/basic/aot.ts"`
 - Provide additional `e2e_runner` options using `--test_arg`: `--test_arg="--package-manager=yarn"`
 
 When running the debug commands, Node will stop and wait for a debugger to attach.
diff --git a/renovate.json b/renovate.json
index 4ffcf9c252d6..3b2c5ab2f6a6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -3,11 +3,11 @@
   "baseBranchPatterns": ["main", "21.0.x"],
   "extends": ["github>angular/dev-infra//renovate-presets/default.json5"],
   "ignoreDeps": ["less"],
-  "ignorePaths": ["tests/legacy-cli/e2e/assets/**", "tests/schematics/update/packages/**"],
+  "ignorePaths": ["tests/e2e/assets/**", "tests/schematics/update/packages/**"],
   "packageRules": [
     {
       "enabled": false,
-      "matchFileNames": ["tests/legacy-cli/e2e/ng-snapshot/package.json"],
+      "matchFileNames": ["tests/e2e/ng-snapshot/package.json"],
       "matchBaseBranches": ["!main"]
     },
     {
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
index 2c0b57b1fe3e..c93ffba8b5da 100644
--- a/tests/BUILD.bazel
+++ b/tests/BUILD.bazel
@@ -1,11 +1,78 @@
+load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
 load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@npm//:rollup/package_json.bzl", rollup = "bin")
+load("//tools:defaults.bzl", "ts_project")
+load(":e2e.bzl", "e2e_suites")
 
-# Copyright Google Inc. All Rights Reserved.
-#
-# Use of this source code is governed by an MIT-style license that can be
-# found in the LICENSE file at https://angular.dev/license
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
 npm_link_all_packages()
+
+ts_project(
+    name = "runner",
+    testonly = True,
+    srcs = [
+        "e2e_runner.ts",
+    ],
+    deps = [
+        "//:node_modules/@types/node",
+        "//:node_modules/fast-glob",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core/node",
+        "//tests/e2e/utils",
+    ],
+)
+
+rollup.rollup(
+    name = "runner_bundled",
+    testonly = True,
+    srcs = [
+        "rollup.config.mjs",
+        ":runner",
+        "//:node_modules/@rollup/plugin-alias",
+        "//:node_modules/@rollup/plugin-commonjs",
+        "//:node_modules/@rollup/plugin-json",
+        "//:node_modules/@rollup/plugin-node-resolve",
+        "//:node_modules/fast-glob",
+        "//tests/e2e/initialize",
+        "//tests/e2e/ng-snapshot",
+        "//tests/e2e/setup",
+        "//tests/e2e/tests",
+    ],
+    args = [
+        "--format=cjs",
+        "--config=./rollup.config.mjs",
+    ],
+    chdir = package_name(),
+    out_dirs = ["runner_bundled_out"],
+    progress_message = "Bundling e2e test runner",
+)
+
+directory_path(
+    name = "runner_entrypoint",
+    testonly = True,
+    directory = ":runner_bundled",
+    path = "./e2e_runner.js",
+)
+
+e2e_suites(
+    name = "e2e",
+    data = [
+        ":runner_bundled",
+        "verdaccio.yaml",
+        "verdaccio_auth.yaml",
+
+        # Dynamically loaded.
+        "//tests/e2e/assets",
+        "//:node_modules/verdaccio",
+        "//:node_modules/verdaccio-auth-memory",
+
+        # Extra runtime deps due to bundling issues.
+        # TODO: Clean this up.
+        "//:node_modules/express",
+        "//:node_modules/undici",
+    ],
+    runner = ":runner_entrypoint",
+)
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index e507add2cea7..000000000000
--- a/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# `/tests` Folder
-
-Contains all e2e tests and test assets.
-
-## `legacy-cli/`
-
-Contains all assets and all e2e tests from the legacy CLI repo.
-
-## Others
-
-Other folders contain test assets related to the Package namespace folders matching their name.
diff --git a/tests/legacy-cli/e2e.bzl b/tests/e2e.bzl
similarity index 100%
rename from tests/legacy-cli/e2e.bzl
rename to tests/e2e.bzl
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/.editorconfig b/tests/e2e/assets/19.0-project/.editorconfig
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/.editorconfig
rename to tests/e2e/assets/19.0-project/.editorconfig
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/.gitignore b/tests/e2e/assets/19.0-project/.gitignore
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/.gitignore
rename to tests/e2e/assets/19.0-project/.gitignore
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/README.md b/tests/e2e/assets/19.0-project/README.md
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/README.md
rename to tests/e2e/assets/19.0-project/README.md
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/angular.json b/tests/e2e/assets/19.0-project/angular.json
similarity index 88%
rename from tests/legacy-cli/e2e/assets/19.0-project/angular.json
rename to tests/e2e/assets/19.0-project/angular.json
index 328a028d1ddc..b435223e9930 100644
--- a/tests/legacy-cli/e2e/assets/19.0-project/angular.json
+++ b/tests/e2e/assets/19.0-project/angular.json
@@ -16,9 +16,7 @@
             "outputPath": "dist/nineteen-project",
             "index": "src/index.html",
             "browser": "src/main.ts",
-            "polyfills": [
-              "zone.js"
-            ],
+            "polyfills": ["zone.js"],
             "tsConfig": "tsconfig.app.json",
             "assets": [
               {
@@ -26,9 +24,7 @@
                 "input": "public"
               }
             ],
-            "styles": [
-              "src/styles.css"
-            ],
+            "styles": ["src/styles.css"],
             "scripts": []
           },
           "configurations": {
@@ -73,10 +69,7 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "polyfills": [
-              "zone.js",
-              "zone.js/testing"
-            ],
+            "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "tsconfig.spec.json",
             "assets": [
               {
@@ -84,9 +77,7 @@
                 "input": "public"
               }
             ],
-            "styles": [
-              "src/styles.css"
-            ],
+            "styles": ["src/styles.css"],
             "scripts": []
           }
         }
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/package.json b/tests/e2e/assets/19.0-project/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/package.json
rename to tests/e2e/assets/19.0-project/package.json
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/public/favicon.ico b/tests/e2e/assets/19.0-project/public/favicon.ico
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/public/favicon.ico
rename to tests/e2e/assets/19.0-project/public/favicon.ico
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.css b/tests/e2e/assets/19.0-project/src/app/app.component.css
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.css
rename to tests/e2e/assets/19.0-project/src/app/app.component.css
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.html b/tests/e2e/assets/19.0-project/src/app/app.component.html
similarity index 93%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.html
rename to tests/e2e/assets/19.0-project/src/app/app.component.html
index 36093e187977..f8135391366c 100644
--- a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.html
+++ b/tests/e2e/assets/19.0-project/src/app/app.component.html
@@ -36,9 +36,18 @@
 
     --pill-accent: var(--bright-blue);
 
-    font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-      "Segoe UI Symbol";
+    font-family:
+      'Inter',
+      -apple-system,
+      BlinkMacSystemFont,
+      'Segoe UI',
+      Roboto,
+      Helvetica,
+      Arial,
+      sans-serif,
+      'Apple Color Emoji',
+      'Segoe UI Emoji',
+      'Segoe UI Symbol';
     box-sizing: border-box;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
@@ -51,9 +60,18 @@
     line-height: 100%;
     letter-spacing: -0.125rem;
     margin: 0;
-    font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-      "Segoe UI Symbol";
+    font-family:
+      'Inter Tight',
+      -apple-system,
+      BlinkMacSystemFont,
+      'Segoe UI',
+      Roboto,
+      Helvetica,
+      Arial,
+      sans-serif,
+      'Apple Color Emoji',
+      'Segoe UI Emoji',
+      'Segoe UI Symbol';
   }
 
   p {
@@ -209,14 +227,7 @@
             <stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
             <stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
           </radialGradient>
-          <linearGradient
-            id="b"
-            x1="0"
-            x2="982"
-            y1="192"
-            y2="192"
-            gradientUnits="userSpaceOnUse"
-          >
+          <linearGradient id="b" x1="0" x2="982" y1="192" y2="192" gradientUnits="userSpaceOnUse">
             <stop stop-color="#F0060B" />
             <stop offset="0" stop-color="#F0070C" />
             <stop offset=".526" stop-color="#CC26D5" />
@@ -231,19 +242,20 @@ <h1>Hello, {{ title }}</h1>
     <div class="divider" role="separator" aria-label="Divider"></div>
     <div class="right-side">
       <div class="pill-group">
-        @for (item of [
-          { title: 'Explore the Docs', link: 'https://angular.dev' },
-          { title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
-          { title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
-          { title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
-          { title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
-        ]; track item.title) {
-          <a
-            class="pill"
-            [href]="item.link"
-            target="_blank"
-            rel="noopener"
-          >
+        @for (
+          item of [
+            { title: 'Explore the Docs', link: 'https://angular.dev' },
+            { title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
+            { title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
+            {
+              title: 'Angular Language Service',
+              link: 'https://angular.dev/tools/language-service',
+            },
+            { title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
+          ];
+          track item.title
+        ) {
+          <a class="pill" [href]="item.link" target="_blank" rel="noopener">
             <span>{{ item.title }}</span>
             <svg
               xmlns="http://www.w3.org/2000/svg"
@@ -279,12 +291,7 @@ <h1>Hello, {{ title }}</h1>
             />
           </svg>
         </a>
-        <a
-          href="https://twitter.com/angular"
-          aria-label="Twitter"
-          target="_blank"
-          rel="noopener"
-        >
+        <a href="https://twitter.com/angular" aria-label="Twitter" target="_blank" rel="noopener">
           <svg
             width="24"
             height="24"
@@ -332,5 +339,4 @@ <h1>Hello, {{ title }}</h1>
 <!-- * * * * * * * * * * End of Placeholder  * * * * * * * * * * * * -->
 <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
 
-
 <router-outlet />
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.spec.ts b/tests/e2e/assets/19.0-project/src/app/app.component.spec.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.spec.ts
rename to tests/e2e/assets/19.0-project/src/app/app.component.spec.ts
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.ts b/tests/e2e/assets/19.0-project/src/app/app.component.ts
similarity index 88%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.ts
rename to tests/e2e/assets/19.0-project/src/app/app.component.ts
index 09e443c2ae9e..620c8a058372 100644
--- a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.component.ts
+++ b/tests/e2e/assets/19.0-project/src/app/app.component.ts
@@ -5,7 +5,7 @@ import { RouterOutlet } from '@angular/router';
   selector: 'app-root',
   imports: [RouterOutlet],
   templateUrl: './app.component.html',
-  styleUrl: './app.component.css'
+  styleUrl: './app.component.css',
 })
 export class AppComponent {
   title = 'nineteen-project';
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.config.ts b/tests/e2e/assets/19.0-project/src/app/app.config.ts
similarity index 90%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/app/app.config.ts
rename to tests/e2e/assets/19.0-project/src/app/app.config.ts
index a1e7d6f864c1..7afc797fbab7 100644
--- a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.config.ts
+++ b/tests/e2e/assets/19.0-project/src/app/app.config.ts
@@ -4,5 +4,5 @@ import { provideRouter } from '@angular/router';
 import { routes } from './app.routes';
 
 export const appConfig: ApplicationConfig = {
-  providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes)]
+  providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes)],
 };
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/app/app.routes.ts b/tests/e2e/assets/19.0-project/src/app/app.routes.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/app/app.routes.ts
rename to tests/e2e/assets/19.0-project/src/app/app.routes.ts
diff --git a/tests/e2e/assets/19.0-project/src/index.html b/tests/e2e/assets/19.0-project/src/index.html
new file mode 100644
index 000000000000..f374b0fe3d5e
--- /dev/null
+++ b/tests/e2e/assets/19.0-project/src/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>NineteenProject</title>
+    <base href="/" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+  </head>
+  <body>
+    <app-root></app-root>
+  </body>
+</html>
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/main.ts b/tests/e2e/assets/19.0-project/src/main.ts
similarity index 66%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/main.ts
rename to tests/e2e/assets/19.0-project/src/main.ts
index 35b00f346331..17447a5dce2c 100644
--- a/tests/legacy-cli/e2e/assets/19.0-project/src/main.ts
+++ b/tests/e2e/assets/19.0-project/src/main.ts
@@ -2,5 +2,4 @@ import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
 
-bootstrapApplication(AppComponent, appConfig)
-  .catch((err) => console.error(err));
+bootstrapApplication(AppComponent, appConfig).catch((err) => console.error(err));
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/styles.css b/tests/e2e/assets/19.0-project/src/styles.css
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/src/styles.css
rename to tests/e2e/assets/19.0-project/src/styles.css
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/tsconfig.app.json b/tests/e2e/assets/19.0-project/tsconfig.app.json
similarity index 82%
rename from tests/legacy-cli/e2e/assets/19.0-project/tsconfig.app.json
rename to tests/e2e/assets/19.0-project/tsconfig.app.json
index 3775b37e3bbc..8886e903f8d0 100644
--- a/tests/legacy-cli/e2e/assets/19.0-project/tsconfig.app.json
+++ b/tests/e2e/assets/19.0-project/tsconfig.app.json
@@ -6,10 +6,6 @@
     "outDir": "./out-tsc/app",
     "types": []
   },
-  "files": [
-    "src/main.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
+  "files": ["src/main.ts"],
+  "include": ["src/**/*.d.ts"]
 }
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/tsconfig.json b/tests/e2e/assets/19.0-project/tsconfig.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/19.0-project/tsconfig.json
rename to tests/e2e/assets/19.0-project/tsconfig.json
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/tsconfig.spec.json b/tests/e2e/assets/19.0-project/tsconfig.spec.json
similarity index 76%
rename from tests/legacy-cli/e2e/assets/19.0-project/tsconfig.spec.json
rename to tests/e2e/assets/19.0-project/tsconfig.spec.json
index 5fb748d9207a..e00e30e6d4fb 100644
--- a/tests/legacy-cli/e2e/assets/19.0-project/tsconfig.spec.json
+++ b/tests/e2e/assets/19.0-project/tsconfig.spec.json
@@ -4,12 +4,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
+    "types": ["jasmine"]
   },
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
+  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
 }
diff --git a/tests/legacy-cli/e2e/assets/BUILD.bazel b/tests/e2e/assets/BUILD.bazel
similarity index 100%
rename from tests/legacy-cli/e2e/assets/BUILD.bazel
rename to tests/e2e/assets/BUILD.bazel
diff --git a/tests/legacy-cli/e2e/assets/add-collection-dir/collection.json b/tests/e2e/assets/add-collection-dir/collection.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/add-collection-dir/collection.json
rename to tests/e2e/assets/add-collection-dir/collection.json
diff --git a/tests/e2e/assets/add-collection-dir/index.js b/tests/e2e/assets/add-collection-dir/index.js
new file mode 100644
index 000000000000..0c38ee4e9fd9
--- /dev/null
+++ b/tests/e2e/assets/add-collection-dir/index.js
@@ -0,0 +1 @@
+exports.default = (options) => (tree) => tree.create(options.name || 'empty-file', '');
diff --git a/tests/legacy-cli/e2e/assets/add-collection-dir/package.json b/tests/e2e/assets/add-collection-dir/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/add-collection-dir/package.json
rename to tests/e2e/assets/add-collection-dir/package.json
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-bad/collection.json b/tests/e2e/assets/add-collection-peer-bad/collection.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/add-collection-peer-bad/collection.json
rename to tests/e2e/assets/add-collection-peer-bad/collection.json
diff --git a/tests/e2e/assets/add-collection-peer-bad/index.js b/tests/e2e/assets/add-collection-peer-bad/index.js
new file mode 100644
index 000000000000..df08babad74f
--- /dev/null
+++ b/tests/e2e/assets/add-collection-peer-bad/index.js
@@ -0,0 +1 @@
+exports.default = (options) => (tree) => tree.create(options.name || 'empty-file-peer-bad', '');
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-bad/package.json b/tests/e2e/assets/add-collection-peer-bad/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/add-collection-peer-bad/package.json
rename to tests/e2e/assets/add-collection-peer-bad/package.json
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-good/collection.json b/tests/e2e/assets/add-collection-peer-good/collection.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/add-collection-peer-good/collection.json
rename to tests/e2e/assets/add-collection-peer-good/collection.json
diff --git a/tests/e2e/assets/add-collection-peer-good/index.js b/tests/e2e/assets/add-collection-peer-good/index.js
new file mode 100644
index 000000000000..bddee127cebf
--- /dev/null
+++ b/tests/e2e/assets/add-collection-peer-good/index.js
@@ -0,0 +1 @@
+exports.default = (options) => (tree) => tree.create(options.name || 'empty-file-peer-good', '');
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-good/package.json b/tests/e2e/assets/add-collection-peer-good/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/add-collection-peer-good/package.json
rename to tests/e2e/assets/add-collection-peer-good/package.json
diff --git a/tests/legacy-cli/e2e/assets/add-collection.tgz b/tests/e2e/assets/add-collection.tgz
similarity index 100%
rename from tests/legacy-cli/e2e/assets/add-collection.tgz
rename to tests/e2e/assets/add-collection.tgz
diff --git a/tests/legacy-cli/e2e/assets/images/spectrum.png b/tests/e2e/assets/images/spectrum.png
similarity index 100%
rename from tests/legacy-cli/e2e/assets/images/spectrum.png
rename to tests/e2e/assets/images/spectrum.png
diff --git a/tests/legacy-cli/e2e/assets/nested-schematic-dependency/collection.json b/tests/e2e/assets/nested-schematic-dependency/collection.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/nested-schematic-dependency/collection.json
rename to tests/e2e/assets/nested-schematic-dependency/collection.json
diff --git a/tests/e2e/assets/nested-schematic-dependency/index.js b/tests/e2e/assets/nested-schematic-dependency/index.js
new file mode 100644
index 000000000000..0c38ee4e9fd9
--- /dev/null
+++ b/tests/e2e/assets/nested-schematic-dependency/index.js
@@ -0,0 +1 @@
+exports.default = (options) => (tree) => tree.create(options.name || 'empty-file', '');
diff --git a/tests/legacy-cli/e2e/assets/nested-schematic-dependency/package.json b/tests/e2e/assets/nested-schematic-dependency/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/nested-schematic-dependency/package.json
rename to tests/e2e/assets/nested-schematic-dependency/package.json
diff --git a/tests/legacy-cli/e2e/assets/nested-schematic-main/collection.json b/tests/e2e/assets/nested-schematic-main/collection.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/nested-schematic-main/collection.json
rename to tests/e2e/assets/nested-schematic-main/collection.json
diff --git a/tests/e2e/assets/nested-schematic-main/index.js b/tests/e2e/assets/nested-schematic-main/index.js
new file mode 100644
index 000000000000..1894dbd19b88
--- /dev/null
+++ b/tests/e2e/assets/nested-schematic-main/index.js
@@ -0,0 +1,2 @@
+exports.default = (options) =>
+  require('@angular-devkit/schematics').externalSchematic('empty-app-nested', 'nested', {});
diff --git a/tests/legacy-cli/e2e/assets/nested-schematic-main/package.json b/tests/e2e/assets/nested-schematic-main/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/nested-schematic-main/package.json
rename to tests/e2e/assets/nested-schematic-main/package.json
diff --git a/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js b/tests/e2e/assets/protractor-saucelabs.conf.js
similarity index 100%
rename from tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
rename to tests/e2e/assets/protractor-saucelabs.conf.js
diff --git a/tests/legacy-cli/e2e/assets/schematic-allow-scripts/collection.json b/tests/e2e/assets/schematic-allow-scripts/collection.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/schematic-allow-scripts/collection.json
rename to tests/e2e/assets/schematic-allow-scripts/collection.json
diff --git a/tests/e2e/assets/schematic-allow-scripts/index.js b/tests/e2e/assets/schematic-allow-scripts/index.js
new file mode 100644
index 000000000000..b4a44b829a15
--- /dev/null
+++ b/tests/e2e/assets/schematic-allow-scripts/index.js
@@ -0,0 +1,24 @@
+const tasks = require('@angular-devkit/schematics/tasks');
+
+exports.default = ({ allowScripts, ignoreScripts = false }) => {
+  return (tree, context) => {
+    tree.create(
+      '/install-test/package.json',
+      JSON.stringify({
+        name: 'install-test',
+        version: '0.0.0',
+        scripts: {
+          postinstall: `node run-post.js`,
+        },
+      }),
+    );
+    tree.create('/install-test/.npmrc', `ignore-scripts=${ignoreScripts}`);
+    tree.create(
+      '/install-test/run-post.js',
+      'require("fs").writeFileSync(__dirname + "/post-script-ran", "12345");',
+    );
+    context.addTask(
+      new tasks.NodePackageInstallTask({ workingDirectory: 'install-test', allowScripts }),
+    );
+  };
+};
diff --git a/tests/legacy-cli/e2e/assets/schematic-allow-scripts/package.json b/tests/e2e/assets/schematic-allow-scripts/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/schematic-allow-scripts/package.json
rename to tests/e2e/assets/schematic-allow-scripts/package.json
diff --git a/tests/e2e/assets/schematic-allow-scripts/schema.json b/tests/e2e/assets/schematic-allow-scripts/schema.json
new file mode 100644
index 000000000000..3dc7b38c6f8d
--- /dev/null
+++ b/tests/e2e/assets/schematic-allow-scripts/schema.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "allowScripts": {
+      "type": "boolean"
+    },
+    "ignoreScripts": {
+      "type": "boolean"
+    }
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/collection.json b/tests/e2e/assets/schematic-boolean-option-negated/collection.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/collection.json
rename to tests/e2e/assets/schematic-boolean-option-negated/collection.json
diff --git a/tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/index.js b/tests/e2e/assets/schematic-boolean-option-negated/index.js
similarity index 100%
rename from tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/index.js
rename to tests/e2e/assets/schematic-boolean-option-negated/index.js
diff --git a/tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/package.json b/tests/e2e/assets/schematic-boolean-option-negated/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/package.json
rename to tests/e2e/assets/schematic-boolean-option-negated/package.json
diff --git a/tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/schema.json b/tests/e2e/assets/schematic-boolean-option-negated/schema.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/schematic-boolean-option-negated/schema.json
rename to tests/e2e/assets/schematic-boolean-option-negated/schema.json
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/.gitignore b/tests/e2e/assets/ssr-project-webpack/.gitignore
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/.gitignore
rename to tests/e2e/assets/ssr-project-webpack/.gitignore
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/README.md b/tests/e2e/assets/ssr-project-webpack/README.md
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/README.md
rename to tests/e2e/assets/ssr-project-webpack/README.md
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/angular.json b/tests/e2e/assets/ssr-project-webpack/angular.json
similarity index 87%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/angular.json
rename to tests/e2e/assets/ssr-project-webpack/angular.json
index 9a26600b1843..5637f8e484a2 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/angular.json
+++ b/tests/e2e/assets/ssr-project-webpack/angular.json
@@ -16,17 +16,10 @@
             "outputPath": "dist/ssr-project-webpack/browser",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "polyfills": [
-              "zone.js"
-            ],
+            "polyfills": ["zone.js"],
             "tsConfig": "tsconfig.app.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.css"
-            ],
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": ["src/styles.css"],
             "scripts": []
           },
           "configurations": {
@@ -77,18 +70,10 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "polyfills": [
-              "zone.js",
-              "zone.js/testing"
-            ],
+            "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "tsconfig.spec.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.css"
-            ],
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": ["src/styles.css"],
             "scripts": []
           }
         },
@@ -130,9 +115,7 @@
         "prerender": {
           "builder": "@angular-devkit/build-angular:prerender",
           "options": {
-            "routes": [
-              "/"
-            ]
+            "routes": ["/"]
           },
           "configurations": {
             "production": {
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/package.json b/tests/e2e/assets/ssr-project-webpack/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/package.json
rename to tests/e2e/assets/ssr-project-webpack/package.json
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/server.ts b/tests/e2e/assets/ssr-project-webpack/server.ts
similarity index 93%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/server.ts
rename to tests/e2e/assets/ssr-project-webpack/server.ts
index c0db431c8657..59f788024bb6 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/server.ts
+++ b/tests/e2e/assets/ssr-project-webpack/server.ts
@@ -23,9 +23,12 @@ export function app(): express.Express {
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
-  server.get('*.*', express.static(distFolder, {
-    maxAge: '1y'
-  }));
+  server.get(
+    '*.*',
+    express.static(distFolder, {
+      maxAge: '1y',
+    }),
+  );
 
   // All regular routes use the Angular engine
   server.get('*', (req, res, next) => {
@@ -61,7 +64,7 @@ function run(): void {
 // The below code is to ensure that the server is run only when not requiring the bundle.
 declare const __non_webpack_require__: NodeRequire;
 const mainModule = __non_webpack_require__.main;
-const moduleFilename = mainModule && mainModule.filename || '';
+const moduleFilename = (mainModule && mainModule.filename) || '';
 if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app-routing.module.ts b/tests/e2e/assets/ssr-project-webpack/src/app/app-routing.module.ts
similarity index 75%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app-routing.module.ts
rename to tests/e2e/assets/ssr-project-webpack/src/app/app-routing.module.ts
index 02972627f8df..f3daf250ad25 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app-routing.module.ts
+++ b/tests/e2e/assets/ssr-project-webpack/src/app/app-routing.module.ts
@@ -5,6 +5,6 @@ const routes: Routes = [];
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
-export class AppRoutingModule { }
+export class AppRoutingModule {}
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.css b/tests/e2e/assets/ssr-project-webpack/src/app/app.component.css
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.css
rename to tests/e2e/assets/ssr-project-webpack/src/app/app.component.css
diff --git a/tests/e2e/assets/ssr-project-webpack/src/app/app.component.html b/tests/e2e/assets/ssr-project-webpack/src/app/app.component.html
new file mode 100644
index 000000000000..e99c7ea22c86
--- /dev/null
+++ b/tests/e2e/assets/ssr-project-webpack/src/app/app.component.html
@@ -0,0 +1,770 @@
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
+<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
+<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * Delete the template below * * * * * * * * * * -->
+<!-- * * * * * * * to get started with your project! * * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+
+<style>
+  :host {
+    font-family:
+      -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
+      'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+    font-size: 14px;
+    color: #333;
+    box-sizing: border-box;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin: 8px 0;
+  }
+
+  p {
+    margin: 0;
+  }
+
+  .spacer {
+    flex: 1;
+  }
+
+  .toolbar {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 60px;
+    display: flex;
+    align-items: center;
+    background-color: #1976d2;
+    color: white;
+    font-weight: 600;
+  }
+
+  .toolbar img {
+    margin: 0 16px;
+  }
+
+  .toolbar #twitter-logo {
+    height: 40px;
+    margin: 0 8px;
+  }
+
+  .toolbar #youtube-logo {
+    height: 40px;
+    margin: 0 16px;
+  }
+
+  .toolbar #twitter-logo:hover,
+  .toolbar #youtube-logo:hover {
+    opacity: 0.8;
+  }
+
+  .content {
+    display: flex;
+    margin: 82px auto 32px;
+    padding: 0 16px;
+    max-width: 960px;
+    flex-direction: column;
+    align-items: center;
+  }
+
+  svg.material-icons {
+    height: 24px;
+    width: auto;
+  }
+
+  svg.material-icons:not(:last-child) {
+    margin-right: 8px;
+  }
+
+  .card svg.material-icons path {
+    fill: #888;
+  }
+
+  .card-container {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin-top: 16px;
+  }
+
+  .card {
+    all: unset;
+    border-radius: 4px;
+    border: 1px solid #eee;
+    background-color: #fafafa;
+    height: 40px;
+    width: 200px;
+    margin: 0 8px 16px;
+    padding: 16px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    transition: all 0.2s ease-in-out;
+    line-height: 24px;
+  }
+
+  .card-container .card:not(:last-child) {
+    margin-right: 0;
+  }
+
+  .card.card-small {
+    height: 16px;
+    width: 168px;
+  }
+
+  .card-container .card:not(.highlight-card) {
+    cursor: pointer;
+  }
+
+  .card-container .card:not(.highlight-card):hover {
+    transform: translateY(-3px);
+    box-shadow: 0 4px 17px rgba(0, 0, 0, 0.35);
+  }
+
+  .card-container .card:not(.highlight-card):hover .material-icons path {
+    fill: rgb(105, 103, 103);
+  }
+
+  .card.highlight-card {
+    background-color: #1976d2;
+    color: white;
+    font-weight: 600;
+    border: none;
+    width: auto;
+    min-width: 30%;
+    position: relative;
+  }
+
+  .card.card.highlight-card span {
+    margin-left: 60px;
+  }
+
+  svg#rocket {
+    width: 80px;
+    position: absolute;
+    left: -10px;
+    top: -24px;
+  }
+
+  svg#rocket-smoke {
+    height: calc(100vh - 95px);
+    position: absolute;
+    top: 10px;
+    right: 180px;
+    z-index: -10;
+  }
+
+  a,
+  a:visited,
+  a:hover {
+    color: #1976d2;
+    text-decoration: none;
+  }
+
+  a:hover {
+    color: #125699;
+  }
+
+  .terminal {
+    position: relative;
+    width: 80%;
+    max-width: 600px;
+    border-radius: 6px;
+    padding-top: 45px;
+    margin-top: 8px;
+    overflow: hidden;
+    background-color: rgb(15, 15, 16);
+  }
+
+  .terminal::before {
+    content: '\2022 \2022 \2022';
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 4px;
+    background: rgb(58, 58, 58);
+    color: #c2c3c4;
+    width: 100%;
+    font-size: 2rem;
+    line-height: 0;
+    padding: 14px 0;
+    text-indent: 4px;
+  }
+
+  .terminal pre {
+    font-family:
+      SFMono-Regular,
+      Consolas,
+      Liberation Mono,
+      Menlo,
+      monospace;
+    color: white;
+    padding: 0 1rem 1rem;
+    margin: 0;
+  }
+
+  .circle-link {
+    height: 40px;
+    width: 40px;
+    border-radius: 40px;
+    margin: 8px;
+    background-color: white;
+    border: 1px solid #eeeeee;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    box-shadow:
+      0 1px 3px rgba(0, 0, 0, 0.12),
+      0 1px 2px rgba(0, 0, 0, 0.24);
+    transition: 1s ease-out;
+  }
+
+  .circle-link:hover {
+    transform: translateY(-0.25rem);
+    box-shadow: 0px 3px 15px rgba(0, 0, 0, 0.2);
+  }
+
+  footer {
+    margin-top: 8px;
+    display: flex;
+    align-items: center;
+    line-height: 20px;
+  }
+
+  footer a {
+    display: flex;
+    align-items: center;
+  }
+
+  .github-star-badge {
+    color: #24292e;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    padding: 3px 10px;
+    border: 1px solid rgba(27, 31, 35, 0.2);
+    border-radius: 3px;
+    background-image: linear-gradient(-180deg, #fafbfc, #eff3f6 90%);
+    margin-left: 4px;
+    font-weight: 600;
+  }
+
+  .github-star-badge:hover {
+    background-image: linear-gradient(-180deg, #f0f3f6, #e6ebf1 90%);
+    border-color: rgba(27, 31, 35, 0.35);
+    background-position: -0.5em;
+  }
+
+  .github-star-badge .material-icons {
+    height: 16px;
+    width: 16px;
+    margin-right: 4px;
+  }
+
+  svg#clouds {
+    position: fixed;
+    bottom: -160px;
+    left: -230px;
+    z-index: -10;
+    width: 1920px;
+  }
+
+  /* Responsive Styles */
+  @media screen and (max-width: 767px) {
+    .card-container > *:not(.circle-link),
+    .terminal {
+      width: 100%;
+    }
+
+    .card:not(.highlight-card) {
+      height: 16px;
+      margin: 8px 0;
+    }
+
+    .card.highlight-card span {
+      margin-left: 72px;
+    }
+
+    svg#rocket-smoke {
+      right: 120px;
+      transform: rotate(-5deg);
+    }
+  }
+
+  @media screen and (max-width: 575px) {
+    svg#rocket-smoke {
+      display: none;
+      visibility: hidden;
+    }
+  }
+</style>
+
+<!-- Toolbar -->
+<div class="toolbar" role="banner">
+  <img
+    width="40"
+    alt="Angular Logo"
+    src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg=="
+  />
+  <span>Welcome</span>
+  <div class="spacer"></div>
+  <a
+    aria-label="Angular on X"
+    target="_blank"
+    rel="noopener"
+    href="https://twitter.com/angular"
+    title="X"
+  >
+    <svg
+      id="twitter-logo"
+      xmlns="http://www.w3.org/2000/svg"
+      height="24"
+      width="24"
+      data-name="Logo"
+      viewBox="0 0 512 512"
+      fill="#fff"
+    >
+      <path
+        d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
+      />
+    </svg>
+  </a>
+  <a
+    aria-label="Angular on YouTube"
+    target="_blank"
+    rel="noopener"
+    href="https://youtube.com/angular"
+    title="YouTube"
+  >
+    <svg
+      id="youtube-logo"
+      height="24"
+      width="24"
+      data-name="Logo"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      fill="#fff"
+    >
+      <path d="M0 0h24v24H0V0z" fill="none" />
+      <path
+        d="M21.58 7.19c-.23-.86-.91-1.54-1.77-1.77C18.25 5 12 5 12 5s-6.25 0-7.81.42c-.86.23-1.54.91-1.77 1.77C2 8.75 2 12 2 12s0 3.25.42 4.81c.23.86.91 1.54 1.77 1.77C5.75 19 12 19 12 19s6.25 0 7.81-.42c.86-.23 1.54-.91 1.77-1.77C22 15.25 22 12 22 12s0-3.25-.42-4.81zM10 15V9l5.2 3-5.2 3z"
+      />
+    </svg>
+  </a>
+</div>
+
+<div class="content" role="main">
+  <!-- Highlight Card -->
+  <div class="card highlight-card card-small">
+    <svg
+      id="rocket"
+      xmlns="http://www.w3.org/2000/svg"
+      width="101.678"
+      height="101.678"
+      viewBox="0 0 101.678 101.678"
+    >
+      <title>Rocket Ship</title>
+      <g id="Group_83" data-name="Group 83" transform="translate(-141 -696)">
+        <circle
+          id="Ellipse_8"
+          data-name="Ellipse 8"
+          cx="50.839"
+          cy="50.839"
+          r="50.839"
+          transform="translate(141 696)"
+          fill="#dd0031"
+        />
+        <g id="Group_47" data-name="Group 47" transform="translate(165.185 720.185)">
+          <path
+            id="Path_33"
+            data-name="Path 33"
+            d="M3.4,42.615a3.084,3.084,0,0,0,3.553,3.553,21.419,21.419,0,0,0,12.215-6.107L9.511,30.4A21.419,21.419,0,0,0,3.4,42.615Z"
+            transform="translate(0.371 3.363)"
+            fill="#fff"
+          />
+          <path
+            id="Path_34"
+            data-name="Path 34"
+            d="M53.3,3.221A3.09,3.09,0,0,0,50.081,0,48.227,48.227,0,0,0,18.322,13.437c-6-1.666-14.991-1.221-18.322,7.218A33.892,33.892,0,0,1,9.439,25.1l-.333.666a3.013,3.013,0,0,0,.555,3.553L23.985,43.641a2.9,2.9,0,0,0,3.553.555l.666-.333A33.892,33.892,0,0,1,32.647,53.3c8.55-3.664,8.884-12.326,7.218-18.322A48.227,48.227,0,0,0,53.3,3.221ZM34.424,9.772a6.439,6.439,0,1,1,9.106,9.106,6.368,6.368,0,0,1-9.106,0A6.467,6.467,0,0,1,34.424,9.772Z"
+            transform="translate(0 0.005)"
+            fill="#fff"
+          />
+        </g>
+      </g>
+    </svg>
+
+    <span>{{ title }} app is running!</span>
+
+    <svg
+      id="rocket-smoke"
+      xmlns="http://www.w3.org/2000/svg"
+      width="516.119"
+      height="1083.632"
+      viewBox="0 0 516.119 1083.632"
+    >
+      <title>Rocket Ship Smoke</title>
+      <path
+        id="Path_40"
+        data-name="Path 40"
+        d="M644.6,141S143.02,215.537,147.049,870.207s342.774,201.755,342.774,201.755S404.659,847.213,388.815,762.2c-27.116-145.51-11.551-384.124,271.9-609.1C671.15,139.365,644.6,141,644.6,141Z"
+        transform="translate(-147.025 -140.939)"
+        fill="#f5f5f5"
+      />
+    </svg>
+  </div>
+
+  <!-- Resources -->
+  <h2>Resources</h2>
+  <p>Here are some links to help you get started:</p>
+
+  <div class="card-container">
+    <a
+      class="card"
+      target="_blank"
+      rel="noopener"
+      href="https://angular.dev/tutorials/learn-angular"
+    >
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z" />
+      </svg>
+      <span>Learn Angular</span>
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" />
+      </svg>
+    </a>
+
+    <a class="card" target="_blank" rel="noopener" href="https://angular.dev/tools/cli">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"
+        />
+      </svg>
+      <span>CLI Documentation</span>
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" />
+      </svg>
+    </a>
+
+    <a class="card" target="_blank" rel="noopener" href="https://material.angular.io">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        style="margin-right: 8px"
+        width="21.813"
+        height="23.453"
+        viewBox="0 0 179.2 192.7"
+      >
+        <path fill="#ffa726" d="M89.4 0 0 32l13.5 118.4 75.9 42.3 76-42.3L179.2 32 89.4 0z" />
+        <path fill="#fb8c00" d="M89.4 0v192.7l76-42.3L179.2 32 89.4 0z" />
+        <path fill="#ffe0b2" d="m102.9 146.3-63.3-30.5 36.3-22.4 63.7 30.6-36.7 22.3z" />
+        <path fill="#fff3e0" d="M102.9 122.8 39.6 92.2l36.3-22.3 63.7 30.6-36.7 22.3z" />
+        <path fill="#fff" d="M102.9 99.3 39.6 68.7l36.3-22.4 63.7 30.6-36.7 22.4z" />
+      </svg>
+      <span>Angular Material</span>
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" />
+      </svg>
+    </a>
+
+    <a class="card" target="_blank" rel="noopener" href="https://blog.angular.dev">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path
+          d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8z"
+        />
+      </svg>
+      <span>Angular Blog</span>
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" />
+      </svg>
+    </a>
+
+    <a class="card" target="_blank" rel="noopener" href="https://angular.dev/tools/devtools">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        enable-background="new 0 0 24 24"
+        height="24px"
+        viewBox="0 0 24 24"
+        width="24px"
+        fill="#000000"
+      >
+        <g><rect fill="none" height="24" width="24" /></g>
+        <g>
+          <g>
+            <path
+              d="M14.73,13.31C15.52,12.24,16,10.93,16,9.5C16,5.91,13.09,3,9.5,3S3,5.91,3,9.5C3,13.09,5.91,16,9.5,16 c1.43,0,2.74-0.48,3.81-1.27L19.59,21L21,19.59L14.73,13.31z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5 S11.99,14,9.5,14z"
+            />
+            <polygon
+              points="10.29,8.44 9.5,6 8.71,8.44 6.25,8.44 8.26,10.03 7.49,12.5 9.5,10.97 11.51,12.5 10.74,10.03 12.75,8.44"
+            />
+          </g>
+        </g>
+      </svg>
+      <span>Angular DevTools</span>
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" />
+      </svg>
+    </a>
+  </div>
+
+  <!-- Next Steps -->
+  <h2>Next Steps</h2>
+  <p>What do you want to do next with your app?</p>
+
+  <input type="hidden" #selection />
+
+  <div class="card-container">
+    <button class="card card-small" (click)="selection.value = 'component'" tabindex="0">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+      </svg>
+      <span>New Component</span>
+    </button>
+
+    <button class="card card-small" (click)="selection.value = 'material'" tabindex="0">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+      </svg>
+      <span>Angular Material</span>
+    </button>
+
+    <button class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+      </svg>
+      <span>Add PWA Support</span>
+    </button>
+
+    <button class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+      </svg>
+      <span>Add Dependency</span>
+    </button>
+
+    <button class="card card-small" (click)="selection.value = 'test'" tabindex="0">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+      </svg>
+      <span>Run and Watch Tests</span>
+    </button>
+
+    <button class="card card-small" (click)="selection.value = 'build'" tabindex="0">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+      </svg>
+      <span>Build for Production</span>
+    </button>
+  </div>
+
+  <!-- Terminal -->
+  <div class="terminal" [ngSwitch]="selection.value">
+    <pre *ngSwitchDefault>ng generate component xyz</pre>
+    <pre *ngSwitchCase="'material'">ng add &#64;angular/material</pre>
+    <pre *ngSwitchCase="'pwa'">ng add &#64;angular/pwa</pre>
+    <pre *ngSwitchCase="'dependency'">ng add _____</pre>
+    <pre *ngSwitchCase="'test'">ng test</pre>
+    <pre *ngSwitchCase="'build'">ng build</pre>
+  </div>
+
+  <!-- Links -->
+  <div class="card-container">
+    <a
+      class="circle-link"
+      title="Find a Local Meetup"
+      href="https://www.meetup.com/find/?keywords=angular"
+      target="_blank"
+      rel="noopener"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        width="24.607"
+        height="23.447"
+        viewBox="0 0 24.607 23.447"
+      >
+        <title>Meetup Logo</title>
+        <path
+          id="logo--mSwarm"
+          d="M21.221,14.95A4.393,4.393,0,0,1,17.6,19.281a4.452,4.452,0,0,1-.8.069c-.09,0-.125.035-.154.117a2.939,2.939,0,0,1-2.506,2.091,2.868,2.868,0,0,1-2.248-.624.168.168,0,0,0-.245-.005,3.926,3.926,0,0,1-2.589.741,4.015,4.015,0,0,1-3.7-3.347,2.7,2.7,0,0,1-.043-.38c0-.106-.042-.146-.143-.166a3.524,3.524,0,0,1-1.516-.69A3.623,3.623,0,0,1,2.23,14.557a3.66,3.66,0,0,1,1.077-3.085.138.138,0,0,0,.026-.2,3.348,3.348,0,0,1-.451-1.821,3.46,3.46,0,0,1,2.749-3.28.44.44,0,0,0,.355-.281,5.072,5.072,0,0,1,3.863-3,5.028,5.028,0,0,1,3.555.666.31.31,0,0,0,.271.03A4.5,4.5,0,0,1,18.3,4.7a4.4,4.4,0,0,1,1.334,2.751,3.658,3.658,0,0,1,.022.706.131.131,0,0,0,.1.157,2.432,2.432,0,0,1,1.574,1.645,2.464,2.464,0,0,1-.7,2.616c-.065.064-.051.1-.014.166A4.321,4.321,0,0,1,21.221,14.95ZM13.4,14.607a2.09,2.09,0,0,0,1.409,1.982,4.7,4.7,0,0,0,1.275.221,1.807,1.807,0,0,0,.9-.151.542.542,0,0,0,.321-.545.558.558,0,0,0-.359-.534,1.2,1.2,0,0,0-.254-.078c-.262-.047-.526-.086-.787-.138a.674.674,0,0,1-.617-.75,3.394,3.394,0,0,1,.218-1.109c.217-.658.509-1.286.79-1.918a15.609,15.609,0,0,0,.745-1.86,1.95,1.95,0,0,0,.06-1.073,1.286,1.286,0,0,0-1.051-1.033,1.977,1.977,0,0,0-1.521.2.339.339,0,0,1-.446-.042c-.1-.092-.2-.189-.307-.284a1.214,1.214,0,0,0-1.643-.061,7.563,7.563,0,0,1-.614.512A.588.588,0,0,1,10.883,8c-.215-.115-.437-.215-.659-.316a2.153,2.153,0,0,0-.695-.248A2.091,2.091,0,0,0,7.541,8.562a9.915,9.915,0,0,0-.405.986c-.559,1.545-1.015,3.123-1.487,4.7a1.528,1.528,0,0,0,.634,1.777,1.755,1.755,0,0,0,1.5.211,1.35,1.35,0,0,0,.824-.858c.543-1.281,1.032-2.584,1.55-3.875.142-.355.28-.712.432-1.064a.548.548,0,0,1,.851-.24.622.622,0,0,1,.185.539,2.161,2.161,0,0,1-.181.621c-.337.852-.68,1.7-1.018,2.552a2.564,2.564,0,0,0-.173.528.624.624,0,0,0,.333.71,1.073,1.073,0,0,0,.814.034,1.22,1.22,0,0,0,.657-.655q.758-1.488,1.511-2.978.35-.687.709-1.37a1.073,1.073,0,0,1,.357-.434.43.43,0,0,1,.463-.016.373.373,0,0,1,.153.387.7.7,0,0,1-.057.236c-.065.157-.127.316-.2.469-.42.883-.846,1.763-1.262,2.648A2.463,2.463,0,0,0,13.4,14.607Zm5.888,6.508a1.09,1.09,0,0,0-2.179.006,1.09,1.09,0,0,0,2.179-.006ZM1.028,12.139a1.038,1.038,0,1,0,.01-2.075,1.038,1.038,0,0,0-.01,2.075ZM13.782.528a1.027,1.027,0,1,0-.011,2.055A1.027,1.027,0,0,0,13.782.528ZM22.21,6.95a.882.882,0,0,0-1.763.011A.882.882,0,0,0,22.21,6.95ZM4.153,4.439a.785.785,0,1,0,.787-.78A.766.766,0,0,0,4.153,4.439Zm8.221,18.22a.676.676,0,1,0-.677.666A.671.671,0,0,0,12.374,22.658ZM22.872,12.2a.674.674,0,0,0-.665.665.656.656,0,0,0,.655.643.634.634,0,0,0,.655-.644A.654.654,0,0,0,22.872,12.2ZM7.171-.123A.546.546,0,0,0,6.613.43a.553.553,0,1,0,1.106,0A.539.539,0,0,0,7.171-.123ZM24.119,9.234a.507.507,0,0,0-.493.488.494.494,0,0,0,.494.494.48.48,0,0,0,.487-.483A.491.491,0,0,0,24.119,9.234Zm-19.454,9.7a.5.5,0,0,0-.488-.488.491.491,0,0,0-.487.5.483.483,0,0,0,.491.479A.49.49,0,0,0,4.665,18.936Z"
+          transform="translate(0 0.123)"
+          fill="#f64060"
+        />
+      </svg>
+    </a>
+
+    <a
+      class="circle-link"
+      title="Join the Conversation on Discord"
+      href="https://discord.gg/angular"
+      target="_blank"
+      rel="noopener"
+    >
+      <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 245 240">
+        <title>Discord Logo</title>
+        <path
+          d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"
+        />
+        <path
+          d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"
+        />
+      </svg>
+    </a>
+  </div>
+
+  <!-- Footer -->
+  <footer>
+    Love Angular?&nbsp;
+    <a href="https://github.com/angular/angular" target="_blank" rel="noopener">
+      Give our repo a star.
+      <div class="github-star-badge">
+        <svg
+          class="material-icons"
+          xmlns="http://www.w3.org/2000/svg"
+          width="24"
+          height="24"
+          viewBox="0 0 24 24"
+        >
+          <path d="M0 0h24v24H0z" fill="none" />
+          <path
+            d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"
+          />
+        </svg>
+        Star
+      </div>
+    </a>
+    <a href="https://github.com/angular/angular" target="_blank" rel="noopener">
+      <svg
+        class="material-icons"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+      >
+        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" fill="#1976d2" />
+        <path d="M0 0h24v24H0z" fill="none" />
+      </svg>
+    </a>
+  </footer>
+
+  <svg
+    id="clouds"
+    xmlns="http://www.w3.org/2000/svg"
+    width="2611.084"
+    height="485.677"
+    viewBox="0 0 2611.084 485.677"
+  >
+    <title>Gray Clouds Background</title>
+    <path
+      id="Path_39"
+      data-name="Path 39"
+      d="M2379.709,863.793c10-93-77-171-168-149-52-114-225-105-264,15-75,3-140,59-152,133-30,2.83-66.725,9.829-93.5,26.25-26.771-16.421-63.5-23.42-93.5-26.25-12-74-77-130-152-133-39-120-212-129-264-15-54.084-13.075-106.753,9.173-138.488,48.9-31.734-39.726-84.4-61.974-138.487-48.9-52-114-225-105-264,15a162.027,162.027,0,0,0-103.147,43.044c-30.633-45.365-87.1-72.091-145.206-58.044-52-114-225-105-264,15-75,3-140,59-152,133-53,5-127,23-130,83-2,42,35,72,70,86,49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33,61.112,8.015,113.854-5.72,150.492-29.764a165.62,165.62,0,0,0,110.861-3.236c47,94,178,113,251,33,31.385,4.116,60.563,2.495,86.487-3.311,25.924,5.806,55.1,7.427,86.488,3.311,73,80,204,61,251-33a165.625,165.625,0,0,0,120,0c51,13,108,15,157-5a147.188,147.188,0,0,0,33.5-18.694,147.217,147.217,0,0,0,33.5,18.694c49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33C2446.709,1093.793,2554.709,922.793,2379.709,863.793Z"
+      transform="translate(142.69 -634.312)"
+      fill="#eee"
+    />
+  </svg>
+</div>
+
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * The content above * * * * * * * * * * * -->
+<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
+<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+
+<router-outlet></router-outlet>
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.spec.ts b/tests/e2e/assets/ssr-project-webpack/src/app/app.component.spec.ts
similarity index 79%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.spec.ts
rename to tests/e2e/assets/ssr-project-webpack/src/app/app.component.spec.ts
index 7dfb0b7df47c..c3fc75313bcc 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.spec.ts
+++ b/tests/e2e/assets/ssr-project-webpack/src/app/app.component.spec.ts
@@ -3,10 +3,12 @@ import { RouterModule } from '@angular/router';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(() => TestBed.configureTestingModule({
-    imports: [RouterModule.forRoot([])],
-    declarations: [AppComponent]
-  }));
+  beforeEach(() =>
+    TestBed.configureTestingModule({
+      imports: [RouterModule.forRoot([])],
+      declarations: [AppComponent],
+    }),
+  );
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
@@ -24,6 +26,8 @@ describe('AppComponent', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('.content span')?.textContent).toContain('20-ssr-project-webpack app is running!');
+    expect(compiled.querySelector('.content span')?.textContent).toContain(
+      '20-ssr-project-webpack app is running!',
+    );
   });
 });
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.ts b/tests/e2e/assets/ssr-project-webpack/src/app/app.component.ts
similarity index 84%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.ts
rename to tests/e2e/assets/ssr-project-webpack/src/app/app.component.ts
index f643fddc3586..20b0fef78f45 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.ts
+++ b/tests/e2e/assets/ssr-project-webpack/src/app/app.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'app-root',
   standalone: false,
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  styleUrls: ['./app.component.css'],
 })
 export class AppComponent {
   title = '20-ssr-project-webpack';
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.module.server.ts b/tests/e2e/assets/ssr-project-webpack/src/app/app.module.server.ts
similarity index 83%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.module.server.ts
rename to tests/e2e/assets/ssr-project-webpack/src/app/app.module.server.ts
index 795380cd2294..d182a9f3e994 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.module.server.ts
+++ b/tests/e2e/assets/ssr-project-webpack/src/app/app.module.server.ts
@@ -5,10 +5,7 @@ import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
 
 @NgModule({
-  imports: [
-    AppModule,
-    ServerModule,
-  ],
+  imports: [AppModule, ServerModule],
   bootstrap: [AppComponent],
 })
 export class AppServerModule {}
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.module.ts b/tests/e2e/assets/ssr-project-webpack/src/app/app.module.ts
similarity index 55%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.module.ts
rename to tests/e2e/assets/ssr-project-webpack/src/app/app.module.ts
index a06d9e8b06b4..700cb243fffa 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.module.ts
+++ b/tests/e2e/assets/ssr-project-webpack/src/app/app.module.ts
@@ -5,16 +5,9 @@ import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 
 @NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule,
-    AppRoutingModule
-  ],
-  providers: [
-    provideClientHydration()
-  ],
-  bootstrap: [AppComponent]
+  declarations: [AppComponent],
+  imports: [BrowserModule, AppRoutingModule],
+  providers: [provideClientHydration()],
+  bootstrap: [AppComponent],
 })
-export class AppModule { }
+export class AppModule {}
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/assets/.gitkeep b/tests/e2e/assets/ssr-project-webpack/src/assets/.gitkeep
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/assets/.gitkeep
rename to tests/e2e/assets/ssr-project-webpack/src/assets/.gitkeep
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/favicon.ico b/tests/e2e/assets/ssr-project-webpack/src/favicon.ico
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/favicon.ico
rename to tests/e2e/assets/ssr-project-webpack/src/favicon.ico
diff --git a/tests/e2e/assets/ssr-project-webpack/src/index.html b/tests/e2e/assets/ssr-project-webpack/src/index.html
new file mode 100644
index 000000000000..28adeacc85ed
--- /dev/null
+++ b/tests/e2e/assets/ssr-project-webpack/src/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>17SsrProjectWebpack</title>
+    <base href="/" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+  </head>
+  <body>
+    <app-root></app-root>
+  </body>
+</html>
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/main.server.ts b/tests/e2e/assets/ssr-project-webpack/src/main.server.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/main.server.ts
rename to tests/e2e/assets/ssr-project-webpack/src/main.server.ts
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/main.ts b/tests/e2e/assets/ssr-project-webpack/src/main.ts
similarity index 55%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/main.ts
rename to tests/e2e/assets/ssr-project-webpack/src/main.ts
index f3a8a045a0a7..55b91297823b 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/main.ts
+++ b/tests/e2e/assets/ssr-project-webpack/src/main.ts
@@ -1,5 +1,6 @@
 import { platformBrowser } from '@angular/platform-browser';
 import { AppModule } from './app/app.module';
 
-platformBrowser().bootstrapModule(AppModule)
-  .catch(err => console.error(err));
+platformBrowser()
+  .bootstrapModule(AppModule)
+  .catch((err) => console.error(err));
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/styles.css b/tests/e2e/assets/ssr-project-webpack/src/styles.css
similarity index 100%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/src/styles.css
rename to tests/e2e/assets/ssr-project-webpack/src/styles.css
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.app.json b/tests/e2e/assets/ssr-project-webpack/tsconfig.app.json
similarity index 71%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.app.json
rename to tests/e2e/assets/ssr-project-webpack/tsconfig.app.json
index 374cc9d294aa..84f1f992d275 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.app.json
+++ b/tests/e2e/assets/ssr-project-webpack/tsconfig.app.json
@@ -5,10 +5,6 @@
     "outDir": "./out-tsc/app",
     "types": []
   },
-  "files": [
-    "src/main.ts"
-  ],
-  "include": [
-    "src/**/*.d.ts"
-  ]
+  "files": ["src/main.ts"],
+  "include": ["src/**/*.d.ts"]
 }
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.json b/tests/e2e/assets/ssr-project-webpack/tsconfig.json
similarity index 94%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.json
rename to tests/e2e/assets/ssr-project-webpack/tsconfig.json
index 532ea4d30a62..bbc051d01524 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.json
+++ b/tests/e2e/assets/ssr-project-webpack/tsconfig.json
@@ -17,10 +17,7 @@
     "importHelpers": true,
     "target": "ES2022",
     "module": "ES2022",
-    "lib": [
-      "ES2022",
-      "dom"
-    ]
+    "lib": ["ES2022", "dom"]
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.server.json b/tests/e2e/assets/ssr-project-webpack/tsconfig.server.json
similarity index 65%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.server.json
rename to tests/e2e/assets/ssr-project-webpack/tsconfig.server.json
index e2ebe5a729be..3b9de71a23f6 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.server.json
+++ b/tests/e2e/assets/ssr-project-webpack/tsconfig.server.json
@@ -3,12 +3,7 @@
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "./out-tsc/server",
-    "types": [
-      "node"
-    ]
+    "types": ["node"]
   },
-  "files": [
-    "src/main.server.ts",
-    "server.ts"
-  ]
+  "files": ["src/main.server.ts", "server.ts"]
 }
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.spec.json b/tests/e2e/assets/ssr-project-webpack/tsconfig.spec.json
similarity index 63%
rename from tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.spec.json
rename to tests/e2e/assets/ssr-project-webpack/tsconfig.spec.json
index be7e9da76f7b..47e3dd755170 100644
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/tsconfig.spec.json
+++ b/tests/e2e/assets/ssr-project-webpack/tsconfig.spec.json
@@ -3,12 +3,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
+    "types": ["jasmine"]
   },
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
+  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
 }
diff --git a/tests/legacy-cli/e2e/initialize/300-log-environment.ts b/tests/e2e/initialize/300-log-environment.ts
similarity index 100%
rename from tests/legacy-cli/e2e/initialize/300-log-environment.ts
rename to tests/e2e/initialize/300-log-environment.ts
diff --git a/tests/legacy-cli/e2e/initialize/500-create-project.ts b/tests/e2e/initialize/500-create-project.ts
similarity index 100%
rename from tests/legacy-cli/e2e/initialize/500-create-project.ts
rename to tests/e2e/initialize/500-create-project.ts
diff --git a/tests/legacy-cli/e2e/initialize/BUILD.bazel b/tests/e2e/initialize/BUILD.bazel
similarity index 88%
rename from tests/legacy-cli/e2e/initialize/BUILD.bazel
rename to tests/e2e/initialize/BUILD.bazel
index da2466d90621..2ab5b570925f 100644
--- a/tests/legacy-cli/e2e/initialize/BUILD.bazel
+++ b/tests/e2e/initialize/BUILD.bazel
@@ -11,6 +11,6 @@ ts_project(
     ],
     deps = [
         "//:node_modules/@types/node",
-        "//tests/legacy-cli/e2e/utils",
+        "//tests/e2e/utils",
     ],
 )
diff --git a/tests/legacy-cli/e2e/ng-snapshot/BUILD.bazel b/tests/e2e/ng-snapshot/BUILD.bazel
similarity index 100%
rename from tests/legacy-cli/e2e/ng-snapshot/BUILD.bazel
rename to tests/e2e/ng-snapshot/BUILD.bazel
diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/e2e/ng-snapshot/package.json
similarity index 100%
rename from tests/legacy-cli/e2e/ng-snapshot/package.json
rename to tests/e2e/ng-snapshot/package.json
diff --git a/tests/legacy-cli/e2e/setup/001-npm-sandbox.ts b/tests/e2e/setup/001-npm-sandbox.ts
similarity index 100%
rename from tests/legacy-cli/e2e/setup/001-npm-sandbox.ts
rename to tests/e2e/setup/001-npm-sandbox.ts
diff --git a/tests/legacy-cli/e2e/setup/010-local-publish.ts b/tests/e2e/setup/010-local-publish.ts
similarity index 100%
rename from tests/legacy-cli/e2e/setup/010-local-publish.ts
rename to tests/e2e/setup/010-local-publish.ts
diff --git a/tests/legacy-cli/e2e/setup/100-global-cli.ts b/tests/e2e/setup/100-global-cli.ts
similarity index 100%
rename from tests/legacy-cli/e2e/setup/100-global-cli.ts
rename to tests/e2e/setup/100-global-cli.ts
diff --git a/tests/legacy-cli/e2e/setup/200-create-project-dir.ts b/tests/e2e/setup/200-create-project-dir.ts
similarity index 100%
rename from tests/legacy-cli/e2e/setup/200-create-project-dir.ts
rename to tests/e2e/setup/200-create-project-dir.ts
diff --git a/tests/legacy-cli/e2e/setup/BUILD.bazel b/tests/e2e/setup/BUILD.bazel
similarity index 85%
rename from tests/legacy-cli/e2e/setup/BUILD.bazel
rename to tests/e2e/setup/BUILD.bazel
index 0b83d8f92d7f..36fe39fa3409 100644
--- a/tests/legacy-cli/e2e/setup/BUILD.bazel
+++ b/tests/e2e/setup/BUILD.bazel
@@ -8,6 +8,6 @@ ts_project(
     srcs = glob(["**/*.ts"]),
     deps = [
         "//:node_modules/@types/node",
-        "//tests/legacy-cli/e2e/utils",
+        "//tests/e2e/utils",
     ],
 )
diff --git a/tests/legacy-cli/e2e/tests/BUILD.bazel b/tests/e2e/tests/BUILD.bazel
similarity index 92%
rename from tests/legacy-cli/e2e/tests/BUILD.bazel
rename to tests/e2e/tests/BUILD.bazel
index 0ed3f83428f7..33ced88bca3a 100644
--- a/tests/legacy-cli/e2e/tests/BUILD.bazel
+++ b/tests/e2e/tests/BUILD.bazel
@@ -14,6 +14,6 @@ ts_project(
         "//:node_modules/fast-glob",
         "//:node_modules/semver",
         "//:node_modules/undici",
-        "//tests/legacy-cli/e2e/utils",
+        "//tests/e2e/utils",
     ],
 )
diff --git a/tests/legacy-cli/e2e/tests/basic/aot.ts b/tests/e2e/tests/basic/aot.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/aot.ts
rename to tests/e2e/tests/basic/aot.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/build.ts b/tests/e2e/tests/basic/build.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/build.ts
rename to tests/e2e/tests/basic/build.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/command-scope.ts b/tests/e2e/tests/basic/command-scope.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/command-scope.ts
rename to tests/e2e/tests/basic/command-scope.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/e2e/tests/basic/rebuild.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/rebuild.ts
rename to tests/e2e/tests/basic/rebuild.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/run.ts b/tests/e2e/tests/basic/run.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/run.ts
rename to tests/e2e/tests/basic/run.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/e2e/tests/basic/scripts-array.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/scripts-array.ts
rename to tests/e2e/tests/basic/scripts-array.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/serve.ts b/tests/e2e/tests/basic/serve.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/serve.ts
rename to tests/e2e/tests/basic/serve.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/e2e/tests/basic/styles-array.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/styles-array.ts
rename to tests/e2e/tests/basic/styles-array.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/test.ts b/tests/e2e/tests/basic/test.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/test.ts
rename to tests/e2e/tests/basic/test.ts
diff --git a/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-ngmodule.ts b/tests/e2e/tests/build/app-shell/app-shell-ngmodule.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/app-shell/app-shell-ngmodule.ts
rename to tests/e2e/tests/build/app-shell/app-shell-ngmodule.ts
diff --git a/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-schematic.ts b/tests/e2e/tests/build/app-shell/app-shell-with-schematic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-schematic.ts
rename to tests/e2e/tests/build/app-shell/app-shell-with-schematic.ts
diff --git a/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-service-worker.ts b/tests/e2e/tests/build/app-shell/app-shell-with-service-worker.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-service-worker.ts
rename to tests/e2e/tests/build/app-shell/app-shell-with-service-worker.ts
diff --git a/tests/legacy-cli/e2e/tests/build/assets.ts b/tests/e2e/tests/build/assets.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/assets.ts
rename to tests/e2e/tests/build/assets.ts
diff --git a/tests/legacy-cli/e2e/tests/build/auto-csp.ts b/tests/e2e/tests/build/auto-csp.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/auto-csp.ts
rename to tests/e2e/tests/build/auto-csp.ts
diff --git a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts b/tests/e2e/tests/build/bundle-budgets.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
rename to tests/e2e/tests/build/bundle-budgets.ts
diff --git a/tests/legacy-cli/e2e/tests/build/chunk-optimizer-lazy.ts b/tests/e2e/tests/build/chunk-optimizer-lazy.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/chunk-optimizer-lazy.ts
rename to tests/e2e/tests/build/chunk-optimizer-lazy.ts
diff --git a/tests/legacy-cli/e2e/tests/build/chunk-optimizer.ts b/tests/e2e/tests/build/chunk-optimizer.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/chunk-optimizer.ts
rename to tests/e2e/tests/build/chunk-optimizer.ts
diff --git a/tests/legacy-cli/e2e/tests/build/config-file-fallback.ts b/tests/e2e/tests/build/config-file-fallback.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/config-file-fallback.ts
rename to tests/e2e/tests/build/config-file-fallback.ts
diff --git a/tests/legacy-cli/e2e/tests/build/css-urls.ts b/tests/e2e/tests/build/css-urls.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/css-urls.ts
rename to tests/e2e/tests/build/css-urls.ts
diff --git a/tests/legacy-cli/e2e/tests/build/disk-cache-purge.ts b/tests/e2e/tests/build/disk-cache-purge.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/disk-cache-purge.ts
rename to tests/e2e/tests/build/disk-cache-purge.ts
diff --git a/tests/legacy-cli/e2e/tests/build/disk-cache.ts b/tests/e2e/tests/build/disk-cache.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/disk-cache.ts
rename to tests/e2e/tests/build/disk-cache.ts
diff --git a/tests/legacy-cli/e2e/tests/build/esbuild-unsupported.ts b/tests/e2e/tests/build/esbuild-unsupported.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/esbuild-unsupported.ts
rename to tests/e2e/tests/build/esbuild-unsupported.ts
diff --git a/tests/legacy-cli/e2e/tests/build/extract-licenses.ts b/tests/e2e/tests/build/extract-licenses.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/extract-licenses.ts
rename to tests/e2e/tests/build/extract-licenses.ts
diff --git a/tests/legacy-cli/e2e/tests/build/incremental-watch.ts b/tests/e2e/tests/build/incremental-watch.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/incremental-watch.ts
rename to tests/e2e/tests/build/incremental-watch.ts
diff --git a/tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts b/tests/e2e/tests/build/jit-ngmodule.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts
rename to tests/e2e/tests/build/jit-ngmodule.ts
diff --git a/tests/legacy-cli/e2e/tests/build/jit-prod.ts b/tests/e2e/tests/build/jit-prod.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/jit-prod.ts
rename to tests/e2e/tests/build/jit-prod.ts
diff --git a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts b/tests/e2e/tests/build/lazy-load-syntax.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
rename to tests/e2e/tests/build/lazy-load-syntax.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library-with-demo-app.ts b/tests/e2e/tests/build/library-with-demo-app.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library-with-demo-app.ts
rename to tests/e2e/tests/build/library-with-demo-app.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library/lib-consumption-full-aot.ts b/tests/e2e/tests/build/library/lib-consumption-full-aot.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library/lib-consumption-full-aot.ts
rename to tests/e2e/tests/build/library/lib-consumption-full-aot.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library/lib-consumption-full-jit.ts b/tests/e2e/tests/build/library/lib-consumption-full-jit.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library/lib-consumption-full-jit.ts
rename to tests/e2e/tests/build/library/lib-consumption-full-jit.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library/lib-consumption-partial-aot.ts b/tests/e2e/tests/build/library/lib-consumption-partial-aot.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library/lib-consumption-partial-aot.ts
rename to tests/e2e/tests/build/library/lib-consumption-partial-aot.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library/lib-consumption-partial-jit.ts b/tests/e2e/tests/build/library/lib-consumption-partial-jit.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library/lib-consumption-partial-jit.ts
rename to tests/e2e/tests/build/library/lib-consumption-partial-jit.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library/lib-consumption-sourcemaps.ts b/tests/e2e/tests/build/library/lib-consumption-sourcemaps.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library/lib-consumption-sourcemaps.ts
rename to tests/e2e/tests/build/library/lib-consumption-sourcemaps.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library/lib-unused-decorated-class-treeshake.ts b/tests/e2e/tests/build/library/lib-unused-decorated-class-treeshake.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library/lib-unused-decorated-class-treeshake.ts
rename to tests/e2e/tests/build/library/lib-unused-decorated-class-treeshake.ts
diff --git a/tests/legacy-cli/e2e/tests/build/library/setup.ts b/tests/e2e/tests/build/library/setup.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/library/setup.ts
rename to tests/e2e/tests/build/library/setup.ts
diff --git a/tests/legacy-cli/e2e/tests/build/material.ts b/tests/e2e/tests/build/material.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/material.ts
rename to tests/e2e/tests/build/material.ts
diff --git a/tests/legacy-cli/e2e/tests/build/multiple-configs.ts b/tests/e2e/tests/build/multiple-configs.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/multiple-configs.ts
rename to tests/e2e/tests/build/multiple-configs.ts
diff --git a/tests/legacy-cli/e2e/tests/build/output-dir.ts b/tests/e2e/tests/build/output-dir.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/output-dir.ts
rename to tests/e2e/tests/build/output-dir.ts
diff --git a/tests/legacy-cli/e2e/tests/build/poll.ts b/tests/e2e/tests/build/poll.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/poll.ts
rename to tests/e2e/tests/build/poll.ts
diff --git a/tests/legacy-cli/e2e/tests/build/prerender/discover-routes-ngmodule.ts b/tests/e2e/tests/build/prerender/discover-routes-ngmodule.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/prerender/discover-routes-ngmodule.ts
rename to tests/e2e/tests/build/prerender/discover-routes-ngmodule.ts
diff --git a/tests/legacy-cli/e2e/tests/build/prerender/discover-routes-standalone.ts b/tests/e2e/tests/build/prerender/discover-routes-standalone.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/prerender/discover-routes-standalone.ts
rename to tests/e2e/tests/build/prerender/discover-routes-standalone.ts
diff --git a/tests/legacy-cli/e2e/tests/build/prerender/error-with-sourcemaps.ts b/tests/e2e/tests/build/prerender/error-with-sourcemaps.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/prerender/error-with-sourcemaps.ts
rename to tests/e2e/tests/build/prerender/error-with-sourcemaps.ts
diff --git a/tests/legacy-cli/e2e/tests/build/prerender/http-requests-assets.ts b/tests/e2e/tests/build/prerender/http-requests-assets.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/prerender/http-requests-assets.ts
rename to tests/e2e/tests/build/prerender/http-requests-assets.ts
diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/e2e/tests/build/prod-build.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/prod-build.ts
rename to tests/e2e/tests/build/prod-build.ts
diff --git a/tests/legacy-cli/e2e/tests/build/progress-and-stats.ts b/tests/e2e/tests/build/progress-and-stats.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/progress-and-stats.ts
rename to tests/e2e/tests/build/progress-and-stats.ts
diff --git a/tests/legacy-cli/e2e/tests/build/project-name.ts b/tests/e2e/tests/build/project-name.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/project-name.ts
rename to tests/e2e/tests/build/project-name.ts
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts b/tests/e2e/tests/build/rebuild-deps-type-check.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts
rename to tests/e2e/tests/build/rebuild-deps-type-check.ts
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts b/tests/e2e/tests/build/rebuild-dot-dirname.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/rebuild-dot-dirname.ts
rename to tests/e2e/tests/build/rebuild-dot-dirname.ts
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts b/tests/e2e/tests/build/rebuild-replacements.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
rename to tests/e2e/tests/build/rebuild-replacements.ts
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-symlink.ts b/tests/e2e/tests/build/rebuild-symlink.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/rebuild-symlink.ts
rename to tests/e2e/tests/build/rebuild-symlink.ts
diff --git a/tests/legacy-cli/e2e/tests/build/relative-sourcemap.ts b/tests/e2e/tests/build/relative-sourcemap.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/relative-sourcemap.ts
rename to tests/e2e/tests/build/relative-sourcemap.ts
diff --git a/tests/legacy-cli/e2e/tests/build/scripts-output-hashing.ts b/tests/e2e/tests/build/scripts-output-hashing.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/scripts-output-hashing.ts
rename to tests/e2e/tests/build/scripts-output-hashing.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-csp-nonce.ts b/tests/e2e/tests/build/server-rendering/express-engine-csp-nonce.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-csp-nonce.ts
rename to tests/e2e/tests/build/server-rendering/express-engine-csp-nonce.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts b/tests/e2e/tests/build/server-rendering/express-engine-ngmodule.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts
rename to tests/e2e/tests/build/server-rendering/express-engine-ngmodule.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-standalone.ts b/tests/e2e/tests/build/server-rendering/express-engine-standalone.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-standalone.ts
rename to tests/e2e/tests/build/server-rendering/express-engine-standalone.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-external-dependencies.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-external-dependencies.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-external-dependencies.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-external-dependencies.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-base-href.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-base-href.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-base-href.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-base-href.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-sub-path.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-sub-path.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-sub-path.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n-sub-path.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-i18n.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-platform-neutral.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-platform-neutral.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-platform-neutral.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-server-platform-neutral.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-http-calls.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-static-http-calls.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-http-calls.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-static-http-calls.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-i18n_APP_BASE_HREF.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-static-i18n_APP_BASE_HREF.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-i18n_APP_BASE_HREF.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-static-i18n_APP_BASE_HREF.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static.ts b/tests/e2e/tests/build/server-rendering/server-routes-output-mode-static.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-output-mode-static.ts
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-preload-links.ts b/tests/e2e/tests/build/server-rendering/server-routes-preload-links.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-preload-links.ts
rename to tests/e2e/tests/build/server-rendering/server-routes-preload-links.ts
diff --git a/tests/legacy-cli/e2e/tests/build/sourcemap.ts b/tests/e2e/tests/build/sourcemap.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/sourcemap.ts
rename to tests/e2e/tests/build/sourcemap.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/bootstrap.ts b/tests/e2e/tests/build/styles/bootstrap.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/bootstrap.ts
rename to tests/e2e/tests/build/styles/bootstrap.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/include-paths.ts b/tests/e2e/tests/build/styles/include-paths.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/include-paths.ts
rename to tests/e2e/tests/build/styles/include-paths.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/less.ts b/tests/e2e/tests/build/styles/less.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/less.ts
rename to tests/e2e/tests/build/styles/less.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/loaders.ts b/tests/e2e/tests/build/styles/loaders.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/loaders.ts
rename to tests/e2e/tests/build/styles/loaders.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/sass-pkg-importer.ts b/tests/e2e/tests/build/styles/sass-pkg-importer.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/sass-pkg-importer.ts
rename to tests/e2e/tests/build/styles/sass-pkg-importer.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/sass.ts b/tests/e2e/tests/build/styles/sass.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/sass.ts
rename to tests/e2e/tests/build/styles/sass.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/scss-partial-resolution.ts b/tests/e2e/tests/build/styles/scss-partial-resolution.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/scss-partial-resolution.ts
rename to tests/e2e/tests/build/styles/scss-partial-resolution.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/scss.ts b/tests/e2e/tests/build/styles/scss.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/scss.ts
rename to tests/e2e/tests/build/styles/scss.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/symlinked-global.ts b/tests/e2e/tests/build/styles/symlinked-global.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/symlinked-global.ts
rename to tests/e2e/tests/build/styles/symlinked-global.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/tailwind-v2.ts b/tests/e2e/tests/build/styles/tailwind-v2.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/tailwind-v2.ts
rename to tests/e2e/tests/build/styles/tailwind-v2.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/tailwind-v3-cjs.ts b/tests/e2e/tests/build/styles/tailwind-v3-cjs.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/tailwind-v3-cjs.ts
rename to tests/e2e/tests/build/styles/tailwind-v3-cjs.ts
diff --git a/tests/legacy-cli/e2e/tests/build/styles/tailwind-v3.ts b/tests/e2e/tests/build/styles/tailwind-v3.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/styles/tailwind-v3.ts
rename to tests/e2e/tests/build/styles/tailwind-v3.ts
diff --git a/tests/legacy-cli/e2e/tests/build/ts-paths.ts b/tests/e2e/tests/build/ts-paths.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/ts-paths.ts
rename to tests/e2e/tests/build/ts-paths.ts
diff --git a/tests/legacy-cli/e2e/tests/build/ts-standard-decorators.ts b/tests/e2e/tests/build/ts-standard-decorators.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/ts-standard-decorators.ts
rename to tests/e2e/tests/build/ts-standard-decorators.ts
diff --git a/tests/legacy-cli/e2e/tests/build/wasm-esm.ts b/tests/e2e/tests/build/wasm-esm.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/wasm-esm.ts
rename to tests/e2e/tests/build/wasm-esm.ts
diff --git a/tests/legacy-cli/e2e/tests/build/worker.ts b/tests/e2e/tests/build/worker.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/build/worker.ts
rename to tests/e2e/tests/build/worker.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-material.ts b/tests/e2e/tests/commands/add/add-material.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/add-material.ts
rename to tests/e2e/tests/commands/add/add-material.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts b/tests/e2e/tests/commands/add/add-pwa.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts
rename to tests/e2e/tests/commands/add/add-pwa.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-tailwindcss.ts b/tests/e2e/tests/commands/add/add-tailwindcss.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/add-tailwindcss.ts
rename to tests/e2e/tests/commands/add/add-tailwindcss.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-version.ts b/tests/e2e/tests/commands/add/add-version.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/add-version.ts
rename to tests/e2e/tests/commands/add/add-version.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add.ts b/tests/e2e/tests/commands/add/add.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/add.ts
rename to tests/e2e/tests/commands/add/add.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/base.ts b/tests/e2e/tests/commands/add/base.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/base.ts
rename to tests/e2e/tests/commands/add/base.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/dir.ts b/tests/e2e/tests/commands/add/dir.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/dir.ts
rename to tests/e2e/tests/commands/add/dir.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/file.ts b/tests/e2e/tests/commands/add/file.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/file.ts
rename to tests/e2e/tests/commands/add/file.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/npm-config.ts b/tests/e2e/tests/commands/add/npm-config.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/npm-config.ts
rename to tests/e2e/tests/commands/add/npm-config.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/peer.ts b/tests/e2e/tests/commands/add/peer.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/peer.ts
rename to tests/e2e/tests/commands/add/peer.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/registry-option.ts b/tests/e2e/tests/commands/add/registry-option.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/registry-option.ts
rename to tests/e2e/tests/commands/add/registry-option.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/secure-registry.ts b/tests/e2e/tests/commands/add/secure-registry.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/secure-registry.ts
rename to tests/e2e/tests/commands/add/secure-registry.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts b/tests/e2e/tests/commands/add/version-specifier.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts
rename to tests/e2e/tests/commands/add/version-specifier.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/add/yarn-env-vars.ts b/tests/e2e/tests/commands/add/yarn-env-vars.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/add/yarn-env-vars.ts
rename to tests/e2e/tests/commands/add/yarn-env-vars.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/additional-properties.ts b/tests/e2e/tests/commands/additional-properties.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/additional-properties.ts
rename to tests/e2e/tests/commands/additional-properties.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/analytics/analytics-enable-disable.ts b/tests/e2e/tests/commands/analytics/analytics-enable-disable.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/analytics/analytics-enable-disable.ts
rename to tests/e2e/tests/commands/analytics/analytics-enable-disable.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/analytics/analytics-info.ts b/tests/e2e/tests/commands/analytics/analytics-info.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/analytics/analytics-info.ts
rename to tests/e2e/tests/commands/analytics/analytics-info.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/analytics/ask-analytics-command.ts b/tests/e2e/tests/commands/analytics/ask-analytics-command.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/analytics/ask-analytics-command.ts
rename to tests/e2e/tests/commands/analytics/ask-analytics-command.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/builder-not-found.ts b/tests/e2e/tests/commands/builder-not-found.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/builder-not-found.ts
rename to tests/e2e/tests/commands/builder-not-found.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/builder-project-by-cwd.ts b/tests/e2e/tests/commands/builder-project-by-cwd.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/builder-project-by-cwd.ts
rename to tests/e2e/tests/commands/builder-project-by-cwd.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/cache/cache-clean.ts b/tests/e2e/tests/commands/cache/cache-clean.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/cache/cache-clean.ts
rename to tests/e2e/tests/commands/cache/cache-clean.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/cache/cache-enable-disable.ts b/tests/e2e/tests/commands/cache/cache-enable-disable.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/cache/cache-enable-disable.ts
rename to tests/e2e/tests/commands/cache/cache-enable-disable.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/cache/cache-info.ts b/tests/e2e/tests/commands/cache/cache-info.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/cache/cache-info.ts
rename to tests/e2e/tests/commands/cache/cache-info.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/completion/completion-prompt.ts b/tests/e2e/tests/commands/completion/completion-prompt.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/completion/completion-prompt.ts
rename to tests/e2e/tests/commands/completion/completion-prompt.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/completion/completion-script.ts b/tests/e2e/tests/commands/completion/completion-script.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/completion/completion-script.ts
rename to tests/e2e/tests/commands/completion/completion-script.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/completion/completion.ts b/tests/e2e/tests/commands/completion/completion.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/completion/completion.ts
rename to tests/e2e/tests/commands/completion/completion.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-get.ts b/tests/e2e/tests/commands/config/config-get.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/config/config-get.ts
rename to tests/e2e/tests/commands/config/config-get.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-global-validation.ts b/tests/e2e/tests/commands/config/config-global-validation.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/config/config-global-validation.ts
rename to tests/e2e/tests/commands/config/config-global-validation.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-global.ts b/tests/e2e/tests/commands/config/config-global.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/config/config-global.ts
rename to tests/e2e/tests/commands/config/config-global.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set-enum-check.ts b/tests/e2e/tests/commands/config/config-set-enum-check.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/config/config-set-enum-check.ts
rename to tests/e2e/tests/commands/config/config-set-enum-check.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set-prefix.ts b/tests/e2e/tests/commands/config/config-set-prefix.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/config/config-set-prefix.ts
rename to tests/e2e/tests/commands/config/config-set-prefix.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts b/tests/e2e/tests/commands/config/config-set-serve-port.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts
rename to tests/e2e/tests/commands/config/config-set-serve-port.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set.ts b/tests/e2e/tests/commands/config/config-set.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/config/config-set.ts
rename to tests/e2e/tests/commands/config/config-set.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/help/help-hidden.ts b/tests/e2e/tests/commands/help/help-hidden.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/help/help-hidden.ts
rename to tests/e2e/tests/commands/help/help-hidden.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/help/help-json.ts b/tests/e2e/tests/commands/help/help-json.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/help/help-json.ts
rename to tests/e2e/tests/commands/help/help-json.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/ng-new-collection.ts b/tests/e2e/tests/commands/ng-new-collection.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/ng-new-collection.ts
rename to tests/e2e/tests/commands/ng-new-collection.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/project-cannot-be-determined-by-cwd.ts b/tests/e2e/tests/commands/project-cannot-be-determined-by-cwd.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/project-cannot-be-determined-by-cwd.ts
rename to tests/e2e/tests/commands/project-cannot-be-determined-by-cwd.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/run-configuration-option.ts b/tests/e2e/tests/commands/run-configuration-option.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/run-configuration-option.ts
rename to tests/e2e/tests/commands/run-configuration-option.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/assets.ts b/tests/e2e/tests/commands/serve/assets.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/serve/assets.ts
rename to tests/e2e/tests/commands/serve/assets.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/head-request.ts b/tests/e2e/tests/commands/serve/head-request.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/serve/head-request.ts
rename to tests/e2e/tests/commands/serve/head-request.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/preflight-request.ts b/tests/e2e/tests/commands/serve/preflight-request.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/serve/preflight-request.ts
rename to tests/e2e/tests/commands/serve/preflight-request.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/reload-shims.ts b/tests/e2e/tests/commands/serve/reload-shims.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/serve/reload-shims.ts
rename to tests/e2e/tests/commands/serve/reload-shims.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/serve-path.ts b/tests/e2e/tests/commands/serve/serve-path.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/serve/serve-path.ts
rename to tests/e2e/tests/commands/serve/serve-path.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/ssr-http-requests-assets.ts b/tests/e2e/tests/commands/serve/ssr-http-requests-assets.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/serve/ssr-http-requests-assets.ts
rename to tests/e2e/tests/commands/serve/ssr-http-requests-assets.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/unknown-configuration.ts b/tests/e2e/tests/commands/unknown-configuration.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/unknown-configuration.ts
rename to tests/e2e/tests/commands/unknown-configuration.ts
diff --git a/tests/legacy-cli/e2e/tests/commands/unknown-option.ts b/tests/e2e/tests/commands/unknown-option.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/commands/unknown-option.ts
rename to tests/e2e/tests/commands/unknown-option.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-ng-module.ts b/tests/e2e/tests/generate/application/application-no-zoneless-ng-module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-ng-module.ts
rename to tests/e2e/tests/generate/application/application-no-zoneless-ng-module.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-standalone.ts b/tests/e2e/tests/generate/application/application-no-zoneless-standalone.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-standalone.ts
rename to tests/e2e/tests/generate/application/application-no-zoneless-standalone.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-zoneless-ng-module.ts b/tests/e2e/tests/generate/application/application-zoneless-ng-module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/application/application-zoneless-ng-module.ts
rename to tests/e2e/tests/generate/application/application-zoneless-ng-module.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-zoneless-standalone.ts b/tests/e2e/tests/generate/application/application-zoneless-standalone.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/application/application-zoneless-standalone.ts
rename to tests/e2e/tests/generate/application/application-zoneless-standalone.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-basic.ts b/tests/e2e/tests/generate/component/component-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/component/component-basic.ts
rename to tests/e2e/tests/generate/component/component-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts b/tests/e2e/tests/generate/component/component-child-dir.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts
rename to tests/e2e/tests/generate/component/component-child-dir.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-flat.ts b/tests/e2e/tests/generate/component/component-flat.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/component/component-flat.ts
rename to tests/e2e/tests/generate/component/component-flat.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-inline-template.ts b/tests/e2e/tests/generate/component/component-inline-template.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/component/component-inline-template.ts
rename to tests/e2e/tests/generate/component/component-inline-template.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-not-flat.ts b/tests/e2e/tests/generate/component/component-not-flat.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/component/component-not-flat.ts
rename to tests/e2e/tests/generate/component/component-not-flat.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts b/tests/e2e/tests/generate/component/component-path-case.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts
rename to tests/e2e/tests/generate/component/component-path-case.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-prefix.ts b/tests/e2e/tests/generate/component/component-prefix.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/component/component-prefix.ts
rename to tests/e2e/tests/generate/component/component-prefix.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/config/type-browserslist.ts b/tests/e2e/tests/generate/config/type-browserslist.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/config/type-browserslist.ts
rename to tests/e2e/tests/generate/config/type-browserslist.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/config/type-karma.ts b/tests/e2e/tests/generate/config/type-karma.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/config/type-karma.ts
rename to tests/e2e/tests/generate/config/type-karma.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/directive/directive-basic.ts b/tests/e2e/tests/generate/directive/directive-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/directive/directive-basic.ts
rename to tests/e2e/tests/generate/directive/directive-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts b/tests/e2e/tests/generate/directive/directive-prefix.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts
rename to tests/e2e/tests/generate/directive/directive-prefix.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/generate-error.ts b/tests/e2e/tests/generate/generate-error.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/generate-error.ts
rename to tests/e2e/tests/generate/generate-error.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/generate-name-check.ts b/tests/e2e/tests/generate/generate-name-check.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/generate-name-check.ts
rename to tests/e2e/tests/generate/generate-name-check.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/guard/guard-basic.ts b/tests/e2e/tests/generate/guard/guard-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/guard/guard-basic.ts
rename to tests/e2e/tests/generate/guard/guard-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/guard/guard-implements.ts b/tests/e2e/tests/generate/guard/guard-implements.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/guard/guard-implements.ts
rename to tests/e2e/tests/generate/guard/guard-implements.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/guard/guard-multiple-implements.ts b/tests/e2e/tests/generate/guard/guard-multiple-implements.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/guard/guard-multiple-implements.ts
rename to tests/e2e/tests/generate/guard/guard-multiple-implements.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/help-output-no-duplicates.ts b/tests/e2e/tests/generate/help-output-no-duplicates.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/help-output-no-duplicates.ts
rename to tests/e2e/tests/generate/help-output-no-duplicates.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/help-output.ts b/tests/e2e/tests/generate/help-output.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/help-output.ts
rename to tests/e2e/tests/generate/help-output.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/install-allow-scripts.ts b/tests/e2e/tests/generate/install-allow-scripts.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/install-allow-scripts.ts
rename to tests/e2e/tests/generate/install-allow-scripts.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/interceptor/interceptor-basic.ts b/tests/e2e/tests/generate/interceptor/interceptor-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/interceptor/interceptor-basic.ts
rename to tests/e2e/tests/generate/interceptor/interceptor-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-basic.ts b/tests/e2e/tests/generate/library/library-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/library/library-basic.ts
rename to tests/e2e/tests/generate/library/library-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-standalone.ts b/tests/e2e/tests/generate/library/library-standalone.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/library/library-standalone.ts
rename to tests/e2e/tests/generate/library/library-standalone.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/module/module-basic.ts b/tests/e2e/tests/generate/module/module-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/module/module-basic.ts
rename to tests/e2e/tests/generate/module/module-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/module/module-import.ts b/tests/e2e/tests/generate/module/module-import.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/module/module-import.ts
rename to tests/e2e/tests/generate/module/module-import.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/module/module-routing-child-folder.ts b/tests/e2e/tests/generate/module/module-routing-child-folder.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/module/module-routing-child-folder.ts
rename to tests/e2e/tests/generate/module/module-routing-child-folder.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/pipe/pipe-basic.ts b/tests/e2e/tests/generate/pipe/pipe-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/pipe/pipe-basic.ts
rename to tests/e2e/tests/generate/pipe/pipe-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/schematic-aliases.ts b/tests/e2e/tests/generate/schematic-aliases.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/schematic-aliases.ts
rename to tests/e2e/tests/generate/schematic-aliases.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/schematic-defaults.ts b/tests/e2e/tests/generate/schematic-defaults.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/schematic-defaults.ts
rename to tests/e2e/tests/generate/schematic-defaults.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/schematic-force-override.ts b/tests/e2e/tests/generate/schematic-force-override.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/schematic-force-override.ts
rename to tests/e2e/tests/generate/schematic-force-override.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/schematics-collections-relative.ts b/tests/e2e/tests/generate/schematics-collections-relative.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/schematics-collections-relative.ts
rename to tests/e2e/tests/generate/schematics-collections-relative.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/schematics-collections.ts b/tests/e2e/tests/generate/schematics-collections.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/schematics-collections.ts
rename to tests/e2e/tests/generate/schematics-collections.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/service/service-basic.ts b/tests/e2e/tests/generate/service/service-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/generate/service/service-basic.ts
rename to tests/e2e/tests/generate/service/service-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy-disk-cache.ts b/tests/e2e/tests/i18n/extract-ivy-disk-cache.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/extract-ivy-disk-cache.ts
rename to tests/e2e/tests/i18n/extract-ivy-disk-cache.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts b/tests/e2e/tests/i18n/extract-ivy-libraries.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts
rename to tests/e2e/tests/i18n/extract-ivy-libraries.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts b/tests/e2e/tests/i18n/extract-ivy.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts
rename to tests/e2e/tests/i18n/extract-ivy.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell-service-worker.ts b/tests/e2e/tests/i18n/ivy-localize-app-shell-service-worker.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell-service-worker.ts
rename to tests/e2e/tests/i18n/ivy-localize-app-shell-service-worker.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts b/tests/e2e/tests/i18n/ivy-localize-app-shell.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts
rename to tests/e2e/tests/i18n/ivy-localize-app-shell.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref-absolute.ts b/tests/e2e/tests/i18n/ivy-localize-basehref-absolute.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref-absolute.ts
rename to tests/e2e/tests/i18n/ivy-localize-basehref-absolute.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts b/tests/e2e/tests/i18n/ivy-localize-basehref.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts
rename to tests/e2e/tests/i18n/ivy-localize-basehref.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-es2015-e2e.ts b/tests/e2e/tests/i18n/ivy-localize-es2015-e2e.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-es2015-e2e.ts
rename to tests/e2e/tests/i18n/ivy-localize-es2015-e2e.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-es2015.ts b/tests/e2e/tests/i18n/ivy-localize-es2015.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-es2015.ts
rename to tests/e2e/tests/i18n/ivy-localize-es2015.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts b/tests/e2e/tests/i18n/ivy-localize-hashes.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts
rename to tests/e2e/tests/i18n/ivy-localize-hashes.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data-augment.ts b/tests/e2e/tests/i18n/ivy-localize-locale-data-augment.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data-augment.ts
rename to tests/e2e/tests/i18n/ivy-localize-locale-data-augment.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data.ts b/tests/e2e/tests/i18n/ivy-localize-locale-data.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-locale-data.ts
rename to tests/e2e/tests/i18n/ivy-localize-locale-data.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.ts b/tests/e2e/tests/i18n/ivy-localize-merging.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.ts
rename to tests/e2e/tests/i18n/ivy-localize-merging.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.ts b/tests/e2e/tests/i18n/ivy-localize-sourcelocale.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.ts
rename to tests/e2e/tests/i18n/ivy-localize-sourcelocale.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcemaps.ts b/tests/e2e/tests/i18n/ivy-localize-sourcemaps.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcemaps.ts
rename to tests/e2e/tests/i18n/ivy-localize-sourcemaps.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-ssr.ts b/tests/e2e/tests/i18n/ivy-localize-ssr.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-ssr.ts
rename to tests/e2e/tests/i18n/ivy-localize-ssr.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sub-path.ts b/tests/e2e/tests/i18n/ivy-localize-sub-path.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/ivy-localize-sub-path.ts
rename to tests/e2e/tests/i18n/ivy-localize-sub-path.ts
diff --git a/tests/legacy-cli/e2e/tests/i18n/setup.ts b/tests/e2e/tests/i18n/setup.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/i18n/setup.ts
rename to tests/e2e/tests/i18n/setup.ts
diff --git a/tests/legacy-cli/e2e/tests/jest/aot.ts b/tests/e2e/tests/jest/aot.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/jest/aot.ts
rename to tests/e2e/tests/jest/aot.ts
diff --git a/tests/legacy-cli/e2e/tests/jest/basic.ts b/tests/e2e/tests/jest/basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/jest/basic.ts
rename to tests/e2e/tests/jest/basic.ts
diff --git a/tests/legacy-cli/e2e/tests/jest/custom-config.ts b/tests/e2e/tests/jest/custom-config.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/jest/custom-config.ts
rename to tests/e2e/tests/jest/custom-config.ts
diff --git a/tests/legacy-cli/e2e/tests/jest/no-zoneless.ts b/tests/e2e/tests/jest/no-zoneless.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/jest/no-zoneless.ts
rename to tests/e2e/tests/jest/no-zoneless.ts
diff --git a/tests/legacy-cli/e2e/tests/mcp/ai-tutor.ts b/tests/e2e/tests/mcp/ai-tutor.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/mcp/ai-tutor.ts
rename to tests/e2e/tests/mcp/ai-tutor.ts
diff --git a/tests/legacy-cli/e2e/tests/mcp/best-practices.ts b/tests/e2e/tests/mcp/best-practices.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/mcp/best-practices.ts
rename to tests/e2e/tests/mcp/best-practices.ts
diff --git a/tests/legacy-cli/e2e/tests/mcp/find-examples-basic.ts b/tests/e2e/tests/mcp/find-examples-basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/mcp/find-examples-basic.ts
rename to tests/e2e/tests/mcp/find-examples-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/mcp/registers-tools.ts b/tests/e2e/tests/mcp/registers-tools.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/mcp/registers-tools.ts
rename to tests/e2e/tests/mcp/registers-tools.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/ask-missing-builder.ts b/tests/e2e/tests/misc/ask-missing-builder.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/ask-missing-builder.ts
rename to tests/e2e/tests/misc/ask-missing-builder.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/browsers.ts b/tests/e2e/tests/misc/browsers.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/browsers.ts
rename to tests/e2e/tests/misc/browsers.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/check-postinstalls.ts b/tests/e2e/tests/misc/check-postinstalls.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/check-postinstalls.ts
rename to tests/e2e/tests/misc/check-postinstalls.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/create-angular.ts b/tests/e2e/tests/misc/create-angular.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/create-angular.ts
rename to tests/e2e/tests/misc/create-angular.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/dedupe-duplicate-modules.ts b/tests/e2e/tests/misc/dedupe-duplicate-modules.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/dedupe-duplicate-modules.ts
rename to tests/e2e/tests/misc/dedupe-duplicate-modules.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/duplicate-command-line-option.ts b/tests/e2e/tests/misc/duplicate-command-line-option.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/duplicate-command-line-option.ts
rename to tests/e2e/tests/misc/duplicate-command-line-option.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/es2015-nometa.ts b/tests/e2e/tests/misc/es2015-nometa.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/es2015-nometa.ts
rename to tests/e2e/tests/misc/es2015-nometa.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/forwardref-es2015.ts b/tests/e2e/tests/misc/forwardref-es2015.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/forwardref-es2015.ts
rename to tests/e2e/tests/misc/forwardref-es2015.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts b/tests/e2e/tests/misc/invalid-schematic-dependencies.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts
rename to tests/e2e/tests/misc/invalid-schematic-dependencies.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/loaders-resolution.ts b/tests/e2e/tests/misc/loaders-resolution.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/loaders-resolution.ts
rename to tests/e2e/tests/misc/loaders-resolution.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/module-resolution/module-resolution-core-mapping.ts b/tests/e2e/tests/misc/module-resolution/module-resolution-core-mapping.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/module-resolution/module-resolution-core-mapping.ts
rename to tests/e2e/tests/misc/module-resolution/module-resolution-core-mapping.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/multiple-targets.ts b/tests/e2e/tests/misc/multiple-targets.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/multiple-targets.ts
rename to tests/e2e/tests/misc/multiple-targets.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/negated-boolean-options.ts b/tests/e2e/tests/misc/negated-boolean-options.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/negated-boolean-options.ts
rename to tests/e2e/tests/misc/negated-boolean-options.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/nested-schematic-packages.ts b/tests/e2e/tests/misc/nested-schematic-packages.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/nested-schematic-packages.ts
rename to tests/e2e/tests/misc/nested-schematic-packages.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/supported-angular.ts b/tests/e2e/tests/misc/supported-angular.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/supported-angular.ts
rename to tests/e2e/tests/misc/supported-angular.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/target-default-configuration.ts b/tests/e2e/tests/misc/target-default-configuration.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/target-default-configuration.ts
rename to tests/e2e/tests/misc/target-default-configuration.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/trace-resolution.ts b/tests/e2e/tests/misc/trace-resolution.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/trace-resolution.ts
rename to tests/e2e/tests/misc/trace-resolution.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/trusted-types.ts b/tests/e2e/tests/misc/trusted-types.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/trusted-types.ts
rename to tests/e2e/tests/misc/trusted-types.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/update-git-clean-subdirectory.ts b/tests/e2e/tests/misc/update-git-clean-subdirectory.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/update-git-clean-subdirectory.ts
rename to tests/e2e/tests/misc/update-git-clean-subdirectory.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/update-git-clean.ts b/tests/e2e/tests/misc/update-git-clean.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/update-git-clean.ts
rename to tests/e2e/tests/misc/update-git-clean.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/version.ts b/tests/e2e/tests/misc/version.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/version.ts
rename to tests/e2e/tests/misc/version.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/workspace-verification.ts b/tests/e2e/tests/misc/workspace-verification.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/misc/workspace-verification.ts
rename to tests/e2e/tests/misc/workspace-verification.ts
diff --git a/tests/legacy-cli/e2e/tests/protractor/test-fails.ts b/tests/e2e/tests/protractor/test-fails.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/protractor/test-fails.ts
rename to tests/e2e/tests/protractor/test-fails.ts
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts b/tests/e2e/tests/schematics_cli/basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
rename to tests/e2e/tests/schematics_cli/basic.ts
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts b/tests/e2e/tests/schematics_cli/blank-test.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts
rename to tests/e2e/tests/schematics_cli/blank-test.ts
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts b/tests/e2e/tests/schematics_cli/schematic-test.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts
rename to tests/e2e/tests/schematics_cli/schematic-test.ts
diff --git a/tests/legacy-cli/e2e/tests/test/karma-junit-output.ts b/tests/e2e/tests/test/karma-junit-output.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/karma-junit-output.ts
rename to tests/e2e/tests/test/karma-junit-output.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-code-coverage-exclude.ts b/tests/e2e/tests/test/test-code-coverage-exclude.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/test-code-coverage-exclude.ts
rename to tests/e2e/tests/test/test-code-coverage-exclude.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-environment.ts b/tests/e2e/tests/test/test-environment.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/test-environment.ts
rename to tests/e2e/tests/test/test-environment.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-fail-single-run.ts b/tests/e2e/tests/test/test-fail-single-run.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/test-fail-single-run.ts
rename to tests/e2e/tests/test/test-fail-single-run.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-include-glob.ts b/tests/e2e/tests/test/test-include-glob.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/test-include-glob.ts
rename to tests/e2e/tests/test/test-include-glob.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-jasmine-clock.ts b/tests/e2e/tests/test/test-jasmine-clock.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/test-jasmine-clock.ts
rename to tests/e2e/tests/test/test-jasmine-clock.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-scripts.ts b/tests/e2e/tests/test/test-scripts.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/test-scripts.ts
rename to tests/e2e/tests/test/test-scripts.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts b/tests/e2e/tests/test/test-sourcemap.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/test/test-sourcemap.ts
rename to tests/e2e/tests/test/test-sourcemap.ts
diff --git a/tests/legacy-cli/e2e/tests/update/update-application-builder.ts b/tests/e2e/tests/update/update-application-builder.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/update/update-application-builder.ts
rename to tests/e2e/tests/update/update-application-builder.ts
diff --git a/tests/legacy-cli/e2e/tests/update/update-multiple-versions.ts b/tests/e2e/tests/update/update-multiple-versions.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/update/update-multiple-versions.ts
rename to tests/e2e/tests/update/update-multiple-versions.ts
diff --git a/tests/legacy-cli/e2e/tests/update/update-secure-registry.ts b/tests/e2e/tests/update/update-secure-registry.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/update/update-secure-registry.ts
rename to tests/e2e/tests/update/update-secure-registry.ts
diff --git a/tests/legacy-cli/e2e/tests/update/update.ts b/tests/e2e/tests/update/update.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/update/update.ts
rename to tests/e2e/tests/update/update.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/reuse-dep-optimization-cache.ts b/tests/e2e/tests/vite/reuse-dep-optimization-cache.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/reuse-dep-optimization-cache.ts
rename to tests/e2e/tests/vite/reuse-dep-optimization-cache.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-base-href.ts b/tests/e2e/tests/vite/ssr-base-href.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-base-href.ts
rename to tests/e2e/tests/vite/ssr-base-href.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-default.ts b/tests/e2e/tests/vite/ssr-default.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-default.ts
rename to tests/e2e/tests/vite/ssr-default.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-express.ts b/tests/e2e/tests/vite/ssr-entry-express.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-entry-express.ts
rename to tests/e2e/tests/vite/ssr-entry-express.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-fastify.ts b/tests/e2e/tests/vite/ssr-entry-fastify.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-entry-fastify.ts
rename to tests/e2e/tests/vite/ssr-entry-fastify.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-h3.ts b/tests/e2e/tests/vite/ssr-entry-h3.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-entry-h3.ts
rename to tests/e2e/tests/vite/ssr-entry-h3.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-hono.ts b/tests/e2e/tests/vite/ssr-entry-hono.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-entry-hono.ts
rename to tests/e2e/tests/vite/ssr-entry-hono.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-error-stack.ts b/tests/e2e/tests/vite/ssr-error-stack.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-error-stack.ts
rename to tests/e2e/tests/vite/ssr-error-stack.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-new-dep-optimization.ts b/tests/e2e/tests/vite/ssr-new-dep-optimization.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-new-dep-optimization.ts
rename to tests/e2e/tests/vite/ssr-new-dep-optimization.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-with-ssl.ts b/tests/e2e/tests/vite/ssr-with-ssl.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vite/ssr-with-ssl.ts
rename to tests/e2e/tests/vite/ssr-with-ssl.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/browser-no-globals.ts b/tests/e2e/tests/vitest/browser-no-globals.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/browser-no-globals.ts
rename to tests/e2e/tests/vitest/browser-no-globals.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/browser-playwright.ts b/tests/e2e/tests/vitest/browser-playwright.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/browser-playwright.ts
rename to tests/e2e/tests/vitest/browser-playwright.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/browser-webdriverio.ts b/tests/e2e/tests/vitest/browser-webdriverio.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/browser-webdriverio.ts
rename to tests/e2e/tests/vitest/browser-webdriverio.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/component.ts b/tests/e2e/tests/vitest/component.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/component.ts
rename to tests/e2e/tests/vitest/component.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/include.ts b/tests/e2e/tests/vitest/include.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/include.ts
rename to tests/e2e/tests/vitest/include.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/larger-project-coverage.ts b/tests/e2e/tests/vitest/larger-project-coverage.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/larger-project-coverage.ts
rename to tests/e2e/tests/vitest/larger-project-coverage.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/larger-project.ts b/tests/e2e/tests/vitest/larger-project.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/larger-project.ts
rename to tests/e2e/tests/vitest/larger-project.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/runner-config-path.ts b/tests/e2e/tests/vitest/runner-config-path.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/runner-config-path.ts
rename to tests/e2e/tests/vitest/runner-config-path.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/snapshot.ts b/tests/e2e/tests/vitest/snapshot.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/snapshot.ts
rename to tests/e2e/tests/vitest/snapshot.ts
diff --git a/tests/legacy-cli/e2e/tests/vitest/tslib-resolution.ts b/tests/e2e/tests/vitest/tslib-resolution.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/vitest/tslib-resolution.ts
rename to tests/e2e/tests/vitest/tslib-resolution.ts
diff --git a/tests/legacy-cli/e2e/tests/web-test-runner/basic.ts b/tests/e2e/tests/web-test-runner/basic.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/web-test-runner/basic.ts
rename to tests/e2e/tests/web-test-runner/basic.ts
diff --git a/tests/legacy-cli/e2e/utils/BUILD.bazel b/tests/e2e/utils/BUILD.bazel
similarity index 93%
rename from tests/legacy-cli/e2e/utils/BUILD.bazel
rename to tests/e2e/utils/BUILD.bazel
index 093a4f832092..b3de5c29f9b5 100644
--- a/tests/legacy-cli/e2e/utils/BUILD.bazel
+++ b/tests/e2e/utils/BUILD.bazel
@@ -7,7 +7,7 @@ ts_project(
     testonly = True,
     srcs = glob(["**/*.ts"]),
     data = [
-        "//tests/legacy-cli/e2e/ng-snapshot",
+        "//tests/e2e/ng-snapshot",
     ],
     deps = [
         "//:node_modules/@types/jasmine",
diff --git a/tests/legacy-cli/e2e/utils/assets.ts b/tests/e2e/utils/assets.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/assets.ts
rename to tests/e2e/utils/assets.ts
diff --git a/tests/legacy-cli/e2e/utils/env.ts b/tests/e2e/utils/env.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/env.ts
rename to tests/e2e/utils/env.ts
diff --git a/tests/legacy-cli/e2e/utils/fs.ts b/tests/e2e/utils/fs.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/fs.ts
rename to tests/e2e/utils/fs.ts
diff --git a/tests/legacy-cli/e2e/utils/git.ts b/tests/e2e/utils/git.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/git.ts
rename to tests/e2e/utils/git.ts
diff --git a/tests/legacy-cli/e2e/utils/jest.ts b/tests/e2e/utils/jest.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/jest.ts
rename to tests/e2e/utils/jest.ts
diff --git a/tests/legacy-cli/e2e/utils/network.ts b/tests/e2e/utils/network.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/network.ts
rename to tests/e2e/utils/network.ts
diff --git a/tests/legacy-cli/e2e/utils/packages.ts b/tests/e2e/utils/packages.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/packages.ts
rename to tests/e2e/utils/packages.ts
diff --git a/tests/legacy-cli/e2e/utils/process.ts b/tests/e2e/utils/process.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/process.ts
rename to tests/e2e/utils/process.ts
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/e2e/utils/project.ts
similarity index 99%
rename from tests/legacy-cli/e2e/utils/project.ts
rename to tests/e2e/utils/project.ts
index fe9cfd8a0e04..58e249d19895 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/e2e/utils/project.ts
@@ -119,7 +119,7 @@ export async function useSha(): Promise<void> {
       if (missingSnapshots.length > 0) {
         throw new Error(
           'e2e test with --ng-snapshots requires all angular packages be ' +
-            'listed in tests/legacy-cli/e2e/ng-snapshot/package.json.\nErrors:\n' +
+            'listed in tests/e2e/ng-snapshot/package.json.\nErrors:\n' +
             missingSnapshots.join('\n  '),
         );
       }
diff --git a/tests/legacy-cli/e2e/utils/registry.ts b/tests/e2e/utils/registry.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/registry.ts
rename to tests/e2e/utils/registry.ts
diff --git a/tests/legacy-cli/e2e/utils/tar.ts b/tests/e2e/utils/tar.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/tar.ts
rename to tests/e2e/utils/tar.ts
diff --git a/tests/legacy-cli/e2e/utils/test_process.ts b/tests/e2e/utils/test_process.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/test_process.ts
rename to tests/e2e/utils/test_process.ts
diff --git a/tests/legacy-cli/e2e/utils/utils.ts b/tests/e2e/utils/utils.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/utils.ts
rename to tests/e2e/utils/utils.ts
diff --git a/tests/legacy-cli/e2e/utils/version.ts b/tests/e2e/utils/version.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/version.ts
rename to tests/e2e/utils/version.ts
diff --git a/tests/legacy-cli/e2e/utils/vitest.ts b/tests/e2e/utils/vitest.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/vitest.ts
rename to tests/e2e/utils/vitest.ts
diff --git a/tests/legacy-cli/e2e/utils/web-test-runner.ts b/tests/e2e/utils/web-test-runner.ts
similarity index 100%
rename from tests/legacy-cli/e2e/utils/web-test-runner.ts
rename to tests/e2e/utils/web-test-runner.ts
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/e2e_runner.ts
similarity index 99%
rename from tests/legacy-cli/e2e_runner.ts
rename to tests/e2e_runner.ts
index 571f7dea5363..c7a672161b7a 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/e2e_runner.ts
@@ -1,5 +1,5 @@
 import { parseArgs, styleText } from 'node:util';
-import { createConsoleLogger } from '../../packages/angular_devkit/core/node';
+import { createConsoleLogger } from '../packages/angular_devkit/core/node';
 import glob from 'fast-glob';
 import * as path from 'node:path';
 import * as fs from 'node:fs';
diff --git a/tests/legacy-cli/BUILD.bazel b/tests/legacy-cli/BUILD.bazel
deleted file mode 100644
index 23acd2ddd3ff..000000000000
--- a/tests/legacy-cli/BUILD.bazel
+++ /dev/null
@@ -1,73 +0,0 @@
-load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
-load("@npm//:rollup/package_json.bzl", rollup = "bin")
-load("//tools:defaults.bzl", "ts_project")
-load(":e2e.bzl", "e2e_suites")
-
-package(default_visibility = ["//visibility:public"])
-
-ts_project(
-    name = "runner",
-    testonly = True,
-    srcs = [
-        "e2e_runner.ts",
-    ],
-    deps = [
-        "//:node_modules/@types/node",
-        "//:node_modules/fast-glob",
-        "//packages/angular_devkit/core",
-        "//packages/angular_devkit/core/node",
-        "//tests/legacy-cli/e2e/utils",
-    ],
-)
-
-rollup.rollup(
-    name = "runner_bundled",
-    testonly = True,
-    srcs = [
-        "rollup.config.mjs",
-        ":runner",
-        "//:node_modules/@rollup/plugin-alias",
-        "//:node_modules/@rollup/plugin-commonjs",
-        "//:node_modules/@rollup/plugin-json",
-        "//:node_modules/@rollup/plugin-node-resolve",
-        "//:node_modules/fast-glob",
-        "//tests/legacy-cli/e2e/initialize",
-        "//tests/legacy-cli/e2e/ng-snapshot",
-        "//tests/legacy-cli/e2e/setup",
-        "//tests/legacy-cli/e2e/tests",
-    ],
-    args = [
-        "--format=cjs",
-        "--config=./rollup.config.mjs",
-    ],
-    chdir = package_name(),
-    out_dirs = ["runner_bundled_out"],
-    progress_message = "Bundling e2e test runner",
-)
-
-directory_path(
-    name = "runner_entrypoint",
-    testonly = True,
-    directory = ":runner_bundled",
-    path = "./e2e_runner.js",
-)
-
-e2e_suites(
-    name = "e2e",
-    data = [
-        ":runner_bundled",
-        "verdaccio.yaml",
-        "verdaccio_auth.yaml",
-
-        # Dynamically loaded.
-        "//tests/legacy-cli/e2e/assets",
-        "//:node_modules/verdaccio",
-        "//:node_modules/verdaccio-auth-memory",
-
-        # Extra runtime deps due to bundling issues.
-        # TODO: Clean this up.
-        "//:node_modules/express",
-        "//:node_modules/undici",
-    ],
-    runner = ":runner_entrypoint",
-)
diff --git a/tests/legacy-cli/e2e/assets/19.0-project/src/index.html b/tests/legacy-cli/e2e/assets/19.0-project/src/index.html
deleted file mode 100644
index a78f28c335bf..000000000000
--- a/tests/legacy-cli/e2e/assets/19.0-project/src/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>NineteenProject</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-</head>
-<body>
-  <app-root></app-root>
-</body>
-</html>
diff --git a/tests/legacy-cli/e2e/assets/add-collection-dir/index.js b/tests/legacy-cli/e2e/assets/add-collection-dir/index.js
deleted file mode 100644
index cf404a768650..000000000000
--- a/tests/legacy-cli/e2e/assets/add-collection-dir/index.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.default = (options) => tree => tree.create(options.name || 'empty-file', '');
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-bad/index.js b/tests/legacy-cli/e2e/assets/add-collection-peer-bad/index.js
deleted file mode 100644
index 867b3a4eb6fd..000000000000
--- a/tests/legacy-cli/e2e/assets/add-collection-peer-bad/index.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.default = (options) => tree => tree.create(options.name || 'empty-file-peer-bad', '');
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-good/index.js b/tests/legacy-cli/e2e/assets/add-collection-peer-good/index.js
deleted file mode 100644
index 4d5dbdca2f69..000000000000
--- a/tests/legacy-cli/e2e/assets/add-collection-peer-good/index.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.default = (options) => tree => tree.create(options.name || 'empty-file-peer-good', '');
diff --git a/tests/legacy-cli/e2e/assets/nested-schematic-dependency/index.js b/tests/legacy-cli/e2e/assets/nested-schematic-dependency/index.js
deleted file mode 100644
index cf404a768650..000000000000
--- a/tests/legacy-cli/e2e/assets/nested-schematic-dependency/index.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.default = (options) => tree => tree.create(options.name || 'empty-file', '');
diff --git a/tests/legacy-cli/e2e/assets/nested-schematic-main/index.js b/tests/legacy-cli/e2e/assets/nested-schematic-main/index.js
deleted file mode 100644
index 9763f96fbb58..000000000000
--- a/tests/legacy-cli/e2e/assets/nested-schematic-main/index.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.default = (options) => require("@angular-devkit/schematics").externalSchematic('empty-app-nested', 'nested', {});
diff --git a/tests/legacy-cli/e2e/assets/schematic-allow-scripts/index.js b/tests/legacy-cli/e2e/assets/schematic-allow-scripts/index.js
deleted file mode 100644
index 20fb52c65137..000000000000
--- a/tests/legacy-cli/e2e/assets/schematic-allow-scripts/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const tasks = require("@angular-devkit/schematics/tasks");
-
-exports.default = ({ allowScripts, ignoreScripts = false }) => {
-    return (tree, context) => {
-        tree.create('/install-test/package.json', JSON.stringify({
-            name: 'install-test',
-            version: '0.0.0',
-            scripts: {
-                postinstall: `node run-post.js`,
-            }
-        }));
-        tree.create('/install-test/.npmrc', `ignore-scripts=${ignoreScripts}`);
-        tree.create('/install-test/run-post.js', 'require("fs").writeFileSync(__dirname + "/post-script-ran", "12345");')
-        context.addTask(new tasks.NodePackageInstallTask({ workingDirectory: 'install-test', allowScripts }));
-    };
-};
diff --git a/tests/legacy-cli/e2e/assets/schematic-allow-scripts/schema.json b/tests/legacy-cli/e2e/assets/schematic-allow-scripts/schema.json
deleted file mode 100644
index 099432e4063a..000000000000
--- a/tests/legacy-cli/e2e/assets/schematic-allow-scripts/schema.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-07/schema",
-    "type": "object",
-    "additionalProperties": false,
-    "properties": {
-        "allowScripts": {
-            "type": "boolean"
-        },
-        "ignoreScripts": {
-            "type": "boolean"
-        }
-    }
-}
-  
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.html b/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.html
deleted file mode 100644
index a1ab9650d463..000000000000
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/app/app.component.html
+++ /dev/null
@@ -1,483 +0,0 @@
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * Delete the template below * * * * * * * * * * -->
-<!-- * * * * * * * to get started with your project! * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<style>
-  :host {
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-    font-size: 14px;
-    color: #333;
-    box-sizing: border-box;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    margin: 8px 0;
-  }
-
-  p {
-    margin: 0;
-  }
-
-  .spacer {
-    flex: 1;
-  }
-
-  .toolbar {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    height: 60px;
-    display: flex;
-    align-items: center;
-    background-color: #1976d2;
-    color: white;
-    font-weight: 600;
-  }
-
-  .toolbar img {
-    margin: 0 16px;
-  }
-
-  .toolbar #twitter-logo {
-    height: 40px;
-    margin: 0 8px;
-  }
-
-  .toolbar #youtube-logo {
-    height: 40px;
-    margin: 0 16px;
-  }
-
-  .toolbar #twitter-logo:hover,
-  .toolbar #youtube-logo:hover {
-    opacity: 0.8;
-  }
-
-  .content {
-    display: flex;
-    margin: 82px auto 32px;
-    padding: 0 16px;
-    max-width: 960px;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  svg.material-icons {
-    height: 24px;
-    width: auto;
-  }
-
-  svg.material-icons:not(:last-child) {
-    margin-right: 8px;
-  }
-
-  .card svg.material-icons path {
-    fill: #888;
-  }
-
-  .card-container {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    margin-top: 16px;
-  }
-
-  .card {
-    all: unset;
-    border-radius: 4px;
-    border: 1px solid #eee;
-    background-color: #fafafa;
-    height: 40px;
-    width: 200px;
-    margin: 0 8px 16px;
-    padding: 16px;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    transition: all 0.2s ease-in-out;
-    line-height: 24px;
-  }
-
-  .card-container .card:not(:last-child) {
-    margin-right: 0;
-  }
-
-  .card.card-small {
-    height: 16px;
-    width: 168px;
-  }
-
-  .card-container .card:not(.highlight-card) {
-    cursor: pointer;
-  }
-
-  .card-container .card:not(.highlight-card):hover {
-    transform: translateY(-3px);
-    box-shadow: 0 4px 17px rgba(0, 0, 0, 0.35);
-  }
-
-  .card-container .card:not(.highlight-card):hover .material-icons path {
-    fill: rgb(105, 103, 103);
-  }
-
-  .card.highlight-card {
-    background-color: #1976d2;
-    color: white;
-    font-weight: 600;
-    border: none;
-    width: auto;
-    min-width: 30%;
-    position: relative;
-  }
-
-  .card.card.highlight-card span {
-    margin-left: 60px;
-  }
-
-  svg#rocket {
-    width: 80px;
-    position: absolute;
-    left: -10px;
-    top: -24px;
-  }
-
-  svg#rocket-smoke {
-    height: calc(100vh - 95px);
-    position: absolute;
-    top: 10px;
-    right: 180px;
-    z-index: -10;
-  }
-
-  a,
-  a:visited,
-  a:hover {
-    color: #1976d2;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #125699;
-  }
-
-  .terminal {
-    position: relative;
-    width: 80%;
-    max-width: 600px;
-    border-radius: 6px;
-    padding-top: 45px;
-    margin-top: 8px;
-    overflow: hidden;
-    background-color: rgb(15, 15, 16);
-  }
-
-  .terminal::before {
-    content: "\2022 \2022 \2022";
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 4px;
-    background: rgb(58, 58, 58);
-    color: #c2c3c4;
-    width: 100%;
-    font-size: 2rem;
-    line-height: 0;
-    padding: 14px 0;
-    text-indent: 4px;
-  }
-
-  .terminal pre {
-    font-family: SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace;
-    color: white;
-    padding: 0 1rem 1rem;
-    margin: 0;
-  }
-
-  .circle-link {
-    height: 40px;
-    width: 40px;
-    border-radius: 40px;
-    margin: 8px;
-    background-color: white;
-    border: 1px solid #eeeeee;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
-    transition: 1s ease-out;
-  }
-
-  .circle-link:hover {
-    transform: translateY(-0.25rem);
-    box-shadow: 0px 3px 15px rgba(0, 0, 0, 0.2);
-  }
-
-  footer {
-    margin-top: 8px;
-    display: flex;
-    align-items: center;
-    line-height: 20px;
-  }
-
-  footer a {
-    display: flex;
-    align-items: center;
-  }
-
-  .github-star-badge {
-    color: #24292e;
-    display: flex;
-    align-items: center;
-    font-size: 12px;
-    padding: 3px 10px;
-    border: 1px solid rgba(27,31,35,.2);
-    border-radius: 3px;
-    background-image: linear-gradient(-180deg,#fafbfc,#eff3f6 90%);
-    margin-left: 4px;
-    font-weight: 600;
-  }
-
-  .github-star-badge:hover {
-    background-image: linear-gradient(-180deg,#f0f3f6,#e6ebf1 90%);
-    border-color: rgba(27,31,35,.35);
-    background-position: -.5em;
-  }
-
-  .github-star-badge .material-icons {
-    height: 16px;
-    width: 16px;
-    margin-right: 4px;
-  }
-
-  svg#clouds {
-    position: fixed;
-    bottom: -160px;
-    left: -230px;
-    z-index: -10;
-    width: 1920px;
-  }
-
-  /* Responsive Styles */
-  @media screen and (max-width: 767px) {
-    .card-container > *:not(.circle-link) ,
-    .terminal {
-      width: 100%;
-    }
-
-    .card:not(.highlight-card) {
-      height: 16px;
-      margin: 8px 0;
-    }
-
-    .card.highlight-card span {
-      margin-left: 72px;
-    }
-
-    svg#rocket-smoke {
-      right: 120px;
-      transform: rotate(-5deg);
-    }
-  }
-
-  @media screen and (max-width: 575px) {
-    svg#rocket-smoke {
-      display: none;
-      visibility: hidden;
-    }
-  }
-</style>
-
-<!-- Toolbar -->
-<div class="toolbar" role="banner">
-  <img
-    width="40"
-    alt="Angular Logo"
-    src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg=="
-  />
-  <span>Welcome</span>
-    <div class="spacer"></div>
-    <a aria-label="Angular on X" target="_blank" rel="noopener" href="https://twitter.com/angular" title="X">
-      <svg id="twitter-logo" xmlns="http://www.w3.org/2000/svg" height="24" width="24" data-name="Logo" viewBox="0 0 512 512" fill="#fff">
-        <path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/>
-      </svg>
-    </a>
-    <a aria-label="Angular on YouTube" target="_blank" rel="noopener" href="https://youtube.com/angular" title="YouTube">
-      <svg id="youtube-logo" height="24" width="24" data-name="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#fff">
-        <path d="M0 0h24v24H0V0z" fill="none"/>
-        <path d="M21.58 7.19c-.23-.86-.91-1.54-1.77-1.77C18.25 5 12 5 12 5s-6.25 0-7.81.42c-.86.23-1.54.91-1.77 1.77C2 8.75 2 12 2 12s0 3.25.42 4.81c.23.86.91 1.54 1.77 1.77C5.75 19 12 19 12 19s6.25 0 7.81-.42c.86-.23 1.54-.91 1.77-1.77C22 15.25 22 12 22 12s0-3.25-.42-4.81zM10 15V9l5.2 3-5.2 3z"/>
-      </svg>
-    </a>
-</div>
-
-<div class="content" role="main">
-
-  <!-- Highlight Card -->
-  <div class="card highlight-card card-small">
-
-    <svg id="rocket" xmlns="http://www.w3.org/2000/svg" width="101.678" height="101.678" viewBox="0 0 101.678 101.678">
-      <title>Rocket Ship</title>
-      <g id="Group_83" data-name="Group 83" transform="translate(-141 -696)">
-        <circle id="Ellipse_8" data-name="Ellipse 8" cx="50.839" cy="50.839" r="50.839" transform="translate(141 696)" fill="#dd0031"/>
-        <g id="Group_47" data-name="Group 47" transform="translate(165.185 720.185)">
-          <path id="Path_33" data-name="Path 33" d="M3.4,42.615a3.084,3.084,0,0,0,3.553,3.553,21.419,21.419,0,0,0,12.215-6.107L9.511,30.4A21.419,21.419,0,0,0,3.4,42.615Z" transform="translate(0.371 3.363)" fill="#fff"/>
-          <path id="Path_34" data-name="Path 34" d="M53.3,3.221A3.09,3.09,0,0,0,50.081,0,48.227,48.227,0,0,0,18.322,13.437c-6-1.666-14.991-1.221-18.322,7.218A33.892,33.892,0,0,1,9.439,25.1l-.333.666a3.013,3.013,0,0,0,.555,3.553L23.985,43.641a2.9,2.9,0,0,0,3.553.555l.666-.333A33.892,33.892,0,0,1,32.647,53.3c8.55-3.664,8.884-12.326,7.218-18.322A48.227,48.227,0,0,0,53.3,3.221ZM34.424,9.772a6.439,6.439,0,1,1,9.106,9.106,6.368,6.368,0,0,1-9.106,0A6.467,6.467,0,0,1,34.424,9.772Z" transform="translate(0 0.005)" fill="#fff"/>
-        </g>
-      </g>
-    </svg>
-
-    <span>{{ title }} app is running!</span>
-
-    <svg id="rocket-smoke" xmlns="http://www.w3.org/2000/svg" width="516.119" height="1083.632" viewBox="0 0 516.119 1083.632">
-      <title>Rocket Ship Smoke</title>
-      <path id="Path_40" data-name="Path 40" d="M644.6,141S143.02,215.537,147.049,870.207s342.774,201.755,342.774,201.755S404.659,847.213,388.815,762.2c-27.116-145.51-11.551-384.124,271.9-609.1C671.15,139.365,644.6,141,644.6,141Z" transform="translate(-147.025 -140.939)" fill="#f5f5f5"/>
-    </svg>
-
-  </div>
-
-  <!-- Resources -->
-  <h2>Resources</h2>
-  <p>Here are some links to help you get started:</p>
-
-  <div class="card-container">
-    <a class="card" target="_blank" rel="noopener" href="https://angular.dev/tutorials/learn-angular">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z"/></svg>
-      <span>Learn Angular</span>
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>    </a>
-
-    <a class="card" target="_blank" rel="noopener" href="https://angular.dev/tools/cli">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-      <span>CLI Documentation</span>
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
-    </a>
-
-    <a class="card" target="_blank" rel="noopener" href="https://material.angular.io">
-      <svg xmlns="http://www.w3.org/2000/svg" style="margin-right: 8px" width="21.813" height="23.453" viewBox="0 0 179.2 192.7"><path fill="#ffa726" d="M89.4 0 0 32l13.5 118.4 75.9 42.3 76-42.3L179.2 32 89.4 0z"/><path fill="#fb8c00" d="M89.4 0v192.7l76-42.3L179.2 32 89.4 0z"/><path fill="#ffe0b2" d="m102.9 146.3-63.3-30.5 36.3-22.4 63.7 30.6-36.7 22.3z"/><path fill="#fff3e0" d="M102.9 122.8 39.6 92.2l36.3-22.3 63.7 30.6-36.7 22.3z"/><path fill="#fff" d="M102.9 99.3 39.6 68.7l36.3-22.4 63.7 30.6-36.7 22.4z"/></svg>
-      <span>Angular Material</span>
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
-    </a>
-
-    <a class="card" target="_blank" rel="noopener" href="https://blog.angular.dev">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8z"/></svg>
-      <span>Angular Blog</span>
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
-    </a>
-
-    <a class="card" target="_blank" rel="noopener" href="https://angular.dev/tools/devtools">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><rect fill="none" height="24" width="24"/></g><g><g><path d="M14.73,13.31C15.52,12.24,16,10.93,16,9.5C16,5.91,13.09,3,9.5,3S3,5.91,3,9.5C3,13.09,5.91,16,9.5,16 c1.43,0,2.74-0.48,3.81-1.27L19.59,21L21,19.59L14.73,13.31z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5 S11.99,14,9.5,14z"/><polygon points="10.29,8.44 9.5,6 8.71,8.44 6.25,8.44 8.26,10.03 7.49,12.5 9.5,10.97 11.51,12.5 10.74,10.03 12.75,8.44"/></g></g></svg>
-      <span>Angular DevTools</span>
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
-    </a>
-
-  </div>
-
-  <!-- Next Steps -->
-  <h2>Next Steps</h2>
-  <p>What do you want to do next with your app?</p>
-
-  <input type="hidden" #selection>
-
-  <div class="card-container">
-    <button class="card card-small" (click)="selection.value = 'component'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-      <span>New Component</span>
-    </button>
-
-    <button class="card card-small" (click)="selection.value = 'material'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-      <span>Angular Material</span>
-    </button>
-
-    <button class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-      <span>Add PWA Support</span>
-    </button>
-
-    <button class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-      <span>Add Dependency</span>
-    </button>
-
-    <button class="card card-small" (click)="selection.value = 'test'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-      <span>Run and Watch Tests</span>
-    </button>
-
-    <button class="card card-small" (click)="selection.value = 'build'" tabindex="0">
-      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-      <span>Build for Production</span>
-    </button>
-  </div>
-
-  <!-- Terminal -->
-  <div class="terminal" [ngSwitch]="selection.value">
-      <pre *ngSwitchDefault>ng generate component xyz</pre>
-      <pre *ngSwitchCase="'material'">ng add &#64;angular/material</pre>
-      <pre *ngSwitchCase="'pwa'">ng add &#64;angular/pwa</pre>
-      <pre *ngSwitchCase="'dependency'">ng add _____</pre>
-      <pre *ngSwitchCase="'test'">ng test</pre>
-      <pre *ngSwitchCase="'build'">ng build</pre>
-  </div>
-
-  <!-- Links -->
-  <div class="card-container">
-    <a class="circle-link" title="Find a Local Meetup" href="https://www.meetup.com/find/?keywords=angular" target="_blank" rel="noopener">
-      <svg xmlns="http://www.w3.org/2000/svg" width="24.607" height="23.447" viewBox="0 0 24.607 23.447">
-        <title>Meetup Logo</title>
-        <path id="logo--mSwarm" d="M21.221,14.95A4.393,4.393,0,0,1,17.6,19.281a4.452,4.452,0,0,1-.8.069c-.09,0-.125.035-.154.117a2.939,2.939,0,0,1-2.506,2.091,2.868,2.868,0,0,1-2.248-.624.168.168,0,0,0-.245-.005,3.926,3.926,0,0,1-2.589.741,4.015,4.015,0,0,1-3.7-3.347,2.7,2.7,0,0,1-.043-.38c0-.106-.042-.146-.143-.166a3.524,3.524,0,0,1-1.516-.69A3.623,3.623,0,0,1,2.23,14.557a3.66,3.66,0,0,1,1.077-3.085.138.138,0,0,0,.026-.2,3.348,3.348,0,0,1-.451-1.821,3.46,3.46,0,0,1,2.749-3.28.44.44,0,0,0,.355-.281,5.072,5.072,0,0,1,3.863-3,5.028,5.028,0,0,1,3.555.666.31.31,0,0,0,.271.03A4.5,4.5,0,0,1,18.3,4.7a4.4,4.4,0,0,1,1.334,2.751,3.658,3.658,0,0,1,.022.706.131.131,0,0,0,.1.157,2.432,2.432,0,0,1,1.574,1.645,2.464,2.464,0,0,1-.7,2.616c-.065.064-.051.1-.014.166A4.321,4.321,0,0,1,21.221,14.95ZM13.4,14.607a2.09,2.09,0,0,0,1.409,1.982,4.7,4.7,0,0,0,1.275.221,1.807,1.807,0,0,0,.9-.151.542.542,0,0,0,.321-.545.558.558,0,0,0-.359-.534,1.2,1.2,0,0,0-.254-.078c-.262-.047-.526-.086-.787-.138a.674.674,0,0,1-.617-.75,3.394,3.394,0,0,1,.218-1.109c.217-.658.509-1.286.79-1.918a15.609,15.609,0,0,0,.745-1.86,1.95,1.95,0,0,0,.06-1.073,1.286,1.286,0,0,0-1.051-1.033,1.977,1.977,0,0,0-1.521.2.339.339,0,0,1-.446-.042c-.1-.092-.2-.189-.307-.284a1.214,1.214,0,0,0-1.643-.061,7.563,7.563,0,0,1-.614.512A.588.588,0,0,1,10.883,8c-.215-.115-.437-.215-.659-.316a2.153,2.153,0,0,0-.695-.248A2.091,2.091,0,0,0,7.541,8.562a9.915,9.915,0,0,0-.405.986c-.559,1.545-1.015,3.123-1.487,4.7a1.528,1.528,0,0,0,.634,1.777,1.755,1.755,0,0,0,1.5.211,1.35,1.35,0,0,0,.824-.858c.543-1.281,1.032-2.584,1.55-3.875.142-.355.28-.712.432-1.064a.548.548,0,0,1,.851-.24.622.622,0,0,1,.185.539,2.161,2.161,0,0,1-.181.621c-.337.852-.68,1.7-1.018,2.552a2.564,2.564,0,0,0-.173.528.624.624,0,0,0,.333.71,1.073,1.073,0,0,0,.814.034,1.22,1.22,0,0,0,.657-.655q.758-1.488,1.511-2.978.35-.687.709-1.37a1.073,1.073,0,0,1,.357-.434.43.43,0,0,1,.463-.016.373.373,0,0,1,.153.387.7.7,0,0,1-.057.236c-.065.157-.127.316-.2.469-.42.883-.846,1.763-1.262,2.648A2.463,2.463,0,0,0,13.4,14.607Zm5.888,6.508a1.09,1.09,0,0,0-2.179.006,1.09,1.09,0,0,0,2.179-.006ZM1.028,12.139a1.038,1.038,0,1,0,.01-2.075,1.038,1.038,0,0,0-.01,2.075ZM13.782.528a1.027,1.027,0,1,0-.011,2.055A1.027,1.027,0,0,0,13.782.528ZM22.21,6.95a.882.882,0,0,0-1.763.011A.882.882,0,0,0,22.21,6.95ZM4.153,4.439a.785.785,0,1,0,.787-.78A.766.766,0,0,0,4.153,4.439Zm8.221,18.22a.676.676,0,1,0-.677.666A.671.671,0,0,0,12.374,22.658ZM22.872,12.2a.674.674,0,0,0-.665.665.656.656,0,0,0,.655.643.634.634,0,0,0,.655-.644A.654.654,0,0,0,22.872,12.2ZM7.171-.123A.546.546,0,0,0,6.613.43a.553.553,0,1,0,1.106,0A.539.539,0,0,0,7.171-.123ZM24.119,9.234a.507.507,0,0,0-.493.488.494.494,0,0,0,.494.494.48.48,0,0,0,.487-.483A.491.491,0,0,0,24.119,9.234Zm-19.454,9.7a.5.5,0,0,0-.488-.488.491.491,0,0,0-.487.5.483.483,0,0,0,.491.479A.49.49,0,0,0,4.665,18.936Z" transform="translate(0 0.123)" fill="#f64060"/>
-      </svg>
-    </a>
-
-    <a class="circle-link" title="Join the Conversation on Discord" href="https://discord.gg/angular" target="_blank" rel="noopener">
-      <svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 245 240">
-        <title>Discord Logo</title>
-        <path d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/>
-        <path d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/>
-      </svg>
-    </a>
-  </div>
-
-  <!-- Footer -->
-  <footer>
-      Love Angular?&nbsp;
-      <a href="https://github.com/angular/angular" target="_blank" rel="noopener"> Give our repo a star.
-        <div class="github-star-badge">
-            <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/></svg>
-          Star
-        </div>
-      </a>
-      <a href="https://github.com/angular/angular" target="_blank" rel="noopener">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" fill="#1976d2"/><path d="M0 0h24v24H0z" fill="none"/></svg>
-      </a>
-  </footer>
-
-  <svg id="clouds" xmlns="http://www.w3.org/2000/svg" width="2611.084" height="485.677" viewBox="0 0 2611.084 485.677">
-    <title>Gray Clouds Background</title>
-    <path id="Path_39" data-name="Path 39" d="M2379.709,863.793c10-93-77-171-168-149-52-114-225-105-264,15-75,3-140,59-152,133-30,2.83-66.725,9.829-93.5,26.25-26.771-16.421-63.5-23.42-93.5-26.25-12-74-77-130-152-133-39-120-212-129-264-15-54.084-13.075-106.753,9.173-138.488,48.9-31.734-39.726-84.4-61.974-138.487-48.9-52-114-225-105-264,15a162.027,162.027,0,0,0-103.147,43.044c-30.633-45.365-87.1-72.091-145.206-58.044-52-114-225-105-264,15-75,3-140,59-152,133-53,5-127,23-130,83-2,42,35,72,70,86,49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33,61.112,8.015,113.854-5.72,150.492-29.764a165.62,165.62,0,0,0,110.861-3.236c47,94,178,113,251,33,31.385,4.116,60.563,2.495,86.487-3.311,25.924,5.806,55.1,7.427,86.488,3.311,73,80,204,61,251-33a165.625,165.625,0,0,0,120,0c51,13,108,15,157-5a147.188,147.188,0,0,0,33.5-18.694,147.217,147.217,0,0,0,33.5,18.694c49,20,106,18,157,5a165.625,165.625,0,0,0,120,0c47,94,178,113,251,33C2446.709,1093.793,2554.709,922.793,2379.709,863.793Z" transform="translate(142.69 -634.312)" fill="#eee"/>
-  </svg>
-
-</div>
-
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content above * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<router-outlet></router-outlet>
diff --git a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/index.html b/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/index.html
deleted file mode 100644
index ca14f8bfb86f..000000000000
--- a/tests/legacy-cli/e2e/assets/ssr-project-webpack/src/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>17SsrProjectWebpack</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-</head>
-<body>
-  <app-root></app-root>
-</body>
-</html>
diff --git a/tests/legacy-cli/rollup.config.mjs b/tests/rollup.config.mjs
similarity index 100%
rename from tests/legacy-cli/rollup.config.mjs
rename to tests/rollup.config.mjs
diff --git a/tests/legacy-cli/tsconfig.json b/tests/tsconfig.json
similarity index 100%
rename from tests/legacy-cli/tsconfig.json
rename to tests/tsconfig.json
diff --git a/tests/legacy-cli/verdaccio.yaml b/tests/verdaccio.yaml
similarity index 100%
rename from tests/legacy-cli/verdaccio.yaml
rename to tests/verdaccio.yaml
diff --git a/tests/legacy-cli/verdaccio_auth.yaml b/tests/verdaccio_auth.yaml
similarity index 100%
rename from tests/legacy-cli/verdaccio_auth.yaml
rename to tests/verdaccio_auth.yaml