From 1a373feb1cbdcd19e9afe2600c62fc3f08a6f6fd Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Wed, 3 Feb 2010 10:43:35 +0000
Subject: [PATCH] Remove machine prefix from namespace.
This change removes the 'machine' namespace, thus making the path for
most modules a bit shorter. For example, learn.machine.ann becomes
learn.ann. In my oppinion, this namespace was superfluous and there is
no loss in removing it.
This commit also renames manifold_learn namespace to manifold.
As a side effect, most modules had to be moved, and this commit breaks
backwards compatibility.
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
git-svn-id: https://scikit-learn.svn.sourceforge.net/svnroot/scikit-learn/trunk@398 22fbfee3-77ab-4535-9bad-27d1bd3bc7d8
---
scikits/learn/__init__.py | 6 +++---
scikits/learn/{machine => }/ann/README | 0
scikits/learn/{machine => }/ann/__init__.py | 0
scikits/learn/{machine => }/ann/data/oil-trn.dat | 0
scikits/learn/{machine => }/ann/data/oil-tst.dat | 0
scikits/learn/{machine => }/ann/data/txor-trn.dat | 0
scikits/learn/{machine => }/ann/data/txor-tst.dat | 0
scikits/learn/{machine => }/ann/data/xor-trn.dat | 0
scikits/learn/{machine => }/ann/data/xor-tst.dat | 0
scikits/learn/{machine => }/ann/doc/mlp.html | 0
scikits/learn/{machine => }/ann/doc/rbf.html | 0
scikits/learn/{machine => }/ann/doc/srn.html | 0
scikits/learn/{machine => }/ann/mlp.py | 0
scikits/learn/{machine => }/ann/rbf.py | 0
scikits/learn/{machine => }/ann/setup.py | 0
scikits/learn/{machine => }/ann/srn.py | 0
scikits/learn/{machine => }/em/Changelog | 0
scikits/learn/{machine => }/em/LICENSE.txt | 0
scikits/learn/{machine => }/em/TODO | 0
scikits/learn/{machine => }/em/__init__.py | 0
scikits/learn/{machine => }/em/_c_densities.py | 0
scikits/learn/{machine => }/em/densities.py | 0
scikits/learn/{machine => }/em/densities2.py | 0
scikits/learn/{machine => }/em/doc/Makefile | 0
scikits/learn/{machine => }/em/doc/base.tex | 0
.../learn/{machine => }/em/doc/examples/demo1.py | 0
.../learn/{machine => }/em/doc/examples/demo2.py | 0
scikits/learn/{machine => }/em/doc/tutorial.pdf | Bin
scikits/learn/{machine => }/em/doc/user.tex | 0
scikits/learn/{machine => em/examples}/__init__.py | 0
.../{machine => }/em/examples/basic_example1.py | 0
.../{machine => }/em/examples/basic_example2.py | 0
.../{machine => }/em/examples/basic_example3.py | 0
.../em/examples/discriminant_analysis.py | 0
scikits/learn/{machine => }/em/examples/examples.py | 0
.../learn/{machine => }/em/examples/expectation.py | 0
.../{machine => }/em/examples/pdfestimation.py | 0
.../{machine => }/em/examples/pdfestimation1d.py | 0
.../learn/{machine => }/em/examples/plotexamples.py | 0
.../em/examples/regularized_example.py | 0
scikits/learn/{machine => }/em/examples/utils.py | 0
scikits/learn/{machine => }/em/gauss_mix.py | 0
scikits/learn/{machine => }/em/gmm_em.py | 0
scikits/learn/{machine => }/em/info.py | 0
scikits/learn/{machine => }/em/misc.py | 0
scikits/learn/{machine => }/em/online_em.py | 0
scikits/learn/{machine => }/em/profile_data/blop.c | 0
scikits/learn/{machine => }/em/profile_data/gden.m | 0
.../learn/{machine => }/em/profile_data/mat_prof.m | 0
.../em/profile_data/profile_densities.py | 0
.../{machine => }/em/profile_data/profile_gmm.py | 0
.../em/profile_data/profile_online_em.py | 0
scikits/learn/{machine => }/em/setup.py | 0
scikits/learn/{machine => }/em/src/Makefile | 0
scikits/learn/{machine => }/em/src/c_gden.c | 0
scikits/learn/{machine => }/em/src/c_gmm.pyx | 0
scikits/learn/{machine => }/em/src/c_numpy.pxd | 0
scikits/learn/{machine => }/em/src/c_python.pxd | 0
scikits/learn/{machine => }/em/src/pure_den.c | 0
scikits/learn/{machine => }/em/tests/__init__.py | 0
scikits/learn/{machine => }/em/tests/diag_1d_3k.mat | Bin
scikits/learn/{machine => }/em/tests/diag_1d_4k.mat | Bin
scikits/learn/{machine => }/em/tests/diag_2d_3k.mat | Bin
scikits/learn/{machine => }/em/tests/full_2d_3k.mat | Bin
.../{machine => }/em/tests/generate_tests_data.py | 0
.../learn/{machine => }/em/tests/test_densities.py | 0
.../learn/{machine => }/em/tests/test_examples.py | 0
.../learn/{machine => }/em/tests/test_gauss_mix.py | 0
scikits/learn/{machine => }/em/tests/test_gmm_em.py | 0
.../learn/{machine => }/em/tests/test_online_em.py | 0
scikits/learn/{machine => }/em/tests/testcommon.py | 0
scikits/learn/machine/setup.py | 12 ------------
scikits/learn/machine/svm/tests/__init__.py | 0
.../manifold_learning => manifold}/__init__.py | 0
.../compression/NLM/__init__.py | 0
.../compression/NLM/cost_function.py | 0
.../compression/__init__.py | 0
.../compression/barycenters.py | 0
.../compression/cca_function.py | 0
.../cca_multiresolution_dimensionality_reduction.py | 0
.../compression/cost_function/__init__.py | 0
.../compression/cost_function/cost_function.cpp | 0
.../compression/cost_function/cost_function.h | 0
.../compression/cost_function/cost_function.py | 0
.../compression/cost_function/modifiedCompression.h | 0
.../compression/cost_function/setup.py | 0
.../compression/dimensionality_reduction.py | 0
.../compression/distances.py | 0
.../compression/euclidian_mds.py | 0
.../compression/geodesic_mds.py | 0
.../compression/isomap_function.py | 0
.../multiresolution_dimensionality_reduction.py | 0
.../compression/pca.py | 0
.../quadratic_dimensionality_reduction.py | 0
.../compression/robust_dimensionality_reduction.py | 0
.../compression/setup.py | 0
.../compression/similarities.py | 0
.../compression/similarities_mds.py | 0
.../stochastic_dimensionality_reduction.py | 0
.../compression/tests}/__init__.py | 0
.../compression/tests/test_barycenters.py | 0
.../compression/tests/test_similarities.py | 0
.../compression/tools.py | 0
.../examples/compression.py | 0
.../manifold_learning => manifold}/examples/knn.py | 0
.../manifold_learning => manifold}/examples/knn2.py | 0
.../examples/projection.py | 0
.../examples/regression.py | 0
.../examples/swissroll.isomap.pickled | 0
.../examples/swissroll.pickled | 0
.../examples/swissroll.projected.pickled | 0
.../examples/swissroll.regressed.pickled | 0
.../examples/swissroll.samples.pickled | 0
.../projection/MAP_projection.py | 0
.../projection/ML_projection.py | 0
.../projection/__init__.py | 0
.../projection/grid_MAP_projection.py | 0
.../projection/grid_ML_projection.py | 0
.../regression/CPLMR.py | 0
.../regression/MLPLMR.py | 0
.../regression/PCA.py | 0
.../regression/PLMR.py | 0
.../regression/__init__.py | 0
.../regression/cluster/ModifiedGeneralClustering.h | 0
.../regression/cluster/ModifiedGeneralClustering.i | 0
.../regression/cluster/__init__.py | 0
.../regression/cluster/clusterInfos.h | 0
.../regression/cluster/setup.py | 0
.../regression/neighbors/__init__.py | 0
.../regression/neighbors/neighbors.py | 0
.../regression/setup.py | 0
.../regression}/tests/__init__.py | 0
.../regression/tests/test_neighbors.py | 0
.../manifold_learning => manifold}/setup.py | 0
.../src/matrix/container_iterator.h | 0
.../src/matrix/diagonal_matrix_iterator.h | 0
.../src/matrix/diagonal_matrix_lib.h | 0
.../src/matrix/dynamic_container_matrix.h | 0
.../src/matrix/expression_template.h | 0
.../src/matrix/expression_template_iterators.h | 0
.../src/matrix/inversion.h | 0
.../src/matrix/iterator_based_functions.h | 0
.../src/matrix/matrix_functions.h | 0
.../src/matrix/matrix_lib.h | 0
.../src/matrix/matrix_traits.h | 0
.../src/matrix/pointer_matrix.h | 0
.../src/matrix/static_container_matrix.h | 0
.../src/matrix/sub_matrix_iterator.h | 0
.../src/matrix/sub_matrix_lib.h | 0
.../src/matrix/sub_vector_lib.h | 0
.../src/matrix/sub_vector_matrix_iterator.h | 0
.../src/matrix/sub_vector_matrix_lib.h | 0
.../src/matrix/type_traits.h | 0
.../manifold_learning => manifold}/src/numpy.i | 0
.../stats/__init__.py | 0
.../stats/gaussian.py | 0
.../manifold_learning => manifold}/stats/gm.py | 0
.../stats/kernels/__init__.py | 0
.../stats/kernels/gaussian.py | 0
.../stats/kernels/gm.py | 0
.../stats/kernels/laplace.py | 0
.../manifold_learning => manifold}/stats/laplace.py | 0
.../stats/radial_basis_functions_field.py | 0
.../manifold_learning => manifold}/stats/setup.py | 0
scikits/learn/setup.py | 8 ++++----
scikits/learn/{machine => }/svm/README | 0
scikits/learn/{machine => }/svm/__init__.py | 0
scikits/learn/{machine => }/svm/classification.py | 0
scikits/learn/{machine => }/svm/dataset.py | 0
.../regression/tests => svm/examples}/__init__.py | 0
.../{machine => }/svm/examples/classification.py | 0
.../{machine => }/svm/examples/classification2.py | 0
scikits/learn/{machine => }/svm/examples/utils.py | 0
scikits/learn/{machine => }/svm/kernel.py | 0
.../{machine => }/svm/libsvm-2.82/Makefile.win | 0
.../learn/{machine => }/svm/libsvm-2.82/SConstruct | 0
scikits/learn/{machine => }/svm/libsvm-2.82/svm.cpp | 0
scikits/learn/{machine => }/svm/libsvm-2.82/svm.h | 0
scikits/learn/{machine => }/svm/libsvm.py | 0
scikits/learn/{machine => }/svm/model.py | 0
scikits/learn/{machine => }/svm/oneclass.py | 0
scikits/learn/{machine => }/svm/predict.py | 0
scikits/learn/{machine => }/svm/regression.py | 0
scikits/learn/{machine => }/svm/setup.py | 0
.../{machine/svm/examples => svm/tests}/__init__.py | 0
scikits/learn/{machine => }/svm/tests/test_all.py | 0
.../{machine => }/svm/tests/test_classification.py | 0
.../learn/{machine => }/svm/tests/test_dataset.py | 0
.../learn/{machine => }/svm/tests/test_kernel.py | 0
.../learn/{machine => }/svm/tests/test_libsvm.py | 0
.../learn/{machine => }/svm/tests/test_oneclass.py | 0
.../{machine => }/svm/tests/test_regression.py | 0
scikits/learn/{machine => }/svm/tests/test_speed.py | 0
193 files changed, 7 insertions(+), 19 deletions(-)
rename scikits/learn/{machine => }/ann/README (100%)
rename scikits/learn/{machine => }/ann/__init__.py (100%)
rename scikits/learn/{machine => }/ann/data/oil-trn.dat (100%)
rename scikits/learn/{machine => }/ann/data/oil-tst.dat (100%)
rename scikits/learn/{machine => }/ann/data/txor-trn.dat (100%)
rename scikits/learn/{machine => }/ann/data/txor-tst.dat (100%)
rename scikits/learn/{machine => }/ann/data/xor-trn.dat (100%)
rename scikits/learn/{machine => }/ann/data/xor-tst.dat (100%)
rename scikits/learn/{machine => }/ann/doc/mlp.html (100%)
rename scikits/learn/{machine => }/ann/doc/rbf.html (100%)
rename scikits/learn/{machine => }/ann/doc/srn.html (100%)
rename scikits/learn/{machine => }/ann/mlp.py (100%)
rename scikits/learn/{machine => }/ann/rbf.py (100%)
rename scikits/learn/{machine => }/ann/setup.py (100%)
rename scikits/learn/{machine => }/ann/srn.py (100%)
rename scikits/learn/{machine => }/em/Changelog (100%)
rename scikits/learn/{machine => }/em/LICENSE.txt (100%)
rename scikits/learn/{machine => }/em/TODO (100%)
rename scikits/learn/{machine => }/em/__init__.py (100%)
rename scikits/learn/{machine => }/em/_c_densities.py (100%)
rename scikits/learn/{machine => }/em/densities.py (100%)
rename scikits/learn/{machine => }/em/densities2.py (100%)
rename scikits/learn/{machine => }/em/doc/Makefile (100%)
rename scikits/learn/{machine => }/em/doc/base.tex (100%)
rename scikits/learn/{machine => }/em/doc/examples/demo1.py (100%)
rename scikits/learn/{machine => }/em/doc/examples/demo2.py (100%)
rename scikits/learn/{machine => }/em/doc/tutorial.pdf (100%)
rename scikits/learn/{machine => }/em/doc/user.tex (100%)
rename scikits/learn/{machine => em/examples}/__init__.py (100%)
rename scikits/learn/{machine => }/em/examples/basic_example1.py (100%)
rename scikits/learn/{machine => }/em/examples/basic_example2.py (100%)
rename scikits/learn/{machine => }/em/examples/basic_example3.py (100%)
rename scikits/learn/{machine => }/em/examples/discriminant_analysis.py (100%)
rename scikits/learn/{machine => }/em/examples/examples.py (100%)
rename scikits/learn/{machine => }/em/examples/expectation.py (100%)
rename scikits/learn/{machine => }/em/examples/pdfestimation.py (100%)
rename scikits/learn/{machine => }/em/examples/pdfestimation1d.py (100%)
rename scikits/learn/{machine => }/em/examples/plotexamples.py (100%)
rename scikits/learn/{machine => }/em/examples/regularized_example.py (100%)
rename scikits/learn/{machine => }/em/examples/utils.py (100%)
rename scikits/learn/{machine => }/em/gauss_mix.py (100%)
rename scikits/learn/{machine => }/em/gmm_em.py (100%)
rename scikits/learn/{machine => }/em/info.py (100%)
rename scikits/learn/{machine => }/em/misc.py (100%)
rename scikits/learn/{machine => }/em/online_em.py (100%)
rename scikits/learn/{machine => }/em/profile_data/blop.c (100%)
rename scikits/learn/{machine => }/em/profile_data/gden.m (100%)
rename scikits/learn/{machine => }/em/profile_data/mat_prof.m (100%)
rename scikits/learn/{machine => }/em/profile_data/profile_densities.py (100%)
rename scikits/learn/{machine => }/em/profile_data/profile_gmm.py (100%)
rename scikits/learn/{machine => }/em/profile_data/profile_online_em.py (100%)
rename scikits/learn/{machine => }/em/setup.py (100%)
rename scikits/learn/{machine => }/em/src/Makefile (100%)
rename scikits/learn/{machine => }/em/src/c_gden.c (100%)
rename scikits/learn/{machine => }/em/src/c_gmm.pyx (100%)
rename scikits/learn/{machine => }/em/src/c_numpy.pxd (100%)
rename scikits/learn/{machine => }/em/src/c_python.pxd (100%)
rename scikits/learn/{machine => }/em/src/pure_den.c (100%)
rename scikits/learn/{machine => }/em/tests/__init__.py (100%)
rename scikits/learn/{machine => }/em/tests/diag_1d_3k.mat (100%)
rename scikits/learn/{machine => }/em/tests/diag_1d_4k.mat (100%)
rename scikits/learn/{machine => }/em/tests/diag_2d_3k.mat (100%)
rename scikits/learn/{machine => }/em/tests/full_2d_3k.mat (100%)
rename scikits/learn/{machine => }/em/tests/generate_tests_data.py (100%)
rename scikits/learn/{machine => }/em/tests/test_densities.py (100%)
rename scikits/learn/{machine => }/em/tests/test_examples.py (100%)
rename scikits/learn/{machine => }/em/tests/test_gauss_mix.py (100%)
rename scikits/learn/{machine => }/em/tests/test_gmm_em.py (100%)
rename scikits/learn/{machine => }/em/tests/test_online_em.py (100%)
rename scikits/learn/{machine => }/em/tests/testcommon.py (100%)
delete mode 100644 scikits/learn/machine/setup.py
delete mode 100644 scikits/learn/machine/svm/tests/__init__.py
rename scikits/learn/{machine/manifold_learning => manifold}/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/NLM/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/NLM/cost_function.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/barycenters.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cca_function.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cca_multiresolution_dimensionality_reduction.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cost_function/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cost_function/cost_function.cpp (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cost_function/cost_function.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cost_function/cost_function.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cost_function/modifiedCompression.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/cost_function/setup.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/dimensionality_reduction.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/distances.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/euclidian_mds.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/geodesic_mds.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/isomap_function.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/multiresolution_dimensionality_reduction.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/pca.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/quadratic_dimensionality_reduction.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/robust_dimensionality_reduction.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/setup.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/similarities.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/similarities_mds.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/stochastic_dimensionality_reduction.py (100%)
rename scikits/learn/{machine/em/examples => manifold/compression/tests}/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/tests/test_barycenters.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/tests/test_similarities.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/compression/tools.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/compression.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/knn.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/knn2.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/projection.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/regression.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/swissroll.isomap.pickled (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/swissroll.pickled (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/swissroll.projected.pickled (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/swissroll.regressed.pickled (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/examples/swissroll.samples.pickled (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/projection/MAP_projection.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/projection/ML_projection.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/projection/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/projection/grid_MAP_projection.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/projection/grid_ML_projection.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/CPLMR.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/MLPLMR.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/PCA.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/PLMR.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/cluster/ModifiedGeneralClustering.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/cluster/ModifiedGeneralClustering.i (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/cluster/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/cluster/clusterInfos.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/cluster/setup.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/neighbors/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/neighbors/neighbors.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/setup.py (100%)
rename scikits/learn/{machine/manifold_learning/compression => manifold/regression}/tests/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/regression/tests/test_neighbors.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/setup.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/container_iterator.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/diagonal_matrix_iterator.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/diagonal_matrix_lib.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/dynamic_container_matrix.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/expression_template.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/expression_template_iterators.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/inversion.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/iterator_based_functions.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/matrix_functions.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/matrix_lib.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/matrix_traits.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/pointer_matrix.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/static_container_matrix.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/sub_matrix_iterator.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/sub_matrix_lib.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/sub_vector_lib.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/sub_vector_matrix_iterator.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/sub_vector_matrix_lib.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/matrix/type_traits.h (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/src/numpy.i (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/gaussian.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/gm.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/kernels/__init__.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/kernels/gaussian.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/kernels/gm.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/kernels/laplace.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/laplace.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/radial_basis_functions_field.py (100%)
rename scikits/learn/{machine/manifold_learning => manifold}/stats/setup.py (100%)
rename scikits/learn/{machine => }/svm/README (100%)
rename scikits/learn/{machine => }/svm/__init__.py (100%)
rename scikits/learn/{machine => }/svm/classification.py (100%)
rename scikits/learn/{machine => }/svm/dataset.py (100%)
rename scikits/learn/{machine/manifold_learning/regression/tests => svm/examples}/__init__.py (100%)
rename scikits/learn/{machine => }/svm/examples/classification.py (100%)
rename scikits/learn/{machine => }/svm/examples/classification2.py (100%)
rename scikits/learn/{machine => }/svm/examples/utils.py (100%)
rename scikits/learn/{machine => }/svm/kernel.py (100%)
rename scikits/learn/{machine => }/svm/libsvm-2.82/Makefile.win (100%)
rename scikits/learn/{machine => }/svm/libsvm-2.82/SConstruct (100%)
rename scikits/learn/{machine => }/svm/libsvm-2.82/svm.cpp (100%)
rename scikits/learn/{machine => }/svm/libsvm-2.82/svm.h (100%)
rename scikits/learn/{machine => }/svm/libsvm.py (100%)
rename scikits/learn/{machine => }/svm/model.py (100%)
rename scikits/learn/{machine => }/svm/oneclass.py (100%)
rename scikits/learn/{machine => }/svm/predict.py (100%)
rename scikits/learn/{machine => }/svm/regression.py (100%)
rename scikits/learn/{machine => }/svm/setup.py (100%)
rename scikits/learn/{machine/svm/examples => svm/tests}/__init__.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_all.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_classification.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_dataset.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_kernel.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_libsvm.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_oneclass.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_regression.py (100%)
rename scikits/learn/{machine => }/svm/tests/test_speed.py (100%)
diff --git a/scikits/learn/__init__.py b/scikits/learn/__init__.py
index db30a3f04e..444183247d 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 359d00e18d..0000000000
--- 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 e69de29bb2..0000000000
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 d2b6c51b4a..27cfed136d 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
--
GitLab