diff --git a/SilKit/source/core/internal/IMessageReceiver.hpp b/SilKit/source/core/internal/IMessageReceiver.hpp
index 0fe79a384..237f444f3 100644
--- a/SilKit/source/core/internal/IMessageReceiver.hpp
+++ b/SilKit/source/core/internal/IMessageReceiver.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "IServiceEndpoint.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/IParticipantInternal.hpp b/SilKit/source/core/internal/IParticipantInternal.hpp
index 3da426d3d..4a085c49d 100644
--- a/SilKit/source/core/internal/IParticipantInternal.hpp
+++ b/SilKit/source/core/internal/IParticipantInternal.hpp
@@ -11,25 +11,25 @@
 #include "silkit/experimental/netsim/NetworkSimulatorDatatypes.hpp"
 
 
-#include "internal_fwd.hpp"
-#include "IServiceEndpoint.hpp"
-#include "ServiceDatatypes.hpp"
-#include "RequestReplyDatatypes.hpp"
-#include "OrchestrationDatatypes.hpp"
-#include "LoggingDatatypesInternal.hpp"
-#include "MetricsDatatypes.hpp"
-
-#include "WireCanMessages.hpp"
-#include "WireDataMessages.hpp"
-#include "WireEthernetMessages.hpp"
-#include "WireFlexrayMessages.hpp"
-#include "WireLinMessages.hpp"
-#include "WireRpcMessages.hpp"
-#include "Metrics.hpp"
-
-#include "ISimulator.hpp"
-#include "IReplayDataController.hpp"
-#include "ITraceMessageSource.hpp"
+#include "core/internal/internal_fwd.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
+#include "core/service/ServiceDatatypes.hpp"
+#include "core/requests/RequestReplyDatatypes.hpp"
+#include "core/internal/OrchestrationDatatypes.hpp"
+#include "core/internal/LoggingDatatypesInternal.hpp"
+#include "services/metrics/MetricsDatatypes.hpp"
+
+#include "wire/can/WireCanMessages.hpp"
+#include "wire/pubsub/WireDataMessages.hpp"
+#include "wire/ethernet/WireEthernetMessages.hpp"
+#include "wire/flexray/WireFlexrayMessages.hpp"
+#include "wire/lin/WireLinMessages.hpp"
+#include "wire/rpc/WireRpcMessages.hpp"
+#include "services/metrics/Metrics.hpp"
+
+#include "core/internal/ISimulator.hpp"
+#include "tracing/IReplayDataController.hpp"
+#include "tracing/ITraceMessageSource.hpp"
 
 // forwards
 namespace SilKit {
diff --git a/SilKit/source/core/internal/IReceiver.hpp b/SilKit/source/core/internal/IReceiver.hpp
index 94c4c3a88..7bb8cad58 100644
--- a/SilKit/source/core/internal/IReceiver.hpp
+++ b/SilKit/source/core/internal/IReceiver.hpp
@@ -5,7 +5,7 @@
 #pragma once
 #include <tuple>
 
-#include "IMessageReceiver.hpp"
+#include "core/internal/IMessageReceiver.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/IServiceEndpoint.hpp b/SilKit/source/core/internal/IServiceEndpoint.hpp
index 47a66171f..db7665b00 100644
--- a/SilKit/source/core/internal/IServiceEndpoint.hpp
+++ b/SilKit/source/core/internal/IServiceEndpoint.hpp
@@ -10,9 +10,9 @@
 #include <vector>
 #include <functional>
 
-#include "EndpointAddress.hpp"
-#include "ServiceDescriptor.hpp"
-#include "ServiceConfigKeys.hpp"
+#include "core/internal/EndpointAddress.hpp"
+#include "core/internal/ServiceDescriptor.hpp"
+#include "core/internal/ServiceConfigKeys.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/ISimulator.hpp b/SilKit/source/core/internal/ISimulator.hpp
index 8959b0992..ee1552614 100644
--- a/SilKit/source/core/internal/ISimulator.hpp
+++ b/SilKit/source/core/internal/ISimulator.hpp
@@ -5,10 +5,10 @@
 // SPDX-License-Identifier: MIT
 
 // internal connection endpoint types:
-#include "IMsgForCanSimulator.hpp"
-#include "IMsgForEthSimulator.hpp"
-#include "IMsgForFlexrayBusSimulator.hpp"
-#include "IMsgForLinSimulator.hpp"
+#include "services/can/IMsgForCanSimulator.hpp"
+#include "services/ethernet/IMsgForEthSimulator.hpp"
+#include "services/flexray/IMsgForFlexrayBusSimulator.hpp"
+#include "services/lin/IMsgForLinSimulator.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/ITimeConsumer.hpp b/SilKit/source/core/internal/ITimeConsumer.hpp
index a07b5ed1a..5b6c30296 100644
--- a/SilKit/source/core/internal/ITimeConsumer.hpp
+++ b/SilKit/source/core/internal/ITimeConsumer.hpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-#include "ITimeProvider.hpp"
+#include "core/internal/ITimeProvider.hpp"
 
 namespace SilKit {
 namespace Services {
diff --git a/SilKit/source/core/internal/InternalSerdes.hpp b/SilKit/source/core/internal/InternalSerdes.hpp
index 8398634de..d6f68cda3 100644
--- a/SilKit/source/core/internal/InternalSerdes.hpp
+++ b/SilKit/source/core/internal/InternalSerdes.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "MessageBuffer.hpp"
-#include "EndpointAddress.hpp"
+#include "core/internal/MessageBuffer.hpp"
+#include "core/internal/EndpointAddress.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/LoggingDatatypesInternal.hpp b/SilKit/source/core/internal/LoggingDatatypesInternal.hpp
index 9a1f36430..4c0109788 100644
--- a/SilKit/source/core/internal/LoggingDatatypesInternal.hpp
+++ b/SilKit/source/core/internal/LoggingDatatypesInternal.hpp
@@ -12,7 +12,7 @@
 
 #include "silkit/services/logging/LoggingDatatypes.hpp"
 #include "silkit/services/logging/string_utils.hpp"
-#include "string_utils_internal.hpp"
+#include "core/internal/string_utils_internal.hpp"
 
 namespace SilKit {
 namespace Services {
diff --git a/SilKit/source/core/internal/MessageBuffer.hpp b/SilKit/source/core/internal/MessageBuffer.hpp
index e68f3a7c7..6030c6d47 100644
--- a/SilKit/source/core/internal/MessageBuffer.hpp
+++ b/SilKit/source/core/internal/MessageBuffer.hpp
@@ -17,9 +17,9 @@
 
 #include "silkit/util/Span.hpp"
 
-#include "Uuid.hpp"
-#include "ProtocolVersion.hpp"
-#include "SharedVector.hpp"
+#include "util/Uuid.hpp"
+#include "core/internal/ProtocolVersion.hpp"
+#include "wire/util/SharedVector.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/OrchestrationDatatypes.hpp b/SilKit/source/core/internal/OrchestrationDatatypes.hpp
index 109dc8340..2bb70a30d 100644
--- a/SilKit/source/core/internal/OrchestrationDatatypes.hpp
+++ b/SilKit/source/core/internal/OrchestrationDatatypes.hpp
@@ -9,7 +9,7 @@
 
 #include "silkit/services/orchestration/OrchestrationDatatypes.hpp"
 
-#include "IServiceEndpoint.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
 
 namespace SilKit {
 namespace Services {
diff --git a/SilKit/source/core/internal/ServiceDescriptor.hpp b/SilKit/source/core/internal/ServiceDescriptor.hpp
index eb1f96963..ececc8ebd 100644
--- a/SilKit/source/core/internal/ServiceDescriptor.hpp
+++ b/SilKit/source/core/internal/ServiceDescriptor.hpp
@@ -7,11 +7,11 @@
 #include <sstream>
 #include <map>
 
-#include "StructuredLoggingKeys.hpp"
-#include "ServiceConfigKeys.hpp"
-#include "Configuration.hpp"
-#include "EndpointAddress.hpp"
-#include "Hash.hpp"
+#include "services/logging/StructuredLoggingKeys.hpp"
+#include "core/internal/ServiceConfigKeys.hpp"
+#include "config/Configuration.hpp"
+#include "core/internal/EndpointAddress.hpp"
+#include "util/Hash.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/TestDataTraits.hpp b/SilKit/source/core/internal/TestDataTraits.hpp
index 3e7b51b04..1fa243ba3 100644
--- a/SilKit/source/core/internal/TestDataTraits.hpp
+++ b/SilKit/source/core/internal/TestDataTraits.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "traits/SilKitMsgTraits.hpp"
-#include "TestDataTypes.hpp"
+#include "core/internal/TestDataTypes.hpp"
 
 // Datatypes for testing versioning and renaming of SIL Kit messages.
 namespace SilKit {
diff --git a/SilKit/source/core/internal/TestDataTypes.hpp b/SilKit/source/core/internal/TestDataTypes.hpp
index f2a35cdf4..d7c32f94b 100644
--- a/SilKit/source/core/internal/TestDataTypes.hpp
+++ b/SilKit/source/core/internal/TestDataTypes.hpp
@@ -6,8 +6,8 @@
 #include <string>
 #include <ostream>
 
-#include "MessageBuffer.hpp"
-#include "InternalSerdes.hpp"
+#include "core/internal/MessageBuffer.hpp"
+#include "core/internal/InternalSerdes.hpp"
 
 
 // Datatypes for testing versioning and renaming of SIL Kit messages.
diff --git a/SilKit/source/core/internal/Test_InternalSerdes.cpp b/SilKit/source/core/internal/Test_InternalSerdes.cpp
index 31a62e5c4..3a4e14bfe 100644
--- a/SilKit/source/core/internal/Test_InternalSerdes.cpp
+++ b/SilKit/source/core/internal/Test_InternalSerdes.cpp
@@ -4,7 +4,7 @@
 
 #include "gtest/gtest.h"
 
-#include "InternalSerdes.hpp"
+#include "core/internal/InternalSerdes.hpp"
 
 TEST(Test_InternalSerdes, Mw_EndpointAddress)
 {
diff --git a/SilKit/source/core/internal/Test_MessageBuffer.cpp b/SilKit/source/core/internal/Test_MessageBuffer.cpp
index 2025c52bb..a46486c6f 100644
--- a/SilKit/source/core/internal/Test_MessageBuffer.cpp
+++ b/SilKit/source/core/internal/Test_MessageBuffer.cpp
@@ -6,7 +6,7 @@
 
 #include "gtest/gtest.h"
 
-#include "MessageBuffer.hpp"
+#include "core/internal/MessageBuffer.hpp"
 
 using namespace std::chrono_literals;
 
diff --git a/SilKit/source/core/internal/string_utils_internal.hpp b/SilKit/source/core/internal/string_utils_internal.hpp
index 1ae12d16a..65a4306d8 100644
--- a/SilKit/source/core/internal/string_utils_internal.hpp
+++ b/SilKit/source/core/internal/string_utils_internal.hpp
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "EndpointAddress.hpp"
+#include "core/internal/EndpointAddress.hpp"
 
 
 #include <ostream>
@@ -15,8 +15,8 @@
 #include <algorithm>
 #include <cctype>
 
-#include "LoggingTopics.hpp"
-#include "StringHelpers.hpp"
+#include "core/internal/LoggingTopics.hpp"
+#include "util/StringHelpers.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/string_utils_sync.hpp b/SilKit/source/core/internal/string_utils_sync.hpp
index fe77c2281..bd7f334bb 100644
--- a/SilKit/source/core/internal/string_utils_sync.hpp
+++ b/SilKit/source/core/internal/string_utils_sync.hpp
@@ -6,7 +6,7 @@
 
 #include "silkit/services/orchestration/string_utils.hpp"
 
-#include "OrchestrationDatatypes.hpp"
+#include "core/internal/OrchestrationDatatypes.hpp"
 
 namespace SilKit {
 namespace Services {
diff --git a/SilKit/source/core/internal/traits/SilKitLoggingTraits.hpp b/SilKit/source/core/internal/traits/SilKitLoggingTraits.hpp
index fde88d237..729a5b617 100644
--- a/SilKit/source/core/internal/traits/SilKitLoggingTraits.hpp
+++ b/SilKit/source/core/internal/traits/SilKitLoggingTraits.hpp
@@ -7,7 +7,7 @@
 #include "core/internal/internal_fwd.hpp"
 
 #include "silkit/services/logging/LoggingDatatypes.hpp"
-#include "LoggingTopics.hpp"
+#include "core/internal/LoggingTopics.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/traits/SilKitMsgTraits.hpp b/SilKit/source/core/internal/traits/SilKitMsgTraits.hpp
index f04e83f31..71a94f5ee 100644
--- a/SilKit/source/core/internal/traits/SilKitMsgTraits.hpp
+++ b/SilKit/source/core/internal/traits/SilKitMsgTraits.hpp
@@ -6,8 +6,8 @@
 
 #include <type_traits>
 
-#include "SilKitMsgVersion.hpp"
-#include "SilKitMsgSerdesName.hpp"
+#include "core/internal/traits/SilKitMsgVersion.hpp"
+#include "core/internal/traits/SilKitMsgSerdesName.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/internal/traits/SilKitServiceConfigTraits.hpp b/SilKit/source/core/internal/traits/SilKitServiceConfigTraits.hpp
index e24d09cf7..9018e12b9 100644
--- a/SilKit/source/core/internal/traits/SilKitServiceConfigTraits.hpp
+++ b/SilKit/source/core/internal/traits/SilKitServiceConfigTraits.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "traits/SilKitServices_fwd.hpp"
+#include "core/internal/traits/SilKitServices_fwd.hpp"
 
 namespace SilKit {
 
diff --git a/SilKit/source/core/internal/traits/SilKitServiceTraits.hpp b/SilKit/source/core/internal/traits/SilKitServiceTraits.hpp
index 98dcb328c..cad2165ba 100644
--- a/SilKit/source/core/internal/traits/SilKitServiceTraits.hpp
+++ b/SilKit/source/core/internal/traits/SilKitServiceTraits.hpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-#include "internal_fwd.hpp"
+#include "core/internal/internal_fwd.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.cpp b/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.cpp
index 84797d1c5..5ce54617d 100644
--- a/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.cpp
+++ b/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.cpp
@@ -4,10 +4,10 @@
 
 #include "silkit/services/logging/ILogger.hpp"
 
-#include "NullConnectionParticipant.hpp"
-#include "Participant.hpp"
-#include "Participant_impl.hpp"
-#include "CreateParticipantT.hpp"
+#include "core/mock/nullconnection/NullConnectionParticipant.hpp"
+#include "core/participant/Participant.hpp"
+#include "core/participant/Participant_impl.hpp"
+#include "core/participant/CreateParticipantT.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.hpp b/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.hpp
index f6f94feb2..46633703a 100644
--- a/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.hpp
+++ b/SilKit/source/core/mock/nullconnection/NullConnectionParticipant.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "IParticipantInternal.hpp"
+#include "core/internal/IParticipantInternal.hpp"
 #include "silkit/config/IParticipantConfiguration.hpp"
 
 namespace SilKit {
diff --git a/SilKit/source/core/mock/participant/MockParticipant.hpp b/SilKit/source/core/mock/participant/MockParticipant.hpp
index 118d36d7f..d43bca5e6 100644
--- a/SilKit/source/core/mock/participant/MockParticipant.hpp
+++ b/SilKit/source/core/mock/participant/MockParticipant.hpp
@@ -28,16 +28,16 @@
 
 #include "silkit/experimental/netsim/INetworkSimulator.hpp"
 
-#include "IParticipantInternal.hpp"
-#include "IServiceDiscovery.hpp"
-#include "IRequestReplyService.hpp"
-#include "IRequestReplyProcedure.hpp"
-#include "procs/IParticipantReplies.hpp"
-#include "LifecycleService.hpp"
-#include "SynchronizedHandlers.hpp"
-#include "MockTimeProvider.hpp"
-
-#include "MockLogger.hpp"
+#include "core/internal/IParticipantInternal.hpp"
+#include "core/service/IServiceDiscovery.hpp"
+#include "core/requests/IRequestReplyService.hpp"
+#include "core/requests/IRequestReplyProcedure.hpp"
+#include "core/requests/procs/IParticipantReplies.hpp"
+#include "services/orchestration/LifecycleService.hpp"
+#include "util/SynchronizedHandlers.hpp"
+#include "core/mock/participant/MockTimeProvider.hpp"
+
+#include "services/logging/MockLogger.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/mock/participant/MockTimeProvider.hpp b/SilKit/source/core/mock/participant/MockTimeProvider.hpp
index 97fcdc95a..9e40956ab 100644
--- a/SilKit/source/core/mock/participant/MockTimeProvider.hpp
+++ b/SilKit/source/core/mock/participant/MockTimeProvider.hpp
@@ -9,8 +9,8 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
-#include "ITimeProvider.hpp"
-#include "SynchronizedHandlers.hpp"
+#include "core/internal/ITimeProvider.hpp"
+#include "util/SynchronizedHandlers.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/participant/CreateParticipantInternal.cpp b/SilKit/source/core/participant/CreateParticipantInternal.cpp
index 345a27329..bcb978852 100644
--- a/SilKit/source/core/participant/CreateParticipantInternal.cpp
+++ b/SilKit/source/core/participant/CreateParticipantInternal.cpp
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "CreateParticipantInternal.hpp"
+#include "core/participant/CreateParticipantInternal.hpp"
 
-#include "CreateParticipantT.hpp"
+#include "core/participant/CreateParticipantT.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/participant/CreateParticipantInternal.hpp b/SilKit/source/core/participant/CreateParticipantInternal.hpp
index a8ac476df..acca0b5ea 100644
--- a/SilKit/source/core/participant/CreateParticipantInternal.hpp
+++ b/SilKit/source/core/participant/CreateParticipantInternal.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "IParticipantInternal.hpp"
-#include "ParticipantConfiguration.hpp"
+#include "core/internal/IParticipantInternal.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/participant/CreateParticipantT.cpp b/SilKit/source/core/participant/CreateParticipantT.cpp
index 0d59ce264..acb3313a2 100644
--- a/SilKit/source/core/participant/CreateParticipantT.cpp
+++ b/SilKit/source/core/participant/CreateParticipantT.cpp
@@ -2,4 +2,4 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "CreateParticipantT.hpp"
+#include "core/participant/CreateParticipantT.hpp"
diff --git a/SilKit/source/core/participant/CreateParticipantT.hpp b/SilKit/source/core/participant/CreateParticipantT.hpp
index 44ca6ac84..80f50652b 100644
--- a/SilKit/source/core/participant/CreateParticipantT.hpp
+++ b/SilKit/source/core/participant/CreateParticipantT.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "ValidateAndSanitizeConfig.hpp"
-#include "Participant.hpp"
+#include "core/participant/ValidateAndSanitizeConfig.hpp"
+#include "core/participant/Participant.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/participant/Participant.cpp b/SilKit/source/core/participant/Participant.cpp
index 3249aa645..fcb6b0d9f 100644
--- a/SilKit/source/core/participant/Participant.cpp
+++ b/SilKit/source/core/participant/Participant.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "Participant.hpp"
-#include "Participant_impl.hpp"
+#include "core/participant/Participant.hpp"
+#include "core/participant/Participant_impl.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/participant/Participant.hpp b/SilKit/source/core/participant/Participant.hpp
index 8f864b597..7cdd5181d 100644
--- a/SilKit/source/core/participant/Participant.hpp
+++ b/SilKit/source/core/participant/Participant.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "IParticipantInternal.hpp"
+#include "core/internal/IParticipantInternal.hpp"
 
 #include <map>
 #include <memory>
@@ -16,64 +16,64 @@
 #include "silkit/services/all.hpp"
 #include "silkit/services/logging/ILogger.hpp"
 
-#include "ParticipantConfiguration.hpp"
-#include "ReplayScheduler.hpp"
-#include "Metrics.hpp"
-#include "MetricsProcessor.hpp"
-#include "IMetricsTimerThread.hpp"
+#include "config/ParticipantConfiguration.hpp"
+#include "tracing/ReplayScheduler.hpp"
+#include "services/metrics/Metrics.hpp"
+#include "services/metrics/MetricsProcessor.hpp"
+#include "services/metrics/IMetricsTimerThread.hpp"
 
 // Interfaces relying on I_SilKit_Core_Internal
-#include "IMsgForLogMsgSender.hpp"
-#include "IMsgForLogMsgReceiver.hpp"
+#include "services/logging/IMsgForLogMsgSender.hpp"
+#include "services/logging/IMsgForLogMsgReceiver.hpp"
 
-#include "IMsgForCanSimulator.hpp"
-#include "IMsgForCanController.hpp"
+#include "services/can/IMsgForCanSimulator.hpp"
+#include "services/can/IMsgForCanController.hpp"
 
-#include "IMsgForEthSimulator.hpp"
-#include "IMsgForEthController.hpp"
+#include "services/ethernet/IMsgForEthSimulator.hpp"
+#include "services/ethernet/IMsgForEthController.hpp"
 
-#include "IMsgForLinSimulator.hpp"
-#include "IMsgForLinController.hpp"
+#include "services/lin/IMsgForLinSimulator.hpp"
+#include "services/lin/IMsgForLinController.hpp"
 
-#include "IMsgForFlexrayBusSimulator.hpp"
-#include "IMsgForFlexrayController.hpp"
+#include "services/flexray/IMsgForFlexrayBusSimulator.hpp"
+#include "services/flexray/IMsgForFlexrayController.hpp"
 
-#include "IMsgForDataPublisher.hpp"
-#include "IMsgForDataSubscriber.hpp"
-#include "IMsgForDataSubscriberInternal.hpp"
+#include "services/pubsub/IMsgForDataPublisher.hpp"
+#include "services/pubsub/IMsgForDataSubscriber.hpp"
+#include "services/pubsub/IMsgForDataSubscriberInternal.hpp"
 
-#include "IMsgForRpcServer.hpp"
-#include "IMsgForRpcServerInternal.hpp"
-#include "IMsgForRpcClient.hpp"
+#include "services/rpc/IMsgForRpcServer.hpp"
+#include "services/rpc/IMsgForRpcServerInternal.hpp"
+#include "services/rpc/IMsgForRpcClient.hpp"
 
-#include "IMsgForSystemMonitor.hpp"
-#include "IMsgForSystemController.hpp"
-#include "IMsgForLifecycleService.hpp"
-#include "IMsgForTimeSyncService.hpp"
+#include "services/orchestration/IMsgForSystemMonitor.hpp"
+#include "services/orchestration/IMsgForSystemController.hpp"
+#include "services/orchestration/IMsgForLifecycleService.hpp"
+#include "services/orchestration/IMsgForTimeSyncService.hpp"
 
-#include "IMsgForMetricsReceiver.hpp"
-#include "IMsgForMetricsSender.hpp"
+#include "services/metrics/IMsgForMetricsReceiver.hpp"
+#include "services/metrics/IMsgForMetricsSender.hpp"
 
-#include "ITraceMessageSink.hpp"
-#include "ITraceMessageSource.hpp"
+#include "tracing/ITraceMessageSink.hpp"
+#include "tracing/ITraceMessageSource.hpp"
 
 // core/service
-#include "ServiceDiscovery.hpp"
+#include "core/service/ServiceDiscovery.hpp"
 
 // core/requests
-#include "RequestReplyService.hpp"
-#include "procs/ParticipantReplies.hpp"
+#include "core/requests/RequestReplyService.hpp"
+#include "core/requests/procs/ParticipantReplies.hpp"
 
-#include "ProtocolVersion.hpp"
-#include "TimeProvider.hpp"
+#include "core/internal/ProtocolVersion.hpp"
+#include "services/orchestration/TimeProvider.hpp"
 
 // Add connection types here and make sure they are instantiated in Participant.cpp
-#include "VAsioConnection.hpp"
+#include "core/vasio/VAsioConnection.hpp"
 
 // utilities for CreateController
-#include "traits/SilKitServiceConfigTraits.hpp"
+#include "core/internal/traits/SilKitServiceConfigTraits.hpp"
 
-#include "NetworkSimulatorInternal.hpp"
+#include "experimental/netsim/NetworkSimulatorInternal.hpp"
 
 using namespace std::chrono_literals;
 
diff --git a/SilKit/source/core/participant/Participant_impl.hpp b/SilKit/source/core/participant/Participant_impl.hpp
index 62c85111a..e018e8741 100644
--- a/SilKit/source/core/participant/Participant_impl.hpp
+++ b/SilKit/source/core/participant/Participant_impl.hpp
@@ -7,52 +7,52 @@
 #include <chrono>
 #include <string>
 
-#include "CanController.hpp"
-#include "EthController.hpp"
-#include "FlexrayController.hpp"
-#include "LinController.hpp"
-#include "DataPublisher.hpp"
-#include "DataSubscriber.hpp"
-#include "DataSubscriberInternal.hpp"
-#include "RpcClient.hpp"
-#include "RpcServer.hpp"
-#include "RpcServerInternal.hpp"
-#include "NetworkSimulatorDatatypesInternal.hpp"
+#include "services/can/CanController.hpp"
+#include "services/ethernet/EthController.hpp"
+#include "services/flexray/FlexrayController.hpp"
+#include "services/lin/LinController.hpp"
+#include "services/pubsub/DataPublisher.hpp"
+#include "services/pubsub/DataSubscriber.hpp"
+#include "services/pubsub/DataSubscriberInternal.hpp"
+#include "services/rpc/RpcClient.hpp"
+#include "services/rpc/RpcServer.hpp"
+#include "services/rpc/RpcServerInternal.hpp"
+#include "experimental/netsim/NetworkSimulatorDatatypesInternal.hpp"
 #include "silkit/experimental/netsim/string_utils.hpp"
 
-#include "LifecycleService.hpp"
-#include "SystemController.hpp"
-#include "SystemMonitor.hpp"
-#include "LogMsgSender.hpp"
-#include "LogMsgReceiver.hpp"
-#include "LoggerMessage.hpp"
-#include "StructuredLoggingKeys.hpp"
-#include "TimeProvider.hpp"
-#include "TimeSyncService.hpp"
-#include "ServiceDiscovery.hpp"
-#include "RequestReplyService.hpp"
-#include "ParticipantConfiguration.hpp"
-#include "YamlParser.hpp"
-#include "NetworkSimulatorInternal.hpp"
-
-#include "MetricsManager.hpp"
-#include "MetricsSender.hpp"
-#include "MetricsTimerThread.hpp"
-#include "CreateMetricsSinksFromParticipantConfiguration.hpp"
-
-#include "tuple_tools/bind.hpp"
-#include "tuple_tools/for_each.hpp"
-#include "tuple_tools/predicative_get.hpp"
+#include "services/orchestration/LifecycleService.hpp"
+#include "services/orchestration/SystemController.hpp"
+#include "services/orchestration/SystemMonitor.hpp"
+#include "services/logging/LogMsgSender.hpp"
+#include "services/logging/LogMsgReceiver.hpp"
+#include "services/logging/LoggerMessage.hpp"
+#include "services/logging/StructuredLoggingKeys.hpp"
+#include "services/orchestration/TimeProvider.hpp"
+#include "services/orchestration/TimeSyncService.hpp"
+#include "core/service/ServiceDiscovery.hpp"
+#include "core/requests/RequestReplyService.hpp"
+#include "config/ParticipantConfiguration.hpp"
+#include "config/YamlParser.hpp"
+#include "experimental/netsim/NetworkSimulatorInternal.hpp"
+
+#include "services/metrics/MetricsManager.hpp"
+#include "services/metrics/MetricsSender.hpp"
+#include "services/metrics/MetricsTimerThread.hpp"
+#include "services/metrics/CreateMetricsSinksFromParticipantConfiguration.hpp"
+
+#include "util/tuple_tools/bind.hpp"
+#include "util/tuple_tools/for_each.hpp"
+#include "util/tuple_tools/predicative_get.hpp"
 
 #include "SilKitVersionImpl.hpp"
 
-#include "Participant.hpp"
+#include "core/participant/Participant.hpp"
 
-#include "Tracing.hpp"
-#include "MessageTracing.hpp"
-#include "Uuid.hpp"
-#include "Assert.hpp"
-#include "ExecutionEnvironment.hpp"
+#include "tracing/Tracing.hpp"
+#include "services/logging/MessageTracing.hpp"
+#include "util/Uuid.hpp"
+#include "util/Assert.hpp"
+#include "util/ExecutionEnvironment.hpp"
 
 #include "fmt/ranges.h"
 
diff --git a/SilKit/source/core/participant/Test_Participant.cpp b/SilKit/source/core/participant/Test_Participant.cpp
index 6f329d08c..1d4b6abca 100644
--- a/SilKit/source/core/participant/Test_Participant.cpp
+++ b/SilKit/source/core/participant/Test_Participant.cpp
@@ -8,10 +8,10 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include "NullConnectionParticipant.hpp"
-#include "CanController.hpp"
-#include "ConfigurationTestUtils.hpp"
-#include "ParticipantConfiguration.hpp"
+#include "core/mock/nullconnection/NullConnectionParticipant.hpp"
+#include "services/can/CanController.hpp"
+#include "config/ConfigurationTestUtils.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 namespace {
 
diff --git a/SilKit/source/core/participant/Test_ValidateAndSanitizeConfig.cpp b/SilKit/source/core/participant/Test_ValidateAndSanitizeConfig.cpp
index 24f2d6742..34e64edc4 100644
--- a/SilKit/source/core/participant/Test_ValidateAndSanitizeConfig.cpp
+++ b/SilKit/source/core/participant/Test_ValidateAndSanitizeConfig.cpp
@@ -5,8 +5,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include "ValidateAndSanitizeConfig.hpp"
-#include "ParticipantConfiguration.hpp"
+#include "core/participant/ValidateAndSanitizeConfig.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 namespace {
 
diff --git a/SilKit/source/core/participant/ValidateAndSanitizeConfig.cpp b/SilKit/source/core/participant/ValidateAndSanitizeConfig.cpp
index 3a4d9ecc6..b2db86c44 100644
--- a/SilKit/source/core/participant/ValidateAndSanitizeConfig.cpp
+++ b/SilKit/source/core/participant/ValidateAndSanitizeConfig.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ValidateAndSanitizeConfig.hpp"
-#include "Assert.hpp"
+#include "core/participant/ValidateAndSanitizeConfig.hpp"
+#include "util/Assert.hpp"
 
 #include <fmt/format.h>
 
diff --git a/SilKit/source/core/participant/ValidateAndSanitizeConfig.hpp b/SilKit/source/core/participant/ValidateAndSanitizeConfig.hpp
index 47737160e..47e08acb2 100644
--- a/SilKit/source/core/participant/ValidateAndSanitizeConfig.hpp
+++ b/SilKit/source/core/participant/ValidateAndSanitizeConfig.hpp
@@ -12,7 +12,7 @@
 #include "silkit/config/IParticipantConfiguration.hpp"
 #include "silkit/services/logging/LoggingDatatypes.hpp"
 
-#include "ParticipantConfiguration.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/requests/IRequestReplyProcedure.hpp b/SilKit/source/core/requests/IRequestReplyProcedure.hpp
index 4f8012182..428015f34 100644
--- a/SilKit/source/core/requests/IRequestReplyProcedure.hpp
+++ b/SilKit/source/core/requests/IRequestReplyProcedure.hpp
@@ -7,7 +7,7 @@
 #include <functional>
 #include <vector>
 
-#include "RequestReplyDatatypes.hpp"
+#include "core/requests/RequestReplyDatatypes.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/requests/IRequestReplyService.hpp b/SilKit/source/core/requests/IRequestReplyService.hpp
index 75a24e12a..ff77e1d12 100644
--- a/SilKit/source/core/requests/IRequestReplyService.hpp
+++ b/SilKit/source/core/requests/IRequestReplyService.hpp
@@ -7,7 +7,7 @@
 #include <functional>
 #include <vector>
 
-#include "RequestReplyDatatypes.hpp"
+#include "core/requests/RequestReplyDatatypes.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/requests/RequestReplyDatatypes.hpp b/SilKit/source/core/requests/RequestReplyDatatypes.hpp
index 2d591cf2f..a0b517080 100644
--- a/SilKit/source/core/requests/RequestReplyDatatypes.hpp
+++ b/SilKit/source/core/requests/RequestReplyDatatypes.hpp
@@ -8,8 +8,8 @@
 #include <map>
 #include <sstream>
 
-#include "Uuid.hpp"
-#include "IServiceEndpoint.hpp"
+#include "util/Uuid.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
 #include "silkit/util/PrintableHexString.hpp"
 
 namespace SilKit {
diff --git a/SilKit/source/core/requests/RequestReplySerdes.cpp b/SilKit/source/core/requests/RequestReplySerdes.cpp
index 3386c1d86..cb8299d27 100644
--- a/SilKit/source/core/requests/RequestReplySerdes.cpp
+++ b/SilKit/source/core/requests/RequestReplySerdes.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "RequestReplySerdes.hpp"
+#include "core/requests/RequestReplySerdes.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/requests/RequestReplySerdes.hpp b/SilKit/source/core/requests/RequestReplySerdes.hpp
index efb84effd..f77395aea 100644
--- a/SilKit/source/core/requests/RequestReplySerdes.hpp
+++ b/SilKit/source/core/requests/RequestReplySerdes.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "MessageBuffer.hpp"
-#include "RequestReplyDatatypes.hpp"
+#include "core/internal/MessageBuffer.hpp"
+#include "core/requests/RequestReplyDatatypes.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/requests/RequestReplyService.cpp b/SilKit/source/core/requests/RequestReplyService.cpp
index 22518dffa..36c5c4d9b 100644
--- a/SilKit/source/core/requests/RequestReplyService.cpp
+++ b/SilKit/source/core/requests/RequestReplyService.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "RequestReplyService.hpp"
+#include "core/requests/RequestReplyService.hpp"
 
 #include "silkit/participant/exception.hpp"
 
diff --git a/SilKit/source/core/requests/RequestReplyService.hpp b/SilKit/source/core/requests/RequestReplyService.hpp
index 90eb6f1f6..d2610451b 100644
--- a/SilKit/source/core/requests/RequestReplyService.hpp
+++ b/SilKit/source/core/requests/RequestReplyService.hpp
@@ -12,14 +12,14 @@
 #include <unordered_set>
 #include <future>
 
-#include "IParticipantInternal.hpp"
-#include "IServiceEndpoint.hpp"
-#include "IReceiver.hpp"
-#include "ISender.hpp"
-#include "IRequestReplyService.hpp"
-#include "IRequestReplyProcedure.hpp"
-
-#include "Uuid.hpp"
+#include "core/internal/IParticipantInternal.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
+#include "core/internal/IReceiver.hpp"
+#include "core/internal/ISender.hpp"
+#include "core/requests/IRequestReplyService.hpp"
+#include "core/requests/IRequestReplyProcedure.hpp"
+
+#include "util/Uuid.hpp"
 #include "procs/ParticipantReplies.hpp"
 
 namespace SilKit {
diff --git a/SilKit/source/core/requests/Test_RequestReplyService.cpp b/SilKit/source/core/requests/Test_RequestReplyService.cpp
index 9848f4edc..6ff0dc6ed 100644
--- a/SilKit/source/core/requests/Test_RequestReplyService.cpp
+++ b/SilKit/source/core/requests/Test_RequestReplyService.cpp
@@ -10,11 +10,11 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
-#include "RequestReplyService.hpp"
-#include "string_utils_internal.hpp"
-#include "Uuid.hpp"
-#include "MockParticipant.hpp"
-#include "MockServiceEndpoint.hpp"
+#include "core/requests/RequestReplyService.hpp"
+#include "core/internal/string_utils_internal.hpp"
+#include "util/Uuid.hpp"
+#include "core/mock/participant/MockParticipant.hpp"
+#include "core/service/MockServiceEndpoint.hpp"
 
 namespace {
 
diff --git a/SilKit/source/core/requests/procs/ParticipantReplies.cpp b/SilKit/source/core/requests/procs/ParticipantReplies.cpp
index 79e311411..476c2eb0a 100644
--- a/SilKit/source/core/requests/procs/ParticipantReplies.cpp
+++ b/SilKit/source/core/requests/procs/ParticipantReplies.cpp
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ParticipantReplies.hpp"
+#include "core/requests/procs/ParticipantReplies.hpp"
 
 #include "silkit/participant/exception.hpp"
-#include "LoggerMessage.hpp"
+#include "services/logging/LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/requests/procs/ParticipantReplies.hpp b/SilKit/source/core/requests/procs/ParticipantReplies.hpp
index 7fd1d5ce7..b1097bce3 100644
--- a/SilKit/source/core/requests/procs/ParticipantReplies.hpp
+++ b/SilKit/source/core/requests/procs/ParticipantReplies.hpp
@@ -9,12 +9,12 @@
 #include <functional>
 #include <set>
 
-#include "IParticipantReplies.hpp"
-#include "IParticipantInternal.hpp"
-#include "IRequestReplyService.hpp"
-#include "IRequestReplyProcedure.hpp"
+#include "core/requests/procs/IParticipantReplies.hpp"
+#include "core/internal/IParticipantInternal.hpp"
+#include "core/requests/IRequestReplyService.hpp"
+#include "core/requests/IRequestReplyProcedure.hpp"
 
-#include "Uuid.hpp"
+#include "util/Uuid.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/IServiceDiscovery.hpp b/SilKit/source/core/service/IServiceDiscovery.hpp
index 763d00e7d..686817a46 100644
--- a/SilKit/source/core/service/IServiceDiscovery.hpp
+++ b/SilKit/source/core/service/IServiceDiscovery.hpp
@@ -7,7 +7,7 @@
 #include <functional>
 #include <vector>
 
-#include "ServiceDatatypes.hpp"
+#include "core/service/ServiceDatatypes.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/MockServiceEndpoint.hpp b/SilKit/source/core/service/MockServiceEndpoint.hpp
index 47ea43b9f..d3b210b41 100644
--- a/SilKit/source/core/service/MockServiceEndpoint.hpp
+++ b/SilKit/source/core/service/MockServiceEndpoint.hpp
@@ -9,8 +9,8 @@
 
 #include "gmock/gmock.h"
 
-#include "IServiceEndpoint.hpp"
-#include "ServiceDiscovery.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
+#include "core/service/ServiceDiscovery.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/ServiceDatatypes.hpp b/SilKit/source/core/service/ServiceDatatypes.hpp
index f970a6271..d75f871c0 100644
--- a/SilKit/source/core/service/ServiceDatatypes.hpp
+++ b/SilKit/source/core/service/ServiceDatatypes.hpp
@@ -8,7 +8,7 @@
 #include <map>
 #include <sstream>
 
-#include "IServiceEndpoint.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/ServiceDiscovery.cpp b/SilKit/source/core/service/ServiceDiscovery.cpp
index 8e897c799..83a6fb2a0 100644
--- a/SilKit/source/core/service/ServiceDiscovery.cpp
+++ b/SilKit/source/core/service/ServiceDiscovery.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ServiceDiscovery.hpp"
+#include "core/service/ServiceDiscovery.hpp"
 #include "silkit/services/logging/ILogger.hpp"
 
 namespace SilKit {
diff --git a/SilKit/source/core/service/ServiceDiscovery.hpp b/SilKit/source/core/service/ServiceDiscovery.hpp
index 436db191d..49c04bd06 100644
--- a/SilKit/source/core/service/ServiceDiscovery.hpp
+++ b/SilKit/source/core/service/ServiceDiscovery.hpp
@@ -11,13 +11,13 @@
 #include <atomic>
 #include <unordered_set>
 
-#include "SpecificDiscoveryStore.hpp"
+#include "core/service/SpecificDiscoveryStore.hpp"
 
-#include "IParticipantInternal.hpp"
-#include "IServiceEndpoint.hpp"
-#include "IReceiver.hpp"
-#include "ISender.hpp"
-#include "IServiceDiscovery.hpp"
+#include "core/internal/IParticipantInternal.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
+#include "core/internal/IReceiver.hpp"
+#include "core/internal/ISender.hpp"
+#include "core/service/IServiceDiscovery.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/ServiceSerdes.cpp b/SilKit/source/core/service/ServiceSerdes.cpp
index 01e307191..94ece9c67 100644
--- a/SilKit/source/core/service/ServiceSerdes.cpp
+++ b/SilKit/source/core/service/ServiceSerdes.cpp
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ServiceSerdes.hpp"
-#include "InternalSerdes.hpp"
-#include "ServiceDescriptor.hpp"
+#include "core/service/ServiceSerdes.hpp"
+#include "core/internal/InternalSerdes.hpp"
+#include "core/internal/ServiceDescriptor.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/ServiceSerdes.hpp b/SilKit/source/core/service/ServiceSerdes.hpp
index e99c42809..c5ff3176a 100644
--- a/SilKit/source/core/service/ServiceSerdes.hpp
+++ b/SilKit/source/core/service/ServiceSerdes.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "MessageBuffer.hpp"
-#include "ServiceDescriptor.hpp"
-#include "ServiceDatatypes.hpp"
+#include "core/internal/MessageBuffer.hpp"
+#include "core/internal/ServiceDescriptor.hpp"
+#include "core/service/ServiceDatatypes.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/SpecificDiscoveryStore.cpp b/SilKit/source/core/service/SpecificDiscoveryStore.cpp
index 8281b27bf..5d8429746 100644
--- a/SilKit/source/core/service/SpecificDiscoveryStore.cpp
+++ b/SilKit/source/core/service/SpecificDiscoveryStore.cpp
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "SpecificDiscoveryStore.hpp"
-#include "LabelMatching.hpp"
-#include "YamlParser.hpp"
+#include "core/service/SpecificDiscoveryStore.hpp"
+#include "util/LabelMatching.hpp"
+#include "config/YamlParser.hpp"
 
 namespace {
 inline auto MakeFilter(const std::string& type,
diff --git a/SilKit/source/core/service/SpecificDiscoveryStore.hpp b/SilKit/source/core/service/SpecificDiscoveryStore.hpp
index b317d980d..6230107b8 100644
--- a/SilKit/source/core/service/SpecificDiscoveryStore.hpp
+++ b/SilKit/source/core/service/SpecificDiscoveryStore.hpp
@@ -12,8 +12,8 @@
 #include <map>
 #include <unordered_set>
 
-#include "IServiceDiscovery.hpp"
-#include "Hash.hpp"
+#include "core/service/IServiceDiscovery.hpp"
+#include "util/Hash.hpp"
 
 namespace SilKit {
 namespace Core {
diff --git a/SilKit/source/core/service/Test_ServiceDiscovery.cpp b/SilKit/source/core/service/Test_ServiceDiscovery.cpp
index 693094356..0799ad3bf 100644
--- a/SilKit/source/core/service/Test_ServiceDiscovery.cpp
+++ b/SilKit/source/core/service/Test_ServiceDiscovery.cpp
@@ -10,11 +10,11 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
-#include "ServiceDiscovery.hpp"
-#include "string_utils_internal.hpp"
-#include "Uuid.hpp"
-#include "MockParticipant.hpp"
-#include "MockServiceEndpoint.hpp"
+#include "core/service/ServiceDiscovery.hpp"
+#include "core/internal/string_utils_internal.hpp"
+#include "util/Uuid.hpp"
+#include "core/mock/participant/MockParticipant.hpp"
+#include "core/service/MockServiceEndpoint.hpp"
 
 namespace {
 
diff --git a/SilKit/source/core/service/Test_ServiceSerdes.cpp b/SilKit/source/core/service/Test_ServiceSerdes.cpp
index c1b564d69..d402ba412 100644
--- a/SilKit/source/core/service/Test_ServiceSerdes.cpp
+++ b/SilKit/source/core/service/Test_ServiceSerdes.cpp
@@ -4,7 +4,7 @@
 
 #include "gtest/gtest.h"
 
-#include "ServiceSerdes.hpp"
+#include "core/service/ServiceSerdes.hpp"
 
 TEST(Test_ServiceSerdes, Mw_Service)
 {
diff --git a/SilKit/source/core/service/Test_SpecificDiscoveryStore.cpp b/SilKit/source/core/service/Test_SpecificDiscoveryStore.cpp
index 9eec69aae..3e445d2b1 100644
--- a/SilKit/source/core/service/Test_SpecificDiscoveryStore.cpp
+++ b/SilKit/source/core/service/Test_SpecificDiscoveryStore.cpp
@@ -9,13 +9,13 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
-#include "ServiceDiscovery.hpp"
-#include "string_utils_internal.hpp"
-#include "Uuid.hpp"
-#include "LabelMatching.hpp"
-#include "MockParticipant.hpp"
-#include "MockServiceEndpoint.hpp"
-#include "YamlParser.hpp"
+#include "core/service/ServiceDiscovery.hpp"
+#include "core/internal/string_utils_internal.hpp"
+#include "util/Uuid.hpp"
+#include "util/LabelMatching.hpp"
+#include "core/mock/participant/MockParticipant.hpp"
+#include "core/service/MockServiceEndpoint.hpp"
+#include "config/YamlParser.hpp"
 
 namespace {