diff --git a/README.md b/README.md
index 5009dd4..a0e5644 100644
--- a/README.md
+++ b/README.md
@@ -81,9 +81,9 @@ DEBUG=Eleventy* npx @11ty/eleventy
 
 ### Implementation Notes
 
-- `about/index.md` is an example of a content page.
-- `blog/` has the blog posts but really they can live in any directory. They need only the `post` tag to be included in the blog posts [collection](https://www.11ty.dev/docs/collections/).
-- Use the `eleventyNavigation` key (via the [Eleventy Navigation plugin](https://www.11ty.dev/docs/plugins/navigation/)) in your front matter to add a template to the top level site navigation. This is in use on `index.njk` and `about/index.md`.
+- `content/about/index.md` is an example of a content page.
+- `content/blog/` has the blog posts but really they can live in any directory. They need only the `post` tag to be included in the blog posts [collection](https://www.11ty.dev/docs/collections/).
+- Use the `eleventyNavigation` key (via the [Eleventy Navigation plugin](https://www.11ty.dev/docs/plugins/navigation/)) in your front matter to add a template to the top level site navigation. This is in use on `content/index.njk` and `content/about/index.md`.
 - Content can be in _any template format_ (blog posts needn’t exclusively be markdown, for example). Configure your project’s supported templates in `eleventy.config.js` -> `templateFormats`.
 - The `public` folder in your input directory will be copied to the output folder (via `addPassthroughCopy` in the `eleventy.config.js` file). This means `./public/css/*` will live at `./_site/css/*` after your build completes.
 - The blog post feed template is in `feed/feed.njk`. This feed also uses the global data file at `_data/metadata.json`.
diff --git a/404.md b/content/404.md
similarity index 100%
rename from 404.md
rename to content/404.md
diff --git a/about/index.md b/content/about/index.md
similarity index 100%
rename from about/index.md
rename to content/about/index.md
diff --git a/blog.njk b/content/blog.njk
similarity index 100%
rename from blog.njk
rename to content/blog.njk
diff --git a/blog/blog.json b/content/blog/blog.json
similarity index 100%
rename from blog/blog.json
rename to content/blog/blog.json
diff --git a/blog/firstpost.md b/content/blog/firstpost.md
similarity index 100%
rename from blog/firstpost.md
rename to content/blog/firstpost.md
diff --git a/blog/fourthpost/fourthpost.md b/content/blog/fourthpost/fourthpost.md
similarity index 100%
rename from blog/fourthpost/fourthpost.md
rename to content/blog/fourthpost/fourthpost.md
diff --git a/blog/fourthpost/possum.png b/content/blog/fourthpost/possum.png
similarity index 100%
rename from blog/fourthpost/possum.png
rename to content/blog/fourthpost/possum.png
diff --git a/blog/secondpost.md b/content/blog/secondpost.md
similarity index 100%
rename from blog/secondpost.md
rename to content/blog/secondpost.md
diff --git a/blog/thirdpost.md b/content/blog/thirdpost.md
similarity index 100%
rename from blog/thirdpost.md
rename to content/blog/thirdpost.md
diff --git a/feed/feed.11tydata.js b/content/feed/feed.11tydata.js
similarity index 100%
rename from feed/feed.11tydata.js
rename to content/feed/feed.11tydata.js
diff --git a/feed/feed.njk b/content/feed/feed.njk
similarity index 100%
rename from feed/feed.njk
rename to content/feed/feed.njk
diff --git a/feed/json.njk b/content/feed/json.njk
similarity index 100%
rename from feed/json.njk
rename to content/feed/json.njk
diff --git a/index.njk b/content/index.njk
similarity index 100%
rename from index.njk
rename to content/index.njk
diff --git a/sitemap/sitemap.xml.njk b/content/sitemap/sitemap.xml.njk
similarity index 100%
rename from sitemap/sitemap.xml.njk
rename to content/sitemap/sitemap.xml.njk
diff --git a/tags-list.njk b/content/tags-list.njk
similarity index 100%
rename from tags-list.njk
rename to content/tags-list.njk
diff --git a/tags.njk b/content/tags.njk
similarity index 100%
rename from tags.njk
rename to content/tags.njk
diff --git a/eleventy.config.js b/eleventy.config.js
index 0522f67..303da60 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -15,10 +15,6 @@ function relativeToInputPath(inputPath, relativeFilePath) {
 }
 
 module.exports = function(eleventyConfig) {
-	// Don’t process these files
-	// https://www.11ty.dev/docs/ignores/#configuration-api
-	eleventyConfig.ignores.add("README.md");
-
 	// Copy the contents of the `public` folder to the output folder
 	// For example, `./public/css/` ends up in `_site/css/`
 	eleventyConfig.addPassthroughCopy({
@@ -30,7 +26,8 @@ module.exports = function(eleventyConfig) {
 	// https://www.11ty.dev/docs/watch-serve/#add-your-own-watch-targets
 
 	// Process content images to the image pipeline.
-	eleventyConfig.addWatchTarget("**/*.(png|jpeg)");
+	eleventyConfig.addWatchTarget("content/**/*.{png,jpeg}");
+
 
 	// Plugins
 	eleventyConfig.addPlugin(pluginRss);
@@ -136,11 +133,11 @@ module.exports = function(eleventyConfig) {
 		// Pre-process *.html files with: (default: `liquid`)
 		htmlTemplateEngine: "njk",
 
-		// These are all optional (defaults are shown):
+		// These are all optional:
 		dir: {
-			input: ".",
-			includes: "_includes",
-			data: "_data",
+			input: "content",         // default: "."
+			includes: "../_includes",  // default: "_includes"
+			data: "../_data",          // default: "_data"
 			output: "_site"
 		},
 
diff --git a/package.json b/package.json
index 77228e8..35a45d0 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
 		"serve": "npx @11ty/eleventy --serve",
 		"start": "npx @11ty/eleventy --serve --quiet",
 		"debug": "DEBUG=Eleventy* npx @11ty/eleventy",
+		"debugstart": "DEBUG=Eleventy* npx @11ty/eleventy --serve --quiet",
 		"benchmark": "DEBUG=Eleventy:Benchmark* npx @11ty/eleventy"
 	},
 	"repository": {