From 2bd68567bc3ce3aab55edfd6dd46fdc6ce3f124a Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Wed, 14 Apr 2010 15:44:30 +0000
Subject: [PATCH] Revert 'src' to 'fastlib' so I don't break everything
 fl-build does.

---
 fastlib/trunk/CMakeLists.txt                                    | 2 +-
 fastlib/trunk/{src => fastlib}/CMakeLists.txt                   | 0
 fastlib/trunk/{src => fastlib}/base/CMakeLists.txt              | 0
 fastlib/trunk/{src => fastlib}/base/Makefile.inc                | 0
 fastlib/trunk/{src => fastlib}/base/ansi_colors.h               | 0
 fastlib/trunk/{src => fastlib}/base/base.h                      | 0
 fastlib/trunk/{src => fastlib}/base/basic_types.h               | 0
 fastlib/trunk/{src => fastlib}/base/build.py                    | 0
 fastlib/trunk/{src => fastlib}/base/cc.cc                       | 0
 fastlib/trunk/{src => fastlib}/base/cc.h                        | 0
 fastlib/trunk/{src => fastlib}/base/ccmem.cc                    | 0
 fastlib/trunk/{src => fastlib}/base/ccmem.h                     | 0
 fastlib/trunk/{src => fastlib}/base/common.c                    | 0
 fastlib/trunk/{src => fastlib}/base/common.h                    | 0
 fastlib/trunk/{src => fastlib}/base/compiler.h                  | 0
 fastlib/trunk/{src => fastlib}/base/config.py                   | 0
 fastlib/trunk/{src => fastlib}/base/debug.c                     | 0
 fastlib/trunk/{src => fastlib}/base/debug.h                     | 0
 fastlib/trunk/{src => fastlib}/base/deprecated.h                | 0
 fastlib/trunk/{src => fastlib}/base/fortran.h                   | 0
 fastlib/trunk/{src => fastlib}/base/otrav.cc                    | 0
 fastlib/trunk/{src => fastlib}/base/otrav.h                     | 0
 fastlib/trunk/{src => fastlib}/base/otrav_impl.h                | 0
 fastlib/trunk/{src => fastlib}/base/test.h                      | 0
 fastlib/trunk/{src => fastlib}/build.py                         | 0
 fastlib/trunk/{src => fastlib}/col/CMakeLists.txt               | 0
 fastlib/trunk/{src => fastlib}/col/arraylist.h                  | 0
 fastlib/trunk/{src => fastlib}/col/build.py                     | 0
 fastlib/trunk/{src => fastlib}/col/col.cc                       | 0
 fastlib/trunk/{src => fastlib}/col/col_string.h                 | 0
 fastlib/trunk/{src => fastlib}/col/col_test.cc                  | 0
 fastlib/trunk/{src => fastlib}/col/fastalloc.h                  | 0
 fastlib/trunk/{src => fastlib}/col/heap.h                       | 0
 fastlib/trunk/{src => fastlib}/col/intmap.h                     | 0
 fastlib/trunk/{src => fastlib}/col/queue.h                      | 0
 fastlib/trunk/{src => fastlib}/col/rangeset.h                   | 0
 fastlib/trunk/{src => fastlib}/data/CMakeLists.txt              | 0
 fastlib/trunk/{src => fastlib}/data/build.py                    | 0
 fastlib/trunk/{src => fastlib}/data/crossvalidation.h           | 0
 fastlib/trunk/{src => fastlib}/data/dataset.cc                  | 0
 fastlib/trunk/{src => fastlib}/data/dataset.h                   | 0
 fastlib/trunk/{src => fastlib}/data/dataset_test.cc             | 0
 fastlib/trunk/{src => fastlib}/data/test/fake.arff              | 0
 fastlib/trunk/{src => fastlib}/data/test/fake.csv               | 0
 fastlib/trunk/{src => fastlib}/data/test/fake.csvh              | 0
 fastlib/trunk/{src => fastlib}/data/test/fake.tsv               | 0
 fastlib/trunk/{src => fastlib}/data/test/fake.weird             | 0
 fastlib/trunk/{src => fastlib}/data/test/fakeout1.arff          | 0
 fastlib/trunk/{src => fastlib}/data/test/fakeout1.csv           | 0
 fastlib/trunk/{src => fastlib}/data/test/test_dataset_copy.arff | 0
 .../trunk/{src => fastlib}/data/test/test_dataset_layout.arff   | 0
 fastlib/trunk/{src => fastlib}/data/test/tmpfile.txt            | 0
 fastlib/trunk/{src => fastlib}/data/test_dataset_copy.arff      | 0
 fastlib/trunk/{src => fastlib}/data/test_dataset_layout.arff    | 0
 fastlib/trunk/{src => fastlib}/data/tmpfile.txt                 | 0
 fastlib/trunk/{src => fastlib}/fake.arff                        | 0
 fastlib/trunk/{src => fastlib}/fastlib.h                        | 0
 fastlib/trunk/{src => fastlib}/fastlib_int.h                    | 0
 fastlib/trunk/{src => fastlib}/file/CMakeLists.txt              | 0
 fastlib/trunk/{src => fastlib}/file/build.py                    | 0
 fastlib/trunk/{src => fastlib}/file/textfile.cc                 | 0
 fastlib/trunk/{src => fastlib}/file/textfile.h                  | 0
 fastlib/trunk/{src => fastlib}/file/textfile_test.cc            | 0
 fastlib/trunk/{src => fastlib}/fx/CMakeLists.txt                | 0
 fastlib/trunk/{src => fastlib}/fx/build.py                      | 0
 fastlib/trunk/{src => fastlib}/fx/datanode.c                    | 0
 fastlib/trunk/{src => fastlib}/fx/datanode.h                    | 0
 fastlib/trunk/{src => fastlib}/fx/fx.c                          | 0
 fastlib/trunk/{src => fastlib}/fx/fx.h                          | 0
 fastlib/trunk/{src => fastlib}/fx/stopwatch.c                   | 0
 fastlib/trunk/{src => fastlib}/fx/stopwatch.h                   | 0
 fastlib/trunk/{src => fastlib}/la/CMakeLists.txt                | 0
 fastlib/trunk/{src => fastlib}/la/blas.h                        | 0
 fastlib/trunk/{src => fastlib}/la/build.py                      | 0
 fastlib/trunk/{src => fastlib}/la/clapack.h                     | 0
 fastlib/trunk/{src => fastlib}/la/la.h                          | 0
 fastlib/trunk/{src => fastlib}/la/matrix.h                      | 0
 fastlib/trunk/{src => fastlib}/la/uselapack.cc                  | 0
 fastlib/trunk/{src => fastlib}/la/uselapack.h                   | 0
 fastlib/trunk/{src => fastlib}/la/uselapack_test.cc             | 0
 fastlib/trunk/{src => fastlib}/math/CMakeLists.txt              | 0
 fastlib/trunk/{src => fastlib}/math/build.py                    | 0
 fastlib/trunk/{src => fastlib}/math/discrete.cc                 | 0
 fastlib/trunk/{src => fastlib}/math/discrete.h                  | 0
 fastlib/trunk/{src => fastlib}/math/geometry.cc                 | 0
 fastlib/trunk/{src => fastlib}/math/geometry.h                  | 0
 fastlib/trunk/{src => fastlib}/math/kernel.h                    | 0
 fastlib/trunk/{src => fastlib}/math/math_lib.h                  | 0
 fastlib/trunk/{src => fastlib}/math/math_lib_impl.h             | 0
 fastlib/trunk/{src => fastlib}/math/statistics.cc               | 0
 fastlib/trunk/{src => fastlib}/math/statistics.h                | 0
 fastlib/trunk/{src => fastlib}/mmanager/build.py                | 0
 fastlib/trunk/{src => fastlib}/mmanager/memory_manager.cc       | 0
 fastlib/trunk/{src => fastlib}/mmanager/memory_manager.h        | 0
 fastlib/trunk/{src => fastlib}/mmanager/memory_manager_test.cc  | 0
 fastlib/trunk/{src => fastlib}/optimization/CMakeLists.txt      | 0
 fastlib/trunk/{src => fastlib}/optimization/build.py            | 0
 .../trunk/{src => fastlib}/optimization/contrib/CMakeLists.txt  | 0
 fastlib/trunk/{src => fastlib}/optimization/contrib/README.txt  | 0
 fastlib/trunk/{src => fastlib}/optimization/contrib/REFERENCE   | 0
 .../trunk/{src => fastlib}/optimization/contrib/optimizers.cc   | 0
 .../trunk/{src => fastlib}/optimization/contrib/optimizers.h    | 0
 .../trunk/{src => fastlib}/optimization/lbfgs/CMakeLists.txt    | 0
 fastlib/trunk/{src => fastlib}/optimization/lbfgs/build.py      | 0
 fastlib/trunk/{src => fastlib}/optimization/lbfgs/lbfgs.h       | 0
 fastlib/trunk/{src => fastlib}/optimization/lbfgs/lbfgs_impl.h  | 0
 .../{src => fastlib}/optimization/lbfgs/optimization_utils.h    | 0
 fastlib/trunk/{src => fastlib}/optimization/lbfgs/test_lbfgs.cc | 0
 .../trunk/{src => fastlib}/optimization/optpp/CMakeLists.txt    | 0
 fastlib/trunk/{src => fastlib}/optimization/optpp/build.py      | 0
 fastlib/trunk/{src => fastlib}/optimization/optpp/optimizer.h   | 0
 .../trunk/{src => fastlib}/optimization/optpp/optimizer_test.cc | 0
 .../{src => fastlib}/optimization/optpp/optimizer_tests.cc      | 0
 fastlib/trunk/{src => fastlib}/otrav_test.cc                    | 0
 fastlib/trunk/{src => fastlib}/par/CMakeLists.txt               | 0
 fastlib/trunk/{src => fastlib}/par/build.py                     | 0
 fastlib/trunk/{src => fastlib}/par/grain.h                      | 0
 fastlib/trunk/{src => fastlib}/par/task.h                       | 0
 fastlib/trunk/{src => fastlib}/par/thread.cc                    | 0
 fastlib/trunk/{src => fastlib}/par/thread.h                     | 0
 fastlib/trunk/{src => fastlib}/sparse/A.txt                     | 0
 fastlib/trunk/{src => fastlib}/sparse/AdottimesB.txt            | 0
 fastlib/trunk/{src => fastlib}/sparse/AminusB.txt               | 0
 fastlib/trunk/{src => fastlib}/sparse/AplusB.txt                | 0
 fastlib/trunk/{src => fastlib}/sparse/AtimesAtrans.txt          | 0
 fastlib/trunk/{src => fastlib}/sparse/AtimesB.txt               | 0
 fastlib/trunk/{src => fastlib}/sparse/B.txt                     | 0
 fastlib/trunk/{src => fastlib}/sparse/CMakeLists.txt            | 0
 fastlib/trunk/{src => fastlib}/sparse/I-W.txt                   | 0
 fastlib/trunk/{src => fastlib}/sparse/I-W_time_I-W_trans.txt    | 0
 fastlib/trunk/{src => fastlib}/sparse/build.py                  | 0
 fastlib/trunk/{src => fastlib}/sparse/sparse_matrix.h           | 0
 fastlib/trunk/{src => fastlib}/sparse/sparse_matrix_impl.h      | 0
 fastlib/trunk/{src => fastlib}/sparse/sparse_matrix_test.cc     | 0
 fastlib/trunk/{src => fastlib}/test_dataset_copy.arff           | 0
 fastlib/trunk/{src => fastlib}/test_dataset_layout.arff         | 0
 fastlib/trunk/{src => fastlib}/thor/CMakeLists.txt              | 0
 fastlib/trunk/{src => fastlib}/thor/allnn.cc                    | 0
 fastlib/trunk/{src => fastlib}/thor/blockdev.cc                 | 0
 fastlib/trunk/{src => fastlib}/thor/blockdev.h                  | 0
 fastlib/trunk/{src => fastlib}/thor/build.py                    | 0
 fastlib/trunk/{src => fastlib}/thor/cache.h                     | 0
 fastlib/trunk/{src => fastlib}/thor/cachearray.h                | 0
 fastlib/trunk/{src => fastlib}/thor/cachearray_impl.h           | 0
 fastlib/trunk/{src => fastlib}/thor/dfs.h                       | 0
 fastlib/trunk/{src => fastlib}/thor/dfs_impl.h                  | 0
 fastlib/trunk/{src => fastlib}/thor/distribcache.cc             | 0
 fastlib/trunk/{src => fastlib}/thor/distribcache.h              | 0
 fastlib/trunk/{src => fastlib}/thor/gnp.h                       | 0
 fastlib/trunk/{src => fastlib}/thor/kdbtree.h                   | 0
 fastlib/trunk/{src => fastlib}/thor/kdbtree_impl.h              | 0
 fastlib/trunk/{src => fastlib}/thor/kdtree.h                    | 0
 fastlib/trunk/{src => fastlib}/thor/kdtree_impl.h               | 0
 fastlib/trunk/{src => fastlib}/thor/rbfs.h                      | 0
 fastlib/trunk/{src => fastlib}/thor/rbfs_impl.h                 | 0
 fastlib/trunk/{src => fastlib}/thor/rpc.cc                      | 0
 fastlib/trunk/{src => fastlib}/thor/rpc.h                       | 0
 fastlib/trunk/{src => fastlib}/thor/rpc_base.h                  | 0
 fastlib/trunk/{src => fastlib}/thor/rpc_sock.cc                 | 0
 fastlib/trunk/{src => fastlib}/thor/rpc_sock.h                  | 0
 fastlib/trunk/{src => fastlib}/thor/sched.cc                    | 0
 fastlib/trunk/{src => fastlib}/thor/sched.h                     | 0
 fastlib/trunk/{src => fastlib}/thor/sched_impl.h                | 0
 fastlib/trunk/{src => fastlib}/thor/thor.h                      | 0
 fastlib/trunk/{src => fastlib}/thor/thor_struct.h               | 0
 fastlib/trunk/{src => fastlib}/thor/thor_utils.h                | 0
 fastlib/trunk/{src => fastlib}/thor/thor_utils_impl.h           | 0
 fastlib/trunk/{src => fastlib}/thor/thortree.h                  | 0
 fastlib/trunk/{src => fastlib}/thor/thortree_impl.h             | 0
 fastlib/trunk/{src => fastlib}/tree/CMakeLists.txt              | 0
 fastlib/trunk/{src => fastlib}/tree/bounds.h                    | 0
 fastlib/trunk/{src => fastlib}/tree/build.py                    | 0
 fastlib/trunk/{src => fastlib}/tree/kdtree.h                    | 0
 fastlib/trunk/{src => fastlib}/tree/kdtree_impl.h               | 0
 fastlib/trunk/{src => fastlib}/tree/spacetree.h                 | 0
 fastlib/trunk/{src => fastlib}/tree/statistic.h                 | 0
 fastlib/trunk/{src => fastlib}/tree/tree_test.cc                | 0
 177 files changed, 1 insertion(+), 1 deletion(-)
 rename fastlib/trunk/{src => fastlib}/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/base/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/base/Makefile.inc (100%)
 rename fastlib/trunk/{src => fastlib}/base/ansi_colors.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/base.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/basic_types.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/base/cc.cc (100%)
 rename fastlib/trunk/{src => fastlib}/base/cc.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/ccmem.cc (100%)
 rename fastlib/trunk/{src => fastlib}/base/ccmem.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/common.c (100%)
 rename fastlib/trunk/{src => fastlib}/base/common.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/compiler.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/config.py (100%)
 rename fastlib/trunk/{src => fastlib}/base/debug.c (100%)
 rename fastlib/trunk/{src => fastlib}/base/debug.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/deprecated.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/fortran.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/otrav.cc (100%)
 rename fastlib/trunk/{src => fastlib}/base/otrav.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/otrav_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/base/test.h (100%)
 rename fastlib/trunk/{src => fastlib}/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/col/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/col/arraylist.h (100%)
 rename fastlib/trunk/{src => fastlib}/col/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/col/col.cc (100%)
 rename fastlib/trunk/{src => fastlib}/col/col_string.h (100%)
 rename fastlib/trunk/{src => fastlib}/col/col_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/col/fastalloc.h (100%)
 rename fastlib/trunk/{src => fastlib}/col/heap.h (100%)
 rename fastlib/trunk/{src => fastlib}/col/intmap.h (100%)
 rename fastlib/trunk/{src => fastlib}/col/queue.h (100%)
 rename fastlib/trunk/{src => fastlib}/col/rangeset.h (100%)
 rename fastlib/trunk/{src => fastlib}/data/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/data/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/data/crossvalidation.h (100%)
 rename fastlib/trunk/{src => fastlib}/data/dataset.cc (100%)
 rename fastlib/trunk/{src => fastlib}/data/dataset.h (100%)
 rename fastlib/trunk/{src => fastlib}/data/dataset_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/fake.arff (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/fake.csv (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/fake.csvh (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/fake.tsv (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/fake.weird (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/fakeout1.arff (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/fakeout1.csv (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/test_dataset_copy.arff (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/test_dataset_layout.arff (100%)
 rename fastlib/trunk/{src => fastlib}/data/test/tmpfile.txt (100%)
 rename fastlib/trunk/{src => fastlib}/data/test_dataset_copy.arff (100%)
 rename fastlib/trunk/{src => fastlib}/data/test_dataset_layout.arff (100%)
 rename fastlib/trunk/{src => fastlib}/data/tmpfile.txt (100%)
 rename fastlib/trunk/{src => fastlib}/fake.arff (100%)
 rename fastlib/trunk/{src => fastlib}/fastlib.h (100%)
 rename fastlib/trunk/{src => fastlib}/fastlib_int.h (100%)
 rename fastlib/trunk/{src => fastlib}/file/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/file/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/file/textfile.cc (100%)
 rename fastlib/trunk/{src => fastlib}/file/textfile.h (100%)
 rename fastlib/trunk/{src => fastlib}/file/textfile_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/fx/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/fx/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/fx/datanode.c (100%)
 rename fastlib/trunk/{src => fastlib}/fx/datanode.h (100%)
 rename fastlib/trunk/{src => fastlib}/fx/fx.c (100%)
 rename fastlib/trunk/{src => fastlib}/fx/fx.h (100%)
 rename fastlib/trunk/{src => fastlib}/fx/stopwatch.c (100%)
 rename fastlib/trunk/{src => fastlib}/fx/stopwatch.h (100%)
 rename fastlib/trunk/{src => fastlib}/la/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/la/blas.h (100%)
 rename fastlib/trunk/{src => fastlib}/la/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/la/clapack.h (100%)
 rename fastlib/trunk/{src => fastlib}/la/la.h (100%)
 rename fastlib/trunk/{src => fastlib}/la/matrix.h (100%)
 rename fastlib/trunk/{src => fastlib}/la/uselapack.cc (100%)
 rename fastlib/trunk/{src => fastlib}/la/uselapack.h (100%)
 rename fastlib/trunk/{src => fastlib}/la/uselapack_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/math/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/math/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/math/discrete.cc (100%)
 rename fastlib/trunk/{src => fastlib}/math/discrete.h (100%)
 rename fastlib/trunk/{src => fastlib}/math/geometry.cc (100%)
 rename fastlib/trunk/{src => fastlib}/math/geometry.h (100%)
 rename fastlib/trunk/{src => fastlib}/math/kernel.h (100%)
 rename fastlib/trunk/{src => fastlib}/math/math_lib.h (100%)
 rename fastlib/trunk/{src => fastlib}/math/math_lib_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/math/statistics.cc (100%)
 rename fastlib/trunk/{src => fastlib}/math/statistics.h (100%)
 rename fastlib/trunk/{src => fastlib}/mmanager/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/mmanager/memory_manager.cc (100%)
 rename fastlib/trunk/{src => fastlib}/mmanager/memory_manager.h (100%)
 rename fastlib/trunk/{src => fastlib}/mmanager/memory_manager_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/contrib/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/contrib/README.txt (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/contrib/REFERENCE (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/contrib/optimizers.cc (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/contrib/optimizers.h (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/lbfgs/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/lbfgs/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/lbfgs/lbfgs.h (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/lbfgs/lbfgs_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/lbfgs/optimization_utils.h (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/lbfgs/test_lbfgs.cc (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/optpp/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/optpp/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/optpp/optimizer.h (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/optpp/optimizer_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/optimization/optpp/optimizer_tests.cc (100%)
 rename fastlib/trunk/{src => fastlib}/otrav_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/par/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/par/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/par/grain.h (100%)
 rename fastlib/trunk/{src => fastlib}/par/task.h (100%)
 rename fastlib/trunk/{src => fastlib}/par/thread.cc (100%)
 rename fastlib/trunk/{src => fastlib}/par/thread.h (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/A.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/AdottimesB.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/AminusB.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/AplusB.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/AtimesAtrans.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/AtimesB.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/B.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/I-W.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/I-W_time_I-W_trans.txt (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/sparse_matrix.h (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/sparse_matrix_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/sparse/sparse_matrix_test.cc (100%)
 rename fastlib/trunk/{src => fastlib}/test_dataset_copy.arff (100%)
 rename fastlib/trunk/{src => fastlib}/test_dataset_layout.arff (100%)
 rename fastlib/trunk/{src => fastlib}/thor/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/thor/allnn.cc (100%)
 rename fastlib/trunk/{src => fastlib}/thor/blockdev.cc (100%)
 rename fastlib/trunk/{src => fastlib}/thor/blockdev.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/thor/cache.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/cachearray.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/cachearray_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/dfs.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/dfs_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/distribcache.cc (100%)
 rename fastlib/trunk/{src => fastlib}/thor/distribcache.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/gnp.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/kdbtree.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/kdbtree_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/kdtree.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/kdtree_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/rbfs.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/rbfs_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/rpc.cc (100%)
 rename fastlib/trunk/{src => fastlib}/thor/rpc.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/rpc_base.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/rpc_sock.cc (100%)
 rename fastlib/trunk/{src => fastlib}/thor/rpc_sock.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/sched.cc (100%)
 rename fastlib/trunk/{src => fastlib}/thor/sched.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/sched_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/thor.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/thor_struct.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/thor_utils.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/thor_utils_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/thortree.h (100%)
 rename fastlib/trunk/{src => fastlib}/thor/thortree_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/tree/CMakeLists.txt (100%)
 rename fastlib/trunk/{src => fastlib}/tree/bounds.h (100%)
 rename fastlib/trunk/{src => fastlib}/tree/build.py (100%)
 rename fastlib/trunk/{src => fastlib}/tree/kdtree.h (100%)
 rename fastlib/trunk/{src => fastlib}/tree/kdtree_impl.h (100%)
 rename fastlib/trunk/{src => fastlib}/tree/spacetree.h (100%)
 rename fastlib/trunk/{src => fastlib}/tree/statistic.h (100%)
 rename fastlib/trunk/{src => fastlib}/tree/tree_test.cc (100%)

diff --git a/fastlib/trunk/CMakeLists.txt b/fastlib/trunk/CMakeLists.txt
index 17ad70d400..54d0c3a069 100644
--- a/fastlib/trunk/CMakeLists.txt
+++ b/fastlib/trunk/CMakeLists.txt
@@ -29,7 +29,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/)
 
 ## recurse
-add_subdirectory(src) # fastlib
+add_subdirectory(fastlib) # fastlib
 add_subdirectory(mlpack) # mlpack
 add_subdirectory(contrib) # mlpack_contrib
 #add_subdirectory(physpack) # physpack  ## do not build by default
diff --git a/fastlib/trunk/src/CMakeLists.txt b/fastlib/trunk/fastlib/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/CMakeLists.txt
rename to fastlib/trunk/fastlib/CMakeLists.txt
diff --git a/fastlib/trunk/src/base/CMakeLists.txt b/fastlib/trunk/fastlib/base/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/base/CMakeLists.txt
rename to fastlib/trunk/fastlib/base/CMakeLists.txt
diff --git a/fastlib/trunk/src/base/Makefile.inc b/fastlib/trunk/fastlib/base/Makefile.inc
similarity index 100%
rename from fastlib/trunk/src/base/Makefile.inc
rename to fastlib/trunk/fastlib/base/Makefile.inc
diff --git a/fastlib/trunk/src/base/ansi_colors.h b/fastlib/trunk/fastlib/base/ansi_colors.h
similarity index 100%
rename from fastlib/trunk/src/base/ansi_colors.h
rename to fastlib/trunk/fastlib/base/ansi_colors.h
diff --git a/fastlib/trunk/src/base/base.h b/fastlib/trunk/fastlib/base/base.h
similarity index 100%
rename from fastlib/trunk/src/base/base.h
rename to fastlib/trunk/fastlib/base/base.h
diff --git a/fastlib/trunk/src/base/basic_types.h b/fastlib/trunk/fastlib/base/basic_types.h
similarity index 100%
rename from fastlib/trunk/src/base/basic_types.h
rename to fastlib/trunk/fastlib/base/basic_types.h
diff --git a/fastlib/trunk/src/base/build.py b/fastlib/trunk/fastlib/base/build.py
similarity index 100%
rename from fastlib/trunk/src/base/build.py
rename to fastlib/trunk/fastlib/base/build.py
diff --git a/fastlib/trunk/src/base/cc.cc b/fastlib/trunk/fastlib/base/cc.cc
similarity index 100%
rename from fastlib/trunk/src/base/cc.cc
rename to fastlib/trunk/fastlib/base/cc.cc
diff --git a/fastlib/trunk/src/base/cc.h b/fastlib/trunk/fastlib/base/cc.h
similarity index 100%
rename from fastlib/trunk/src/base/cc.h
rename to fastlib/trunk/fastlib/base/cc.h
diff --git a/fastlib/trunk/src/base/ccmem.cc b/fastlib/trunk/fastlib/base/ccmem.cc
similarity index 100%
rename from fastlib/trunk/src/base/ccmem.cc
rename to fastlib/trunk/fastlib/base/ccmem.cc
diff --git a/fastlib/trunk/src/base/ccmem.h b/fastlib/trunk/fastlib/base/ccmem.h
similarity index 100%
rename from fastlib/trunk/src/base/ccmem.h
rename to fastlib/trunk/fastlib/base/ccmem.h
diff --git a/fastlib/trunk/src/base/common.c b/fastlib/trunk/fastlib/base/common.c
similarity index 100%
rename from fastlib/trunk/src/base/common.c
rename to fastlib/trunk/fastlib/base/common.c
diff --git a/fastlib/trunk/src/base/common.h b/fastlib/trunk/fastlib/base/common.h
similarity index 100%
rename from fastlib/trunk/src/base/common.h
rename to fastlib/trunk/fastlib/base/common.h
diff --git a/fastlib/trunk/src/base/compiler.h b/fastlib/trunk/fastlib/base/compiler.h
similarity index 100%
rename from fastlib/trunk/src/base/compiler.h
rename to fastlib/trunk/fastlib/base/compiler.h
diff --git a/fastlib/trunk/src/base/config.py b/fastlib/trunk/fastlib/base/config.py
similarity index 100%
rename from fastlib/trunk/src/base/config.py
rename to fastlib/trunk/fastlib/base/config.py
diff --git a/fastlib/trunk/src/base/debug.c b/fastlib/trunk/fastlib/base/debug.c
similarity index 100%
rename from fastlib/trunk/src/base/debug.c
rename to fastlib/trunk/fastlib/base/debug.c
diff --git a/fastlib/trunk/src/base/debug.h b/fastlib/trunk/fastlib/base/debug.h
similarity index 100%
rename from fastlib/trunk/src/base/debug.h
rename to fastlib/trunk/fastlib/base/debug.h
diff --git a/fastlib/trunk/src/base/deprecated.h b/fastlib/trunk/fastlib/base/deprecated.h
similarity index 100%
rename from fastlib/trunk/src/base/deprecated.h
rename to fastlib/trunk/fastlib/base/deprecated.h
diff --git a/fastlib/trunk/src/base/fortran.h b/fastlib/trunk/fastlib/base/fortran.h
similarity index 100%
rename from fastlib/trunk/src/base/fortran.h
rename to fastlib/trunk/fastlib/base/fortran.h
diff --git a/fastlib/trunk/src/base/otrav.cc b/fastlib/trunk/fastlib/base/otrav.cc
similarity index 100%
rename from fastlib/trunk/src/base/otrav.cc
rename to fastlib/trunk/fastlib/base/otrav.cc
diff --git a/fastlib/trunk/src/base/otrav.h b/fastlib/trunk/fastlib/base/otrav.h
similarity index 100%
rename from fastlib/trunk/src/base/otrav.h
rename to fastlib/trunk/fastlib/base/otrav.h
diff --git a/fastlib/trunk/src/base/otrav_impl.h b/fastlib/trunk/fastlib/base/otrav_impl.h
similarity index 100%
rename from fastlib/trunk/src/base/otrav_impl.h
rename to fastlib/trunk/fastlib/base/otrav_impl.h
diff --git a/fastlib/trunk/src/base/test.h b/fastlib/trunk/fastlib/base/test.h
similarity index 100%
rename from fastlib/trunk/src/base/test.h
rename to fastlib/trunk/fastlib/base/test.h
diff --git a/fastlib/trunk/src/build.py b/fastlib/trunk/fastlib/build.py
similarity index 100%
rename from fastlib/trunk/src/build.py
rename to fastlib/trunk/fastlib/build.py
diff --git a/fastlib/trunk/src/col/CMakeLists.txt b/fastlib/trunk/fastlib/col/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/col/CMakeLists.txt
rename to fastlib/trunk/fastlib/col/CMakeLists.txt
diff --git a/fastlib/trunk/src/col/arraylist.h b/fastlib/trunk/fastlib/col/arraylist.h
similarity index 100%
rename from fastlib/trunk/src/col/arraylist.h
rename to fastlib/trunk/fastlib/col/arraylist.h
diff --git a/fastlib/trunk/src/col/build.py b/fastlib/trunk/fastlib/col/build.py
similarity index 100%
rename from fastlib/trunk/src/col/build.py
rename to fastlib/trunk/fastlib/col/build.py
diff --git a/fastlib/trunk/src/col/col.cc b/fastlib/trunk/fastlib/col/col.cc
similarity index 100%
rename from fastlib/trunk/src/col/col.cc
rename to fastlib/trunk/fastlib/col/col.cc
diff --git a/fastlib/trunk/src/col/col_string.h b/fastlib/trunk/fastlib/col/col_string.h
similarity index 100%
rename from fastlib/trunk/src/col/col_string.h
rename to fastlib/trunk/fastlib/col/col_string.h
diff --git a/fastlib/trunk/src/col/col_test.cc b/fastlib/trunk/fastlib/col/col_test.cc
similarity index 100%
rename from fastlib/trunk/src/col/col_test.cc
rename to fastlib/trunk/fastlib/col/col_test.cc
diff --git a/fastlib/trunk/src/col/fastalloc.h b/fastlib/trunk/fastlib/col/fastalloc.h
similarity index 100%
rename from fastlib/trunk/src/col/fastalloc.h
rename to fastlib/trunk/fastlib/col/fastalloc.h
diff --git a/fastlib/trunk/src/col/heap.h b/fastlib/trunk/fastlib/col/heap.h
similarity index 100%
rename from fastlib/trunk/src/col/heap.h
rename to fastlib/trunk/fastlib/col/heap.h
diff --git a/fastlib/trunk/src/col/intmap.h b/fastlib/trunk/fastlib/col/intmap.h
similarity index 100%
rename from fastlib/trunk/src/col/intmap.h
rename to fastlib/trunk/fastlib/col/intmap.h
diff --git a/fastlib/trunk/src/col/queue.h b/fastlib/trunk/fastlib/col/queue.h
similarity index 100%
rename from fastlib/trunk/src/col/queue.h
rename to fastlib/trunk/fastlib/col/queue.h
diff --git a/fastlib/trunk/src/col/rangeset.h b/fastlib/trunk/fastlib/col/rangeset.h
similarity index 100%
rename from fastlib/trunk/src/col/rangeset.h
rename to fastlib/trunk/fastlib/col/rangeset.h
diff --git a/fastlib/trunk/src/data/CMakeLists.txt b/fastlib/trunk/fastlib/data/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/data/CMakeLists.txt
rename to fastlib/trunk/fastlib/data/CMakeLists.txt
diff --git a/fastlib/trunk/src/data/build.py b/fastlib/trunk/fastlib/data/build.py
similarity index 100%
rename from fastlib/trunk/src/data/build.py
rename to fastlib/trunk/fastlib/data/build.py
diff --git a/fastlib/trunk/src/data/crossvalidation.h b/fastlib/trunk/fastlib/data/crossvalidation.h
similarity index 100%
rename from fastlib/trunk/src/data/crossvalidation.h
rename to fastlib/trunk/fastlib/data/crossvalidation.h
diff --git a/fastlib/trunk/src/data/dataset.cc b/fastlib/trunk/fastlib/data/dataset.cc
similarity index 100%
rename from fastlib/trunk/src/data/dataset.cc
rename to fastlib/trunk/fastlib/data/dataset.cc
diff --git a/fastlib/trunk/src/data/dataset.h b/fastlib/trunk/fastlib/data/dataset.h
similarity index 100%
rename from fastlib/trunk/src/data/dataset.h
rename to fastlib/trunk/fastlib/data/dataset.h
diff --git a/fastlib/trunk/src/data/dataset_test.cc b/fastlib/trunk/fastlib/data/dataset_test.cc
similarity index 100%
rename from fastlib/trunk/src/data/dataset_test.cc
rename to fastlib/trunk/fastlib/data/dataset_test.cc
diff --git a/fastlib/trunk/src/data/test/fake.arff b/fastlib/trunk/fastlib/data/test/fake.arff
similarity index 100%
rename from fastlib/trunk/src/data/test/fake.arff
rename to fastlib/trunk/fastlib/data/test/fake.arff
diff --git a/fastlib/trunk/src/data/test/fake.csv b/fastlib/trunk/fastlib/data/test/fake.csv
similarity index 100%
rename from fastlib/trunk/src/data/test/fake.csv
rename to fastlib/trunk/fastlib/data/test/fake.csv
diff --git a/fastlib/trunk/src/data/test/fake.csvh b/fastlib/trunk/fastlib/data/test/fake.csvh
similarity index 100%
rename from fastlib/trunk/src/data/test/fake.csvh
rename to fastlib/trunk/fastlib/data/test/fake.csvh
diff --git a/fastlib/trunk/src/data/test/fake.tsv b/fastlib/trunk/fastlib/data/test/fake.tsv
similarity index 100%
rename from fastlib/trunk/src/data/test/fake.tsv
rename to fastlib/trunk/fastlib/data/test/fake.tsv
diff --git a/fastlib/trunk/src/data/test/fake.weird b/fastlib/trunk/fastlib/data/test/fake.weird
similarity index 100%
rename from fastlib/trunk/src/data/test/fake.weird
rename to fastlib/trunk/fastlib/data/test/fake.weird
diff --git a/fastlib/trunk/src/data/test/fakeout1.arff b/fastlib/trunk/fastlib/data/test/fakeout1.arff
similarity index 100%
rename from fastlib/trunk/src/data/test/fakeout1.arff
rename to fastlib/trunk/fastlib/data/test/fakeout1.arff
diff --git a/fastlib/trunk/src/data/test/fakeout1.csv b/fastlib/trunk/fastlib/data/test/fakeout1.csv
similarity index 100%
rename from fastlib/trunk/src/data/test/fakeout1.csv
rename to fastlib/trunk/fastlib/data/test/fakeout1.csv
diff --git a/fastlib/trunk/src/data/test/test_dataset_copy.arff b/fastlib/trunk/fastlib/data/test/test_dataset_copy.arff
similarity index 100%
rename from fastlib/trunk/src/data/test/test_dataset_copy.arff
rename to fastlib/trunk/fastlib/data/test/test_dataset_copy.arff
diff --git a/fastlib/trunk/src/data/test/test_dataset_layout.arff b/fastlib/trunk/fastlib/data/test/test_dataset_layout.arff
similarity index 100%
rename from fastlib/trunk/src/data/test/test_dataset_layout.arff
rename to fastlib/trunk/fastlib/data/test/test_dataset_layout.arff
diff --git a/fastlib/trunk/src/data/test/tmpfile.txt b/fastlib/trunk/fastlib/data/test/tmpfile.txt
similarity index 100%
rename from fastlib/trunk/src/data/test/tmpfile.txt
rename to fastlib/trunk/fastlib/data/test/tmpfile.txt
diff --git a/fastlib/trunk/src/data/test_dataset_copy.arff b/fastlib/trunk/fastlib/data/test_dataset_copy.arff
similarity index 100%
rename from fastlib/trunk/src/data/test_dataset_copy.arff
rename to fastlib/trunk/fastlib/data/test_dataset_copy.arff
diff --git a/fastlib/trunk/src/data/test_dataset_layout.arff b/fastlib/trunk/fastlib/data/test_dataset_layout.arff
similarity index 100%
rename from fastlib/trunk/src/data/test_dataset_layout.arff
rename to fastlib/trunk/fastlib/data/test_dataset_layout.arff
diff --git a/fastlib/trunk/src/data/tmpfile.txt b/fastlib/trunk/fastlib/data/tmpfile.txt
similarity index 100%
rename from fastlib/trunk/src/data/tmpfile.txt
rename to fastlib/trunk/fastlib/data/tmpfile.txt
diff --git a/fastlib/trunk/src/fake.arff b/fastlib/trunk/fastlib/fake.arff
similarity index 100%
rename from fastlib/trunk/src/fake.arff
rename to fastlib/trunk/fastlib/fake.arff
diff --git a/fastlib/trunk/src/fastlib.h b/fastlib/trunk/fastlib/fastlib.h
similarity index 100%
rename from fastlib/trunk/src/fastlib.h
rename to fastlib/trunk/fastlib/fastlib.h
diff --git a/fastlib/trunk/src/fastlib_int.h b/fastlib/trunk/fastlib/fastlib_int.h
similarity index 100%
rename from fastlib/trunk/src/fastlib_int.h
rename to fastlib/trunk/fastlib/fastlib_int.h
diff --git a/fastlib/trunk/src/file/CMakeLists.txt b/fastlib/trunk/fastlib/file/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/file/CMakeLists.txt
rename to fastlib/trunk/fastlib/file/CMakeLists.txt
diff --git a/fastlib/trunk/src/file/build.py b/fastlib/trunk/fastlib/file/build.py
similarity index 100%
rename from fastlib/trunk/src/file/build.py
rename to fastlib/trunk/fastlib/file/build.py
diff --git a/fastlib/trunk/src/file/textfile.cc b/fastlib/trunk/fastlib/file/textfile.cc
similarity index 100%
rename from fastlib/trunk/src/file/textfile.cc
rename to fastlib/trunk/fastlib/file/textfile.cc
diff --git a/fastlib/trunk/src/file/textfile.h b/fastlib/trunk/fastlib/file/textfile.h
similarity index 100%
rename from fastlib/trunk/src/file/textfile.h
rename to fastlib/trunk/fastlib/file/textfile.h
diff --git a/fastlib/trunk/src/file/textfile_test.cc b/fastlib/trunk/fastlib/file/textfile_test.cc
similarity index 100%
rename from fastlib/trunk/src/file/textfile_test.cc
rename to fastlib/trunk/fastlib/file/textfile_test.cc
diff --git a/fastlib/trunk/src/fx/CMakeLists.txt b/fastlib/trunk/fastlib/fx/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/fx/CMakeLists.txt
rename to fastlib/trunk/fastlib/fx/CMakeLists.txt
diff --git a/fastlib/trunk/src/fx/build.py b/fastlib/trunk/fastlib/fx/build.py
similarity index 100%
rename from fastlib/trunk/src/fx/build.py
rename to fastlib/trunk/fastlib/fx/build.py
diff --git a/fastlib/trunk/src/fx/datanode.c b/fastlib/trunk/fastlib/fx/datanode.c
similarity index 100%
rename from fastlib/trunk/src/fx/datanode.c
rename to fastlib/trunk/fastlib/fx/datanode.c
diff --git a/fastlib/trunk/src/fx/datanode.h b/fastlib/trunk/fastlib/fx/datanode.h
similarity index 100%
rename from fastlib/trunk/src/fx/datanode.h
rename to fastlib/trunk/fastlib/fx/datanode.h
diff --git a/fastlib/trunk/src/fx/fx.c b/fastlib/trunk/fastlib/fx/fx.c
similarity index 100%
rename from fastlib/trunk/src/fx/fx.c
rename to fastlib/trunk/fastlib/fx/fx.c
diff --git a/fastlib/trunk/src/fx/fx.h b/fastlib/trunk/fastlib/fx/fx.h
similarity index 100%
rename from fastlib/trunk/src/fx/fx.h
rename to fastlib/trunk/fastlib/fx/fx.h
diff --git a/fastlib/trunk/src/fx/stopwatch.c b/fastlib/trunk/fastlib/fx/stopwatch.c
similarity index 100%
rename from fastlib/trunk/src/fx/stopwatch.c
rename to fastlib/trunk/fastlib/fx/stopwatch.c
diff --git a/fastlib/trunk/src/fx/stopwatch.h b/fastlib/trunk/fastlib/fx/stopwatch.h
similarity index 100%
rename from fastlib/trunk/src/fx/stopwatch.h
rename to fastlib/trunk/fastlib/fx/stopwatch.h
diff --git a/fastlib/trunk/src/la/CMakeLists.txt b/fastlib/trunk/fastlib/la/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/la/CMakeLists.txt
rename to fastlib/trunk/fastlib/la/CMakeLists.txt
diff --git a/fastlib/trunk/src/la/blas.h b/fastlib/trunk/fastlib/la/blas.h
similarity index 100%
rename from fastlib/trunk/src/la/blas.h
rename to fastlib/trunk/fastlib/la/blas.h
diff --git a/fastlib/trunk/src/la/build.py b/fastlib/trunk/fastlib/la/build.py
similarity index 100%
rename from fastlib/trunk/src/la/build.py
rename to fastlib/trunk/fastlib/la/build.py
diff --git a/fastlib/trunk/src/la/clapack.h b/fastlib/trunk/fastlib/la/clapack.h
similarity index 100%
rename from fastlib/trunk/src/la/clapack.h
rename to fastlib/trunk/fastlib/la/clapack.h
diff --git a/fastlib/trunk/src/la/la.h b/fastlib/trunk/fastlib/la/la.h
similarity index 100%
rename from fastlib/trunk/src/la/la.h
rename to fastlib/trunk/fastlib/la/la.h
diff --git a/fastlib/trunk/src/la/matrix.h b/fastlib/trunk/fastlib/la/matrix.h
similarity index 100%
rename from fastlib/trunk/src/la/matrix.h
rename to fastlib/trunk/fastlib/la/matrix.h
diff --git a/fastlib/trunk/src/la/uselapack.cc b/fastlib/trunk/fastlib/la/uselapack.cc
similarity index 100%
rename from fastlib/trunk/src/la/uselapack.cc
rename to fastlib/trunk/fastlib/la/uselapack.cc
diff --git a/fastlib/trunk/src/la/uselapack.h b/fastlib/trunk/fastlib/la/uselapack.h
similarity index 100%
rename from fastlib/trunk/src/la/uselapack.h
rename to fastlib/trunk/fastlib/la/uselapack.h
diff --git a/fastlib/trunk/src/la/uselapack_test.cc b/fastlib/trunk/fastlib/la/uselapack_test.cc
similarity index 100%
rename from fastlib/trunk/src/la/uselapack_test.cc
rename to fastlib/trunk/fastlib/la/uselapack_test.cc
diff --git a/fastlib/trunk/src/math/CMakeLists.txt b/fastlib/trunk/fastlib/math/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/math/CMakeLists.txt
rename to fastlib/trunk/fastlib/math/CMakeLists.txt
diff --git a/fastlib/trunk/src/math/build.py b/fastlib/trunk/fastlib/math/build.py
similarity index 100%
rename from fastlib/trunk/src/math/build.py
rename to fastlib/trunk/fastlib/math/build.py
diff --git a/fastlib/trunk/src/math/discrete.cc b/fastlib/trunk/fastlib/math/discrete.cc
similarity index 100%
rename from fastlib/trunk/src/math/discrete.cc
rename to fastlib/trunk/fastlib/math/discrete.cc
diff --git a/fastlib/trunk/src/math/discrete.h b/fastlib/trunk/fastlib/math/discrete.h
similarity index 100%
rename from fastlib/trunk/src/math/discrete.h
rename to fastlib/trunk/fastlib/math/discrete.h
diff --git a/fastlib/trunk/src/math/geometry.cc b/fastlib/trunk/fastlib/math/geometry.cc
similarity index 100%
rename from fastlib/trunk/src/math/geometry.cc
rename to fastlib/trunk/fastlib/math/geometry.cc
diff --git a/fastlib/trunk/src/math/geometry.h b/fastlib/trunk/fastlib/math/geometry.h
similarity index 100%
rename from fastlib/trunk/src/math/geometry.h
rename to fastlib/trunk/fastlib/math/geometry.h
diff --git a/fastlib/trunk/src/math/kernel.h b/fastlib/trunk/fastlib/math/kernel.h
similarity index 100%
rename from fastlib/trunk/src/math/kernel.h
rename to fastlib/trunk/fastlib/math/kernel.h
diff --git a/fastlib/trunk/src/math/math_lib.h b/fastlib/trunk/fastlib/math/math_lib.h
similarity index 100%
rename from fastlib/trunk/src/math/math_lib.h
rename to fastlib/trunk/fastlib/math/math_lib.h
diff --git a/fastlib/trunk/src/math/math_lib_impl.h b/fastlib/trunk/fastlib/math/math_lib_impl.h
similarity index 100%
rename from fastlib/trunk/src/math/math_lib_impl.h
rename to fastlib/trunk/fastlib/math/math_lib_impl.h
diff --git a/fastlib/trunk/src/math/statistics.cc b/fastlib/trunk/fastlib/math/statistics.cc
similarity index 100%
rename from fastlib/trunk/src/math/statistics.cc
rename to fastlib/trunk/fastlib/math/statistics.cc
diff --git a/fastlib/trunk/src/math/statistics.h b/fastlib/trunk/fastlib/math/statistics.h
similarity index 100%
rename from fastlib/trunk/src/math/statistics.h
rename to fastlib/trunk/fastlib/math/statistics.h
diff --git a/fastlib/trunk/src/mmanager/build.py b/fastlib/trunk/fastlib/mmanager/build.py
similarity index 100%
rename from fastlib/trunk/src/mmanager/build.py
rename to fastlib/trunk/fastlib/mmanager/build.py
diff --git a/fastlib/trunk/src/mmanager/memory_manager.cc b/fastlib/trunk/fastlib/mmanager/memory_manager.cc
similarity index 100%
rename from fastlib/trunk/src/mmanager/memory_manager.cc
rename to fastlib/trunk/fastlib/mmanager/memory_manager.cc
diff --git a/fastlib/trunk/src/mmanager/memory_manager.h b/fastlib/trunk/fastlib/mmanager/memory_manager.h
similarity index 100%
rename from fastlib/trunk/src/mmanager/memory_manager.h
rename to fastlib/trunk/fastlib/mmanager/memory_manager.h
diff --git a/fastlib/trunk/src/mmanager/memory_manager_test.cc b/fastlib/trunk/fastlib/mmanager/memory_manager_test.cc
similarity index 100%
rename from fastlib/trunk/src/mmanager/memory_manager_test.cc
rename to fastlib/trunk/fastlib/mmanager/memory_manager_test.cc
diff --git a/fastlib/trunk/src/optimization/CMakeLists.txt b/fastlib/trunk/fastlib/optimization/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/optimization/CMakeLists.txt
rename to fastlib/trunk/fastlib/optimization/CMakeLists.txt
diff --git a/fastlib/trunk/src/optimization/build.py b/fastlib/trunk/fastlib/optimization/build.py
similarity index 100%
rename from fastlib/trunk/src/optimization/build.py
rename to fastlib/trunk/fastlib/optimization/build.py
diff --git a/fastlib/trunk/src/optimization/contrib/CMakeLists.txt b/fastlib/trunk/fastlib/optimization/contrib/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/optimization/contrib/CMakeLists.txt
rename to fastlib/trunk/fastlib/optimization/contrib/CMakeLists.txt
diff --git a/fastlib/trunk/src/optimization/contrib/README.txt b/fastlib/trunk/fastlib/optimization/contrib/README.txt
similarity index 100%
rename from fastlib/trunk/src/optimization/contrib/README.txt
rename to fastlib/trunk/fastlib/optimization/contrib/README.txt
diff --git a/fastlib/trunk/src/optimization/contrib/REFERENCE b/fastlib/trunk/fastlib/optimization/contrib/REFERENCE
similarity index 100%
rename from fastlib/trunk/src/optimization/contrib/REFERENCE
rename to fastlib/trunk/fastlib/optimization/contrib/REFERENCE
diff --git a/fastlib/trunk/src/optimization/contrib/optimizers.cc b/fastlib/trunk/fastlib/optimization/contrib/optimizers.cc
similarity index 100%
rename from fastlib/trunk/src/optimization/contrib/optimizers.cc
rename to fastlib/trunk/fastlib/optimization/contrib/optimizers.cc
diff --git a/fastlib/trunk/src/optimization/contrib/optimizers.h b/fastlib/trunk/fastlib/optimization/contrib/optimizers.h
similarity index 100%
rename from fastlib/trunk/src/optimization/contrib/optimizers.h
rename to fastlib/trunk/fastlib/optimization/contrib/optimizers.h
diff --git a/fastlib/trunk/src/optimization/lbfgs/CMakeLists.txt b/fastlib/trunk/fastlib/optimization/lbfgs/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/optimization/lbfgs/CMakeLists.txt
rename to fastlib/trunk/fastlib/optimization/lbfgs/CMakeLists.txt
diff --git a/fastlib/trunk/src/optimization/lbfgs/build.py b/fastlib/trunk/fastlib/optimization/lbfgs/build.py
similarity index 100%
rename from fastlib/trunk/src/optimization/lbfgs/build.py
rename to fastlib/trunk/fastlib/optimization/lbfgs/build.py
diff --git a/fastlib/trunk/src/optimization/lbfgs/lbfgs.h b/fastlib/trunk/fastlib/optimization/lbfgs/lbfgs.h
similarity index 100%
rename from fastlib/trunk/src/optimization/lbfgs/lbfgs.h
rename to fastlib/trunk/fastlib/optimization/lbfgs/lbfgs.h
diff --git a/fastlib/trunk/src/optimization/lbfgs/lbfgs_impl.h b/fastlib/trunk/fastlib/optimization/lbfgs/lbfgs_impl.h
similarity index 100%
rename from fastlib/trunk/src/optimization/lbfgs/lbfgs_impl.h
rename to fastlib/trunk/fastlib/optimization/lbfgs/lbfgs_impl.h
diff --git a/fastlib/trunk/src/optimization/lbfgs/optimization_utils.h b/fastlib/trunk/fastlib/optimization/lbfgs/optimization_utils.h
similarity index 100%
rename from fastlib/trunk/src/optimization/lbfgs/optimization_utils.h
rename to fastlib/trunk/fastlib/optimization/lbfgs/optimization_utils.h
diff --git a/fastlib/trunk/src/optimization/lbfgs/test_lbfgs.cc b/fastlib/trunk/fastlib/optimization/lbfgs/test_lbfgs.cc
similarity index 100%
rename from fastlib/trunk/src/optimization/lbfgs/test_lbfgs.cc
rename to fastlib/trunk/fastlib/optimization/lbfgs/test_lbfgs.cc
diff --git a/fastlib/trunk/src/optimization/optpp/CMakeLists.txt b/fastlib/trunk/fastlib/optimization/optpp/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/optimization/optpp/CMakeLists.txt
rename to fastlib/trunk/fastlib/optimization/optpp/CMakeLists.txt
diff --git a/fastlib/trunk/src/optimization/optpp/build.py b/fastlib/trunk/fastlib/optimization/optpp/build.py
similarity index 100%
rename from fastlib/trunk/src/optimization/optpp/build.py
rename to fastlib/trunk/fastlib/optimization/optpp/build.py
diff --git a/fastlib/trunk/src/optimization/optpp/optimizer.h b/fastlib/trunk/fastlib/optimization/optpp/optimizer.h
similarity index 100%
rename from fastlib/trunk/src/optimization/optpp/optimizer.h
rename to fastlib/trunk/fastlib/optimization/optpp/optimizer.h
diff --git a/fastlib/trunk/src/optimization/optpp/optimizer_test.cc b/fastlib/trunk/fastlib/optimization/optpp/optimizer_test.cc
similarity index 100%
rename from fastlib/trunk/src/optimization/optpp/optimizer_test.cc
rename to fastlib/trunk/fastlib/optimization/optpp/optimizer_test.cc
diff --git a/fastlib/trunk/src/optimization/optpp/optimizer_tests.cc b/fastlib/trunk/fastlib/optimization/optpp/optimizer_tests.cc
similarity index 100%
rename from fastlib/trunk/src/optimization/optpp/optimizer_tests.cc
rename to fastlib/trunk/fastlib/optimization/optpp/optimizer_tests.cc
diff --git a/fastlib/trunk/src/otrav_test.cc b/fastlib/trunk/fastlib/otrav_test.cc
similarity index 100%
rename from fastlib/trunk/src/otrav_test.cc
rename to fastlib/trunk/fastlib/otrav_test.cc
diff --git a/fastlib/trunk/src/par/CMakeLists.txt b/fastlib/trunk/fastlib/par/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/par/CMakeLists.txt
rename to fastlib/trunk/fastlib/par/CMakeLists.txt
diff --git a/fastlib/trunk/src/par/build.py b/fastlib/trunk/fastlib/par/build.py
similarity index 100%
rename from fastlib/trunk/src/par/build.py
rename to fastlib/trunk/fastlib/par/build.py
diff --git a/fastlib/trunk/src/par/grain.h b/fastlib/trunk/fastlib/par/grain.h
similarity index 100%
rename from fastlib/trunk/src/par/grain.h
rename to fastlib/trunk/fastlib/par/grain.h
diff --git a/fastlib/trunk/src/par/task.h b/fastlib/trunk/fastlib/par/task.h
similarity index 100%
rename from fastlib/trunk/src/par/task.h
rename to fastlib/trunk/fastlib/par/task.h
diff --git a/fastlib/trunk/src/par/thread.cc b/fastlib/trunk/fastlib/par/thread.cc
similarity index 100%
rename from fastlib/trunk/src/par/thread.cc
rename to fastlib/trunk/fastlib/par/thread.cc
diff --git a/fastlib/trunk/src/par/thread.h b/fastlib/trunk/fastlib/par/thread.h
similarity index 100%
rename from fastlib/trunk/src/par/thread.h
rename to fastlib/trunk/fastlib/par/thread.h
diff --git a/fastlib/trunk/src/sparse/A.txt b/fastlib/trunk/fastlib/sparse/A.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/A.txt
rename to fastlib/trunk/fastlib/sparse/A.txt
diff --git a/fastlib/trunk/src/sparse/AdottimesB.txt b/fastlib/trunk/fastlib/sparse/AdottimesB.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/AdottimesB.txt
rename to fastlib/trunk/fastlib/sparse/AdottimesB.txt
diff --git a/fastlib/trunk/src/sparse/AminusB.txt b/fastlib/trunk/fastlib/sparse/AminusB.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/AminusB.txt
rename to fastlib/trunk/fastlib/sparse/AminusB.txt
diff --git a/fastlib/trunk/src/sparse/AplusB.txt b/fastlib/trunk/fastlib/sparse/AplusB.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/AplusB.txt
rename to fastlib/trunk/fastlib/sparse/AplusB.txt
diff --git a/fastlib/trunk/src/sparse/AtimesAtrans.txt b/fastlib/trunk/fastlib/sparse/AtimesAtrans.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/AtimesAtrans.txt
rename to fastlib/trunk/fastlib/sparse/AtimesAtrans.txt
diff --git a/fastlib/trunk/src/sparse/AtimesB.txt b/fastlib/trunk/fastlib/sparse/AtimesB.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/AtimesB.txt
rename to fastlib/trunk/fastlib/sparse/AtimesB.txt
diff --git a/fastlib/trunk/src/sparse/B.txt b/fastlib/trunk/fastlib/sparse/B.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/B.txt
rename to fastlib/trunk/fastlib/sparse/B.txt
diff --git a/fastlib/trunk/src/sparse/CMakeLists.txt b/fastlib/trunk/fastlib/sparse/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/CMakeLists.txt
rename to fastlib/trunk/fastlib/sparse/CMakeLists.txt
diff --git a/fastlib/trunk/src/sparse/I-W.txt b/fastlib/trunk/fastlib/sparse/I-W.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/I-W.txt
rename to fastlib/trunk/fastlib/sparse/I-W.txt
diff --git a/fastlib/trunk/src/sparse/I-W_time_I-W_trans.txt b/fastlib/trunk/fastlib/sparse/I-W_time_I-W_trans.txt
similarity index 100%
rename from fastlib/trunk/src/sparse/I-W_time_I-W_trans.txt
rename to fastlib/trunk/fastlib/sparse/I-W_time_I-W_trans.txt
diff --git a/fastlib/trunk/src/sparse/build.py b/fastlib/trunk/fastlib/sparse/build.py
similarity index 100%
rename from fastlib/trunk/src/sparse/build.py
rename to fastlib/trunk/fastlib/sparse/build.py
diff --git a/fastlib/trunk/src/sparse/sparse_matrix.h b/fastlib/trunk/fastlib/sparse/sparse_matrix.h
similarity index 100%
rename from fastlib/trunk/src/sparse/sparse_matrix.h
rename to fastlib/trunk/fastlib/sparse/sparse_matrix.h
diff --git a/fastlib/trunk/src/sparse/sparse_matrix_impl.h b/fastlib/trunk/fastlib/sparse/sparse_matrix_impl.h
similarity index 100%
rename from fastlib/trunk/src/sparse/sparse_matrix_impl.h
rename to fastlib/trunk/fastlib/sparse/sparse_matrix_impl.h
diff --git a/fastlib/trunk/src/sparse/sparse_matrix_test.cc b/fastlib/trunk/fastlib/sparse/sparse_matrix_test.cc
similarity index 100%
rename from fastlib/trunk/src/sparse/sparse_matrix_test.cc
rename to fastlib/trunk/fastlib/sparse/sparse_matrix_test.cc
diff --git a/fastlib/trunk/src/test_dataset_copy.arff b/fastlib/trunk/fastlib/test_dataset_copy.arff
similarity index 100%
rename from fastlib/trunk/src/test_dataset_copy.arff
rename to fastlib/trunk/fastlib/test_dataset_copy.arff
diff --git a/fastlib/trunk/src/test_dataset_layout.arff b/fastlib/trunk/fastlib/test_dataset_layout.arff
similarity index 100%
rename from fastlib/trunk/src/test_dataset_layout.arff
rename to fastlib/trunk/fastlib/test_dataset_layout.arff
diff --git a/fastlib/trunk/src/thor/CMakeLists.txt b/fastlib/trunk/fastlib/thor/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/thor/CMakeLists.txt
rename to fastlib/trunk/fastlib/thor/CMakeLists.txt
diff --git a/fastlib/trunk/src/thor/allnn.cc b/fastlib/trunk/fastlib/thor/allnn.cc
similarity index 100%
rename from fastlib/trunk/src/thor/allnn.cc
rename to fastlib/trunk/fastlib/thor/allnn.cc
diff --git a/fastlib/trunk/src/thor/blockdev.cc b/fastlib/trunk/fastlib/thor/blockdev.cc
similarity index 100%
rename from fastlib/trunk/src/thor/blockdev.cc
rename to fastlib/trunk/fastlib/thor/blockdev.cc
diff --git a/fastlib/trunk/src/thor/blockdev.h b/fastlib/trunk/fastlib/thor/blockdev.h
similarity index 100%
rename from fastlib/trunk/src/thor/blockdev.h
rename to fastlib/trunk/fastlib/thor/blockdev.h
diff --git a/fastlib/trunk/src/thor/build.py b/fastlib/trunk/fastlib/thor/build.py
similarity index 100%
rename from fastlib/trunk/src/thor/build.py
rename to fastlib/trunk/fastlib/thor/build.py
diff --git a/fastlib/trunk/src/thor/cache.h b/fastlib/trunk/fastlib/thor/cache.h
similarity index 100%
rename from fastlib/trunk/src/thor/cache.h
rename to fastlib/trunk/fastlib/thor/cache.h
diff --git a/fastlib/trunk/src/thor/cachearray.h b/fastlib/trunk/fastlib/thor/cachearray.h
similarity index 100%
rename from fastlib/trunk/src/thor/cachearray.h
rename to fastlib/trunk/fastlib/thor/cachearray.h
diff --git a/fastlib/trunk/src/thor/cachearray_impl.h b/fastlib/trunk/fastlib/thor/cachearray_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/cachearray_impl.h
rename to fastlib/trunk/fastlib/thor/cachearray_impl.h
diff --git a/fastlib/trunk/src/thor/dfs.h b/fastlib/trunk/fastlib/thor/dfs.h
similarity index 100%
rename from fastlib/trunk/src/thor/dfs.h
rename to fastlib/trunk/fastlib/thor/dfs.h
diff --git a/fastlib/trunk/src/thor/dfs_impl.h b/fastlib/trunk/fastlib/thor/dfs_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/dfs_impl.h
rename to fastlib/trunk/fastlib/thor/dfs_impl.h
diff --git a/fastlib/trunk/src/thor/distribcache.cc b/fastlib/trunk/fastlib/thor/distribcache.cc
similarity index 100%
rename from fastlib/trunk/src/thor/distribcache.cc
rename to fastlib/trunk/fastlib/thor/distribcache.cc
diff --git a/fastlib/trunk/src/thor/distribcache.h b/fastlib/trunk/fastlib/thor/distribcache.h
similarity index 100%
rename from fastlib/trunk/src/thor/distribcache.h
rename to fastlib/trunk/fastlib/thor/distribcache.h
diff --git a/fastlib/trunk/src/thor/gnp.h b/fastlib/trunk/fastlib/thor/gnp.h
similarity index 100%
rename from fastlib/trunk/src/thor/gnp.h
rename to fastlib/trunk/fastlib/thor/gnp.h
diff --git a/fastlib/trunk/src/thor/kdbtree.h b/fastlib/trunk/fastlib/thor/kdbtree.h
similarity index 100%
rename from fastlib/trunk/src/thor/kdbtree.h
rename to fastlib/trunk/fastlib/thor/kdbtree.h
diff --git a/fastlib/trunk/src/thor/kdbtree_impl.h b/fastlib/trunk/fastlib/thor/kdbtree_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/kdbtree_impl.h
rename to fastlib/trunk/fastlib/thor/kdbtree_impl.h
diff --git a/fastlib/trunk/src/thor/kdtree.h b/fastlib/trunk/fastlib/thor/kdtree.h
similarity index 100%
rename from fastlib/trunk/src/thor/kdtree.h
rename to fastlib/trunk/fastlib/thor/kdtree.h
diff --git a/fastlib/trunk/src/thor/kdtree_impl.h b/fastlib/trunk/fastlib/thor/kdtree_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/kdtree_impl.h
rename to fastlib/trunk/fastlib/thor/kdtree_impl.h
diff --git a/fastlib/trunk/src/thor/rbfs.h b/fastlib/trunk/fastlib/thor/rbfs.h
similarity index 100%
rename from fastlib/trunk/src/thor/rbfs.h
rename to fastlib/trunk/fastlib/thor/rbfs.h
diff --git a/fastlib/trunk/src/thor/rbfs_impl.h b/fastlib/trunk/fastlib/thor/rbfs_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/rbfs_impl.h
rename to fastlib/trunk/fastlib/thor/rbfs_impl.h
diff --git a/fastlib/trunk/src/thor/rpc.cc b/fastlib/trunk/fastlib/thor/rpc.cc
similarity index 100%
rename from fastlib/trunk/src/thor/rpc.cc
rename to fastlib/trunk/fastlib/thor/rpc.cc
diff --git a/fastlib/trunk/src/thor/rpc.h b/fastlib/trunk/fastlib/thor/rpc.h
similarity index 100%
rename from fastlib/trunk/src/thor/rpc.h
rename to fastlib/trunk/fastlib/thor/rpc.h
diff --git a/fastlib/trunk/src/thor/rpc_base.h b/fastlib/trunk/fastlib/thor/rpc_base.h
similarity index 100%
rename from fastlib/trunk/src/thor/rpc_base.h
rename to fastlib/trunk/fastlib/thor/rpc_base.h
diff --git a/fastlib/trunk/src/thor/rpc_sock.cc b/fastlib/trunk/fastlib/thor/rpc_sock.cc
similarity index 100%
rename from fastlib/trunk/src/thor/rpc_sock.cc
rename to fastlib/trunk/fastlib/thor/rpc_sock.cc
diff --git a/fastlib/trunk/src/thor/rpc_sock.h b/fastlib/trunk/fastlib/thor/rpc_sock.h
similarity index 100%
rename from fastlib/trunk/src/thor/rpc_sock.h
rename to fastlib/trunk/fastlib/thor/rpc_sock.h
diff --git a/fastlib/trunk/src/thor/sched.cc b/fastlib/trunk/fastlib/thor/sched.cc
similarity index 100%
rename from fastlib/trunk/src/thor/sched.cc
rename to fastlib/trunk/fastlib/thor/sched.cc
diff --git a/fastlib/trunk/src/thor/sched.h b/fastlib/trunk/fastlib/thor/sched.h
similarity index 100%
rename from fastlib/trunk/src/thor/sched.h
rename to fastlib/trunk/fastlib/thor/sched.h
diff --git a/fastlib/trunk/src/thor/sched_impl.h b/fastlib/trunk/fastlib/thor/sched_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/sched_impl.h
rename to fastlib/trunk/fastlib/thor/sched_impl.h
diff --git a/fastlib/trunk/src/thor/thor.h b/fastlib/trunk/fastlib/thor/thor.h
similarity index 100%
rename from fastlib/trunk/src/thor/thor.h
rename to fastlib/trunk/fastlib/thor/thor.h
diff --git a/fastlib/trunk/src/thor/thor_struct.h b/fastlib/trunk/fastlib/thor/thor_struct.h
similarity index 100%
rename from fastlib/trunk/src/thor/thor_struct.h
rename to fastlib/trunk/fastlib/thor/thor_struct.h
diff --git a/fastlib/trunk/src/thor/thor_utils.h b/fastlib/trunk/fastlib/thor/thor_utils.h
similarity index 100%
rename from fastlib/trunk/src/thor/thor_utils.h
rename to fastlib/trunk/fastlib/thor/thor_utils.h
diff --git a/fastlib/trunk/src/thor/thor_utils_impl.h b/fastlib/trunk/fastlib/thor/thor_utils_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/thor_utils_impl.h
rename to fastlib/trunk/fastlib/thor/thor_utils_impl.h
diff --git a/fastlib/trunk/src/thor/thortree.h b/fastlib/trunk/fastlib/thor/thortree.h
similarity index 100%
rename from fastlib/trunk/src/thor/thortree.h
rename to fastlib/trunk/fastlib/thor/thortree.h
diff --git a/fastlib/trunk/src/thor/thortree_impl.h b/fastlib/trunk/fastlib/thor/thortree_impl.h
similarity index 100%
rename from fastlib/trunk/src/thor/thortree_impl.h
rename to fastlib/trunk/fastlib/thor/thortree_impl.h
diff --git a/fastlib/trunk/src/tree/CMakeLists.txt b/fastlib/trunk/fastlib/tree/CMakeLists.txt
similarity index 100%
rename from fastlib/trunk/src/tree/CMakeLists.txt
rename to fastlib/trunk/fastlib/tree/CMakeLists.txt
diff --git a/fastlib/trunk/src/tree/bounds.h b/fastlib/trunk/fastlib/tree/bounds.h
similarity index 100%
rename from fastlib/trunk/src/tree/bounds.h
rename to fastlib/trunk/fastlib/tree/bounds.h
diff --git a/fastlib/trunk/src/tree/build.py b/fastlib/trunk/fastlib/tree/build.py
similarity index 100%
rename from fastlib/trunk/src/tree/build.py
rename to fastlib/trunk/fastlib/tree/build.py
diff --git a/fastlib/trunk/src/tree/kdtree.h b/fastlib/trunk/fastlib/tree/kdtree.h
similarity index 100%
rename from fastlib/trunk/src/tree/kdtree.h
rename to fastlib/trunk/fastlib/tree/kdtree.h
diff --git a/fastlib/trunk/src/tree/kdtree_impl.h b/fastlib/trunk/fastlib/tree/kdtree_impl.h
similarity index 100%
rename from fastlib/trunk/src/tree/kdtree_impl.h
rename to fastlib/trunk/fastlib/tree/kdtree_impl.h
diff --git a/fastlib/trunk/src/tree/spacetree.h b/fastlib/trunk/fastlib/tree/spacetree.h
similarity index 100%
rename from fastlib/trunk/src/tree/spacetree.h
rename to fastlib/trunk/fastlib/tree/spacetree.h
diff --git a/fastlib/trunk/src/tree/statistic.h b/fastlib/trunk/fastlib/tree/statistic.h
similarity index 100%
rename from fastlib/trunk/src/tree/statistic.h
rename to fastlib/trunk/fastlib/tree/statistic.h
diff --git a/fastlib/trunk/src/tree/tree_test.cc b/fastlib/trunk/fastlib/tree/tree_test.cc
similarity index 100%
rename from fastlib/trunk/src/tree/tree_test.cc
rename to fastlib/trunk/fastlib/tree/tree_test.cc