diff --git a/README.rst b/README.rst
index 4bda151..3f9d23d 100644
--- a/README.rst
+++ b/README.rst
@@ -10,7 +10,9 @@ http://www.llvmpy.org
 Versions
 --------
 
-This package has only been tested with LLVM 3.1, and Python 2.7 and Python 3.2.
+This package has been tested with LLVM 3.1, Python 2.7 and Python 3.2.
+Other Python versions should work, but some modifications may be
+needed for the upcoming LLVM 3.2
 
 Quickstart
 ----------
diff --git a/docs/source/index.rst b/docs/source/index.rst
index fbca2ec..f8b8a31 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -13,6 +13,8 @@ Contents:
    :maxdepth: 2
 
    doc/userguide.rst
+   doc/llvm_cbuilder.rst
+   doc/llpython/index.rst
    doc/examples.rst
 
 
diff --git a/llvm_cbuilder_tests/__init__.py b/llvm_cbuilder/tests/__init__.py
similarity index 100%
rename from llvm_cbuilder_tests/__init__.py
rename to llvm_cbuilder/tests/__init__.py
diff --git a/llvm_cbuilder_tests/test_atomic_add.py b/llvm_cbuilder/tests/test_atomic_add.py
similarity index 100%
rename from llvm_cbuilder_tests/test_atomic_add.py
rename to llvm_cbuilder/tests/test_atomic_add.py
diff --git a/llvm_cbuilder_tests/test_atomic_cmpxchg.py b/llvm_cbuilder/tests/test_atomic_cmpxchg.py
similarity index 100%
rename from llvm_cbuilder_tests/test_atomic_cmpxchg.py
rename to llvm_cbuilder/tests/test_atomic_cmpxchg.py
diff --git a/llvm_cbuilder_tests/test_cstr_collide.py b/llvm_cbuilder/tests/test_cstr_collide.py
similarity index 100%
rename from llvm_cbuilder_tests/test_cstr_collide.py
rename to llvm_cbuilder/tests/test_cstr_collide.py
diff --git a/llvm_cbuilder_tests/test_isprime.py b/llvm_cbuilder/tests/test_isprime.py
similarity index 100%
rename from llvm_cbuilder_tests/test_isprime.py
rename to llvm_cbuilder/tests/test_isprime.py
diff --git a/llvm_cbuilder_tests/test_loopcontrol.py b/llvm_cbuilder/tests/test_loopcontrol.py
similarity index 100%
rename from llvm_cbuilder_tests/test_loopcontrol.py
rename to llvm_cbuilder/tests/test_loopcontrol.py
diff --git a/llvm_cbuilder_tests/test_nestedloops.py b/llvm_cbuilder/tests/test_nestedloops.py
similarity index 100%
rename from llvm_cbuilder_tests/test_nestedloops.py
rename to llvm_cbuilder/tests/test_nestedloops.py
diff --git a/llvm_cbuilder_tests/test_print.py b/llvm_cbuilder/tests/test_print.py
similarity index 100%
rename from llvm_cbuilder_tests/test_print.py
rename to llvm_cbuilder/tests/test_print.py
diff --git a/llvm_cbuilder_tests/test_pthread.py b/llvm_cbuilder/tests/test_pthread.py
similarity index 100%
rename from llvm_cbuilder_tests/test_pthread.py
rename to llvm_cbuilder/tests/test_pthread.py
diff --git a/llvm_cbuilder_tests/test_struct.py b/llvm_cbuilder/tests/test_struct.py
similarity index 100%
rename from llvm_cbuilder_tests/test_struct.py
rename to llvm_cbuilder/tests/test_struct.py
diff --git a/llvm_cbuilder_tests/test_translate.py b/llvm_cbuilder/tests/test_translate.py
similarity index 100%
rename from llvm_cbuilder_tests/test_translate.py
rename to llvm_cbuilder/tests/test_translate.py
diff --git a/llvm_cbuilder_tests/test_vectorarith.py b/llvm_cbuilder/tests/test_vectorarith.py
similarity index 100%
rename from llvm_cbuilder_tests/test_vectorarith.py
rename to llvm_cbuilder/tests/test_vectorarith.py