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
similarity index 100%
rename from examples/blog/astro/components/AuthorCard.astro
rename to examples/blog/src/components/AuthorCard.astro
diff --git a/examples/blog/astro/components/Counter.jsx b/examples/blog/src/components/Counter.jsx
similarity index 100%
rename from examples/blog/astro/components/Counter.jsx
rename to examples/blog/src/components/Counter.jsx
diff --git a/examples/blog/astro/components/MainHead.astro b/examples/blog/src/components/MainHead.astro
similarity index 100%
rename from examples/blog/astro/components/MainHead.astro
rename to examples/blog/src/components/MainHead.astro
diff --git a/examples/blog/astro/components/Nav.astro b/examples/blog/src/components/Nav.astro
similarity index 100%
rename from examples/blog/astro/components/Nav.astro
rename to examples/blog/src/components/Nav.astro
diff --git a/examples/blog/astro/components/Pagination.astro b/examples/blog/src/components/Pagination.astro
similarity index 100%
rename from examples/blog/astro/components/Pagination.astro
rename to examples/blog/src/components/Pagination.astro
diff --git a/examples/blog/astro/components/PostPreview.astro b/examples/blog/src/components/PostPreview.astro
similarity index 100%
rename from examples/blog/astro/components/PostPreview.astro
rename to examples/blog/src/components/PostPreview.astro
diff --git a/examples/blog/astro/data/authors.json b/examples/blog/src/data/authors.json
similarity index 100%
rename from examples/blog/astro/data/authors.json
rename to examples/blog/src/data/authors.json
diff --git a/examples/blog/astro/layouts/post.astro b/examples/blog/src/layouts/post.astro
similarity index 100%
rename from examples/blog/astro/layouts/post.astro
rename to examples/blog/src/layouts/post.astro
diff --git a/examples/blog/astro/pages/$posts.astro b/examples/blog/src/pages/$posts.astro
similarity index 100%
rename from examples/blog/astro/pages/$posts.astro
rename to examples/blog/src/pages/$posts.astro
diff --git a/examples/blog/astro/pages/$tag.astro b/examples/blog/src/pages/$tag.astro
similarity index 100%
rename from examples/blog/astro/pages/$tag.astro
rename to examples/blog/src/pages/$tag.astro
diff --git a/examples/blog/astro/pages/index.astro b/examples/blog/src/pages/index.astro
similarity index 100%
rename from examples/blog/astro/pages/index.astro
rename to 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
similarity index 100%
rename from examples/blog/astro/pages/post/muppet-babies.md
rename to 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
similarity index 100%
rename from examples/blog/astro/pages/post/muppet-treasure-island.md
rename to 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
similarity index 100%
rename from examples/blog/astro/pages/post/muppets-from-space.md
rename to 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
similarity index 100%
rename from examples/blog/astro/pages/post/muppets-most-wanted.md
rename to 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
similarity index 100%
rename from examples/blog/astro/pages/post/the-muppet-christmas-carol.md
rename to 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
similarity index 100%
rename from examples/blog/astro/pages/post/the-muppet-show.md
rename to 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
similarity index 100%
rename from examples/blog/astro/pages/post/the-muppets.md
rename to 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
similarity index 100%
rename from examples/kitchen-sink/astro/components/PreactCounter.tsx
rename to 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
similarity index 100%
rename from examples/kitchen-sink/astro/components/ReactCounter.jsx
rename to 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
similarity index 100%
rename from examples/kitchen-sink/astro/components/SvelteCounter.svelte
rename to 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
similarity index 100%
rename from examples/kitchen-sink/astro/components/VueCounter.vue
rename to 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
similarity index 100%
rename from examples/kitchen-sink/astro/pages/index.astro
rename to 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
similarity index 100%
rename from examples/snowpack/astro/components/Banner.astro
rename to examples/snowpack/src/components/Banner.astro
diff --git a/examples/snowpack/astro/components/BaseHead.astro b/examples/snowpack/src/components/BaseHead.astro
similarity index 100%
rename from examples/snowpack/astro/components/BaseHead.astro
rename to examples/snowpack/src/components/BaseHead.astro
diff --git a/examples/snowpack/astro/components/BaseLayout.astro b/examples/snowpack/src/components/BaseLayout.astro
similarity index 100%
rename from examples/snowpack/astro/components/BaseLayout.astro
rename to examples/snowpack/src/components/BaseLayout.astro
diff --git a/examples/snowpack/astro/components/Card.css b/examples/snowpack/src/components/Card.css
similarity index 100%
rename from examples/snowpack/astro/components/Card.css
rename to examples/snowpack/src/components/Card.css
diff --git a/examples/snowpack/astro/components/Card.jsx b/examples/snowpack/src/components/Card.jsx
similarity index 100%
rename from examples/snowpack/astro/components/Card.jsx
rename to examples/snowpack/src/components/Card.jsx
diff --git a/examples/snowpack/astro/components/CompanyLogo.jsx b/examples/snowpack/src/components/CompanyLogo.jsx
similarity index 100%
rename from examples/snowpack/astro/components/CompanyLogo.jsx
rename to examples/snowpack/src/components/CompanyLogo.jsx
diff --git a/examples/snowpack/astro/components/ContentfulRichText.jsx b/examples/snowpack/src/components/ContentfulRichText.jsx
similarity index 100%
rename from examples/snowpack/astro/components/ContentfulRichText.jsx
rename to examples/snowpack/src/components/ContentfulRichText.jsx
diff --git a/examples/snowpack/astro/components/Hero.astro b/examples/snowpack/src/components/Hero.astro
similarity index 100%
rename from examples/snowpack/astro/components/Hero.astro
rename to examples/snowpack/src/components/Hero.astro
diff --git a/examples/snowpack/astro/components/MainLayout.astro b/examples/snowpack/src/components/MainLayout.astro
similarity index 100%
rename from examples/snowpack/astro/components/MainLayout.astro
rename to examples/snowpack/src/components/MainLayout.astro
diff --git a/examples/snowpack/astro/components/Menu.astro b/examples/snowpack/src/components/Menu.astro
similarity index 100%
rename from examples/snowpack/astro/components/Menu.astro
rename to examples/snowpack/src/components/Menu.astro
diff --git a/examples/snowpack/astro/components/Nav.astro b/examples/snowpack/src/components/Nav.astro
similarity index 100%
rename from examples/snowpack/astro/components/Nav.astro
rename to examples/snowpack/src/components/Nav.astro
diff --git a/examples/snowpack/astro/components/NewsAssets.svelte b/examples/snowpack/src/components/NewsAssets.svelte
similarity index 100%
rename from examples/snowpack/astro/components/NewsAssets.svelte
rename to examples/snowpack/src/components/NewsAssets.svelte
diff --git a/examples/snowpack/astro/components/NewsTitle.vue b/examples/snowpack/src/components/NewsTitle.vue
similarity index 100%
rename from examples/snowpack/astro/components/NewsTitle.vue
rename to examples/snowpack/src/components/NewsTitle.vue
diff --git a/examples/snowpack/astro/components/PluginSearchPage.jsx b/examples/snowpack/src/components/PluginSearchPage.jsx
similarity index 100%
rename from examples/snowpack/astro/components/PluginSearchPage.jsx
rename to examples/snowpack/src/components/PluginSearchPage.jsx
diff --git a/examples/snowpack/astro/components/PluginSearchPage.module.css b/examples/snowpack/src/components/PluginSearchPage.module.css
similarity index 100%
rename from examples/snowpack/astro/components/PluginSearchPage.module.css
rename to examples/snowpack/src/components/PluginSearchPage.module.css
diff --git a/examples/snowpack/astro/components/PokemonLookup.astro b/examples/snowpack/src/components/PokemonLookup.astro
similarity index 100%
rename from examples/snowpack/astro/components/PokemonLookup.astro
rename to examples/snowpack/src/components/PokemonLookup.astro
diff --git a/examples/snowpack/astro/components/Subnav.astro b/examples/snowpack/src/components/Subnav.astro
similarity index 100%
rename from examples/snowpack/astro/components/Subnav.astro
rename to examples/snowpack/src/components/Subnav.astro
diff --git a/examples/snowpack/astro/components/docsearch.js b/examples/snowpack/src/components/docsearch.js
similarity index 100%
rename from examples/snowpack/astro/components/docsearch.js
rename to examples/snowpack/src/components/docsearch.js
diff --git a/examples/snowpack/astro/components/index.ts b/examples/snowpack/src/components/index.ts
similarity index 100%
rename from examples/snowpack/astro/components/index.ts
rename to examples/snowpack/src/components/index.ts
diff --git a/examples/snowpack/astro/data/news.json b/examples/snowpack/src/data/news.json
similarity index 100%
rename from examples/snowpack/astro/data/news.json
rename to examples/snowpack/src/data/news.json
diff --git a/examples/snowpack/astro/data/users.json b/examples/snowpack/src/data/users.json
similarity index 100%
rename from examples/snowpack/astro/data/users.json
rename to examples/snowpack/src/data/users.json
diff --git a/examples/snowpack/astro/data/version.js b/examples/snowpack/src/data/version.js
similarity index 100%
rename from examples/snowpack/astro/data/version.js
rename to 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
similarity index 100%
rename from examples/snowpack/astro/layouts/content-with-cover.astro
rename to examples/snowpack/src/layouts/content-with-cover.astro
diff --git a/examples/snowpack/astro/layouts/content.astro b/examples/snowpack/src/layouts/content.astro
similarity index 100%
rename from examples/snowpack/astro/layouts/content.astro
rename to examples/snowpack/src/layouts/content.astro
diff --git a/examples/snowpack/astro/layouts/post.astro b/examples/snowpack/src/layouts/post.astro
similarity index 100%
rename from examples/snowpack/astro/layouts/post.astro
rename to examples/snowpack/src/layouts/post.astro
diff --git a/examples/snowpack/astro/pages/404.astro b/examples/snowpack/src/pages/404.astro
similarity index 100%
rename from examples/snowpack/astro/pages/404.astro
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/concepts/build-pipeline.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/concepts/dev-server.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/concepts/hot-module-replacement.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/concepts/how-snowpack-works.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides.astro
rename to examples/snowpack/src/pages/guides.astro
diff --git a/examples/snowpack/astro/pages/guides/babel.md b/examples/snowpack/src/pages/guides/babel.md
similarity index 100%
rename from examples/snowpack/astro/pages/guides/babel.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/connecting-tools.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/hmr.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/https-ssl-certificates.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/jest.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/optimize-and-bundle.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/plugins.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/postcss.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/preact.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/react-global-imports.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/react-loadable-components.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/routing.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/sass.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/server-side-render.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/streaming-imports.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/tailwind-css.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/testing.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/upgrade-guide.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/vue.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/wasm.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/web-test-runner.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/web-worker.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/guides/workbox.md
rename to examples/snowpack/src/pages/guides/workbox.md
diff --git a/examples/snowpack/astro/pages/index.astro b/examples/snowpack/src/pages/index.astro
similarity index 100%
rename from examples/snowpack/astro/pages/index.astro
rename to examples/snowpack/src/pages/index.astro
diff --git a/examples/snowpack/astro/pages/news.astro b/examples/snowpack/src/pages/news.astro
similarity index 100%
rename from examples/snowpack/astro/pages/news.astro
rename to examples/snowpack/src/pages/news.astro
diff --git a/examples/snowpack/astro/pages/plugins.astro b/examples/snowpack/src/pages/plugins.astro
similarity index 100%
rename from examples/snowpack/astro/pages/plugins.astro
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/posts/2020-05-26-snowpack-2-0-release.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/posts/2020-07-30-snowpack-2-7-release.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/posts/2020-12-03-snowpack-3-release-candidate.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/posts/2021-01-13-snowpack-3-0.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/proof-of-concept-dynamic/[slug].astro.ignore
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/cli-command-line-interface.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/common-error-details.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/configuration.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/environment-variables.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/hot-module-replacement.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/javascript-interface.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/plugins.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/reference/supported-files.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/tutorials/getting-started.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/tutorials/quick-start.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/tutorials/react.md
rename to 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
similarity index 100%
rename from examples/snowpack/astro/pages/tutorials/svelte.md
rename to 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
similarity index 100%
rename from examples/tailwindcss/astro/components/Button.astro
rename to examples/tailwindcss/src/components/Button.astro
diff --git a/examples/tailwindcss/astro/pages/index.astro b/examples/tailwindcss/src/pages/index.astro
similarity index 100%
rename from examples/tailwindcss/astro/pages/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-basic/astro/layouts/base.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-basic/astro/pages/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-basic/astro/pages/nested-astro/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-basic/astro/pages/nested-md/index.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-basic/astro/pages/news.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-collection/astro/pages/$posts.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-collection/astro/pages/post/one.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-collection/astro/pages/post/three.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-collection/astro/pages/post/two.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-doctype/astro/pages/prepend.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-doctype/astro/pages/preserve.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-dynamic/astro/components/Counter.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-dynamic/astro/components/SvelteCounter.svelte
rename to 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
similarity index 100%
rename from test/fixtures/astro-dynamic/astro/pages/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-expr/astro/components/Color.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-expr/astro/pages/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-expr/astro/pages/line-comments.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-expr/astro/pages/multiline-comments.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-expr/astro/pages/multiple-children.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-expr/astro/pages/strings.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-fallback/astro/components/Client.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-fallback/astro/pages/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-markdown/astro/components/Counter.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-markdown/astro/components/Example.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-markdown/astro/components/Hello.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-markdown/astro/layouts/content.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-markdown/astro/pages/complex.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-markdown/astro/pages/post.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-request/astro/pages/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-rss/astro/pages/$episodes.astro
rename to 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
similarity index 100%
rename from test/fixtures/astro-rss/astro/pages/episode/fazers.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-rss/astro/pages/episode/rap-snitch-knishes.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-rss/astro/pages/episode/rhymes-like-dimes.md
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/ReactCSS.css
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/ReactCSS.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/ReactModules.jsx
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/ReactModules.module.css
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/SvelteScoped.svelte
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/VueCSS.vue
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/VueModules.vue
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/components/VueScoped.vue
rename to 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
similarity index 100%
rename from test/fixtures/astro-styles-ssr/astro/pages/index.astro
rename to 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
similarity index 100%
rename from test/fixtures/react-component/astro/components/Goodbye.vue
rename to 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
similarity index 100%
rename from test/fixtures/react-component/astro/components/Hello.jsx
rename to 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
similarity index 100%
rename from test/fixtures/react-component/astro/pages/index.astro
rename to 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
similarity index 100%
rename from www/astro/components/Article.astro
rename to www/src/components/Article.astro
diff --git a/www/astro/components/BaseHead.astro b/www/src/components/BaseHead.astro
similarity index 100%
rename from www/astro/components/BaseHead.astro
rename to www/src/components/BaseHead.astro
diff --git a/www/astro/components/Logo.astro b/www/src/components/Logo.astro
similarity index 100%
rename from www/astro/components/Logo.astro
rename to www/src/components/Logo.astro
diff --git a/www/astro/components/Main.astro b/www/src/components/Main.astro
similarity index 100%
rename from www/astro/components/Main.astro
rename to www/src/components/Main.astro
diff --git a/www/astro/components/Planets.astro b/www/src/components/Planets.astro
similarity index 100%
rename from www/astro/components/Planets.astro
rename to www/src/components/Planets.astro
diff --git a/www/astro/components/Space.astro b/www/src/components/Space.astro
similarity index 100%
rename from www/astro/components/Space.astro
rename to www/src/components/Space.astro
diff --git a/www/astro/components/Stars.astro b/www/src/components/Stars.astro
similarity index 100%
rename from www/astro/components/Stars.astro
rename to www/src/components/Stars.astro
diff --git a/www/astro/components/Tagline.astro b/www/src/components/Tagline.astro
similarity index 100%
rename from www/astro/components/Tagline.astro
rename to www/src/components/Tagline.astro
diff --git a/www/astro/pages/index.astro b/www/src/pages/index.astro
similarity index 100%
rename from www/astro/pages/index.astro
rename to www/src/pages/index.astro