diff --git a/SilKit/source/capi/CapiLin.cpp b/SilKit/source/capi/CapiLin.cpp
index 510690246..76abf9bd6 100644
--- a/SilKit/source/capi/CapiLin.cpp
+++ b/SilKit/source/capi/CapiLin.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "services/lin/LinControllerExtensionsImpl.hpp"
+#include "experimental/services/lin/LinControllerExtensionsImpl.hpp"
 
 #include "silkit/capi/SilKit.h"
 #include "silkit/SilKit.hpp"
diff --git a/SilKit/source/capi/CapiNetworkSimulator.cpp b/SilKit/source/capi/CapiNetworkSimulator.cpp
index fb059dd3d..e431876df 100644
--- a/SilKit/source/capi/CapiNetworkSimulator.cpp
+++ b/SilKit/source/capi/CapiNetworkSimulator.cpp
@@ -16,7 +16,7 @@
 #include "silkit/experimental/netsim/all.hpp"
 
 #include "silkit/detail/impl/HourglassConversions.hpp"
-#include "participant/ParticipantExtensionsImpl.hpp"
+#include "experimental/participant/ParticipantExtensionsImpl.hpp"
 
 namespace SilKit {
 namespace Experimental {
diff --git a/SilKit/source/capi/CapiOrchestration.cpp b/SilKit/source/capi/CapiOrchestration.cpp
index 2b1ba9d15..5e0f642df 100644
--- a/SilKit/source/capi/CapiOrchestration.cpp
+++ b/SilKit/source/capi/CapiOrchestration.cpp
@@ -7,12 +7,12 @@
 #include "silkit/services/orchestration/all.hpp"
 #include "silkit/participant/exception.hpp"
 
-#include "participant/ParticipantExtensionsImpl.hpp"
+#include "experimental/participant/ParticipantExtensionsImpl.hpp"
 
 #include "capi/CapiImpl.hpp"
 #include "capi/TypeConversion.hpp"
 
-#include "services/orchestration/TimeSyncServiceExtensionsImpl.hpp"
+#include "experimental/services/orchestration/TimeSyncServiceExtensionsImpl.hpp"
 
 #include <memory>
 #include <map>
diff --git a/SilKit/source/capi/Test_CapiLogger.cpp b/SilKit/source/capi/Test_CapiLogger.cpp
index e4f608349..cfb09aefe 100644
--- a/SilKit/source/capi/Test_CapiLogger.cpp
+++ b/SilKit/source/capi/Test_CapiLogger.cpp
@@ -6,8 +6,8 @@
 #include "gmock/gmock.h"
 #include "silkit/capi/SilKit.h"
 #include "silkit/services/logging/all.hpp"
-#include "LoggingTopics.hpp"
-#include "MockLogger.hpp"
+#include "core/internal/LoggingTopics.hpp"
+#include "services/logging/MockLogger.hpp"
 
 namespace {
 using namespace SilKit::Services::Logging;
diff --git a/SilKit/source/config/Configuration.hpp b/SilKit/source/config/Configuration.hpp
index 266c9c9b4..19be7f3da 100644
--- a/SilKit/source/config/Configuration.hpp
+++ b/SilKit/source/config/Configuration.hpp
@@ -18,7 +18,7 @@
 #include "silkit/SilKitMacros.hpp"
 
 #include "silkit/services/logging/LoggingDatatypes.hpp"
-#include "LoggingTopics.hpp"
+#include "core/internal/LoggingTopics.hpp"
 
 #include "util/StringHelpers.hpp"
 
diff --git a/SilKit/source/extensions/SilKitExtensionImpl/CreateMdf4Tracing.hpp b/SilKit/source/extensions/SilKitExtensionImpl/CreateMdf4Tracing.hpp
index e4ab05345..31f0b4b88 100644
--- a/SilKit/source/extensions/SilKitExtensionImpl/CreateMdf4Tracing.hpp
+++ b/SilKit/source/extensions/SilKitExtensionImpl/CreateMdf4Tracing.hpp
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "ILoggerInternal.hpp"
+#include "services/logging/ILoggerInternal.hpp"
 
 #include "tracing/ITraceMessageSink.hpp"
 #include "tracing/IReplay.hpp"
diff --git a/SilKit/source/services/can/SimBehaviorTrivial.cpp b/SilKit/source/services/can/SimBehaviorTrivial.cpp
index 7182ec099..a3b89bad0 100644
--- a/SilKit/source/services/can/SimBehaviorTrivial.cpp
+++ b/SilKit/source/services/can/SimBehaviorTrivial.cpp
@@ -6,7 +6,7 @@
 #include "services/can/SimBehaviorTrivial.hpp"
 #include "util/Assert.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "services/logging/ILoggerInternal.hpp"
 
 
 namespace SilKit {
diff --git a/SilKit/source/services/logging/ILoggerInternal.hpp b/SilKit/source/services/logging/ILoggerInternal.hpp
index eec9d4d42..e0c3ff89b 100644
--- a/SilKit/source/services/logging/ILoggerInternal.hpp
+++ b/SilKit/source/services/logging/ILoggerInternal.hpp
@@ -11,7 +11,7 @@
 #include "services/logging/StructuredLoggingKeys.hpp"
 #include "services/logging/SilKitFmtFormatters.hpp"
 #include "fmt/format.h"
-#include "traits/SilKitLoggingTraits.hpp"
+#include "core/internal/traits/SilKitLoggingTraits.hpp"
 
 namespace SilKit {
 namespace Services {
diff --git a/SilKit/source/services/logging/MessageTracing.hpp b/SilKit/source/services/logging/MessageTracing.hpp
index f2ffb7aaa..c5a0604db 100644
--- a/SilKit/source/services/logging/MessageTracing.hpp
+++ b/SilKit/source/services/logging/MessageTracing.hpp
@@ -7,8 +7,8 @@
 #include "services/logging/LoggerMessage.hpp"
 #include "core/internal/IServiceEndpoint.hpp"
 #include "core/internal/ServiceDescriptor.hpp"
-#include "traits/SilKitMsgTraits.hpp"
-#include "traits/SilKitLoggingTraits.hpp"
+#include "core/internal/traits/SilKitMsgTraits.hpp"
+#include "core/internal/traits/SilKitLoggingTraits.hpp"
 
 #include "config/YamlParser.hpp"
 
diff --git a/SilKit/source/services/metrics/MetricsProcessor.hpp b/SilKit/source/services/metrics/MetricsProcessor.hpp
index 525f4374c..a393eef71 100644
--- a/SilKit/source/services/metrics/MetricsProcessor.hpp
+++ b/SilKit/source/services/metrics/MetricsProcessor.hpp
@@ -8,7 +8,7 @@
 #include "services/metrics/MetricsDatatypes.hpp"
 #include "services/metrics/MetricsReceiver.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "services/logging/ILoggerInternal.hpp"
 
 #include <atomic>
 #include <memory>
diff --git a/SilKit/source/services/orchestration/LifecycleStates.cpp b/SilKit/source/services/orchestration/LifecycleStates.cpp
index 36636cf93..c6c001096 100644
--- a/SilKit/source/services/orchestration/LifecycleStates.cpp
+++ b/SilKit/source/services/orchestration/LifecycleStates.cpp
@@ -9,7 +9,7 @@
 #include "services/orchestration/LifecycleService.hpp"
 #include "services/orchestration/LifecycleManagement.hpp"
 #include "core/requests/IRequestReplyService.hpp"
-#include "procs/IParticipantReplies.hpp"
+#include "core/requests/procs/IParticipantReplies.hpp"
 
 namespace SilKit {
 namespace Services {
diff --git a/SilKit/source/tracing/ITraceMessageSink.hpp b/SilKit/source/tracing/ITraceMessageSink.hpp
index 413116fcb..a0aaea57d 100644
--- a/SilKit/source/tracing/ITraceMessageSink.hpp
+++ b/SilKit/source/tracing/ITraceMessageSink.hpp
@@ -9,7 +9,7 @@
 #include <chrono>
 #include <tuple>
 
-#include "ILoggerInternal.hpp"
+#include "services/logging/ILoggerInternal.hpp"
 
 #include "core/internal/ServiceDescriptor.hpp"
 #include "tracing/TraceMessage.hpp"
diff --git a/SilKit/source/tracing/PcapSink.hpp b/SilKit/source/tracing/PcapSink.hpp
index c8cd37556..030e8d0dc 100755
--- a/SilKit/source/tracing/PcapSink.hpp
+++ b/SilKit/source/tracing/PcapSink.hpp
@@ -12,7 +12,7 @@
 
 #include "core/internal/EndpointAddress.hpp"
 #include "detail/NamedPipe.hpp"
-#include "ILoggerInternal.hpp"
+#include "services/logging/ILoggerInternal.hpp"
 
 namespace SilKit {
 namespace Tracing {
diff --git a/SilKit/source/wire/can/WireCanMessages.hpp b/SilKit/source/wire/can/WireCanMessages.hpp
index d23c60f89..65db6182d 100644
--- a/SilKit/source/wire/can/WireCanMessages.hpp
+++ b/SilKit/source/wire/can/WireCanMessages.hpp
@@ -7,7 +7,7 @@
 #include "silkit/services/can/CanDatatypes.hpp"
 #include "silkit/services/can/string_utils.hpp"
 
-#include "SharedVector.hpp"
+#include "wire/util/SharedVector.hpp"
 
 #include <chrono>
 #include <vector>
diff --git a/SilKit/source/wire/ethernet/WireEthernetMessages.hpp b/SilKit/source/wire/ethernet/WireEthernetMessages.hpp
index 96384cf31..ed1f71465 100644
--- a/SilKit/source/wire/ethernet/WireEthernetMessages.hpp
+++ b/SilKit/source/wire/ethernet/WireEthernetMessages.hpp
@@ -7,7 +7,7 @@
 #include "silkit/services/ethernet/EthernetDatatypes.hpp"
 #include "silkit/services/ethernet/string_utils.hpp"
 
-#include "SharedVector.hpp"
+#include "wire/util/SharedVector.hpp"
 
 #include <chrono>
 #include <vector>
diff --git a/SilKit/source/wire/flexray/WireFlexrayMessages.hpp b/SilKit/source/wire/flexray/WireFlexrayMessages.hpp
index 80a3e7d1e..ad4463052 100644
--- a/SilKit/source/wire/flexray/WireFlexrayMessages.hpp
+++ b/SilKit/source/wire/flexray/WireFlexrayMessages.hpp
@@ -7,7 +7,7 @@
 #include "silkit/services/flexray/FlexrayDatatypes.hpp"
 #include "silkit/services/flexray/string_utils.hpp"
 
-#include "SharedVector.hpp"
+#include "wire/util/SharedVector.hpp"
 
 #include <chrono>
 #include <vector>
diff --git a/SilKit/source/wire/lin/WireLinMessages.hpp b/SilKit/source/wire/lin/WireLinMessages.hpp
index 7469d5fed..2a93c070f 100644
--- a/SilKit/source/wire/lin/WireLinMessages.hpp
+++ b/SilKit/source/wire/lin/WireLinMessages.hpp
@@ -8,7 +8,7 @@
 #include "silkit/services/lin/string_utils.hpp"
 #include "silkit/experimental/services/lin/LinDatatypesExtensions.hpp"
 
-#include "SharedVector.hpp"
+#include "wire/util/SharedVector.hpp"
 
 #include <chrono>
 #include <vector>
diff --git a/SilKit/source/wire/pubsub/WireDataMessages.hpp b/SilKit/source/wire/pubsub/WireDataMessages.hpp
index b92f08a61..be1e77b73 100644
--- a/SilKit/source/wire/pubsub/WireDataMessages.hpp
+++ b/SilKit/source/wire/pubsub/WireDataMessages.hpp
@@ -7,7 +7,7 @@
 #include "silkit/services/pubsub/PubSubDatatypes.hpp"
 #include "silkit/services/pubsub/string_utils.hpp"
 
-#include "SharedVector.hpp"
+#include "wire/util/SharedVector.hpp"
 
 #include <chrono>
 #include <vector>
diff --git a/SilKit/source/wire/rpc/WireRpcMessages.hpp b/SilKit/source/wire/rpc/WireRpcMessages.hpp
index 5a6522e53..6674817dd 100644
--- a/SilKit/source/wire/rpc/WireRpcMessages.hpp
+++ b/SilKit/source/wire/rpc/WireRpcMessages.hpp
@@ -8,8 +8,8 @@
 #include "silkit/services/rpc/string_utils.hpp"
 #include "silkit/util/PrintableHexString.hpp"
 
-#include "SharedVector.hpp"
-#include "Uuid.hpp"
+#include "wire/util/SharedVector.hpp"
+#include "util/Uuid.hpp"
 
 #include <chrono>
 #include <vector>
diff --git a/SilKit/source/wire/util/SharedVector.cpp b/SilKit/source/wire/util/SharedVector.cpp
index 83e90331a..1201e71c0 100644
--- a/SilKit/source/wire/util/SharedVector.cpp
+++ b/SilKit/source/wire/util/SharedVector.cpp
@@ -6,4 +6,4 @@
 // Created by dedwards on 6/24/22.
 //
 
-#include "SharedVector.hpp"
+#include "wire/util/SharedVector.hpp"