diff --git a/float16_t.hpp b/include/float16/float16_t.hpp
similarity index 100%
rename from float16_t.hpp
rename to include/float16/float16_t.hpp
index 3b3967d..bb86271 100644
--- a/float16_t.hpp
+++ b/include/float16/float16_t.hpp
@@ -1011,8 +1011,8 @@ namespace std
 
 #endif
 
-#endif
-
 #ifdef _MSC_VER
 #pragma warning( pop )
 #endif
+
+#endif
diff --git a/tests/test.cc b/tests/test.cc
index 4afdc70..e6eae94 100644
--- a/tests/test.cc
+++ b/tests/test.cc
@@ -1,6 +1,6 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include "catch.hpp"
-#include "../float16_t.hpp"
+#include "../include/float16/float16_t.hpp"
 #include <cmath>
 #include <iostream>
 #include <bitset>