diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..a508d1f
Binary files /dev/null and b/.DS_Store differ
diff --git a/doc/.DS_Store b/doc/.DS_Store
new file mode 100644
index 0000000..4c70db1
Binary files /dev/null and b/doc/.DS_Store differ
diff --git a/safe_numerics/doc/boostbook/bb2db.xsl b/doc/boostbook/bb2db.xsl
similarity index 100%
rename from safe_numerics/doc/boostbook/bb2db.xsl
rename to doc/boostbook/bb2db.xsl
diff --git a/safe_numerics/doc/boostbook/db2html.xsl b/doc/boostbook/db2html.xsl
similarity index 100%
rename from safe_numerics/doc/boostbook/db2html.xsl
rename to doc/boostbook/db2html.xsl
diff --git a/safe_numerics/doc/boostbook/makehtml.bat b/doc/boostbook/makehtml.bat
similarity index 100%
rename from safe_numerics/doc/boostbook/makehtml.bat
rename to doc/boostbook/makehtml.bat
diff --git a/safe_numerics/doc/boostbook/makehtml.sh b/doc/boostbook/makehtml.sh
similarity index 100%
rename from safe_numerics/doc/boostbook/makehtml.sh
rename to doc/boostbook/makehtml.sh
diff --git a/safe_numerics/doc/boostbook/numeric_concept.xml b/doc/boostbook/numeric_concept.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/numeric_concept.xml
rename to doc/boostbook/numeric_concept.xml
diff --git a/safe_numerics/doc/boostbook/overflow.xml b/doc/boostbook/overflow.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/overflow.xml
rename to doc/boostbook/overflow.xml
diff --git a/safe_numerics/doc/boostbook/pre-boost.jpg b/doc/boostbook/pre-boost.jpg
similarity index 100%
rename from safe_numerics/doc/boostbook/pre-boost.jpg
rename to doc/boostbook/pre-boost.jpg
diff --git a/safe_numerics/doc/boostbook/safe.xml b/doc/boostbook/safe.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/safe.xml
rename to doc/boostbook/safe.xml
diff --git a/safe_numerics/doc/boostbook/safe_cast.xml b/doc/boostbook/safe_cast.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/safe_cast.xml
rename to doc/boostbook/safe_cast.xml
diff --git a/safe_numerics/doc/boostbook/safe_compare.xml b/doc/boostbook/safe_compare.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/safe_compare.xml
rename to doc/boostbook/safe_compare.xml
diff --git a/safe_numerics/doc/boostbook/safe_numerics.xml b/doc/boostbook/safe_numerics.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/safe_numerics.xml
rename to doc/boostbook/safe_numerics.xml
diff --git a/safe_numerics/doc/boostbook/safe_signed_range.xml b/doc/boostbook/safe_signed_range.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/safe_signed_range.xml
rename to doc/boostbook/safe_signed_range.xml
diff --git a/safe_numerics/doc/boostbook/safe_unsigned_range.xml b/doc/boostbook/safe_unsigned_range.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/safe_unsigned_range.xml
rename to doc/boostbook/safe_unsigned_range.xml
diff --git a/safe_numerics/doc/boostbook/tutorial.xml b/doc/boostbook/tutorial.xml
similarity index 100%
rename from safe_numerics/doc/boostbook/tutorial.xml
rename to doc/boostbook/tutorial.xml
diff --git a/safe_numerics/doc/html/acknowledgements.html b/doc/html/acknowledgements.html
similarity index 100%
rename from safe_numerics/doc/html/acknowledgements.html
rename to doc/html/acknowledgements.html
diff --git a/safe_numerics/doc/html/boostbook.css b/doc/html/boostbook.css
similarity index 100%
rename from safe_numerics/doc/html/boostbook.css
rename to doc/html/boostbook.css
diff --git a/safe_numerics/doc/html/change_log.html b/doc/html/change_log.html
similarity index 100%
rename from safe_numerics/doc/html/change_log.html
rename to doc/html/change_log.html
diff --git a/safe_numerics/doc/html/concepts.html b/doc/html/concepts.html
similarity index 100%
rename from safe_numerics/doc/html/concepts.html
rename to doc/html/concepts.html
diff --git a/safe_numerics/doc/html/functions.html b/doc/html/functions.html
similarity index 100%
rename from safe_numerics/doc/html/functions.html
rename to doc/html/functions.html
diff --git a/safe_numerics/doc/html/index.html b/doc/html/index.html
similarity index 100%
rename from safe_numerics/doc/html/index.html
rename to doc/html/index.html
diff --git a/safe_numerics/doc/html/introduction.html b/doc/html/introduction.html
similarity index 100%
rename from safe_numerics/doc/html/introduction.html
rename to doc/html/introduction.html
diff --git a/safe_numerics/doc/html/notes.html b/doc/html/notes.html
similarity index 100%
rename from safe_numerics/doc/html/notes.html
rename to doc/html/notes.html
diff --git a/safe_numerics/doc/html/numeric.html b/doc/html/numeric.html
similarity index 100%
rename from safe_numerics/doc/html/numeric.html
rename to doc/html/numeric.html
diff --git a/safe_numerics/doc/html/pre-boost.jpg b/doc/html/pre-boost.jpg
similarity index 100%
rename from safe_numerics/doc/html/pre-boost.jpg
rename to doc/html/pre-boost.jpg
diff --git a/safe_numerics/doc/html/rationale.html b/doc/html/rationale.html
similarity index 100%
rename from safe_numerics/doc/html/rationale.html
rename to doc/html/rationale.html
diff --git a/safe_numerics/doc/html/rationale/overflow.html b/doc/html/rationale/overflow.html
similarity index 100%
rename from safe_numerics/doc/html/rationale/overflow.html
rename to doc/html/rationale/overflow.html
diff --git a/safe_numerics/doc/html/references.html b/doc/html/references.html
similarity index 100%
rename from safe_numerics/doc/html/references.html
rename to doc/html/references.html
diff --git a/safe_numerics/doc/html/safe.html b/doc/html/safe.html
similarity index 100%
rename from safe_numerics/doc/html/safe.html
rename to doc/html/safe.html
diff --git a/safe_numerics/doc/html/safe_cast.html b/doc/html/safe_cast.html
similarity index 100%
rename from safe_numerics/doc/html/safe_cast.html
rename to doc/html/safe_cast.html
diff --git a/safe_numerics/doc/html/safe_compare.html b/doc/html/safe_compare.html
similarity index 100%
rename from safe_numerics/doc/html/safe_compare.html
rename to doc/html/safe_compare.html
diff --git a/safe_numerics/doc/html/safe_signed_range.html b/doc/html/safe_signed_range.html
similarity index 100%
rename from safe_numerics/doc/html/safe_signed_range.html
rename to doc/html/safe_signed_range.html
diff --git a/safe_numerics/doc/html/safe_unsigned_range.html b/doc/html/safe_unsigned_range.html
similarity index 100%
rename from safe_numerics/doc/html/safe_unsigned_range.html
rename to doc/html/safe_unsigned_range.html
diff --git a/safe_numerics/doc/html/tutorial.html b/doc/html/tutorial.html
similarity index 100%
rename from safe_numerics/doc/html/tutorial.html
rename to doc/html/tutorial.html
diff --git a/safe_numerics/doc/html/tutorial/1.html b/doc/html/tutorial/1.html
similarity index 100%
rename from safe_numerics/doc/html/tutorial/1.html
rename to doc/html/tutorial/1.html
diff --git a/safe_numerics/doc/html/tutorial/2.html b/doc/html/tutorial/2.html
similarity index 100%
rename from safe_numerics/doc/html/tutorial/2.html
rename to doc/html/tutorial/2.html
diff --git a/safe_numerics/doc/html/tutorial/3.html b/doc/html/tutorial/3.html
similarity index 100%
rename from safe_numerics/doc/html/tutorial/3.html
rename to doc/html/tutorial/3.html
diff --git a/safe_numerics/doc/html/types.html b/doc/html/types.html
similarity index 100%
rename from safe_numerics/doc/html/types.html
rename to doc/html/types.html
diff --git a/safe_numerics/examples/example1.cpp b/examples/example1.cpp
similarity index 100%
rename from safe_numerics/examples/example1.cpp
rename to examples/example1.cpp
diff --git a/safe_numerics/examples/example2.cpp b/examples/example2.cpp
similarity index 100%
rename from safe_numerics/examples/example2.cpp
rename to examples/example2.cpp
diff --git a/safe_numerics/examples/example3.cpp b/examples/example3.cpp
similarity index 100%
rename from safe_numerics/examples/example3.cpp
rename to examples/example3.cpp
diff --git a/safe_numerics/examples/example4.cpp b/examples/example4.cpp
similarity index 100%
rename from safe_numerics/examples/example4.cpp
rename to examples/example4.cpp
diff --git a/safe_numerics/examples/example_test.cpp b/examples/example_test.cpp
similarity index 100%
rename from safe_numerics/examples/example_test.cpp
rename to examples/example_test.cpp
diff --git a/include/.DS_Store b/include/.DS_Store
new file mode 100644
index 0000000..5cd553c
Binary files /dev/null and b/include/.DS_Store differ
diff --git a/safe_numerics/include/concept/numeric.hpp b/include/concept/numeric.hpp
similarity index 100%
rename from safe_numerics/include/concept/numeric.hpp
rename to include/concept/numeric.hpp
diff --git a/safe_numerics/include/numeric.hpp b/include/numeric.hpp
similarity index 100%
rename from safe_numerics/include/numeric.hpp
rename to include/numeric.hpp
diff --git a/safe_numerics/include/overflow.hpp b/include/overflow.hpp
similarity index 100%
rename from safe_numerics/include/overflow.hpp
rename to include/overflow.hpp
diff --git a/safe_numerics/include/safe_cast.hpp b/include/safe_cast.hpp
similarity index 100%
rename from safe_numerics/include/safe_cast.hpp
rename to include/safe_cast.hpp
diff --git a/safe_numerics/include/safe_compare.hpp b/include/safe_compare.hpp
similarity index 100%
rename from safe_numerics/include/safe_compare.hpp
rename to include/safe_compare.hpp
diff --git a/safe_numerics/include/safe_integer.hpp b/include/safe_integer.hpp
similarity index 100%
rename from safe_numerics/include/safe_integer.hpp
rename to include/safe_integer.hpp
diff --git a/safe_numerics/include/safe_range.hpp b/include/safe_range.hpp
similarity index 100%
rename from safe_numerics/include/safe_range.hpp
rename to include/safe_range.hpp
diff --git a/safe_numerics/.DS_Store b/safe_numerics/.DS_Store
new file mode 100644
index 0000000..ad2aeb9
Binary files /dev/null and b/safe_numerics/.DS_Store differ
diff --git a/safe_numerics/test/test.cpp b/test/test.cpp
similarity index 100%
rename from safe_numerics/test/test.cpp
rename to test/test.cpp
diff --git a/safe_numerics/test/test.hpp b/test/test.hpp
similarity index 100%
rename from safe_numerics/test/test.hpp
rename to test/test.hpp
diff --git a/safe_numerics/test/test_add.cpp b/test/test_add.cpp
similarity index 100%
rename from safe_numerics/test/test_add.cpp
rename to test/test_add.cpp
diff --git a/safe_numerics/test/test_add.hpp b/test/test_add.hpp
similarity index 100%
rename from safe_numerics/test/test_add.hpp
rename to test/test_add.hpp
diff --git a/safe_numerics/test/test_add1.cpp b/test/test_add1.cpp
similarity index 100%
rename from safe_numerics/test/test_add1.cpp
rename to test/test_add1.cpp
diff --git a/safe_numerics/test/test_add2.cpp b/test/test_add2.cpp
similarity index 100%
rename from safe_numerics/test/test_add2.cpp
rename to test/test_add2.cpp
diff --git a/safe_numerics/test/test_add3.cpp b/test/test_add3.cpp
similarity index 100%
rename from safe_numerics/test/test_add3.cpp
rename to test/test_add3.cpp
diff --git a/safe_numerics/test/test_compare.cpp b/test/test_compare.cpp
similarity index 100%
rename from safe_numerics/test/test_compare.cpp
rename to test/test_compare.cpp
diff --git a/safe_numerics/test/test_conversion.cpp b/test/test_conversion.cpp
similarity index 100%
rename from safe_numerics/test/test_conversion.cpp
rename to test/test_conversion.cpp
diff --git a/safe_numerics/test/test_divide.cpp b/test/test_divide.cpp
similarity index 100%
rename from safe_numerics/test/test_divide.cpp
rename to test/test_divide.cpp
diff --git a/safe_numerics/test/test_divide.hpp b/test/test_divide.hpp
similarity index 100%
rename from safe_numerics/test/test_divide.hpp
rename to test/test_divide.hpp
diff --git a/safe_numerics/test/test_divide1.cpp b/test/test_divide1.cpp
similarity index 100%
rename from safe_numerics/test/test_divide1.cpp
rename to test/test_divide1.cpp
diff --git a/safe_numerics/test/test_divide2.cpp b/test/test_divide2.cpp
similarity index 100%
rename from safe_numerics/test/test_divide2.cpp
rename to test/test_divide2.cpp
diff --git a/safe_numerics/test/test_divide3.cpp b/test/test_divide3.cpp
similarity index 100%
rename from safe_numerics/test/test_divide3.cpp
rename to test/test_divide3.cpp
diff --git a/safe_numerics/test/test_misc.cpp b/test/test_misc.cpp
similarity index 100%
rename from safe_numerics/test/test_misc.cpp
rename to test/test_misc.cpp
diff --git a/safe_numerics/test/test_modulus.cpp b/test/test_modulus.cpp
similarity index 100%
rename from safe_numerics/test/test_modulus.cpp
rename to test/test_modulus.cpp
diff --git a/safe_numerics/test/test_modulus.hpp b/test/test_modulus.hpp
similarity index 100%
rename from safe_numerics/test/test_modulus.hpp
rename to test/test_modulus.hpp
diff --git a/safe_numerics/test/test_modulus1.cpp b/test/test_modulus1.cpp
similarity index 100%
rename from safe_numerics/test/test_modulus1.cpp
rename to test/test_modulus1.cpp
diff --git a/safe_numerics/test/test_modulus2.cpp b/test/test_modulus2.cpp
similarity index 100%
rename from safe_numerics/test/test_modulus2.cpp
rename to test/test_modulus2.cpp
diff --git a/safe_numerics/test/test_modulus3.cpp b/test/test_modulus3.cpp
similarity index 100%
rename from safe_numerics/test/test_modulus3.cpp
rename to test/test_modulus3.cpp
diff --git a/safe_numerics/test/test_multiply.cpp b/test/test_multiply.cpp
similarity index 100%
rename from safe_numerics/test/test_multiply.cpp
rename to test/test_multiply.cpp
diff --git a/safe_numerics/test/test_multiply.hpp b/test/test_multiply.hpp
similarity index 100%
rename from safe_numerics/test/test_multiply.hpp
rename to test/test_multiply.hpp
diff --git a/safe_numerics/test/test_multiply1.cpp b/test/test_multiply1.cpp
similarity index 100%
rename from safe_numerics/test/test_multiply1.cpp
rename to test/test_multiply1.cpp
diff --git a/safe_numerics/test/test_multiply2.cpp b/test/test_multiply2.cpp
similarity index 100%
rename from safe_numerics/test/test_multiply2.cpp
rename to test/test_multiply2.cpp
diff --git a/safe_numerics/test/test_multiply3.cpp b/test/test_multiply3.cpp
similarity index 100%
rename from safe_numerics/test/test_multiply3.cpp
rename to test/test_multiply3.cpp
diff --git a/safe_numerics/test/test_numeric.cpp b/test/test_numeric.cpp
similarity index 100%
rename from safe_numerics/test/test_numeric.cpp
rename to test/test_numeric.cpp
diff --git a/safe_numerics/test/test_subtract.cpp b/test/test_subtract.cpp
similarity index 100%
rename from safe_numerics/test/test_subtract.cpp
rename to test/test_subtract.cpp
diff --git a/safe_numerics/test/test_subtract.hpp b/test/test_subtract.hpp
similarity index 100%
rename from safe_numerics/test/test_subtract.hpp
rename to test/test_subtract.hpp
diff --git a/safe_numerics/test/test_subtract1.cpp b/test/test_subtract1.cpp
similarity index 100%
rename from safe_numerics/test/test_subtract1.cpp
rename to test/test_subtract1.cpp
diff --git a/safe_numerics/test/test_subtract2.cpp b/test/test_subtract2.cpp
similarity index 100%
rename from safe_numerics/test/test_subtract2.cpp
rename to test/test_subtract2.cpp
diff --git a/safe_numerics/test/test_subtract3.cpp b/test/test_subtract3.cpp
similarity index 100%
rename from safe_numerics/test/test_subtract3.cpp
rename to test/test_subtract3.cpp
diff --git a/safe_numerics/test/vcide/example_test.vcproj b/test/vcide/example_test.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/example_test.vcproj
rename to test/vcide/example_test.vcproj
diff --git a/safe_numerics/test/vcide/safe_numerics.sln b/test/vcide/safe_numerics.sln
similarity index 100%
rename from safe_numerics/test/vcide/safe_numerics.sln
rename to test/vcide/safe_numerics.sln
diff --git a/safe_numerics/test/vcide/test_add.vcproj b/test/vcide/test_add.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_add.vcproj
rename to test/vcide/test_add.vcproj
diff --git a/safe_numerics/test/vcide/test_comparison.vcproj b/test/vcide/test_comparison.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_comparison.vcproj
rename to test/vcide/test_comparison.vcproj
diff --git a/safe_numerics/test/vcide/test_conversion.vcproj b/test/vcide/test_conversion.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_conversion.vcproj
rename to test/vcide/test_conversion.vcproj
diff --git a/safe_numerics/test/vcide/test_divide.vcproj b/test/vcide/test_divide.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_divide.vcproj
rename to test/vcide/test_divide.vcproj
diff --git a/safe_numerics/test/vcide/test_modulus.vcproj b/test/vcide/test_modulus.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_modulus.vcproj
rename to test/vcide/test_modulus.vcproj
diff --git a/safe_numerics/test/vcide/test_multiply.vcproj b/test/vcide/test_multiply.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_multiply.vcproj
rename to test/vcide/test_multiply.vcproj
diff --git a/safe_numerics/test/vcide/test_numeric.vcproj b/test/vcide/test_numeric.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_numeric.vcproj
rename to test/vcide/test_numeric.vcproj
diff --git a/safe_numerics/test/vcide/test_subtract.vcproj b/test/vcide/test_subtract.vcproj
similarity index 100%
rename from safe_numerics/test/vcide/test_subtract.vcproj
rename to test/vcide/test_subtract.vcproj