diff --git a/qt6-after/qt6-migrated-legatus/.envrc b/qt6-after/qt6-migrated-legatus/.envrc
deleted file mode 100644
index 547159bcc..000000000
--- a/qt6-after/qt6-migrated-legatus/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-export MIGRATE_PIPELINE_ROOT=/home/torsten/sandbox/qt6-migration-pipeline
\ No newline at end of file
diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
index d81863fb2..580d4d32a 100755
--- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
@@ -96,6 +96,7 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
 include_directories(${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap)
 include_directories(${CMAKE_SOURCE_DIR}/include/OperatorManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/FileManagement)
+include_directories(${CMAKE_SOURCE_DIR}/forward-declarations)
 SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
diff --git a/qt6-after/qt6-migrated-legatus/DDS/Core/core_dtc.h b/qt6-after/qt6-migrated-legatus/DDS/Core/core_dtc.h
deleted file mode 100644
index 47120f2bd..000000000
--- a/qt6-after/qt6-migrated-legatus/DDS/Core/core_dtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace DDS
-{
-namespace Core
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace Core
-} // namespace DDS
diff --git a/qt6-after/qt6-migrated-legatus/DDS/Core/core_enums.hpp b/qt6-after/qt6-migrated-legatus/DDS/Core/core_enums.hpp
deleted file mode 100644
index 7cf5e6fee..000000000
--- a/qt6-after/qt6-migrated-legatus/DDS/Core/core_enums.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Typ-Definitionen
-
-namespace Core
-{
-// Placeholder enums - werden durch echte DDS-Typen ersetzt
-enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
-
-enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
-
-struct UnitSymbolPosition
-{
-    double x = 0.0;
-    double y = 0.0;
-    double z = 0.0;
-};
-} // namespace Core
diff --git a/qt6-after/qt6-migrated-legatus/Proxies/Buildings/bld_dtc.h b/qt6-after/qt6-migrated-legatus/Proxies/Buildings/bld_dtc.h
deleted file mode 100644
index 1a97ff37a..000000000
--- a/qt6-after/qt6-migrated-legatus/Proxies/Buildings/bld_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace Buildings
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace Buildings
diff --git a/qt6-after/qt6-migrated-legatus/Services/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/AlarmManagement/alm_dtc.h
deleted file mode 100644
index 48fc0cc57..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/AlarmManagement/alm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace AlarmManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/Services/AreaEffectSimulation/aes_dtc.h
deleted file mode 100644
index 53d8cdb02..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/AreaEffectSimulation/aes_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace AreaEffectSimulation
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Services/AreaEffectSimulation/aes_enums.hpp b/qt6-after/qt6-migrated-legatus/Services/AreaEffectSimulation/aes_enums.hpp
deleted file mode 100644
index 7dc7ece03..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/AreaEffectSimulation/aes_enums.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Typ-Definitionen
-
-namespace AreaEffectSimulation
-{
-// Placeholder enums - werden durch echte DDS-Typen ersetzt
-enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
-
-enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
-
-struct UnitSymbolPosition
-{
-    double x = 0.0;
-    double y = 0.0;
-    double z = 0.0;
-};
-} // namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Services/AudioVideoManagement/avm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/AudioVideoManagement/avm_dtc.h
deleted file mode 100644
index 6ebbe52b0..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/AudioVideoManagement/avm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace AudioVideoManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace AudioVideoManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/CodificationManagement/cod_dtc.h b/qt6-after/qt6-migrated-legatus/Services/CodificationManagement/cod_dtc.h
deleted file mode 100644
index 0aad572f6..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/CodificationManagement/cod_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace CodificationManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace CodificationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/EffectShowClient/esc_dtc.h b/qt6-after/qt6-migrated-legatus/Services/EffectShowClient/esc_dtc.h
deleted file mode 100644
index d91be8274..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/EffectShowClient/esc_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace EffectShowClient
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace EffectShowClient
diff --git a/qt6-after/qt6-migrated-legatus/Services/EffectShowManagement/esm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/EffectShowManagement/esm_dtc.h
deleted file mode 100644
index d73623e87..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/EffectShowManagement/esm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace EffectShowManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace EffectShowManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/ExerciseManagement/exm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/ExerciseManagement/exm_dtc.h
deleted file mode 100644
index d9f59111e..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/ExerciseManagement/exm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace ExerciseManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace ExerciseManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/FileManagement/flm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/FileManagement/flm_dtc.h
deleted file mode 100644
index 9a997306f..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/FileManagement/flm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace FileManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/InfrastructureManagement/ism_dtc.h b/qt6-after/qt6-migrated-legatus/Services/InfrastructureManagement/ism_dtc.h
deleted file mode 100644
index b62a281ef..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/InfrastructureManagement/ism_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace InfrastructureManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/InfrastructureManagement/ism_enums.hpp b/qt6-after/qt6-migrated-legatus/Services/InfrastructureManagement/ism_enums.hpp
deleted file mode 100644
index 369f0caa3..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/InfrastructureManagement/ism_enums.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Typ-Definitionen
-
-namespace InfrastructureManagement
-{
-// Placeholder enums - werden durch echte DDS-Typen ersetzt
-enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
-
-enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
-
-struct UnitSymbolPosition
-{
-    double x = 0.0;
-    double y = 0.0;
-    double z = 0.0;
-};
-} // namespace InfrastructureManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/Messaging/msg_dtc.h b/qt6-after/qt6-migrated-legatus/Services/Messaging/msg_dtc.h
deleted file mode 100644
index e6a935b68..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/Messaging/msg_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace Messaging
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace Messaging
diff --git a/qt6-after/qt6-migrated-legatus/Services/MeteoDataManagement/mdm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/MeteoDataManagement/mdm_dtc.h
deleted file mode 100644
index 9efa8bfc7..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/MeteoDataManagement/mdm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace MeteoDataManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace MeteoDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/OperatorManagement/opm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/OperatorManagement/opm_dtc.h
deleted file mode 100644
index c69e9ca0e..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/OperatorManagement/opm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace OperatorManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace OperatorManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/ParticipantManagement/ppm_dtc.h b/qt6-after/qt6-migrated-legatus/Services/ParticipantManagement/ppm_dtc.h
deleted file mode 100644
index 6b29b3f6c..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/ParticipantManagement/ppm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace ParticipantManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace ParticipantManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/PresentationManagement/pre_dtc.h b/qt6-after/qt6-migrated-legatus/Services/PresentationManagement/pre_dtc.h
deleted file mode 100644
index ad127f9d8..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/PresentationManagement/pre_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace PresentationManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace PresentationManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/ProjectDataManagement/pdm_enums.hpp b/qt6-after/qt6-migrated-legatus/Services/ProjectDataManagement/pdm_enums.hpp
deleted file mode 100644
index b543eaced..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/ProjectDataManagement/pdm_enums.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Typ-Definitionen
-
-namespace ProjectDataManagement
-{
-// Placeholder enums - werden durch echte DDS-Typen ersetzt
-enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
-
-enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
-
-struct UnitSymbolPosition
-{
-    double x = 0.0;
-    double y = 0.0;
-    double z = 0.0;
-};
-} // namespace ProjectDataManagement
diff --git a/qt6-after/qt6-migrated-legatus/Services/ReportManagement/rep_dtc.h b/qt6-after/qt6-migrated-legatus/Services/ReportManagement/rep_dtc.h
deleted file mode 100644
index a5c0fbce0..000000000
--- a/qt6-after/qt6-migrated-legatus/Services/ReportManagement/rep_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace ReportManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace ReportManagement
diff --git a/qt6-after/qt6-migrated-legatus/SituationReplayManagement/srm_dtc.h b/qt6-after/qt6-migrated-legatus/SituationReplayManagement/srm_dtc.h
deleted file mode 100644
index 452338f5e..000000000
--- a/qt6-after/qt6-migrated-legatus/SituationReplayManagement/srm_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace SituationReplayManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace SituationReplayManagement
diff --git a/qt6-after/qt6-migrated-legatus/TargetManagement/tgt_dtc.h b/qt6-after/qt6-migrated-legatus/TargetManagement/tgt_dtc.h
deleted file mode 100644
index e105df868..000000000
--- a/qt6-after/qt6-migrated-legatus/TargetManagement/tgt_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace TargetManagement
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace TargetManagement
diff --git a/qt6-after/qt6-migrated-legatus/TrainingAreaBase/tab_dtc.h b/qt6-after/qt6-migrated-legatus/TrainingAreaBase/tab_dtc.h
deleted file mode 100644
index c81da3ffd..000000000
--- a/qt6-after/qt6-migrated-legatus/TrainingAreaBase/tab_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace TrainingAreaBase
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace TrainingAreaBase
diff --git a/qt6-after/qt6-migrated-legatus/TrainingAreaBaseOC/taboc_dtc.h b/qt6-after/qt6-migrated-legatus/TrainingAreaBaseOC/taboc_dtc.h
deleted file mode 100644
index 5e5e69eb8..000000000
--- a/qt6-after/qt6-migrated-legatus/TrainingAreaBaseOC/taboc_dtc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Forward-Declarations
-
-namespace TrainingAreaBaseOC
-{
-namespace Interface
-{
-class Dtc;
-class Ftc;
-} // namespace Interface
-} // namespace TrainingAreaBaseOC
diff --git a/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/aes_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/aes_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/aes_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/aes_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/alm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/AlarmManagement/alm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/alm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/AssetManagement/asm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/asm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/AssetManagement/asm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/asm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/AssetManagement/asm_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/asm_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/AssetManagement/asm_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/asm_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/avm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/avm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/avm_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/avm_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/Buildings/bld_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/bld_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Buildings/bld_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/bld_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Buildings/bld_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/bld_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Buildings/bld_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/bld_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/CentralEffectSimulation/ces_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/ces_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/CentralEffectSimulation/ces_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/ces_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/ComponentMonitor/cmo_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/cmo_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ComponentMonitor/cmo_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/cmo_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/CodificationManagement/cod_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/cod_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/CodificationManagement/cod_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/cod_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Core/core_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/core_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Core/core_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/core_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Core/core_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/core_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Core/core_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/core_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/ExerciseEventManagement/eem_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/eem_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ExerciseEventManagement/eem_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/eem_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Services/ExerciseEventManagement/eem_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/eem_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Services/ExerciseEventManagement/eem_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/eem_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/EffectShowClient/esc_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/esc_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/EffectShowClient/esc_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/esc_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/EffectShowManagement/esm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/esm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/EffectShowManagement/esm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/esm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Evaluations/evl_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/evl_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Evaluations/evl_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/evl_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/exm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/exm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/exm_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/exm_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/FileManagement/flm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/flm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/FileManagement/flm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/flm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/FileManagement/flm_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/flm_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/FileManagement/flm_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/flm_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/DDS/DTC/generic_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/generic_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/DDS/DTC/generic_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/generic_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/GuezIedManagement/gim_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/gim_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/GuezIedManagement/gim_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/gim_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/GuezNasat/gna_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/gna_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/GuezNasat/gna_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/gna_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/ism_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/ism_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/ism_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/ism_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/MeteoDataManagement/mdm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/mdm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/MeteoDataManagement/mdm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/mdm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/MarkerManagement/mrk_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/mrk_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/MarkerManagement/mrk_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/mrk_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Messaging/msg_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/msg_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Messaging/msg_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/msg_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/NotificationManagement/nom_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/nom_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/NotificationManagement/nom_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/nom_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/NotificationManagement/nom_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/nom_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/NotificationManagement/nom_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/nom_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/OperatorManagement/opm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/opm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/OperatorManagement/opm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/opm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/OcSituationServer/oss_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/oss_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/OcSituationServer/oss_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/oss_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/ProjectDataManagement/pdm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/pdm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ProjectDataManagement/pdm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pdm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/pdm_dtc_types.h b/qt6-after/qt6-migrated-legatus/forward-declarations/pdm_dtc_types.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/pdm_dtc_types.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pdm_dtc_types.h
diff --git a/qt6-after/qt6-migrated-legatus/pdm_dts_types.h b/qt6-after/qt6-migrated-legatus/forward-declarations/pdm_dts_types.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/pdm_dts_types.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pdm_dts_types.h
diff --git a/qt6-after/qt6-migrated-legatus/ProjectDataManagement/pdm_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/pdm_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ProjectDataManagement/pdm_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pdm_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/pdm_ftc_types.h b/qt6-after/qt6-migrated-legatus/forward-declarations/pdm_ftc_types.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/pdm_ftc_types.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pdm_ftc_types.h
diff --git a/qt6-after/qt6-migrated-legatus/pdm_fts_types.h b/qt6-after/qt6-migrated-legatus/forward-declarations/pdm_fts_types.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/pdm_fts_types.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pdm_fts_types.h
diff --git a/qt6-after/qt6-migrated-legatus/pdm_operator_rights.h b/qt6-after/qt6-migrated-legatus/forward-declarations/pdm_operator_rights.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/pdm_operator_rights.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pdm_operator_rights.h
diff --git a/qt6-after/qt6-migrated-legatus/ParticipantManagement/ppm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/ppm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ParticipantManagement/ppm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/ppm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/ParticipantManagement/ppm_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/ppm_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ParticipantManagement/ppm_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/ppm_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/PresentationManagement/pre_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/pre_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/PresentationManagement/pre_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/pre_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/ReportManagement/rep_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/rep_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ReportManagement/rep_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/rep_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/ReportManagement/rep_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/rep_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ReportManagement/rep_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/rep_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/ServiceManagement/scm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/scm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/ServiceManagement/scm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/scm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Services/Skeleton/skl_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/skl_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Services/Skeleton/skl_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/skl_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/SoundManagement/som_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/som_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/SoundManagement/som_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/som_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Services/SituationReplayManagement/srm_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/srm_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Services/SituationReplayManagement/srm_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/srm_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/SituationReplay/srp_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/srp_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/SituationReplay/srp_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/srp_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/SituationReplay/srp_enums.hpp b/qt6-after/qt6-migrated-legatus/forward-declarations/srp_enums.hpp
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/SituationReplay/srp_enums.hpp
rename to qt6-after/qt6-migrated-legatus/forward-declarations/srp_enums.hpp
diff --git a/qt6-after/qt6-migrated-legatus/Proxies/TrainingAreaBase/tab_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/tab_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Proxies/TrainingAreaBase/tab_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/tab_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Proxies/TrainingAreaBaseOC/taboc_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/taboc_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Proxies/TrainingAreaBaseOC/taboc_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/taboc_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/Services/TargetManagement/tgt_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/tgt_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/Services/TargetManagement/tgt_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/tgt_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/WarehouseGuez/whg_dtc.h b/qt6-after/qt6-migrated-legatus/forward-declarations/whg_dtc.h
similarity index 100%
rename from qt6-after/qt6-migrated-legatus/WarehouseGuez/whg_dtc.h
rename to qt6-after/qt6-migrated-legatus/forward-declarations/whg_dtc.h
diff --git a/qt6-after/qt6-migrated-legatus/pdm_enums.hpp b/qt6-after/qt6-migrated-legatus/pdm_enums.hpp
deleted file mode 100644
index b543eaced..000000000
--- a/qt6-after/qt6-migrated-legatus/pdm_enums.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Typ-Definitionen
-
-namespace ProjectDataManagement
-{
-// Placeholder enums - werden durch echte DDS-Typen ersetzt
-enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
-
-enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
-
-struct UnitSymbolPosition
-{
-    double x = 0.0;
-    double y = 0.0;
-    double z = 0.0;
-};
-} // namespace ProjectDataManagement