path changes oatpp-lib --> oatpp

encoding/src/Hex.hpp

@@ -25,10 +25,10 @@
 #ifndef oatpp_encoding_Hex_hpp
 #define oatpp_encoding_Hex_hpp
 
-#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../oatpp/core/src/data/stream/Stream.hpp"
 
-#include "../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../oatpp/core/src/base/PtrWrapper.hpp"
-#include "../../../oatpp-lib/core/src/base/Environment.hpp"
+#include "../../../oatpp/core/src/base/Environment.hpp"
 
 namespace oatpp { namespace encoding {
   

encoding/src/Unicode.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_encoding_Unicode_hpp
 #define oatpp_encoding_Unicode_hpp
 
-#include "../../../oatpp-lib/core/src/base/Environment.hpp"
+#include "../../../oatpp/core/src/base/Environment.hpp"
 
 namespace oatpp { namespace encoding {
   

encoding/test/UnicodeTest.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_test_encoding_UnicodeTest_hpp
 #define oatpp_test_encoding_UnicodeTest_hpp
 
-#include "../../../oatpp-lib/core/test/UnitTest.hpp"
+#include "../../../oatpp/core/test/UnitTest.hpp"
 
 namespace oatpp { namespace test { namespace encoding {
   

network/src/AsyncConnection.hpp

@@ -9,9 +9,9 @@
 #ifndef oatpp_network_AsyncConnection_hpp
 #define oatpp_network_AsyncConnection_hpp
 
-#include "../../../oatpp-lib/core/src/base/memory/ObjectPool.hpp"
+#include "../../../oatpp/core/src/base/memory/ObjectPool.hpp"
-#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../oatpp/core/src/data/stream/Stream.hpp"
-#include "../../../oatpp-lib/core/src/os/io/Library.hpp"
+#include "../../../oatpp/core/src/os/io/Library.hpp"
 
 namespace oatpp { namespace network {
   

network/src/Connection.hpp

@@ -25,15 +25,15 @@
 #ifndef oatpp_network_Connection_hpp
 #define oatpp_network_Connection_hpp
 
-#include "../../../oatpp-lib/core/src/base/memory/ObjectPool.hpp"
+#include "../../../oatpp/core/src/base/memory/ObjectPool.hpp"
 
-#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../oatpp/core/src/data/stream/Stream.hpp"
 
-#include "../../../oatpp-lib/core/src/base/Controllable.hpp"
+#include "../../../oatpp/core/src/base/Controllable.hpp"
-#include "../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../oatpp/core/src/base/PtrWrapper.hpp"
-#include "../../../oatpp-lib/core/src/base/Environment.hpp"
+#include "../../../oatpp/core/src/base/Environment.hpp"
 
-#include "../../../oatpp-lib/core/src/os/io/Library.hpp"
+#include "../../../oatpp/core/src/os/io/Library.hpp"
 
 namespace oatpp { namespace network {
   

network/src/ConnectionProvider.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_netword_ConnectionsProvider_hpp
 #define oatpp_netword_ConnectionsProvider_hpp
 
-#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../oatpp/core/src/data/stream/Stream.hpp"
 
 namespace oatpp { namespace network {
   

network/src/client/SimpleTCPConnectionProvider.cpp

@@ -26,8 +26,8 @@
 
 #include "../Connection.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
-#include "../../../../oatpp-lib/core/test/Checker.hpp"
+#include "../../../../oatpp/core/test/Checker.hpp"
 
 #include <fcntl.h>
 #include <netdb.h>

network/src/client/SimpleTCPConnectionProvider.hpp

@@ -27,8 +27,8 @@
 
 #include "../ConnectionProvider.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../../oatpp/core/src/data/stream/Stream.hpp"
-#include "../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../oatpp/core/src/base/String.hpp"
 
 namespace oatpp { namespace network { namespace client {
   

network/src/server/ConnectionHandler.hpp

@@ -25,8 +25,8 @@
 #ifndef network_server_ConnectionHandler_hpp
 #define network_server_ConnectionHandler_hpp
 
-#include "../../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../../oatpp/core/src/data/stream/Stream.hpp"
-#include "../../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../../oatpp/core/src/base/PtrWrapper.hpp"
 
 namespace oatpp { namespace network { namespace server {
   

network/src/server/Server.cpp

@@ -24,7 +24,7 @@
 
 #include "Server.hpp"
 
-#include "../../../../oatpp-lib/core/test/Checker.hpp"
+#include "../../../../oatpp/core/test/Checker.hpp"
 
 #include <thread>
 #include <chrono>

network/src/server/Server.hpp

@@ -29,15 +29,15 @@
 
 #include "./ConnectionHandler.hpp"
 
-#include "../../../../oatpp-lib/core/src/concurrency/Runnable.hpp"
+#include "../../../../oatpp/core/src/concurrency/Runnable.hpp"
 
-#include "../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../oatpp/core/src/base/String.hpp"
 
-#include "../../../../oatpp-lib/core/src/os/io/Library.hpp"
+#include "../../../../oatpp/core/src/os/io/Library.hpp"
 
-#include "../../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../../oatpp/core/src/base/PtrWrapper.hpp"
-#include "../../../../oatpp-lib/core/src/base/Controllable.hpp"
+#include "../../../../oatpp/core/src/base/Controllable.hpp"
-#include "../../../../oatpp-lib/core/src/base/Environment.hpp"
+#include "../../../../oatpp/core/src/base/Environment.hpp"
 
 #include <atomic>
 

network/src/server/SimpleTCPConnectionProvider.cpp

@@ -27,8 +27,8 @@
 #include "../AsyncConnection.hpp"
 #include "../Connection.hpp"
 
-#include "../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp"
+#include "../../../../oatpp/core/src/utils/ConversionUtils.hpp"
-#include "../../../../oatpp-lib/core/test/Checker.hpp"
+#include "../../../../oatpp/core/test/Checker.hpp"
 
 #include <fcntl.h>
 #include <netdb.h>

network/src/server/SimpleTCPConnectionProvider.hpp

@@ -27,9 +27,9 @@
 
 #include "../ConnectionProvider.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../../oatpp/core/src/data/stream/Stream.hpp"
-#include "../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../oatpp/core/src/base/String.hpp"
-#include "../../../../oatpp-lib/core/src/os/io/Library.hpp"
+#include "../../../../oatpp/core/src/os/io/Library.hpp"
 
 namespace oatpp { namespace network { namespace server {
   

parser/src/json/Utils.cpp

@@ -24,8 +24,8 @@
 
 #include "Utils.hpp"
 
-#include "../../../../oatpp-lib/encoding/src/Unicode.hpp"
+#include "../../../../oatpp/encoding/src/Unicode.hpp"
-#include "../../../../oatpp-lib/encoding/src/Hex.hpp"
+#include "../../../../oatpp/encoding/src/Hex.hpp"
 
 namespace oatpp { namespace parser { namespace json{
   

parser/src/json/Utils.hpp

@@ -25,8 +25,8 @@
 #ifndef oatpp_parser_json_Utils_hpp
 #define oatpp_parser_json_Utils_hpp
 
-#include "../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp"
+#include "../../../../oatpp/core/src/parser/ParsingCaret.hpp"
-#include "../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../oatpp/core/src/base/String.hpp"
 
 #include <string>
 

parser/src/json/mapping/Deserializer.cpp

@@ -25,7 +25,7 @@
 #include "./Deserializer.hpp"
 
 #include "../Utils.hpp"
-#include "../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp"
+#include "../../../../../oatpp/core/src/utils/ConversionUtils.hpp"
 
 namespace oatpp { namespace parser { namespace json { namespace mapping {
 

parser/src/json/mapping/Deserializer.hpp

@@ -25,15 +25,15 @@
 #ifndef oatpp_parser_json_mapping_Deserializer_hpp
 #define oatpp_parser_json_mapping_Deserializer_hpp
 
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/List.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/List.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Object.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Object.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Primitive.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Type.hpp"
 
-#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp"
+#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp"
 
-#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp"
+#include "../../../../../oatpp/core/src/collection/LinkedList.hpp"
-#include "../../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../../oatpp/core/src/base/String.hpp"
 
 namespace oatpp { namespace parser { namespace json { namespace mapping {
   

parser/src/json/mapping/ObjectMapper.hpp

@@ -28,7 +28,7 @@
 #include "./Serializer.hpp"
 #include "./Deserializer.hpp"
 
-#include "../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp"
 
 namespace oatpp { namespace parser { namespace json { namespace mapping {
   

parser/src/json/mapping/Serializer.hpp

@@ -25,16 +25,16 @@
 #ifndef oatpp_parser_json_mapping_Serializer_hpp
 #define oatpp_parser_json_mapping_Serializer_hpp
 
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/List.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/List.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Object.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Object.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Primitive.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Type.hpp"
-#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
 
-#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp"
+#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp"
 
-#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp"
+#include "../../../../../oatpp/core/src/collection/LinkedList.hpp"
-#include "../../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../../oatpp/core/src/base/String.hpp"
 
 namespace oatpp { namespace parser { namespace json { namespace mapping {
   

parser/test/json/mapping/DTOMapperPerfTest.cpp

@@ -24,12 +24,12 @@
 
 #include "DTOMapperPerfTest.hpp"
 
-#include "../../../../../oatpp-lib/core/src/macro/basic.hpp"
+#include "../../../../../oatpp/core/src/macro/basic.hpp"
-#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp"
+#include "../../../../../oatpp/core/src/macro/codegen.hpp"
 
 #include "../../../src/json/mapping/ObjectMapper.hpp"
 
-#include "../../../../../oatpp-lib/core/test/Checker.hpp"
+#include "../../../../../oatpp/core/test/Checker.hpp"
 
 namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping {
   

parser/test/json/mapping/DTOMapperPerfTest.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_test_parser_json_mapping_DTOMapperPerfTest_hpp
 #define oatpp_test_parser_json_mapping_DTOMapperPerfTest_hpp
 
-#include "../../../../../oatpp-lib/core/test/UnitTest.hpp"
+#include "../../../../../oatpp/core/test/UnitTest.hpp"
 
 namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping {
   

parser/test/json/mapping/DTOMapperTest.cpp

@@ -26,11 +26,11 @@
 
 #include "../../../src/json/mapping/ObjectMapper.hpp"
 
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Object.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Object.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/List.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/List.hpp"
-#include "../../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp"
+#include "../../../../../oatpp/core/src/data/mapping/type/Primitive.hpp"
 
-#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp"
+#include "../../../../../oatpp/core/src/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping {
   

parser/test/json/mapping/DTOMapperTest.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_test_parser_json_mapping_DTOMapperTest_hpp
 #define oatpp_test_parser_json_mapping_DTOMapperTest_hpp
 
-#include "../../../../../oatpp-lib/core/test/UnitTest.hpp"
+#include "../../../../../oatpp/core/test/UnitTest.hpp"
 
 namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping {
   

parser/test/json/mapping/DeserializerTest.cpp

@@ -25,7 +25,7 @@
 #include "DeserializerTest.hpp"
 
 #include "../../../src/json/mapping/ObjectMapper.hpp"
-#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp"
+#include "../../../../../oatpp/core/src/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping {
 

parser/test/json/mapping/DeserializerTest.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_test_parser_json_mapping_DeserializerTest_hpp
 #define oatpp_test_parser_json_mapping_DeserializerTest_hpp
 
-#include "../../../../../oatpp-lib/core/test/UnitTest.hpp"
+#include "../../../../../oatpp/core/test/UnitTest.hpp"
 
 namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping {
   

web/src/client/ApiClient.hpp

@@ -32,18 +32,18 @@
 #include "../protocol/http/outgoing/DtoBody.hpp"
 #include "../protocol/http/outgoing/BufferBody.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp"
+#include "../../../../oatpp/core/src/data/mapping/type/Primitive.hpp"
-#include "../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp"
+#include "../../../../oatpp/core/src/data/mapping/type/Type.hpp"
-#include "../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp"
+#include "../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp"
 
-#include "../../../../oatpp-lib/core/src/collection/ListMap.hpp"
+#include "../../../../oatpp/core/src/collection/ListMap.hpp"
 
-#include "../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp"
+#include "../../../../oatpp/core/src/utils/ConversionUtils.hpp"
 
-#include "../../../../oatpp-lib/core/src/base/Controllable.hpp"
+#include "../../../../oatpp/core/src/base/Controllable.hpp"
-#include "../../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../../oatpp/core/src/base/PtrWrapper.hpp"
 
 #include <string>
 #include <list>

web/src/client/HttpRequestExecutor.cpp

@@ -27,9 +27,9 @@
 #include "../protocol/http/outgoing/Request.hpp"
 #include "../protocol/http/outgoing/BufferBody.hpp"
 
-#include "../../../../oatpp-lib/network/src/Connection.hpp"
+#include "../../../../oatpp/network/src/Connection.hpp"
-#include "../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
-#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp"
+#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp"
 
 #include <stdlib.h>
 #include <sys/types.h>

web/src/client/HttpRequestExecutor.hpp

@@ -26,7 +26,7 @@
 #define oatpp_web_client_HttpRequestExecutor_hpp
 
 #include "./RequestExecutor.hpp"
-#include "../../../../oatpp-lib/network/src/ConnectionProvider.hpp"
+#include "../../../../oatpp/network/src/ConnectionProvider.hpp"
 
 namespace oatpp { namespace web { namespace client {
   

web/src/client/macro/zzz_macro_define_ApiClient_.hpp

@@ -22,8 +22,8 @@
  *
  ***************************************************************************/
 
-#include "../../../../../oatpp-lib/core/src/macro/basic.hpp"
+#include "../../../../../oatpp/core/src/macro/basic.hpp"
-#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp"
+#include "../../../../../oatpp/core/src/macro/codegen.hpp"
 
 #define OATPP_MACRO_API_CLIENT_PARAM_MACRO(MACRO, TYPE, NAME, PARAM_LIST) MACRO(TYPE, NAME, PARAM_LIST)
 #define OATPP_MACRO_API_CLIENT_PARAM_TYPE(MACRO, TYPE, NAME, PARAM_LIST) TYPE

web/src/protocol/http/Http.cpp

@@ -24,7 +24,7 @@
 
 #include "./Http.hpp"
 
-#include "../../../../../oatpp-lib/core/test/Checker.hpp"
+#include "../../../../../oatpp/core/test/Checker.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http {
   

web/src/protocol/http/Http.hpp

@@ -25,13 +25,13 @@
 #ifndef oatpp_network_http_Protocol_hpp
 #define oatpp_network_http_Protocol_hpp
 
-#include "../../../../../oatpp-lib/network/src/Connection.hpp"
+#include "../../../../../oatpp/network/src/Connection.hpp"
 
-#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp"
+#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp"
 
-#include "../../../../../oatpp-lib/core/src/data/stream/Delegate.hpp"
+#include "../../../../../oatpp/core/src/data/stream/Delegate.hpp"
-#include "../../../../../oatpp-lib/core/src/collection/ListMap.hpp"
+#include "../../../../../oatpp/core/src/collection/ListMap.hpp"
-#include "../../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../../oatpp/core/src/base/String.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http {
   

web/src/protocol/http/incoming/BodyDecoder.cpp

@@ -24,8 +24,8 @@
 
 #include "BodyDecoder.hpp"
 
-#include "../../../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp"
+#include "../../../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp"
-#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp"
+#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming {
 

web/src/protocol/http/incoming/BodyDecoder.hpp

@@ -26,7 +26,7 @@
 #define oatpp_web_protocol_http_incoming_BodyDecoder_hpp
 
 #include "../Http.hpp"
-#include "../../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp"
+#include "../../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming {
   

web/src/protocol/http/outgoing/Body.hpp

@@ -25,9 +25,9 @@
 #ifndef oatpp_web_protocol_http_outgoing_Body_hpp
 #define oatpp_web_protocol_http_outgoing_Body_hpp
 
-#include "../../../../../../oatpp-lib/core/src/data/stream/Stream.hpp"
+#include "../../../../../../oatpp/core/src/data/stream/Stream.hpp"
-#include "../../../../../../oatpp-lib/core/src/collection/ListMap.hpp"
+#include "../../../../../../oatpp/core/src/collection/ListMap.hpp"
-#include "../../../../../../oatpp-lib/core/src/async/Coroutine.hpp"
+#include "../../../../../../oatpp/core/src/async/Coroutine.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing {
   

web/src/protocol/http/outgoing/BufferBody.hpp

@@ -28,7 +28,7 @@
 #include "../Http.hpp"
 #include "./Body.hpp"
 
-#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp"
+#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing {
   

web/src/protocol/http/outgoing/ChunkedBufferBody.hpp

@@ -28,8 +28,8 @@
 #include "../Http.hpp"
 #include "./Body.hpp"
 
-#include "../../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
-#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp"
+#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing {
   

web/src/protocol/http/outgoing/DtoBody.hpp

@@ -28,8 +28,8 @@
 #include "../Http.hpp"
 #include "./ChunkedBufferBody.hpp"
 
-#include "../../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp"
+#include "../../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp"
-#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp"
+#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing {
   

web/src/protocol/http/outgoing/ResponseFactory.hpp

@@ -27,9 +27,9 @@
 
 #include "./Response.hpp"
 
-#include "../../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp"
+#include "../../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp"
-#include "../../../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp"
+#include "../../../../../../oatpp/core/src/data/mapping/type/Type.hpp"
-#include "../../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
 
 namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing {
   

web/src/server/AsyncHttpConnectionHandler.cpp

@@ -31,9 +31,9 @@
 
 #include "./HttpError.hpp"
 
-#include "../../../../oatpp-lib/network/src/AsyncConnection.hpp"
+#include "../../../../oatpp/network/src/AsyncConnection.hpp"
 
-#include "../../../../oatpp-lib/core/test/Checker.hpp"
+#include "../../../../oatpp/core/test/Checker.hpp"
 
 #include <errno.h>
 

web/src/server/AsyncHttpConnectionHandler.hpp

@@ -34,15 +34,15 @@
 #include "../protocol/http/incoming/Request.hpp"
 #include "../protocol/http/outgoing/Response.hpp"
 
-#include "../../../../oatpp-lib/network/src/server/Server.hpp"
+#include "../../../../oatpp/network/src/server/Server.hpp"
-#include "../../../../oatpp-lib/network/src/Connection.hpp"
+#include "../../../../oatpp/network/src/Connection.hpp"
 
-#include "../../../../oatpp-lib/core/src/concurrency/Thread.hpp"
+#include "../../../../oatpp/core/src/concurrency/Thread.hpp"
-#include "../../../../oatpp-lib/core/src/concurrency/Runnable.hpp"
+#include "../../../../oatpp/core/src/concurrency/Runnable.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp"
+#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp"
-#include "../../../../oatpp-lib/core/src/data/buffer/IOBuffer.hpp"
+#include "../../../../oatpp/core/src/data/buffer/IOBuffer.hpp"
-#include "../../../../oatpp-lib/core/src/async/Processor.hpp"
+#include "../../../../oatpp/core/src/async/Processor.hpp"
 
 namespace oatpp { namespace web { namespace server {
   

web/src/server/HttpConnectionHandler.cpp

@@ -33,7 +33,7 @@
 
 #include "./HttpError.hpp"
 
-#include "../../../../oatpp-lib/core/test/Checker.hpp"
+#include "../../../../oatpp/core/test/Checker.hpp"
 
 #include <errno.h>
 

web/src/server/HttpConnectionHandler.hpp

@@ -32,14 +32,14 @@
 #include "../protocol/http/incoming/Request.hpp"
 #include "../protocol/http/outgoing/Response.hpp"
 
-#include "../../../../oatpp-lib/network/src/server/Server.hpp"
+#include "../../../../oatpp/network/src/server/Server.hpp"
-#include "../../../../oatpp-lib/network/src/Connection.hpp"
+#include "../../../../oatpp/network/src/Connection.hpp"
 
-#include "../../../../oatpp-lib/core/src/concurrency/Thread.hpp"
+#include "../../../../oatpp/core/src/concurrency/Thread.hpp"
-#include "../../../../oatpp-lib/core/src/concurrency/Runnable.hpp"
+#include "../../../../oatpp/core/src/concurrency/Runnable.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp"
+#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp"
-#include "../../../../oatpp-lib/core/src/data/buffer/IOBuffer.hpp"
+#include "../../../../oatpp/core/src/data/buffer/IOBuffer.hpp"
 
 namespace oatpp { namespace web { namespace server {
   

web/src/server/HttpError.hpp

@@ -26,7 +26,7 @@
 #define oatpp_web_server_HttpError_hpp
 
 #include "../protocol/http/Http.hpp"
-#include "../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../oatpp/core/src/base/String.hpp"
 
 namespace oatpp { namespace web { namespace server {
   

web/src/server/HttpProcessor.hpp

@@ -16,9 +16,9 @@
 #include "../protocol/http/incoming/Request.hpp"
 #include "../protocol/http/outgoing/Response.hpp"
 
-#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp"
+#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp"
 
-#include "../../../../oatpp-lib/core/src/async/Processor.hpp"
+#include "../../../../oatpp/core/src/async/Processor.hpp"
 
 namespace oatpp { namespace web { namespace server {
   

web/src/server/api/ApiController.hpp

@@ -32,7 +32,7 @@
 
 #include "../../url/mapping/Router.hpp"
 #include "../../protocol/http/outgoing/ResponseFactory.hpp"
-#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp"
+#include "../../../../../oatpp/core/src/collection/LinkedList.hpp"
 
 #include <unordered_map>
 

web/src/server/api/Endpoint.cpp

@@ -24,7 +24,7 @@
 
 #include "Endpoint.hpp"
 
-#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
 
 namespace oatpp { namespace web { namespace server { namespace api {
 

web/src/server/api/macro/zzz_macro_define_ApiController_.hpp

@@ -22,8 +22,8 @@
  *
  ***************************************************************************/
 
-#include "../../../../../../oatpp-lib/core/src/macro/basic.hpp"
+#include "../../../../../../oatpp/core/src/macro/basic.hpp"
-#include "../../../../../../oatpp-lib/core/src/macro/codegen.hpp"
+#include "../../../../../../oatpp/core/src/macro/codegen.hpp"
 
 #define OATPP_MACRO_API_CONTROLLER_PARAM_MACRO(MACRO, INFO, TYPE, NAME, PARAM_LIST) MACRO(TYPE, NAME, PARAM_LIST)
 #define OATPP_MACRO_API_CONTROLLER_PARAM_INFO(MACRO, INFO, TYPE, NAME, PARAM_LIST) INFO(TYPE, NAME, PARAM_LIST)

web/src/server/handler/ErrorHandler.cpp

@@ -25,7 +25,7 @@
 #include "./ErrorHandler.hpp"
 
 #include "../../protocol/http/outgoing/ChunkedBufferBody.hpp"
-#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
 
 namespace oatpp { namespace web { namespace server { namespace handler {
   

web/src/url/mapping/Pattern.cpp

@@ -24,9 +24,9 @@
 
 #include "Pattern.hpp"
 
-#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp"
+#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp"
 
-#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp"
+#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp"
 
 namespace oatpp { namespace web { namespace url { namespace mapping {
 

web/src/url/mapping/Pattern.hpp

@@ -25,14 +25,14 @@
 #ifndef network_url_Pattern_hpp
 #define network_url_Pattern_hpp
 
-#include "../../../../../oatpp-lib/core/src/collection/ListMap.hpp"
+#include "../../../../../oatpp/core/src/collection/ListMap.hpp"
-#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp"
+#include "../../../../../oatpp/core/src/collection/LinkedList.hpp"
 
-#include "../../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../../oatpp/core/src/base/String.hpp"
 
-#include "../../../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../../../oatpp/core/src/base/PtrWrapper.hpp"
-#include "../../../../../oatpp-lib/core/src/base/Controllable.hpp"
+#include "../../../../../oatpp/core/src/base/Controllable.hpp"
-#include "../../../../../oatpp-lib/core/src/base/Environment.hpp"
+#include "../../../../../oatpp/core/src/base/Environment.hpp"
 
 namespace oatpp { namespace web { namespace url { namespace mapping {
   

web/src/url/mapping/Router.hpp

@@ -28,13 +28,13 @@
 #include "./Subscriber.hpp"
 #include "./Pattern.hpp"
 
-#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp"
+#include "../../../../../oatpp/core/src/collection/LinkedList.hpp"
 
-#include "../../../../../oatpp-lib/core/src/base/String.hpp"
+#include "../../../../../oatpp/core/src/base/String.hpp"
 
-#include "../../../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../../../oatpp/core/src/base/PtrWrapper.hpp"
-#include "../../../../../oatpp-lib/core/src/base/Controllable.hpp"
+#include "../../../../../oatpp/core/src/base/Controllable.hpp"
-#include "../../../../../oatpp-lib/core/src/base/Environment.hpp"
+#include "../../../../../oatpp/core/src/base/Environment.hpp"
 
 namespace oatpp { namespace web { namespace url { namespace mapping {
   

web/src/url/mapping/Subscriber.hpp

@@ -25,8 +25,8 @@
 #ifndef oatpp_network_url_Subscriber_hpp
 #define oatpp_network_url_Subscriber_hpp
 
-#include "../../../../../oatpp-lib/core/src/base/PtrWrapper.hpp"
+#include "../../../../../oatpp/core/src/base/PtrWrapper.hpp"
-#include "../../../../../oatpp-lib/core/src/async/Coroutine.hpp"
+#include "../../../../../oatpp/core/src/async/Coroutine.hpp"
 
 namespace oatpp { namespace web { namespace url { namespace mapping {