diff --git a/include/iso15118/d20/ac_powers.hpp b/include/iso15118/d20/ac_powers.hpp
index a2d8f9cf..d4b6e268 100644
--- a/include/iso15118/d20/ac_powers.hpp
+++ b/include/iso15118/d20/ac_powers.hpp
@@ -4,7 +4,7 @@
 
 #include <optional>
 
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 
 namespace iso15118::d20 {
 
diff --git a/include/iso15118/d20/config.hpp b/include/iso15118/d20/config.hpp
index 36ad87a6..895d8ed9 100644
--- a/include/iso15118/d20/config.hpp
+++ b/include/iso15118/d20/config.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <iso15118/d20/limits.hpp>
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 
 namespace iso15118::d20 {
 
diff --git a/include/iso15118/d20/context.hpp b/include/iso15118/d20/context.hpp
index e8386c9c..e9e493f6 100644
--- a/include/iso15118/d20/context.hpp
+++ b/include/iso15118/d20/context.hpp
@@ -9,8 +9,8 @@
 #include <tuple>
 
 #include <iso15118/d20/timeout.hpp>
-#include <iso15118/message/payload_type.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/payload_type.hpp>
+#include <iso15118/message_d20/variant.hpp>
 #include <iso15118/session/feedback.hpp>
 #include <iso15118/session/logger.hpp>
 
diff --git a/include/iso15118/d20/ev_information.hpp b/include/iso15118/d20/ev_information.hpp
index 4dbefe96..33359109 100644
--- a/include/iso15118/d20/ev_information.hpp
+++ b/include/iso15118/d20/ev_information.hpp
@@ -2,7 +2,7 @@
 // Copyright 2025 Pionix GmbH and Contributors to EVerest
 #pragma once
 
-#include <iso15118/message/supported_app_protocol.hpp>
+#include <iso15118/message_d20/supported_app_protocol.hpp>
 
 namespace iso15118::d20 {
 
diff --git a/include/iso15118/d20/ev_session_info.hpp b/include/iso15118/d20/ev_session_info.hpp
index 00e24b65..8ba12693 100644
--- a/include/iso15118/d20/ev_session_info.hpp
+++ b/include/iso15118/d20/ev_session_info.hpp
@@ -2,7 +2,7 @@
 // Copyright 2025 Pionix GmbH and Contributors to EVerest
 #pragma once
 
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 #include <iso15118/session/feedback.hpp>
 
 namespace iso15118::d20 {
diff --git a/include/iso15118/d20/limits.hpp b/include/iso15118/d20/limits.hpp
index 1bfd90d4..b5066b47 100644
--- a/include/iso15118/d20/limits.hpp
+++ b/include/iso15118/d20/limits.hpp
@@ -4,7 +4,7 @@
 
 #include <optional>
 
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 
 namespace iso15118::d20 {
 
diff --git a/include/iso15118/d20/session.hpp b/include/iso15118/d20/session.hpp
index 71752dd3..0e532005 100644
--- a/include/iso15118/d20/session.hpp
+++ b/include/iso15118/d20/session.hpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <iso15118/io/sha_hash.hpp>
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 
 namespace iso15118::d20 {
 
diff --git a/include/iso15118/d20/state/authorization.hpp b/include/iso15118/d20/state/authorization.hpp
index 45fd89b7..450ca298 100644
--- a/include/iso15118/d20/state/authorization.hpp
+++ b/include/iso15118/d20/state/authorization.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "../states.hpp"
-#include <iso15118/message/authorization.hpp>
+#include <iso15118/message_d20/authorization.hpp>
 
 namespace iso15118::d20::state {
 struct Authorization : public StateBase {
diff --git a/include/iso15118/d20/state/power_delivery.hpp b/include/iso15118/d20/state/power_delivery.hpp
index 327b51a7..92db601f 100644
--- a/include/iso15118/d20/state/power_delivery.hpp
+++ b/include/iso15118/d20/state/power_delivery.hpp
@@ -4,7 +4,7 @@
 
 #include "../states.hpp"
 
-#include <iso15118/message/power_delivery.hpp>
+#include <iso15118/message_d20/power_delivery.hpp>
 #include <optional>
 
 namespace iso15118::d20::state {
diff --git a/include/iso15118/detail/d20/context_helper.hpp b/include/iso15118/detail/d20/context_helper.hpp
index 5dfe2f5b..b7cd61af 100644
--- a/include/iso15118/detail/d20/context_helper.hpp
+++ b/include/iso15118/detail/d20/context_helper.hpp
@@ -4,7 +4,7 @@
 
 #include <iso15118/d20/context.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 
 namespace iso15118::d20 {
 
diff --git a/include/iso15118/detail/d20/state/ac_charge_loop.hpp b/include/iso15118/detail/d20/state/ac_charge_loop.hpp
index 29710733..d65801a3 100644
--- a/include/iso15118/detail/d20/state/ac_charge_loop.hpp
+++ b/include/iso15118/detail/d20/state/ac_charge_loop.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/ac_charge_loop.hpp>
+#include <iso15118/message_d20/ac_charge_loop.hpp>
 
 #include <iso15118/d20/ac_powers.hpp>
 #include <iso15118/d20/dynamic_mode_parameters.hpp>
diff --git a/include/iso15118/detail/d20/state/ac_charge_parameter_discovery.hpp b/include/iso15118/detail/d20/state/ac_charge_parameter_discovery.hpp
index ab5d0fb1..c1b4eed3 100644
--- a/include/iso15118/detail/d20/state/ac_charge_parameter_discovery.hpp
+++ b/include/iso15118/detail/d20/state/ac_charge_parameter_discovery.hpp
@@ -5,7 +5,7 @@
 #include <iso15118/d20/ac_powers.hpp>
 #include <iso15118/d20/config.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/ac_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/authorization.hpp b/include/iso15118/detail/d20/state/authorization.hpp
index b7765742..6bb85eb2 100644
--- a/include/iso15118/detail/d20/state/authorization.hpp
+++ b/include/iso15118/detail/d20/state/authorization.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/authorization.hpp>
+#include <iso15118/message_d20/authorization.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/authorization_setup.hpp b/include/iso15118/detail/d20/state/authorization_setup.hpp
index d036ad01..af9cff0e 100644
--- a/include/iso15118/detail/d20/state/authorization_setup.hpp
+++ b/include/iso15118/detail/d20/state/authorization_setup.hpp
@@ -4,7 +4,7 @@
 
 #include <iso15118/d20/config.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/authorization_setup.hpp>
+#include <iso15118/message_d20/authorization_setup.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/dc_cable_check.hpp b/include/iso15118/detail/d20/state/dc_cable_check.hpp
index 053d7807..e10c98bc 100644
--- a/include/iso15118/detail/d20/state/dc_cable_check.hpp
+++ b/include/iso15118/detail/d20/state/dc_cable_check.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/dc_cable_check.hpp>
+#include <iso15118/message_d20/dc_cable_check.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/dc_charge_loop.hpp b/include/iso15118/detail/d20/state/dc_charge_loop.hpp
index 11589775..6f7f086e 100644
--- a/include/iso15118/detail/d20/state/dc_charge_loop.hpp
+++ b/include/iso15118/detail/d20/state/dc_charge_loop.hpp
@@ -11,7 +11,7 @@
 #include <iso15118/d20/dynamic_mode_parameters.hpp>
 #include <iso15118/d20/limits.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/dc_charge_loop.hpp>
+#include <iso15118/message_d20/dc_charge_loop.hpp>
 
 #include <iso15118/session/feedback.hpp>
 
diff --git a/include/iso15118/detail/d20/state/dc_charge_parameter_discovery.hpp b/include/iso15118/detail/d20/state/dc_charge_parameter_discovery.hpp
index a2d3333a..d7de3e5b 100644
--- a/include/iso15118/detail/d20/state/dc_charge_parameter_discovery.hpp
+++ b/include/iso15118/detail/d20/state/dc_charge_parameter_discovery.hpp
@@ -5,7 +5,7 @@
 #include <iso15118/d20/config.hpp>
 #include <iso15118/d20/limits.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/dc_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/dc_pre_charge.hpp b/include/iso15118/detail/d20/state/dc_pre_charge.hpp
index c3ac872f..5478f732 100644
--- a/include/iso15118/detail/d20/state/dc_pre_charge.hpp
+++ b/include/iso15118/detail/d20/state/dc_pre_charge.hpp
@@ -6,7 +6,7 @@
 #include <tuple>
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/dc_pre_charge.hpp>
+#include <iso15118/message_d20/dc_pre_charge.hpp>
 
 #include <iso15118/session/feedback.hpp>
 
diff --git a/include/iso15118/detail/d20/state/dc_welding_detection.hpp b/include/iso15118/detail/d20/state/dc_welding_detection.hpp
index eeed3e22..80048289 100644
--- a/include/iso15118/detail/d20/state/dc_welding_detection.hpp
+++ b/include/iso15118/detail/d20/state/dc_welding_detection.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/dc_welding_detection.hpp>
+#include <iso15118/message_d20/dc_welding_detection.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/power_delivery.hpp b/include/iso15118/detail/d20/state/power_delivery.hpp
index 8147707d..5d8ab3b3 100644
--- a/include/iso15118/detail/d20/state/power_delivery.hpp
+++ b/include/iso15118/detail/d20/state/power_delivery.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/power_delivery.hpp>
+#include <iso15118/message_d20/power_delivery.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/schedule_exchange.hpp b/include/iso15118/detail/d20/state/schedule_exchange.hpp
index c63d726a..b4e774d7 100644
--- a/include/iso15118/detail/d20/state/schedule_exchange.hpp
+++ b/include/iso15118/detail/d20/state/schedule_exchange.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/schedule_exchange.hpp>
+#include <iso15118/message_d20/schedule_exchange.hpp>
 
 #include <cstdint>
 #include <ctime>
diff --git a/include/iso15118/detail/d20/state/service_detail.hpp b/include/iso15118/detail/d20/state/service_detail.hpp
index 89011391..fa83bb1f 100644
--- a/include/iso15118/detail/d20/state/service_detail.hpp
+++ b/include/iso15118/detail/d20/state/service_detail.hpp
@@ -4,7 +4,7 @@
 
 #include <iso15118/d20/config.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/service_detail.hpp>
+#include <iso15118/message_d20/service_detail.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/service_discovery.hpp b/include/iso15118/detail/d20/state/service_discovery.hpp
index b3d3f4b8..74440361 100644
--- a/include/iso15118/detail/d20/state/service_discovery.hpp
+++ b/include/iso15118/detail/d20/state/service_discovery.hpp
@@ -6,8 +6,8 @@
 
 #include <iso15118/d20/config.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/common_types.hpp>
-#include <iso15118/message/service_discovery.hpp>
+#include <iso15118/message_d20/common_types.hpp>
+#include <iso15118/message_d20/service_discovery.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/service_selection.hpp b/include/iso15118/detail/d20/state/service_selection.hpp
index a3429dfc..ae783d66 100644
--- a/include/iso15118/detail/d20/state/service_selection.hpp
+++ b/include/iso15118/detail/d20/state/service_selection.hpp
@@ -4,7 +4,7 @@
 
 #include <iso15118/d20/config.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/service_selection.hpp>
+#include <iso15118/message_d20/service_selection.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/session_setup.hpp b/include/iso15118/detail/d20/state/session_setup.hpp
index 276dd1db..f30fb4b5 100644
--- a/include/iso15118/detail/d20/state/session_setup.hpp
+++ b/include/iso15118/detail/d20/state/session_setup.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/session_setup.hpp>
+#include <iso15118/message_d20/session_setup.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/d20/state/session_stop.hpp b/include/iso15118/detail/d20/state/session_stop.hpp
index 98d9260c..601cac1d 100644
--- a/include/iso15118/detail/d20/state/session_stop.hpp
+++ b/include/iso15118/detail/d20/state/session_stop.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/session_stop.hpp>
+#include <iso15118/message_d20/session_stop.hpp>
 
 namespace iso15118::d20::state {
 
diff --git a/include/iso15118/detail/variant_access.hpp b/include/iso15118/detail/variant_access.hpp
index 22e4bbfb..47d6077b 100644
--- a/include/iso15118/detail/variant_access.hpp
+++ b/include/iso15118/detail/variant_access.hpp
@@ -4,7 +4,7 @@
 
 #include <cassert>
 
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "cb_exi.hpp"
 
diff --git a/include/iso15118/message/ac_charge_loop.hpp b/include/iso15118/message_d20/ac_charge_loop.hpp
similarity index 100%
rename from include/iso15118/message/ac_charge_loop.hpp
rename to include/iso15118/message_d20/ac_charge_loop.hpp
diff --git a/include/iso15118/message/ac_charge_parameter_discovery.hpp b/include/iso15118/message_d20/ac_charge_parameter_discovery.hpp
similarity index 100%
rename from include/iso15118/message/ac_charge_parameter_discovery.hpp
rename to include/iso15118/message_d20/ac_charge_parameter_discovery.hpp
diff --git a/include/iso15118/message/authorization.hpp b/include/iso15118/message_d20/authorization.hpp
similarity index 100%
rename from include/iso15118/message/authorization.hpp
rename to include/iso15118/message_d20/authorization.hpp
diff --git a/include/iso15118/message/authorization_setup.hpp b/include/iso15118/message_d20/authorization_setup.hpp
similarity index 100%
rename from include/iso15118/message/authorization_setup.hpp
rename to include/iso15118/message_d20/authorization_setup.hpp
diff --git a/include/iso15118/message/common_types.hpp b/include/iso15118/message_d20/common_types.hpp
similarity index 100%
rename from include/iso15118/message/common_types.hpp
rename to include/iso15118/message_d20/common_types.hpp
diff --git a/include/iso15118/message/dc_cable_check.hpp b/include/iso15118/message_d20/dc_cable_check.hpp
similarity index 100%
rename from include/iso15118/message/dc_cable_check.hpp
rename to include/iso15118/message_d20/dc_cable_check.hpp
diff --git a/include/iso15118/message/dc_charge_loop.hpp b/include/iso15118/message_d20/dc_charge_loop.hpp
similarity index 100%
rename from include/iso15118/message/dc_charge_loop.hpp
rename to include/iso15118/message_d20/dc_charge_loop.hpp
diff --git a/include/iso15118/message/dc_charge_parameter_discovery.hpp b/include/iso15118/message_d20/dc_charge_parameter_discovery.hpp
similarity index 100%
rename from include/iso15118/message/dc_charge_parameter_discovery.hpp
rename to include/iso15118/message_d20/dc_charge_parameter_discovery.hpp
diff --git a/include/iso15118/message/dc_pre_charge.hpp b/include/iso15118/message_d20/dc_pre_charge.hpp
similarity index 100%
rename from include/iso15118/message/dc_pre_charge.hpp
rename to include/iso15118/message_d20/dc_pre_charge.hpp
diff --git a/include/iso15118/message/dc_welding_detection.hpp b/include/iso15118/message_d20/dc_welding_detection.hpp
similarity index 100%
rename from include/iso15118/message/dc_welding_detection.hpp
rename to include/iso15118/message_d20/dc_welding_detection.hpp
diff --git a/include/iso15118/message/payload_type.hpp b/include/iso15118/message_d20/payload_type.hpp
similarity index 100%
rename from include/iso15118/message/payload_type.hpp
rename to include/iso15118/message_d20/payload_type.hpp
diff --git a/include/iso15118/message/power_delivery.hpp b/include/iso15118/message_d20/power_delivery.hpp
similarity index 100%
rename from include/iso15118/message/power_delivery.hpp
rename to include/iso15118/message_d20/power_delivery.hpp
diff --git a/include/iso15118/message/schedule_exchange.hpp b/include/iso15118/message_d20/schedule_exchange.hpp
similarity index 100%
rename from include/iso15118/message/schedule_exchange.hpp
rename to include/iso15118/message_d20/schedule_exchange.hpp
diff --git a/include/iso15118/message/service_detail.hpp b/include/iso15118/message_d20/service_detail.hpp
similarity index 100%
rename from include/iso15118/message/service_detail.hpp
rename to include/iso15118/message_d20/service_detail.hpp
diff --git a/include/iso15118/message/service_discovery.hpp b/include/iso15118/message_d20/service_discovery.hpp
similarity index 100%
rename from include/iso15118/message/service_discovery.hpp
rename to include/iso15118/message_d20/service_discovery.hpp
diff --git a/include/iso15118/message/service_selection.hpp b/include/iso15118/message_d20/service_selection.hpp
similarity index 100%
rename from include/iso15118/message/service_selection.hpp
rename to include/iso15118/message_d20/service_selection.hpp
diff --git a/include/iso15118/message/session_setup.hpp b/include/iso15118/message_d20/session_setup.hpp
similarity index 100%
rename from include/iso15118/message/session_setup.hpp
rename to include/iso15118/message_d20/session_setup.hpp
diff --git a/include/iso15118/message/session_stop.hpp b/include/iso15118/message_d20/session_stop.hpp
similarity index 100%
rename from include/iso15118/message/session_stop.hpp
rename to include/iso15118/message_d20/session_stop.hpp
diff --git a/include/iso15118/message/supported_app_protocol.hpp b/include/iso15118/message_d20/supported_app_protocol.hpp
similarity index 100%
rename from include/iso15118/message/supported_app_protocol.hpp
rename to include/iso15118/message_d20/supported_app_protocol.hpp
diff --git a/include/iso15118/message/type.hpp b/include/iso15118/message_d20/type.hpp
similarity index 100%
rename from include/iso15118/message/type.hpp
rename to include/iso15118/message_d20/type.hpp
diff --git a/include/iso15118/message/variant.hpp b/include/iso15118/message_d20/variant.hpp
similarity index 100%
rename from include/iso15118/message/variant.hpp
rename to include/iso15118/message_d20/variant.hpp
diff --git a/include/iso15118/session/feedback.hpp b/include/iso15118/session/feedback.hpp
index 8b5a68dd..f4c0e774 100644
--- a/include/iso15118/session/feedback.hpp
+++ b/include/iso15118/session/feedback.hpp
@@ -11,14 +11,14 @@
 #include <iso15118/d20/ev_information.hpp>
 #include <iso15118/d20/limits.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/message/ac_charge_loop.hpp>
-#include <iso15118/message/ac_charge_parameter_discovery.hpp>
-#include <iso15118/message/dc_charge_loop.hpp>
-#include <iso15118/message/dc_charge_parameter_discovery.hpp>
-#include <iso15118/message/schedule_exchange.hpp>
-#include <iso15118/message/service_detail.hpp>
-#include <iso15118/message/service_selection.hpp>
-#include <iso15118/message/type.hpp>
+#include <iso15118/message_d20/ac_charge_loop.hpp>
+#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/dc_charge_loop.hpp>
+#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/schedule_exchange.hpp>
+#include <iso15118/message_d20/service_detail.hpp>
+#include <iso15118/message_d20/service_selection.hpp>
+#include <iso15118/message_d20/type.hpp>
 
 namespace iso15118::session {
 
diff --git a/include/iso15118/tbd_controller.hpp b/include/iso15118/tbd_controller.hpp
index 13e88b4c..2267bafd 100644
--- a/include/iso15118/tbd_controller.hpp
+++ b/include/iso15118/tbd_controller.hpp
@@ -14,7 +14,7 @@
 #include <iso15118/d20/limits.hpp>
 #include <iso15118/io/poll_manager.hpp>
 #include <iso15118/io/sdp_server.hpp>
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 #include <iso15118/session/feedback.hpp>
 #include <iso15118/session/iso.hpp>
 
diff --git a/src/iso15118/CMakeLists.txt b/src/iso15118/CMakeLists.txt
index fc33f8a3..b815ee43 100644
--- a/src/iso15118/CMakeLists.txt
+++ b/src/iso15118/CMakeLists.txt
@@ -48,25 +48,25 @@ target_sources(iso15118
         d20/state/ac_charge_loop.cpp
         d20/state/session_stop.cpp
         
-        message/variant.cpp
-        message/supported_app_protocol.cpp
-        message/session_setup.cpp
-        message/common_types.cpp
-        message/authorization_setup.cpp
-        message/authorization.cpp
-        message/service_discovery.cpp
-        message/service_detail.cpp
-        message/service_selection.cpp
-        message/ac_charge_parameter_discovery.cpp
-        message/dc_charge_parameter_discovery.cpp
-        message/schedule_exchange.cpp
-        message/dc_cable_check.cpp
-        message/dc_pre_charge.cpp
-        message/power_delivery.cpp
-        message/ac_charge_loop.cpp
-        message/dc_charge_loop.cpp
-        message/dc_welding_detection.cpp
-        message/session_stop.cpp
+        message_d20/variant.cpp
+        message_d20/supported_app_protocol.cpp
+        message_d20/session_setup.cpp
+        message_d20/common_types.cpp
+        message_d20/authorization_setup.cpp
+        message_d20/authorization.cpp
+        message_d20/service_discovery.cpp
+        message_d20/service_detail.cpp
+        message_d20/service_selection.cpp
+        message_d20/ac_charge_parameter_discovery.cpp
+        message_d20/dc_charge_parameter_discovery.cpp
+        message_d20/schedule_exchange.cpp
+        message_d20/dc_cable_check.cpp
+        message_d20/dc_pre_charge.cpp
+        message_d20/power_delivery.cpp
+        message_d20/ac_charge_loop.cpp
+        message_d20/dc_charge_loop.cpp
+        message_d20/dc_welding_detection.cpp
+        message_d20/session_stop.cpp
 
         tbd_controller.cpp    
 )
diff --git a/src/iso15118/d20/context_helper.cpp b/src/iso15118/d20/context_helper.cpp
index f134189f..4a8625e0 100644
--- a/src/iso15118/d20/context_helper.cpp
+++ b/src/iso15118/d20/context_helper.cpp
@@ -5,21 +5,21 @@
 #include <iso15118/detail/d20/context_helper.hpp>
 #include <iso15118/detail/helper.hpp>
 
-#include <iso15118/message/ac_charge_parameter_discovery.hpp>
-#include <iso15118/message/authorization.hpp>
-#include <iso15118/message/authorization_setup.hpp>
-#include <iso15118/message/dc_cable_check.hpp>
-#include <iso15118/message/dc_charge_loop.hpp>
-#include <iso15118/message/dc_charge_parameter_discovery.hpp>
-#include <iso15118/message/dc_pre_charge.hpp>
-#include <iso15118/message/dc_welding_detection.hpp>
-#include <iso15118/message/power_delivery.hpp>
-#include <iso15118/message/schedule_exchange.hpp>
-#include <iso15118/message/service_detail.hpp>
-#include <iso15118/message/service_discovery.hpp>
-#include <iso15118/message/service_selection.hpp>
-#include <iso15118/message/session_setup.hpp>
-#include <iso15118/message/session_stop.hpp>
+#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/authorization.hpp>
+#include <iso15118/message_d20/authorization_setup.hpp>
+#include <iso15118/message_d20/dc_cable_check.hpp>
+#include <iso15118/message_d20/dc_charge_loop.hpp>
+#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/dc_pre_charge.hpp>
+#include <iso15118/message_d20/dc_welding_detection.hpp>
+#include <iso15118/message_d20/power_delivery.hpp>
+#include <iso15118/message_d20/schedule_exchange.hpp>
+#include <iso15118/message_d20/service_detail.hpp>
+#include <iso15118/message_d20/service_discovery.hpp>
+#include <iso15118/message_d20/service_selection.hpp>
+#include <iso15118/message_d20/session_setup.hpp>
+#include <iso15118/message_d20/session_stop.hpp>
 
 namespace iso15118::d20 {
 
diff --git a/src/iso15118/d20/state/ac_charge_loop.cpp b/src/iso15118/d20/state/ac_charge_loop.cpp
index 0d4eb9dd..834437fd 100644
--- a/src/iso15118/d20/state/ac_charge_loop.cpp
+++ b/src/iso15118/d20/state/ac_charge_loop.cpp
@@ -2,7 +2,7 @@
 // Copyright 2025 Pionix GmbH and Contributors to EVerest
 #include <iso15118/d20/state/ac_charge_loop.hpp>
 
-#include <iso15118/message/ac_charge_loop.hpp>
+#include <iso15118/message_d20/ac_charge_loop.hpp>
 
 #include <iso15118/d20/state/power_delivery.hpp>
 #include <iso15118/d20/state/session_stop.hpp>
diff --git a/src/iso15118/d20/state/supported_app_protocol.cpp b/src/iso15118/d20/state/supported_app_protocol.cpp
index 081e9f65..f1bb878a 100644
--- a/src/iso15118/d20/state/supported_app_protocol.cpp
+++ b/src/iso15118/d20/state/supported_app_protocol.cpp
@@ -7,7 +7,7 @@
 
 #include <iso15118/d20/state/session_setup.hpp>
 
-#include <iso15118/message/supported_app_protocol.hpp>
+#include <iso15118/message_d20/supported_app_protocol.hpp>
 
 #include <iso15118/detail/d20/context_helper.hpp>
 #include <iso15118/detail/helper.hpp>
diff --git a/src/iso15118/message/ac_charge_loop.cpp b/src/iso15118/message_d20/ac_charge_loop.cpp
similarity index 99%
rename from src/iso15118/message/ac_charge_loop.cpp
rename to src/iso15118/message_d20/ac_charge_loop.cpp
index 8e7c80b0..67a9ff14 100644
--- a/src/iso15118/message/ac_charge_loop.cpp
+++ b/src/iso15118/message_d20/ac_charge_loop.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2024 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/ac_charge_loop.hpp>
+#include <iso15118/message_d20/ac_charge_loop.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/ac_charge_parameter_discovery.cpp b/src/iso15118/message_d20/ac_charge_parameter_discovery.cpp
similarity index 99%
rename from src/iso15118/message/ac_charge_parameter_discovery.cpp
rename to src/iso15118/message_d20/ac_charge_parameter_discovery.cpp
index e49252c6..d102eba6 100644
--- a/src/iso15118/message/ac_charge_parameter_discovery.cpp
+++ b/src/iso15118/message_d20/ac_charge_parameter_discovery.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2024 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/ac_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/authorization.cpp b/src/iso15118/message_d20/authorization.cpp
similarity index 98%
rename from src/iso15118/message/authorization.cpp
rename to src/iso15118/message_d20/authorization.cpp
index 0a948506..bf342fb4 100644
--- a/src/iso15118/message/authorization.cpp
+++ b/src/iso15118/message_d20/authorization.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/authorization.hpp>
+#include <iso15118/message_d20/authorization.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/authorization_setup.cpp b/src/iso15118/message_d20/authorization_setup.cpp
similarity index 98%
rename from src/iso15118/message/authorization_setup.cpp
rename to src/iso15118/message_d20/authorization_setup.cpp
index 324d19eb..c073c2dc 100644
--- a/src/iso15118/message/authorization_setup.cpp
+++ b/src/iso15118/message_d20/authorization_setup.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/authorization_setup.hpp>
+#include <iso15118/message_d20/authorization_setup.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/common_types.cpp b/src/iso15118/message_d20/common_types.cpp
similarity index 98%
rename from src/iso15118/message/common_types.cpp
rename to src/iso15118/message_d20/common_types.cpp
index 5426a7fb..712b87fa 100644
--- a/src/iso15118/message/common_types.cpp
+++ b/src/iso15118/message_d20/common_types.cpp
@@ -2,10 +2,10 @@
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
 #include <cmath>
 
-#include <iso15118/message/common_types.hpp>
+#include <iso15118/message_d20/common_types.hpp>
 
 #include <iso15118/detail/cb_exi.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include <cbv2g/iso_20/iso20_AC_Datatypes.h>
 #include <cbv2g/iso_20/iso20_CommonMessages_Datatypes.h>
diff --git a/src/iso15118/message/dc_cable_check.cpp b/src/iso15118/message_d20/dc_cable_check.cpp
similarity index 97%
rename from src/iso15118/message/dc_cable_check.cpp
rename to src/iso15118/message_d20/dc_cable_check.cpp
index d5846cd0..230480cd 100644
--- a/src/iso15118/message/dc_cable_check.cpp
+++ b/src/iso15118/message_d20/dc_cable_check.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/dc_cable_check.hpp>
+#include <iso15118/message_d20/dc_cable_check.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/dc_charge_loop.cpp b/src/iso15118/message_d20/dc_charge_loop.cpp
similarity index 99%
rename from src/iso15118/message/dc_charge_loop.cpp
rename to src/iso15118/message_d20/dc_charge_loop.cpp
index 871dbba8..568124c4 100644
--- a/src/iso15118/message/dc_charge_loop.cpp
+++ b/src/iso15118/message_d20/dc_charge_loop.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/dc_charge_loop.hpp>
+#include <iso15118/message_d20/dc_charge_loop.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/dc_charge_parameter_discovery.cpp b/src/iso15118/message_d20/dc_charge_parameter_discovery.cpp
similarity index 99%
rename from src/iso15118/message/dc_charge_parameter_discovery.cpp
rename to src/iso15118/message_d20/dc_charge_parameter_discovery.cpp
index ce7735c0..8b74ca04 100644
--- a/src/iso15118/message/dc_charge_parameter_discovery.cpp
+++ b/src/iso15118/message_d20/dc_charge_parameter_discovery.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/dc_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/dc_pre_charge.cpp b/src/iso15118/message_d20/dc_pre_charge.cpp
similarity index 98%
rename from src/iso15118/message/dc_pre_charge.cpp
rename to src/iso15118/message_d20/dc_pre_charge.cpp
index cf28cebf..546b0eba 100644
--- a/src/iso15118/message/dc_pre_charge.cpp
+++ b/src/iso15118/message_d20/dc_pre_charge.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/dc_pre_charge.hpp>
+#include <iso15118/message_d20/dc_pre_charge.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/dc_welding_detection.cpp b/src/iso15118/message_d20/dc_welding_detection.cpp
similarity index 97%
rename from src/iso15118/message/dc_welding_detection.cpp
rename to src/iso15118/message_d20/dc_welding_detection.cpp
index c0d68ba2..848007f4 100644
--- a/src/iso15118/message/dc_welding_detection.cpp
+++ b/src/iso15118/message_d20/dc_welding_detection.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/dc_welding_detection.hpp>
+#include <iso15118/message_d20/dc_welding_detection.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/power_delivery.cpp b/src/iso15118/message_d20/power_delivery.cpp
similarity index 99%
rename from src/iso15118/message/power_delivery.cpp
rename to src/iso15118/message_d20/power_delivery.cpp
index dc846a54..60070710 100644
--- a/src/iso15118/message/power_delivery.cpp
+++ b/src/iso15118/message_d20/power_delivery.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/power_delivery.hpp>
+#include <iso15118/message_d20/power_delivery.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/schedule_exchange.cpp b/src/iso15118/message_d20/schedule_exchange.cpp
similarity index 99%
rename from src/iso15118/message/schedule_exchange.cpp
rename to src/iso15118/message_d20/schedule_exchange.cpp
index a34e98b5..8d9e1015 100644
--- a/src/iso15118/message/schedule_exchange.cpp
+++ b/src/iso15118/message_d20/schedule_exchange.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/schedule_exchange.hpp>
+#include <iso15118/message_d20/schedule_exchange.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/service_detail.cpp b/src/iso15118/message_d20/service_detail.cpp
similarity index 99%
rename from src/iso15118/message/service_detail.cpp
rename to src/iso15118/message_d20/service_detail.cpp
index c0bb75b3..fa48e6ba 100644
--- a/src/iso15118/message/service_detail.cpp
+++ b/src/iso15118/message_d20/service_detail.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/service_detail.hpp>
+#include <iso15118/message_d20/service_detail.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/service_discovery.cpp b/src/iso15118/message_d20/service_discovery.cpp
similarity index 98%
rename from src/iso15118/message/service_discovery.cpp
rename to src/iso15118/message_d20/service_discovery.cpp
index 3a5b463b..358ee1ee 100644
--- a/src/iso15118/message/service_discovery.cpp
+++ b/src/iso15118/message_d20/service_discovery.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/service_discovery.hpp>
+#include <iso15118/message_d20/service_discovery.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/service_selection.cpp b/src/iso15118/message_d20/service_selection.cpp
similarity index 98%
rename from src/iso15118/message/service_selection.cpp
rename to src/iso15118/message_d20/service_selection.cpp
index 7b3ea5f2..9eb1e813 100644
--- a/src/iso15118/message/service_selection.cpp
+++ b/src/iso15118/message_d20/service_selection.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/service_selection.hpp>
+#include <iso15118/message_d20/service_selection.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/session_setup.cpp b/src/iso15118/message_d20/session_setup.cpp
similarity index 97%
rename from src/iso15118/message/session_setup.cpp
rename to src/iso15118/message_d20/session_setup.cpp
index f9c6a351..281e4c6a 100644
--- a/src/iso15118/message/session_setup.cpp
+++ b/src/iso15118/message_d20/session_setup.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/session_setup.hpp>
+#include <iso15118/message_d20/session_setup.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/session_stop.cpp b/src/iso15118/message_d20/session_stop.cpp
similarity index 98%
rename from src/iso15118/message/session_stop.cpp
rename to src/iso15118/message_d20/session_stop.cpp
index 8d2fd389..c59c3842 100644
--- a/src/iso15118/message/session_stop.cpp
+++ b/src/iso15118/message_d20/session_stop.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/session_stop.hpp>
+#include <iso15118/message_d20/session_stop.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/supported_app_protocol.cpp b/src/iso15118/message_d20/supported_app_protocol.cpp
similarity index 98%
rename from src/iso15118/message/supported_app_protocol.cpp
rename to src/iso15118/message_d20/supported_app_protocol.cpp
index d254e22d..4c4b05f4 100644
--- a/src/iso15118/message/supported_app_protocol.cpp
+++ b/src/iso15118/message_d20/supported_app_protocol.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/supported_app_protocol.hpp>
+#include <iso15118/message_d20/supported_app_protocol.hpp>
 
 #include <type_traits>
 
diff --git a/src/iso15118/message/variant.cpp b/src/iso15118/message_d20/variant.cpp
similarity index 99%
rename from src/iso15118/message/variant.cpp
rename to src/iso15118/message_d20/variant.cpp
index b1e42f3e..3d85ecc6 100644
--- a/src/iso15118/message/variant.cpp
+++ b/src/iso15118/message_d20/variant.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include <cassert>
 #include <string>
diff --git a/test/exi/cb/app_hand/app_hand.cpp b/test/exi/cb/app_hand/app_hand.cpp
index c5acc91f..d5f629d1 100644
--- a/test/exi/cb/app_hand/app_hand.cpp
+++ b/test/exi/cb/app_hand/app_hand.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/supported_app_protocol.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/supported_app_protocol.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include <string>
 
diff --git a/test/exi/cb/iso20/ac_charge_loop.cpp b/test/exi/cb/iso20/ac_charge_loop.cpp
index 1fd41f4e..65f7b559 100644
--- a/test/exi/cb/iso20/ac_charge_loop.cpp
+++ b/test/exi/cb/iso20/ac_charge_loop.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/ac_charge_loop.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/ac_charge_loop.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/ac_charge_parameter_discovery.cpp b/test/exi/cb/iso20/ac_charge_parameter_discovery.cpp
index f495eedf..817e3fdb 100644
--- a/test/exi/cb/iso20/ac_charge_parameter_discovery.cpp
+++ b/test/exi/cb/iso20/ac_charge_parameter_discovery.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/ac_charge_parameter_discovery.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/authorization.cpp b/test/exi/cb/iso20/authorization.cpp
index 780190d1..3e052878 100644
--- a/test/exi/cb/iso20/authorization.cpp
+++ b/test/exi/cb/iso20/authorization.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/authorization.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/authorization.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/authorization_setup.cpp b/test/exi/cb/iso20/authorization_setup.cpp
index cd975877..fece2c26 100644
--- a/test/exi/cb/iso20/authorization_setup.cpp
+++ b/test/exi/cb/iso20/authorization_setup.cpp
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include <iso15118/message/authorization_setup.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/authorization_setup.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/dc_cable_check.cpp b/test/exi/cb/iso20/dc_cable_check.cpp
index 890412c2..f6155224 100644
--- a/test/exi/cb/iso20/dc_cable_check.cpp
+++ b/test/exi/cb/iso20/dc_cable_check.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/dc_cable_check.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/dc_cable_check.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/dc_charge_loop.cpp b/test/exi/cb/iso20/dc_charge_loop.cpp
index 71102a8b..4d2c0158 100644
--- a/test/exi/cb/iso20/dc_charge_loop.cpp
+++ b/test/exi/cb/iso20/dc_charge_loop.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/dc_charge_loop.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/dc_charge_loop.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/dc_charge_parameter_discovery.cpp b/test/exi/cb/iso20/dc_charge_parameter_discovery.cpp
index 7a1f2dbb..9a85e499 100644
--- a/test/exi/cb/iso20/dc_charge_parameter_discovery.cpp
+++ b/test/exi/cb/iso20/dc_charge_parameter_discovery.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/dc_charge_parameter_discovery.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/dc_pre_charge.cpp b/test/exi/cb/iso20/dc_pre_charge.cpp
index d45a54f5..78fe2f6e 100644
--- a/test/exi/cb/iso20/dc_pre_charge.cpp
+++ b/test/exi/cb/iso20/dc_pre_charge.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/dc_pre_charge.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/dc_pre_charge.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/dc_welding_detection.cpp b/test/exi/cb/iso20/dc_welding_detection.cpp
index fa9c7729..bd3e6188 100644
--- a/test/exi/cb/iso20/dc_welding_detection.cpp
+++ b/test/exi/cb/iso20/dc_welding_detection.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/dc_welding_detection.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/dc_welding_detection.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/power_delivery.cpp b/test/exi/cb/iso20/power_delivery.cpp
index 06b08ebc..374acc3e 100644
--- a/test/exi/cb/iso20/power_delivery.cpp
+++ b/test/exi/cb/iso20/power_delivery.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/power_delivery.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/power_delivery.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/schedule_exchange.cpp b/test/exi/cb/iso20/schedule_exchange.cpp
index 3acd5993..f6ab72a0 100644
--- a/test/exi/cb/iso20/schedule_exchange.cpp
+++ b/test/exi/cb/iso20/schedule_exchange.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/schedule_exchange.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/schedule_exchange.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/service_detail.cpp b/test/exi/cb/iso20/service_detail.cpp
index 34358cfc..530dcb9a 100644
--- a/test/exi/cb/iso20/service_detail.cpp
+++ b/test/exi/cb/iso20/service_detail.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/service_detail.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/service_detail.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/service_discovery.cpp b/test/exi/cb/iso20/service_discovery.cpp
index 7546f14f..e6f63ede 100644
--- a/test/exi/cb/iso20/service_discovery.cpp
+++ b/test/exi/cb/iso20/service_discovery.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/service_discovery.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/service_discovery.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/service_selection.cpp b/test/exi/cb/iso20/service_selection.cpp
index ad9e7fa5..dbc1abdb 100644
--- a/test/exi/cb/iso20/service_selection.cpp
+++ b/test/exi/cb/iso20/service_selection.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/service_selection.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/service_selection.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/exi/cb/iso20/session_setup.cpp b/test/exi/cb/iso20/session_setup.cpp
index 69e86324..1f123d9c 100644
--- a/test/exi/cb/iso20/session_setup.cpp
+++ b/test/exi/cb/iso20/session_setup.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/session_setup.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/session_setup.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include <string>
 
diff --git a/test/exi/cb/iso20/session_stop.cpp b/test/exi/cb/iso20/session_stop.cpp
index efe62273..e7b1207a 100644
--- a/test/exi/cb/iso20/session_stop.cpp
+++ b/test/exi/cb/iso20/session_stop.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/message/session_stop.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/session_stop.hpp>
+#include <iso15118/message_d20/variant.hpp>
 
 #include "helper.hpp"
 
diff --git a/test/iso15118/fsm/d20_transitions.cpp b/test/iso15118/fsm/d20_transitions.cpp
index 97cb2c35..649f42ec 100644
--- a/test/iso15118/fsm/d20_transitions.cpp
+++ b/test/iso15118/fsm/d20_transitions.cpp
@@ -7,7 +7,7 @@
 #include <iso15118/d20/state/session_setup.hpp>
 #include <iso15118/d20/state/supported_app_protocol.hpp>
 
-#include <iso15118/message/supported_app_protocol.hpp>
+#include <iso15118/message_d20/supported_app_protocol.hpp>
 
 using namespace iso15118;
 
diff --git a/test/iso15118/fsm/helper.hpp b/test/iso15118/fsm/helper.hpp
index 76daca0a..f9c2e4b5 100644
--- a/test/iso15118/fsm/helper.hpp
+++ b/test/iso15118/fsm/helper.hpp
@@ -16,7 +16,7 @@
 #include <iso15118/io/logging.hpp>
 #include <iso15118/io/sdp.hpp>
 #include <iso15118/io/stream_view.hpp>
-#include <iso15118/message/variant.hpp>
+#include <iso15118/message_d20/variant.hpp>
 #include <iso15118/session/feedback.hpp>
 
 using namespace iso15118;
diff --git a/test/iso15118/fsm/service_detail.cpp b/test/iso15118/fsm/service_detail.cpp
index 8d25b34b..0b91ea39 100644
--- a/test/iso15118/fsm/service_detail.cpp
+++ b/test/iso15118/fsm/service_detail.cpp
@@ -7,7 +7,7 @@
 #include <iso15118/d20/state/service_detail.hpp>
 #include <iso15118/d20/state/service_selection.hpp>
 
-#include <iso15118/message/service_detail.hpp>
+#include <iso15118/message_d20/service_detail.hpp>
 
 #include <iso15118/detail/helper.hpp>
 
diff --git a/test/iso15118/fsm/session_setup.cpp b/test/iso15118/fsm/session_setup.cpp
index 73b39c98..4975b0e9 100644
--- a/test/iso15118/fsm/session_setup.cpp
+++ b/test/iso15118/fsm/session_setup.cpp
@@ -7,7 +7,7 @@
 #include <iso15118/d20/state/authorization_setup.hpp>
 #include <iso15118/d20/state/session_setup.hpp>
 
-#include <iso15118/message/session_setup.hpp>
+#include <iso15118/message_d20/session_setup.hpp>
 
 using namespace iso15118;