diff --git a/.gitignore b/.gitignore
index 34d312f..ccd87b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 *.pyc
 *.egg-info
 
+.python-version
+
+doc/
 build/
 dist/
 venv/
diff --git a/Makefile b/Makefile
index d0c3cbf..ecb8d0a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 # from the environment for the first two.
 SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = source
-BUILDDIR      = build
+SOURCEDIR     = doc/source
+BUILDDIR      = doc
 
 # Put it first so that "make" without argument is like "make help".
 help:
diff --git a/source/SuperBeam.RequestHandlers.rst b/doc/source/SuperBeam.RequestHandlers.rst
similarity index 100%
rename from source/SuperBeam.RequestHandlers.rst
rename to doc/source/SuperBeam.RequestHandlers.rst
diff --git a/source/SuperBeam.rst b/doc/source/SuperBeam.rst
similarity index 100%
rename from source/SuperBeam.rst
rename to doc/source/SuperBeam.rst
diff --git a/source/conf.py b/doc/source/conf.py
similarity index 98%
rename from source/conf.py
rename to doc/source/conf.py
index 48e60b6..b8c1267 100644
--- a/source/conf.py
+++ b/doc/source/conf.py
@@ -12,7 +12,7 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('../src'))
+sys.path.insert(0, os.path.abspath('../../src'))
 
 
 # -- Project information -----------------------------------------------------
diff --git a/source/index.rst b/doc/source/index.rst
similarity index 100%
rename from source/index.rst
rename to doc/source/index.rst
diff --git a/source/sbeam.rst b/doc/source/sbeam.rst
similarity index 100%
rename from source/sbeam.rst
rename to doc/source/sbeam.rst
diff --git a/make.bat b/make.bat
index 6247f7e..9a4f94b 100644
--- a/make.bat
+++ b/make.bat
@@ -7,8 +7,8 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set SOURCEDIR=source
-set BUILDDIR=build
+set SOURCEDIR=doc\source
+set BUILDDIR=doc
 
 if "%1" == "" goto help