diff --git a/changelog/1.4.0.md b/changelog/1.4.0.md
index a0e52504..8e7bc739 100644
--- a/changelog/1.4.0.md
+++ b/changelog/1.4.0.md
@@ -51,6 +51,19 @@ OATPP_ASSERT(decoded == data)
 
 ## Restructuring
 
+### Files
+
+| old file                               | new file                     |
+|----------------------------------------|------------------------------|
+| `oatpp/parser/json/*`                  | `oatpp/json/*`               |
+| `oatpp/parser/json/mapping/*`          | `oatpp/json/*`               |
+| `oatpp/algorithm/CRC.hpp`              | `oatpp/utils/CRC32.hpp`      |
+| `oatpp/core/utils/*`                   | `oatpp/utils/*`              |
+| `oatpp/core/utils/ConversionUtils.hpp` | `oatpp/utils/Conversion.hpp` |
+| `oatpp/core/macro/*`                   | `oatpp/macro/*`              |
+
+### Namespaces
+
 | old namespace                     | new namespace        |
 |-----------------------------------|----------------------|
 | `oatpp::parser::json::*`          | `oatpp::json::*`     |
diff --git a/fuzzers/oatpp/json/ObjectMapper.cpp b/fuzzers/oatpp/json/ObjectMapper.cpp
index 21789f32..6bbddae2 100644
--- a/fuzzers/oatpp/json/ObjectMapper.cpp
+++ b/fuzzers/oatpp/json/ObjectMapper.cpp
@@ -1,5 +1,5 @@
 #include "oatpp/json/ObjectMapper.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 typedef oatpp::parser::Caret ParsingCaret;
 typedef oatpp::json::Serializer Serializer;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31489085..ef8f62f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,14 +3,6 @@
 ## oatpp
 
 add_library(oatpp
-        oatpp/codegen/ApiClient_define.hpp
-        oatpp/codegen/ApiClient_undef.hpp
-        oatpp/codegen/ApiController_define.hpp
-        oatpp/codegen/ApiController_undef.hpp
-        oatpp/codegen/DbClient_define.hpp
-        oatpp/codegen/DbClient_undef.hpp
-        oatpp/codegen/DTO_define.hpp
-        oatpp/codegen/DTO_undef.hpp
         oatpp/codegen/api_controller/auth_define.hpp
         oatpp/codegen/api_controller/auth_undef.hpp
         oatpp/codegen/api_controller/base_define.hpp
@@ -23,6 +15,14 @@ add_library(oatpp
         oatpp/codegen/dto/base_undef.hpp
         oatpp/codegen/dto/enum_define.hpp
         oatpp/codegen/dto/enum_undef.hpp
+		oatpp/codegen/ApiClient_define.hpp
+		oatpp/codegen/ApiClient_undef.hpp
+		oatpp/codegen/ApiController_define.hpp
+		oatpp/codegen/ApiController_undef.hpp
+		oatpp/codegen/DbClient_define.hpp
+		oatpp/codegen/DbClient_undef.hpp
+		oatpp/codegen/DTO_define.hpp
+		oatpp/codegen/DTO_undef.hpp
         oatpp/core/IODefinitions.cpp
         oatpp/core/IODefinitions.hpp
         oatpp/core/Types.hpp
@@ -120,9 +120,6 @@ add_library(oatpp
         oatpp/core/data/stream/Stream.hpp
         oatpp/core/data/stream/StreamBufferedProxy.cpp
         oatpp/core/data/stream/StreamBufferedProxy.hpp
-        oatpp/core/macro/basic.hpp
-        oatpp/core/macro/codegen.hpp
-        oatpp/core/macro/component.hpp
         oatpp/core/parser/Caret.cpp
         oatpp/core/parser/Caret.hpp
         oatpp/core/parser/ParsingError.cpp
@@ -148,6 +145,9 @@ add_library(oatpp
 		oatpp/json/Serializer.hpp
 		oatpp/json/Utils.cpp
 		oatpp/json/Utils.hpp
+		oatpp/macro/basic.hpp
+		oatpp/macro/codegen.hpp
+		oatpp/macro/component.hpp
         oatpp/network/Address.cpp
         oatpp/network/Address.hpp
         oatpp/network/ConnectionHandler.hpp
diff --git a/src/oatpp-test/UnitTest.hpp b/src/oatpp-test/UnitTest.hpp
index 521071b3..086faa9f 100644
--- a/src/oatpp-test/UnitTest.hpp
+++ b/src/oatpp-test/UnitTest.hpp
@@ -27,7 +27,7 @@
 
 #include <functional>
 #include "oatpp/core/base/Environment.hpp"
-#include "oatpp/core/macro/basic.hpp"
+#include "oatpp/macro/basic.hpp"
 
 namespace oatpp { namespace test {
 
diff --git a/src/oatpp-test/web/ClientServerTestRunner.hpp b/src/oatpp-test/web/ClientServerTestRunner.hpp
index a801ea44..3ec31959 100644
--- a/src/oatpp-test/web/ClientServerTestRunner.hpp
+++ b/src/oatpp-test/web/ClientServerTestRunner.hpp
@@ -31,7 +31,7 @@
 #include "oatpp/network/Server.hpp"
 #include "oatpp/network/ConnectionProvider.hpp"
 
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include <list>
 #include <chrono>
diff --git a/src/oatpp/codegen/ApiClient_define.hpp b/src/oatpp/codegen/ApiClient_define.hpp
index 990b6825..6f4b43b3 100644
--- a/src/oatpp/codegen/ApiClient_define.hpp
+++ b/src/oatpp/codegen/ApiClient_define.hpp
@@ -42,8 +42,8 @@
  * </ul>
  */
 
-#include "oatpp/core/macro/basic.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/basic.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 #define OATPP_MACRO_API_CLIENT_PARAM_MACRO(MACRO, TYPE, PARAM_LIST) MACRO(TYPE, PARAM_LIST)
 #define OATPP_MACRO_API_CLIENT_PARAM_TYPE(MACRO, TYPE, PARAM_LIST) const TYPE&
diff --git a/src/oatpp/codegen/ApiController_define.hpp b/src/oatpp/codegen/ApiController_define.hpp
index e8419fb1..78a060fa 100644
--- a/src/oatpp/codegen/ApiController_define.hpp
+++ b/src/oatpp/codegen/ApiController_define.hpp
@@ -42,8 +42,8 @@
  * </ul>
  */
 
-#include "oatpp/core/macro/basic.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/basic.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 #include "./api_controller/base_define.hpp"
 #include "./api_controller/auth_define.hpp"
diff --git a/src/oatpp/codegen/DTO_define.hpp b/src/oatpp/codegen/DTO_define.hpp
index 184dd3aa..1956576e 100644
--- a/src/oatpp/codegen/DTO_define.hpp
+++ b/src/oatpp/codegen/DTO_define.hpp
@@ -42,8 +42,8 @@
  * </ul>
  */
 
-#include "oatpp/core/macro/basic.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/basic.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 #include "./dto/base_define.hpp"
 #include "./dto/enum_define.hpp"
diff --git a/src/oatpp/codegen/DbClient_define.hpp b/src/oatpp/codegen/DbClient_define.hpp
index 4e03a38c..b33b1c5b 100644
--- a/src/oatpp/codegen/DbClient_define.hpp
+++ b/src/oatpp/codegen/DbClient_define.hpp
@@ -22,8 +22,8 @@
  *
  ***************************************************************************/
 
-#include "oatpp/core/macro/basic.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/basic.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 #define OATPP_MACRO_DB_CLIENT_PARAM_TYPE(MACRO, TYPE, PARAM_LIST) TYPE
 #define OATPP_MACRO_DB_CLIENT_PARAM_NAME(MACRO, TYPE, PARAM_LIST) OATPP_MACRO_FIRSTARG PARAM_LIST
diff --git a/src/oatpp/core/macro/basic.hpp b/src/oatpp/macro/basic.hpp
similarity index 100%
rename from src/oatpp/core/macro/basic.hpp
rename to src/oatpp/macro/basic.hpp
diff --git a/src/oatpp/core/macro/codegen.hpp b/src/oatpp/macro/codegen.hpp
similarity index 100%
rename from src/oatpp/core/macro/codegen.hpp
rename to src/oatpp/macro/codegen.hpp
diff --git a/src/oatpp/core/macro/component.hpp b/src/oatpp/macro/component.hpp
similarity index 100%
rename from src/oatpp/core/macro/component.hpp
rename to src/oatpp/macro/component.hpp
diff --git a/src/oatpp/web/server/handler/AuthorizationHandler.hpp b/src/oatpp/web/server/handler/AuthorizationHandler.hpp
index c670825c..e6296178 100644
--- a/src/oatpp/web/server/handler/AuthorizationHandler.hpp
+++ b/src/oatpp/web/server/handler/AuthorizationHandler.hpp
@@ -28,7 +28,7 @@
 
 #include <oatpp/web/protocol/http/incoming/Request.hpp>
 #include "oatpp/web/protocol/http/Http.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 #include "oatpp/core/data/mapping/type/Type.hpp"
 
 namespace oatpp { namespace web { namespace server { namespace handler {
diff --git a/test/oatpp/core/data/mapping/TypeResolverTest.cpp b/test/oatpp/core/data/mapping/TypeResolverTest.cpp
index c2c3e3ce..6ec4f2f2 100644
--- a/test/oatpp/core/data/mapping/TypeResolverTest.cpp
+++ b/test/oatpp/core/data/mapping/TypeResolverTest.cpp
@@ -26,7 +26,7 @@
 
 #include "oatpp/core/data/mapping/TypeResolver.hpp"
 #include "oatpp/core/Types.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping {
 
diff --git a/test/oatpp/core/data/mapping/type/AnyTest.cpp b/test/oatpp/core/data/mapping/type/AnyTest.cpp
index a6fdd544..2383416b 100644
--- a/test/oatpp/core/data/mapping/type/AnyTest.cpp
+++ b/test/oatpp/core/data/mapping/type/AnyTest.cpp
@@ -27,7 +27,7 @@
 #include "oatpp/core/data/mapping/type/Any.hpp"
 
 #include "oatpp/json/ObjectMapper.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 
diff --git a/test/oatpp/core/data/mapping/type/EnumTest.cpp b/test/oatpp/core/data/mapping/type/EnumTest.cpp
index c7b25a73..35faa798 100644
--- a/test/oatpp/core/data/mapping/type/EnumTest.cpp
+++ b/test/oatpp/core/data/mapping/type/EnumTest.cpp
@@ -25,7 +25,7 @@
 #include "EnumTest.hpp"
 
 #include "oatpp/core/Types.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 #include <unordered_map>
 
diff --git a/test/oatpp/core/data/mapping/type/InterpretationTest.cpp b/test/oatpp/core/data/mapping/type/InterpretationTest.cpp
index 493bc743..e6fcb0e4 100644
--- a/test/oatpp/core/data/mapping/type/InterpretationTest.cpp
+++ b/test/oatpp/core/data/mapping/type/InterpretationTest.cpp
@@ -27,7 +27,7 @@
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/core/data/mapping/TypeResolver.hpp"
 #include "oatpp/core/Types.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
 
diff --git a/test/oatpp/core/data/mapping/type/ObjectTest.cpp b/test/oatpp/core/data/mapping/type/ObjectTest.cpp
index 1a75e545..6aa5c521 100644
--- a/test/oatpp/core/data/mapping/type/ObjectTest.cpp
+++ b/test/oatpp/core/data/mapping/type/ObjectTest.cpp
@@ -26,7 +26,7 @@
 
 #include "oatpp/json/ObjectMapper.hpp"
 
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 #include "oatpp/core/Types.hpp"
 
 #include "oatpp-test/Checker.hpp"
diff --git a/test/oatpp/core/data/mapping/type/TypeTest.cpp b/test/oatpp/core/data/mapping/type/TypeTest.cpp
index 3985b721..18b8da16 100644
--- a/test/oatpp/core/data/mapping/type/TypeTest.cpp
+++ b/test/oatpp/core/data/mapping/type/TypeTest.cpp
@@ -24,7 +24,7 @@
 
 #include "TypeTest.hpp"
 
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 #include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace  type {
diff --git a/test/oatpp/json/DTOMapperPerfTest.cpp b/test/oatpp/json/DTOMapperPerfTest.cpp
index 9f208bb7..2daf42d7 100644
--- a/test/oatpp/json/DTOMapperPerfTest.cpp
+++ b/test/oatpp/json/DTOMapperPerfTest.cpp
@@ -30,8 +30,8 @@
 
 #include "oatpp/core/data/stream/BufferStream.hpp"
 
-#include "oatpp/core/macro/basic.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/basic.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 #include "oatpp-test/Checker.hpp"
 
diff --git a/test/oatpp/json/DTOMapperTest.cpp b/test/oatpp/json/DTOMapperTest.cpp
index 17fac540..7f12015d 100644
--- a/test/oatpp/json/DTOMapperTest.cpp
+++ b/test/oatpp/json/DTOMapperTest.cpp
@@ -34,7 +34,7 @@
 
 #include "oatpp/utils/Conversion.hpp"
 
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace json { namespace test {
   
diff --git a/test/oatpp/json/DeserializerTest.cpp b/test/oatpp/json/DeserializerTest.cpp
index 036d689a..ea6b3422 100644
--- a/test/oatpp/json/DeserializerTest.cpp
+++ b/test/oatpp/json/DeserializerTest.cpp
@@ -27,7 +27,7 @@
 #include <cmath>
 
 #include "oatpp/json/ObjectMapper.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace json { namespace test {
 
diff --git a/test/oatpp/json/EnumTest.cpp b/test/oatpp/json/EnumTest.cpp
index b2dfbe39..96f66267 100644
--- a/test/oatpp/json/EnumTest.cpp
+++ b/test/oatpp/json/EnumTest.cpp
@@ -26,7 +26,7 @@
 
 #include "oatpp/json/ObjectMapper.hpp"
 
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace json { namespace test {
 
diff --git a/test/oatpp/web/ClientRetryTest.cpp b/test/oatpp/web/ClientRetryTest.cpp
index 52305966..3526c7c0 100644
--- a/test/oatpp/web/ClientRetryTest.cpp
+++ b/test/oatpp/web/ClientRetryTest.cpp
@@ -47,7 +47,7 @@
 
 #include "oatpp/network/ConnectionPool.hpp"
 
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include "oatpp-test/web/ClientServerTestRunner.hpp"
 #include "oatpp-test/Checker.hpp"
diff --git a/test/oatpp/web/FullAsyncClientTest.cpp b/test/oatpp/web/FullAsyncClientTest.cpp
index 306b0ddb..01d07f1c 100644
--- a/test/oatpp/web/FullAsyncClientTest.cpp
+++ b/test/oatpp/web/FullAsyncClientTest.cpp
@@ -42,7 +42,7 @@
 #include "oatpp/network/virtual_/server/ConnectionProvider.hpp"
 #include "oatpp/network/virtual_/Interface.hpp"
 
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include "oatpp-test/web/ClientServerTestRunner.hpp"
 
diff --git a/test/oatpp/web/FullAsyncTest.cpp b/test/oatpp/web/FullAsyncTest.cpp
index 5e738035..34aaf18e 100644
--- a/test/oatpp/web/FullAsyncTest.cpp
+++ b/test/oatpp/web/FullAsyncTest.cpp
@@ -44,7 +44,7 @@
 #include "oatpp/network/virtual_/Interface.hpp"
 
 #include "oatpp/core/data/resource/InMemoryData.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include "oatpp-test/web/ClientServerTestRunner.hpp"
 
diff --git a/test/oatpp/web/FullTest.cpp b/test/oatpp/web/FullTest.cpp
index 87329f4b..dd0c2aaf 100644
--- a/test/oatpp/web/FullTest.cpp
+++ b/test/oatpp/web/FullTest.cpp
@@ -47,7 +47,7 @@
 #include "oatpp/network/virtual_/Interface.hpp"
 
 #include "oatpp/core/data/resource/InMemoryData.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include "oatpp-test/web/ClientServerTestRunner.hpp"
 
diff --git a/test/oatpp/web/PipelineAsyncTest.cpp b/test/oatpp/web/PipelineAsyncTest.cpp
index 2a40728f..c5533ee5 100644
--- a/test/oatpp/web/PipelineAsyncTest.cpp
+++ b/test/oatpp/web/PipelineAsyncTest.cpp
@@ -39,7 +39,7 @@
 #include "oatpp/network/virtual_/Interface.hpp"
 
 #include "oatpp/core/data/stream/BufferStream.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include "oatpp-test/web/ClientServerTestRunner.hpp"
 
diff --git a/test/oatpp/web/PipelineTest.cpp b/test/oatpp/web/PipelineTest.cpp
index 690db038..4978ebd6 100644
--- a/test/oatpp/web/PipelineTest.cpp
+++ b/test/oatpp/web/PipelineTest.cpp
@@ -39,7 +39,7 @@
 #include "oatpp/network/virtual_/Interface.hpp"
 
 #include "oatpp/core/data/stream/BufferStream.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include "oatpp-test/web/ClientServerTestRunner.hpp"
 
diff --git a/test/oatpp/web/app/BasicAuthorizationController.hpp b/test/oatpp/web/app/BasicAuthorizationController.hpp
index e3056f2c..8aa291a7 100644
--- a/test/oatpp/web/app/BasicAuthorizationController.hpp
+++ b/test/oatpp/web/app/BasicAuthorizationController.hpp
@@ -30,8 +30,8 @@
 #include "oatpp/web/server/api/ApiController.hpp"
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/utils/Conversion.hpp"
-#include "oatpp/core/macro/codegen.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/codegen.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include <sstream>
 
diff --git a/test/oatpp/web/app/BearerAuthorizationController.hpp b/test/oatpp/web/app/BearerAuthorizationController.hpp
index 8b0358cc..a498c256 100644
--- a/test/oatpp/web/app/BearerAuthorizationController.hpp
+++ b/test/oatpp/web/app/BearerAuthorizationController.hpp
@@ -30,8 +30,8 @@
 #include "oatpp/web/server/api/ApiController.hpp"
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/utils/Conversion.hpp"
-#include "oatpp/core/macro/codegen.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/codegen.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include <sstream>
 
diff --git a/test/oatpp/web/app/Client.hpp b/test/oatpp/web/app/Client.hpp
index db591dc5..6e5c748d 100644
--- a/test/oatpp/web/app/Client.hpp
+++ b/test/oatpp/web/app/Client.hpp
@@ -30,7 +30,7 @@
 #include "oatpp/web/client/ApiClient.hpp"
 #include "oatpp/web/protocol/http/outgoing/MultipartBody.hpp"
 #include "oatpp/encoding/Base64.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace web { namespace app {
   
diff --git a/test/oatpp/web/app/Controller.hpp b/test/oatpp/web/app/Controller.hpp
index 69037a6f..9ac3230f 100644
--- a/test/oatpp/web/app/Controller.hpp
+++ b/test/oatpp/web/app/Controller.hpp
@@ -41,8 +41,8 @@
 #include "oatpp/core/data/resource/File.hpp"
 #include "oatpp/core/data/stream/FileStream.hpp"
 #include "oatpp/utils/Conversion.hpp"
-#include "oatpp/core/macro/codegen.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/codegen.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include <sstream>
 #include <thread>
diff --git a/test/oatpp/web/app/ControllerAsync.hpp b/test/oatpp/web/app/ControllerAsync.hpp
index 68a13d88..304e8468 100644
--- a/test/oatpp/web/app/ControllerAsync.hpp
+++ b/test/oatpp/web/app/ControllerAsync.hpp
@@ -42,8 +42,8 @@
 #include "oatpp/core/data/stream/FileStream.hpp"
 #include "oatpp/core/data/stream/Stream.hpp"
 #include "oatpp/utils/Conversion.hpp"
-#include "oatpp/core/macro/codegen.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/codegen.hpp"
+#include "oatpp/macro/component.hpp"
 
 namespace oatpp { namespace test { namespace web { namespace app {
 
diff --git a/test/oatpp/web/app/ControllerWithErrorHandler.hpp b/test/oatpp/web/app/ControllerWithErrorHandler.hpp
index 9968e9e0..9f86bd5d 100644
--- a/test/oatpp/web/app/ControllerWithErrorHandler.hpp
+++ b/test/oatpp/web/app/ControllerWithErrorHandler.hpp
@@ -28,8 +28,8 @@
 #include "oatpp/web/server/api/ApiController.hpp"
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/utils/Conversion.hpp"
-#include "oatpp/core/macro/codegen.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/codegen.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include <sstream>
 
diff --git a/test/oatpp/web/app/ControllerWithInterceptors.hpp b/test/oatpp/web/app/ControllerWithInterceptors.hpp
index 44b1c1d7..a9f2da41 100644
--- a/test/oatpp/web/app/ControllerWithInterceptors.hpp
+++ b/test/oatpp/web/app/ControllerWithInterceptors.hpp
@@ -28,8 +28,8 @@
 #include "oatpp/web/server/api/ApiController.hpp"
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/utils/Conversion.hpp"
-#include "oatpp/core/macro/codegen.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/codegen.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include <sstream>
 
diff --git a/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp b/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp
index 03d3bf7c..c26599dd 100644
--- a/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp
+++ b/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp
@@ -28,8 +28,8 @@
 #include "oatpp/web/server/api/ApiController.hpp"
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/utils/Conversion.hpp"
-#include "oatpp/core/macro/codegen.hpp"
-#include "oatpp/core/macro/component.hpp"
+#include "oatpp/macro/codegen.hpp"
+#include "oatpp/macro/component.hpp"
 
 #include <sstream>
 
diff --git a/test/oatpp/web/app/DTOs.hpp b/test/oatpp/web/app/DTOs.hpp
index d2090f48..68c36609 100644
--- a/test/oatpp/web/app/DTOs.hpp
+++ b/test/oatpp/web/app/DTOs.hpp
@@ -25,7 +25,7 @@
 #ifndef oatpp_test_web_app_DTOs_hpp
 #define oatpp_test_web_app_DTOs_hpp
 
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 #include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace test { namespace web { namespace app {
diff --git a/test/oatpp/web/server/api/ApiControllerTest.cpp b/test/oatpp/web/server/api/ApiControllerTest.cpp
index 521ecbec..15c90d48 100644
--- a/test/oatpp/web/server/api/ApiControllerTest.cpp
+++ b/test/oatpp/web/server/api/ApiControllerTest.cpp
@@ -25,7 +25,7 @@
 #include "ApiControllerTest.hpp"
 
 #include "oatpp/web/server/api/ApiController.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 namespace oatpp { namespace test { namespace web { namespace server { namespace api {