vectorgrp · MariusBgm · Jun 26, 2026
diff --git a/SilKit/source/core/vasio/AggregationMessageTraits.hpp b/SilKit/source/core/vasio/AggregationMessageTraits.hpp
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "VAsioDatatypes.hpp"
+#include "core/vasio/VAsioDatatypes.hpp"
 
-#include "OrchestrationDatatypes.hpp"
+#include "core/internal/OrchestrationDatatypes.hpp"
 
-#include "WireCanMessages.hpp"
-#include "WireDataMessages.hpp"
-#include "WireEthernetMessages.hpp"
-#include "WireRpcMessages.hpp"
+#include "wire/can/WireCanMessages.hpp"
+#include "wire/pubsub/WireDataMessages.hpp"
+#include "wire/ethernet/WireEthernetMessages.hpp"
+#include "wire/rpc/WireRpcMessages.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/ConnectKnownParticipants.cpp b/SilKit/source/core/vasio/ConnectKnownParticipants.cpp
@@ -2,12 +2,12 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ConnectKnownParticipants.hpp"
+#include "core/vasio/ConnectKnownParticipants.hpp"
 
-#include "LoggerMessage.hpp"
-#include "VAsioConnection.hpp"
-#include "VAsioPeer.hpp"
-#include "util/TracingMacros.hpp"
+#include "services/logging/LoggerMessage.hpp"
+#include "core/vasio/VAsioConnection.hpp"
+#include "core/vasio/VAsioPeer.hpp"
+#include "core/vasio/io/util/TracingMacros.hpp"
 
 #include <chrono>
 #include <memory>

diff --git a/SilKit/source/core/vasio/ConnectKnownParticipants.hpp b/SilKit/source/core/vasio/ConnectKnownParticipants.hpp
@@ -5,12 +5,12 @@
 #pragma once
 
 
-#include "IIoContext.hpp"
-#include "IConnectPeer.hpp"
-#include "IConnectionMethods.hpp"
-#include "IConnectKnownParticipantsListener.hpp"
-#include "ITimer.hpp"
-#include "VAsioPeerInfo.hpp"
+#include "core/vasio/io/IIoContext.hpp"
+#include "core/vasio/IConnectPeer.hpp"
+#include "core/vasio/IConnectionMethods.hpp"
+#include "core/vasio/IConnectKnownParticipantsListener.hpp"
+#include "core/vasio/io/ITimer.hpp"
+#include "core/vasio/VAsioPeerInfo.hpp"
 
 #include "silkit/services/logging/ILogger.hpp"
 

diff --git a/SilKit/source/core/vasio/ConnectPeer.cpp b/SilKit/source/core/vasio/ConnectPeer.cpp
@@ -2,15 +2,15 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ConnectPeer.hpp"
+#include "core/vasio/ConnectPeer.hpp"
 
-#include "util/TracingMacros.hpp"
+#include "core/vasio/io/util/TracingMacros.hpp"
 
-#include "VAsioConnection.hpp"
-#include "VAsioPeerInfo.hpp"
-#include "VAsioPeer.hpp"
+#include "core/vasio/VAsioConnection.hpp"
+#include "core/vasio/VAsioPeerInfo.hpp"
+#include "core/vasio/VAsioPeer.hpp"
 
-#include "Uri.hpp"
+#include "util/Uri.hpp"
 
 #include <algorithm>
 #include <memory>

diff --git a/SilKit/source/core/vasio/ConnectPeer.hpp b/SilKit/source/core/vasio/ConnectPeer.hpp
@@ -5,11 +5,11 @@
 #pragma once
 
 
-#include "IConnectPeer.hpp"
+#include "core/vasio/IConnectPeer.hpp"
 
-#include "IIoContext.hpp"
+#include "core/vasio/io/IIoContext.hpp"
 
-#include "LoggerMessage.hpp"
+#include "services/logging/LoggerMessage.hpp"
 
 #include <chrono>
 #include <functional>

diff --git a/SilKit/source/core/vasio/IConnectPeer.hpp b/SilKit/source/core/vasio/IConnectPeer.hpp
@@ -5,9 +5,9 @@
 #pragma once
 
 
-#include "VAsioPeerInfo.hpp"
+#include "core/vasio/VAsioPeerInfo.hpp"
 
-#include "IRawByteStream.hpp"
+#include "core/vasio/io/IRawByteStream.hpp"
 
 #include <cstddef>
 #include <chrono>

diff --git a/SilKit/source/core/vasio/IConnectionMethods.hpp b/SilKit/source/core/vasio/IConnectionMethods.hpp
@@ -5,10 +5,10 @@
 #pragma once
 
 
-#include "VAsioPeerInfo.hpp"
+#include "core/vasio/VAsioPeerInfo.hpp"
 
-#include "IConnectPeer.hpp"
-#include "IVAsioPeer.hpp"
+#include "core/vasio/IConnectPeer.hpp"
+#include "core/vasio/IVAsioPeer.hpp"
 
 #include <cstddef>
 #include <chrono>

diff --git a/SilKit/source/core/vasio/IPeerMetrics.hpp b/SilKit/source/core/vasio/IPeerMetrics.hpp
@@ -5,9 +5,9 @@
 
 #include <string>
 
-#include "IMetricsManager.hpp"
-#include "IVAsioPeer.hpp"
-#include "SerializedMessage.hpp"
+#include "services/metrics/IMetricsManager.hpp"
+#include "core/vasio/IVAsioPeer.hpp"
+#include "core/vasio/SerializedMessage.hpp"
 
 namespace VSilKit {
 

diff --git a/SilKit/source/core/vasio/IVAsioPeer.hpp b/SilKit/source/core/vasio/IVAsioPeer.hpp
@@ -6,14 +6,14 @@
 
 #include <tuple>
 
-#include "IServiceEndpoint.hpp"
+#include "core/internal/IServiceEndpoint.hpp"
 
-#include "VAsioPeerInfo.hpp"
-#include "VAsioDatatypes.hpp"
-#include "VAsioProtocolVersion.hpp"
+#include "core/vasio/VAsioPeerInfo.hpp"
+#include "core/vasio/VAsioDatatypes.hpp"
+#include "core/vasio/VAsioProtocolVersion.hpp"
 
-#include "SerializedMessage.hpp"
-#include "IMetricsManager.hpp"
+#include "core/vasio/SerializedMessage.hpp"
+#include "services/metrics/IMetricsManager.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/PeerMetrics.cpp b/SilKit/source/core/vasio/PeerMetrics.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Vector Informatik GmbH
 // SPDX-License-Identifier: MIT
 
-#include "PeerMetrics.hpp"
+#include "core/vasio/PeerMetrics.hpp"
 
 
 namespace VSilKit {

diff --git a/SilKit/source/core/vasio/PeerMetrics.hpp b/SilKit/source/core/vasio/PeerMetrics.hpp
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include "IPeerMetrics.hpp"
-#include "ICounterMetric.hpp"
-#include "IStatisticMetric.hpp"
-#include "IVAsioPeer.hpp"
-#include "SerializedMessage.hpp"
+#include "core/vasio/IPeerMetrics.hpp"
+#include "services/metrics/ICounterMetric.hpp"
+#include "services/metrics/IStatisticMetric.hpp"
+#include "core/vasio/IVAsioPeer.hpp"
+#include "core/vasio/SerializedMessage.hpp"
 
 namespace VSilKit {
 

diff --git a/SilKit/source/core/vasio/RemoteConnectionManager.cpp b/SilKit/source/core/vasio/RemoteConnectionManager.cpp
@@ -2,12 +2,12 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "RemoteConnectionManager.hpp"
+#include "core/vasio/RemoteConnectionManager.hpp"
 
-#include "VAsioConnection.hpp"
-#include "VAsioPeer.hpp"
-#include "ConnectPeer.hpp"
-#include "util/TracingMacros.hpp"
+#include "core/vasio/VAsioConnection.hpp"
+#include "core/vasio/VAsioPeer.hpp"
+#include "core/vasio/ConnectPeer.hpp"
+#include "core/vasio/io/util/TracingMacros.hpp"
 
 
 #if SILKIT_ENABLE_TRACING_INSTRUMENTATION_VAsioConnection

diff --git a/SilKit/source/core/vasio/RemoteConnectionManager.hpp b/SilKit/source/core/vasio/RemoteConnectionManager.hpp
@@ -5,8 +5,8 @@
 #pragma once
 
 
-#include "ConnectPeer.hpp"
-#include "ITimer.hpp"
+#include "core/vasio/ConnectPeer.hpp"
+#include "core/vasio/io/ITimer.hpp"
 
 #include <mutex>
 #include <vector>

diff --git a/SilKit/source/core/vasio/RingBuffer.cpp b/SilKit/source/core/vasio/RingBuffer.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "RingBuffer.hpp"
+#include "core/vasio/RingBuffer.hpp"
 
 #include <algorithm>
 #include <iterator>

diff --git a/SilKit/source/core/vasio/RingBuffer.hpp b/SilKit/source/core/vasio/RingBuffer.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 #include <stdint.h>
 
-#include "util/Buffer.hpp"
+#include "core/vasio/io/util/Buffer.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/SerializedMessage.cpp b/SilKit/source/core/vasio/SerializedMessage.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "SerializedMessage.hpp"
+#include "core/vasio/SerializedMessage.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/SerializedMessage.hpp b/SilKit/source/core/vasio/SerializedMessage.hpp
@@ -3,26 +3,26 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-#include "VAsioMsgKind.hpp"
-#include "VAsioDatatypes.hpp"
-#include "SerializedMessageTraits.hpp"
-#include "AggregationMessageTraits.hpp"
-#include "MessageBuffer.hpp"
+#include "core/vasio/VAsioMsgKind.hpp"
+#include "core/vasio/VAsioDatatypes.hpp"
+#include "core/vasio/SerializedMessageTraits.hpp"
+#include "core/vasio/AggregationMessageTraits.hpp"
+#include "core/internal/MessageBuffer.hpp"
 
 // Component specific Serialize/Deserialize functions
-#include "VAsioSerdes.hpp"
-#include "CanSerdes.hpp"
-#include "LinSerdes.hpp"
-#include "EthernetSerdes.hpp"
-#include "FlexraySerdes.hpp"
-#include "RpcSerdes.hpp"
-#include "InternalSerdes.hpp"
-#include "SyncSerdes.hpp"
-#include "ServiceSerdes.hpp"
-#include "RequestReplySerdes.hpp"
-#include "LoggingSerdes.hpp"
-#include "DataSerdes.hpp"
-#include "MetricsSerdes.hpp"
+#include "core/vasio/VAsioSerdes.hpp"
+#include "services/can/CanSerdes.hpp"
+#include "services/lin/LinSerdes.hpp"
+#include "services/ethernet/EthernetSerdes.hpp"
+#include "services/flexray/FlexraySerdes.hpp"
+#include "services/rpc/RpcSerdes.hpp"
+#include "core/internal/InternalSerdes.hpp"
+#include "services/orchestration/SyncSerdes.hpp"
+#include "core/service/ServiceSerdes.hpp"
+#include "core/requests/RequestReplySerdes.hpp"
+#include "services/logging/LoggingSerdes.hpp"
+#include "services/pubsub/DataSerdes.hpp"
+#include "services/metrics/MetricsSerdes.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/SerializedMessageTraits.hpp b/SilKit/source/core/vasio/SerializedMessageTraits.hpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-#include "VAsioMsgKind.hpp"
-#include "VAsioDatatypes.hpp"
+#include "core/vasio/VAsioMsgKind.hpp"
+#include "core/vasio/VAsioDatatypes.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/SilKitLink.hpp b/SilKit/source/core/vasio/SilKitLink.hpp
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "LoggerMessage.hpp"
+#include "services/logging/LoggerMessage.hpp"
 
-#include "VAsioTransmitter.hpp"
-#include "traits/SilKitMsgTraits.hpp"
-#include "MessageTracing.hpp"
+#include "core/vasio/VAsioTransmitter.hpp"
+#include "core/internal/traits/SilKitMsgTraits.hpp"
+#include "services/logging/MessageTracing.hpp"
 
-#include "IMessageReceiver.hpp"
-#include "TimeSyncService.hpp"
+#include "core/internal/IMessageReceiver.hpp"
+#include "services/orchestration/TimeSyncService.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/Test_ConnectKnownParticipants.cpp b/SilKit/source/core/vasio/Test_ConnectKnownParticipants.cpp
@@ -2,19 +2,19 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ConnectKnownParticipants.hpp"
+#include "core/vasio/ConnectKnownParticipants.hpp"
 
-#include "MockLogger.hpp"
+#include "services/logging/MockLogger.hpp"
 
-#include "MockConnectKnownParticipantsListener.hpp"
-#include "MockConnectionMethods.hpp"
-#include "MockConnectPeer.hpp"
-#include "MockIoContext.hpp"
-#include "MockRawByteStream.hpp"
-#include "MockTimer.hpp"
-#include "MockVAsioPeer.hpp"
+#include "core/vasio/mock/MockConnectKnownParticipantsListener.hpp"
+#include "core/vasio/mock/MockConnectionMethods.hpp"
+#include "core/vasio/mock/MockConnectPeer.hpp"
+#include "core/vasio/io/mock/MockIoContext.hpp"
+#include "core/vasio/io/mock/MockRawByteStream.hpp"
+#include "core/vasio/io/mock/MockTimer.hpp"
+#include "core/vasio/mock/MockVAsioPeer.hpp"
 
-#include "Hash.hpp"
+#include "util/Hash.hpp"
 
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"

diff --git a/SilKit/source/core/vasio/Test_ConnectPeer.cpp b/SilKit/source/core/vasio/Test_ConnectPeer.cpp
@@ -2,16 +2,16 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ConnectPeer.hpp"
+#include "core/vasio/ConnectPeer.hpp"
 
-#include "MockLogger.hpp"
+#include "services/logging/MockLogger.hpp"
 
-#include "MockConnector.hpp"
-#include "MockConnectPeer.hpp"
-#include "MockIoContext.hpp"
-#include "MockRawByteStream.hpp"
+#include "core/vasio/io/mock/MockConnector.hpp"
+#include "core/vasio/mock/MockConnectPeer.hpp"
+#include "core/vasio/io/mock/MockIoContext.hpp"
+#include "core/vasio/io/mock/MockRawByteStream.hpp"
 
-#include "Hash.hpp"
+#include "util/Hash.hpp"
 
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"

diff --git a/SilKit/source/core/vasio/Test_ParticipantVersion.cpp b/SilKit/source/core/vasio/Test_ParticipantVersion.cpp
@@ -10,10 +10,10 @@
 
 #include "gtest/gtest.h"
 
-#include "ProtocolVersion.hpp"
-#include "VAsioConnection.hpp"
-#include "VAsioRegistry.hpp"
-#include "Participant.hpp"
+#include "core/internal/ProtocolVersion.hpp"
+#include "core/vasio/VAsioConnection.hpp"
+#include "core/vasio/VAsioRegistry.hpp"
+#include "core/participant/Participant.hpp"
 
 #include "SimSystemController.hpp"
 

diff --git a/SilKit/source/core/vasio/Test_RingBuffer.cpp b/SilKit/source/core/vasio/Test_RingBuffer.cpp
@@ -5,7 +5,7 @@
 #include <random>
 #include <cstring>
 
-#include "RingBuffer.hpp"
+#include "core/vasio/RingBuffer.hpp"
 
 #include "gtest/gtest.h"