173 files changed, 39 insertions, 31 deletions
diff --git a/.gitignore b/.gitignore
index af615c7fe..489fc719a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@ parser/
 dist/
 *.tsbuildinfo
 .DS_Store
-test/fixtures/*/_site/
-www/_site
+test/fixtures/*/dist/
+www/dist
 .vercel
diff --git a/README.md b/README.md
index 7b3c6257e..ae07926e1 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@ export default {
   /** Where to resolve all URLs relative to. Useful if you have a monorepo project. */
   projectRoot: '.',
   /** Path to Astro components, pages, and data */
-  astroRoot: './astro',
+  astroRoot: './src',
   /** When running `astro build`, path to final static output */
-  dist: './_site',
+  dist: './dist',
   /** A folder of static files Astro will copy to the root. Useful for favicons, images, and other files that don’t need processing. */
   public: './public',
   /** Extension-specific handlings */
@@ -204,7 +204,7 @@ Then run:
 npm run build
 ```
 
-Now upload the contents of `/_site_` to your favorite static site host.
+Now upload the contents of `/dist` to your favorite static site host.
 
 ## 📚 API
 
diff --git a/docs/api.md b/docs/api.md
index 95a522f3b..785f9a83b 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -17,9 +17,9 @@ The `Astro` global is available in all contexts in `.astro` files. It has the fo
 `Astro.fetchContent()` is a way to load local `*.md` files into your static site setup. You can either use this on its own, or within [Astro Collections][docs-collections].
 
 ```jsx
-// ./astro/components/my-component.astro
+// ./src/components/my-component.astro
 ---
-const data = Astro.fetchContent('../pages/post/*.md'); // returns an array of posts that live at ./astro/pages/post/*.md
+const data = Astro.fetchContent('../pages/post/*.md'); // returns an array of posts that live at ./src/pages/post/*.md
 ---
 
 <div>
diff --git a/docs/styling.md b/docs/styling.md
index e5546e887..0688d2959 100644
--- a/docs/styling.md
+++ b/docs/styling.md
@@ -95,7 +95,7 @@ And also create a `tailwind.config.js` in your project root:
 
 module.exports = {
   mode: 'jit',
-  purge: ['./public/**/*.html', './astro/**/*.{astro,js,jsx,ts,tsx,vue}'],
+  purge: ['./public/**/*.html', './src/**/*.{astro,js,jsx,ts,tsx,vue}'],
   // more options here
 };
 ```
diff --git a/examples/blog/.gitignore b/examples/blog/.gitignore
index ca35be08d..1521c8b76 100644
--- a/examples/blog/.gitignore
+++ b/examples/blog/.gitignore
@@ -1 +1 @@
-_site
+dist
diff --git a/examples/blog/README.md b/examples/blog/README.md
index 2cc988b7e..f1894ad62 100644
--- a/examples/blog/README.md
+++ b/examples/blog/README.md
@@ -20,4 +20,4 @@ Preview at `http://localhost:3000`
 npm build
 ```
 
-Will output static site at `./_site`
+Will output static site at `./dist`
diff --git a/examples/blog/astro/components/AuthorCard.astro b/examples/blog/src/components/AuthorCard.astro
index 46ff504f7..46ff504f7 100644
--- a/examples/blog/astro/components/AuthorCard.astro
+++ b/examples/blog/src/components/AuthorCard.astro
diff --git a/examples/blog/astro/components/Counter.jsx b/examples/blog/src/components/Counter.jsx
index c9b27e1a7..c9b27e1a7 100644
--- a/examples/blog/astro/components/Counter.jsx
+++ b/examples/blog/src/components/Counter.jsx
diff --git a/examples/blog/astro/components/MainHead.astro b/examples/blog/src/components/MainHead.astro
index bff812b0c..bff812b0c 100644
--- a/examples/blog/astro/components/MainHead.astro
+++ b/examples/blog/src/components/MainHead.astro
diff --git a/examples/blog/astro/components/Nav.astro b/examples/blog/src/components/Nav.astro
index f1ac28c98..f1ac28c98 100644
--- a/examples/blog/astro/components/Nav.astro
+++ b/examples/blog/src/components/Nav.astro
diff --git a/examples/blog/astro/components/Pagination.astro b/examples/blog/src/components/Pagination.astro
index 8e033c668..8e033c668 100644
--- a/examples/blog/astro/components/Pagination.astro
+++ b/examples/blog/src/components/Pagination.astro
diff --git a/examples/blog/astro/components/PostPreview.astro b/examples/blog/src/components/PostPreview.astro
index e4e39143a..e4e39143a 100644
--- a/examples/blog/astro/components/PostPreview.astro
+++ b/examples/blog/src/components/PostPreview.astro
diff --git a/examples/blog/astro/data/authors.json b/examples/blog/src/data/authors.json
index c0f247e02..c0f247e02 100644
--- a/examples/blog/astro/data/authors.json
+++ b/examples/blog/src/data/authors.json
diff --git a/examples/blog/astro/layouts/post.astro b/examples/blog/src/layouts/post.astro
index 09e0fdbcd..09e0fdbcd 100644
--- a/examples/blog/astro/layouts/post.astro
+++ b/examples/blog/src/layouts/post.astro
diff --git a/examples/blog/astro/pages/$posts.astro b/examples/blog/src/pages/$posts.astro
index ebb20705d..ebb20705d 100644
--- a/examples/blog/astro/pages/$posts.astro
+++ b/examples/blog/src/pages/$posts.astro
diff --git a/examples/blog/astro/pages/$tag.astro b/examples/blog/src/pages/$tag.astro
index 6eef913cf..6eef913cf 100644
--- a/examples/blog/astro/pages/$tag.astro
+++ b/examples/blog/src/pages/$tag.astro
diff --git a/examples/blog/astro/pages/index.astro b/examples/blog/src/pages/index.astro
index 2af3a1a03..2af3a1a03 100644
--- a/examples/blog/astro/pages/index.astro
+++ b/examples/blog/src/pages/index.astro
diff --git a/examples/blog/astro/pages/post/muppet-babies.md b/examples/blog/src/pages/post/muppet-babies.md
index 53339cac1..53339cac1 100644
--- a/examples/blog/astro/pages/post/muppet-babies.md
+++ b/examples/blog/src/pages/post/muppet-babies.md
diff --git a/examples/blog/astro/pages/post/muppet-treasure-island.md b/examples/blog/src/pages/post/muppet-treasure-island.md
index f193ff8ae..f193ff8ae 100644
--- a/examples/blog/astro/pages/post/muppet-treasure-island.md
+++ b/examples/blog/src/pages/post/muppet-treasure-island.md
diff --git a/examples/blog/astro/pages/post/muppets-from-space.md b/examples/blog/src/pages/post/muppets-from-space.md
index d4d9c521f..d4d9c521f 100644
--- a/examples/blog/astro/pages/post/muppets-from-space.md
+++ b/examples/blog/src/pages/post/muppets-from-space.md
diff --git a/examples/blog/astro/pages/post/muppets-most-wanted.md b/examples/blog/src/pages/post/muppets-most-wanted.md
index 7d7f99dce..7d7f99dce 100644
--- a/examples/blog/astro/pages/post/muppets-most-wanted.md
+++ b/examples/blog/src/pages/post/muppets-most-wanted.md
diff --git a/examples/blog/astro/pages/post/the-muppet-christmas-carol.md b/examples/blog/src/pages/post/the-muppet-christmas-carol.md
index dc32fc66e..dc32fc66e 100644
--- a/examples/blog/astro/pages/post/the-muppet-christmas-carol.md
+++ b/examples/blog/src/pages/post/the-muppet-christmas-carol.md
diff --git a/examples/blog/astro/pages/post/the-muppet-show.md b/examples/blog/src/pages/post/the-muppet-show.md
index ebd2ca6dd..ebd2ca6dd 100644
--- a/examples/blog/astro/pages/post/the-muppet-show.md
+++ b/examples/blog/src/pages/post/the-muppet-show.md
diff --git a/examples/blog/astro/pages/post/the-muppets.md b/examples/blog/src/pages/post/the-muppets.md
index 0f3266170..0f3266170 100644
--- a/examples/blog/astro/pages/post/the-muppets.md
+++ b/examples/blog/src/pages/post/the-muppets.md
diff --git a/examples/kitchen-sink/package-lock.json b/examples/kitchen-sink/package-lock.json
index 1088d9907..1b50f9ea3 100644
--- a/examples/kitchen-sink/package-lock.json
+++ b/examples/kitchen-sink/package-lock.json
@@ -76,6 +76,7 @@
       "version": "file:../..",
       "dev": true,
       "requires": {
+        "@babel/code-frame": "^7.12.13",
         "@babel/generator": "^7.13.9",
         "@babel/parser": "^7.13.15",
         "@babel/traverse": "^7.13.15",
@@ -89,6 +90,7 @@
         "es-module-lexer": "^0.4.1",
         "esbuild": "^0.10.1",
         "estree-walker": "^3.0.0",
+        "fast-xml-parser": "^3.19.0",
         "fdir": "^5.0.0",
         "find-up": "^5.0.0",
         "github-slugger": "^1.3.0",
@@ -115,7 +117,7 @@
         "rollup": "^2.43.1",
         "rollup-plugin-terser": "^7.0.2",
         "sass": "^1.32.8",
-        "snowpack": "^3.3.2",
+        "snowpack": "^3.3.4",
         "svelte": "^3.35.0",
         "tiny-glob": "^0.2.8",
         "unified": "^9.2.1",
@@ -1984,6 +1986,12 @@
           "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
           "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
         },
+        "fast-xml-parser": {
+          "version": "3.19.0",
+          "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz",
+          "integrity": "sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg==",
+          "dev": true
+        },
         "fastq": {
           "version": "1.11.0",
           "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
diff --git a/examples/kitchen-sink/astro/components/PreactCounter.tsx b/examples/kitchen-sink/src/components/PreactCounter.tsx
index 9f1e8d887..9f1e8d887 100644
--- a/examples/kitchen-sink/astro/components/PreactCounter.tsx
+++ b/examples/kitchen-sink/src/components/PreactCounter.tsx
diff --git a/examples/kitchen-sink/astro/components/ReactCounter.jsx b/examples/kitchen-sink/src/components/ReactCounter.jsx
index 384dd9918..384dd9918 100644
--- a/examples/kitchen-sink/astro/components/ReactCounter.jsx
+++ b/examples/kitchen-sink/src/components/ReactCounter.jsx
diff --git a/examples/kitchen-sink/astro/components/SvelteCounter.svelte b/examples/kitchen-sink/src/components/SvelteCounter.svelte
index 8d6b3f5e1..8d6b3f5e1 100644
--- a/examples/kitchen-sink/astro/components/SvelteCounter.svelte
+++ b/examples/kitchen-sink/src/components/SvelteCounter.svelte
diff --git a/examples/kitchen-sink/astro/components/VueCounter.vue b/examples/kitchen-sink/src/components/VueCounter.vue
index 8179fb1d9..8179fb1d9 100644
--- a/examples/kitchen-sink/astro/components/VueCounter.vue
+++ b/examples/kitchen-sink/src/components/VueCounter.vue
diff --git a/examples/kitchen-sink/astro/pages/index.astro b/examples/kitchen-sink/src/pages/index.astro
index 4f0c9522f..4f0c9522f 100644
--- a/examples/kitchen-sink/astro/pages/index.astro
+++ b/examples/kitchen-sink/src/pages/index.astro
diff --git a/examples/snowpack/.gitignore b/examples/snowpack/.gitignore
index 888e5be06..8a882418f 100644
--- a/examples/snowpack/.gitignore
+++ b/examples/snowpack/.gitignore
@@ -1,4 +1,4 @@
 .DS_Store
 build
 node_modules
-_site
-\ No newline at end of file
+dist
diff --git a/examples/snowpack/astro.config.mjs b/examples/snowpack/astro.config.mjs
index 5339e88ed..47fc0d32e 100644
--- a/examples/snowpack/astro.config.mjs
+++ b/examples/snowpack/astro.config.mjs
@@ -1,7 +1,7 @@
 export default {
   projectRoot: '.',
-  astroRoot: './astro',
-  dist: './_site',
+  astroRoot: './src',
+  dist: './dist',
   public: './public',
   extensions: {
     '.jsx': 'preact',
diff --git a/examples/snowpack/astro/components/Banner.astro b/examples/snowpack/src/components/Banner.astro
index 565027678..565027678 100644
--- a/examples/snowpack/astro/components/Banner.astro
+++ b/examples/snowpack/src/components/Banner.astro
diff --git a/examples/snowpack/astro/components/BaseHead.astro b/examples/snowpack/src/components/BaseHead.astro
index a96fc7327..a96fc7327 100644
--- a/examples/snowpack/astro/components/BaseHead.astro
+++ b/examples/snowpack/src/components/BaseHead.astro
diff --git a/examples/snowpack/astro/components/BaseLayout.astro b/examples/snowpack/src/components/BaseLayout.astro
index 040739515..040739515 100644
--- a/examples/snowpack/astro/components/BaseLayout.astro
+++ b/examples/snowpack/src/components/BaseLayout.astro
diff --git a/examples/snowpack/astro/components/Card.css b/examples/snowpack/src/components/Card.css
index 2fa7efe20..2fa7efe20 100644
--- a/examples/snowpack/astro/components/Card.css
+++ b/examples/snowpack/src/components/Card.css
diff --git a/examples/snowpack/astro/components/Card.jsx b/examples/snowpack/src/components/Card.jsx
index ee9460dcf..ee9460dcf 100644
--- a/examples/snowpack/astro/components/Card.jsx
+++ b/examples/snowpack/src/components/Card.jsx
diff --git a/examples/snowpack/astro/components/CompanyLogo.jsx b/examples/snowpack/src/components/CompanyLogo.jsx
index 98be3f2eb..98be3f2eb 100644
--- a/examples/snowpack/astro/components/CompanyLogo.jsx
+++ b/examples/snowpack/src/components/CompanyLogo.jsx
diff --git a/examples/snowpack/astro/components/ContentfulRichText.jsx b/examples/snowpack/src/components/ContentfulRichText.jsx
index 1f4528f6b..1f4528f6b 100644
--- a/examples/snowpack/astro/components/ContentfulRichText.jsx
+++ b/examples/snowpack/src/components/ContentfulRichText.jsx
diff --git a/examples/snowpack/astro/components/Hero.astro b/examples/snowpack/src/components/Hero.astro
index 441f30f12..441f30f12 100644
--- a/examples/snowpack/astro/components/Hero.astro
+++ b/examples/snowpack/src/components/Hero.astro
diff --git a/examples/snowpack/astro/components/MainLayout.astro b/examples/snowpack/src/components/MainLayout.astro
index c9ce65f08..c9ce65f08 100644
--- a/examples/snowpack/astro/components/MainLayout.astro
+++ b/examples/snowpack/src/components/MainLayout.astro
diff --git a/examples/snowpack/astro/components/Menu.astro b/examples/snowpack/src/components/Menu.astro
index 120a8af86..120a8af86 100644
--- a/examples/snowpack/astro/components/Menu.astro
+++ b/examples/snowpack/src/components/Menu.astro
diff --git a/examples/snowpack/astro/components/Nav.astro b/examples/snowpack/src/components/Nav.astro
index 0c97dd425..0c97dd425 100644
--- a/examples/snowpack/astro/components/Nav.astro
+++ b/examples/snowpack/src/components/Nav.astro
diff --git a/examples/snowpack/astro/components/NewsAssets.svelte b/examples/snowpack/src/components/NewsAssets.svelte
index f53078e79..f53078e79 100644
--- a/examples/snowpack/astro/components/NewsAssets.svelte
+++ b/examples/snowpack/src/components/NewsAssets.svelte
diff --git a/examples/snowpack/astro/components/NewsTitle.vue b/examples/snowpack/src/components/NewsTitle.vue
index 00194ac1e..00194ac1e 100644
--- a/examples/snowpack/astro/components/NewsTitle.vue
+++ b/examples/snowpack/src/components/NewsTitle.vue
diff --git a/examples/snowpack/astro/components/PluginSearchPage.jsx b/examples/snowpack/src/components/PluginSearchPage.jsx
index 51c7e6b0f..51c7e6b0f 100644
--- a/examples/snowpack/astro/components/PluginSearchPage.jsx
+++ b/examples/snowpack/src/components/PluginSearchPage.jsx
diff --git a/examples/snowpack/astro/components/PluginSearchPage.module.css b/examples/snowpack/src/components/PluginSearchPage.module.css
index d67dfd72d..d67dfd72d 100644
--- a/examples/snowpack/astro/components/PluginSearchPage.module.css
+++ b/examples/snowpack/src/components/PluginSearchPage.module.css
diff --git a/examples/snowpack/astro/components/PokemonLookup.astro b/examples/snowpack/src/components/PokemonLookup.astro
index 0de7713e3..0de7713e3 100644
--- a/examples/snowpack/astro/components/PokemonLookup.astro
+++ b/examples/snowpack/src/components/PokemonLookup.astro
diff --git a/examples/snowpack/astro/components/Subnav.astro b/examples/snowpack/src/components/Subnav.astro
index 69560cae1..69560cae1 100644
--- a/examples/snowpack/astro/components/Subnav.astro
+++ b/examples/snowpack/src/components/Subnav.astro
diff --git a/examples/snowpack/astro/components/docsearch.js b/examples/snowpack/src/components/docsearch.js
index d7ae95f30..d7ae95f30 100644
--- a/examples/snowpack/astro/components/docsearch.js
+++ b/examples/snowpack/src/components/docsearch.js
diff --git a/examples/snowpack/astro/components/index.ts b/examples/snowpack/src/components/index.ts
index b9d3e23cb..b9d3e23cb 100644
--- a/examples/snowpack/astro/components/index.ts
+++ b/examples/snowpack/src/components/index.ts
diff --git a/examples/snowpack/astro/data/news.json b/examples/snowpack/src/data/news.json
index c29b5e6e2..c29b5e6e2 100644
--- a/examples/snowpack/astro/data/news.json
+++ b/examples/snowpack/src/data/news.json
diff --git a/examples/snowpack/astro/data/users.json b/examples/snowpack/src/data/users.json
index 5ba7c14c0..5ba7c14c0 100644
--- a/examples/snowpack/astro/data/users.json
+++ b/examples/snowpack/src/data/users.json
diff --git a/examples/snowpack/astro/data/version.js b/examples/snowpack/src/data/version.js
index 19a63491c..19a63491c 100644
--- a/examples/snowpack/astro/data/version.js
+++ b/examples/snowpack/src/data/version.js
diff --git a/examples/snowpack/astro/layouts/content-with-cover.astro b/examples/snowpack/src/layouts/content-with-cover.astro
index 46006bdfb..46006bdfb 100644
--- a/examples/snowpack/astro/layouts/content-with-cover.astro
+++ b/examples/snowpack/src/layouts/content-with-cover.astro
diff --git a/examples/snowpack/astro/layouts/content.astro b/examples/snowpack/src/layouts/content.astro
index c8f9ca907..c8f9ca907 100644
--- a/examples/snowpack/astro/layouts/content.astro
+++ b/examples/snowpack/src/layouts/content.astro
diff --git a/examples/snowpack/astro/layouts/post.astro b/examples/snowpack/src/layouts/post.astro
index 05f28bf24..05f28bf24 100644
--- a/examples/snowpack/astro/layouts/post.astro
+++ b/examples/snowpack/src/layouts/post.astro
diff --git a/examples/snowpack/astro/pages/404.astro b/examples/snowpack/src/pages/404.astro
index 053c931f4..053c931f4 100644
--- a/examples/snowpack/astro/pages/404.astro
+++ b/examples/snowpack/src/pages/404.astro
diff --git a/examples/snowpack/astro/pages/concepts/build-pipeline.md b/examples/snowpack/src/pages/concepts/build-pipeline.md
index b996273a4..b996273a4 100644
--- a/examples/snowpack/astro/pages/concepts/build-pipeline.md
+++ b/examples/snowpack/src/pages/concepts/build-pipeline.md
diff --git a/examples/snowpack/astro/pages/concepts/dev-server.md b/examples/snowpack/src/pages/concepts/dev-server.md
index b15bde96b..b15bde96b 100644
--- a/examples/snowpack/astro/pages/concepts/dev-server.md
+++ b/examples/snowpack/src/pages/concepts/dev-server.md
diff --git a/examples/snowpack/astro/pages/concepts/hot-module-replacement.md b/examples/snowpack/src/pages/concepts/hot-module-replacement.md
index 868bbd9a7..868bbd9a7 100644
--- a/examples/snowpack/astro/pages/concepts/hot-module-replacement.md
+++ b/examples/snowpack/src/pages/concepts/hot-module-replacement.md
diff --git a/examples/snowpack/astro/pages/concepts/how-snowpack-works.md b/examples/snowpack/src/pages/concepts/how-snowpack-works.md
index 7b89c4dbd..7b89c4dbd 100644
--- a/examples/snowpack/astro/pages/concepts/how-snowpack-works.md
+++ b/examples/snowpack/src/pages/concepts/how-snowpack-works.md
diff --git a/examples/snowpack/astro/pages/guides.astro b/examples/snowpack/src/pages/guides.astro
index e02856ede..e02856ede 100644
--- a/examples/snowpack/astro/pages/guides.astro
+++ b/examples/snowpack/src/pages/guides.astro
diff --git a/examples/snowpack/astro/pages/guides/babel.md b/examples/snowpack/src/pages/guides/babel.md
index 6c024d150..6c024d150 100644
--- a/examples/snowpack/astro/pages/guides/babel.md
+++ b/examples/snowpack/src/pages/guides/babel.md
diff --git a/examples/snowpack/astro/pages/guides/connecting-tools.md b/examples/snowpack/src/pages/guides/connecting-tools.md
index 239a35116..239a35116 100644
--- a/examples/snowpack/astro/pages/guides/connecting-tools.md
+++ b/examples/snowpack/src/pages/guides/connecting-tools.md
diff --git a/examples/snowpack/astro/pages/guides/hmr.md b/examples/snowpack/src/pages/guides/hmr.md
index f1a967e31..f1a967e31 100644
--- a/examples/snowpack/astro/pages/guides/hmr.md
+++ b/examples/snowpack/src/pages/guides/hmr.md
diff --git a/examples/snowpack/astro/pages/guides/https-ssl-certificates.md b/examples/snowpack/src/pages/guides/https-ssl-certificates.md
index 512c6524f..512c6524f 100644
--- a/examples/snowpack/astro/pages/guides/https-ssl-certificates.md
+++ b/examples/snowpack/src/pages/guides/https-ssl-certificates.md
diff --git a/examples/snowpack/astro/pages/guides/jest.md b/examples/snowpack/src/pages/guides/jest.md
index 8b8edb0a3..8b8edb0a3 100644
--- a/examples/snowpack/astro/pages/guides/jest.md
+++ b/examples/snowpack/src/pages/guides/jest.md
diff --git a/examples/snowpack/astro/pages/guides/optimize-and-bundle.md b/examples/snowpack/src/pages/guides/optimize-and-bundle.md
index 442ec3c05..442ec3c05 100644
--- a/examples/snowpack/astro/pages/guides/optimize-and-bundle.md
+++ b/examples/snowpack/src/pages/guides/optimize-and-bundle.md
diff --git a/examples/snowpack/astro/pages/guides/plugins.md b/examples/snowpack/src/pages/guides/plugins.md
index f78b71617..f78b71617 100644
--- a/examples/snowpack/astro/pages/guides/plugins.md
+++ b/examples/snowpack/src/pages/guides/plugins.md
diff --git a/examples/snowpack/astro/pages/guides/postcss.md b/examples/snowpack/src/pages/guides/postcss.md
index 3d8c26b84..3d8c26b84 100644
--- a/examples/snowpack/astro/pages/guides/postcss.md
+++ b/examples/snowpack/src/pages/guides/postcss.md
diff --git a/examples/snowpack/astro/pages/guides/preact.md b/examples/snowpack/src/pages/guides/preact.md
index 060ff1e89..060ff1e89 100644
--- a/examples/snowpack/astro/pages/guides/preact.md
+++ b/examples/snowpack/src/pages/guides/preact.md
diff --git a/examples/snowpack/astro/pages/guides/react-global-imports.md b/examples/snowpack/src/pages/guides/react-global-imports.md
index 46e3f9054..46e3f9054 100644
--- a/examples/snowpack/astro/pages/guides/react-global-imports.md
+++ b/examples/snowpack/src/pages/guides/react-global-imports.md
diff --git a/examples/snowpack/astro/pages/guides/react-loadable-components.md b/examples/snowpack/src/pages/guides/react-loadable-components.md
index d22931b9b..d22931b9b 100644
--- a/examples/snowpack/astro/pages/guides/react-loadable-components.md
+++ b/examples/snowpack/src/pages/guides/react-loadable-components.md
diff --git a/examples/snowpack/astro/pages/guides/routing.md b/examples/snowpack/src/pages/guides/routing.md
index 3c5ea6ed4..3c5ea6ed4 100644
--- a/examples/snowpack/astro/pages/guides/routing.md
+++ b/examples/snowpack/src/pages/guides/routing.md
diff --git a/examples/snowpack/astro/pages/guides/sass.md b/examples/snowpack/src/pages/guides/sass.md
index e7588b8b0..e7588b8b0 100644
--- a/examples/snowpack/astro/pages/guides/sass.md
+++ b/examples/snowpack/src/pages/guides/sass.md
diff --git a/examples/snowpack/astro/pages/guides/server-side-render.md b/examples/snowpack/src/pages/guides/server-side-render.md
index 77b72f979..77b72f979 100644
--- a/examples/snowpack/astro/pages/guides/server-side-render.md
+++ b/examples/snowpack/src/pages/guides/server-side-render.md
diff --git a/examples/snowpack/astro/pages/guides/streaming-imports.md b/examples/snowpack/src/pages/guides/streaming-imports.md
index cf8673ecb..cf8673ecb 100644
--- a/examples/snowpack/astro/pages/guides/streaming-imports.md
+++ b/examples/snowpack/src/pages/guides/streaming-imports.md
diff --git a/examples/snowpack/astro/pages/guides/tailwind-css.md b/examples/snowpack/src/pages/guides/tailwind-css.md
index a0643b69e..a0643b69e 100644
--- a/examples/snowpack/astro/pages/guides/tailwind-css.md
+++ b/examples/snowpack/src/pages/guides/tailwind-css.md
diff --git a/examples/snowpack/astro/pages/guides/testing.md b/examples/snowpack/src/pages/guides/testing.md
index c632c2f87..c632c2f87 100644
--- a/examples/snowpack/astro/pages/guides/testing.md
+++ b/examples/snowpack/src/pages/guides/testing.md
diff --git a/examples/snowpack/astro/pages/guides/upgrade-guide.md b/examples/snowpack/src/pages/guides/upgrade-guide.md
index 58942350e..58942350e 100644
--- a/examples/snowpack/astro/pages/guides/upgrade-guide.md
+++ b/examples/snowpack/src/pages/guides/upgrade-guide.md
diff --git a/examples/snowpack/astro/pages/guides/vue.md b/examples/snowpack/src/pages/guides/vue.md
index 599a3def5..599a3def5 100644
--- a/examples/snowpack/astro/pages/guides/vue.md
+++ b/examples/snowpack/src/pages/guides/vue.md
diff --git a/examples/snowpack/astro/pages/guides/wasm.md b/examples/snowpack/src/pages/guides/wasm.md
index 1e7ab5ac4..1e7ab5ac4 100644
--- a/examples/snowpack/astro/pages/guides/wasm.md
+++ b/examples/snowpack/src/pages/guides/wasm.md
diff --git a/examples/snowpack/astro/pages/guides/web-test-runner.md b/examples/snowpack/src/pages/guides/web-test-runner.md
index 8962f5001..8962f5001 100644
--- a/examples/snowpack/astro/pages/guides/web-test-runner.md
+++ b/examples/snowpack/src/pages/guides/web-test-runner.md
diff --git a/examples/snowpack/astro/pages/guides/web-worker.md b/examples/snowpack/src/pages/guides/web-worker.md
index 4329c489a..4329c489a 100644
--- a/examples/snowpack/astro/pages/guides/web-worker.md
+++ b/examples/snowpack/src/pages/guides/web-worker.md
diff --git a/examples/snowpack/astro/pages/guides/workbox.md b/examples/snowpack/src/pages/guides/workbox.md
index 5572a8fdb..5572a8fdb 100644
--- a/examples/snowpack/astro/pages/guides/workbox.md
+++ b/examples/snowpack/src/pages/guides/workbox.md
diff --git a/examples/snowpack/astro/pages/index.astro b/examples/snowpack/src/pages/index.astro
index aa5ee59b6..aa5ee59b6 100644
--- a/examples/snowpack/astro/pages/index.astro
+++ b/examples/snowpack/src/pages/index.astro
diff --git a/examples/snowpack/astro/pages/news.astro b/examples/snowpack/src/pages/news.astro
index bae3e5ad7..bae3e5ad7 100644
--- a/examples/snowpack/astro/pages/news.astro
+++ b/examples/snowpack/src/pages/news.astro
diff --git a/examples/snowpack/astro/pages/plugins.astro b/examples/snowpack/src/pages/plugins.astro
index ddd7632e8..ddd7632e8 100644
--- a/examples/snowpack/astro/pages/plugins.astro
+++ b/examples/snowpack/src/pages/plugins.astro
diff --git a/examples/snowpack/astro/pages/posts/2020-05-26-snowpack-2-0-release.md b/examples/snowpack/src/pages/posts/2020-05-26-snowpack-2-0-release.md
index 3882b1071..3882b1071 100644
--- a/examples/snowpack/astro/pages/posts/2020-05-26-snowpack-2-0-release.md
+++ b/examples/snowpack/src/pages/posts/2020-05-26-snowpack-2-0-release.md
diff --git a/examples/snowpack/astro/pages/posts/2020-07-30-snowpack-2-7-release.md b/examples/snowpack/src/pages/posts/2020-07-30-snowpack-2-7-release.md
index 8eecf3158..8eecf3158 100644
--- a/examples/snowpack/astro/pages/posts/2020-07-30-snowpack-2-7-release.md
+++ b/examples/snowpack/src/pages/posts/2020-07-30-snowpack-2-7-release.md
diff --git a/examples/snowpack/astro/pages/posts/2020-12-03-snowpack-3-release-candidate.md b/examples/snowpack/src/pages/posts/2020-12-03-snowpack-3-release-candidate.md
index 392d554d6..392d554d6 100644
--- a/examples/snowpack/astro/pages/posts/2020-12-03-snowpack-3-release-candidate.md
+++ b/examples/snowpack/src/pages/posts/2020-12-03-snowpack-3-release-candidate.md
diff --git a/examples/snowpack/astro/pages/posts/2021-01-13-snowpack-3-0.md b/examples/snowpack/src/pages/posts/2021-01-13-snowpack-3-0.md
index b6dd9b1be..b6dd9b1be 100644
--- a/examples/snowpack/astro/pages/posts/2021-01-13-snowpack-3-0.md
+++ b/examples/snowpack/src/pages/posts/2021-01-13-snowpack-3-0.md
diff --git a/examples/snowpack/astro/pages/proof-of-concept-dynamic/[slug].astro.ignore b/examples/snowpack/src/pages/proof-of-concept-dynamic/[slug].astro.ignore
index 2b05bcf66..2b05bcf66 100644
--- a/examples/snowpack/astro/pages/proof-of-concept-dynamic/[slug].astro.ignore
+++ b/examples/snowpack/src/pages/proof-of-concept-dynamic/[slug].astro.ignore
diff --git a/examples/snowpack/astro/pages/reference/cli-command-line-interface.md b/examples/snowpack/src/pages/reference/cli-command-line-interface.md
index 338eee415..338eee415 100644
--- a/examples/snowpack/astro/pages/reference/cli-command-line-interface.md
+++ b/examples/snowpack/src/pages/reference/cli-command-line-interface.md
diff --git a/examples/snowpack/astro/pages/reference/common-error-details.md b/examples/snowpack/src/pages/reference/common-error-details.md
index c25be136d..c25be136d 100644
--- a/examples/snowpack/astro/pages/reference/common-error-details.md
+++ b/examples/snowpack/src/pages/reference/common-error-details.md
diff --git a/examples/snowpack/astro/pages/reference/configuration.md b/examples/snowpack/src/pages/reference/configuration.md
index d1ed2fc34..d1ed2fc34 100644
--- a/examples/snowpack/astro/pages/reference/configuration.md
+++ b/examples/snowpack/src/pages/reference/configuration.md
diff --git a/examples/snowpack/astro/pages/reference/environment-variables.md b/examples/snowpack/src/pages/reference/environment-variables.md
index 1a4c40794..1a4c40794 100644
--- a/examples/snowpack/astro/pages/reference/environment-variables.md
+++ b/examples/snowpack/src/pages/reference/environment-variables.md
diff --git a/examples/snowpack/astro/pages/reference/hot-module-replacement.md b/examples/snowpack/src/pages/reference/hot-module-replacement.md
index 0b95cebf9..0b95cebf9 100644
--- a/examples/snowpack/astro/pages/reference/hot-module-replacement.md
+++ b/examples/snowpack/src/pages/reference/hot-module-replacement.md
diff --git a/examples/snowpack/astro/pages/reference/javascript-interface.md b/examples/snowpack/src/pages/reference/javascript-interface.md
index ad3048240..ad3048240 100644
--- a/examples/snowpack/astro/pages/reference/javascript-interface.md
+++ b/examples/snowpack/src/pages/reference/javascript-interface.md
diff --git a/examples/snowpack/astro/pages/reference/plugins.md b/examples/snowpack/src/pages/reference/plugins.md
index 3e38f2b6e..3e38f2b6e 100644
--- a/examples/snowpack/astro/pages/reference/plugins.md
+++ b/examples/snowpack/src/pages/reference/plugins.md
diff --git a/examples/snowpack/astro/pages/reference/supported-files.md b/examples/snowpack/src/pages/reference/supported-files.md
index c111247dc..c111247dc 100644
--- a/examples/snowpack/astro/pages/reference/supported-files.md
+++ b/examples/snowpack/src/pages/reference/supported-files.md
diff --git a/examples/snowpack/astro/pages/tutorials/getting-started.md b/examples/snowpack/src/pages/tutorials/getting-started.md
index 07687dffa..07687dffa 100644
--- a/examples/snowpack/astro/pages/tutorials/getting-started.md
+++ b/examples/snowpack/src/pages/tutorials/getting-started.md
diff --git a/examples/snowpack/astro/pages/tutorials/quick-start.md b/examples/snowpack/src/pages/tutorials/quick-start.md
index a3960453f..a3960453f 100644
--- a/examples/snowpack/astro/pages/tutorials/quick-start.md
+++ b/examples/snowpack/src/pages/tutorials/quick-start.md
diff --git a/examples/snowpack/astro/pages/tutorials/react.md b/examples/snowpack/src/pages/tutorials/react.md
index 7364f03cc..7364f03cc 100644
--- a/examples/snowpack/astro/pages/tutorials/react.md
+++ b/examples/snowpack/src/pages/tutorials/react.md
diff --git a/examples/snowpack/astro/pages/tutorials/svelte.md b/examples/snowpack/src/pages/tutorials/svelte.md
index c25f2bcdb..c25f2bcdb 100644
--- a/examples/snowpack/astro/pages/tutorials/svelte.md
+++ b/examples/snowpack/src/pages/tutorials/svelte.md
diff --git a/examples/tailwindcss/.gitignore b/examples/tailwindcss/.gitignore
index ca35be08d..1521c8b76 100644
--- a/examples/tailwindcss/.gitignore
+++ b/examples/tailwindcss/.gitignore
@@ -1 +1 @@
-_site
+dist
diff --git a/examples/tailwindcss/README.md b/examples/tailwindcss/README.md
index e16be0504..dd96562bd 100644
--- a/examples/tailwindcss/README.md
+++ b/examples/tailwindcss/README.md
@@ -20,4 +20,4 @@ Preview at `http://localhost:3000`
 npm build
 ```
 
-Will output static site at `./_site`
+Will output static site at `./dist`
diff --git a/examples/tailwindcss/astro/components/Button.astro b/examples/tailwindcss/src/components/Button.astro
index ac13d7a49..ac13d7a49 100644
--- a/examples/tailwindcss/astro/components/Button.astro
+++ b/examples/tailwindcss/src/components/Button.astro
diff --git a/examples/tailwindcss/astro/pages/index.astro b/examples/tailwindcss/src/pages/index.astro
index e062f1f5b..e062f1f5b 100644
--- a/examples/tailwindcss/astro/pages/index.astro
+++ b/examples/tailwindcss/src/pages/index.astro
diff --git a/examples/tailwindcss/tailwind.config.js b/examples/tailwindcss/tailwind.config.js
index 279237052..9b380cc46 100644
--- a/examples/tailwindcss/tailwind.config.js
+++ b/examples/tailwindcss/tailwind.config.js
@@ -1,4 +1,4 @@
 module.exports = {
   mode: 'jit',
-  purge: ['./public/**/*.html', './astro/**/*.{astro,js,jsx,ts,tsx,vue}'],
+  purge: ['./public/**/*.html', './src/**/*.{astro,js,jsx,ts,tsx,vue}'],
 };
diff --git a/src/config.ts b/src/config.ts
index 5b77a3402..8f3ebaf5a 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -35,8 +35,8 @@ function configDefaults(userConfig?: any): any {
   const config: any = { ...(userConfig || {}) };
 
   if (!config.projectRoot) config.projectRoot = '.';
-  if (!config.astroRoot) config.astroRoot = './astro';
-  if (!config.dist) config.dist = './_site';
+  if (!config.astroRoot) config.astroRoot = './src';
+  if (!config.dist) config.dist = './dist';
   if (!config.public) config.public = './public';
   if (!config.devOptions) config.devOptions = {};
   if (!config.devOptions.port) config.devOptions.port = 3000;
diff --git a/test/astro-markdown.test.js b/test/astro-markdown.test.js
index 4d6a4f438..281243b49 100644
--- a/test/astro-markdown.test.js
+++ b/test/astro-markdown.test.js
@@ -34,7 +34,7 @@ Markdown.before(async () => {
 
 Markdown.after(async () => {
   (await runtime) && runtime.shutdown();
-  rmdir(join(fixturePath, '_site'), { recursive: true });
+  rmdir(join(fixturePath, 'dist'), { recursive: true });
 });
 
 Markdown('No errors creating a runtime', () => {
@@ -62,10 +62,10 @@ Markdown('Can load more complex jsxy stuff', async () => {
 Markdown('Bundles client-side JS for prod', async () => {
   await build(astroConfig);
 
-  const complexHtml = await readFile(join(fixturePath, './_site/complex/index.html'), 'utf-8');
+  const complexHtml = await readFile(join(fixturePath, './dist/complex/index.html'), 'utf-8');
 
   assert.match(complexHtml, `import("/_astro/components/Counter.js"`);
-  assert.ok(existsSync(join(fixturePath, `./_site/_astro/components/Counter.js`)), 'Counter.jsx is bundled for prod');
+  assert.ok(existsSync(join(fixturePath, `./dist/_astro/components/Counter.js`)), 'Counter.jsx is bundled for prod');
 });
 
 Markdown.run();
diff --git a/test/astro-rss.test.js b/test/astro-rss.test.js
index 53a48f158..ed0d37818 100644
--- a/test/astro-rss.test.js
+++ b/test/astro-rss.test.js
@@ -13,14 +13,14 @@ const snapshot = `<?xml version="1.0" encoding="UTF-8"?><rss version="2.0" xmlns
 
 const cwd = new URL('./fixtures/astro-rss', import.meta.url);
 
-const clear = () => del(path.join(fileURLToPath(cwd), '_site')); // clear _site output
+const clear = () => del(path.join(fileURLToPath(cwd), 'dist')); // clear dist output
 
 RSS.before(() => clear());
 RSS.after(() => clear());
 
 RSS('Generates RSS correctly', async () => {
   execSync('node ../../../astro.mjs build', { cwd: fileURLToPath(cwd) });
-  const rss = await fs.promises.readFile(path.join(fileURLToPath(cwd), '_site', 'feed', 'episodes.xml'), 'utf8');
+  const rss = await fs.promises.readFile(path.join(fileURLToPath(cwd), 'dist', 'feed', 'episodes.xml'), 'utf8');
   assert.match(rss, snapshot);
 });
 
diff --git a/test/astro-sitemap.test.js b/test/astro-sitemap.test.js
index b2edd9312..dccaac326 100644
--- a/test/astro-sitemap.test.js
+++ b/test/astro-sitemap.test.js
@@ -12,14 +12,14 @@ const snapshot = `<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://ww
 
 const cwd = new URL('./fixtures/astro-rss', import.meta.url);
 
-const clear = () => del(path.join(fileURLToPath(cwd), '_site')); // clear _site output
+const clear = () => del(path.join(fileURLToPath(cwd), 'dist')); // clear dist output
 
 Sitemap.before(() => clear());
 Sitemap.after(() => clear());
 
 Sitemap('Generates Sitemap correctly', async () => {
   execSync('node ../../../astro.mjs build', { cwd: fileURLToPath(cwd) });
-  const rss = await fs.promises.readFile(path.join(fileURLToPath(cwd), '_site', 'sitemap.xml'), 'utf8');
+  const rss = await fs.promises.readFile(path.join(fileURLToPath(cwd), 'dist', 'sitemap.xml'), 'utf8');
   assert.match(rss, snapshot);
 });
 
diff --git a/test/config-path.test.js b/test/config-path.test.js
index a13e099b3..33e2cf3b7 100644
--- a/test/config-path.test.js
+++ b/test/config-path.test.js
@@ -12,7 +12,7 @@ ConfigPath('can be passed via --config', async (context) => {
 
   process.stdout.setEncoding('utf8');
   for await (const chunk of process.stdout) {
-    if(/Server running at/.test(chunk)) {
+    if(/Server started/.test(chunk)) {
       break;
     }
   }
diff --git a/test/config-port.test.js b/test/config-port.test.js
index 9b5f7b14c..e2e238b64 100644
--- a/test/config-port.test.js
+++ b/test/config-port.test.js
@@ -17,7 +17,7 @@ ConfigPort('can be specified via --port flag', async (context) => {
 
   process.stdout.setEncoding('utf8');
   for await (const chunk of process.stdout) {
-    if(/Server running at/.test(chunk)) {
+    if(/Local:/.test(chunk)) {
       assert.ok(/:3002/.test(chunk), 'Using the right port');
       break;
     }
diff --git a/test/fixtures/astro-basic/astro/layouts/base.astro b/test/fixtures/astro-basic/src/layouts/base.astro
index ec996a32f..ec996a32f 100644
--- a/test/fixtures/astro-basic/astro/layouts/base.astro
+++ b/test/fixtures/astro-basic/src/layouts/base.astro
diff --git a/test/fixtures/astro-basic/astro/pages/index.astro b/test/fixtures/astro-basic/src/pages/index.astro
index 5ae5380c5..5ae5380c5 100644
--- a/test/fixtures/astro-basic/astro/pages/index.astro
+++ b/test/fixtures/astro-basic/src/pages/index.astro
diff --git a/test/fixtures/astro-basic/astro/pages/nested-astro/index.astro b/test/fixtures/astro-basic/src/pages/nested-astro/index.astro
index a28992ee6..a28992ee6 100644
--- a/test/fixtures/astro-basic/astro/pages/nested-astro/index.astro
+++ b/test/fixtures/astro-basic/src/pages/nested-astro/index.astro
diff --git a/test/fixtures/astro-basic/astro/pages/nested-md/index.md b/test/fixtures/astro-basic/src/pages/nested-md/index.md
index 23374f9b8..23374f9b8 100644
--- a/test/fixtures/astro-basic/astro/pages/nested-md/index.md
+++ b/test/fixtures/astro-basic/src/pages/nested-md/index.md
diff --git a/test/fixtures/astro-basic/astro/pages/news.astro b/test/fixtures/astro-basic/src/pages/news.astro
index 71a00b8a9..71a00b8a9 100644
--- a/test/fixtures/astro-basic/astro/pages/news.astro
+++ b/test/fixtures/astro-basic/src/pages/news.astro
diff --git a/test/fixtures/astro-collection/astro/pages/$posts.astro b/test/fixtures/astro-collection/src/pages/$posts.astro
index 4186a9a5c..4186a9a5c 100644
--- a/test/fixtures/astro-collection/astro/pages/$posts.astro
+++ b/test/fixtures/astro-collection/src/pages/$posts.astro
diff --git a/test/fixtures/astro-collection/astro/pages/post/one.md b/test/fixtures/astro-collection/src/pages/post/one.md
index 9d68e12dd..9d68e12dd 100644
--- a/test/fixtures/astro-collection/astro/pages/post/one.md
+++ b/test/fixtures/astro-collection/src/pages/post/one.md
diff --git a/test/fixtures/astro-collection/astro/pages/post/three.md b/test/fixtures/astro-collection/src/pages/post/three.md
index c495a5195..c495a5195 100644
--- a/test/fixtures/astro-collection/astro/pages/post/three.md
+++ b/test/fixtures/astro-collection/src/pages/post/three.md
diff --git a/test/fixtures/astro-collection/astro/pages/post/two.md b/test/fixtures/astro-collection/src/pages/post/two.md
index 39855e701..39855e701 100644
--- a/test/fixtures/astro-collection/astro/pages/post/two.md
+++ b/test/fixtures/astro-collection/src/pages/post/two.md
diff --git a/test/fixtures/astro-doctype/astro/pages/prepend.astro b/test/fixtures/astro-doctype/src/pages/prepend.astro
index f8fb1bacd..f8fb1bacd 100644
--- a/test/fixtures/astro-doctype/astro/pages/prepend.astro
+++ b/test/fixtures/astro-doctype/src/pages/prepend.astro
diff --git a/test/fixtures/astro-doctype/astro/pages/preserve.astro b/test/fixtures/astro-doctype/src/pages/preserve.astro
index 3e1ca934f..3e1ca934f 100644
--- a/test/fixtures/astro-doctype/astro/pages/preserve.astro
+++ b/test/fixtures/astro-doctype/src/pages/preserve.astro
diff --git a/test/fixtures/astro-dynamic/astro/components/Counter.jsx b/test/fixtures/astro-dynamic/src/components/Counter.jsx
index 31472c3ac..31472c3ac 100644
--- a/test/fixtures/astro-dynamic/astro/components/Counter.jsx
+++ b/test/fixtures/astro-dynamic/src/components/Counter.jsx
diff --git a/test/fixtures/astro-dynamic/astro/components/SvelteCounter.svelte b/test/fixtures/astro-dynamic/src/components/SvelteCounter.svelte
index 8d6b3f5e1..8d6b3f5e1 100644
--- a/test/fixtures/astro-dynamic/astro/components/SvelteCounter.svelte
+++ b/test/fixtures/astro-dynamic/src/components/SvelteCounter.svelte
diff --git a/test/fixtures/astro-dynamic/astro/pages/index.astro b/test/fixtures/astro-dynamic/src/pages/index.astro
index c4d0fef17..c4d0fef17 100644
--- a/test/fixtures/astro-dynamic/astro/pages/index.astro
+++ b/test/fixtures/astro-dynamic/src/pages/index.astro
diff --git a/test/fixtures/astro-expr/astro/components/Color.jsx b/test/fixtures/astro-expr/src/components/Color.jsx
index c2681cc9b..c2681cc9b 100644
--- a/test/fixtures/astro-expr/astro/components/Color.jsx
+++ b/test/fixtures/astro-expr/src/components/Color.jsx
diff --git a/test/fixtures/astro-expr/astro/pages/index.astro b/test/fixtures/astro-expr/src/pages/index.astro
index 50af05d93..50af05d93 100644
--- a/test/fixtures/astro-expr/astro/pages/index.astro
+++ b/test/fixtures/astro-expr/src/pages/index.astro
diff --git a/test/fixtures/astro-expr/astro/pages/line-comments.astro b/test/fixtures/astro-expr/src/pages/line-comments.astro
index 2fb7bf643..2fb7bf643 100644
--- a/test/fixtures/astro-expr/astro/pages/line-comments.astro
+++ b/test/fixtures/astro-expr/src/pages/line-comments.astro
diff --git a/test/fixtures/astro-expr/astro/pages/multiline-comments.astro b/test/fixtures/astro-expr/src/pages/multiline-comments.astro
index 5c7016ee8..5c7016ee8 100644
--- a/test/fixtures/astro-expr/astro/pages/multiline-comments.astro
+++ b/test/fixtures/astro-expr/src/pages/multiline-comments.astro
diff --git a/test/fixtures/astro-expr/astro/pages/multiple-children.astro b/test/fixtures/astro-expr/src/pages/multiple-children.astro
index fb0fafd4a..fb0fafd4a 100644
--- a/test/fixtures/astro-expr/astro/pages/multiple-children.astro
+++ b/test/fixtures/astro-expr/src/pages/multiple-children.astro
diff --git a/test/fixtures/astro-expr/astro/pages/strings.astro b/test/fixtures/astro-expr/src/pages/strings.astro
index 712df6120..712df6120 100644
--- a/test/fixtures/astro-expr/astro/pages/strings.astro
+++ b/test/fixtures/astro-expr/src/pages/strings.astro
diff --git a/test/fixtures/astro-fallback/astro/components/Client.jsx b/test/fixtures/astro-fallback/src/components/Client.jsx
index d79536e27..d79536e27 100644
--- a/test/fixtures/astro-fallback/astro/components/Client.jsx
+++ b/test/fixtures/astro-fallback/src/components/Client.jsx
diff --git a/test/fixtures/astro-fallback/astro/pages/index.astro b/test/fixtures/astro-fallback/src/pages/index.astro
index f4f20c322..f4f20c322 100644
--- a/test/fixtures/astro-fallback/astro/pages/index.astro
+++ b/test/fixtures/astro-fallback/src/pages/index.astro
diff --git a/test/fixtures/astro-markdown/astro/components/Counter.jsx b/test/fixtures/astro-markdown/src/components/Counter.jsx
index a75f858b5..a75f858b5 100644
--- a/test/fixtures/astro-markdown/astro/components/Counter.jsx
+++ b/test/fixtures/astro-markdown/src/components/Counter.jsx
diff --git a/test/fixtures/astro-markdown/astro/components/Example.jsx b/test/fixtures/astro-markdown/src/components/Example.jsx
index 57bde3a95..57bde3a95 100644
--- a/test/fixtures/astro-markdown/astro/components/Example.jsx
+++ b/test/fixtures/astro-markdown/src/components/Example.jsx
diff --git a/test/fixtures/astro-markdown/astro/components/Hello.jsx b/test/fixtures/astro-markdown/src/components/Hello.jsx
index 787ca587b..787ca587b 100644
--- a/test/fixtures/astro-markdown/astro/components/Hello.jsx
+++ b/test/fixtures/astro-markdown/src/components/Hello.jsx
diff --git a/test/fixtures/astro-markdown/astro/layouts/content.astro b/test/fixtures/astro-markdown/src/layouts/content.astro
index 925a243a9..925a243a9 100644
--- a/test/fixtures/astro-markdown/astro/layouts/content.astro
+++ b/test/fixtures/astro-markdown/src/layouts/content.astro
diff --git a/test/fixtures/astro-markdown/astro/pages/complex.md b/test/fixtures/astro-markdown/src/pages/complex.md
index 6367948b9..6367948b9 100644
--- a/test/fixtures/astro-markdown/astro/pages/complex.md
+++ b/test/fixtures/astro-markdown/src/pages/complex.md
diff --git a/test/fixtures/astro-markdown/astro/pages/post.md b/test/fixtures/astro-markdown/src/pages/post.md
index 58ebdc945..58ebdc945 100644
--- a/test/fixtures/astro-markdown/astro/pages/post.md
+++ b/test/fixtures/astro-markdown/src/pages/post.md
diff --git a/test/fixtures/astro-request/astro/pages/index.astro b/test/fixtures/astro-request/src/pages/index.astro
index 590a5e154..590a5e154 100644
--- a/test/fixtures/astro-request/astro/pages/index.astro
+++ b/test/fixtures/astro-request/src/pages/index.astro
diff --git a/test/fixtures/astro-rss/astro/pages/$episodes.astro b/test/fixtures/astro-rss/src/pages/$episodes.astro
index a1e3df00b..a1e3df00b 100644
--- a/test/fixtures/astro-rss/astro/pages/$episodes.astro
+++ b/test/fixtures/astro-rss/src/pages/$episodes.astro
diff --git a/test/fixtures/astro-rss/astro/pages/episode/fazers.md b/test/fixtures/astro-rss/src/pages/episode/fazers.md
index 9efbf1fa2..9efbf1fa2 100644
--- a/test/fixtures/astro-rss/astro/pages/episode/fazers.md
+++ b/test/fixtures/astro-rss/src/pages/episode/fazers.md
diff --git a/test/fixtures/astro-rss/astro/pages/episode/rap-snitch-knishes.md b/test/fixtures/astro-rss/src/pages/episode/rap-snitch-knishes.md
index e7ade24b4..e7ade24b4 100644
--- a/test/fixtures/astro-rss/astro/pages/episode/rap-snitch-knishes.md
+++ b/test/fixtures/astro-rss/src/pages/episode/rap-snitch-knishes.md
diff --git a/test/fixtures/astro-rss/astro/pages/episode/rhymes-like-dimes.md b/test/fixtures/astro-rss/src/pages/episode/rhymes-like-dimes.md
index ba73c28d8..ba73c28d8 100644
--- a/test/fixtures/astro-rss/astro/pages/episode/rhymes-like-dimes.md
+++ b/test/fixtures/astro-rss/src/pages/episode/rhymes-like-dimes.md
diff --git a/test/fixtures/astro-styles-ssr/astro/components/ReactCSS.css b/test/fixtures/astro-styles-ssr/src/components/ReactCSS.css
index a29595b86..a29595b86 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/ReactCSS.css
+++ b/test/fixtures/astro-styles-ssr/src/components/ReactCSS.css
diff --git a/test/fixtures/astro-styles-ssr/astro/components/ReactCSS.jsx b/test/fixtures/astro-styles-ssr/src/components/ReactCSS.jsx
index 88d731a3f..88d731a3f 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/ReactCSS.jsx
+++ b/test/fixtures/astro-styles-ssr/src/components/ReactCSS.jsx
diff --git a/test/fixtures/astro-styles-ssr/astro/components/ReactModules.jsx b/test/fixtures/astro-styles-ssr/src/components/ReactModules.jsx
index b3aef6bb2..b3aef6bb2 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/ReactModules.jsx
+++ b/test/fixtures/astro-styles-ssr/src/components/ReactModules.jsx
diff --git a/test/fixtures/astro-styles-ssr/astro/components/ReactModules.module.css b/test/fixtures/astro-styles-ssr/src/components/ReactModules.module.css
index 465178859..465178859 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/ReactModules.module.css
+++ b/test/fixtures/astro-styles-ssr/src/components/ReactModules.module.css
diff --git a/test/fixtures/astro-styles-ssr/astro/components/SvelteScoped.svelte b/test/fixtures/astro-styles-ssr/src/components/SvelteScoped.svelte
index 8c2b7d451..8c2b7d451 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/SvelteScoped.svelte
+++ b/test/fixtures/astro-styles-ssr/src/components/SvelteScoped.svelte
diff --git a/test/fixtures/astro-styles-ssr/astro/components/VueCSS.vue b/test/fixtures/astro-styles-ssr/src/components/VueCSS.vue
index 23ac9a291..23ac9a291 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/VueCSS.vue
+++ b/test/fixtures/astro-styles-ssr/src/components/VueCSS.vue
diff --git a/test/fixtures/astro-styles-ssr/astro/components/VueModules.vue b/test/fixtures/astro-styles-ssr/src/components/VueModules.vue
index bd520fec4..bd520fec4 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/VueModules.vue
+++ b/test/fixtures/astro-styles-ssr/src/components/VueModules.vue
diff --git a/test/fixtures/astro-styles-ssr/astro/components/VueScoped.vue b/test/fixtures/astro-styles-ssr/src/components/VueScoped.vue
index 0eee4dff1..0eee4dff1 100644
--- a/test/fixtures/astro-styles-ssr/astro/components/VueScoped.vue
+++ b/test/fixtures/astro-styles-ssr/src/components/VueScoped.vue
diff --git a/test/fixtures/astro-styles-ssr/astro/pages/index.astro b/test/fixtures/astro-styles-ssr/src/pages/index.astro
index 45f9683ac..45f9683ac 100644
--- a/test/fixtures/astro-styles-ssr/astro/pages/index.astro
+++ b/test/fixtures/astro-styles-ssr/src/pages/index.astro
diff --git a/test/fixtures/react-component/astro/components/Goodbye.vue b/test/fixtures/react-component/src/components/Goodbye.vue
index 430dfdb71..430dfdb71 100644
--- a/test/fixtures/react-component/astro/components/Goodbye.vue
+++ b/test/fixtures/react-component/src/components/Goodbye.vue
diff --git a/test/fixtures/react-component/astro/components/Hello.jsx b/test/fixtures/react-component/src/components/Hello.jsx
index 4b6c416a9..4b6c416a9 100644
--- a/test/fixtures/react-component/astro/components/Hello.jsx
+++ b/test/fixtures/react-component/src/components/Hello.jsx
diff --git a/test/fixtures/react-component/astro/pages/index.astro b/test/fixtures/react-component/src/pages/index.astro
index 74475f34e..74475f34e 100644
--- a/test/fixtures/react-component/astro/pages/index.astro
+++ b/test/fixtures/react-component/src/pages/index.astro
diff --git a/test/snowpack-integration.test.js b/test/snowpack-integration.test.js
index d48aa1a1f..eff5b6756 100644
--- a/test/snowpack-integration.test.js
+++ b/test/snowpack-integration.test.js
@@ -68,7 +68,7 @@ SnowpackDev('No error creating the runtime', () => {
 SnowpackDev('Can load every page', async () => {
   const failed = [];
 
-  const pageRoot = new URL('../examples/snowpack/astro/pages/', import.meta.url);
+  const pageRoot = new URL('../examples/snowpack/src/pages/', import.meta.url);
   for await (let pathname of allPages(pageRoot)) {
     if (pathname.includes('proof-of-concept-dynamic')) {
       continue;
diff --git a/vscode/packages/server/src/plugins/typescript/languageService.ts b/vscode/packages/server/src/plugins/typescript/languageService.ts
index c1663ea46..4de703b2a 100644
--- a/vscode/packages/server/src/plugins/typescript/languageService.ts
+++ b/vscode/packages/server/src/plugins/typescript/languageService.ts
@@ -79,7 +79,7 @@ async function createLanguageService(tsconfigPath: string, workspaceRoot: string
     );
 
   let projectVersion = 0;
-  const snapshotManager = new SnapshotManager(project.fileNames, { exclude: ['node_modules', '_site'], include: ['astro'] }, workspaceRoot || process.cwd());
+  const snapshotManager = new SnapshotManager(project.fileNames, { exclude: ['node_modules', 'dist'], include: ['astro'] }, workspaceRoot || process.cwd());
   const astroSys = createAstroSys(updateDocument);
 
   const host: ts.LanguageServiceHost = {
@@ -175,5 +175,5 @@ function getDefaultJsConfig(): {
 }
 
 function getDefaultExclude() {
-  return ['_site', 'node_modules'];
+  return ['dist', 'node_modules'];
 }
diff --git a/www/astro/components/Article.astro b/www/src/components/Article.astro
index 283d79d91..283d79d91 100644
--- a/www/astro/components/Article.astro
+++ b/www/src/components/Article.astro
diff --git a/www/astro/components/BaseHead.astro b/www/src/components/BaseHead.astro
index 155d12ae2..155d12ae2 100644
--- a/www/astro/components/BaseHead.astro
+++ b/www/src/components/BaseHead.astro
diff --git a/www/astro/components/Logo.astro b/www/src/components/Logo.astro
index 7926dab4d..7926dab4d 100644
--- a/www/astro/components/Logo.astro
+++ b/www/src/components/Logo.astro
diff --git a/www/astro/components/Main.astro b/www/src/components/Main.astro
index 58597c8ec..58597c8ec 100644
--- a/www/astro/components/Main.astro
+++ b/www/src/components/Main.astro
diff --git a/www/astro/components/Planets.astro b/www/src/components/Planets.astro
index c39e0d2d9..c39e0d2d9 100644
--- a/www/astro/components/Planets.astro
+++ b/www/src/components/Planets.astro
diff --git a/www/astro/components/Space.astro b/www/src/components/Space.astro
index 9bab693a8..9bab693a8 100644
--- a/www/astro/components/Space.astro
+++ b/www/src/components/Space.astro
diff --git a/www/astro/components/Stars.astro b/www/src/components/Stars.astro
index 952bc0340..952bc0340 100644
--- a/www/astro/components/Stars.astro
+++ b/www/src/components/Stars.astro
diff --git a/www/astro/components/Tagline.astro b/www/src/components/Tagline.astro
index 232ee76b9..232ee76b9 100644
--- a/www/astro/components/Tagline.astro
+++ b/www/src/components/Tagline.astro
diff --git a/www/astro/pages/index.astro b/www/src/pages/index.astro
index bc4c0711d..bc4c0711d 100644
--- a/www/astro/pages/index.astro
+++ b/www/src/pages/index.astro