diff --git a/akka-docs/Makefile b/akka-docs/Makefile
index 7b803258cb..49f649367f 100644
--- a/akka-docs/Makefile
+++ b/akka-docs/Makefile
@@ -8,7 +8,7 @@ PAPER         =
 BUILDDIR      = _build
 EASYINSTALL   = easy_install
 LOCALPACKAGES = $(shell pwd)/$(BUILDDIR)/site-packages
-PYGMENTSDIR   = pygments
+PYGMENTSDIR   = _sphinx/pygments
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
diff --git a/akka-docs/exts/includecode.py b/akka-docs/_sphinx/exts/includecode.py
similarity index 100%
rename from akka-docs/exts/includecode.py
rename to akka-docs/_sphinx/exts/includecode.py
diff --git a/akka-docs/pygments/setup.py b/akka-docs/_sphinx/pygments/setup.py
similarity index 100%
rename from akka-docs/pygments/setup.py
rename to akka-docs/_sphinx/pygments/setup.py
diff --git a/akka-docs/pygments/styles/__init__.py b/akka-docs/_sphinx/pygments/styles/__init__.py
similarity index 100%
rename from akka-docs/pygments/styles/__init__.py
rename to akka-docs/_sphinx/pygments/styles/__init__.py
diff --git a/akka-docs/pygments/styles/simple.py b/akka-docs/_sphinx/pygments/styles/simple.py
similarity index 100%
rename from akka-docs/pygments/styles/simple.py
rename to akka-docs/_sphinx/pygments/styles/simple.py
diff --git a/akka-docs/_static/akka.png b/akka-docs/_sphinx/static/akka.png
similarity index 100%
rename from akka-docs/_static/akka.png
rename to akka-docs/_sphinx/static/akka.png
diff --git a/akka-docs/_static/logo.png b/akka-docs/_sphinx/static/logo.png
similarity index 100%
rename from akka-docs/_static/logo.png
rename to akka-docs/_sphinx/static/logo.png
diff --git a/akka-docs/themes/akka/layout.html b/akka-docs/_sphinx/themes/akka/layout.html
similarity index 100%
rename from akka-docs/themes/akka/layout.html
rename to akka-docs/_sphinx/themes/akka/layout.html
diff --git a/akka-docs/themes/akka/static/akka.css_t b/akka-docs/_sphinx/themes/akka/static/akka.css_t
similarity index 100%
rename from akka-docs/themes/akka/static/akka.css_t
rename to akka-docs/_sphinx/themes/akka/static/akka.css_t
diff --git a/akka-docs/themes/akka/static/alert_info_32.png b/akka-docs/_sphinx/themes/akka/static/alert_info_32.png
similarity index 100%
rename from akka-docs/themes/akka/static/alert_info_32.png
rename to akka-docs/_sphinx/themes/akka/static/alert_info_32.png
diff --git a/akka-docs/themes/akka/static/alert_warning_32.png b/akka-docs/_sphinx/themes/akka/static/alert_warning_32.png
similarity index 100%
rename from akka-docs/themes/akka/static/alert_warning_32.png
rename to akka-docs/_sphinx/themes/akka/static/alert_warning_32.png
diff --git a/akka-docs/themes/akka/static/bg-page.png b/akka-docs/_sphinx/themes/akka/static/bg-page.png
similarity index 100%
rename from akka-docs/themes/akka/static/bg-page.png
rename to akka-docs/_sphinx/themes/akka/static/bg-page.png
diff --git a/akka-docs/themes/akka/static/bullet_orange.png b/akka-docs/_sphinx/themes/akka/static/bullet_orange.png
similarity index 100%
rename from akka-docs/themes/akka/static/bullet_orange.png
rename to akka-docs/_sphinx/themes/akka/static/bullet_orange.png
diff --git a/akka-docs/themes/akka/theme.conf b/akka-docs/_sphinx/themes/akka/theme.conf
similarity index 100%
rename from akka-docs/themes/akka/theme.conf
rename to akka-docs/_sphinx/themes/akka/theme.conf
diff --git a/akka-docs/conf.py b/akka-docs/conf.py
index f0dd997167..209f747afc 100644
--- a/akka-docs/conf.py
+++ b/akka-docs/conf.py
@@ -7,7 +7,7 @@ import sys, os
 
 # -- General configuration -----------------------------------------------------
 
-sys.path.append(os.path.abspath('exts'))
+sys.path.append(os.path.abspath('_sphinx/exts'))
 extensions = ['sphinx.ext.todo', 'includecode']
 
 templates_path = ['_templates']
@@ -31,13 +31,13 @@ html_theme = 'akka'
 html_theme_options = {
     'full_logo': 'true'
     }
-html_theme_path = ['themes']
+html_theme_path = ['_sphinx/themes']
 
 html_title = 'Akka Documentation'
-html_logo = '_static/logo.png'
+html_logo = '_sphinx/static/logo.png'
 #html_favicon = None
 
-html_static_path = ['_static']
+html_static_path = ['_sphinx/static']
 
 html_last_updated_fmt = '%b %d, %Y'
 #html_sidebars = {}
@@ -65,4 +65,4 @@ latex_elements = {
     'preamble': '\\definecolor{VerbatimColor}{rgb}{0.935,0.935,0.935}'
     }
 
-# latex_logo = '_static/akka.png'
+# latex_logo = '_sphinx/static/akka.png'
diff --git a/akka-docs/index.rst b/akka-docs/index.rst
index 7a4301de34..9a57f097e2 100644
--- a/akka-docs/index.rst
+++ b/akka-docs/index.rst
@@ -4,78 +4,9 @@ Contents
 .. toctree::
    :maxdepth: 2
 
-   manual/why-akka
-   manual/getting-started-first-scala
-   manual/getting-started-first-java
-   manual/building-akka
-   manual/configuration
-   manual/fsm-scala
+   intro/index
+   scala/index
 
-.. pending/actor-registry-java
-.. pending/actor-registry-scala
-.. pending/actors-scala
-.. pending/agents-scala
-.. pending/articles
-.. pending/benchmarks
-.. pending/buildr
-.. pending/cluster-membership
-.. pending/companies-using-akka
-.. pending/dataflow-java
-.. pending/dataflow-scala
-.. pending/deployment-scenarios
-.. pending/developer-guidelines
-.. pending/dispatchers-java
-.. pending/dispatchers-scala
-.. pending/event-handler
-.. pending/external-sample-projects
-.. pending/fault-tolerance-java
-.. pending/fault-tolerance-scala
-.. pending/Feature Stability Matrix
-.. pending/futures-scala
-.. pending/getting-started
-.. pending/guice-integration
-.. pending/Home
-.. pending/http
-.. pending/issue-tracking
-.. pending/language-bindings
-.. pending/licenses
-.. pending/logging
-.. pending/Migration-1.0-1.1
-.. pending/migration-guide-0.10.x-1.0.x
-.. pending/migration-guide-0.7.x-0.8.x
-.. pending/migration-guide-0.8.x-0.9.x
-.. pending/migration-guide-0.9.x-0.10.x
-.. pending/migration-guides
-.. pending/Recipes
-.. pending/release-notes
-.. pending/remote-actors-java
-.. pending/remote-actors-scala
-.. pending/routing-java
-.. pending/routing-scala
-.. pending/scheduler
-.. pending/security
-.. pending/serialization-java
-.. pending/serialization-scala
-.. pending/servlet
-.. pending/slf4j
-.. pending/sponsors
-.. pending/stm
-.. pending/stm-java
-.. pending/stm-scala
-.. pending/team
-.. pending/test
-.. pending/testkit
-.. pending/testkit-example
-.. pending/third-party-integrations
-.. pending/transactors-java
-.. pending/transactors-scala
-.. pending/tutorial-chat-server-java
-.. pending/tutorial-chat-server-scala
-.. pending/typed-actors-java
-.. pending/typed-actors-scala
-.. pending/untyped-actors-java
-.. pending/use-cases
-.. pending/web
 
 Links
 =====
diff --git a/akka-docs/manual/building-akka.rst b/akka-docs/intro/building-akka.rst
similarity index 100%
rename from akka-docs/manual/building-akka.rst
rename to akka-docs/intro/building-akka.rst
diff --git a/akka-docs/manual/configuration.rst b/akka-docs/intro/configuration.rst
similarity index 100%
rename from akka-docs/manual/configuration.rst
rename to akka-docs/intro/configuration.rst
diff --git a/akka-docs/manual/examples/Pi.scala b/akka-docs/intro/examples/Pi.scala
similarity index 100%
rename from akka-docs/manual/examples/Pi.scala
rename to akka-docs/intro/examples/Pi.scala
diff --git a/akka-docs/manual/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst
similarity index 100%
rename from akka-docs/manual/getting-started-first-java.rst
rename to akka-docs/intro/getting-started-first-java.rst
diff --git a/akka-docs/manual/getting-started-first-scala.rst b/akka-docs/intro/getting-started-first-scala.rst
similarity index 100%
rename from akka-docs/manual/getting-started-first-scala.rst
rename to akka-docs/intro/getting-started-first-scala.rst
diff --git a/akka-docs/manual/getting-started-first.rst b/akka-docs/intro/getting-started-first.rst
similarity index 100%
rename from akka-docs/manual/getting-started-first.rst
rename to akka-docs/intro/getting-started-first.rst
diff --git a/akka-docs/intro/index.rst b/akka-docs/intro/index.rst
new file mode 100644
index 0000000000..70f6caf3ce
--- /dev/null
+++ b/akka-docs/intro/index.rst
@@ -0,0 +1,11 @@
+Introduction
+============
+
+.. toctree::
+   :maxdepth: 2
+
+   why-akka
+   getting-started-first-scala
+   getting-started-first-java
+   building-akka
+   configuration
diff --git a/akka-docs/manual/pi-formula.png b/akka-docs/intro/pi-formula.png
similarity index 100%
rename from akka-docs/manual/pi-formula.png
rename to akka-docs/intro/pi-formula.png
diff --git a/akka-docs/manual/why-akka.rst b/akka-docs/intro/why-akka.rst
similarity index 100%
rename from akka-docs/manual/why-akka.rst
rename to akka-docs/intro/why-akka.rst
diff --git a/akka-docs/manual/more.png b/akka-docs/manual/more.png
deleted file mode 100644
index 3eb7b05c84..0000000000
Binary files a/akka-docs/manual/more.png and /dev/null differ
diff --git a/akka-docs/pending/actors-scala.rst b/akka-docs/scala/actors.rst
similarity index 99%
rename from akka-docs/pending/actors-scala.rst
rename to akka-docs/scala/actors.rst
index fc456ba71e..70f9e0cfcc 100644
--- a/akka-docs/pending/actors-scala.rst
+++ b/akka-docs/scala/actors.rst
@@ -1,5 +1,5 @@
-Actors (Scala)
-==============
+Actors
+======
 
 Module stability: **SOLID**
 
diff --git a/akka-docs/manual/fsm-scala.rst b/akka-docs/scala/fsm.rst
similarity index 100%
rename from akka-docs/manual/fsm-scala.rst
rename to akka-docs/scala/fsm.rst
diff --git a/akka-docs/scala/index.rst b/akka-docs/scala/index.rst
new file mode 100644
index 0000000000..645efccf41
--- /dev/null
+++ b/akka-docs/scala/index.rst
@@ -0,0 +1,8 @@
+Scala API
+=========
+
+.. toctree::
+   :maxdepth: 2
+
+   actors
+   fsm