diff --git a/classes/index.rst b/classes/_classes.rst
similarity index 100%
rename from classes/index.rst
rename to classes/_classes.rst
diff --git a/conf.py b/conf.py
index df2058432..4122e9690 100644
--- a/conf.py
+++ b/conf.py
@@ -10,7 +10,7 @@ import os
 needs_sphinx = '1.3'
 
 # Sphinx extension module names and templates location
-extensions = []
+extensions = ['sphinx.ext.intersphinx']
 templates_path = ['_templates']
 
 # You can specify multiple suffix as a list of string: ['.rst', '.md']
@@ -39,6 +39,11 @@ exclude_patterns = ['_build']
 pygments_style = 'sphinx'
 highlight_language = 'python3'
 
+# intersphinx configuration
+intersphinx_mapping = {
+  'english': ('http://docs.godotengine.org/en/latest/', None),
+}
+
 # -- Options for HTML output ----------------------------------------------
 
 # on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
diff --git a/contributing/index.rst b/contributing/_contributing.rst
similarity index 100%
rename from contributing/index.rst
rename to contributing/_contributing.rst
diff --git a/index.rst b/index.rst
index 5bb504616..451b81ab1 100644
--- a/index.rst
+++ b/index.rst
@@ -17,21 +17,21 @@ The main documentation for the site is organized into a few sections:
    :caption: Tutorials
    :name: sec-tutorials
 
-   tutorials/step_by_step/index
-   tutorials/engine/index
-   tutorials/2d/index
-   tutorials/3d/index
+   tutorials/step_by_step/_step_by_step
+   tutorials/engine/_engine
+   tutorials/2d/_2d
+   tutorials/3d/_3d
    tutorials/_networking
    tutorials/_plugins
-   tutorials/_misc
-   tutorials/asset_pipeline/index
+   tutorials/_misc_tutorials
+   tutorials/asset_pipeline/_asset_pipeline
 
 .. toctree::
    :maxdepth: 1
    :caption: Reference
    :name: sec-reference
 
-   classes/index
+   classes/_classes
    reference/_languages
    reference/_cheat_sheets
    reference/_compiling
@@ -42,7 +42,7 @@ The main documentation for the site is organized into a few sections:
    :caption: Community
    :name: sec-community
 
-   contributing/index
+   contributing/_contributing
 
 .. Indices and tables
 .. ------------------
diff --git a/reference/_advanced.rst b/reference/_advanced.rst
index 03756af87..bfb38c182 100644
--- a/reference/_advanced.rst
+++ b/reference/_advanced.rst
@@ -7,4 +7,4 @@ Advanced
 
    _developing
    _formats
-   _misc
+   _misc_ref
diff --git a/reference/_misc.rst b/reference/_misc_ref.rst
similarity index 79%
rename from reference/_misc.rst
rename to reference/_misc_ref.rst
index 0dc5cbe27..dc1567046 100644
--- a/reference/_misc.rst
+++ b/reference/_misc_ref.rst
@@ -3,7 +3,7 @@ Misc
 
 .. toctree::
    :maxdepth: 1
-   :name: toc-advanced-misc
+   :name: toc-misc-ref
 
    command_line_tutorial
    changing_editor_fonts
diff --git a/tutorials/2d/index.rst b/tutorials/2d/_2d.rst
similarity index 66%
rename from tutorials/2d/index.rst
rename to tutorials/2d/_2d.rst
index c76f711e9..3ad3a25cb 100644
--- a/tutorials/2d/index.rst
+++ b/tutorials/2d/_2d.rst
@@ -5,6 +5,6 @@
    :maxdepth: 2
    :name: toc-2d-tutorials
 
-   _graphics
-   _gui
-   _physics
+   _2d_graphics
+   _2d_gui
+   _2d_physics
diff --git a/tutorials/2d/_graphics.rst b/tutorials/2d/_2d_graphics.rst
similarity index 100%
rename from tutorials/2d/_graphics.rst
rename to tutorials/2d/_2d_graphics.rst
diff --git a/tutorials/2d/_gui.rst b/tutorials/2d/_2d_gui.rst
similarity index 100%
rename from tutorials/2d/_gui.rst
rename to tutorials/2d/_2d_gui.rst
diff --git a/tutorials/2d/_physics.rst b/tutorials/2d/_2d_physics.rst
similarity index 100%
rename from tutorials/2d/_physics.rst
rename to tutorials/2d/_2d_physics.rst
diff --git a/tutorials/3d/index.rst b/tutorials/3d/_3d.rst
similarity index 65%
rename from tutorials/3d/index.rst
rename to tutorials/3d/_3d.rst
index f3c9b8df3..de9eb0658 100644
--- a/tutorials/3d/index.rst
+++ b/tutorials/3d/_3d.rst
@@ -5,6 +5,6 @@
    :maxdepth: 2
    :name: toc-3d-tutorials
 
-   _graphics
-   _physics
-   _import
+   _3d_graphics
+   _3d_physics
+   _3d_import
diff --git a/tutorials/3d/_graphics.rst b/tutorials/3d/_3d_graphics.rst
similarity index 100%
rename from tutorials/3d/_graphics.rst
rename to tutorials/3d/_3d_graphics.rst
diff --git a/tutorials/3d/_import.rst b/tutorials/3d/_3d_import.rst
similarity index 100%
rename from tutorials/3d/_import.rst
rename to tutorials/3d/_3d_import.rst
diff --git a/tutorials/3d/_physics.rst b/tutorials/3d/_3d_physics.rst
similarity index 100%
rename from tutorials/3d/_physics.rst
rename to tutorials/3d/_3d_physics.rst
diff --git a/tutorials/_misc.rst b/tutorials/_misc_tutorials.rst
similarity index 100%
rename from tutorials/_misc.rst
rename to tutorials/_misc_tutorials.rst
diff --git a/tutorials/asset_pipeline/index.rst b/tutorials/asset_pipeline/_asset_pipeline.rst
similarity index 100%
rename from tutorials/asset_pipeline/index.rst
rename to tutorials/asset_pipeline/_asset_pipeline.rst
diff --git a/tutorials/engine/index.rst b/tutorials/engine/_engine.rst
similarity index 100%
rename from tutorials/engine/index.rst
rename to tutorials/engine/_engine.rst
diff --git a/tutorials/step_by_step/index.rst b/tutorials/step_by_step/_step_by_step.rst
similarity index 100%
rename from tutorials/step_by_step/index.rst
rename to tutorials/step_by_step/_step_by_step.rst