diff --git a/MANIFEST.in b/MANIFEST.in
index 9880b576b61ce53c9a4fb1da53c1e544cbebb594..f6653d0f3ef4990bd76ae3bbf4132aa7205a0747 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include LICENSE README.rst bootstrap.py buildout.cfg
 recursive-include doc conf.py *.rst
 recursive-include xbob *.cpp *.h
-recursive-include xbob/io/data *.*
-recursive-include xbob/io/fonts *.txt *.ttf
+recursive-include xbob/io/base/data *.*
+recursive-include xbob/io/base/fonts *.txt *.ttf
diff --git a/README.rst b/README.rst
index da91ab2d94a5f3d1faf41a5bda7b7b028d7b1534..52ad86b2fc2dacd6a4f028b371b143bd0643ca5f 100644
--- a/README.rst
+++ b/README.rst
@@ -2,22 +2,22 @@
 .. Andre Anjos <andre.anjos@idiap.ch>
 .. Thu 29 Aug 2013 16:07:57 CEST
 
-.. image:: https://travis-ci.org/bioidiap/xbob.io.svg?branch=master
-   :target: https://travis-ci.org/bioidiap/xbob.io
-.. image:: https://coveralls.io/repos/bioidiap/xbob.io/badge.png
-   :target: https://coveralls.io/r/bioidiap/xbob.io
-.. image:: http://img.shields.io/github/tag/bioidiap/xbob.io.png
-   :target: https://github.com/bioidiap/xbob.io
-.. image:: http://img.shields.io/pypi/v/xbob.io.png
-   :target: https://pypi.python.org/pypi/xbob.io
-.. image:: http://img.shields.io/pypi/dm/xbob.io.png
-   :target: https://pypi.python.org/pypi/xbob.io
-
-============================
- Python bindings for bob.io
-============================
-
-This package contains a set of Pythonic bindings for Bob's I/O functionality.
+.. image:: https://travis-ci.org/bioidiap/xbob.io.base.svg?branch=master
+   :target: https://travis-ci.org/bioidiap/xbob.io.base
+.. image:: https://coveralls.io/repos/bioidiap/xbob.io.base/badge.png
+   :target: https://coveralls.io/r/bioidiap/xbob.io.base
+.. image:: http://img.shields.io/github/tag/bioidiap/xbob.io.base.png
+   :target: https://github.com/bioidiap/xbob.io.base
+.. image:: http://img.shields.io/pypi/v/xbob.io.base.png
+   :target: https://pypi.python.org/pypi/xbob.io.base
+.. image:: http://img.shields.io/pypi/dm/xbob.io.base.png
+   :target: https://pypi.python.org/pypi/xbob.io.base
+
+=============================
+ Python bindings for bob::io
+=============================
+
+This package contains a set of Pythonic bindings for core Bob I/O functionality.
 
 Installation
 ------------
@@ -41,7 +41,7 @@ Testing
 
 You can run a set of tests using the nose test runner::
 
-  $ nosetests -sv xbob.io
+  $ nosetests -sv xbob.io.base
 
 .. warning::
 
@@ -58,7 +58,7 @@ You can run our documentation tests using sphinx itself::
 
 You can test overall test coverage with::
 
-  $ nosetests --with-coverage --cover-package=xbob.io
+  $ nosetests --with-coverage --cover-package=xbob.io.base
 
 The ``coverage`` egg must be installed for this to work properly.