diff --git a/action/ActionHelper.h b/core/inc/fsfw/action/ActionHelper.h
similarity index 100%
rename from action/ActionHelper.h
rename to core/inc/fsfw/action/ActionHelper.h
diff --git a/action/ActionMessage.h b/core/inc/fsfw/action/ActionMessage.h
similarity index 100%
rename from action/ActionMessage.h
rename to core/inc/fsfw/action/ActionMessage.h
diff --git a/action/CommandActionHelper.h b/core/inc/fsfw/action/CommandActionHelper.h
similarity index 100%
rename from action/CommandActionHelper.h
rename to core/inc/fsfw/action/CommandActionHelper.h
diff --git a/action/CommandsActionsIF.h b/core/inc/fsfw/action/CommandsActionsIF.h
similarity index 100%
rename from action/CommandsActionsIF.h
rename to core/inc/fsfw/action/CommandsActionsIF.h
diff --git a/action/HasActionsIF.h b/core/inc/fsfw/action/HasActionsIF.h
similarity index 100%
rename from action/HasActionsIF.h
rename to core/inc/fsfw/action/HasActionsIF.h
diff --git a/action/SimpleActionHelper.h b/core/inc/fsfw/action/SimpleActionHelper.h
similarity index 100%
rename from action/SimpleActionHelper.h
rename to core/inc/fsfw/action/SimpleActionHelper.h
diff --git a/container/ArrayList.h b/core/inc/fsfw/container/ArrayList.h
similarity index 100%
rename from container/ArrayList.h
rename to core/inc/fsfw/container/ArrayList.h
diff --git a/container/BinaryTree.h b/core/inc/fsfw/container/BinaryTree.h
similarity index 100%
rename from container/BinaryTree.h
rename to core/inc/fsfw/container/BinaryTree.h
diff --git a/container/DynamicFIFO.h b/core/inc/fsfw/container/DynamicFIFO.h
similarity index 100%
rename from container/DynamicFIFO.h
rename to core/inc/fsfw/container/DynamicFIFO.h
diff --git a/container/FIFO.h b/core/inc/fsfw/container/FIFO.h
similarity index 100%
rename from container/FIFO.h
rename to core/inc/fsfw/container/FIFO.h
diff --git a/container/FIFOBase.h b/core/inc/fsfw/container/FIFOBase.h
similarity index 100%
rename from container/FIFOBase.h
rename to core/inc/fsfw/container/FIFOBase.h
diff --git a/container/FIFOBase.tpp b/core/inc/fsfw/container/FIFOBase.tpp
similarity index 100%
rename from container/FIFOBase.tpp
rename to core/inc/fsfw/container/FIFOBase.tpp
diff --git a/container/FixedArrayList.h b/core/inc/fsfw/container/FixedArrayList.h
similarity index 100%
rename from container/FixedArrayList.h
rename to core/inc/fsfw/container/FixedArrayList.h
diff --git a/container/FixedMap.h b/core/inc/fsfw/container/FixedMap.h
similarity index 100%
rename from container/FixedMap.h
rename to core/inc/fsfw/container/FixedMap.h
diff --git a/container/FixedOrderedMultimap.h b/core/inc/fsfw/container/FixedOrderedMultimap.h
similarity index 100%
rename from container/FixedOrderedMultimap.h
rename to core/inc/fsfw/container/FixedOrderedMultimap.h
diff --git a/container/FixedOrderedMultimap.tpp b/core/inc/fsfw/container/FixedOrderedMultimap.tpp
similarity index 100%
rename from container/FixedOrderedMultimap.tpp
rename to core/inc/fsfw/container/FixedOrderedMultimap.tpp
diff --git a/container/HybridIterator.h b/core/inc/fsfw/container/HybridIterator.h
similarity index 100%
rename from container/HybridIterator.h
rename to core/inc/fsfw/container/HybridIterator.h
diff --git a/container/IndexedRingMemoryArray.h b/core/inc/fsfw/container/IndexedRingMemoryArray.h
similarity index 100%
rename from container/IndexedRingMemoryArray.h
rename to core/inc/fsfw/container/IndexedRingMemoryArray.h
diff --git a/container/PlacementFactory.h b/core/inc/fsfw/container/PlacementFactory.h
similarity index 100%
rename from container/PlacementFactory.h
rename to core/inc/fsfw/container/PlacementFactory.h
diff --git a/container/RingBufferBase.h b/core/inc/fsfw/container/RingBufferBase.h
similarity index 100%
rename from container/RingBufferBase.h
rename to core/inc/fsfw/container/RingBufferBase.h
diff --git a/container/SharedRingBuffer.h b/core/inc/fsfw/container/SharedRingBuffer.h
similarity index 100%
rename from container/SharedRingBuffer.h
rename to core/inc/fsfw/container/SharedRingBuffer.h
diff --git a/container/SimpleRingBuffer.h b/core/inc/fsfw/container/SimpleRingBuffer.h
similarity index 100%
rename from container/SimpleRingBuffer.h
rename to core/inc/fsfw/container/SimpleRingBuffer.h
diff --git a/container/SinglyLinkedList.h b/core/inc/fsfw/container/SinglyLinkedList.h
similarity index 100%
rename from container/SinglyLinkedList.h
rename to core/inc/fsfw/container/SinglyLinkedList.h
diff --git a/container/group.h b/core/inc/fsfw/container/group.h
similarity index 100%
rename from container/group.h
rename to core/inc/fsfw/container/group.h
diff --git a/controller/ControllerBase.h b/core/inc/fsfw/controller/ControllerBase.h
similarity index 100%
rename from controller/ControllerBase.h
rename to core/inc/fsfw/controller/ControllerBase.h
diff --git a/controller/ExtendedControllerBase.h b/core/inc/fsfw/controller/ExtendedControllerBase.h
similarity index 100%
rename from controller/ExtendedControllerBase.h
rename to core/inc/fsfw/controller/ExtendedControllerBase.h
diff --git a/datapool/DataSetIF.h b/core/inc/fsfw/datapool/DataSetIF.h
similarity index 100%
rename from datapool/DataSetIF.h
rename to core/inc/fsfw/datapool/DataSetIF.h
diff --git a/datapool/HkSwitchHelper.h b/core/inc/fsfw/datapool/HkSwitchHelper.h
similarity index 100%
rename from datapool/HkSwitchHelper.h
rename to core/inc/fsfw/datapool/HkSwitchHelper.h
diff --git a/datapool/PoolDataSetBase.h b/core/inc/fsfw/datapool/PoolDataSetBase.h
similarity index 100%
rename from datapool/PoolDataSetBase.h
rename to core/inc/fsfw/datapool/PoolDataSetBase.h
diff --git a/datapool/PoolDataSetIF.h b/core/inc/fsfw/datapool/PoolDataSetIF.h
similarity index 100%
rename from datapool/PoolDataSetIF.h
rename to core/inc/fsfw/datapool/PoolDataSetIF.h
diff --git a/datapool/PoolEntry.h b/core/inc/fsfw/datapool/PoolEntry.h
similarity index 100%
rename from datapool/PoolEntry.h
rename to core/inc/fsfw/datapool/PoolEntry.h
diff --git a/datapool/PoolEntryIF.h b/core/inc/fsfw/datapool/PoolEntryIF.h
similarity index 100%
rename from datapool/PoolEntryIF.h
rename to core/inc/fsfw/datapool/PoolEntryIF.h
diff --git a/datapool/PoolReadGuard.h b/core/inc/fsfw/datapool/PoolReadGuard.h
similarity index 100%
rename from datapool/PoolReadGuard.h
rename to core/inc/fsfw/datapool/PoolReadGuard.h
diff --git a/datapool/PoolVarList.h b/core/inc/fsfw/datapool/PoolVarList.h
similarity index 100%
rename from datapool/PoolVarList.h
rename to core/inc/fsfw/datapool/PoolVarList.h
diff --git a/datapool/PoolVariableIF.h b/core/inc/fsfw/datapool/PoolVariableIF.h
similarity index 100%
rename from datapool/PoolVariableIF.h
rename to core/inc/fsfw/datapool/PoolVariableIF.h
diff --git a/datapool/ReadCommitIF.h b/core/inc/fsfw/datapool/ReadCommitIF.h
similarity index 100%
rename from datapool/ReadCommitIF.h
rename to core/inc/fsfw/datapool/ReadCommitIF.h
diff --git a/datapool/ReadCommitIFAttorney.h b/core/inc/fsfw/datapool/ReadCommitIFAttorney.h
similarity index 100%
rename from datapool/ReadCommitIFAttorney.h
rename to core/inc/fsfw/datapool/ReadCommitIFAttorney.h
diff --git a/datapool/SharedDataSetIF.h b/core/inc/fsfw/datapool/SharedDataSetIF.h
similarity index 100%
rename from datapool/SharedDataSetIF.h
rename to core/inc/fsfw/datapool/SharedDataSetIF.h
diff --git a/core/inc/fsfw/datapoollocal.h b/core/inc/fsfw/datapoollocal.h
new file mode 100644
index 00000000..73024a5c
--- /dev/null
+++ b/core/inc/fsfw/datapoollocal.h
@@ -0,0 +1,12 @@
+#ifndef FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_
+#define FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_
+
+/* Collected related headers */
+#include "datapoollocal/LocalPoolVariable.h"
+#include "datapoollocal/LocalPoolVector.h"
+#include "datapoollocal/StaticLocalDataSet.h"
+#include "datapoollocal/LocalDataSet.h"
+#include "datapoollocal/SharedLocalDataSet.h"
+
+
+#endif /* FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ */
diff --git a/datapoollocal/AccessLocalPoolF.h b/core/inc/fsfw/datapoollocal/AccessLocalPoolF.h
similarity index 100%
rename from datapoollocal/AccessLocalPoolF.h
rename to core/inc/fsfw/datapoollocal/AccessLocalPoolF.h
diff --git a/datapoollocal/HasLocalDataPoolIF.h b/core/inc/fsfw/datapoollocal/HasLocalDataPoolIF.h
similarity index 100%
rename from datapoollocal/HasLocalDataPoolIF.h
rename to core/inc/fsfw/datapoollocal/HasLocalDataPoolIF.h
diff --git a/datapoollocal/LocalDataPoolManager.h b/core/inc/fsfw/datapoollocal/LocalDataPoolManager.h
similarity index 100%
rename from datapoollocal/LocalDataPoolManager.h
rename to core/inc/fsfw/datapoollocal/LocalDataPoolManager.h
diff --git a/datapoollocal/LocalDataSet.h b/core/inc/fsfw/datapoollocal/LocalDataSet.h
similarity index 100%
rename from datapoollocal/LocalDataSet.h
rename to core/inc/fsfw/datapoollocal/LocalDataSet.h
diff --git a/datapoollocal/LocalPoolDataSetBase.h b/core/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h
similarity index 100%
rename from datapoollocal/LocalPoolDataSetBase.h
rename to core/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h
diff --git a/datapoollocal/LocalPoolObjectBase.h b/core/inc/fsfw/datapoollocal/LocalPoolObjectBase.h
similarity index 100%
rename from datapoollocal/LocalPoolObjectBase.h
rename to core/inc/fsfw/datapoollocal/LocalPoolObjectBase.h
diff --git a/datapoollocal/LocalPoolVariable.h b/core/inc/fsfw/datapoollocal/LocalPoolVariable.h
similarity index 100%
rename from datapoollocal/LocalPoolVariable.h
rename to core/inc/fsfw/datapoollocal/LocalPoolVariable.h
diff --git a/datapoollocal/LocalPoolVariable.tpp b/core/inc/fsfw/datapoollocal/LocalPoolVariable.tpp
similarity index 100%
rename from datapoollocal/LocalPoolVariable.tpp
rename to core/inc/fsfw/datapoollocal/LocalPoolVariable.tpp
diff --git a/datapoollocal/LocalPoolVector.h b/core/inc/fsfw/datapoollocal/LocalPoolVector.h
similarity index 100%
rename from datapoollocal/LocalPoolVector.h
rename to core/inc/fsfw/datapoollocal/LocalPoolVector.h
diff --git a/datapoollocal/LocalPoolVector.tpp b/core/inc/fsfw/datapoollocal/LocalPoolVector.tpp
similarity index 100%
rename from datapoollocal/LocalPoolVector.tpp
rename to core/inc/fsfw/datapoollocal/LocalPoolVector.tpp
diff --git a/datapoollocal/MarkChangedIF.h b/core/inc/fsfw/datapoollocal/MarkChangedIF.h
similarity index 100%
rename from datapoollocal/MarkChangedIF.h
rename to core/inc/fsfw/datapoollocal/MarkChangedIF.h
diff --git a/datapoollocal/ProvidesDataPoolSubscriptionIF.h b/core/inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
similarity index 100%
rename from datapoollocal/ProvidesDataPoolSubscriptionIF.h
rename to core/inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
diff --git a/datapoollocal/SharedLocalDataSet.h b/core/inc/fsfw/datapoollocal/SharedLocalDataSet.h
similarity index 100%
rename from datapoollocal/SharedLocalDataSet.h
rename to core/inc/fsfw/datapoollocal/SharedLocalDataSet.h
diff --git a/datapoollocal/StaticLocalDataSet.h b/core/inc/fsfw/datapoollocal/StaticLocalDataSet.h
similarity index 100%
rename from datapoollocal/StaticLocalDataSet.h
rename to core/inc/fsfw/datapoollocal/StaticLocalDataSet.h
diff --git a/datapoollocal/localPoolDefinitions.h b/core/inc/fsfw/datapoollocal/localPoolDefinitions.h
similarity index 100%
rename from datapoollocal/localPoolDefinitions.h
rename to core/inc/fsfw/datapoollocal/localPoolDefinitions.h
diff --git a/action/ActionHelper.cpp b/core/src/action/ActionHelper.cpp
similarity index 100%
rename from action/ActionHelper.cpp
rename to core/src/action/ActionHelper.cpp
diff --git a/action/ActionMessage.cpp b/core/src/action/ActionMessage.cpp
similarity index 100%
rename from action/ActionMessage.cpp
rename to core/src/action/ActionMessage.cpp
diff --git a/action/CMakeLists.txt b/core/src/action/CMakeLists.txt
similarity index 100%
rename from action/CMakeLists.txt
rename to core/src/action/CMakeLists.txt
diff --git a/action/CommandActionHelper.cpp b/core/src/action/CommandActionHelper.cpp
similarity index 100%
rename from action/CommandActionHelper.cpp
rename to core/src/action/CommandActionHelper.cpp
diff --git a/action/SimpleActionHelper.cpp b/core/src/action/SimpleActionHelper.cpp
similarity index 100%
rename from action/SimpleActionHelper.cpp
rename to core/src/action/SimpleActionHelper.cpp
diff --git a/container/CMakeLists.txt b/core/src/container/CMakeLists.txt
similarity index 100%
rename from container/CMakeLists.txt
rename to core/src/container/CMakeLists.txt
diff --git a/container/SharedRingBuffer.cpp b/core/src/container/SharedRingBuffer.cpp
similarity index 100%
rename from container/SharedRingBuffer.cpp
rename to core/src/container/SharedRingBuffer.cpp
diff --git a/container/SimpleRingBuffer.cpp b/core/src/container/SimpleRingBuffer.cpp
similarity index 100%
rename from container/SimpleRingBuffer.cpp
rename to core/src/container/SimpleRingBuffer.cpp
diff --git a/controller/CMakeLists.txt b/core/src/controller/CMakeLists.txt
similarity index 100%
rename from controller/CMakeLists.txt
rename to core/src/controller/CMakeLists.txt
diff --git a/controller/ControllerBase.cpp b/core/src/controller/ControllerBase.cpp
similarity index 100%
rename from controller/ControllerBase.cpp
rename to core/src/controller/ControllerBase.cpp
diff --git a/controller/ExtendedControllerBase.cpp b/core/src/controller/ExtendedControllerBase.cpp
similarity index 100%
rename from controller/ExtendedControllerBase.cpp
rename to core/src/controller/ExtendedControllerBase.cpp
diff --git a/datapool/CMakeLists.txt b/core/src/datapool/CMakeLists.txt
similarity index 100%
rename from datapool/CMakeLists.txt
rename to core/src/datapool/CMakeLists.txt
diff --git a/datapool/HkSwitchHelper.cpp b/core/src/datapool/HkSwitchHelper.cpp
similarity index 100%
rename from datapool/HkSwitchHelper.cpp
rename to core/src/datapool/HkSwitchHelper.cpp
diff --git a/datapool/PoolDataSetBase.cpp b/core/src/datapool/PoolDataSetBase.cpp
similarity index 100%
rename from datapool/PoolDataSetBase.cpp
rename to core/src/datapool/PoolDataSetBase.cpp
diff --git a/datapool/PoolEntry.cpp b/core/src/datapool/PoolEntry.cpp
similarity index 100%
rename from datapool/PoolEntry.cpp
rename to core/src/datapool/PoolEntry.cpp
diff --git a/datapoollocal/CMakeLists.txt b/core/src/datapoollocal/CMakeLists.txt
similarity index 100%
rename from datapoollocal/CMakeLists.txt
rename to core/src/datapoollocal/CMakeLists.txt
diff --git a/datapoollocal/LocalDataPoolManager.cpp b/core/src/datapoollocal/LocalDataPoolManager.cpp
similarity index 100%
rename from datapoollocal/LocalDataPoolManager.cpp
rename to core/src/datapoollocal/LocalDataPoolManager.cpp
diff --git a/datapoollocal/LocalDataSet.cpp b/core/src/datapoollocal/LocalDataSet.cpp
similarity index 100%
rename from datapoollocal/LocalDataSet.cpp
rename to core/src/datapoollocal/LocalDataSet.cpp
diff --git a/datapoollocal/LocalPoolDataSetBase.cpp b/core/src/datapoollocal/LocalPoolDataSetBase.cpp
similarity index 100%
rename from datapoollocal/LocalPoolDataSetBase.cpp
rename to core/src/datapoollocal/LocalPoolDataSetBase.cpp
diff --git a/datapoollocal/LocalPoolObjectBase.cpp b/core/src/datapoollocal/LocalPoolObjectBase.cpp
similarity index 100%
rename from datapoollocal/LocalPoolObjectBase.cpp
rename to core/src/datapoollocal/LocalPoolObjectBase.cpp
diff --git a/datapoollocal/SharedLocalDataSet.cpp b/core/src/datapoollocal/SharedLocalDataSet.cpp
similarity index 100%
rename from datapoollocal/SharedLocalDataSet.cpp
rename to core/src/datapoollocal/SharedLocalDataSet.cpp
diff --git a/datapoollocal/internal/CMakeLists.txt b/core/src/datapoollocal/internal/CMakeLists.txt
similarity index 100%
rename from datapoollocal/internal/CMakeLists.txt
rename to core/src/datapoollocal/internal/CMakeLists.txt
diff --git a/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp b/core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp
similarity index 100%
rename from datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp
rename to core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp
diff --git a/datapoollocal/internal/HasLocalDpIFManagerAttorney.h b/core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.h
similarity index 100%
rename from datapoollocal/internal/HasLocalDpIFManagerAttorney.h
rename to core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.h
diff --git a/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp b/core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp
similarity index 100%
rename from datapoollocal/internal/HasLocalDpIFUserAttorney.cpp
rename to core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp
diff --git a/datapoollocal/internal/HasLocalDpIFUserAttorney.h b/core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.h
similarity index 100%
rename from datapoollocal/internal/HasLocalDpIFUserAttorney.h
rename to core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.h
diff --git a/datapoollocal/internal/LocalDpManagerAttorney.h b/core/src/datapoollocal/internal/LocalDpManagerAttorney.h
similarity index 100%
rename from datapoollocal/internal/LocalDpManagerAttorney.h
rename to core/src/datapoollocal/internal/LocalDpManagerAttorney.h
diff --git a/datapoollocal/internal/LocalPoolDataSetAttorney.h b/core/src/datapoollocal/internal/LocalPoolDataSetAttorney.h
similarity index 100%
rename from datapoollocal/internal/LocalPoolDataSetAttorney.h
rename to core/src/datapoollocal/internal/LocalPoolDataSetAttorney.h
diff --git a/datapoollocal/datapoollocal.h b/datapoollocal/datapoollocal.h
deleted file mode 100644
index c5c47078..00000000
--- a/datapoollocal/datapoollocal.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_
-#define FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_
-
-/* Collected related headers */
-#include "LocalPoolVariable.h"
-#include "LocalPoolVector.h"
-#include "StaticLocalDataSet.h"
-#include "LocalDataSet.h"
-#include "SharedLocalDataSet.h"
-
-
-#endif /* FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ */
diff --git a/coordinates/CoordinateTransformations.h b/opt/inc/fsfw/coordinates/CoordinateTransformations.h
similarity index 100%
rename from coordinates/CoordinateTransformations.h
rename to opt/inc/fsfw/coordinates/CoordinateTransformations.h
diff --git a/coordinates/Jgm3Model.h b/opt/inc/fsfw/coordinates/Jgm3Model.h
similarity index 100%
rename from coordinates/Jgm3Model.h
rename to opt/inc/fsfw/coordinates/Jgm3Model.h
diff --git a/coordinates/Sgp4Propagator.h b/opt/inc/fsfw/coordinates/Sgp4Propagator.h
similarity index 100%
rename from coordinates/Sgp4Propagator.h
rename to opt/inc/fsfw/coordinates/Sgp4Propagator.h
diff --git a/datalinklayer/BCFrame.h b/opt/inc/fsfw/datalinklayer/BCFrame.h
similarity index 100%
rename from datalinklayer/BCFrame.h
rename to opt/inc/fsfw/datalinklayer/BCFrame.h
diff --git a/datalinklayer/CCSDSReturnValuesIF.h b/opt/inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h
similarity index 100%
rename from datalinklayer/CCSDSReturnValuesIF.h
rename to opt/inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h
diff --git a/datalinklayer/Clcw.h b/opt/inc/fsfw/datalinklayer/Clcw.h
similarity index 100%
rename from datalinklayer/Clcw.h
rename to opt/inc/fsfw/datalinklayer/Clcw.h
diff --git a/datalinklayer/ClcwIF.h b/opt/inc/fsfw/datalinklayer/ClcwIF.h
similarity index 100%
rename from datalinklayer/ClcwIF.h
rename to opt/inc/fsfw/datalinklayer/ClcwIF.h
diff --git a/datalinklayer/DataLinkLayer.h b/opt/inc/fsfw/datalinklayer/DataLinkLayer.h
similarity index 100%
rename from datalinklayer/DataLinkLayer.h
rename to opt/inc/fsfw/datalinklayer/DataLinkLayer.h
diff --git a/datalinklayer/Farm1StateIF.h b/opt/inc/fsfw/datalinklayer/Farm1StateIF.h
similarity index 100%
rename from datalinklayer/Farm1StateIF.h
rename to opt/inc/fsfw/datalinklayer/Farm1StateIF.h
diff --git a/datalinklayer/Farm1StateLockout.h b/opt/inc/fsfw/datalinklayer/Farm1StateLockout.h
similarity index 100%
rename from datalinklayer/Farm1StateLockout.h
rename to opt/inc/fsfw/datalinklayer/Farm1StateLockout.h
diff --git a/datalinklayer/Farm1StateOpen.h b/opt/inc/fsfw/datalinklayer/Farm1StateOpen.h
similarity index 100%
rename from datalinklayer/Farm1StateOpen.h
rename to opt/inc/fsfw/datalinklayer/Farm1StateOpen.h
diff --git a/datalinklayer/Farm1StateWait.h b/opt/inc/fsfw/datalinklayer/Farm1StateWait.h
similarity index 100%
rename from datalinklayer/Farm1StateWait.h
rename to opt/inc/fsfw/datalinklayer/Farm1StateWait.h
diff --git a/datalinklayer/MapPacketExtraction.h b/opt/inc/fsfw/datalinklayer/MapPacketExtraction.h
similarity index 100%
rename from datalinklayer/MapPacketExtraction.h
rename to opt/inc/fsfw/datalinklayer/MapPacketExtraction.h
diff --git a/datalinklayer/MapPacketExtractionIF.h b/opt/inc/fsfw/datalinklayer/MapPacketExtractionIF.h
similarity index 100%
rename from datalinklayer/MapPacketExtractionIF.h
rename to opt/inc/fsfw/datalinklayer/MapPacketExtractionIF.h
diff --git a/datalinklayer/TcTransferFrame.h b/opt/inc/fsfw/datalinklayer/TcTransferFrame.h
similarity index 100%
rename from datalinklayer/TcTransferFrame.h
rename to opt/inc/fsfw/datalinklayer/TcTransferFrame.h
diff --git a/datalinklayer/TcTransferFrameLocal.h b/opt/inc/fsfw/datalinklayer/TcTransferFrameLocal.h
similarity index 100%
rename from datalinklayer/TcTransferFrameLocal.h
rename to opt/inc/fsfw/datalinklayer/TcTransferFrameLocal.h
diff --git a/datalinklayer/VirtualChannelReception.h b/opt/inc/fsfw/datalinklayer/VirtualChannelReception.h
similarity index 100%
rename from datalinklayer/VirtualChannelReception.h
rename to opt/inc/fsfw/datalinklayer/VirtualChannelReception.h
diff --git a/datalinklayer/VirtualChannelReceptionIF.h b/opt/inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h
similarity index 100%
rename from datalinklayer/VirtualChannelReceptionIF.h
rename to opt/inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h
diff --git a/coordinates/CMakeLists.txt b/opt/src/coordinates/CMakeLists.txt
similarity index 100%
rename from coordinates/CMakeLists.txt
rename to opt/src/coordinates/CMakeLists.txt
diff --git a/coordinates/CoordinateTransformations.cpp b/opt/src/coordinates/CoordinateTransformations.cpp
similarity index 100%
rename from coordinates/CoordinateTransformations.cpp
rename to opt/src/coordinates/CoordinateTransformations.cpp
diff --git a/coordinates/Sgp4Propagator.cpp b/opt/src/coordinates/Sgp4Propagator.cpp
similarity index 100%
rename from coordinates/Sgp4Propagator.cpp
rename to opt/src/coordinates/Sgp4Propagator.cpp
diff --git a/datalinklayer/CMakeLists.txt b/opt/src/datalinklayer/CMakeLists.txt
similarity index 100%
rename from datalinklayer/CMakeLists.txt
rename to opt/src/datalinklayer/CMakeLists.txt
diff --git a/datalinklayer/Clcw.cpp b/opt/src/datalinklayer/Clcw.cpp
similarity index 100%
rename from datalinklayer/Clcw.cpp
rename to opt/src/datalinklayer/Clcw.cpp
diff --git a/datalinklayer/DataLinkLayer.cpp b/opt/src/datalinklayer/DataLinkLayer.cpp
similarity index 100%
rename from datalinklayer/DataLinkLayer.cpp
rename to opt/src/datalinklayer/DataLinkLayer.cpp
diff --git a/datalinklayer/Farm1StateLockout.cpp b/opt/src/datalinklayer/Farm1StateLockout.cpp
similarity index 100%
rename from datalinklayer/Farm1StateLockout.cpp
rename to opt/src/datalinklayer/Farm1StateLockout.cpp
diff --git a/datalinklayer/Farm1StateOpen.cpp b/opt/src/datalinklayer/Farm1StateOpen.cpp
similarity index 100%
rename from datalinklayer/Farm1StateOpen.cpp
rename to opt/src/datalinklayer/Farm1StateOpen.cpp
diff --git a/datalinklayer/Farm1StateWait.cpp b/opt/src/datalinklayer/Farm1StateWait.cpp
similarity index 100%
rename from datalinklayer/Farm1StateWait.cpp
rename to opt/src/datalinklayer/Farm1StateWait.cpp
diff --git a/datalinklayer/MapPacketExtraction.cpp b/opt/src/datalinklayer/MapPacketExtraction.cpp
similarity index 100%
rename from datalinklayer/MapPacketExtraction.cpp
rename to opt/src/datalinklayer/MapPacketExtraction.cpp
diff --git a/datalinklayer/TcTransferFrame.cpp b/opt/src/datalinklayer/TcTransferFrame.cpp
similarity index 100%
rename from datalinklayer/TcTransferFrame.cpp
rename to opt/src/datalinklayer/TcTransferFrame.cpp
diff --git a/datalinklayer/TcTransferFrameLocal.cpp b/opt/src/datalinklayer/TcTransferFrameLocal.cpp
similarity index 100%
rename from datalinklayer/TcTransferFrameLocal.cpp
rename to opt/src/datalinklayer/TcTransferFrameLocal.cpp
diff --git a/datalinklayer/VirtualChannelReception.cpp b/opt/src/datalinklayer/VirtualChannelReception.cpp
similarity index 100%
rename from datalinklayer/VirtualChannelReception.cpp
rename to opt/src/datalinklayer/VirtualChannelReception.cpp