diff --git a/src/sp_collector.cpp b/extras/src/sp_collector.cpp
similarity index 100%
rename from src/sp_collector.cpp
rename to extras/src/sp_collector.cpp
diff --git a/src/sp_debug_hooks.cpp b/extras/src/sp_debug_hooks.cpp
similarity index 100%
rename from src/sp_debug_hooks.cpp
rename to extras/src/sp_debug_hooks.cpp
diff --git a/test/shared_ptr_mt_test.cpp b/extras/test/shared_ptr_mt_test.cpp
similarity index 100%
rename from test/shared_ptr_mt_test.cpp
rename to extras/test/shared_ptr_mt_test.cpp
diff --git a/test/shared_ptr_timing_test.cpp b/extras/test/shared_ptr_timing_test.cpp
similarity index 100%
rename from test/shared_ptr_timing_test.cpp
rename to extras/test/shared_ptr_timing_test.cpp
diff --git a/test/sp_atomic_mt2_test.cpp b/extras/test/sp_atomic_mt2_test.cpp
similarity index 100%
rename from test/sp_atomic_mt2_test.cpp
rename to extras/test/sp_atomic_mt2_test.cpp
diff --git a/test/sp_atomic_mt_test.cpp b/extras/test/sp_atomic_mt_test.cpp
similarity index 100%
rename from test/sp_atomic_mt_test.cpp
rename to extras/test/sp_atomic_mt_test.cpp
diff --git a/test/weak_ptr_mt_test.cpp b/extras/test/weak_ptr_mt_test.cpp
similarity index 100%
rename from test/weak_ptr_mt_test.cpp
rename to extras/test/weak_ptr_mt_test.cpp
diff --git a/test/weak_ptr_timing_test.cpp b/extras/test/weak_ptr_timing_test.cpp
similarity index 100%
rename from test/weak_ptr_timing_test.cpp
rename to extras/test/weak_ptr_timing_test.cpp