diff --git a/other/build.nr b/other/build.nr
index 2663d7c..05da436 100644
--- a/other/build.nr
+++ b/other/build.nr
@@ -1 +1 @@
-2001
+2007
diff --git a/other/create_release.sh b/other/create_release.sh
index 19f0b4a..71e7c6b 100755
--- a/other/create_release.sh
+++ b/other/create_release.sh
@@ -37,12 +37,21 @@ fi
 
 mkdir -p $RELEASE_DIR/include/ostd/vendor
 mkdir -p $RELEASE_DIR/include/ostd/vendor/midifile
-mkdir -p $RELEASE_DIR/include/ostd/vendor/nlohmann
+mkdir -p $RELEASE_DIR/include/ostd/data_types
+mkdir -p $RELEASE_DIR/include/ostd/io
+mkdir -p $RELEASE_DIR/include/ostd/math
+mkdir -p $RELEASE_DIR/include/ostd/string
+mkdir -p $RELEASE_DIR/include/ostd/utils
 mkdir -p $RELEASE_DIR/include/ogfx/
 find ../src/ostd  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd \;
+find ../src/ostd/data_types  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/data_types \;
+find ../src/ostd/io  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/io \;
+find ../src/ostd/math  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/math \;
+find ../src/ostd/string  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/string \;
+find ../src/ostd/utils  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/utils \;
 find ../src/ogfx  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ogfx \;
 find ../src/ostd/vendor  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor \;
 find ../src/ostd/vendor/midifile  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor/midifile \;
-find ../src/ostd/vendor/nlohmann  -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor/nlohmann \;
+cp -r ../src/ostd/vendor/nlohmann $RELEASE_DIR/include/ostd/vendor/
 cp -r ../licences $RELEASE_DIR
 cp ../LICENSE $RELEASE_DIR/licences/OmniaFramework-LICENCE.txt
diff --git a/src/ostd/io/Logger.hpp b/src/ostd/io/Logger.hpp
index 6e4d69e..239b5e9 100755
--- a/src/ostd/io/Logger.hpp
+++ b/src/ostd/io/Logger.hpp
@@ -53,7 +53,7 @@ namespace ostd
 #define OX_LOG_DEBUG_ENABLED 1
 #define OX_LOG_TRACE_ENABLED 1
 
-#if OX_RELEASE_BUILD == 1
+#ifdef  OX_RELEASE_BUILD
 	#define OX_LOG_DEBUG_ENABLED 0
 	#define OX_LOG_TRACE_ENABLED 0
 #endif
diff --git a/src/ostd/vendor/nlohmann/adl_serializer.hpp b/src/ostd/vendor/nlohmann/adl_serializer.hpp
index 5df1af3..6575f00 100644
--- a/src/ostd/vendor/nlohmann/adl_serializer.hpp
+++ b/src/ostd/vendor/nlohmann/adl_serializer.hpp
@@ -10,10 +10,10 @@
 
 #include <utility>
 
-#include <nlohmann/detail/abi_macros.hpp>
-#include <nlohmann/detail/conversions/from_json.hpp>
-#include <nlohmann/detail/conversions/to_json.hpp>
-#include <nlohmann/detail/meta/identity_tag.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/conversions/from_json.hpp>
+#include <ostd/vendor/nlohmann/detail/conversions/to_json.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/identity_tag.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 
diff --git a/src/ostd/vendor/nlohmann/byte_container_with_subtype.hpp b/src/ostd/vendor/nlohmann/byte_container_with_subtype.hpp
index d6398e6..3526fcc 100644
--- a/src/ostd/vendor/nlohmann/byte_container_with_subtype.hpp
+++ b/src/ostd/vendor/nlohmann/byte_container_with_subtype.hpp
@@ -12,7 +12,7 @@
 #include <tuple> // tie
 #include <utility> // move
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 
diff --git a/src/ostd/vendor/nlohmann/detail/conversions/from_json.hpp b/src/ostd/vendor/nlohmann/detail/conversions/from_json.hpp
index d647d74..4401eae 100644
--- a/src/ostd/vendor/nlohmann/detail/conversions/from_json.hpp
+++ b/src/ostd/vendor/nlohmann/detail/conversions/from_json.hpp
@@ -23,14 +23,14 @@
 #include <utility> // pair, declval
 #include <valarray> // valarray
 
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/meta/identity_tag.hpp>
-#include <nlohmann/detail/meta/std_fs.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
-#include <nlohmann/detail/string_concat.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/identity_tag.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/std_fs.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/conversions/to_chars.hpp b/src/ostd/vendor/nlohmann/detail/conversions/to_chars.hpp
index 7431041..38d52a0 100644
--- a/src/ostd/vendor/nlohmann/detail/conversions/to_chars.hpp
+++ b/src/ostd/vendor/nlohmann/detail/conversions/to_chars.hpp
@@ -16,7 +16,7 @@
 #include <limits> // numeric_limits
 #include <type_traits> // conditional
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/conversions/to_json.hpp b/src/ostd/vendor/nlohmann/detail/conversions/to_json.hpp
index ead4566..3f3ce4f 100644
--- a/src/ostd/vendor/nlohmann/detail/conversions/to_json.hpp
+++ b/src/ostd/vendor/nlohmann/detail/conversions/to_json.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <nlohmann/detail/macro_scope.hpp> // JSON_HAS_CPP_17
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp> // JSON_HAS_CPP_17
 #ifdef JSON_HAS_CPP_17
     #include <optional> // optional
 #endif
@@ -22,11 +22,11 @@
 #include <valarray> // valarray
 #include <vector> // vector
 
-#include <nlohmann/detail/iterators/iteration_proxy.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/meta/std_fs.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/std_fs.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/exceptions.hpp b/src/ostd/vendor/nlohmann/detail/exceptions.hpp
index 5ebfb65..09fe000 100644
--- a/src/ostd/vendor/nlohmann/detail/exceptions.hpp
+++ b/src/ostd/vendor/nlohmann/detail/exceptions.hpp
@@ -17,13 +17,13 @@
 #include <string> // to_string
 #include <vector> // vector
 
-#include <nlohmann/detail/value_t.hpp>
-#include <nlohmann/detail/string_escape.hpp>
-#include <nlohmann/detail/input/position_t.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
-#include <nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/string_escape.hpp>
+#include <ostd/vendor/nlohmann/detail/input/position_t.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
 
 // With -Wweak-vtables, Clang will complain about the exception classes as they
 // have no out-of-line virtual method definitions and their vtable will be
diff --git a/src/ostd/vendor/nlohmann/detail/hash.hpp b/src/ostd/vendor/nlohmann/detail/hash.hpp
index 973943e..08dcaeb 100644
--- a/src/ostd/vendor/nlohmann/detail/hash.hpp
+++ b/src/ostd/vendor/nlohmann/detail/hash.hpp
@@ -12,8 +12,8 @@
 #include <cstddef> // size_t
 #include <functional> // hash
 
-#include <nlohmann/detail/abi_macros.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/input/binary_reader.hpp b/src/ostd/vendor/nlohmann/detail/input/binary_reader.hpp
index 2120cf9..e36c514 100644
--- a/src/ostd/vendor/nlohmann/detail/input/binary_reader.hpp
+++ b/src/ostd/vendor/nlohmann/detail/input/binary_reader.hpp
@@ -24,15 +24,15 @@
     #include <bit>  //byteswap
 #endif
 
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/input/input_adapters.hpp>
-#include <nlohmann/detail/input/json_sax.hpp>
-#include <nlohmann/detail/input/lexer.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/is_sax.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
-#include <nlohmann/detail/string_concat.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
+#include <ostd/vendor/nlohmann/detail/input/json_sax.hpp>
+#include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/is_sax.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/input/input_adapters.hpp b/src/ostd/vendor/nlohmann/detail/input/input_adapters.hpp
index 1affd61..0c8e844 100644
--- a/src/ostd/vendor/nlohmann/detail/input/input_adapters.hpp
+++ b/src/ostd/vendor/nlohmann/detail/input/input_adapters.hpp
@@ -23,10 +23,10 @@
     #include <istream>  // istream
 #endif                  // JSON_NO_IO
 
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/iterators/iterator_traits.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/input/json_sax.hpp b/src/ostd/vendor/nlohmann/detail/input/json_sax.hpp
index 0ff8778..611033c 100644
--- a/src/ostd/vendor/nlohmann/detail/input/json_sax.hpp
+++ b/src/ostd/vendor/nlohmann/detail/input/json_sax.hpp
@@ -14,10 +14,10 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/input/lexer.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
 NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /*!
diff --git a/src/ostd/vendor/nlohmann/detail/input/lexer.hpp b/src/ostd/vendor/nlohmann/detail/input/lexer.hpp
index 2b4e80a..248ab24 100644
--- a/src/ostd/vendor/nlohmann/detail/input/lexer.hpp
+++ b/src/ostd/vendor/nlohmann/detail/input/lexer.hpp
@@ -18,10 +18,10 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include <nlohmann/detail/input/input_adapters.hpp>
-#include <nlohmann/detail/input/position_t.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
+#include <ostd/vendor/nlohmann/detail/input/position_t.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/input/parser.hpp b/src/ostd/vendor/nlohmann/detail/input/parser.hpp
index b5a5a52..18f99da 100644
--- a/src/ostd/vendor/nlohmann/detail/input/parser.hpp
+++ b/src/ostd/vendor/nlohmann/detail/input/parser.hpp
@@ -15,14 +15,14 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/input/input_adapters.hpp>
-#include <nlohmann/detail/input/json_sax.hpp>
-#include <nlohmann/detail/input/lexer.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/is_sax.hpp>
-#include <nlohmann/detail/string_concat.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
+#include <ostd/vendor/nlohmann/detail/input/json_sax.hpp>
+#include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/is_sax.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/input/position_t.hpp b/src/ostd/vendor/nlohmann/detail/input/position_t.hpp
index c26c5f4..aee97be 100644
--- a/src/ostd/vendor/nlohmann/detail/input/position_t.hpp
+++ b/src/ostd/vendor/nlohmann/detail/input/position_t.hpp
@@ -10,7 +10,7 @@
 
 #include <cstddef> // size_t
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp b/src/ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp
index 9f3c8e6..d6b982b 100644
--- a/src/ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp
+++ b/src/ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <nlohmann/detail/abi_macros.hpp>
-#include <nlohmann/detail/iterators/primitive_iterator.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/iterators/iter_impl.hpp b/src/ostd/vendor/nlohmann/detail/iterators/iter_impl.hpp
index 45864e8..3368389 100644
--- a/src/ostd/vendor/nlohmann/detail/iterators/iter_impl.hpp
+++ b/src/ostd/vendor/nlohmann/detail/iterators/iter_impl.hpp
@@ -11,13 +11,13 @@
 #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
 #include <type_traits> // conditional, is_const, remove_const
 
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/iterators/internal_iterator.hpp>
-#include <nlohmann/detail/iterators/primitive_iterator.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp b/src/ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp
index 78e0d8b..3c92372 100644
--- a/src/ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp
+++ b/src/ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp
@@ -17,10 +17,10 @@
     #include <ranges> // enable_borrowed_range
 #endif
 
-#include <nlohmann/detail/abi_macros.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
-#include <nlohmann/detail/string_utils.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/string_utils.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp b/src/ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp
index 5ca92a5..f17f13e 100644
--- a/src/ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp
+++ b/src/ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp
@@ -10,9 +10,9 @@
 
 #include <iterator> // random_access_iterator_tag
 
-#include <nlohmann/detail/abi_macros.hpp>
-#include <nlohmann/detail/meta/void_t.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/void_t.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/iterators/json_reverse_iterator.hpp b/src/ostd/vendor/nlohmann/detail/iterators/json_reverse_iterator.hpp
index f979d85..bd26d0b 100644
--- a/src/ostd/vendor/nlohmann/detail/iterators/json_reverse_iterator.hpp
+++ b/src/ostd/vendor/nlohmann/detail/iterators/json_reverse_iterator.hpp
@@ -12,7 +12,7 @@
 #include <iterator> // reverse_iterator
 #include <utility> // declval
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp b/src/ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp
index 3a23834..fcdedd7 100644
--- a/src/ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp
+++ b/src/ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp
@@ -11,7 +11,7 @@
 #include <cstddef> // ptrdiff_t
 #include <limits>  // numeric_limits
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/json_custom_base_class.hpp b/src/ostd/vendor/nlohmann/detail/json_custom_base_class.hpp
index 91e0c80..f14a03e 100644
--- a/src/ostd/vendor/nlohmann/detail/json_custom_base_class.hpp
+++ b/src/ostd/vendor/nlohmann/detail/json_custom_base_class.hpp
@@ -10,7 +10,7 @@
 
 #include <type_traits> // conditional, is_same
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/json_pointer.hpp b/src/ostd/vendor/nlohmann/detail/json_pointer.hpp
index 1f76497..9e6aa54 100644
--- a/src/ostd/vendor/nlohmann/detail/json_pointer.hpp
+++ b/src/ostd/vendor/nlohmann/detail/json_pointer.hpp
@@ -21,11 +21,11 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/string_concat.hpp>
-#include <nlohmann/detail/string_escape.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/string_escape.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 
diff --git a/src/ostd/vendor/nlohmann/detail/json_ref.hpp b/src/ostd/vendor/nlohmann/detail/json_ref.hpp
index a9a68d9..8c2ff06 100644
--- a/src/ostd/vendor/nlohmann/detail/json_ref.hpp
+++ b/src/ostd/vendor/nlohmann/detail/json_ref.hpp
@@ -11,8 +11,8 @@
 #include <initializer_list>
 #include <utility>
 
-#include <nlohmann/detail/abi_macros.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/macro_scope.hpp b/src/ostd/vendor/nlohmann/detail/macro_scope.hpp
index d1c6b1b..2d4b026 100644
--- a/src/ostd/vendor/nlohmann/detail/macro_scope.hpp
+++ b/src/ostd/vendor/nlohmann/detail/macro_scope.hpp
@@ -9,13 +9,13 @@
 #pragma once
 
 #include <utility> // declval, pair
-#include <nlohmann/detail/meta/detected.hpp>
-#include <nlohmann/thirdparty/hedley/hedley.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
+#include <ostd/vendor/nlohmann/thirdparty/hedley/hedley.hpp>
 
 // This file contains all internal macro definitions (except those affecting ABI)
 // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 // exclude unsupported compilers
 #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
diff --git a/src/ostd/vendor/nlohmann/detail/macro_unscope.hpp b/src/ostd/vendor/nlohmann/detail/macro_unscope.hpp
index 2edb168..ae66788 100644
--- a/src/ostd/vendor/nlohmann/detail/macro_unscope.hpp
+++ b/src/ostd/vendor/nlohmann/detail/macro_unscope.hpp
@@ -43,4 +43,4 @@
     #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
 #endif
 
-#include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+#include <ostd/vendor/nlohmann/thirdparty/hedley/hedley_undef.hpp>
diff --git a/src/ostd/vendor/nlohmann/detail/meta/call_std/begin.hpp b/src/ostd/vendor/nlohmann/detail/meta/call_std/begin.hpp
index 6e697b5..21e07a4 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/call_std/begin.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/call_std/begin.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 
diff --git a/src/ostd/vendor/nlohmann/detail/meta/call_std/end.hpp b/src/ostd/vendor/nlohmann/detail/meta/call_std/end.hpp
index 4d27914..6b51ab5 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/call_std/end.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/call_std/end.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 
diff --git a/src/ostd/vendor/nlohmann/detail/meta/cpp_future.hpp b/src/ostd/vendor/nlohmann/detail/meta/cpp_future.hpp
index 57811b9..f062f25 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/cpp_future.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/cpp_future.hpp
@@ -14,7 +14,7 @@
 #include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
 #include <utility> // index_sequence, make_index_sequence, index_sequence_for
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/meta/detected.hpp b/src/ostd/vendor/nlohmann/detail/meta/detected.hpp
index c394733..cbe595c 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/detected.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/detected.hpp
@@ -10,7 +10,7 @@
 
 #include <type_traits>
 
-#include <nlohmann/detail/meta/void_t.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/void_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/meta/identity_tag.hpp b/src/ostd/vendor/nlohmann/detail/meta/identity_tag.hpp
index c39dabb..b7df469 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/identity_tag.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/identity_tag.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/meta/is_sax.hpp b/src/ostd/vendor/nlohmann/detail/meta/is_sax.hpp
index 2574f72..1e651a1 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/is_sax.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/is_sax.hpp
@@ -12,9 +12,9 @@
 #include <utility> // declval
 #include <string> // string
 
-#include <nlohmann/detail/abi_macros.hpp>
-#include <nlohmann/detail/meta/detected.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/meta/std_fs.hpp b/src/ostd/vendor/nlohmann/detail/meta/std_fs.hpp
index 2f33e32..69f548e 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/std_fs.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/std_fs.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 
 #if JSON_HAS_EXPERIMENTAL_FILESYSTEM
 #include <experimental/filesystem>
diff --git a/src/ostd/vendor/nlohmann/detail/meta/type_traits.hpp b/src/ostd/vendor/nlohmann/detail/meta/type_traits.hpp
index d834a0d..afdceb2 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/type_traits.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/type_traits.hpp
@@ -14,13 +14,13 @@
 #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
 #include <utility> // declval
 
-#include <nlohmann/detail/iterators/iterator_traits.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/call_std/begin.hpp>
-#include <nlohmann/detail/meta/call_std/end.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/meta/detected.hpp>
-#include <nlohmann/json_fwd.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/call_std/begin.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/call_std/end.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
+#include <ostd/vendor/nlohmann/json_fwd.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 /*!
diff --git a/src/ostd/vendor/nlohmann/detail/meta/void_t.hpp b/src/ostd/vendor/nlohmann/detail/meta/void_t.hpp
index 258475c..32cdfd4 100644
--- a/src/ostd/vendor/nlohmann/detail/meta/void_t.hpp
+++ b/src/ostd/vendor/nlohmann/detail/meta/void_t.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/output/binary_writer.hpp b/src/ostd/vendor/nlohmann/detail/output/binary_writer.hpp
index f81fa54..b89ede3 100644
--- a/src/ostd/vendor/nlohmann/detail/output/binary_writer.hpp
+++ b/src/ostd/vendor/nlohmann/detail/output/binary_writer.hpp
@@ -19,10 +19,10 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include <nlohmann/detail/input/binary_reader.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/output/output_adapters.hpp>
-#include <nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/input/binary_reader.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/output/output_adapters.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/output/output_adapters.hpp b/src/ostd/vendor/nlohmann/detail/output/output_adapters.hpp
index 6080697..beffbc6 100644
--- a/src/ostd/vendor/nlohmann/detail/output/output_adapters.hpp
+++ b/src/ostd/vendor/nlohmann/detail/output/output_adapters.hpp
@@ -20,7 +20,7 @@
     #include <ostream>  // basic_ostream
 #endif  // JSON_NO_IO
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/output/serializer.hpp b/src/ostd/vendor/nlohmann/detail/output/serializer.hpp
index 3137f3c..ae8326a 100644
--- a/src/ostd/vendor/nlohmann/detail/output/serializer.hpp
+++ b/src/ostd/vendor/nlohmann/detail/output/serializer.hpp
@@ -22,14 +22,14 @@
 #include <type_traits> // is_same
 #include <utility> // move
 
-#include <nlohmann/detail/conversions/to_chars.hpp>
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/output/binary_writer.hpp>
-#include <nlohmann/detail/output/output_adapters.hpp>
-#include <nlohmann/detail/string_concat.hpp>
-#include <nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/detail/conversions/to_chars.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/output/binary_writer.hpp>
+#include <ostd/vendor/nlohmann/detail/output/output_adapters.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/string_concat.hpp b/src/ostd/vendor/nlohmann/detail/string_concat.hpp
index 78569a8..e76a276 100644
--- a/src/ostd/vendor/nlohmann/detail/string_concat.hpp
+++ b/src/ostd/vendor/nlohmann/detail/string_concat.hpp
@@ -12,8 +12,8 @@
 #include <string> // string
 #include <utility> // forward
 
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/meta/detected.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/string_escape.hpp b/src/ostd/vendor/nlohmann/detail/string_escape.hpp
index 7f02318..63091cb 100644
--- a/src/ostd/vendor/nlohmann/detail/string_escape.hpp
+++ b/src/ostd/vendor/nlohmann/detail/string_escape.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/string_utils.hpp b/src/ostd/vendor/nlohmann/detail/string_utils.hpp
index d8ecc0c..0a5ad79 100644
--- a/src/ostd/vendor/nlohmann/detail/string_utils.hpp
+++ b/src/ostd/vendor/nlohmann/detail/string_utils.hpp
@@ -11,7 +11,7 @@
 #include <cstddef> // size_t
 #include <string> // string, to_string
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/src/ostd/vendor/nlohmann/detail/value_t.hpp b/src/ostd/vendor/nlohmann/detail/value_t.hpp
index 4bd87ab..70d9a52 100644
--- a/src/ostd/vendor/nlohmann/detail/value_t.hpp
+++ b/src/ostd/vendor/nlohmann/detail/value_t.hpp
@@ -13,7 +13,7 @@
 #include <cstdint> // uint8_t
 #include <string> // string
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
 #if JSON_HAS_THREE_WAY_COMPARISON
     #include <compare> // partial_ordering
 #endif
diff --git a/src/ostd/vendor/nlohmann/json.hpp b/src/ostd/vendor/nlohmann/json.hpp
index ed51cd5..254da35 100644
--- a/src/ostd/vendor/nlohmann/json.hpp
+++ b/src/ostd/vendor/nlohmann/json.hpp
@@ -31,36 +31,36 @@
 #include <utility> // declval, forward, move, pair, swap
 #include <vector> // vector
 
-#include <nlohmann/adl_serializer.hpp>
-#include <nlohmann/byte_container_with_subtype.hpp>
-#include <nlohmann/detail/conversions/from_json.hpp>
-#include <nlohmann/detail/conversions/to_json.hpp>
-#include <nlohmann/detail/exceptions.hpp>
-#include <nlohmann/detail/hash.hpp>
-#include <nlohmann/detail/input/binary_reader.hpp>
-#include <nlohmann/detail/input/input_adapters.hpp>
-#include <nlohmann/detail/input/lexer.hpp>
-#include <nlohmann/detail/input/parser.hpp>
-#include <nlohmann/detail/iterators/internal_iterator.hpp>
-#include <nlohmann/detail/iterators/iter_impl.hpp>
-#include <nlohmann/detail/iterators/iteration_proxy.hpp>
-#include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
-#include <nlohmann/detail/iterators/primitive_iterator.hpp>
-#include <nlohmann/detail/json_custom_base_class.hpp>
-#include <nlohmann/detail/json_pointer.hpp>
-#include <nlohmann/detail/json_ref.hpp>
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/string_concat.hpp>
-#include <nlohmann/detail/string_escape.hpp>
-#include <nlohmann/detail/string_utils.hpp>
-#include <nlohmann/detail/meta/cpp_future.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
-#include <nlohmann/detail/output/binary_writer.hpp>
-#include <nlohmann/detail/output/output_adapters.hpp>
-#include <nlohmann/detail/output/serializer.hpp>
-#include <nlohmann/detail/value_t.hpp>
-#include <nlohmann/json_fwd.hpp>
-#include <nlohmann/ordered_map.hpp>
+#include <ostd/vendor/nlohmann/adl_serializer.hpp>
+#include <ostd/vendor/nlohmann/byte_container_with_subtype.hpp>
+#include <ostd/vendor/nlohmann/detail/conversions/from_json.hpp>
+#include <ostd/vendor/nlohmann/detail/conversions/to_json.hpp>
+#include <ostd/vendor/nlohmann/detail/exceptions.hpp>
+#include <ostd/vendor/nlohmann/detail/hash.hpp>
+#include <ostd/vendor/nlohmann/detail/input/binary_reader.hpp>
+#include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
+#include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
+#include <ostd/vendor/nlohmann/detail/input/parser.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/iter_impl.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/json_reverse_iterator.hpp>
+#include <ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp>
+#include <ostd/vendor/nlohmann/detail/json_custom_base_class.hpp>
+#include <ostd/vendor/nlohmann/detail/json_pointer.hpp>
+#include <ostd/vendor/nlohmann/detail/json_ref.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/string_concat.hpp>
+#include <ostd/vendor/nlohmann/detail/string_escape.hpp>
+#include <ostd/vendor/nlohmann/detail/string_utils.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/output/binary_writer.hpp>
+#include <ostd/vendor/nlohmann/detail/output/output_adapters.hpp>
+#include <ostd/vendor/nlohmann/detail/output/serializer.hpp>
+#include <ostd/vendor/nlohmann/detail/value_t.hpp>
+#include <ostd/vendor/nlohmann/json_fwd.hpp>
+#include <ostd/vendor/nlohmann/ordered_map.hpp>
 
 #if defined(JSON_HAS_CPP_17)
     #if JSON_HAS_STATIC_RTTI
@@ -5301,6 +5301,6 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC
     #endif
 #endif
 
-#include <nlohmann/detail/macro_unscope.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_unscope.hpp>
 
 #endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/src/ostd/vendor/nlohmann/json_fwd.hpp b/src/ostd/vendor/nlohmann/json_fwd.hpp
index a595ae4..05da332 100644
--- a/src/ostd/vendor/nlohmann/json_fwd.hpp
+++ b/src/ostd/vendor/nlohmann/json_fwd.hpp
@@ -15,7 +15,7 @@
 #include <string> // string
 #include <vector> // vector
 
-#include <nlohmann/detail/abi_macros.hpp>
+#include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
 
 /*!
 @brief namespace for Niels Lohmann
diff --git a/src/ostd/vendor/nlohmann/ordered_map.hpp b/src/ostd/vendor/nlohmann/ordered_map.hpp
index d830c6d..219d0ff 100644
--- a/src/ostd/vendor/nlohmann/ordered_map.hpp
+++ b/src/ostd/vendor/nlohmann/ordered_map.hpp
@@ -17,8 +17,8 @@
 #include <utility> // pair
 #include <vector> // vector
 
-#include <nlohmann/detail/macro_scope.hpp>
-#include <nlohmann/detail/meta/type_traits.hpp>
+#include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
+#include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
 
 NLOHMANN_JSON_NAMESPACE_BEGIN