diff --git a/safe_numerics/tests/test.cpp b/safe_numerics/test/test.cpp
similarity index 100%
rename from safe_numerics/tests/test.cpp
rename to safe_numerics/test/test.cpp
diff --git a/safe_numerics/tests/test.hpp b/safe_numerics/test/test.hpp
similarity index 100%
rename from safe_numerics/tests/test.hpp
rename to safe_numerics/test/test.hpp
diff --git a/safe_numerics/tests/test_add.cpp b/safe_numerics/test/test_add.cpp
similarity index 100%
rename from safe_numerics/tests/test_add.cpp
rename to safe_numerics/test/test_add.cpp
diff --git a/safe_numerics/tests/test_add.hpp b/safe_numerics/test/test_add.hpp
similarity index 100%
rename from safe_numerics/tests/test_add.hpp
rename to safe_numerics/test/test_add.hpp
diff --git a/safe_numerics/tests/test_add1.cpp b/safe_numerics/test/test_add1.cpp
similarity index 100%
rename from safe_numerics/tests/test_add1.cpp
rename to safe_numerics/test/test_add1.cpp
diff --git a/safe_numerics/tests/test_add2.cpp b/safe_numerics/test/test_add2.cpp
similarity index 100%
rename from safe_numerics/tests/test_add2.cpp
rename to safe_numerics/test/test_add2.cpp
diff --git a/safe_numerics/tests/test_add3.cpp b/safe_numerics/test/test_add3.cpp
similarity index 100%
rename from safe_numerics/tests/test_add3.cpp
rename to safe_numerics/test/test_add3.cpp
diff --git a/safe_numerics/tests/test_conversion.cpp b/safe_numerics/test/test_conversion.cpp
similarity index 100%
rename from safe_numerics/tests/test_conversion.cpp
rename to safe_numerics/test/test_conversion.cpp
diff --git a/safe_numerics/tests/test_divide.cpp b/safe_numerics/test/test_divide.cpp
similarity index 100%
rename from safe_numerics/tests/test_divide.cpp
rename to safe_numerics/test/test_divide.cpp
diff --git a/safe_numerics/tests/test_divide.hpp b/safe_numerics/test/test_divide.hpp
similarity index 100%
rename from safe_numerics/tests/test_divide.hpp
rename to safe_numerics/test/test_divide.hpp
diff --git a/safe_numerics/tests/test_divide1.cpp b/safe_numerics/test/test_divide1.cpp
similarity index 100%
rename from safe_numerics/tests/test_divide1.cpp
rename to safe_numerics/test/test_divide1.cpp
diff --git a/safe_numerics/tests/test_divide2.cpp b/safe_numerics/test/test_divide2.cpp
similarity index 100%
rename from safe_numerics/tests/test_divide2.cpp
rename to safe_numerics/test/test_divide2.cpp
diff --git a/safe_numerics/tests/test_divide3.cpp b/safe_numerics/test/test_divide3.cpp
similarity index 100%
rename from safe_numerics/tests/test_divide3.cpp
rename to safe_numerics/test/test_divide3.cpp
diff --git a/safe_numerics/tests/test_misc.cpp b/safe_numerics/test/test_misc.cpp
similarity index 100%
rename from safe_numerics/tests/test_misc.cpp
rename to safe_numerics/test/test_misc.cpp
diff --git a/safe_numerics/tests/test_modulus.cpp b/safe_numerics/test/test_modulus.cpp
similarity index 100%
rename from safe_numerics/tests/test_modulus.cpp
rename to safe_numerics/test/test_modulus.cpp
diff --git a/safe_numerics/tests/test_modulus.hpp b/safe_numerics/test/test_modulus.hpp
similarity index 100%
rename from safe_numerics/tests/test_modulus.hpp
rename to safe_numerics/test/test_modulus.hpp
diff --git a/safe_numerics/tests/test_modulus1.cpp b/safe_numerics/test/test_modulus1.cpp
similarity index 100%
rename from safe_numerics/tests/test_modulus1.cpp
rename to safe_numerics/test/test_modulus1.cpp
diff --git a/safe_numerics/tests/test_modulus2.cpp b/safe_numerics/test/test_modulus2.cpp
similarity index 100%
rename from safe_numerics/tests/test_modulus2.cpp
rename to safe_numerics/test/test_modulus2.cpp
diff --git a/safe_numerics/tests/test_modulus3.cpp b/safe_numerics/test/test_modulus3.cpp
similarity index 100%
rename from safe_numerics/tests/test_modulus3.cpp
rename to safe_numerics/test/test_modulus3.cpp
diff --git a/safe_numerics/tests/test_multiply.cpp b/safe_numerics/test/test_multiply.cpp
similarity index 100%
rename from safe_numerics/tests/test_multiply.cpp
rename to safe_numerics/test/test_multiply.cpp
diff --git a/safe_numerics/tests/test_multiply.hpp b/safe_numerics/test/test_multiply.hpp
similarity index 100%
rename from safe_numerics/tests/test_multiply.hpp
rename to safe_numerics/test/test_multiply.hpp
diff --git a/safe_numerics/tests/test_multiply1.cpp b/safe_numerics/test/test_multiply1.cpp
similarity index 100%
rename from safe_numerics/tests/test_multiply1.cpp
rename to safe_numerics/test/test_multiply1.cpp
diff --git a/safe_numerics/tests/test_multiply2.cpp b/safe_numerics/test/test_multiply2.cpp
similarity index 100%
rename from safe_numerics/tests/test_multiply2.cpp
rename to safe_numerics/test/test_multiply2.cpp
diff --git a/safe_numerics/tests/test_multiply3.cpp b/safe_numerics/test/test_multiply3.cpp
similarity index 100%
rename from safe_numerics/tests/test_multiply3.cpp
rename to safe_numerics/test/test_multiply3.cpp
diff --git a/safe_numerics/tests/test_numeric.cpp b/safe_numerics/test/test_numeric.cpp
similarity index 100%
rename from safe_numerics/tests/test_numeric.cpp
rename to safe_numerics/test/test_numeric.cpp
diff --git a/safe_numerics/tests/test_subtract.cpp b/safe_numerics/test/test_subtract.cpp
similarity index 100%
rename from safe_numerics/tests/test_subtract.cpp
rename to safe_numerics/test/test_subtract.cpp
diff --git a/safe_numerics/tests/test_subtract.hpp b/safe_numerics/test/test_subtract.hpp
similarity index 100%
rename from safe_numerics/tests/test_subtract.hpp
rename to safe_numerics/test/test_subtract.hpp
diff --git a/safe_numerics/tests/test_subtract1.cpp b/safe_numerics/test/test_subtract1.cpp
similarity index 100%
rename from safe_numerics/tests/test_subtract1.cpp
rename to safe_numerics/test/test_subtract1.cpp
diff --git a/safe_numerics/tests/test_subtract2.cpp b/safe_numerics/test/test_subtract2.cpp
similarity index 100%
rename from safe_numerics/tests/test_subtract2.cpp
rename to safe_numerics/test/test_subtract2.cpp
diff --git a/safe_numerics/tests/test_subtract3.cpp b/safe_numerics/test/test_subtract3.cpp
similarity index 100%
rename from safe_numerics/tests/test_subtract3.cpp
rename to safe_numerics/test/test_subtract3.cpp
diff --git a/safe_numerics/tests/vcide/example_test.vcproj b/safe_numerics/test/vcide/example_test.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/example_test.vcproj
rename to safe_numerics/test/vcide/example_test.vcproj
diff --git a/safe_numerics/tests/vcide/safe_numerics.sln b/safe_numerics/test/vcide/safe_numerics.sln
similarity index 100%
rename from safe_numerics/tests/vcide/safe_numerics.sln
rename to safe_numerics/test/vcide/safe_numerics.sln
diff --git a/safe_numerics/tests/vcide/test_add.vcproj b/safe_numerics/test/vcide/test_add.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_add.vcproj
rename to safe_numerics/test/vcide/test_add.vcproj
diff --git a/safe_numerics/tests/vcide/test_comparison.vcproj b/safe_numerics/test/vcide/test_comparison.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_comparison.vcproj
rename to safe_numerics/test/vcide/test_comparison.vcproj
diff --git a/safe_numerics/tests/vcide/test_conversion.vcproj b/safe_numerics/test/vcide/test_conversion.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_conversion.vcproj
rename to safe_numerics/test/vcide/test_conversion.vcproj
diff --git a/safe_numerics/tests/vcide/test_divide.vcproj b/safe_numerics/test/vcide/test_divide.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_divide.vcproj
rename to safe_numerics/test/vcide/test_divide.vcproj
diff --git a/safe_numerics/tests/vcide/test_modulus.vcproj b/safe_numerics/test/vcide/test_modulus.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_modulus.vcproj
rename to safe_numerics/test/vcide/test_modulus.vcproj
diff --git a/safe_numerics/tests/vcide/test_multiply.vcproj b/safe_numerics/test/vcide/test_multiply.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_multiply.vcproj
rename to safe_numerics/test/vcide/test_multiply.vcproj
diff --git a/safe_numerics/tests/vcide/test_numeric.vcproj b/safe_numerics/test/vcide/test_numeric.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_numeric.vcproj
rename to safe_numerics/test/vcide/test_numeric.vcproj
diff --git a/safe_numerics/tests/vcide/test_subtract.vcproj b/safe_numerics/test/vcide/test_subtract.vcproj
similarity index 100%
rename from safe_numerics/tests/vcide/test_subtract.vcproj
rename to safe_numerics/test/vcide/test_subtract.vcproj