diff --git a/scoped_ptr_example.cpp b/example/scoped_ptr_example.cpp
similarity index 100%
rename from scoped_ptr_example.cpp
rename to example/scoped_ptr_example.cpp
diff --git a/scoped_ptr_example.hpp b/example/scoped_ptr_example.hpp
similarity index 100%
rename from scoped_ptr_example.hpp
rename to example/scoped_ptr_example.hpp
diff --git a/scoped_ptr_example_test.cpp b/example/scoped_ptr_example_test.cpp
similarity index 100%
rename from scoped_ptr_example_test.cpp
rename to example/scoped_ptr_example_test.cpp
diff --git a/shared_ptr_example.cpp b/example/shared_ptr_example.cpp
similarity index 100%
rename from shared_ptr_example.cpp
rename to example/shared_ptr_example.cpp
diff --git a/shared_ptr_example2.cpp b/example/shared_ptr_example2.cpp
similarity index 100%
rename from shared_ptr_example2.cpp
rename to example/shared_ptr_example2.cpp
diff --git a/shared_ptr_example2.hpp b/example/shared_ptr_example2.hpp
similarity index 100%
rename from shared_ptr_example2.hpp
rename to example/shared_ptr_example2.hpp
diff --git a/shared_ptr_example2_test.cpp b/example/shared_ptr_example2_test.cpp
similarity index 100%
rename from shared_ptr_example2_test.cpp
rename to example/shared_ptr_example2_test.cpp
diff --git a/sp_debug_hooks.cpp b/src/sp_debug_hooks.cpp
similarity index 100%
rename from sp_debug_hooks.cpp
rename to src/sp_debug_hooks.cpp
diff --git a/test/Jamfile b/test/Jamfile
new file mode 100644
index 0000000..88cfbfe
--- /dev/null
+++ b/test/Jamfile
@@ -0,0 +1,25 @@
+# Boost.SmartPtr Library test Jamfile
+
+subproject libs/smart_ptr/test ;
+
+# bring in rules for testing
+SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
+include testing.jam ;
+
+# Make tests run by default.
+DEPENDS all : test ;
+
+{
+    # look in BOOST_ROOT for sources first, just in this Jamfile
+    local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
+    
+    test-suite "smart_ptr"
+        : [ run libs/smart_ptr/test/smart_ptr_test.cpp ]
+          [ run libs/smart_ptr/test/shared_ptr_basic_test.cpp : : : <gcc><*><cxxflags>-Wno-non-virtual-dtor ]
+          [ run libs/smart_ptr/test/shared_ptr_test.cpp : : : <gcc><*><cxxflags>-Wno-non-virtual-dtor ]
+          [ run libs/smart_ptr/test/weak_ptr_test.cpp ]
+          [ run libs/smart_ptr/test/shared_from_this_test.cpp : : : <gcc><*><cxxflags>-Wno-non-virtual-dtor ]
+          [ run libs/smart_ptr/test/get_deleter_test.cpp ]
+          [ compile-fail libs/smart_ptr/test/shared_ptr_assign_fail.cpp ]
+        ;
+}
diff --git a/get_deleter_test.cpp b/test/get_deleter_test.cpp
similarity index 100%
rename from get_deleter_test.cpp
rename to test/get_deleter_test.cpp
diff --git a/intrusive_ptr_test.cpp b/test/intrusive_ptr_test.cpp
similarity index 100%
rename from intrusive_ptr_test.cpp
rename to test/intrusive_ptr_test.cpp
diff --git a/shared_from_this_test.cpp b/test/shared_from_this_test.cpp
similarity index 100%
rename from shared_from_this_test.cpp
rename to test/shared_from_this_test.cpp
diff --git a/shared_ptr_alloc_test.cpp b/test/shared_ptr_alloc_test.cpp
similarity index 100%
rename from shared_ptr_alloc_test.cpp
rename to test/shared_ptr_alloc_test.cpp
diff --git a/shared_ptr_assign_fail.cpp b/test/shared_ptr_assign_fail.cpp
similarity index 100%
rename from shared_ptr_assign_fail.cpp
rename to test/shared_ptr_assign_fail.cpp
diff --git a/shared_ptr_basic_test.cpp b/test/shared_ptr_basic_test.cpp
similarity index 100%
rename from shared_ptr_basic_test.cpp
rename to test/shared_ptr_basic_test.cpp
diff --git a/shared_ptr_mt_test.cpp b/test/shared_ptr_mt_test.cpp
similarity index 100%
rename from shared_ptr_mt_test.cpp
rename to test/shared_ptr_mt_test.cpp
diff --git a/shared_ptr_test.cpp b/test/shared_ptr_test.cpp
similarity index 100%
rename from shared_ptr_test.cpp
rename to test/shared_ptr_test.cpp
diff --git a/shared_ptr_timing_test.cpp b/test/shared_ptr_timing_test.cpp
similarity index 100%
rename from shared_ptr_timing_test.cpp
rename to test/shared_ptr_timing_test.cpp
diff --git a/smart_ptr_test.cpp b/test/smart_ptr_test.cpp
similarity index 100%
rename from smart_ptr_test.cpp
rename to test/smart_ptr_test.cpp
diff --git a/weak_ptr_test.cpp b/test/weak_ptr_test.cpp
similarity index 100%
rename from weak_ptr_test.cpp
rename to test/weak_ptr_test.cpp