diff --git a/Jamfile b/test/Jamfile
similarity index 100%
rename from Jamfile
rename to test/Jamfile
diff --git a/Jamfile.v2 b/test/Jamfile.v2
similarity index 100%
rename from Jamfile.v2
rename to test/Jamfile.v2
diff --git a/test/common/init.hpp b/test/common/init.hpp
new file mode 100644
index 00000000..914ea0fe
--- /dev/null
+++ b/test/common/init.hpp
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2004 Michael Stevens
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+/*
+ * Initialise test values in vector/matrix
+ */
+
+template<class V>
+void initialize_vector (V &v) {
+    typename V::size_type size = v.size ();
+    for (typename V::size_type i = 0; i < size; ++ i)
+        v [i] = i + 1.f;
+}
+
+template<class M>
+void initialize_matrix (M &m) {
+    typename M::size_type size1 = m.size1 ();
+    typename M::size_type size2 = m.size2 ();
+    for (typename M::size_type i = 0; i < size1; ++ i)
+        for (typename M::size_type j = 0; j < size2; ++ j)
+            m (i, j) = i * size1 + j + 1.f;
+}
diff --git a/concepts.cpp b/test/concepts.cpp
similarity index 100%
rename from concepts.cpp
rename to test/concepts.cpp
diff --git a/test1/Jamfile b/test/test1/Jamfile
similarity index 100%
rename from test1/Jamfile
rename to test/test1/Jamfile
diff --git a/test1/test1.cpp b/test/test1/test1.cpp
similarity index 100%
rename from test1/test1.cpp
rename to test/test1/test1.cpp
diff --git a/test1/test1.hpp b/test/test1/test1.hpp
similarity index 100%
rename from test1/test1.hpp
rename to test/test1/test1.hpp
diff --git a/test1/test11.cpp b/test/test1/test11.cpp
similarity index 100%
rename from test1/test11.cpp
rename to test/test1/test11.cpp
diff --git a/test1/test12.cpp b/test/test1/test12.cpp
similarity index 100%
rename from test1/test12.cpp
rename to test/test1/test12.cpp
diff --git a/test1/test13.cpp b/test/test1/test13.cpp
similarity index 100%
rename from test1/test13.cpp
rename to test/test1/test13.cpp
diff --git a/test2/Jamfile b/test/test2/Jamfile
similarity index 100%
rename from test2/Jamfile
rename to test/test2/Jamfile
diff --git a/test2/test2.cpp b/test/test2/test2.cpp
similarity index 100%
rename from test2/test2.cpp
rename to test/test2/test2.cpp
diff --git a/test2/test2.hpp b/test/test2/test2.hpp
similarity index 100%
rename from test2/test2.hpp
rename to test/test2/test2.hpp
diff --git a/test2/test21.cpp b/test/test2/test21.cpp
similarity index 100%
rename from test2/test21.cpp
rename to test/test2/test21.cpp
diff --git a/test2/test22.cpp b/test/test2/test22.cpp
similarity index 100%
rename from test2/test22.cpp
rename to test/test2/test22.cpp
diff --git a/test2/test23.cpp b/test/test2/test23.cpp
similarity index 100%
rename from test2/test23.cpp
rename to test/test2/test23.cpp
diff --git a/test3/Jamfile b/test/test3/Jamfile
similarity index 100%
rename from test3/Jamfile
rename to test/test3/Jamfile
diff --git a/test3/test3.cpp b/test/test3/test3.cpp
similarity index 100%
rename from test3/test3.cpp
rename to test/test3/test3.cpp
diff --git a/test3/test3.hpp b/test/test3/test3.hpp
similarity index 100%
rename from test3/test3.hpp
rename to test/test3/test3.hpp
diff --git a/test3/test31.cpp b/test/test3/test31.cpp
similarity index 100%
rename from test3/test31.cpp
rename to test/test3/test31.cpp
diff --git a/test3/test32.cpp b/test/test3/test32.cpp
similarity index 100%
rename from test3/test32.cpp
rename to test/test3/test32.cpp
diff --git a/test3/test33.cpp b/test/test3/test33.cpp
similarity index 100%
rename from test3/test33.cpp
rename to test/test3/test33.cpp
diff --git a/test4/Jamfile b/test/test4/Jamfile
similarity index 100%
rename from test4/Jamfile
rename to test/test4/Jamfile
diff --git a/test4/test4.cpp b/test/test4/test4.cpp
similarity index 100%
rename from test4/test4.cpp
rename to test/test4/test4.cpp
diff --git a/test4/test4.hpp b/test/test4/test4.hpp
similarity index 100%
rename from test4/test4.hpp
rename to test/test4/test4.hpp
diff --git a/test4/test42.cpp b/test/test4/test42.cpp
similarity index 100%
rename from test4/test42.cpp
rename to test/test4/test42.cpp
diff --git a/test4/test43.cpp b/test/test4/test43.cpp
similarity index 100%
rename from test4/test43.cpp
rename to test/test4/test43.cpp
diff --git a/test5/Jamfile b/test/test5/Jamfile
similarity index 100%
rename from test5/Jamfile
rename to test/test5/Jamfile
diff --git a/test5/test5.cpp b/test/test5/test5.cpp
similarity index 100%
rename from test5/test5.cpp
rename to test/test5/test5.cpp
diff --git a/test5/test5.hpp b/test/test5/test5.hpp
similarity index 100%
rename from test5/test5.hpp
rename to test/test5/test5.hpp
diff --git a/test5/test52.cpp b/test/test5/test52.cpp
similarity index 100%
rename from test5/test52.cpp
rename to test/test5/test52.cpp
diff --git a/test5/test53.cpp b/test/test5/test53.cpp
similarity index 100%
rename from test5/test53.cpp
rename to test/test5/test53.cpp
diff --git a/test6/Jamfile b/test/test6/Jamfile
similarity index 100%
rename from test6/Jamfile
rename to test/test6/Jamfile
diff --git a/test6/test6.cpp b/test/test6/test6.cpp
similarity index 100%
rename from test6/test6.cpp
rename to test/test6/test6.cpp
diff --git a/test6/test6.hpp b/test/test6/test6.hpp
similarity index 100%
rename from test6/test6.hpp
rename to test/test6/test6.hpp
diff --git a/test6/test62.cpp b/test/test6/test62.cpp
similarity index 100%
rename from test6/test62.cpp
rename to test/test6/test62.cpp
diff --git a/test6/test63.cpp b/test/test6/test63.cpp
similarity index 100%
rename from test6/test63.cpp
rename to test/test6/test63.cpp
diff --git a/test7/Jamfile b/test/test7/Jamfile
similarity index 100%
rename from test7/Jamfile
rename to test/test7/Jamfile
diff --git a/test7/test7.cpp b/test/test7/test7.cpp
similarity index 100%
rename from test7/test7.cpp
rename to test/test7/test7.cpp
diff --git a/test7/test7.hpp b/test/test7/test7.hpp
similarity index 100%
rename from test7/test7.hpp
rename to test/test7/test7.hpp
diff --git a/test7/test71.cpp b/test/test7/test71.cpp
similarity index 100%
rename from test7/test71.cpp
rename to test/test7/test71.cpp
diff --git a/test7/test72.cpp b/test/test7/test72.cpp
similarity index 100%
rename from test7/test72.cpp
rename to test/test7/test72.cpp
diff --git a/test7/test73.cpp b/test/test7/test73.cpp
similarity index 100%
rename from test7/test73.cpp
rename to test/test7/test73.cpp