diff --git a/MANIFEST b/MANIFEST
index 7e67b3f61..de98e2e44 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,6 +3,13 @@ LICENSE
 MANIFEST
 README.txt
 TODO.txt
+example/execnet/popen_read_multiple.py
+example/genhtml.py
+example/genhtmlcss.py
+example/genxml.py
+example/pytest/failure_demo.py
+example/pytest/test_failures.py
+example/pytest/test_setup_flow_example.py
 ez_setup.py
 py/LICENSE
 py/__init__.py
@@ -105,12 +112,6 @@ py/doc/confrest.py
 py/doc/contact.txt
 py/doc/download.txt
 py/doc/draft_pyfs
-py/doc/example/genhtml.py
-py/doc/example/genhtmlcss.py
-py/doc/example/genxml.py
-py/doc/example/pytest/failure_demo.py
-py/doc/example/pytest/test_failures.py
-py/doc/example/pytest/test_setup_flow_example.py
 py/doc/execnet.txt
 py/doc/future.txt
 py/doc/greenlet.txt
@@ -125,7 +126,12 @@ py/doc/release-0.9.0.txt
 py/doc/release-0.9.2.txt
 py/doc/style.css
 py/doc/test-config.txt
+py/doc/test-dist.txt
+py/doc/test-examples.txt
+py/doc/test-ext.txt
+py/doc/test-features.txt
 py/doc/test-plugins.txt
+py/doc/test-quickstart.txt
 py/doc/test.txt
 py/doc/why_py.txt
 py/doc/xml.txt
@@ -292,17 +298,16 @@ py/test/config.py
 py/test/conftesthandle.py
 py/test/custompdb.py
 py/test/defaultconftest.py
-py/test/dsession/__init__.py
-py/test/dsession/dsession.py
-py/test/dsession/mypickle.py
-py/test/dsession/nodemanage.py
-py/test/dsession/testing/__init__.py
-py/test/dsession/testing/test_dsession.py
-py/test/dsession/testing/test_functional_dsession.py
-py/test/dsession/testing/test_mypickle.py
-py/test/dsession/testing/test_nodemanage.py
-py/test/dsession/testing/test_txnode.py
-py/test/dsession/txnode.py
+py/test/dist/__init__.py
+py/test/dist/dsession.py
+py/test/dist/mypickle.py
+py/test/dist/nodemanage.py
+py/test/dist/testing/__init__.py
+py/test/dist/testing/test_dsession.py
+py/test/dist/testing/test_mypickle.py
+py/test/dist/testing/test_nodemanage.py
+py/test/dist/testing/test_txnode.py
+py/test/dist/txnode.py
 py/test/event.py
 py/test/looponfail/__init__.py
 py/test/looponfail/remote.py
diff --git a/README.txt b/README.txt
index 62e5aac0e..0914b90cf 100644
--- a/README.txt
+++ b/README.txt
@@ -1,10 +1,11 @@
 The py lib is a Python development support library featuring 
 the following tools and modules:
 
-* py.test: automated testing tool
+* py.test: tool for distributed automated testing
 * py.execnet: ad-hoc distributed execution
-* py.magic.greenlet: micro-threads
+* py.code: dynamic code generation and introspection
 * py.path:  uniform local and svn path objects 
+* py.magic.greenlet: micro-threads
 
 It includes code and contributions from several people, 
 listed in the LICENSE file. 
@@ -17,4 +18,4 @@ have fun,
 
 holger krekel, holger at merlinux eu
 
-$Id: README.txt 57755 2008-09-02 12:26:22Z hpk $
+$Id: README.txt 63217 2009-03-23 00:59:18Z hpk $
diff --git a/py/doc/apigen_refactorings.txt b/py/doc/apigen_refactorings.txt
deleted file mode 100644
index dbe438303..000000000
--- a/py/doc/apigen_refactorings.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Proposed apigen refactorings
-=============================
-
-First of all we would like to have some kind of a persistent storage
-for apigen, so we could use it for different purposes (hint! hint! pdb)
-than only web pages. This will resolve the issue of having separated
-apigen "data" generation and web page generation.
-
-Apigen is very usefull feature, but we don't use it in general. Which
-is bad. One of the reasons is above and the other one is that API of
-apigen is not that well defined which makes it harder to use. So what
-I think would be:
-
-* **py.apigen** tool, which will take tests and initpkg (or whatever
-  means of collecting data) and will try to store it somewhere
-  (not sure, plain text log as a first step?). Than next step
-  would be to have tools for generating webpages out of it
-  (py.webapi or so) and other tools which will integrate it to pdb,
-  emacs (pick your random IDE here) or whatever.
-
-* Another option is to have py.test generate those data and have another
-  tools using it.
-
-* Data storage. Text with a log comes in mind, but it's not very handy.
-  Using any sort of SQL doesn't really counts, cause it makes pylib
-  less standalone, especially that I wouldn't like to have write all
-  those SQL myself, but rather use some kind of sql object relational
-  mapper. Another format might be some kind of structured text
-  (xml anyone?) or pickled stuff. Pickle has problems on his own,
-  so I don't have any best solution at hand.
-
-* Accessing. These are all strings and simple types built on top of it.
-  Probably would be good not to store all data in memory, because it might
-  be huge in case we would like to have all past informations there.
diff --git a/setup.py b/setup.py
index 41910d8d0..76b6a20b4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 """
     setup file for 'py' package based on:
 
-        https://codespeak.net/svn/py/trunk, revision=63208
+        https://codespeak.net/svn/py/trunk, revision=63215
 
     autogenerated by gensetup.py
 """
@@ -169,7 +169,6 @@ def main():
                              'compat/LICENSE',
                              'compat/testing/test_doctest.txt',
                              'compat/testing/test_doctest2.txt',
-                             'doc/apigen_refactorings.txt',
                              'doc/bin.txt',
                              'doc/code.txt',
                              'doc/coding-style.txt',