diff --git a/.github/workflows/website-gh-pages.yml b/.github/workflows/website-gh-pages.yml
index 78e7337206..47605ebd5c 100644
--- a/.github/workflows/website-gh-pages.yml
+++ b/.github/workflows/website-gh-pages.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
-          path: ./packages/website-astro/dist
+          path: ./website/dist
 
   # Deployment job
   deploy:
diff --git a/.gitignore b/.gitignore
index e0741bfa49..baa3b25e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -207,7 +207,7 @@ vite.config.ts.timestamp-*
 # Api extractor
 packages/*/etc/
 docs/**/js-api/
-packages/website-astro/src/content/docs/current/**/js-api/
+website/src/content/docs/current/**/js-api/
 
 # VS Code test web temp files
 .vscode-test-web/
diff --git a/.prettierignore b/.prettierignore
index 25968b473e..1e1b95b53f 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -45,7 +45,7 @@ packages/website/versioned_docs/**/standard-library/built-in-data-types.md
 
 # Auto generated version list
 packages/website/playground-versions.json
-packages/website-astro/playground-versions.json
+website/playground-versions.json
 
 # Auto generated built-in template list
 packages/compiler/templates/scaffolding.json
diff --git a/eng/common/CredScanSuppression.json b/eng/common/CredScanSuppression.json
index 2e6d0728a2..a3e739d3a3 100644
--- a/eng/common/CredScanSuppression.json
+++ b/eng/common/CredScanSuppression.json
@@ -10,7 +10,7 @@
       "_justification": "Files contains publicly disclosed application key."
     },
     {
-      "file": ["packages/website-astro/algolia.ts"],
+      "file": ["website/algolia.ts"],
       "_justification": "Files contains publicly disclosed application key."
     }
   ]
diff --git a/eng/tsp-core/pipelines/pr-tools.yml b/eng/tsp-core/pipelines/pr-tools.yml
index d190019cee..0a89da2a27 100644
--- a/eng/tsp-core/pipelines/pr-tools.yml
+++ b/eng/tsp-core/pipelines/pr-tools.yml
@@ -62,7 +62,7 @@ extends:
                       --destination \$web \
                       --account-name "tspwebsitepr" \
                       --destination-path $(TYPESPEC_WEBSITE_BASE_PATH) \
-                      --source "./packages/website-astro/dist/" \
+                      --source "./website/dist/" \
                       --overwrite
 
               - script: npx tsx eng/tsp-core/scripts/create-tryit-comment.ts
diff --git a/eslint.config.js b/eslint.config.js
index ca289717ac..cb8b690119 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -144,7 +144,7 @@ export default tsEslint.config(
       "**/website/build/**/*",
       "**/.astro/**/*",
       "**/.docusaurus/**/*",
-      "packages/website-astro/src/assets/**/*",
+      "website/src/assets/**/*",
       "packages/compiler/templates/**/*", // Ignore the templates which might have invalid code and not follow exactly our rules.
       "**/venv/**/*", // Ignore python virtual env
       "**/.vscode-test-web/**/*", // Ignore VSCode test web project
diff --git a/packages/website-astro/public/favicon.svg b/packages/website-astro/public/favicon.svg
deleted file mode 100644
index 27071d255e..0000000000
--- a/packages/website-astro/public/favicon.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="200 200 30 30" xmlns="http://www.w3.org/2000/svg">
-  <rect x="200" y="200" width="30" height="30" fill="#4A3665" />
-  <path
-    d="M 223.327 148.108 L 223.327 144.801 L 222.786 144.801 L 222.786 144.213 L 224.44 144.213 L 224.44 144.801 L 223.899 144.801 L 223.899 148.108 Z M 225.391 148.15 Q 225.156 148.15 224.999 148.072 Q 224.843 147.994 224.753 147.846 Q 224.663 147.697 224.624 147.488 Q 224.586 147.279 224.586 147.016 L 225.148 146.963 Q 225.148 147.09 225.157 147.208 Q 225.166 147.326 225.191 147.42 Q 225.217 147.514 225.266 147.57 Q 225.315 147.626 225.391 147.626 Q 225.519 147.626 225.572 147.508 Q 225.625 147.39 225.625 147.223 Q 225.625 147.056 225.537 146.876 Q 225.45 146.696 225.328 146.534 Q 225.121 146.258 224.966 146.022 Q 224.811 145.787 224.725 145.559 Q 224.639 145.331 224.639 145.082 Q 224.639 144.886 224.689 144.72 Q 224.74 144.554 224.836 144.431 Q 224.933 144.308 225.071 144.239 Q 225.209 144.17 225.386 144.17 Q 225.606 144.17 225.758 144.244 Q 225.911 144.319 226.005 144.456 Q 226.099 144.594 226.143 144.784 Q 226.186 144.973 226.186 145.204 L 225.625 145.257 Q 225.625 145.159 225.615 145.059 Q 225.606 144.96 225.582 144.878 Q 225.558 144.796 225.513 144.745 Q 225.468 144.695 225.397 144.695 Q 225.285 144.695 225.243 144.789 Q 225.201 144.883 225.201 145.055 Q 225.201 145.278 225.32 145.485 Q 225.439 145.691 225.641 145.967 Q 225.882 146.293 226.034 146.566 Q 226.186 146.839 226.186 147.17 Q 226.186 147.379 226.141 147.558 Q 226.096 147.737 226 147.87 Q 225.903 148.002 225.753 148.076 Q 225.603 148.15 225.391 148.15 Z M 226.494 148.108 L 226.494 144.213 L 227.066 144.213 Q 227.392 144.213 227.611 144.356 Q 227.829 144.499 227.938 144.761 Q 228.047 145.023 228.047 145.379 Q 228.047 145.734 227.933 145.991 Q 227.819 146.248 227.6 146.392 Q 227.381 146.537 227.066 146.55 L 227.066 148.108 Z M 227.066 145.967 Q 227.217 145.967 227.305 145.907 Q 227.392 145.848 227.43 145.718 Q 227.469 145.588 227.469 145.384 Q 227.469 145.177 227.43 145.047 Q 227.392 144.917 227.303 144.856 Q 227.214 144.796 227.066 144.796 Z"
-    transform="matrix(4.553588, 0, 0, 3.175088, -811.313782, -249.035522)"
-    fill="#fff" />
-</svg>
diff --git a/packages/website-astro/src/assets/houston.webp b/packages/website-astro/src/assets/houston.webp
deleted file mode 100644
index 930c164974..0000000000
Binary files a/packages/website-astro/src/assets/houston.webp and /dev/null differ
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0ab15f2cfc..ddbde42a7c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2023,7 +2023,40 @@ importers:
         specifier: ~5.6.3
         version: 5.6.3
 
-  packages/website-astro:
+  packages/xml:
+    devDependencies:
+      '@types/node':
+        specifier: ~22.7.5
+        version: 22.7.5
+      '@typespec/compiler':
+        specifier: workspace:~
+        version: link:../compiler
+      '@typespec/library-linter':
+        specifier: workspace:~
+        version: link:../library-linter
+      '@typespec/tspd':
+        specifier: workspace:~
+        version: link:../tspd
+      '@vitest/coverage-v8':
+        specifier: ^2.1.2
+        version: 2.1.2(vitest@2.1.2(@types/node@22.7.5)(@vitest/ui@2.1.2)(happy-dom@15.7.4)(jsdom@25.0.1)(terser@5.34.1))
+      '@vitest/ui':
+        specifier: ^2.1.2
+        version: 2.1.2(vitest@2.1.2)
+      c8:
+        specifier: ^10.1.2
+        version: 10.1.2
+      rimraf:
+        specifier: ~6.0.1
+        version: 6.0.1
+      typescript:
+        specifier: ~5.6.3
+        version: 5.6.3
+      vitest:
+        specifier: ^2.1.2
+        version: 2.1.2(@types/node@22.7.5)(@vitest/ui@2.1.2)(happy-dom@15.7.4)(jsdom@25.0.1)(terser@5.34.1)
+
+  website:
     dependencies:
       '@astrojs/check':
         specifier: ^0.9.4
@@ -2057,10 +2090,10 @@ importers:
         version: 2.0.260(react@18.3.1)
       '@typespec/compiler':
         specifier: workspace:~
-        version: link:../compiler
+        version: link:../packages/compiler
       '@typespec/playground':
         specifier: workspace:~
-        version: link:../playground
+        version: link:../packages/playground
       astro:
         specifier: ^4.16.1
         version: 4.16.5(@types/node@22.7.5)(rollup@4.24.0)(terser@5.34.1)(typescript@5.6.3)
@@ -2106,13 +2139,13 @@ importers:
         version: 1.0.0
       '@typespec/internal-build-utils':
         specifier: workspace:~
-        version: link:../internal-build-utils
+        version: link:../packages/internal-build-utils
       '@typespec/playground-website':
         specifier: workspace:*
-        version: link:../playground-website
+        version: link:../packages/playground-website
       '@typespec/website':
         specifier: workspace:*
-        version: link:../website
+        version: link:../packages/website
       astro-expressive-code:
         specifier: ^0.37.0
         version: 0.37.0(astro@4.16.5(@types/node@22.7.5)(rollup@4.24.0)(terser@5.34.1)(typescript@5.6.3))
@@ -2126,39 +2159,6 @@ importers:
         specifier: ~6.0.1
         version: 6.0.1
 
-  packages/xml:
-    devDependencies:
-      '@types/node':
-        specifier: ~22.7.5
-        version: 22.7.5
-      '@typespec/compiler':
-        specifier: workspace:~
-        version: link:../compiler
-      '@typespec/library-linter':
-        specifier: workspace:~
-        version: link:../library-linter
-      '@typespec/tspd':
-        specifier: workspace:~
-        version: link:../tspd
-      '@vitest/coverage-v8':
-        specifier: ^2.1.2
-        version: 2.1.2(vitest@2.1.2(@types/node@22.7.5)(@vitest/ui@2.1.2)(happy-dom@15.7.4)(jsdom@25.0.1)(terser@5.34.1))
-      '@vitest/ui':
-        specifier: ^2.1.2
-        version: 2.1.2(vitest@2.1.2)
-      c8:
-        specifier: ^10.1.2
-        version: 10.1.2
-      rimraf:
-        specifier: ~6.0.1
-        version: 6.0.1
-      typescript:
-        specifier: ~5.6.3
-        version: 5.6.3
-      vitest:
-        specifier: ^2.1.2
-        version: 2.1.2(@types/node@22.7.5)(@vitest/ui@2.1.2)(happy-dom@15.7.4)(jsdom@25.0.1)(terser@5.34.1)
-
 packages:
 
   '@adobe/css-tools@4.4.0':
@@ -20588,16 +20588,6 @@ snapshots:
       postcss: 8.4.39
       postcss-value-parser: 4.2.0
 
-  autoprefixer@10.4.19(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.0
-      caniuse-lite: 1.0.30001666
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
-      picocolors: 1.1.0
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
   autoprefixer@10.4.20(postcss@8.4.47):
     dependencies:
       browserslist: 4.24.0
@@ -21586,7 +21576,7 @@ snapshots:
 
   cssnano-preset-advanced@6.1.2(postcss@8.4.47):
     dependencies:
-      autoprefixer: 10.4.19(postcss@8.4.47)
+      autoprefixer: 10.4.20(postcss@8.4.47)
       browserslist: 4.24.0
       cssnano-preset-default: 6.1.2(postcss@8.4.47)
       postcss: 8.4.47
@@ -27717,7 +27707,7 @@ snapshots:
   snake-case@3.0.4:
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.7.0
 
   sockjs@0.3.24:
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index d3f583bbeb..948ada872a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,6 +1,7 @@
 packages:
   - "packages/*"
   - "e2e"
+  - "website"
   - "!packages/http-client-csharp/**"
   - "!packages/http-client-java/**"
   - "!packages/http-client-python/**"
diff --git a/packages/website-astro/.gitignore b/website/.gitignore
similarity index 100%
rename from packages/website-astro/.gitignore
rename to website/.gitignore
diff --git a/packages/website-astro/.scripts/build.ts b/website/.scripts/build.ts
similarity index 100%
rename from packages/website-astro/.scripts/build.ts
rename to website/.scripts/build.ts
diff --git a/packages/website-astro/README.md b/website/README.md
similarity index 100%
rename from packages/website-astro/README.md
rename to website/README.md
diff --git a/packages/website-astro/algolia.ts b/website/algolia.ts
similarity index 100%
rename from packages/website-astro/algolia.ts
rename to website/algolia.ts
diff --git a/packages/website-astro/astro.config.mjs b/website/astro.config.mjs
similarity index 96%
rename from packages/website-astro/astro.config.mjs
rename to website/astro.config.mjs
index e121b809c5..79c42e6605 100644
--- a/packages/website-astro/astro.config.mjs
+++ b/website/astro.config.mjs
@@ -13,7 +13,7 @@ import { resolveSideBars } from "./sidebars";
 
 const base = process.env.TYPESPEC_WEBSITE_BASE_PATH ?? "/";
 
-const grammarPath = resolve(import.meta.dirname, "../../grammars/typespec.json");
+const grammarPath = resolve(import.meta.dirname, "../grammars/typespec.json");
 const tspGrammar = JSON.parse((await readFile(grammarPath)).toString());
 
 const typespecLang = {
diff --git a/packages/website-astro/ec.config.mjs b/website/ec.config.mjs
similarity index 100%
rename from packages/website-astro/ec.config.mjs
rename to website/ec.config.mjs
diff --git a/packages/website-astro/package.json b/website/package.json
similarity index 86%
rename from packages/website-astro/package.json
rename to website/package.json
index cd40b4988d..ba99036e7b 100644
--- a/packages/website-astro/package.json
+++ b/website/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "version": "0.0.1",
   "scripts": {
-    "copy": "cp -r ../../docs/. ./src/content/docs/docs && cp -r ../website/static/. ./src/assets  && cp -r ../website/static/img/. ./public/img  && cp ../website/static/1ds-init.js ./public/1ds-init.js && cp -r ../../blog/. ./src/content/blog",
+    "copy": "cp -r ../docs/. ./src/content/docs/docs && cp -r ../packages/website/static/. ./src/assets  && cp -r ../packages/website/static/img/. ./public/img  && cp ../packages/website/static/1ds-init.js ./public/1ds-init.js && cp -r ../blog/. ./src/content/blog",
     "clean": "rimraf ./dist ./temp ./.astro",
     "dev": "astro dev",
     "start": "astro dev",
diff --git a/packages/website-astro/playground-versions.json b/website/playground-versions.json
similarity index 100%
rename from packages/website-astro/playground-versions.json
rename to website/playground-versions.json
diff --git a/packages/website-astro/src/content/docs/.keep b/website/public/.keep
similarity index 100%
rename from packages/website-astro/src/content/docs/.keep
rename to website/public/.keep
diff --git a/packages/website-astro/sidebars.ts b/website/sidebars.ts
similarity index 100%
rename from packages/website-astro/sidebars.ts
rename to website/sidebars.ts
diff --git a/packages/website-astro/src/components/asset-img.astro b/website/src/components/asset-img.astro
similarity index 100%
rename from packages/website-astro/src/components/asset-img.astro
rename to website/src/components/asset-img.astro
diff --git a/packages/website-astro/src/components/button.astro b/website/src/components/button.astro
similarity index 100%
rename from packages/website-astro/src/components/button.astro
rename to website/src/components/button.astro
diff --git a/packages/website-astro/src/components/card.astro b/website/src/components/card.astro
similarity index 100%
rename from packages/website-astro/src/components/card.astro
rename to website/src/components/card.astro
diff --git a/packages/website-astro/src/components/docusaurus/theme/TabItem.ts b/website/src/components/docusaurus/theme/TabItem.ts
similarity index 100%
rename from packages/website-astro/src/components/docusaurus/theme/TabItem.ts
rename to website/src/components/docusaurus/theme/TabItem.ts
diff --git a/packages/website-astro/src/components/docusaurus/theme/Tabs.ts b/website/src/components/docusaurus/theme/Tabs.ts
similarity index 100%
rename from packages/website-astro/src/components/docusaurus/theme/Tabs.ts
rename to website/src/components/docusaurus/theme/Tabs.ts
diff --git a/packages/website-astro/src/components/editor-tabs.astro b/website/src/components/editor-tabs.astro
similarity index 100%
rename from packages/website-astro/src/components/editor-tabs.astro
rename to website/src/components/editor-tabs.astro
diff --git a/packages/website-astro/src/components/feature-list.astro b/website/src/components/feature-list.astro
similarity index 100%
rename from packages/website-astro/src/components/feature-list.astro
rename to website/src/components/feature-list.astro
diff --git a/packages/website-astro/src/components/fluent-img.astro b/website/src/components/fluent-img.astro
similarity index 100%
rename from packages/website-astro/src/components/fluent-img.astro
rename to website/src/components/fluent-img.astro
diff --git a/packages/website-astro/src/components/footer/footer.astro b/website/src/components/footer/footer.astro
similarity index 100%
rename from packages/website-astro/src/components/footer/footer.astro
rename to website/src/components/footer/footer.astro
diff --git a/packages/website-astro/src/components/footer/microsoft-logo.astro b/website/src/components/footer/microsoft-logo.astro
similarity index 100%
rename from packages/website-astro/src/components/footer/microsoft-logo.astro
rename to website/src/components/footer/microsoft-logo.astro
diff --git a/packages/website-astro/src/components/header/header.astro b/website/src/components/header/header.astro
similarity index 100%
rename from packages/website-astro/src/components/header/header.astro
rename to website/src/components/header/header.astro
diff --git a/packages/website-astro/src/components/header/link.astro b/website/src/components/header/link.astro
similarity index 100%
rename from packages/website-astro/src/components/header/link.astro
rename to website/src/components/header/link.astro
diff --git a/packages/website-astro/src/components/header/search.astro b/website/src/components/header/search.astro
similarity index 100%
rename from packages/website-astro/src/components/header/search.astro
rename to website/src/components/header/search.astro
diff --git a/packages/website-astro/src/components/homepage/data-validation-hero-illustration.astro b/website/src/components/homepage/data-validation-hero-illustration.astro
similarity index 100%
rename from packages/website-astro/src/components/homepage/data-validation-hero-illustration.astro
rename to website/src/components/homepage/data-validation-hero-illustration.astro
diff --git a/packages/website-astro/src/components/homepage/extensibility-illustration.astro b/website/src/components/homepage/extensibility-illustration.astro
similarity index 100%
rename from packages/website-astro/src/components/homepage/extensibility-illustration.astro
rename to website/src/components/homepage/extensibility-illustration.astro
diff --git a/packages/website-astro/src/components/homepage/hero-illustration.astro b/website/src/components/homepage/hero-illustration.astro
similarity index 100%
rename from packages/website-astro/src/components/homepage/hero-illustration.astro
rename to website/src/components/homepage/hero-illustration.astro
diff --git a/packages/website-astro/src/components/homepage/hero.astro b/website/src/components/homepage/hero.astro
similarity index 100%
rename from packages/website-astro/src/components/homepage/hero.astro
rename to website/src/components/homepage/hero.astro
diff --git a/packages/website-astro/src/components/homepage/openapi3-hero-illustration.astro b/website/src/components/homepage/openapi3-hero-illustration.astro
similarity index 100%
rename from packages/website-astro/src/components/homepage/openapi3-hero-illustration.astro
rename to website/src/components/homepage/openapi3-hero-illustration.astro
diff --git a/packages/website-astro/src/components/homepage/overview-illustration-terminal-content.tsx b/website/src/components/homepage/overview-illustration-terminal-content.tsx
similarity index 100%
rename from packages/website-astro/src/components/homepage/overview-illustration-terminal-content.tsx
rename to website/src/components/homepage/overview-illustration-terminal-content.tsx
diff --git a/packages/website-astro/src/components/homepage/overview-illustration.astro b/website/src/components/homepage/overview-illustration.astro
similarity index 100%
rename from packages/website-astro/src/components/homepage/overview-illustration.astro
rename to website/src/components/homepage/overview-illustration.astro
diff --git a/packages/website-astro/src/components/illustration-card.astro b/website/src/components/illustration-card.astro
similarity index 100%
rename from packages/website-astro/src/components/illustration-card.astro
rename to website/src/components/illustration-card.astro
diff --git a/packages/website-astro/src/components/illustrations/formatter.astro b/website/src/components/illustrations/formatter.astro
similarity index 100%
rename from packages/website-astro/src/components/illustrations/formatter.astro
rename to website/src/components/illustrations/formatter.astro
diff --git a/packages/website-astro/src/components/illustrations/openapi3-interoperate.astro b/website/src/components/illustrations/openapi3-interoperate.astro
similarity index 100%
rename from packages/website-astro/src/components/illustrations/openapi3-interoperate.astro
rename to website/src/components/illustrations/openapi3-interoperate.astro
diff --git a/packages/website-astro/src/components/layouts/fluent-layout.tsx b/website/src/components/layouts/fluent-layout.tsx
similarity index 100%
rename from packages/website-astro/src/components/layouts/fluent-layout.tsx
rename to website/src/components/layouts/fluent-layout.tsx
diff --git a/packages/website-astro/src/components/learn-more-card.astro b/website/src/components/learn-more-card.astro
similarity index 100%
rename from packages/website-astro/src/components/learn-more-card.astro
rename to website/src/components/learn-more-card.astro
diff --git a/packages/website-astro/src/components/light-dark-img.astro b/website/src/components/light-dark-img.astro
similarity index 100%
rename from packages/website-astro/src/components/light-dark-img.astro
rename to website/src/components/light-dark-img.astro
diff --git a/packages/website-astro/src/components/link.astro b/website/src/components/link.astro
similarity index 100%
rename from packages/website-astro/src/components/link.astro
rename to website/src/components/link.astro
diff --git a/packages/website-astro/src/components/painter/painter.module.css b/website/src/components/painter/painter.module.css
similarity index 100%
rename from packages/website-astro/src/components/painter/painter.module.css
rename to website/src/components/painter/painter.module.css
diff --git a/packages/website-astro/src/components/painter/painter.tsx b/website/src/components/painter/painter.tsx
similarity index 100%
rename from packages/website-astro/src/components/painter/painter.tsx
rename to website/src/components/painter/painter.tsx
diff --git a/packages/website-astro/src/components/playground-component/import-map.ts b/website/src/components/playground-component/import-map.ts
similarity index 100%
rename from packages/website-astro/src/components/playground-component/import-map.ts
rename to website/src/components/playground-component/import-map.ts
diff --git a/packages/website-astro/src/components/playground-component/loading-spinner.module.css b/website/src/components/playground-component/loading-spinner.module.css
similarity index 100%
rename from packages/website-astro/src/components/playground-component/loading-spinner.module.css
rename to website/src/components/playground-component/loading-spinner.module.css
diff --git a/packages/website-astro/src/components/playground-component/loading-spinner.tsx b/website/src/components/playground-component/loading-spinner.tsx
similarity index 100%
rename from packages/website-astro/src/components/playground-component/loading-spinner.tsx
rename to website/src/components/playground-component/loading-spinner.tsx
diff --git a/packages/website-astro/src/components/playground-component/playground.tsx b/website/src/components/playground-component/playground.tsx
similarity index 100%
rename from packages/website-astro/src/components/playground-component/playground.tsx
rename to website/src/components/playground-component/playground.tsx
diff --git a/packages/website-astro/src/components/react-pages/playground.tsx b/website/src/components/react-pages/playground.tsx
similarity index 100%
rename from packages/website-astro/src/components/react-pages/playground.tsx
rename to website/src/components/react-pages/playground.tsx
diff --git a/packages/website-astro/src/components/section.astro b/website/src/components/section.astro
similarity index 100%
rename from packages/website-astro/src/components/section.astro
rename to website/src/components/section.astro
diff --git a/packages/website-astro/src/components/sectioned-layout.astro b/website/src/components/sectioned-layout.astro
similarity index 100%
rename from packages/website-astro/src/components/sectioned-layout.astro
rename to website/src/components/sectioned-layout.astro
diff --git a/packages/website-astro/src/components/starlight-overrides/Header.astro b/website/src/components/starlight-overrides/Header.astro
similarity index 100%
rename from packages/website-astro/src/components/starlight-overrides/Header.astro
rename to website/src/components/starlight-overrides/Header.astro
diff --git a/packages/website-astro/src/components/starlight-overrides/PageFrame.astro b/website/src/components/starlight-overrides/PageFrame.astro
similarity index 100%
rename from packages/website-astro/src/components/starlight-overrides/PageFrame.astro
rename to website/src/components/starlight-overrides/PageFrame.astro
diff --git a/packages/website-astro/src/components/terminal.astro b/website/src/components/terminal.astro
similarity index 100%
rename from packages/website-astro/src/components/terminal.astro
rename to website/src/components/terminal.astro
diff --git a/packages/website-astro/src/components/text/text.module.css b/website/src/components/text/text.module.css
similarity index 100%
rename from packages/website-astro/src/components/text/text.module.css
rename to website/src/components/text/text.module.css
diff --git a/packages/website-astro/src/components/text/text.tsx b/website/src/components/text/text.tsx
similarity index 100%
rename from packages/website-astro/src/components/text/text.tsx
rename to website/src/components/text/text.tsx
diff --git a/packages/website-astro/src/components/theme-picker.astro b/website/src/components/theme-picker.astro
similarity index 100%
rename from packages/website-astro/src/components/theme-picker.astro
rename to website/src/components/theme-picker.astro
diff --git a/packages/website-astro/src/components/types.ts b/website/src/components/types.ts
similarity index 100%
rename from packages/website-astro/src/components/types.ts
rename to website/src/components/types.ts
diff --git a/packages/website-astro/src/components/use-case-overview.astro b/website/src/components/use-case-overview.astro
similarity index 100%
rename from packages/website-astro/src/components/use-case-overview.astro
rename to website/src/components/use-case-overview.astro
diff --git a/packages/website-astro/src/components/window-carousel.astro b/website/src/components/window-carousel.astro
similarity index 100%
rename from packages/website-astro/src/components/window-carousel.astro
rename to website/src/components/window-carousel.astro
diff --git a/packages/website-astro/src/components/window.astro b/website/src/components/window.astro
similarity index 100%
rename from packages/website-astro/src/components/window.astro
rename to website/src/components/window.astro
diff --git a/packages/website-astro/src/constants.ts b/website/src/constants.ts
similarity index 100%
rename from packages/website-astro/src/constants.ts
rename to website/src/constants.ts
diff --git a/packages/website-astro/src/content/config.ts b/website/src/content/config.ts
similarity index 100%
rename from packages/website-astro/src/content/config.ts
rename to website/src/content/config.ts
diff --git a/packages/website-astro/src/content/current-sidebar.ts b/website/src/content/current-sidebar.ts
similarity index 100%
rename from packages/website-astro/src/content/current-sidebar.ts
rename to website/src/content/current-sidebar.ts
diff --git a/website/src/content/docs/.keep b/website/src/content/docs/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/website-astro/src/css/custom.css b/website/src/css/custom.css
similarity index 100%
rename from packages/website-astro/src/css/custom.css
rename to website/src/css/custom.css
diff --git a/packages/website-astro/src/css/dark.css b/website/src/css/dark.css
similarity index 100%
rename from packages/website-astro/src/css/dark.css
rename to website/src/css/dark.css
diff --git a/packages/website-astro/src/css/fluentui.css b/website/src/css/fluentui.css
similarity index 100%
rename from packages/website-astro/src/css/fluentui.css
rename to website/src/css/fluentui.css
diff --git a/packages/website-astro/src/css/light.css b/website/src/css/light.css
similarity index 100%
rename from packages/website-astro/src/css/light.css
rename to website/src/css/light.css
diff --git a/packages/website-astro/src/env.d.ts b/website/src/env.d.ts
similarity index 100%
rename from packages/website-astro/src/env.d.ts
rename to website/src/env.d.ts
diff --git a/packages/website-astro/src/layouts/base-layout.astro b/website/src/layouts/base-layout.astro
similarity index 100%
rename from packages/website-astro/src/layouts/base-layout.astro
rename to website/src/layouts/base-layout.astro
diff --git a/packages/website-astro/src/layouts/blog-post.astro b/website/src/layouts/blog-post.astro
similarity index 100%
rename from packages/website-astro/src/layouts/blog-post.astro
rename to website/src/layouts/blog-post.astro
diff --git a/packages/website-astro/src/layouts/content.astro b/website/src/layouts/content.astro
similarity index 100%
rename from packages/website-astro/src/layouts/content.astro
rename to website/src/layouts/content.astro
diff --git a/packages/website-astro/src/layouts/showcase.astro b/website/src/layouts/showcase.astro
similarity index 100%
rename from packages/website-astro/src/layouts/showcase.astro
rename to website/src/layouts/showcase.astro
diff --git a/packages/website-astro/src/pages/blog/[...slug].astro b/website/src/pages/blog/[...slug].astro
similarity index 100%
rename from packages/website-astro/src/pages/blog/[...slug].astro
rename to website/src/pages/blog/[...slug].astro
diff --git a/packages/website-astro/src/pages/blog/_BlogPostPreview.astro b/website/src/pages/blog/_BlogPostPreview.astro
similarity index 100%
rename from packages/website-astro/src/pages/blog/_BlogPostPreview.astro
rename to website/src/pages/blog/_BlogPostPreview.astro
diff --git a/packages/website-astro/src/pages/blog/index.astro b/website/src/pages/blog/index.astro
similarity index 100%
rename from packages/website-astro/src/pages/blog/index.astro
rename to website/src/pages/blog/index.astro
diff --git a/packages/website-astro/src/pages/blog/resolve-image.ts b/website/src/pages/blog/resolve-image.ts
similarity index 100%
rename from packages/website-astro/src/pages/blog/resolve-image.ts
rename to website/src/pages/blog/resolve-image.ts
diff --git a/packages/website-astro/src/pages/community.md b/website/src/pages/community.md
similarity index 100%
rename from packages/website-astro/src/pages/community.md
rename to website/src/pages/community.md
diff --git a/packages/website-astro/src/pages/data-validation.astro b/website/src/pages/data-validation.astro
similarity index 100%
rename from packages/website-astro/src/pages/data-validation.astro
rename to website/src/pages/data-validation.astro
diff --git a/packages/website-astro/src/pages/index.astro b/website/src/pages/index.astro
similarity index 100%
rename from packages/website-astro/src/pages/index.astro
rename to website/src/pages/index.astro
diff --git a/packages/website-astro/src/pages/openapi.astro b/website/src/pages/openapi.astro
similarity index 100%
rename from packages/website-astro/src/pages/openapi.astro
rename to website/src/pages/openapi.astro
diff --git a/packages/website-astro/src/pages/playground.astro b/website/src/pages/playground.astro
similarity index 93%
rename from packages/website-astro/src/pages/playground.astro
rename to website/src/pages/playground.astro
index 17b9cf8401..d6e0fdee46 100644
--- a/packages/website-astro/src/pages/playground.astro
+++ b/website/src/pages/playground.astro
@@ -1,6 +1,6 @@
 ---
 import { AsyncPlayground } from "../components/react-pages/playground";
-import packageJson from "../../../compiler/package.json";
+import packageJson from "../../../packages/compiler/package.json";
 import { LoadingSpinner } from "../components/playground-component/loading-spinner";
 import BaseLayout from "../layouts/base-layout.astro";
 
diff --git a/packages/website-astro/src/pages/tooling.astro b/website/src/pages/tooling.astro
similarity index 100%
rename from packages/website-astro/src/pages/tooling.astro
rename to website/src/pages/tooling.astro
diff --git a/packages/website-astro/src/plugins/tsp-tryit-code.js b/website/src/plugins/tsp-tryit-code.js
similarity index 100%
rename from packages/website-astro/src/plugins/tsp-tryit-code.js
rename to website/src/plugins/tsp-tryit-code.js
diff --git a/packages/website-astro/src/prism/light.ts b/website/src/prism/light.ts
similarity index 100%
rename from packages/website-astro/src/prism/light.ts
rename to website/src/prism/light.ts
diff --git a/packages/website-astro/src/prism/typespec-lang-prism.ts b/website/src/prism/typespec-lang-prism.ts
similarity index 100%
rename from packages/website-astro/src/prism/typespec-lang-prism.ts
rename to website/src/prism/typespec-lang-prism.ts
diff --git a/packages/website-astro/src/utils/base-url.ts b/website/src/utils/base-url.ts
similarity index 100%
rename from packages/website-astro/src/utils/base-url.ts
rename to website/src/utils/base-url.ts
diff --git a/packages/website-astro/src/utils/index.ts b/website/src/utils/index.ts
similarity index 100%
rename from packages/website-astro/src/utils/index.ts
rename to website/src/utils/index.ts
diff --git a/packages/website-astro/src/utils/link.ts b/website/src/utils/link.ts
similarity index 100%
rename from packages/website-astro/src/utils/link.ts
rename to website/src/utils/link.ts
diff --git a/packages/website-astro/src/utils/theme-react.ts b/website/src/utils/theme-react.ts
similarity index 100%
rename from packages/website-astro/src/utils/theme-react.ts
rename to website/src/utils/theme-react.ts
diff --git a/packages/website-astro/src/utils/theme.ts b/website/src/utils/theme.ts
similarity index 100%
rename from packages/website-astro/src/utils/theme.ts
rename to website/src/utils/theme.ts
diff --git a/packages/website-astro/tailwind.config.mjs b/website/tailwind.config.mjs
similarity index 100%
rename from packages/website-astro/tailwind.config.mjs
rename to website/tailwind.config.mjs
diff --git a/packages/website-astro/tsconfig.json b/website/tsconfig.json
similarity index 100%
rename from packages/website-astro/tsconfig.json
rename to website/tsconfig.json