diff --git a/modules/drogon/SCsub b/modules/drogon/SCsub
index 25c7eed..dfd89c4 100644
--- a/modules/drogon/SCsub
+++ b/modules/drogon/SCsub
@@ -6,6 +6,7 @@ Import("env")
 env_mod.core_sources = []
 
 env_mod.add_source_files(env_mod.core_sources, "drogon/lib/src/*.cc")
+env_mod.add_source_files(env_mod.core_sources, "drogon/lib/inc/http/*.cc")
 env_mod.add_source_files(env_mod.core_sources, "drogon/lib/src/ssl_funcs/*.cc")
 
 env_mod.add_source_files(env_mod.core_sources, "trantor/net/*.cc")
diff --git a/modules/drogon/drogon/lib/inc/drogon/HttpAppFramework.h b/modules/drogon/drogon/lib/inc/drogon/HttpAppFramework.h
index 747455b..cbc4d18 100644
--- a/modules/drogon/drogon/lib/inc/drogon/HttpAppFramework.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpAppFramework.h
@@ -14,12 +14,12 @@
 
 #pragma once
 
-#include <drogon/CacheMap.h>
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/CacheMap.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/IntranetIpFilter.h>
 #include <drogon/LocalHostFilter.h>
-#include <drogon/MultiPart.h>
+#include <http/MultiPart.h>
 #include <drogon/drogon_callbacks.h>
 
 #include <drogon/plugins/Plugin.h>
diff --git a/modules/drogon/drogon/lib/inc/drogon/HttpClient.h b/modules/drogon/drogon/lib/inc/drogon/HttpClient.h
index 0741dce..92ddf57 100644
--- a/modules/drogon/drogon/lib/inc/drogon/HttpClient.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpClient.h
@@ -14,9 +14,9 @@
  */
 #pragma once
 
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
-#include <drogon/HttpTypes.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
+#include <http/HttpTypes.h>
 #include <drogon/drogon_callbacks.h>
 
 #include <trantor/net/EventLoop.h>
diff --git a/modules/drogon/drogon/lib/inc/drogon/HttpFilter.h b/modules/drogon/drogon/lib/inc/drogon/HttpFilter.h
index 060e892..62a9f23 100644
--- a/modules/drogon/drogon/lib/inc/drogon/HttpFilter.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpFilter.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/drogon_callbacks.h>
 #include <memory>
 
diff --git a/modules/drogon/drogon/lib/inc/drogon/WebSocketClient.h b/modules/drogon/drogon/lib/inc/drogon/WebSocketClient.h
index 1102fcc..3635320 100644
--- a/modules/drogon/drogon/lib/inc/drogon/WebSocketClient.h
+++ b/modules/drogon/drogon/lib/inc/drogon/WebSocketClient.h
@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
-#include <drogon/HttpTypes.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
+#include <http/HttpTypes.h>
 #include <drogon/WebSocketConnection.h>
 #ifdef __cpp_impl_coroutine
 #include <drogon/utils/coroutine.h>
diff --git a/modules/drogon/drogon/lib/inc/drogon/WebSocketConnection.h b/modules/drogon/drogon/lib/inc/drogon/WebSocketConnection.h
index d9a9cc5..ebcbf38 100644
--- a/modules/drogon/drogon/lib/inc/drogon/WebSocketConnection.h
+++ b/modules/drogon/drogon/lib/inc/drogon/WebSocketConnection.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <trantor/net/InetAddress.h>
 #include <trantor/utils/NonCopyable.h>
 #include <memory>
diff --git a/modules/drogon/drogon/lib/inc/drogon/drogon.h b/modules/drogon/drogon/lib/inc/drogon/drogon.h
index 0098d8e..5fff366 100644
--- a/modules/drogon/drogon/lib/inc/drogon/drogon.h
+++ b/modules/drogon/drogon/lib/inc/drogon/drogon.h
@@ -19,14 +19,14 @@
 #include <trantor/utils/Date.h>
 #include <trantor/utils/Logger.h>
 
-#include <drogon/CacheMap.h>
-#include <drogon/Cookie.h>
+#include <http/CacheMap.h>
+#include <http/Cookie.h>
 #include <drogon/HttpAppFramework.h>
 #include <drogon/HttpClient.h>
 #include <drogon/IOThreadStorage.h>
-#include <drogon/MultiPart.h>
-#include <drogon/Session.h>
-#include <drogon/UploadFile.h>
+#include <http/MultiPart.h>
+#include <http/Session.h>
+#include <http/UploadFile.h>
 #include <drogon/plugins/AccessLogger.h>
 #include <drogon/plugins/Plugin.h>
 #include <drogon/plugins/SecureSSLRedirector.h>
diff --git a/modules/drogon/drogon/lib/inc/drogon/drogon_callbacks.h b/modules/drogon/drogon/lib/inc/drogon/drogon_callbacks.h
index 74830aa..20f2f79 100644
--- a/modules/drogon/drogon/lib/inc/drogon/drogon_callbacks.h
+++ b/modules/drogon/drogon/lib/inc/drogon/drogon_callbacks.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <functional>
 #include <memory>
 
diff --git a/modules/drogon/drogon/lib/inc/drogon/plugins/AccessLogger.h b/modules/drogon/drogon/lib/inc/drogon/plugins/AccessLogger.h
index bb64a94..38e3c5a 100644
--- a/modules/drogon/drogon/lib/inc/drogon/plugins/AccessLogger.h
+++ b/modules/drogon/drogon/lib/inc/drogon/plugins/AccessLogger.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/plugins/Plugin.h>
 #include <trantor/utils/AsyncFileLogger.h>
 #include <vector>
diff --git a/modules/drogon/drogon/lib/inc/drogon/utils/HttpConstraint.h b/modules/drogon/drogon/lib/inc/drogon/utils/HttpConstraint.h
index a3354c5..0cbe971 100644
--- a/modules/drogon/drogon/lib/inc/drogon/utils/HttpConstraint.h
+++ b/modules/drogon/drogon/lib/inc/drogon/utils/HttpConstraint.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <string>
 namespace drogon {
 namespace internal {
diff --git a/modules/drogon/drogon/lib/inc/drogon/Attribute.h b/modules/drogon/drogon/lib/inc/http/Attribute.h
similarity index 100%
rename from modules/drogon/drogon/lib/inc/drogon/Attribute.h
rename to modules/drogon/drogon/lib/inc/http/Attribute.h
diff --git a/modules/drogon/drogon/lib/src/CacheFile.cc b/modules/drogon/drogon/lib/inc/http/CacheFile.cc
similarity index 100%
rename from modules/drogon/drogon/lib/src/CacheFile.cc
rename to modules/drogon/drogon/lib/inc/http/CacheFile.cc
diff --git a/modules/drogon/drogon/lib/src/CacheFile.h b/modules/drogon/drogon/lib/inc/http/CacheFile.h
similarity index 100%
rename from modules/drogon/drogon/lib/src/CacheFile.h
rename to modules/drogon/drogon/lib/inc/http/CacheFile.h
diff --git a/modules/drogon/drogon/lib/inc/drogon/CacheMap.h b/modules/drogon/drogon/lib/inc/http/CacheMap.h
similarity index 100%
rename from modules/drogon/drogon/lib/inc/drogon/CacheMap.h
rename to modules/drogon/drogon/lib/inc/http/CacheMap.h
diff --git a/modules/drogon/drogon/lib/src/Cookie.cc b/modules/drogon/drogon/lib/inc/http/Cookie.cc
similarity index 97%
rename from modules/drogon/drogon/lib/src/Cookie.cc
rename to modules/drogon/drogon/lib/inc/http/Cookie.cc
index 8934be2..e4580f3 100644
--- a/modules/drogon/drogon/lib/src/Cookie.cc
+++ b/modules/drogon/drogon/lib/inc/http/Cookie.cc
@@ -12,7 +12,7 @@
  *
  */
 
-#include <drogon/Cookie.h>
+#include "Cookie.h"
 #include <drogon/utils/Utilities.h>
 using namespace drogon;
 std::string Cookie::cookieString() const {
diff --git a/modules/drogon/drogon/lib/inc/drogon/Cookie.h b/modules/drogon/drogon/lib/inc/http/Cookie.h
similarity index 100%
rename from modules/drogon/drogon/lib/inc/drogon/Cookie.h
rename to modules/drogon/drogon/lib/inc/http/Cookie.h
diff --git a/modules/drogon/drogon/lib/src/HttpFileImpl.cc b/modules/drogon/drogon/lib/inc/http/HttpFileImpl.cc
similarity index 98%
rename from modules/drogon/drogon/lib/src/HttpFileImpl.cc
rename to modules/drogon/drogon/lib/inc/http/HttpFileImpl.cc
index 5cf2a06..0ebeb10 100644
--- a/modules/drogon/drogon/lib/src/HttpFileImpl.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpFileImpl.cc
@@ -13,8 +13,8 @@
  */
 
 #include "HttpFileImpl.h"
-#include "HttpAppFrameworkImpl.h"
-#include <drogon/MultiPart.h>
+#include "../src/HttpAppFrameworkImpl.h"
+#include <http/MultiPart.h>
 #include <fstream>
 #include <iostream>
 
diff --git a/modules/drogon/drogon/lib/src/HttpFileImpl.h b/modules/drogon/drogon/lib/inc/http/HttpFileImpl.h
similarity index 98%
rename from modules/drogon/drogon/lib/src/HttpFileImpl.h
rename to modules/drogon/drogon/lib/inc/http/HttpFileImpl.h
index afb87a7..34cb42c 100644
--- a/modules/drogon/drogon/lib/src/HttpFileImpl.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpFileImpl.h
@@ -14,7 +14,7 @@
 
 #pragma once
 #include "HttpUtils.h"
-#include <drogon/HttpRequest.h>
+#include <http/HttpRequest.h>
 #include <drogon/utils/string_view.h>
 
 #include <map>
diff --git a/modules/drogon/drogon/lib/src/HttpFileUploadRequest.cc b/modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.cc
similarity index 95%
rename from modules/drogon/drogon/lib/src/HttpFileUploadRequest.cc
rename to modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.cc
index 9d1a924..9b0f033 100644
--- a/modules/drogon/drogon/lib/src/HttpFileUploadRequest.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.cc
@@ -13,7 +13,7 @@
  */
 
 #include "HttpFileUploadRequest.h"
-#include <drogon/UploadFile.h>
+#include <http/UploadFile.h>
 #include <drogon/utils/Utilities.h>
 
 using namespace drogon;
diff --git a/modules/drogon/drogon/lib/src/HttpFileUploadRequest.h b/modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.h
similarity index 100%
rename from modules/drogon/drogon/lib/src/HttpFileUploadRequest.h
rename to modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.h
diff --git a/modules/drogon/drogon/lib/src/HttpMessageBody.h b/modules/drogon/drogon/lib/inc/http/HttpMessageBody.h
similarity index 100%
rename from modules/drogon/drogon/lib/src/HttpMessageBody.h
rename to modules/drogon/drogon/lib/inc/http/HttpMessageBody.h
diff --git a/modules/drogon/drogon/lib/inc/drogon/HttpRequest.h b/modules/drogon/drogon/lib/inc/http/HttpRequest.h
similarity index 98%
rename from modules/drogon/drogon/lib/inc/drogon/HttpRequest.h
rename to modules/drogon/drogon/lib/inc/http/HttpRequest.h
index 731d4aa..b336ac5 100644
--- a/modules/drogon/drogon/lib/inc/drogon/HttpRequest.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequest.h
@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include <drogon/Attribute.h>
-#include <drogon/HttpTypes.h>
-#include <drogon/Session.h>
-#include <drogon/UploadFile.h>
+#include "Attribute.h"
+#include "HttpTypes.h"
+#include "Session.h"
+#include "UploadFile.h"
 
 #include <drogon/utils/string_view.h>
 #include <json/json.h>
diff --git a/modules/drogon/drogon/lib/src/HttpRequestImpl.cc b/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.cc
similarity index 99%
rename from modules/drogon/drogon/lib/src/HttpRequestImpl.cc
rename to modules/drogon/drogon/lib/inc/http/HttpRequestImpl.cc
index 6fda2d5..43c9076 100644
--- a/modules/drogon/drogon/lib/src/HttpRequestImpl.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.cc
@@ -13,7 +13,7 @@
  */
 
 #include "HttpRequestImpl.h"
-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpFileUploadRequest.h"
 
 #include <drogon/utils/Utilities.h>
diff --git a/modules/drogon/drogon/lib/src/HttpRequestImpl.h b/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.h
similarity index 99%
rename from modules/drogon/drogon/lib/src/HttpRequestImpl.h
rename to modules/drogon/drogon/lib/inc/http/HttpRequestImpl.h
index f9f958e..1e20909 100644
--- a/modules/drogon/drogon/lib/src/HttpRequestImpl.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.h
@@ -17,7 +17,7 @@
 #include "CacheFile.h"
 #include "HttpUtils.h"
 #include <assert.h>
-#include <drogon/HttpRequest.h>
+#include <http/HttpRequest.h>
 #include <drogon/utils/Utilities.h>
 #include <stdio.h>
 #include <trantor/net/EventLoop.h>
diff --git a/modules/drogon/drogon/lib/src/HttpRequestParser.cc b/modules/drogon/drogon/lib/inc/http/HttpRequestParser.cc
similarity index 99%
rename from modules/drogon/drogon/lib/src/HttpRequestParser.cc
rename to modules/drogon/drogon/lib/inc/http/HttpRequestParser.cc
index 06e9eb7..8809039 100644
--- a/modules/drogon/drogon/lib/src/HttpRequestParser.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestParser.cc
@@ -13,11 +13,11 @@
  */
 
 #include "HttpRequestParser.h"
-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpRequestImpl.h"
 #include "HttpResponseImpl.h"
 #include "HttpUtils.h"
-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <trantor/utils/Logger.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <iostream>
diff --git a/modules/drogon/drogon/lib/src/HttpRequestParser.h b/modules/drogon/drogon/lib/inc/http/HttpRequestParser.h
similarity index 98%
rename from modules/drogon/drogon/lib/src/HttpRequestParser.h
rename to modules/drogon/drogon/lib/inc/http/HttpRequestParser.h
index a828103..a682191 100644
--- a/modules/drogon/drogon/lib/src/HttpRequestParser.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestParser.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "impl_forwards.h"
-#include <drogon/HttpTypes.h>
+#include "../src/impl_forwards.h"
+#include <http/HttpTypes.h>
 #include <trantor/net/TcpConnection.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <trantor/utils/NonCopyable.h>
diff --git a/modules/drogon/drogon/lib/inc/drogon/HttpResponse.h b/modules/drogon/drogon/lib/inc/http/HttpResponse.h
similarity index 99%
rename from modules/drogon/drogon/lib/inc/drogon/HttpResponse.h
rename to modules/drogon/drogon/lib/inc/http/HttpResponse.h
index 82c84e9..c8bc146 100644
--- a/modules/drogon/drogon/lib/inc/drogon/HttpResponse.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponse.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <drogon/Cookie.h>
-#include <drogon/HttpTypes.h>
+#include "Cookie.h"
+#include "HttpTypes.h"
 #include <drogon/HttpViewData.h>
 
 #include <drogon/utils/string_view.h>
diff --git a/modules/drogon/drogon/lib/src/HttpResponseImpl.cc b/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.cc
similarity index 99%
rename from modules/drogon/drogon/lib/src/HttpResponseImpl.cc
rename to modules/drogon/drogon/lib/inc/http/HttpResponseImpl.cc
index 560182f..a04df04 100644
--- a/modules/drogon/drogon/lib/src/HttpResponseImpl.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.cc
@@ -13,7 +13,7 @@
  */
 
 #include "HttpResponseImpl.h"
-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpUtils.h"
 #include <drogon/HttpViewData.h>
 #include <drogon/IOThreadStorage.h>
diff --git a/modules/drogon/drogon/lib/src/HttpResponseImpl.h b/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.h
similarity index 99%
rename from modules/drogon/drogon/lib/src/HttpResponseImpl.h
rename to modules/drogon/drogon/lib/inc/http/HttpResponseImpl.h
index 706d87c..f4bedc9 100644
--- a/modules/drogon/drogon/lib/src/HttpResponseImpl.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.h
@@ -16,7 +16,7 @@
 
 #include "HttpMessageBody.h"
 #include "HttpUtils.h"
-#include <drogon/HttpResponse.h>
+#include <http/HttpResponse.h>
 
 #include <drogon/utils/Utilities.h>
 #include <trantor/net/InetAddress.h>
diff --git a/modules/drogon/drogon/lib/src/HttpResponseParser.cc b/modules/drogon/drogon/lib/inc/http/HttpResponseParser.cc
similarity index 100%
rename from modules/drogon/drogon/lib/src/HttpResponseParser.cc
rename to modules/drogon/drogon/lib/inc/http/HttpResponseParser.cc
diff --git a/modules/drogon/drogon/lib/src/HttpResponseParser.h b/modules/drogon/drogon/lib/inc/http/HttpResponseParser.h
similarity index 97%
rename from modules/drogon/drogon/lib/src/HttpResponseParser.h
rename to modules/drogon/drogon/lib/inc/http/HttpResponseParser.h
index e9967c9..cde089c 100644
--- a/modules/drogon/drogon/lib/src/HttpResponseParser.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponseParser.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "impl_forwards.h"
+#include "../src/impl_forwards.h"
 #include <trantor/net/TcpConnection.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <trantor/utils/NonCopyable.h>
diff --git a/modules/drogon/drogon/lib/inc/drogon/HttpTypes.h b/modules/drogon/drogon/lib/inc/http/HttpTypes.h
similarity index 100%
rename from modules/drogon/drogon/lib/inc/drogon/HttpTypes.h
rename to modules/drogon/drogon/lib/inc/http/HttpTypes.h
diff --git a/modules/drogon/drogon/lib/src/HttpUtils.cc b/modules/drogon/drogon/lib/inc/http/HttpUtils.cc
similarity index 100%
rename from modules/drogon/drogon/lib/src/HttpUtils.cc
rename to modules/drogon/drogon/lib/inc/http/HttpUtils.cc
diff --git a/modules/drogon/drogon/lib/src/HttpUtils.h b/modules/drogon/drogon/lib/inc/http/HttpUtils.h
similarity index 98%
rename from modules/drogon/drogon/lib/src/HttpUtils.h
rename to modules/drogon/drogon/lib/inc/http/HttpUtils.h
index 3f770c4..4e91e90 100644
--- a/modules/drogon/drogon/lib/src/HttpUtils.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpUtils.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <drogon/HttpTypes.h>
+#include "HttpTypes.h"
 #include <drogon/utils/string_view.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <string>
diff --git a/modules/drogon/drogon/lib/src/MultiPart.cc b/modules/drogon/drogon/lib/inc/http/MultiPart.cc
similarity index 98%
rename from modules/drogon/drogon/lib/src/MultiPart.cc
rename to modules/drogon/drogon/lib/inc/http/MultiPart.cc
index e43366d..1f4056e 100644
--- a/modules/drogon/drogon/lib/src/MultiPart.cc
+++ b/modules/drogon/drogon/lib/inc/http/MultiPart.cc
@@ -12,11 +12,11 @@
  *
  */
 
-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpFileImpl.h"
 #include "HttpRequestImpl.h"
 #include "HttpUtils.h"
-#include <drogon/MultiPart.h>
+#include <http/MultiPart.h>
 
 #include <drogon/utils/Utilities.h>
 #include <fcntl.h>
diff --git a/modules/drogon/drogon/lib/inc/drogon/MultiPart.h b/modules/drogon/drogon/lib/inc/http/MultiPart.h
similarity index 99%
rename from modules/drogon/drogon/lib/inc/drogon/MultiPart.h
rename to modules/drogon/drogon/lib/inc/http/MultiPart.h
index 8f70219..5905c4e 100644
--- a/modules/drogon/drogon/lib/inc/drogon/MultiPart.h
+++ b/modules/drogon/drogon/lib/inc/http/MultiPart.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <drogon/HttpRequest.h>
+#include "HttpRequest.h"
 
 #include <drogon/utils/string_view.h>
 #include <map>
diff --git a/modules/drogon/drogon/lib/inc/drogon/Session.h b/modules/drogon/drogon/lib/inc/http/Session.h
similarity index 100%
rename from modules/drogon/drogon/lib/inc/drogon/Session.h
rename to modules/drogon/drogon/lib/inc/http/Session.h
diff --git a/modules/drogon/drogon/lib/src/SessionManager.cc b/modules/drogon/drogon/lib/inc/http/SessionManager.cc
similarity index 100%
rename from modules/drogon/drogon/lib/src/SessionManager.cc
rename to modules/drogon/drogon/lib/inc/http/SessionManager.cc
diff --git a/modules/drogon/drogon/lib/src/SessionManager.h b/modules/drogon/drogon/lib/inc/http/SessionManager.h
similarity index 93%
rename from modules/drogon/drogon/lib/src/SessionManager.h
rename to modules/drogon/drogon/lib/inc/http/SessionManager.h
index a017be6..5d27e66 100644
--- a/modules/drogon/drogon/lib/src/SessionManager.h
+++ b/modules/drogon/drogon/lib/inc/http/SessionManager.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include <drogon/CacheMap.h>
-#include <drogon/Session.h>
+#include "CacheMap.h"
+#include "Session.h"
 #include <trantor/net/EventLoop.h>
 #include <trantor/utils/NonCopyable.h>
 #include <memory>
diff --git a/modules/drogon/drogon/lib/inc/drogon/UploadFile.h b/modules/drogon/drogon/lib/inc/http/UploadFile.h
similarity index 100%
rename from modules/drogon/drogon/lib/inc/drogon/UploadFile.h
rename to modules/drogon/drogon/lib/inc/http/UploadFile.h
diff --git a/modules/drogon/drogon/lib/src/AOPAdvice.cc b/modules/drogon/drogon/lib/src/AOPAdvice.cc
index e053ad7..9a6f998 100644
--- a/modules/drogon/drogon/lib/src/AOPAdvice.cc
+++ b/modules/drogon/drogon/lib/src/AOPAdvice.cc
@@ -13,8 +13,8 @@
  */
 
 #include "AOPAdvice.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
 
 namespace drogon {
 void doAdvicesChain(
diff --git a/modules/drogon/drogon/lib/src/AccessLogger.cc b/modules/drogon/drogon/lib/src/AccessLogger.cc
index 4ec56e2..855fbfa 100644
--- a/modules/drogon/drogon/lib/src/AccessLogger.cc
+++ b/modules/drogon/drogon/lib/src/AccessLogger.cc
@@ -12,7 +12,7 @@
  *
  */
 
-#include "HttpUtils.h"
+#include <http/HttpUtils.h>
 #include <drogon/drogon.h>
 #include <drogon/plugins/AccessLogger.h>
 #include <regex>
diff --git a/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc b/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc
index ae2103d..6970ece 100644
--- a/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc
+++ b/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc
@@ -16,21 +16,21 @@
 #include "AOPAdvice.h"
 #include "ConfigLoader.h"
 #include "HttpClientImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
 #include "HttpServer.h"
 #include "ListenerManager.h"
 #include "PluginsManager.h"
-#include "SessionManager.h"
+#include "http/SessionManager.h"
 #include "SharedLibManager.h"
 #include "StaticFileRouter.h"
 #include "WebSocketConnectionImpl.h"
 #include "WebsocketControllersRouter.h"
-#include <drogon/CacheMap.h>
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
-#include <drogon/HttpTypes.h>
-#include <drogon/Session.h>
+#include <http/CacheMap.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
+#include <http/HttpTypes.h>
+#include <http/Session.h>
 
 #include <drogon/utils/Utilities.h>
 #include <json/json.h>
diff --git a/modules/drogon/drogon/lib/src/HttpClientImpl.cc b/modules/drogon/drogon/lib/src/HttpClientImpl.cc
index 8803d6d..14fb675 100644
--- a/modules/drogon/drogon/lib/src/HttpClientImpl.cc
+++ b/modules/drogon/drogon/lib/src/HttpClientImpl.cc
@@ -14,9 +14,9 @@
 
 #include "HttpClientImpl.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
-#include "HttpResponseParser.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
+#include "http/HttpResponseParser.h"
 
 #include <stdlib.h>
 #include <algorithm>
diff --git a/modules/drogon/drogon/lib/src/HttpClientImpl.h b/modules/drogon/drogon/lib/src/HttpClientImpl.h
index cde02ed..0b647cb 100644
--- a/modules/drogon/drogon/lib/src/HttpClientImpl.h
+++ b/modules/drogon/drogon/lib/src/HttpClientImpl.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "impl_forwards.h"
-#include <drogon/Cookie.h>
+#include <http/Cookie.h>
 #include <drogon/HttpClient.h>
 #include <trantor/net/EventLoop.h>
 #include <trantor/net/Resolver.h>
diff --git a/modules/drogon/drogon/lib/src/HttpServer.cc b/modules/drogon/drogon/lib/src/HttpServer.cc
index 8f214c9..6ff245e 100644
--- a/modules/drogon/drogon/lib/src/HttpServer.cc
+++ b/modules/drogon/drogon/lib/src/HttpServer.cc
@@ -14,12 +14,12 @@
 
 #include "HttpServer.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpRequestParser.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpRequestParser.h"
+#include "http/HttpResponseImpl.h"
 #include "WebSocketConnectionImpl.h"
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/utils/Utilities.h>
 #include <trantor/utils/Logger.h>
 #include <functional>
diff --git a/modules/drogon/drogon/lib/src/IntranetIpFilter.cc b/modules/drogon/drogon/lib/src/IntranetIpFilter.cc
index cf4dc7d..7eef8d1 100644
--- a/modules/drogon/drogon/lib/src/IntranetIpFilter.cc
+++ b/modules/drogon/drogon/lib/src/IntranetIpFilter.cc
@@ -12,7 +12,7 @@
  *
  */
 
-#include "HttpResponseImpl.h"
+#include "http/HttpResponseImpl.h"
 #include <drogon/IntranetIpFilter.h>
 using namespace drogon;
 void IntranetIpFilter::doFilter(const HttpRequestPtr &req,
diff --git a/modules/drogon/drogon/lib/src/LocalHostFilter.cc b/modules/drogon/drogon/lib/src/LocalHostFilter.cc
index e166e1c..e777ab1 100644
--- a/modules/drogon/drogon/lib/src/LocalHostFilter.cc
+++ b/modules/drogon/drogon/lib/src/LocalHostFilter.cc
@@ -12,7 +12,7 @@
  *
  */
 
-#include "HttpResponseImpl.h"
+#include "http/HttpResponseImpl.h"
 #include <drogon/LocalHostFilter.h>
 using namespace drogon;
 void LocalHostFilter::doFilter(const HttpRequestPtr &req,
diff --git a/modules/drogon/drogon/lib/src/StaticFileRouter.cc b/modules/drogon/drogon/lib/src/StaticFileRouter.cc
index 252019a..6749ae4 100644
--- a/modules/drogon/drogon/lib/src/StaticFileRouter.cc
+++ b/modules/drogon/drogon/lib/src/StaticFileRouter.cc
@@ -14,8 +14,8 @@
 
 #include "StaticFileRouter.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
 #include <fcntl.h>
 #include <algorithm>
 #include <fstream>
diff --git a/modules/drogon/drogon/lib/src/StaticFileRouter.h b/modules/drogon/drogon/lib/src/StaticFileRouter.h
index f5ae92a..92f68e0 100644
--- a/modules/drogon/drogon/lib/src/StaticFileRouter.h
+++ b/modules/drogon/drogon/lib/src/StaticFileRouter.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "impl_forwards.h"
-#include <drogon/CacheMap.h>
+#include <http/CacheMap.h>
 #include <drogon/IOThreadStorage.h>
 #include <functional>
 #include <memory>
diff --git a/modules/drogon/drogon/lib/src/WebSocketClientImpl.cc b/modules/drogon/drogon/lib/src/WebSocketClientImpl.cc
index 478743a..8060577 100644
--- a/modules/drogon/drogon/lib/src/WebSocketClientImpl.cc
+++ b/modules/drogon/drogon/lib/src/WebSocketClientImpl.cc
@@ -14,10 +14,10 @@
 
 #include "WebSocketClientImpl.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
-#include "HttpResponseParser.h"
-#include "HttpUtils.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
+#include "http/HttpResponseParser.h"
+#include "http/HttpUtils.h"
 #include "WebSocketConnectionImpl.h"
 
 #include <drogon/utils/Utilities.h>
diff --git a/modules/drogon/drogon/lib/src/WebsocketControllersRouter.cc b/modules/drogon/drogon/lib/src/WebsocketControllersRouter.cc
index cc509a6..922c6b0 100644
--- a/modules/drogon/drogon/lib/src/WebsocketControllersRouter.cc
+++ b/modules/drogon/drogon/lib/src/WebsocketControllersRouter.cc
@@ -14,8 +14,8 @@
 
 #include "WebsocketControllersRouter.h"
 #include "AOPAdvice.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
 #include "WebSocketConnectionImpl.h"
 #include <drogon/HttpFilter.h>
 
@@ -137,7 +137,7 @@ void WebsocketControllersRouter::route(
 										std::move(*callbackPtr),
 										wsConnPtr);
 							});
-				} else {
+				} edrogonlse {
 					doControllerHandler(
 							ctrlInfo, wsKey, req, std::move(callback), wsConnPtr);
 				}
diff --git a/modules/drogon/drogon/lib/src/WebsocketControllersRouter.h b/modules/drogon/drogon/lib/src/WebsocketControllersRouter.h
index 6994254..4e4293d 100644
--- a/modules/drogon/drogon/lib/src/WebsocketControllersRouter.h
+++ b/modules/drogon/drogon/lib/src/WebsocketControllersRouter.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "impl_forwards.h"
-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <drogon/drogon_callbacks.h>
 #include <drogon/utils/HttpConstraint.h>
 #include <trantor/utils/NonCopyable.h>