diff --git a/.travis.yml b/.travis.yml
index 6a22839..8f3cc8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,21 +25,6 @@ matrix:
       dist: trusty
       addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-8"], packages: ["xorg-dev", "clang-8", "g++-7"] } }
       env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
-    - os: osx
-      osx_image: xcode9
-      compiler: clang
-    - os: osx
-      osx_image: xcode9.1
-      compiler: clang
-    - os: osx
-      osx_image: xcode9.2
-      compiler: clang
-    - os: osx
-      osx_image: xcode9.3
-      compiler: clang
-    - os: osx
-      osx_image: xcode9.4
-      compiler: clang
     - os: osx
       osx_image: xcode10
       compiler: clang
diff --git a/README.md b/README.md
index 8840b64..7a1a839 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 [flat.hpp][flat] is a header-only library. All you need to do is copy the headers files from `headers` directory into your project and include them:
 
 ```cpp
-#include "flat_hpp/flat_set.hpp"
+#include "flat.hpp/flat_set.hpp"
 using namespace flat_hpp;
 
 int main() {
diff --git a/headers/flat_hpp/flat_map.hpp b/headers/flat.hpp/flat_map.hpp
similarity index 100%
rename from headers/flat_hpp/flat_map.hpp
rename to headers/flat.hpp/flat_map.hpp
diff --git a/headers/flat_hpp/flat_multimap.hpp b/headers/flat.hpp/flat_multimap.hpp
similarity index 100%
rename from headers/flat_hpp/flat_multimap.hpp
rename to headers/flat.hpp/flat_multimap.hpp
diff --git a/headers/flat_hpp/flat_multiset.hpp b/headers/flat.hpp/flat_multiset.hpp
similarity index 100%
rename from headers/flat_hpp/flat_multiset.hpp
rename to headers/flat.hpp/flat_multiset.hpp
diff --git a/headers/flat_hpp/flat_set.hpp b/headers/flat.hpp/flat_set.hpp
similarity index 100%
rename from headers/flat_hpp/flat_set.hpp
rename to headers/flat.hpp/flat_set.hpp
diff --git a/untests/CMakeLists.txt b/untests/CMakeLists.txt
index c71a4db..e37f8fc 100644
--- a/untests/CMakeLists.txt
+++ b/untests/CMakeLists.txt
@@ -29,4 +29,11 @@ add_executable(${PROJECT_NAME} ${UNTESTS_SOURCES})
 target_link_libraries(${PROJECT_NAME}
     Catch2
     flat.hpp)
+target_compile_options(${PROJECT_NAME}
+    PRIVATE
+    $<$<CXX_COMPILER_ID:MSVC>:
+        /W4>
+    PRIVATE
+    $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:
+        -Wall -Wextra -Wpedantic>)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
diff --git a/untests/flat_map_tests.cpp b/untests/flat_map_tests.cpp
index b880656..ced86ce 100644
--- a/untests/flat_map_tests.cpp
+++ b/untests/flat_map_tests.cpp
@@ -9,7 +9,7 @@
 
 #include <deque>
 
-#include <flat_hpp/flat_map.hpp>
+#include <flat.hpp/flat_map.hpp>
 using namespace flat_hpp;
 
 namespace
diff --git a/untests/flat_multimap_tests.cpp b/untests/flat_multimap_tests.cpp
index 3247874..ccaf5bd 100644
--- a/untests/flat_multimap_tests.cpp
+++ b/untests/flat_multimap_tests.cpp
@@ -9,7 +9,7 @@
 
 #include <deque>
 
-#include <flat_hpp/flat_multimap.hpp>
+#include <flat.hpp/flat_multimap.hpp>
 using namespace flat_hpp;
 
 namespace
diff --git a/untests/flat_multiset_tests.cpp b/untests/flat_multiset_tests.cpp
index db7725b..669d799 100644
--- a/untests/flat_multiset_tests.cpp
+++ b/untests/flat_multiset_tests.cpp
@@ -9,7 +9,7 @@
 
 #include <deque>
 
-#include <flat_hpp/flat_multiset.hpp>
+#include <flat.hpp/flat_multiset.hpp>
 using namespace flat_hpp;
 
 namespace
diff --git a/untests/flat_set_tests.cpp b/untests/flat_set_tests.cpp
index 480dbeb..6029598 100644
--- a/untests/flat_set_tests.cpp
+++ b/untests/flat_set_tests.cpp
@@ -9,7 +9,7 @@
 
 #include <deque>
 
-#include <flat_hpp/flat_set.hpp>
+#include <flat.hpp/flat_set.hpp>
 using namespace flat_hpp;
 
 namespace