diff --git a/scikits/learn/__init__.py b/scikits/learn/__init__.py
index db30a3f04e2489d254ea0f330e43d954381f0735..444183247df4e73e3a0f566aeaa5425218e2c160 100644
--- a/scikits/learn/__init__.py
+++ b/scikits/learn/__init__.py
@@ -1,3 +1,3 @@
-#
-#  scikits.learn - Machine Learning module
-#
+"""
+Machine Learning module for python.
+"""
diff --git a/scikits/learn/machine/ann/README b/scikits/learn/ann/README
similarity index 100%
rename from scikits/learn/machine/ann/README
rename to scikits/learn/ann/README
diff --git a/scikits/learn/machine/ann/__init__.py b/scikits/learn/ann/__init__.py
similarity index 100%
rename from scikits/learn/machine/ann/__init__.py
rename to scikits/learn/ann/__init__.py
diff --git a/scikits/learn/machine/ann/data/oil-trn.dat b/scikits/learn/ann/data/oil-trn.dat
similarity index 100%
rename from scikits/learn/machine/ann/data/oil-trn.dat
rename to scikits/learn/ann/data/oil-trn.dat
diff --git a/scikits/learn/machine/ann/data/oil-tst.dat b/scikits/learn/ann/data/oil-tst.dat
similarity index 100%
rename from scikits/learn/machine/ann/data/oil-tst.dat
rename to scikits/learn/ann/data/oil-tst.dat
diff --git a/scikits/learn/machine/ann/data/txor-trn.dat b/scikits/learn/ann/data/txor-trn.dat
similarity index 100%
rename from scikits/learn/machine/ann/data/txor-trn.dat
rename to scikits/learn/ann/data/txor-trn.dat
diff --git a/scikits/learn/machine/ann/data/txor-tst.dat b/scikits/learn/ann/data/txor-tst.dat
similarity index 100%
rename from scikits/learn/machine/ann/data/txor-tst.dat
rename to scikits/learn/ann/data/txor-tst.dat
diff --git a/scikits/learn/machine/ann/data/xor-trn.dat b/scikits/learn/ann/data/xor-trn.dat
similarity index 100%
rename from scikits/learn/machine/ann/data/xor-trn.dat
rename to scikits/learn/ann/data/xor-trn.dat
diff --git a/scikits/learn/machine/ann/data/xor-tst.dat b/scikits/learn/ann/data/xor-tst.dat
similarity index 100%
rename from scikits/learn/machine/ann/data/xor-tst.dat
rename to scikits/learn/ann/data/xor-tst.dat
diff --git a/scikits/learn/machine/ann/doc/mlp.html b/scikits/learn/ann/doc/mlp.html
similarity index 100%
rename from scikits/learn/machine/ann/doc/mlp.html
rename to scikits/learn/ann/doc/mlp.html
diff --git a/scikits/learn/machine/ann/doc/rbf.html b/scikits/learn/ann/doc/rbf.html
similarity index 100%
rename from scikits/learn/machine/ann/doc/rbf.html
rename to scikits/learn/ann/doc/rbf.html
diff --git a/scikits/learn/machine/ann/doc/srn.html b/scikits/learn/ann/doc/srn.html
similarity index 100%
rename from scikits/learn/machine/ann/doc/srn.html
rename to scikits/learn/ann/doc/srn.html
diff --git a/scikits/learn/machine/ann/mlp.py b/scikits/learn/ann/mlp.py
similarity index 100%
rename from scikits/learn/machine/ann/mlp.py
rename to scikits/learn/ann/mlp.py
diff --git a/scikits/learn/machine/ann/rbf.py b/scikits/learn/ann/rbf.py
similarity index 100%
rename from scikits/learn/machine/ann/rbf.py
rename to scikits/learn/ann/rbf.py
diff --git a/scikits/learn/machine/ann/setup.py b/scikits/learn/ann/setup.py
similarity index 100%
rename from scikits/learn/machine/ann/setup.py
rename to scikits/learn/ann/setup.py
diff --git a/scikits/learn/machine/ann/srn.py b/scikits/learn/ann/srn.py
similarity index 100%
rename from scikits/learn/machine/ann/srn.py
rename to scikits/learn/ann/srn.py
diff --git a/scikits/learn/machine/em/Changelog b/scikits/learn/em/Changelog
similarity index 100%
rename from scikits/learn/machine/em/Changelog
rename to scikits/learn/em/Changelog
diff --git a/scikits/learn/machine/em/LICENSE.txt b/scikits/learn/em/LICENSE.txt
similarity index 100%
rename from scikits/learn/machine/em/LICENSE.txt
rename to scikits/learn/em/LICENSE.txt
diff --git a/scikits/learn/machine/em/TODO b/scikits/learn/em/TODO
similarity index 100%
rename from scikits/learn/machine/em/TODO
rename to scikits/learn/em/TODO
diff --git a/scikits/learn/machine/em/__init__.py b/scikits/learn/em/__init__.py
similarity index 100%
rename from scikits/learn/machine/em/__init__.py
rename to scikits/learn/em/__init__.py
diff --git a/scikits/learn/machine/em/_c_densities.py b/scikits/learn/em/_c_densities.py
similarity index 100%
rename from scikits/learn/machine/em/_c_densities.py
rename to scikits/learn/em/_c_densities.py
diff --git a/scikits/learn/machine/em/densities.py b/scikits/learn/em/densities.py
similarity index 100%
rename from scikits/learn/machine/em/densities.py
rename to scikits/learn/em/densities.py
diff --git a/scikits/learn/machine/em/densities2.py b/scikits/learn/em/densities2.py
similarity index 100%
rename from scikits/learn/machine/em/densities2.py
rename to scikits/learn/em/densities2.py
diff --git a/scikits/learn/machine/em/doc/Makefile b/scikits/learn/em/doc/Makefile
similarity index 100%
rename from scikits/learn/machine/em/doc/Makefile
rename to scikits/learn/em/doc/Makefile
diff --git a/scikits/learn/machine/em/doc/base.tex b/scikits/learn/em/doc/base.tex
similarity index 100%
rename from scikits/learn/machine/em/doc/base.tex
rename to scikits/learn/em/doc/base.tex
diff --git a/scikits/learn/machine/em/doc/examples/demo1.py b/scikits/learn/em/doc/examples/demo1.py
similarity index 100%
rename from scikits/learn/machine/em/doc/examples/demo1.py
rename to scikits/learn/em/doc/examples/demo1.py
diff --git a/scikits/learn/machine/em/doc/examples/demo2.py b/scikits/learn/em/doc/examples/demo2.py
similarity index 100%
rename from scikits/learn/machine/em/doc/examples/demo2.py
rename to scikits/learn/em/doc/examples/demo2.py
diff --git a/scikits/learn/machine/em/doc/tutorial.pdf b/scikits/learn/em/doc/tutorial.pdf
similarity index 100%
rename from scikits/learn/machine/em/doc/tutorial.pdf
rename to scikits/learn/em/doc/tutorial.pdf
diff --git a/scikits/learn/machine/em/doc/user.tex b/scikits/learn/em/doc/user.tex
similarity index 100%
rename from scikits/learn/machine/em/doc/user.tex
rename to scikits/learn/em/doc/user.tex
diff --git a/scikits/learn/machine/__init__.py b/scikits/learn/em/examples/__init__.py
similarity index 100%
rename from scikits/learn/machine/__init__.py
rename to scikits/learn/em/examples/__init__.py
diff --git a/scikits/learn/machine/em/examples/basic_example1.py b/scikits/learn/em/examples/basic_example1.py
similarity index 100%
rename from scikits/learn/machine/em/examples/basic_example1.py
rename to scikits/learn/em/examples/basic_example1.py
diff --git a/scikits/learn/machine/em/examples/basic_example2.py b/scikits/learn/em/examples/basic_example2.py
similarity index 100%
rename from scikits/learn/machine/em/examples/basic_example2.py
rename to scikits/learn/em/examples/basic_example2.py
diff --git a/scikits/learn/machine/em/examples/basic_example3.py b/scikits/learn/em/examples/basic_example3.py
similarity index 100%
rename from scikits/learn/machine/em/examples/basic_example3.py
rename to scikits/learn/em/examples/basic_example3.py
diff --git a/scikits/learn/machine/em/examples/discriminant_analysis.py b/scikits/learn/em/examples/discriminant_analysis.py
similarity index 100%
rename from scikits/learn/machine/em/examples/discriminant_analysis.py
rename to scikits/learn/em/examples/discriminant_analysis.py
diff --git a/scikits/learn/machine/em/examples/examples.py b/scikits/learn/em/examples/examples.py
similarity index 100%
rename from scikits/learn/machine/em/examples/examples.py
rename to scikits/learn/em/examples/examples.py
diff --git a/scikits/learn/machine/em/examples/expectation.py b/scikits/learn/em/examples/expectation.py
similarity index 100%
rename from scikits/learn/machine/em/examples/expectation.py
rename to scikits/learn/em/examples/expectation.py
diff --git a/scikits/learn/machine/em/examples/pdfestimation.py b/scikits/learn/em/examples/pdfestimation.py
similarity index 100%
rename from scikits/learn/machine/em/examples/pdfestimation.py
rename to scikits/learn/em/examples/pdfestimation.py
diff --git a/scikits/learn/machine/em/examples/pdfestimation1d.py b/scikits/learn/em/examples/pdfestimation1d.py
similarity index 100%
rename from scikits/learn/machine/em/examples/pdfestimation1d.py
rename to scikits/learn/em/examples/pdfestimation1d.py
diff --git a/scikits/learn/machine/em/examples/plotexamples.py b/scikits/learn/em/examples/plotexamples.py
similarity index 100%
rename from scikits/learn/machine/em/examples/plotexamples.py
rename to scikits/learn/em/examples/plotexamples.py
diff --git a/scikits/learn/machine/em/examples/regularized_example.py b/scikits/learn/em/examples/regularized_example.py
similarity index 100%
rename from scikits/learn/machine/em/examples/regularized_example.py
rename to scikits/learn/em/examples/regularized_example.py
diff --git a/scikits/learn/machine/em/examples/utils.py b/scikits/learn/em/examples/utils.py
similarity index 100%
rename from scikits/learn/machine/em/examples/utils.py
rename to scikits/learn/em/examples/utils.py
diff --git a/scikits/learn/machine/em/gauss_mix.py b/scikits/learn/em/gauss_mix.py
similarity index 100%
rename from scikits/learn/machine/em/gauss_mix.py
rename to scikits/learn/em/gauss_mix.py
diff --git a/scikits/learn/machine/em/gmm_em.py b/scikits/learn/em/gmm_em.py
similarity index 100%
rename from scikits/learn/machine/em/gmm_em.py
rename to scikits/learn/em/gmm_em.py
diff --git a/scikits/learn/machine/em/info.py b/scikits/learn/em/info.py
similarity index 100%
rename from scikits/learn/machine/em/info.py
rename to scikits/learn/em/info.py
diff --git a/scikits/learn/machine/em/misc.py b/scikits/learn/em/misc.py
similarity index 100%
rename from scikits/learn/machine/em/misc.py
rename to scikits/learn/em/misc.py
diff --git a/scikits/learn/machine/em/online_em.py b/scikits/learn/em/online_em.py
similarity index 100%
rename from scikits/learn/machine/em/online_em.py
rename to scikits/learn/em/online_em.py
diff --git a/scikits/learn/machine/em/profile_data/blop.c b/scikits/learn/em/profile_data/blop.c
similarity index 100%
rename from scikits/learn/machine/em/profile_data/blop.c
rename to scikits/learn/em/profile_data/blop.c
diff --git a/scikits/learn/machine/em/profile_data/gden.m b/scikits/learn/em/profile_data/gden.m
similarity index 100%
rename from scikits/learn/machine/em/profile_data/gden.m
rename to scikits/learn/em/profile_data/gden.m
diff --git a/scikits/learn/machine/em/profile_data/mat_prof.m b/scikits/learn/em/profile_data/mat_prof.m
similarity index 100%
rename from scikits/learn/machine/em/profile_data/mat_prof.m
rename to scikits/learn/em/profile_data/mat_prof.m
diff --git a/scikits/learn/machine/em/profile_data/profile_densities.py b/scikits/learn/em/profile_data/profile_densities.py
similarity index 100%
rename from scikits/learn/machine/em/profile_data/profile_densities.py
rename to scikits/learn/em/profile_data/profile_densities.py
diff --git a/scikits/learn/machine/em/profile_data/profile_gmm.py b/scikits/learn/em/profile_data/profile_gmm.py
similarity index 100%
rename from scikits/learn/machine/em/profile_data/profile_gmm.py
rename to scikits/learn/em/profile_data/profile_gmm.py
diff --git a/scikits/learn/machine/em/profile_data/profile_online_em.py b/scikits/learn/em/profile_data/profile_online_em.py
similarity index 100%
rename from scikits/learn/machine/em/profile_data/profile_online_em.py
rename to scikits/learn/em/profile_data/profile_online_em.py
diff --git a/scikits/learn/machine/em/setup.py b/scikits/learn/em/setup.py
similarity index 100%
rename from scikits/learn/machine/em/setup.py
rename to scikits/learn/em/setup.py
diff --git a/scikits/learn/machine/em/src/Makefile b/scikits/learn/em/src/Makefile
similarity index 100%
rename from scikits/learn/machine/em/src/Makefile
rename to scikits/learn/em/src/Makefile
diff --git a/scikits/learn/machine/em/src/c_gden.c b/scikits/learn/em/src/c_gden.c
similarity index 100%
rename from scikits/learn/machine/em/src/c_gden.c
rename to scikits/learn/em/src/c_gden.c
diff --git a/scikits/learn/machine/em/src/c_gmm.pyx b/scikits/learn/em/src/c_gmm.pyx
similarity index 100%
rename from scikits/learn/machine/em/src/c_gmm.pyx
rename to scikits/learn/em/src/c_gmm.pyx
diff --git a/scikits/learn/machine/em/src/c_numpy.pxd b/scikits/learn/em/src/c_numpy.pxd
similarity index 100%
rename from scikits/learn/machine/em/src/c_numpy.pxd
rename to scikits/learn/em/src/c_numpy.pxd
diff --git a/scikits/learn/machine/em/src/c_python.pxd b/scikits/learn/em/src/c_python.pxd
similarity index 100%
rename from scikits/learn/machine/em/src/c_python.pxd
rename to scikits/learn/em/src/c_python.pxd
diff --git a/scikits/learn/machine/em/src/pure_den.c b/scikits/learn/em/src/pure_den.c
similarity index 100%
rename from scikits/learn/machine/em/src/pure_den.c
rename to scikits/learn/em/src/pure_den.c
diff --git a/scikits/learn/machine/em/tests/__init__.py b/scikits/learn/em/tests/__init__.py
similarity index 100%
rename from scikits/learn/machine/em/tests/__init__.py
rename to scikits/learn/em/tests/__init__.py
diff --git a/scikits/learn/machine/em/tests/diag_1d_3k.mat b/scikits/learn/em/tests/diag_1d_3k.mat
similarity index 100%
rename from scikits/learn/machine/em/tests/diag_1d_3k.mat
rename to scikits/learn/em/tests/diag_1d_3k.mat
diff --git a/scikits/learn/machine/em/tests/diag_1d_4k.mat b/scikits/learn/em/tests/diag_1d_4k.mat
similarity index 100%
rename from scikits/learn/machine/em/tests/diag_1d_4k.mat
rename to scikits/learn/em/tests/diag_1d_4k.mat
diff --git a/scikits/learn/machine/em/tests/diag_2d_3k.mat b/scikits/learn/em/tests/diag_2d_3k.mat
similarity index 100%
rename from scikits/learn/machine/em/tests/diag_2d_3k.mat
rename to scikits/learn/em/tests/diag_2d_3k.mat
diff --git a/scikits/learn/machine/em/tests/full_2d_3k.mat b/scikits/learn/em/tests/full_2d_3k.mat
similarity index 100%
rename from scikits/learn/machine/em/tests/full_2d_3k.mat
rename to scikits/learn/em/tests/full_2d_3k.mat
diff --git a/scikits/learn/machine/em/tests/generate_tests_data.py b/scikits/learn/em/tests/generate_tests_data.py
similarity index 100%
rename from scikits/learn/machine/em/tests/generate_tests_data.py
rename to scikits/learn/em/tests/generate_tests_data.py
diff --git a/scikits/learn/machine/em/tests/test_densities.py b/scikits/learn/em/tests/test_densities.py
similarity index 100%
rename from scikits/learn/machine/em/tests/test_densities.py
rename to scikits/learn/em/tests/test_densities.py
diff --git a/scikits/learn/machine/em/tests/test_examples.py b/scikits/learn/em/tests/test_examples.py
similarity index 100%
rename from scikits/learn/machine/em/tests/test_examples.py
rename to scikits/learn/em/tests/test_examples.py
diff --git a/scikits/learn/machine/em/tests/test_gauss_mix.py b/scikits/learn/em/tests/test_gauss_mix.py
similarity index 100%
rename from scikits/learn/machine/em/tests/test_gauss_mix.py
rename to scikits/learn/em/tests/test_gauss_mix.py
diff --git a/scikits/learn/machine/em/tests/test_gmm_em.py b/scikits/learn/em/tests/test_gmm_em.py
similarity index 100%
rename from scikits/learn/machine/em/tests/test_gmm_em.py
rename to scikits/learn/em/tests/test_gmm_em.py
diff --git a/scikits/learn/machine/em/tests/test_online_em.py b/scikits/learn/em/tests/test_online_em.py
similarity index 100%
rename from scikits/learn/machine/em/tests/test_online_em.py
rename to scikits/learn/em/tests/test_online_em.py
diff --git a/scikits/learn/machine/em/tests/testcommon.py b/scikits/learn/em/tests/testcommon.py
similarity index 100%
rename from scikits/learn/machine/em/tests/testcommon.py
rename to scikits/learn/em/tests/testcommon.py
diff --git a/scikits/learn/machine/setup.py b/scikits/learn/machine/setup.py
deleted file mode 100644
index 359d00e18dfcda18712af91ee0b6316301e64333..0000000000000000000000000000000000000000
--- a/scikits/learn/machine/setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-def configuration(parent_package='',top_path=None):
-    from numpy.distutils.misc_util import Configuration
-    config = Configuration('machine',parent_package,top_path)
-    config.add_subpackage('em')
-    #config.add_subpackage('em2')
-    config.add_subpackage('manifold_learning')
-    config.add_subpackage('svm')
-    return config
-
-if __name__ == '__main__':
-    from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
diff --git a/scikits/learn/machine/svm/tests/__init__.py b/scikits/learn/machine/svm/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/scikits/learn/machine/manifold_learning/__init__.py b/scikits/learn/manifold/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/__init__.py
rename to scikits/learn/manifold/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/compression/NLM/__init__.py b/scikits/learn/manifold/compression/NLM/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/NLM/__init__.py
rename to scikits/learn/manifold/compression/NLM/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/compression/NLM/cost_function.py b/scikits/learn/manifold/compression/NLM/cost_function.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/NLM/cost_function.py
rename to scikits/learn/manifold/compression/NLM/cost_function.py
diff --git a/scikits/learn/machine/manifold_learning/compression/__init__.py b/scikits/learn/manifold/compression/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/__init__.py
rename to scikits/learn/manifold/compression/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/compression/barycenters.py b/scikits/learn/manifold/compression/barycenters.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/barycenters.py
rename to scikits/learn/manifold/compression/barycenters.py
diff --git a/scikits/learn/machine/manifold_learning/compression/cca_function.py b/scikits/learn/manifold/compression/cca_function.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cca_function.py
rename to scikits/learn/manifold/compression/cca_function.py
diff --git a/scikits/learn/machine/manifold_learning/compression/cca_multiresolution_dimensionality_reduction.py b/scikits/learn/manifold/compression/cca_multiresolution_dimensionality_reduction.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cca_multiresolution_dimensionality_reduction.py
rename to scikits/learn/manifold/compression/cca_multiresolution_dimensionality_reduction.py
diff --git a/scikits/learn/machine/manifold_learning/compression/cost_function/__init__.py b/scikits/learn/manifold/compression/cost_function/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cost_function/__init__.py
rename to scikits/learn/manifold/compression/cost_function/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/compression/cost_function/cost_function.cpp b/scikits/learn/manifold/compression/cost_function/cost_function.cpp
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cost_function/cost_function.cpp
rename to scikits/learn/manifold/compression/cost_function/cost_function.cpp
diff --git a/scikits/learn/machine/manifold_learning/compression/cost_function/cost_function.h b/scikits/learn/manifold/compression/cost_function/cost_function.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cost_function/cost_function.h
rename to scikits/learn/manifold/compression/cost_function/cost_function.h
diff --git a/scikits/learn/machine/manifold_learning/compression/cost_function/cost_function.py b/scikits/learn/manifold/compression/cost_function/cost_function.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cost_function/cost_function.py
rename to scikits/learn/manifold/compression/cost_function/cost_function.py
diff --git a/scikits/learn/machine/manifold_learning/compression/cost_function/modifiedCompression.h b/scikits/learn/manifold/compression/cost_function/modifiedCompression.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cost_function/modifiedCompression.h
rename to scikits/learn/manifold/compression/cost_function/modifiedCompression.h
diff --git a/scikits/learn/machine/manifold_learning/compression/cost_function/setup.py b/scikits/learn/manifold/compression/cost_function/setup.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/cost_function/setup.py
rename to scikits/learn/manifold/compression/cost_function/setup.py
diff --git a/scikits/learn/machine/manifold_learning/compression/dimensionality_reduction.py b/scikits/learn/manifold/compression/dimensionality_reduction.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/dimensionality_reduction.py
rename to scikits/learn/manifold/compression/dimensionality_reduction.py
diff --git a/scikits/learn/machine/manifold_learning/compression/distances.py b/scikits/learn/manifold/compression/distances.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/distances.py
rename to scikits/learn/manifold/compression/distances.py
diff --git a/scikits/learn/machine/manifold_learning/compression/euclidian_mds.py b/scikits/learn/manifold/compression/euclidian_mds.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/euclidian_mds.py
rename to scikits/learn/manifold/compression/euclidian_mds.py
diff --git a/scikits/learn/machine/manifold_learning/compression/geodesic_mds.py b/scikits/learn/manifold/compression/geodesic_mds.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/geodesic_mds.py
rename to scikits/learn/manifold/compression/geodesic_mds.py
diff --git a/scikits/learn/machine/manifold_learning/compression/isomap_function.py b/scikits/learn/manifold/compression/isomap_function.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/isomap_function.py
rename to scikits/learn/manifold/compression/isomap_function.py
diff --git a/scikits/learn/machine/manifold_learning/compression/multiresolution_dimensionality_reduction.py b/scikits/learn/manifold/compression/multiresolution_dimensionality_reduction.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/multiresolution_dimensionality_reduction.py
rename to scikits/learn/manifold/compression/multiresolution_dimensionality_reduction.py
diff --git a/scikits/learn/machine/manifold_learning/compression/pca.py b/scikits/learn/manifold/compression/pca.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/pca.py
rename to scikits/learn/manifold/compression/pca.py
diff --git a/scikits/learn/machine/manifold_learning/compression/quadratic_dimensionality_reduction.py b/scikits/learn/manifold/compression/quadratic_dimensionality_reduction.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/quadratic_dimensionality_reduction.py
rename to scikits/learn/manifold/compression/quadratic_dimensionality_reduction.py
diff --git a/scikits/learn/machine/manifold_learning/compression/robust_dimensionality_reduction.py b/scikits/learn/manifold/compression/robust_dimensionality_reduction.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/robust_dimensionality_reduction.py
rename to scikits/learn/manifold/compression/robust_dimensionality_reduction.py
diff --git a/scikits/learn/machine/manifold_learning/compression/setup.py b/scikits/learn/manifold/compression/setup.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/setup.py
rename to scikits/learn/manifold/compression/setup.py
diff --git a/scikits/learn/machine/manifold_learning/compression/similarities.py b/scikits/learn/manifold/compression/similarities.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/similarities.py
rename to scikits/learn/manifold/compression/similarities.py
diff --git a/scikits/learn/machine/manifold_learning/compression/similarities_mds.py b/scikits/learn/manifold/compression/similarities_mds.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/similarities_mds.py
rename to scikits/learn/manifold/compression/similarities_mds.py
diff --git a/scikits/learn/machine/manifold_learning/compression/stochastic_dimensionality_reduction.py b/scikits/learn/manifold/compression/stochastic_dimensionality_reduction.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/stochastic_dimensionality_reduction.py
rename to scikits/learn/manifold/compression/stochastic_dimensionality_reduction.py
diff --git a/scikits/learn/machine/em/examples/__init__.py b/scikits/learn/manifold/compression/tests/__init__.py
similarity index 100%
rename from scikits/learn/machine/em/examples/__init__.py
rename to scikits/learn/manifold/compression/tests/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/compression/tests/test_barycenters.py b/scikits/learn/manifold/compression/tests/test_barycenters.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/tests/test_barycenters.py
rename to scikits/learn/manifold/compression/tests/test_barycenters.py
diff --git a/scikits/learn/machine/manifold_learning/compression/tests/test_similarities.py b/scikits/learn/manifold/compression/tests/test_similarities.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/tests/test_similarities.py
rename to scikits/learn/manifold/compression/tests/test_similarities.py
diff --git a/scikits/learn/machine/manifold_learning/compression/tools.py b/scikits/learn/manifold/compression/tools.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/tools.py
rename to scikits/learn/manifold/compression/tools.py
diff --git a/scikits/learn/machine/manifold_learning/examples/compression.py b/scikits/learn/manifold/examples/compression.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/compression.py
rename to scikits/learn/manifold/examples/compression.py
diff --git a/scikits/learn/machine/manifold_learning/examples/knn.py b/scikits/learn/manifold/examples/knn.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/knn.py
rename to scikits/learn/manifold/examples/knn.py
diff --git a/scikits/learn/machine/manifold_learning/examples/knn2.py b/scikits/learn/manifold/examples/knn2.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/knn2.py
rename to scikits/learn/manifold/examples/knn2.py
diff --git a/scikits/learn/machine/manifold_learning/examples/projection.py b/scikits/learn/manifold/examples/projection.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/projection.py
rename to scikits/learn/manifold/examples/projection.py
diff --git a/scikits/learn/machine/manifold_learning/examples/regression.py b/scikits/learn/manifold/examples/regression.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/regression.py
rename to scikits/learn/manifold/examples/regression.py
diff --git a/scikits/learn/machine/manifold_learning/examples/swissroll.isomap.pickled b/scikits/learn/manifold/examples/swissroll.isomap.pickled
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/swissroll.isomap.pickled
rename to scikits/learn/manifold/examples/swissroll.isomap.pickled
diff --git a/scikits/learn/machine/manifold_learning/examples/swissroll.pickled b/scikits/learn/manifold/examples/swissroll.pickled
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/swissroll.pickled
rename to scikits/learn/manifold/examples/swissroll.pickled
diff --git a/scikits/learn/machine/manifold_learning/examples/swissroll.projected.pickled b/scikits/learn/manifold/examples/swissroll.projected.pickled
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/swissroll.projected.pickled
rename to scikits/learn/manifold/examples/swissroll.projected.pickled
diff --git a/scikits/learn/machine/manifold_learning/examples/swissroll.regressed.pickled b/scikits/learn/manifold/examples/swissroll.regressed.pickled
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/swissroll.regressed.pickled
rename to scikits/learn/manifold/examples/swissroll.regressed.pickled
diff --git a/scikits/learn/machine/manifold_learning/examples/swissroll.samples.pickled b/scikits/learn/manifold/examples/swissroll.samples.pickled
similarity index 100%
rename from scikits/learn/machine/manifold_learning/examples/swissroll.samples.pickled
rename to scikits/learn/manifold/examples/swissroll.samples.pickled
diff --git a/scikits/learn/machine/manifold_learning/projection/MAP_projection.py b/scikits/learn/manifold/projection/MAP_projection.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/projection/MAP_projection.py
rename to scikits/learn/manifold/projection/MAP_projection.py
diff --git a/scikits/learn/machine/manifold_learning/projection/ML_projection.py b/scikits/learn/manifold/projection/ML_projection.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/projection/ML_projection.py
rename to scikits/learn/manifold/projection/ML_projection.py
diff --git a/scikits/learn/machine/manifold_learning/projection/__init__.py b/scikits/learn/manifold/projection/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/projection/__init__.py
rename to scikits/learn/manifold/projection/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/projection/grid_MAP_projection.py b/scikits/learn/manifold/projection/grid_MAP_projection.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/projection/grid_MAP_projection.py
rename to scikits/learn/manifold/projection/grid_MAP_projection.py
diff --git a/scikits/learn/machine/manifold_learning/projection/grid_ML_projection.py b/scikits/learn/manifold/projection/grid_ML_projection.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/projection/grid_ML_projection.py
rename to scikits/learn/manifold/projection/grid_ML_projection.py
diff --git a/scikits/learn/machine/manifold_learning/regression/CPLMR.py b/scikits/learn/manifold/regression/CPLMR.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/CPLMR.py
rename to scikits/learn/manifold/regression/CPLMR.py
diff --git a/scikits/learn/machine/manifold_learning/regression/MLPLMR.py b/scikits/learn/manifold/regression/MLPLMR.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/MLPLMR.py
rename to scikits/learn/manifold/regression/MLPLMR.py
diff --git a/scikits/learn/machine/manifold_learning/regression/PCA.py b/scikits/learn/manifold/regression/PCA.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/PCA.py
rename to scikits/learn/manifold/regression/PCA.py
diff --git a/scikits/learn/machine/manifold_learning/regression/PLMR.py b/scikits/learn/manifold/regression/PLMR.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/PLMR.py
rename to scikits/learn/manifold/regression/PLMR.py
diff --git a/scikits/learn/machine/manifold_learning/regression/__init__.py b/scikits/learn/manifold/regression/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/__init__.py
rename to scikits/learn/manifold/regression/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/regression/cluster/ModifiedGeneralClustering.h b/scikits/learn/manifold/regression/cluster/ModifiedGeneralClustering.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/cluster/ModifiedGeneralClustering.h
rename to scikits/learn/manifold/regression/cluster/ModifiedGeneralClustering.h
diff --git a/scikits/learn/machine/manifold_learning/regression/cluster/ModifiedGeneralClustering.i b/scikits/learn/manifold/regression/cluster/ModifiedGeneralClustering.i
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/cluster/ModifiedGeneralClustering.i
rename to scikits/learn/manifold/regression/cluster/ModifiedGeneralClustering.i
diff --git a/scikits/learn/machine/manifold_learning/regression/cluster/__init__.py b/scikits/learn/manifold/regression/cluster/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/cluster/__init__.py
rename to scikits/learn/manifold/regression/cluster/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/regression/cluster/clusterInfos.h b/scikits/learn/manifold/regression/cluster/clusterInfos.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/cluster/clusterInfos.h
rename to scikits/learn/manifold/regression/cluster/clusterInfos.h
diff --git a/scikits/learn/machine/manifold_learning/regression/cluster/setup.py b/scikits/learn/manifold/regression/cluster/setup.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/cluster/setup.py
rename to scikits/learn/manifold/regression/cluster/setup.py
diff --git a/scikits/learn/machine/manifold_learning/regression/neighbors/__init__.py b/scikits/learn/manifold/regression/neighbors/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/neighbors/__init__.py
rename to scikits/learn/manifold/regression/neighbors/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/regression/neighbors/neighbors.py b/scikits/learn/manifold/regression/neighbors/neighbors.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/neighbors/neighbors.py
rename to scikits/learn/manifold/regression/neighbors/neighbors.py
diff --git a/scikits/learn/machine/manifold_learning/regression/setup.py b/scikits/learn/manifold/regression/setup.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/setup.py
rename to scikits/learn/manifold/regression/setup.py
diff --git a/scikits/learn/machine/manifold_learning/compression/tests/__init__.py b/scikits/learn/manifold/regression/tests/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/compression/tests/__init__.py
rename to scikits/learn/manifold/regression/tests/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/regression/tests/test_neighbors.py b/scikits/learn/manifold/regression/tests/test_neighbors.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/tests/test_neighbors.py
rename to scikits/learn/manifold/regression/tests/test_neighbors.py
diff --git a/scikits/learn/machine/manifold_learning/setup.py b/scikits/learn/manifold/setup.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/setup.py
rename to scikits/learn/manifold/setup.py
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/container_iterator.h b/scikits/learn/manifold/src/matrix/container_iterator.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/container_iterator.h
rename to scikits/learn/manifold/src/matrix/container_iterator.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/diagonal_matrix_iterator.h b/scikits/learn/manifold/src/matrix/diagonal_matrix_iterator.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/diagonal_matrix_iterator.h
rename to scikits/learn/manifold/src/matrix/diagonal_matrix_iterator.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/diagonal_matrix_lib.h b/scikits/learn/manifold/src/matrix/diagonal_matrix_lib.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/diagonal_matrix_lib.h
rename to scikits/learn/manifold/src/matrix/diagonal_matrix_lib.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/dynamic_container_matrix.h b/scikits/learn/manifold/src/matrix/dynamic_container_matrix.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/dynamic_container_matrix.h
rename to scikits/learn/manifold/src/matrix/dynamic_container_matrix.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/expression_template.h b/scikits/learn/manifold/src/matrix/expression_template.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/expression_template.h
rename to scikits/learn/manifold/src/matrix/expression_template.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/expression_template_iterators.h b/scikits/learn/manifold/src/matrix/expression_template_iterators.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/expression_template_iterators.h
rename to scikits/learn/manifold/src/matrix/expression_template_iterators.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/inversion.h b/scikits/learn/manifold/src/matrix/inversion.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/inversion.h
rename to scikits/learn/manifold/src/matrix/inversion.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/iterator_based_functions.h b/scikits/learn/manifold/src/matrix/iterator_based_functions.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/iterator_based_functions.h
rename to scikits/learn/manifold/src/matrix/iterator_based_functions.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/matrix_functions.h b/scikits/learn/manifold/src/matrix/matrix_functions.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/matrix_functions.h
rename to scikits/learn/manifold/src/matrix/matrix_functions.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/matrix_lib.h b/scikits/learn/manifold/src/matrix/matrix_lib.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/matrix_lib.h
rename to scikits/learn/manifold/src/matrix/matrix_lib.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/matrix_traits.h b/scikits/learn/manifold/src/matrix/matrix_traits.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/matrix_traits.h
rename to scikits/learn/manifold/src/matrix/matrix_traits.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/pointer_matrix.h b/scikits/learn/manifold/src/matrix/pointer_matrix.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/pointer_matrix.h
rename to scikits/learn/manifold/src/matrix/pointer_matrix.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/static_container_matrix.h b/scikits/learn/manifold/src/matrix/static_container_matrix.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/static_container_matrix.h
rename to scikits/learn/manifold/src/matrix/static_container_matrix.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/sub_matrix_iterator.h b/scikits/learn/manifold/src/matrix/sub_matrix_iterator.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/sub_matrix_iterator.h
rename to scikits/learn/manifold/src/matrix/sub_matrix_iterator.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/sub_matrix_lib.h b/scikits/learn/manifold/src/matrix/sub_matrix_lib.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/sub_matrix_lib.h
rename to scikits/learn/manifold/src/matrix/sub_matrix_lib.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/sub_vector_lib.h b/scikits/learn/manifold/src/matrix/sub_vector_lib.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/sub_vector_lib.h
rename to scikits/learn/manifold/src/matrix/sub_vector_lib.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/sub_vector_matrix_iterator.h b/scikits/learn/manifold/src/matrix/sub_vector_matrix_iterator.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/sub_vector_matrix_iterator.h
rename to scikits/learn/manifold/src/matrix/sub_vector_matrix_iterator.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/sub_vector_matrix_lib.h b/scikits/learn/manifold/src/matrix/sub_vector_matrix_lib.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/sub_vector_matrix_lib.h
rename to scikits/learn/manifold/src/matrix/sub_vector_matrix_lib.h
diff --git a/scikits/learn/machine/manifold_learning/src/matrix/type_traits.h b/scikits/learn/manifold/src/matrix/type_traits.h
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/matrix/type_traits.h
rename to scikits/learn/manifold/src/matrix/type_traits.h
diff --git a/scikits/learn/machine/manifold_learning/src/numpy.i b/scikits/learn/manifold/src/numpy.i
similarity index 100%
rename from scikits/learn/machine/manifold_learning/src/numpy.i
rename to scikits/learn/manifold/src/numpy.i
diff --git a/scikits/learn/machine/manifold_learning/stats/__init__.py b/scikits/learn/manifold/stats/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/__init__.py
rename to scikits/learn/manifold/stats/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/stats/gaussian.py b/scikits/learn/manifold/stats/gaussian.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/gaussian.py
rename to scikits/learn/manifold/stats/gaussian.py
diff --git a/scikits/learn/machine/manifold_learning/stats/gm.py b/scikits/learn/manifold/stats/gm.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/gm.py
rename to scikits/learn/manifold/stats/gm.py
diff --git a/scikits/learn/machine/manifold_learning/stats/kernels/__init__.py b/scikits/learn/manifold/stats/kernels/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/kernels/__init__.py
rename to scikits/learn/manifold/stats/kernels/__init__.py
diff --git a/scikits/learn/machine/manifold_learning/stats/kernels/gaussian.py b/scikits/learn/manifold/stats/kernels/gaussian.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/kernels/gaussian.py
rename to scikits/learn/manifold/stats/kernels/gaussian.py
diff --git a/scikits/learn/machine/manifold_learning/stats/kernels/gm.py b/scikits/learn/manifold/stats/kernels/gm.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/kernels/gm.py
rename to scikits/learn/manifold/stats/kernels/gm.py
diff --git a/scikits/learn/machine/manifold_learning/stats/kernels/laplace.py b/scikits/learn/manifold/stats/kernels/laplace.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/kernels/laplace.py
rename to scikits/learn/manifold/stats/kernels/laplace.py
diff --git a/scikits/learn/machine/manifold_learning/stats/laplace.py b/scikits/learn/manifold/stats/laplace.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/laplace.py
rename to scikits/learn/manifold/stats/laplace.py
diff --git a/scikits/learn/machine/manifold_learning/stats/radial_basis_functions_field.py b/scikits/learn/manifold/stats/radial_basis_functions_field.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/radial_basis_functions_field.py
rename to scikits/learn/manifold/stats/radial_basis_functions_field.py
diff --git a/scikits/learn/machine/manifold_learning/stats/setup.py b/scikits/learn/manifold/stats/setup.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/stats/setup.py
rename to scikits/learn/manifold/stats/setup.py
diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py
index d2b6c51b4ac1af5310f2906978ac5bf155ae3eb9..27cfed136da70a9d90b31e490f0ec123afdfd0e0 100644
--- a/scikits/learn/setup.py
+++ b/scikits/learn/setup.py
@@ -1,9 +1,9 @@
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
-    config = Configuration('learn',parent_package,top_path)
-
-    config.add_subpackage('datasets')
-    config.add_subpackage('machine')
+    config = Configuration('machine',parent_package,top_path)
+    config.add_subpackage('em')
+    config.add_subpackage('manifold')
+    config.add_subpackage('svm')
     config.add_subpackage('utils')
     return config
 
diff --git a/scikits/learn/machine/svm/README b/scikits/learn/svm/README
similarity index 100%
rename from scikits/learn/machine/svm/README
rename to scikits/learn/svm/README
diff --git a/scikits/learn/machine/svm/__init__.py b/scikits/learn/svm/__init__.py
similarity index 100%
rename from scikits/learn/machine/svm/__init__.py
rename to scikits/learn/svm/__init__.py
diff --git a/scikits/learn/machine/svm/classification.py b/scikits/learn/svm/classification.py
similarity index 100%
rename from scikits/learn/machine/svm/classification.py
rename to scikits/learn/svm/classification.py
diff --git a/scikits/learn/machine/svm/dataset.py b/scikits/learn/svm/dataset.py
similarity index 100%
rename from scikits/learn/machine/svm/dataset.py
rename to scikits/learn/svm/dataset.py
diff --git a/scikits/learn/machine/manifold_learning/regression/tests/__init__.py b/scikits/learn/svm/examples/__init__.py
similarity index 100%
rename from scikits/learn/machine/manifold_learning/regression/tests/__init__.py
rename to scikits/learn/svm/examples/__init__.py
diff --git a/scikits/learn/machine/svm/examples/classification.py b/scikits/learn/svm/examples/classification.py
similarity index 100%
rename from scikits/learn/machine/svm/examples/classification.py
rename to scikits/learn/svm/examples/classification.py
diff --git a/scikits/learn/machine/svm/examples/classification2.py b/scikits/learn/svm/examples/classification2.py
similarity index 100%
rename from scikits/learn/machine/svm/examples/classification2.py
rename to scikits/learn/svm/examples/classification2.py
diff --git a/scikits/learn/machine/svm/examples/utils.py b/scikits/learn/svm/examples/utils.py
similarity index 100%
rename from scikits/learn/machine/svm/examples/utils.py
rename to scikits/learn/svm/examples/utils.py
diff --git a/scikits/learn/machine/svm/kernel.py b/scikits/learn/svm/kernel.py
similarity index 100%
rename from scikits/learn/machine/svm/kernel.py
rename to scikits/learn/svm/kernel.py
diff --git a/scikits/learn/machine/svm/libsvm-2.82/Makefile.win b/scikits/learn/svm/libsvm-2.82/Makefile.win
similarity index 100%
rename from scikits/learn/machine/svm/libsvm-2.82/Makefile.win
rename to scikits/learn/svm/libsvm-2.82/Makefile.win
diff --git a/scikits/learn/machine/svm/libsvm-2.82/SConstruct b/scikits/learn/svm/libsvm-2.82/SConstruct
similarity index 100%
rename from scikits/learn/machine/svm/libsvm-2.82/SConstruct
rename to scikits/learn/svm/libsvm-2.82/SConstruct
diff --git a/scikits/learn/machine/svm/libsvm-2.82/svm.cpp b/scikits/learn/svm/libsvm-2.82/svm.cpp
similarity index 100%
rename from scikits/learn/machine/svm/libsvm-2.82/svm.cpp
rename to scikits/learn/svm/libsvm-2.82/svm.cpp
diff --git a/scikits/learn/machine/svm/libsvm-2.82/svm.h b/scikits/learn/svm/libsvm-2.82/svm.h
similarity index 100%
rename from scikits/learn/machine/svm/libsvm-2.82/svm.h
rename to scikits/learn/svm/libsvm-2.82/svm.h
diff --git a/scikits/learn/machine/svm/libsvm.py b/scikits/learn/svm/libsvm.py
similarity index 100%
rename from scikits/learn/machine/svm/libsvm.py
rename to scikits/learn/svm/libsvm.py
diff --git a/scikits/learn/machine/svm/model.py b/scikits/learn/svm/model.py
similarity index 100%
rename from scikits/learn/machine/svm/model.py
rename to scikits/learn/svm/model.py
diff --git a/scikits/learn/machine/svm/oneclass.py b/scikits/learn/svm/oneclass.py
similarity index 100%
rename from scikits/learn/machine/svm/oneclass.py
rename to scikits/learn/svm/oneclass.py
diff --git a/scikits/learn/machine/svm/predict.py b/scikits/learn/svm/predict.py
similarity index 100%
rename from scikits/learn/machine/svm/predict.py
rename to scikits/learn/svm/predict.py
diff --git a/scikits/learn/machine/svm/regression.py b/scikits/learn/svm/regression.py
similarity index 100%
rename from scikits/learn/machine/svm/regression.py
rename to scikits/learn/svm/regression.py
diff --git a/scikits/learn/machine/svm/setup.py b/scikits/learn/svm/setup.py
similarity index 100%
rename from scikits/learn/machine/svm/setup.py
rename to scikits/learn/svm/setup.py
diff --git a/scikits/learn/machine/svm/examples/__init__.py b/scikits/learn/svm/tests/__init__.py
similarity index 100%
rename from scikits/learn/machine/svm/examples/__init__.py
rename to scikits/learn/svm/tests/__init__.py
diff --git a/scikits/learn/machine/svm/tests/test_all.py b/scikits/learn/svm/tests/test_all.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_all.py
rename to scikits/learn/svm/tests/test_all.py
diff --git a/scikits/learn/machine/svm/tests/test_classification.py b/scikits/learn/svm/tests/test_classification.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_classification.py
rename to scikits/learn/svm/tests/test_classification.py
diff --git a/scikits/learn/machine/svm/tests/test_dataset.py b/scikits/learn/svm/tests/test_dataset.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_dataset.py
rename to scikits/learn/svm/tests/test_dataset.py
diff --git a/scikits/learn/machine/svm/tests/test_kernel.py b/scikits/learn/svm/tests/test_kernel.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_kernel.py
rename to scikits/learn/svm/tests/test_kernel.py
diff --git a/scikits/learn/machine/svm/tests/test_libsvm.py b/scikits/learn/svm/tests/test_libsvm.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_libsvm.py
rename to scikits/learn/svm/tests/test_libsvm.py
diff --git a/scikits/learn/machine/svm/tests/test_oneclass.py b/scikits/learn/svm/tests/test_oneclass.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_oneclass.py
rename to scikits/learn/svm/tests/test_oneclass.py
diff --git a/scikits/learn/machine/svm/tests/test_regression.py b/scikits/learn/svm/tests/test_regression.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_regression.py
rename to scikits/learn/svm/tests/test_regression.py
diff --git a/scikits/learn/machine/svm/tests/test_speed.py b/scikits/learn/svm/tests/test_speed.py
similarity index 100%
rename from scikits/learn/machine/svm/tests/test_speed.py
rename to scikits/learn/svm/tests/test_speed.py