diff --git a/scikits/learn/pyem/Changelog b/scikits/learn/pyem/Changelog
index 0545abf1076ea2761da1634e940a051de37f58b5..ff829ddb6c9862f3caa8318a5f73c4d4f4ae9856 100644
--- a/scikits/learn/pyem/Changelog
+++ b/scikits/learn/pyem/Changelog
@@ -1,3 +1,7 @@
+pyem (0.5.7dev) Mon, 28 May 2007 11:31:08 +0900
+
+	* Put doc into its own directory
+
 pyem (0.5.6) Thu, 16 Nov 2006 21:02:02 +0900
 
 	* correct examples
diff --git a/scikits/learn/pyem/TODO b/scikits/learn/pyem/TODO
index 49489e0e1c1ebcd8e8a2b3321daa6ced4672be01..d24d670f089a548d9c7545681bdce8b9a58104a8 100644
--- a/scikits/learn/pyem/TODO
+++ b/scikits/learn/pyem/TODO
@@ -1,8 +1,11 @@
-# Last Change: Thu Nov 09 06:00 PM 2006 J
+# Last Change: Mon May 28 11:00 AM 2007 J
+
 
 Things which must be implemented for a 1.0 version (in importante order)
     - A classifier
     - basic regularization
+    - Use scipy.cluster kmeans instead of our own, as it now provides all
+    necessary functionalities.
 
 Things which would be nice (after 1.0 version):
     - Bayes prior (hard, suppose MCMC)
diff --git a/scikits/learn/pyem/__init__.py b/scikits/learn/pyem/__init__.py
index ae6d83c73b75d8371cdca32ed5409a668def7372..27479a9166855cfb324161922e3ddf816a64db87 100644
--- a/scikits/learn/pyem/__init__.py
+++ b/scikits/learn/pyem/__init__.py
@@ -1,12 +1,12 @@
 #! /usr/bin/env python
-# Last Change: Thu Nov 16 09:00 PM 2006 J
+# Last Change: Mon May 28 01:00 PM 2007 J
 
 from info import __doc__
 
 from gauss_mix import GmParamError, GM
 from gmm_em import GmmParamError, GMM, EM
-from online_em import OnGMM as _OnGMM
-import examples as _examples
+#from online_em import OnGMM as _OnGMM
+#import examples as _examples
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
 
diff --git a/scikits/learn/pyem/demo1.py b/scikits/learn/pyem/doc/examples/demo1.py
similarity index 100%
rename from scikits/learn/pyem/demo1.py
rename to scikits/learn/pyem/doc/examples/demo1.py
diff --git a/scikits/learn/pyem/demo2.py b/scikits/learn/pyem/doc/examples/demo2.py
similarity index 100%
rename from scikits/learn/pyem/demo2.py
rename to scikits/learn/pyem/doc/examples/demo2.py
diff --git a/scikits/learn/pyem/examples/__init__.py b/scikits/learn/pyem/examples/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scikits/learn/pyem/doc/examples/basic_example1.py b/scikits/learn/pyem/examples/basic_example1.py
similarity index 100%
rename from scikits/learn/pyem/doc/examples/basic_example1.py
rename to scikits/learn/pyem/examples/basic_example1.py
diff --git a/scikits/learn/pyem/doc/examples/basic_example2.py b/scikits/learn/pyem/examples/basic_example2.py
similarity index 100%
rename from scikits/learn/pyem/doc/examples/basic_example2.py
rename to scikits/learn/pyem/examples/basic_example2.py
diff --git a/scikits/learn/pyem/doc/examples/basic_example3.py b/scikits/learn/pyem/examples/basic_example3.py
similarity index 100%
rename from scikits/learn/pyem/doc/examples/basic_example3.py
rename to scikits/learn/pyem/examples/basic_example3.py
diff --git a/scikits/learn/pyem/doc/examples/examples.py b/scikits/learn/pyem/examples/examples.py
similarity index 100%
rename from scikits/learn/pyem/doc/examples/examples.py
rename to scikits/learn/pyem/examples/examples.py
diff --git a/scikits/learn/pyem/info.py b/scikits/learn/pyem/info.py
index 080edc6c4155ac8aca7ced7b99709093a5a8bd30..cf107708a96adad4d51370f49c9a136f69bb88e8 100644
--- a/scikits/learn/pyem/info.py
+++ b/scikits/learn/pyem/info.py
@@ -60,7 +60,7 @@ Bibliography:
 Copyright: David Cournapeau 2006
 License: BSD-style (see LICENSE.txt in main source directory)
 """
-version = '0.5.6'
+version = '0.5.7dev'
 
 depends = ['linalg', 'stats']
 ignore  = False
diff --git a/scikits/learn/pyem/src/pure_den.c b/scikits/learn/pyem/src/pure_den.c
index b460e211d0ba229697653653872ed1b545359198..aa2a4ecded2441675092c632ee4d9e2605d28a57 100644
--- a/scikits/learn/pyem/src/pure_den.c
+++ b/scikits/learn/pyem/src/pure_den.c
@@ -1,5 +1,8 @@
 /*
- * Last Change: Wed Dec 06 08:00 PM 2006 J
+ * Last Change: Mon May 28 01:00 PM 2007 J
+ *
+ * Pure C module because ctypes cannot be used here for performance reasons
+ * (function calls are the primary bottleneck)
  */
 #include <Python.h>
 #include <numpy/arrayobject.h>
diff --git a/scikits/learn/pyem/tests/test_densities.py b/scikits/learn/pyem/tests/test_densities.py
index 02fec1b57b019bd20e44b354d6535ceac2bd398a..bc89ee828d5b7deecfc2ab8653b41280ffa5306c 100644
--- a/scikits/learn/pyem/tests/test_densities.py
+++ b/scikits/learn/pyem/tests/test_densities.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Last Change: Thu Nov 09 05:00 PM 2006 J
+# Last Change: Mon May 28 01:00 PM 2007 J
 
 # TODO:
 #   - having "fake tests" to check that all mode (scalar, diag and full) are
diff --git a/scikits/learn/pyem/tests/test_examples.py b/scikits/learn/pyem/tests/test_examples.py
index 708c83bf6e757977bc2373dae929dbf611bca599..eab31b07d364320c6dd9c89728ae1ad0bf18b288 100644
--- a/scikits/learn/pyem/tests/test_examples.py
+++ b/scikits/learn/pyem/tests/test_examples.py
@@ -1,10 +1,10 @@
 #! /usr/bin/env python
-# Last Change: Thu Nov 16 09:00 PM 2006 J
+# Last Change: Mon May 28 04:00 PM 2007 J
 
 from numpy.testing import *
 
 set_package_path()
-from pyem.examples import ex1, ex2, ex3
+from examples.examples import ex1, ex2, ex3
 restore_path()
 
 # #Optional:
diff --git a/scikits/learn/pyem/tests/test_online_em.py b/scikits/learn/pyem/tests/test_online_em.py
index 587fff0151637435518cf8effc56b69f6d865e33..c1fa049a8635b480df59e1dc5fa250bc302352f2 100644
--- a/scikits/learn/pyem/tests/test_online_em.py
+++ b/scikits/learn/pyem/tests/test_online_em.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Last Change: Wed Dec 06 09:00 PM 2006 J
+# Last Change: Mon May 28 01:00 PM 2007 J
 
 import copy