diff --git a/README.md b/README.md
index beb54a9..9516a40 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ It has basic features, serialize arithmetic types, enums, containers and text, a
 ```cpp
 #include <iostream>
 #include <vector>
-#include <Bitsery.h>
+#include <bitsery/bitsery.h>
 
 
 enum class MyEnum { V1,V2,V3 };
@@ -73,4 +73,5 @@ int main() {
 This library was tested on
 * Windows: Visual Studio 2015, MinGW (gcc 5.2)
 * Linux: GCC 5.4, GCC 6.2, Clang 3.9
+* OS X Mavericks: AppleClang 8
 
diff --git a/examples/basic_usage.cpp b/examples/basic_usage.cpp
index c478719..bc9e6b5 100644
--- a/examples/basic_usage.cpp
+++ b/examples/basic_usage.cpp
@@ -22,7 +22,7 @@
 
 #include <iostream>
 #include <vector>
-#include <Bitsery.h>
+#include <bitsery/bitsery.h>
 
 
 enum class MyEnum { V1,V2,V3 };
diff --git a/include/Bitsery.h b/include/bitsery/bitsery.h
similarity index 92%
rename from include/Bitsery.h
rename to include/bitsery/bitsery.h
index a43f494..b32158e 100644
--- a/include/Bitsery.h
+++ b/include/bitsery/bitsery.h
@@ -26,7 +26,7 @@
 
 #define BITSERY_MAJOR_VERSION 1
 #define BITSERY_MINOR_VERSION 1
-#define BITSERY_PATCH_VERSION 0
+#define BITSERY_PATCH_VERSION 1
 
 #define BITSERY_QUOTE_MACRO(name) #name
 #define BITSERY_BUILD_VERSION_STR(major,minor, patch) \
@@ -38,9 +38,9 @@ BITSERY_QUOTE_MACRO(patch)
 BITSERY_BUILD_VERSION_STR(BITSERY_MAJOR_VERSION, BITSERY_MINOR_VERSION, BITSERY_PATCH_VERSION)
 
 
-#include "BufferWriter.h"
-#include "BufferReader.h"
-#include "Serializer.h"
-#include "Deserializer.h"
+#include "buffer_writer.h"
+#include "buffer_reader.h"
+#include "serializer.h"
+#include "deserializer.h"
 
 #endif //BITSERY_BITSERY_H
diff --git a/include/BufferReader.h b/include/bitsery/buffer_reader.h
similarity index 96%
rename from include/BufferReader.h
rename to include/bitsery/buffer_reader.h
index 780bd40..ed2dacf 100644
--- a/include/BufferReader.h
+++ b/include/bitsery/buffer_reader.h
@@ -25,7 +25,7 @@
 #ifndef BITSERY_BUFFER_READER_H
 #define BITSERY_BUFFER_READER_H
 
-#include "Common.h"
+#include "common.h"
 
 #include <cassert>
 #include <algorithm>
diff --git a/include/BufferWriter.h b/include/bitsery/buffer_writer.h
similarity index 96%
rename from include/BufferWriter.h
rename to include/bitsery/buffer_writer.h
index 5174be6..32c274f 100644
--- a/include/BufferWriter.h
+++ b/include/bitsery/buffer_writer.h
@@ -25,7 +25,7 @@
 #ifndef BITSERY_BUFFER_WRITER_H
 #define BITSERY_BUFFER_WRITER_H
 
-#include "Common.h"
+#include "common.h"
 #include <cassert>
 #include <algorithm>
 #include <iterator>
diff --git a/include/Common.h b/include/bitsery/common.h
similarity index 99%
rename from include/Common.h
rename to include/bitsery/common.h
index d3d6f9c..f94263d 100644
--- a/include/Common.h
+++ b/include/bitsery/common.h
@@ -25,7 +25,7 @@
 #ifndef BITSERY_COMMON_H
 #define BITSERY_COMMON_H
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace bitsery {
 
diff --git a/include/DeltaDeserializer.h b/include/bitsery/delta_deserializer.h
similarity index 99%
rename from include/DeltaDeserializer.h
rename to include/bitsery/delta_deserializer.h
index 1d4a99d..f6a161b 100644
--- a/include/DeltaDeserializer.h
+++ b/include/bitsery/delta_deserializer.h
@@ -28,7 +28,7 @@
 #include <array>
 #include <stack>
 #include <algorithm>
-#include "Deserializer.h"
+#include "deserializer.h"
 
 namespace bitsery {
 
diff --git a/include/DeltaSerializer.h b/include/bitsery/delta_serializer.h
similarity index 99%
rename from include/DeltaSerializer.h
rename to include/bitsery/delta_serializer.h
index 5b72ee7..b06aed3 100644
--- a/include/DeltaSerializer.h
+++ b/include/bitsery/delta_serializer.h
@@ -28,7 +28,7 @@
 #include <array>
 #include <stack>
 #include <algorithm>
-#include "Serializer.h"
+#include "serializer.h"
 
 namespace bitsery {
 
diff --git a/include/Deserializer.h b/include/bitsery/deserializer.h
similarity index 99%
rename from include/Deserializer.h
rename to include/bitsery/deserializer.h
index 12c9962..55c95fa 100644
--- a/include/Deserializer.h
+++ b/include/bitsery/deserializer.h
@@ -24,7 +24,7 @@
 #ifndef BITSERY_DESERIALIZER_H
 #define BITSERY_DESERIALIZER_H
 
-#include "Common.h"
+#include "common.h"
 #include <array>
 #include <utility>
 
diff --git a/include/Serializer.h b/include/bitsery/serializer.h
similarity index 99%
rename from include/Serializer.h
rename to include/bitsery/serializer.h
index ad64959..26eaa62 100644
--- a/include/Serializer.h
+++ b/include/bitsery/serializer.h
@@ -25,7 +25,7 @@
 #ifndef BITSERY_SERIALIZER_H
 #define BITSERY_SERIALIZER_H
 
-#include "Common.h"
+#include "common.h"
 #include <array>
 
 namespace bitsery {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5d50dbd..d14b49e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -39,33 +39,54 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 file(GLOB TEST_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
 FOREACH(TEST_PROJECT_FILE ${TEST_SRC_FILES})
-    get_filename_component(TEST_PROJECT_NAME ${TEST_PROJECT_FILE} NAME_WE)
+    get_filename_component(SEPARATE_TEST_NAME ${TEST_PROJECT_FILE} NAME_WE)
+    set(SEPARATE_TEST_NAME TEST_${SEPARATE_TEST_NAME})
+    add_executable(${SEPARATE_TEST_NAME} ${TEST_PROJECT_FILE})
+    add_dependencies(${SEPARATE_TEST_NAME} googletest)
 
-    add_executable(${TEST_PROJECT_NAME} ${TEST_PROJECT_FILE})
-    add_dependencies(${TEST_PROJECT_NAME} googletest)
-
-    set_property(TARGET ${TEST_PROJECT_NAME} PROPERTY CXX_STANDARD 14)
-    set_property(TARGET ${TEST_PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+    set_property(TARGET ${SEPARATE_TEST_NAME} PROPERTY CXX_STANDARD 14)
+    set_property(TARGET ${SEPARATE_TEST_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
 
 
     if(NOT WIN32 OR MINGW)
         FOREACH(LIBNAME ${GTEST_LINK_LIBNAMES})
-            target_link_libraries(${TEST_PROJECT_NAME} ${GTEST_LIBS_DIR}/lib${LIBNAME}.a )
+            target_link_libraries(${SEPARATE_TEST_NAME} ${GTEST_LIBS_DIR}/lib${LIBNAME}.a )
         ENDFOREACH()
     else()
         FOREACH(LIBNAME ${GTEST_LINK_LIBNAMES})
-            target_link_libraries(${TEST_PROJECT_NAME}
+            target_link_libraries(${SEPARATE_TEST_NAME}
                     debug ${GTEST_LIBS_DIR}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}${LIBNAME}${CMAKE_FIND_LIBRARY_SUFFIXES}
                     optimized ${GTEST_LIBS_DIR}/ReleaseLibs/${CMAKE_FIND_LIBRARY_PREFIXES}${LIBNAME}${CMAKE_FIND_LIBRARY_SUFFIXES})
         ENDFOREACH()
     endif()
 
-    target_link_libraries(${TEST_PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(${SEPARATE_TEST_NAME} ${CMAKE_THREAD_LIBS_INIT})
 
-    add_test(NAME ${TEST_PROJECT_NAME} COMMAND $<TARGET_FILE:${TEST_PROJECT_NAME}>)
+    add_test(NAME ${SEPARATE_TEST_NAME} COMMAND $<TARGET_FILE:${SEPARATE_TEST_NAME}>)
 
 ENDFOREACH()
 
+#all in one tests for code coverage
+add_executable(${TEST_PROJECT_NAME} ${TEST_SRC_FILES})
+add_dependencies(${TEST_PROJECT_NAME} googletest)
+
+set_property(TARGET ${TEST_PROJECT_NAME} PROPERTY CXX_STANDARD 14)
+set_property(TARGET ${TEST_PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+
+
+if(NOT WIN32 OR MINGW)
+    FOREACH(LIBNAME ${GTEST_LINK_LIBNAMES})
+        target_link_libraries(${TEST_PROJECT_NAME} ${GTEST_LIBS_DIR}/lib${LIBNAME}.a )
+    ENDFOREACH()
+else()
+    FOREACH(LIBNAME ${GTEST_LINK_LIBNAMES})
+        target_link_libraries(${TEST_PROJECT_NAME}
+                debug ${GTEST_LIBS_DIR}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}${LIBNAME}${CMAKE_FIND_LIBRARY_SUFFIXES}
+                optimized ${GTEST_LIBS_DIR}/ReleaseLibs/${CMAKE_FIND_LIBRARY_PREFIXES}${LIBNAME}${CMAKE_FIND_LIBRARY_SUFFIXES})
+    ENDFOREACH()
+endif()
+
+target_link_libraries(${TEST_PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT})
 
 
 
diff --git a/tests/BufferBitsOpTests.cpp b/tests/buffer_bits_op.cpp
similarity index 95%
rename from tests/BufferBitsOpTests.cpp
rename to tests/buffer_bits_op.cpp
index 79db70c..dd2ade1 100644
--- a/tests/BufferBitsOpTests.cpp
+++ b/tests/buffer_bits_op.cpp
@@ -22,8 +22,8 @@
 
 
 #include <gmock/gmock.h>
-#include "BufferWriter.h"
-#include "BufferReader.h"
+#include <bitsery/buffer_writer.h>
+#include <bitsery/buffer_reader.h>
 #include <list>
 #include <bitset>
 
diff --git a/tests/BufferBytesOpTests.cpp b/tests/buffer_bytes_op.cpp
similarity index 95%
rename from tests/BufferBytesOpTests.cpp
rename to tests/buffer_bytes_op.cpp
index 56828d7..919ca19 100644
--- a/tests/BufferBytesOpTests.cpp
+++ b/tests/buffer_bytes_op.cpp
@@ -22,8 +22,8 @@
 
 
 #include <gmock/gmock.h>
-#include "BufferWriter.h"
-#include "BufferReader.h"
+#include <bitsery/buffer_writer.h>
+#include <bitsery/buffer_reader.h>
 #include <list>
 #include <bitset>
 
diff --git a/tests/SerializationBoolTests.cpp b/tests/serialization_bool.cpp
similarity index 98%
rename from tests/SerializationBoolTests.cpp
rename to tests/serialization_bool.cpp
index ff42ea7..504fcb7 100644
--- a/tests/SerializationBoolTests.cpp
+++ b/tests/serialization_bool.cpp
@@ -22,7 +22,7 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 
 using testing::Eq;
 
diff --git a/tests/SerializationContainerTests.cpp b/tests/serialization_container.cpp
similarity index 99%
rename from tests/SerializationContainerTests.cpp
rename to tests/serialization_container.cpp
index e517c03..7d4e238 100644
--- a/tests/SerializationContainerTests.cpp
+++ b/tests/serialization_container.cpp
@@ -23,7 +23,7 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 #include <numeric>
 #include <deque>
 #include <list>
diff --git a/tests/SerializationFixedSizeArrayTests.cpp b/tests/serialization_fixed_size_array.cpp
similarity index 99%
rename from tests/SerializationFixedSizeArrayTests.cpp
rename to tests/serialization_fixed_size_array.cpp
index 370bfcd..8dddcea 100644
--- a/tests/SerializationFixedSizeArrayTests.cpp
+++ b/tests/serialization_fixed_size_array.cpp
@@ -22,7 +22,7 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 #include <type_traits>
 
 using testing::ContainerEq;
diff --git a/tests/SerializerObjectsTests.cpp b/tests/serialization_objects.cpp
similarity index 97%
rename from tests/SerializerObjectsTests.cpp
rename to tests/serialization_objects.cpp
index b95bd32..1cef990 100644
--- a/tests/SerializerObjectsTests.cpp
+++ b/tests/serialization_objects.cpp
@@ -22,10 +22,10 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 
-#include "DeltaSerializer.h"
-#include "DeltaDeserializer.h"
+#include <bitsery/delta_serializer.h>
+#include <bitsery/delta_deserializer.h>
 
 #include <list>
 
diff --git a/tests/SerializationRangeTests.cpp b/tests/serialization_range.cpp
similarity index 99%
rename from tests/SerializationRangeTests.cpp
rename to tests/serialization_range.cpp
index dee0271..2e0fe16 100644
--- a/tests/SerializationRangeTests.cpp
+++ b/tests/serialization_range.cpp
@@ -22,7 +22,7 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 using namespace testing;
 using bitsery::RangeSpec;
 using bitsery::BitsConstraint;
diff --git a/tests/SerializationSizeTests.cpp b/tests/serialization_size.cpp
similarity index 98%
rename from tests/SerializationSizeTests.cpp
rename to tests/serialization_size.cpp
index 37ab89c..af5a117 100644
--- a/tests/SerializationSizeTests.cpp
+++ b/tests/serialization_size.cpp
@@ -22,7 +22,7 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 
 using testing::Eq;
 
diff --git a/tests/SerializationSubstitutionTests.cpp b/tests/serialization_substitution.cpp
similarity index 99%
rename from tests/SerializationSubstitutionTests.cpp
rename to tests/serialization_substitution.cpp
index 613d30f..56339f0 100644
--- a/tests/SerializationSubstitutionTests.cpp
+++ b/tests/serialization_substitution.cpp
@@ -22,7 +22,7 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 using namespace testing;
 
 TEST(SerializeSubstitution, WhenSubstitutedThenOnlyWriteIndexUsingMinRequiredBits) {
diff --git a/tests/SerializationTestUtils.h b/tests/serialization_test_utils.h
similarity index 96%
rename from tests/SerializationTestUtils.h
rename to tests/serialization_test_utils.h
index 5812e9c..d5fe43b 100644
--- a/tests/SerializationTestUtils.h
+++ b/tests/serialization_test_utils.h
@@ -24,10 +24,7 @@
 #ifndef BITSERY_SERIALIZERTESTS_H
 #define BITSERY_SERIALIZERTESTS_H
 
-#include <Deserializer.h>
-#include <BufferReader.h>
-#include "BufferWriter.h"
-#include "Serializer.h"
+#include <bitsery/bitsery.h>
 #include <memory>
 
 struct MyStruct1 {
diff --git a/tests/SerializationTextTests.cpp b/tests/serialization_text.cpp
similarity index 99%
rename from tests/SerializationTextTests.cpp
rename to tests/serialization_text.cpp
index 2546a3e..4a5b245 100644
--- a/tests/SerializationTextTests.cpp
+++ b/tests/serialization_text.cpp
@@ -22,7 +22,7 @@
 
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 using namespace testing;
 
 TEST(SerializeText, BasicString) {
diff --git a/tests/SerializerValuesTests.cpp b/tests/serializer_values.cpp
similarity index 98%
rename from tests/SerializerValuesTests.cpp
rename to tests/serializer_values.cpp
index bb22176..6dde056 100644
--- a/tests/SerializerValuesTests.cpp
+++ b/tests/serializer_values.cpp
@@ -21,7 +21,7 @@
 //SOFTWARE.
 
 #include <gmock/gmock.h>
-#include "SerializationTestUtils.h"
+#include "serialization_test_utils.h"
 
 using testing::Eq;