diff --git a/docs/requirements.txt b/doc/requirements.txt
similarity index 100%
rename from docs/requirements.txt
rename to doc/requirements.txt
diff --git a/docs/source/artifacts.rst b/doc/source/artifacts.rst
similarity index 100%
rename from docs/source/artifacts.rst
rename to doc/source/artifacts.rst
diff --git a/docs/source/authoring_strategy.rst b/doc/source/authoring_strategy.rst
similarity index 100%
rename from docs/source/authoring_strategy.rst
rename to doc/source/authoring_strategy.rst
diff --git a/docs/source/cli.rst b/doc/source/cli.rst
similarity index 100%
rename from docs/source/cli.rst
rename to doc/source/cli.rst
diff --git a/docs/source/conf.py b/doc/source/conf.py
similarity index 100%
rename from docs/source/conf.py
rename to doc/source/conf.py
diff --git a/docs/source/getting_started.rst b/doc/source/getting_started.rst
similarity index 100%
rename from docs/source/getting_started.rst
rename to doc/source/getting_started.rst
diff --git a/docs/source/index.rst b/doc/source/index.rst
similarity index 100%
rename from docs/source/index.rst
rename to doc/source/index.rst
diff --git a/tools/gate/playbooks/zuul-linter.yaml b/tools/gate/playbooks/zuul-linter.yaml
index 05ee4a63..dd379553 100644
--- a/tools/gate/playbooks/zuul-linter.yaml
+++ b/tools/gate/playbooks/zuul-linter.yaml
@@ -15,6 +15,6 @@
 - hosts: primary
   tasks:
     - name: Execute a Whitespace Linter check
-      command: find . -not -path "*/\.*" -not -path "*/docs/build/*" -not -name "*.tgz"  -type f -exec egrep -l " +$" {} \;
+      command: find . -not -path "*/\.*" -not -path "*/doc/build/*" -not -name "*.tgz"  -type f -exec egrep -l " +$" {} \;
       register: result
       failed_when: result.stdout != ""
diff --git a/tox.ini b/tox.ini
index 92cf14a3..f3bfeeea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,8 +26,8 @@ commands =
 whitelist_externals = tox
 
 [testenv:docs]
-deps = -r{toxinidir}/docs/requirements.txt
+deps = -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf doc/build
-    sphinx-build -b html docs/source docs/build -n -W -v
+    sphinx-build -b html doc/source doc/build -n -W -v
 whitelist_externals = rm