diff --git a/doc/Makefile b/doc/Makefile
index 4d9874a..f507382 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,14 +5,14 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = build
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 # the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
 
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
deleted file mode 100644
index aa59819..0000000
--- a/doc/_templates/layout.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "!layout.html" %}
-{%- set rellinks = [] %}
-{% block rootrellink %}</pre>
-<ul>
-    <li><a href="index.html">Home</a> |</li>
-    <li><a href="install.html">Install</a> |</li>
-    <li><a href="docs.html">Documentation</a> |</li>
-    <li><a href="about.html">About</a> |</li>
-    <li>{% endblock %}
-{% block relbar2 %}
-{% endblock %}
diff --git a/doc/make.bat b/doc/make.bat
index 9803814..c1a44bd 100644
--- a/doc/make.bat
+++ b/doc/make.bat
@@ -5,9 +5,9 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+set I18NSPHINXOPTS=%SPHINXOPTS% source
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
 	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
diff --git a/doc/_static/boros_with_holes.png b/doc/source/_static/boros_with_holes.png
similarity index 100%
rename from doc/_static/boros_with_holes.png
rename to doc/source/_static/boros_with_holes.png
diff --git a/doc/_static/holes.png b/doc/source/_static/holes.png
similarity index 100%
rename from doc/_static/holes.png
rename to doc/source/_static/holes.png
diff --git a/doc/_static/nyc.png b/doc/source/_static/nyc.png
similarity index 100%
rename from doc/_static/nyc.png
rename to doc/source/_static/nyc.png
diff --git a/doc/_static/nyc_hull.png b/doc/source/_static/nyc_hull.png
similarity index 100%
rename from doc/_static/nyc_hull.png
rename to doc/source/_static/nyc_hull.png
diff --git a/doc/_static/test.png b/doc/source/_static/test.png
similarity index 100%
rename from doc/_static/test.png
rename to doc/source/_static/test.png
diff --git a/doc/_static/test_buffer.png b/doc/source/_static/test_buffer.png
similarity index 100%
rename from doc/_static/test_buffer.png
rename to doc/source/_static/test_buffer.png
diff --git a/doc/about.rst b/doc/source/about.rst
similarity index 100%
rename from doc/about.rst
rename to doc/source/about.rst
diff --git a/doc/conf.py b/doc/source/conf.py
similarity index 96%
rename from doc/conf.py
rename to doc/source/conf.py
index e99b3e3..a707c73 100644
--- a/doc/conf.py
+++ b/doc/source/conf.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # GeoPandas documentation build configuration file, created by
-# sphinx-quickstart on Sun Jun 30 15:18:48 2013.
+# sphinx-quickstart on Tue Oct 15 08:08:14 2013.
 #
 # This file is execfile()d with the current directory set to its containing dir.
 #
@@ -46,11 +46,9 @@ copyright = u'2013, Kelsey Jordahl'
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-#
-# The short X.Y version.
-version = '0.1dev'
-# The full version, including alpha/beta/rc tags.
-release = '0.1dev'
+d = {}
+execfile(os.path.join('..', '..', 'geopandas', 'version.py'), d)
+version = release = d['version']
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -64,7 +62,7 @@ release = '0.1dev'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -103,10 +101,10 @@ html_theme = 'nature'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "GeoPandas"
+#html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = "GeoPandas"
+#html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -131,7 +129,7 @@ html_static_path = ['_static']
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {'**':['localtoc.html','searchbox.html']}
+#html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
diff --git a/doc/index.rst b/doc/source/index.rst
similarity index 100%
rename from doc/index.rst
rename to doc/source/index.rst
diff --git a/doc/install.rst b/doc/source/install.rst
similarity index 100%
rename from doc/install.rst
rename to doc/source/install.rst
diff --git a/doc/docs.rst b/doc/source/user.rst
similarity index 100%
rename from doc/docs.rst
rename to doc/source/user.rst