diff --git a/doc/more.png b/doc/_static/more.png
similarity index 100%
rename from doc/more.png
rename to doc/_static/more.png
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
index f1e1d60eb..032636d94 100644
--- a/doc/_templates/index.html
+++ b/doc/_templates/index.html
@@ -49,7 +49,7 @@
   <table class="contentstable">
     <tr>
       <td>
-        <p class="biglink"><a class="biglink" href="{{ pathto("tutorial") }}">{%trans%}First steps with Sphinx{%endtrans%}</a><br/>
+        <p class="biglink"><a class="biglink" href="{{ pathto("usage/quickstart") }}">{%trans%}First steps with Sphinx{%endtrans%}</a><br/>
            <span class="linkdescr">{%trans%}overview of basic tasks{%endtrans%}</span></p>
       </td><td>
         {%- if hasdoc('search') %}<p class="biglink"><a class="biglink" href="{{ pathto("search") }}">{%trans%}Search page{%endtrans%}</a><br/>
diff --git a/doc/contents.rst b/doc/contents.rst
index 772145f26..886861fba 100644
--- a/doc/contents.rst
+++ b/doc/contents.rst
@@ -8,9 +8,9 @@ Sphinx documentation contents
    :maxdepth: 2
 
    usage/installation
+   usage/quickstart
 
    intro
-   tutorial
    man/index
    rest
    markup/index
@@ -35,6 +35,7 @@ Sphinx documentation contents
    authors
 
 
+
 Indices and tables
 ==================
 
diff --git a/doc/ext/napoleon.rst b/doc/ext/napoleon.rst
index 870c2454d..6c5f0d61a 100644
--- a/doc/ext/napoleon.rst
+++ b/doc/ext/napoleon.rst
@@ -63,8 +63,8 @@ source code files.
 Getting Started
 ---------------
 
-1. After :doc:`setting up Sphinx <../tutorial>` to build your docs, enable
-   napoleon in the Sphinx `conf.py` file::
+1. After :doc:`setting up Sphinx </usage/quickstart>` to build your docs,
+   enable napoleon in the Sphinx `conf.py` file::
 
        # conf.py
 
diff --git a/doc/intro.rst b/doc/intro.rst
index b258c7097..e2a23f95a 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -69,5 +69,5 @@ highlighting support, you must also install the Pygments_ library.
 Usage
 -----
 
-See :doc:`tutorial` for an introduction.  It also contains links to more
-advanced sections in this manual for the topics it discusses.
+See :doc:`/usage/quickstart` for an introduction.  It also contains links to
+more advanced sections in this manual for the topics it discusses.
diff --git a/doc/tutorial.rst b/doc/usage/quickstart.rst
similarity index 98%
rename from doc/tutorial.rst
rename to doc/usage/quickstart.rst
index e97063c90..650410333 100644
--- a/doc/tutorial.rst
+++ b/doc/usage/quickstart.rst
@@ -318,15 +318,15 @@ features of intersphinx.
 More topics to be covered
 -------------------------
 
-- :doc:`Other extensions <extensions>`:
+- :doc:`Other extensions </extensions>`:
 
-  * :doc:`ext/math`,
-  * :doc:`ext/viewcode`,
-  * :doc:`ext/doctest`,
+  * :doc:`/ext/math`,
+  * :doc:`/ext/viewcode`,
+  * :doc:`/ext/doctest`,
   * ...
 - Static files
-- :doc:`Selecting a theme <theming>`
-- :doc:`setuptools`
+- :doc:`Selecting a theme </theming>`
+- :doc:`/setuptools`
 - :ref:`Templating <templating>`
 - Using extensions
 - :ref:`Writing extensions <dev-extensions>`
@@ -338,6 +338,6 @@ More topics to be covered
        another directory, the :term:`configuration directory`.  Refer to the
        :program:`sphinx-build man page <sphinx-build>` for more information.
 
-.. |more| image:: more.png
+.. |more| image:: /_static/more.png
           :align: middle
           :alt: more info