diff --git a/include/optionx_cpp/bridges/telegram.hpp b/include/optionx_cpp/bridges/telegram.hpp
index 962a744..b36b333 100644
--- a/include/optionx_cpp/bridges/telegram.hpp
+++ b/include/optionx_cpp/bridges/telegram.hpp
@@ -7,9 +7,9 @@
 
 #include "bridges/telegram/TelegramParsedMessage.hpp"
 #include "bridges/telegram/TelegramRawMessage.hpp"
-#include "bridges/telegram/TelegramSignalParser.hpp"
+#include "bridges/telegram/detail/TelegramSignalParser.hpp"
 #include "bridges/telegram/TelegramSignalBridgeConfig.hpp"
 #include "bridges/telegram/TelegramSignalBridge.hpp"
-#include "bridges/telegram/TelegramWorkerMessageSource.hpp"
+#include "bridges/telegram/detail/TelegramWorkerMessageSource.hpp"
 
 #endif // OPTIONX_HEADER_BRIDGES_TELEGRAM_HPP_INCLUDED
diff --git a/include/optionx_cpp/bridges/telegram/TelegramSignalBridgeConfig.hpp b/include/optionx_cpp/bridges/telegram/TelegramSignalBridgeConfig.hpp
index ddaa18c..ac3f3b4 100644
--- a/include/optionx_cpp/bridges/telegram/TelegramSignalBridgeConfig.hpp
+++ b/include/optionx_cpp/bridges/telegram/TelegramSignalBridgeConfig.hpp
@@ -6,7 +6,7 @@
 /// \brief Configuration for the Telegram signal bridge.
 
 #include "data/bridge.hpp"
-#include "bridges/telegram/TelegramSignalParser.hpp"
+#include "bridges/telegram/detail/TelegramSignalParser.hpp"
 
 #include <cmath>
 #include <memory>
diff --git a/include/optionx_cpp/bridges/telegram/TelegramSignalParser.hpp b/include/optionx_cpp/bridges/telegram/detail/TelegramSignalParser.hpp
similarity index 99%
rename from include/optionx_cpp/bridges/telegram/TelegramSignalParser.hpp
rename to include/optionx_cpp/bridges/telegram/detail/TelegramSignalParser.hpp
index 6c8a8bd..45dbd94 100644
--- a/include/optionx_cpp/bridges/telegram/TelegramSignalParser.hpp
+++ b/include/optionx_cpp/bridges/telegram/detail/TelegramSignalParser.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#ifndef OPTIONX_HEADER_BRIDGES_TELEGRAM_TELEGRAM_SIGNAL_PARSER_HPP_INCLUDED
-#define OPTIONX_HEADER_BRIDGES_TELEGRAM_TELEGRAM_SIGNAL_PARSER_HPP_INCLUDED
+#ifndef OPTIONX_HEADER_BRIDGES_TELEGRAM_DETAIL_TELEGRAM_SIGNAL_PARSER_HPP_INCLUDED
+#define OPTIONX_HEADER_BRIDGES_TELEGRAM_DETAIL_TELEGRAM_SIGNAL_PARSER_HPP_INCLUDED
 
-/// \file TelegramSignalParser.hpp
+/// \file bridges/telegram/detail/TelegramSignalParser.hpp
 /// \brief Deterministic regex parser for Telegram signal and outcome messages.
 
 #include "bridges/telegram/TelegramParsedMessage.hpp"
@@ -840,4 +840,4 @@ namespace optionx::bridges::telegram {
 
 } // namespace optionx::bridges::telegram
 
-#endif // OPTIONX_HEADER_BRIDGES_TELEGRAM_TELEGRAM_SIGNAL_PARSER_HPP_INCLUDED
+#endif // OPTIONX_HEADER_BRIDGES_TELEGRAM_DETAIL_TELEGRAM_SIGNAL_PARSER_HPP_INCLUDED
diff --git a/include/optionx_cpp/bridges/telegram/TelegramWorkerMessageSource.hpp b/include/optionx_cpp/bridges/telegram/detail/TelegramWorkerMessageSource.hpp
similarity index 92%
rename from include/optionx_cpp/bridges/telegram/TelegramWorkerMessageSource.hpp
rename to include/optionx_cpp/bridges/telegram/detail/TelegramWorkerMessageSource.hpp
index c4eb5fa..84842fb 100644
--- a/include/optionx_cpp/bridges/telegram/TelegramWorkerMessageSource.hpp
+++ b/include/optionx_cpp/bridges/telegram/detail/TelegramWorkerMessageSource.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#ifndef OPTIONX_HEADER_BRIDGES_TELEGRAM_TELEGRAM_WORKER_MESSAGE_SOURCE_HPP_INCLUDED
-#define OPTIONX_HEADER_BRIDGES_TELEGRAM_TELEGRAM_WORKER_MESSAGE_SOURCE_HPP_INCLUDED
+#ifndef OPTIONX_HEADER_BRIDGES_TELEGRAM_DETAIL_TELEGRAM_WORKER_MESSAGE_SOURCE_HPP_INCLUDED
+#define OPTIONX_HEADER_BRIDGES_TELEGRAM_DETAIL_TELEGRAM_WORKER_MESSAGE_SOURCE_HPP_INCLUDED
 
-/// \file TelegramWorkerMessageSource.hpp
+/// \file bridges/telegram/detail/TelegramWorkerMessageSource.hpp
 /// \brief Adapter from a tg-client-stdio-style worker client to Telegram bridge input.
 
 #include "bridges/telegram/TelegramSignalBridge.hpp"
@@ -134,4 +134,4 @@ namespace optionx::bridges::telegram {
 
 } // namespace optionx::bridges::telegram
 
-#endif // OPTIONX_HEADER_BRIDGES_TELEGRAM_TELEGRAM_WORKER_MESSAGE_SOURCE_HPP_INCLUDED
+#endif // OPTIONX_HEADER_BRIDGES_TELEGRAM_DETAIL_TELEGRAM_WORKER_MESSAGE_SOURCE_HPP_INCLUDED