diff --git a/scrapy/trunk/docs/index.rst b/scrapy/trunk/docs/index.rst
index 403c0b4d5..2884cec85 100644
--- a/scrapy/trunk/docs/index.rst
+++ b/scrapy/trunk/docs/index.rst
@@ -11,6 +11,5 @@ Contents:
    :maxdepth: 2
 
    intro/index
-   tutorial/index
    topics/index
    ref/index
diff --git a/scrapy/trunk/docs/intro/index.rst b/scrapy/trunk/docs/intro/index.rst
index 0147b06c1..478660709 100644
--- a/scrapy/trunk/docs/intro/index.rst
+++ b/scrapy/trunk/docs/intro/index.rst
@@ -4,7 +4,6 @@ Introduction
 .. toctree::
    :maxdepth: 1
 
-   overview/overview
-   overview/spiders
-   overview/selectors
+   overview
    install
+   tutorial/index
diff --git a/scrapy/trunk/docs/intro/install.rst b/scrapy/trunk/docs/intro/install.rst
index 219b6332f..52a7e630e 100644
--- a/scrapy/trunk/docs/intro/install.rst
+++ b/scrapy/trunk/docs/intro/install.rst
@@ -1,8 +1,8 @@
 .. _install:
 
-=====================
-How to install Scrapy
-=====================
+============
+Installation
+============
 
 Requirements
 ============
diff --git a/scrapy/trunk/docs/intro/overview/overview.rst b/scrapy/trunk/docs/intro/overview.rst
similarity index 100%
rename from scrapy/trunk/docs/intro/overview/overview.rst
rename to scrapy/trunk/docs/intro/overview.rst
diff --git a/scrapy/trunk/docs/tutorial/index.rst b/scrapy/trunk/docs/intro/tutorial/index.rst
similarity index 100%
rename from scrapy/trunk/docs/tutorial/index.rst
rename to scrapy/trunk/docs/intro/tutorial/index.rst
diff --git a/scrapy/trunk/docs/tutorial/scrot1.png b/scrapy/trunk/docs/intro/tutorial/scrot1.png
similarity index 100%
rename from scrapy/trunk/docs/tutorial/scrot1.png
rename to scrapy/trunk/docs/intro/tutorial/scrot1.png
diff --git a/scrapy/trunk/docs/tutorial/scrot2.png b/scrapy/trunk/docs/intro/tutorial/scrot2.png
similarity index 100%
rename from scrapy/trunk/docs/tutorial/scrot2.png
rename to scrapy/trunk/docs/intro/tutorial/scrot2.png
diff --git a/scrapy/trunk/docs/tutorial/scrot3.png b/scrapy/trunk/docs/intro/tutorial/scrot3.png
similarity index 100%
rename from scrapy/trunk/docs/tutorial/scrot3.png
rename to scrapy/trunk/docs/intro/tutorial/scrot3.png
diff --git a/scrapy/trunk/docs/tutorial/tutorial1.rst b/scrapy/trunk/docs/intro/tutorial/tutorial1.rst
similarity index 100%
rename from scrapy/trunk/docs/tutorial/tutorial1.rst
rename to scrapy/trunk/docs/intro/tutorial/tutorial1.rst
diff --git a/scrapy/trunk/docs/tutorial/tutorial2.rst b/scrapy/trunk/docs/intro/tutorial/tutorial2.rst
similarity index 100%
rename from scrapy/trunk/docs/tutorial/tutorial2.rst
rename to scrapy/trunk/docs/intro/tutorial/tutorial2.rst
diff --git a/scrapy/trunk/docs/tutorial/tutorial3.rst b/scrapy/trunk/docs/intro/tutorial/tutorial3.rst
similarity index 100%
rename from scrapy/trunk/docs/tutorial/tutorial3.rst
rename to scrapy/trunk/docs/intro/tutorial/tutorial3.rst
diff --git a/scrapy/trunk/docs/tutorial/tutorial4.rst b/scrapy/trunk/docs/intro/tutorial/tutorial4.rst
similarity index 100%
rename from scrapy/trunk/docs/tutorial/tutorial4.rst
rename to scrapy/trunk/docs/intro/tutorial/tutorial4.rst
diff --git a/scrapy/trunk/docs/topics/index.rst b/scrapy/trunk/docs/topics/index.rst
index 2c384fbf0..2dff156cd 100644
--- a/scrapy/trunk/docs/topics/index.rst
+++ b/scrapy/trunk/docs/topics/index.rst
@@ -3,4 +3,6 @@ Topics
 
 .. toctree::
 
+   selectors
    settings
+   spiders
diff --git a/scrapy/trunk/docs/intro/overview/selectors.rst b/scrapy/trunk/docs/topics/selectors.rst
similarity index 100%
rename from scrapy/trunk/docs/intro/overview/selectors.rst
rename to scrapy/trunk/docs/topics/selectors.rst
diff --git a/scrapy/trunk/docs/topics/settings.rst b/scrapy/trunk/docs/topics/settings.rst
index bea0bef73..04f9f9d52 100644
--- a/scrapy/trunk/docs/topics/settings.rst
+++ b/scrapy/trunk/docs/topics/settings.rst
@@ -1,6 +1,6 @@
-===============
-Scrapy settings
-===============
+========
+Settings
+========
 
 The Scrapy settings allows you to customize the behaviour of all Scrapy
 components, including the core, extensions, pipelines and spiders themselves.
diff --git a/scrapy/trunk/docs/intro/overview/spiders.rst b/scrapy/trunk/docs/topics/spiders.rst
similarity index 100%
rename from scrapy/trunk/docs/intro/overview/spiders.rst
rename to scrapy/trunk/docs/topics/spiders.rst