diff --git a/ADDON_HOOKS.md b/ADDON_HOOKS.md
deleted file mode 100644
index aa024860d0..0000000000
--- a/ADDON_HOOKS.md
+++ /dev/null
@@ -1 +0,0 @@
-see <https://ember-cli.com/api/classes/Addon.html>
diff --git a/Analytics.md b/docs/analytics.md
similarity index 100%
rename from Analytics.md
rename to docs/analytics.md
diff --git a/ARCHITECTURE.md b/docs/architecture.md
similarity index 100%
rename from ARCHITECTURE.md
rename to docs/architecture.md
diff --git a/assets/architecture/Ember-CLI architecture.png b/docs/assets/architecture/Ember-CLI architecture.png
similarity index 100%
rename from assets/architecture/Ember-CLI architecture.png
rename to docs/assets/architecture/Ember-CLI architecture.png
diff --git a/assets/architecture/Ember-CLI architecture.xml b/docs/assets/architecture/Ember-CLI architecture.xml
similarity index 100%
rename from assets/architecture/Ember-CLI architecture.xml
rename to docs/assets/architecture/Ember-CLI architecture.xml
diff --git a/assets/architecture/README.md b/docs/assets/architecture/README.md
similarity index 73%
rename from assets/architecture/README.md
rename to docs/assets/architecture/README.md
index 8086b6a2b4..fcdaf56468 100644
--- a/assets/architecture/README.md
+++ b/docs/assets/architecture/README.md
@@ -2,4 +2,4 @@
 1. Open xml file in https://www.draw.io
 2. Make necessary changes
 3. Commit the updated diagram in xml and png format.
-4. Point the ARCHITECTURE.md file to the updated diagram
+4. Point the architecture.md file to the updated diagram
diff --git a/TRANSITION.md b/docs/brocfile-transition.md
similarity index 100%
rename from TRANSITION.md
rename to docs/brocfile-transition.md
diff --git a/docs/BUILD_PIPELINE_DEBUGGING.md b/docs/build-pipeline-debugging.md
similarity index 80%
rename from docs/BUILD_PIPELINE_DEBUGGING.md
rename to docs/build-pipeline-debugging.md
index 93a2ba3adb..a818975c34 100644
--- a/docs/BUILD_PIPELINE_DEBUGGING.md
+++ b/docs/build-pipeline-debugging.md
@@ -29,5 +29,5 @@ DEBUG/
 
 Ember CLI uses [`broccoli-debug`](https://github.com/broccolijs/broccoli-debug/) to generate debug output mentioned above.
 
-More tips can be found in our [PERF_GUIDE](https://github.com/ember-cli/ember-cli/blob/master/PERF_GUIDE.md)
-under [DEBUG logging section](https://github.com/ember-cli/ember-cli/blob/master/PERF_GUIDE.md#debug-logging).
+More tips can be found in our [PERF_GUIDE](./perf-guide.md)
+under [DEBUG logging section](./perf-guide.md#debug-logging).
diff --git a/docs/CODE_COVERAGE.md b/docs/code-coverage.md
similarity index 100%
rename from docs/CODE_COVERAGE.md
rename to docs/code-coverage.md
diff --git a/docs/ERRORS.md b/docs/error-propagation.md
similarity index 100%
rename from docs/ERRORS.md
rename to docs/error-propagation.md
diff --git a/PERF_GUIDE.md b/docs/perf-guide.md
similarity index 99%
rename from PERF_GUIDE.md
rename to docs/perf-guide.md
index e00224bd19..8145b0356b 100644
--- a/PERF_GUIDE.md
+++ b/docs/perf-guide.md
@@ -214,7 +214,7 @@ DEBUG_DEPTH=5 DEBUG_LEVEL=debug DEBUG=broccoli-merge-trees: ember build
 `[... ConcatWithMaps#782 -> BroccoliMergeTrees#783]` means that the log entry
 occurred in broccoli merge-trees node with id 783, whose parent was a concat
 with maps node with id 782.  These ids are shown in the visualization graph.
-See [Visualization](#Visualization) for details.
+See [Visualization](#visualization) for details.
 
 ... more on what to look for ...
 
diff --git a/SOURCEMAPS.md b/docs/sourcemaps.md
similarity index 100%
rename from SOURCEMAPS.md
rename to docs/sourcemaps.md
diff --git a/tests/unit/tasks/serve-test.js b/tests/unit/tasks/serve-test.js
index a61bb8e049..78b3a4db15 100644
--- a/tests/unit/tasks/serve-test.js
+++ b/tests/unit/tasks/serve-test.js
@@ -70,7 +70,7 @@ describe('serve task', function() {
     });
 
     it(`Serves ember app from given path`, function() {
-      runServeTask('assets');
+      runServeTask('docs');
       return RSVP.resolve().then(() => {
         expect(ui.output).to.be.contains('– Serving on');
       });