From bdb8b0a75700edbd24b383b354311803298b00c1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 13 Jul 2021 18:40:52 +0200 Subject: [PATCH] restructure repository --- fsfw.mk | 75 ------------------ FSFW.h => inc/fsfw/FSFW.h | 0 FSFWVersion.h => inc/fsfw/FSFWVersion.h | 0 {core/inc => inc}/fsfw/action/ActionHelper.h | 0 {core/inc => inc}/fsfw/action/ActionMessage.h | 0 .../fsfw/action/CommandActionHelper.h | 0 .../fsfw/action/CommandsActionsIF.h | 0 {core/inc => inc}/fsfw/action/HasActionsIF.h | 0 .../fsfw/action/SimpleActionHelper.h | 0 {core/inc => inc}/fsfw/container/ArrayList.h | 0 {core/inc => inc}/fsfw/container/BinaryTree.h | 0 .../inc => inc}/fsfw/container/DynamicFIFO.h | 0 {core/inc => inc}/fsfw/container/FIFO.h | 0 {core/inc => inc}/fsfw/container/FIFOBase.h | 0 {core/inc => inc}/fsfw/container/FIFOBase.tpp | 0 .../fsfw/container/FixedArrayList.h | 0 {core/inc => inc}/fsfw/container/FixedMap.h | 0 .../fsfw/container/FixedOrderedMultimap.h | 0 .../fsfw/container/FixedOrderedMultimap.tpp | 0 .../fsfw/container/HybridIterator.h | 0 .../fsfw/container/IndexedRingMemoryArray.h | 0 .../fsfw/container/PlacementFactory.h | 0 .../fsfw/container/RingBufferBase.h | 0 .../fsfw/container/SharedRingBuffer.h | 0 .../fsfw/container/SimpleRingBuffer.h | 0 .../fsfw/container/SinglyLinkedList.h | 0 {core/inc => inc}/fsfw/container/group.h | 0 .../fsfw/controller/ControllerBase.h | 0 .../fsfw/controller/ExtendedControllerBase.h | 0 .../coordinates/CoordinateTransformations.h | 0 {opt/inc => inc}/fsfw/coordinates/Jgm3Model.h | 0 .../fsfw/coordinates/Sgp4Propagator.h | 0 {opt/inc => inc}/fsfw/datalinklayer/BCFrame.h | 0 .../fsfw/datalinklayer/CCSDSReturnValuesIF.h | 0 {opt/inc => inc}/fsfw/datalinklayer/Clcw.h | 0 {opt/inc => inc}/fsfw/datalinklayer/ClcwIF.h | 0 .../fsfw/datalinklayer/DataLinkLayer.h | 0 .../fsfw/datalinklayer/Farm1StateIF.h | 0 .../fsfw/datalinklayer/Farm1StateLockout.h | 0 .../fsfw/datalinklayer/Farm1StateOpen.h | 0 .../fsfw/datalinklayer/Farm1StateWait.h | 0 .../fsfw/datalinklayer/MapPacketExtraction.h | 0 .../datalinklayer/MapPacketExtractionIF.h | 0 .../fsfw/datalinklayer/TcTransferFrame.h | 0 .../fsfw/datalinklayer/TcTransferFrameLocal.h | 0 .../datalinklayer/VirtualChannelReception.h | 0 .../datalinklayer/VirtualChannelReceptionIF.h | 0 {core/inc => inc}/fsfw/datapool/DataSetIF.h | 0 .../fsfw/datapool/HkSwitchHelper.h | 0 .../fsfw/datapool/PoolDataSetBase.h | 0 .../inc => inc}/fsfw/datapool/PoolDataSetIF.h | 0 {core/inc => inc}/fsfw/datapool/PoolEntry.h | 0 {core/inc => inc}/fsfw/datapool/PoolEntryIF.h | 0 .../inc => inc}/fsfw/datapool/PoolReadGuard.h | 0 {core/inc => inc}/fsfw/datapool/PoolVarList.h | 0 .../fsfw/datapool/PoolVariableIF.h | 0 .../inc => inc}/fsfw/datapool/ReadCommitIF.h | 0 .../fsfw/datapool/ReadCommitIFAttorney.h | 0 .../fsfw/datapool/SharedDataSetIF.h | 0 {core/inc => inc}/fsfw/datapoollocal.h | 0 .../fsfw/datapoollocal/AccessLocalPoolF.h | 0 .../fsfw/datapoollocal/HasLocalDataPoolIF.h | 0 .../fsfw/datapoollocal/LocalDataPoolManager.h | 0 .../fsfw/datapoollocal/LocalDataSet.h | 0 .../fsfw/datapoollocal/LocalPoolDataSetBase.h | 0 .../fsfw/datapoollocal/LocalPoolObjectBase.h | 0 .../fsfw/datapoollocal/LocalPoolVariable.h | 0 .../fsfw/datapoollocal/LocalPoolVariable.tpp | 0 .../fsfw/datapoollocal/LocalPoolVector.h | 0 .../fsfw/datapoollocal/LocalPoolVector.tpp | 0 .../fsfw/datapoollocal/MarkChangedIF.h | 0 .../ProvidesDataPoolSubscriptionIF.h | 0 .../fsfw/datapoollocal/SharedLocalDataSet.h | 0 .../fsfw/datapoollocal/StaticLocalDataSet.h | 0 .../fsfw/datapoollocal/localPoolDefinitions.h | 0 .../AcceptsDeviceResponsesIF.h | 0 .../fsfw/devicehandlers}/AssemblyBase.h | 0 .../fsfw/devicehandlers}/CMakeLists.txt | 0 .../fsfw/devicehandlers}/ChildHandlerBase.h | 0 .../fsfw/devicehandlers}/ChildHandlerFDIR.h | 0 .../fsfw/devicehandlers}/CookieIF.h | 0 .../devicehandlers}/DeviceCommunicationIF.h | 0 .../fsfw/devicehandlers}/DeviceHandlerBase.h | 0 .../DeviceHandlerFailureIsolation.h | 0 .../fsfw/devicehandlers}/DeviceHandlerIF.h | 0 .../devicehandlers}/DeviceHandlerMessage.h | 0 .../devicehandlers}/DeviceHandlerThermalSet.h | 0 .../DeviceTmReportingWrapper.h | 0 .../fsfw/devicehandlers}/HealthDevice.h | 0 {events => inc/fsfw/events}/Event.h | 0 {events => inc/fsfw/events}/EventManager.h | 0 {events => inc/fsfw/events}/EventManagerIF.h | 0 {events => inc/fsfw/events}/EventMessage.h | 0 .../fsfw/events}/EventReportingProxyIF.h | 0 .../fsfw/events}/eventmatching/CMakeLists.txt | 0 .../eventmatching/EventIdRangeMatcher.cpp | 0 .../eventmatching/EventIdRangeMatcher.h | 0 .../events}/eventmatching/EventMatchTree.cpp | 0 .../events}/eventmatching/EventMatchTree.h | 0 .../eventmatching/EventRangeMatcherBase.h | 0 .../eventmatching/ReporterRangeMatcher.cpp | 0 .../eventmatching/ReporterRangeMatcher.h | 0 .../eventmatching/SeverityRangeMatcher.cpp | 0 .../eventmatching/SeverityRangeMatcher.h | 0 .../events}/eventmatching/eventmatching.h | 0 .../fsfw/events}/fwSubsystemIdRanges.h | 0 {fdir => inc/fsfw/fdir}/ConfirmsFailuresIF.h | 0 {fdir => inc/fsfw/fdir}/EventCorrelation.h | 0 .../fsfw/fdir}/FailureIsolationBase.h | 0 {fdir => inc/fsfw/fdir}/FaultCounter.h | 0 .../fsfw/globalfunctions}/AsciiConverter.h | 0 .../fsfw/globalfunctions}/CRC.h | 0 .../fsfw/globalfunctions}/DleEncoder.h | 0 .../PeriodicOperationDivider.h | 0 .../fsfw/globalfunctions}/Type.h | 0 .../fsfw/globalfunctions}/arrayprinter.h | 0 .../fsfw/globalfunctions}/bitutility.h | 0 .../fsfw/globalfunctions}/constants.h | 0 .../globalfunctions}/matching/BinaryMatcher.h | 0 .../matching/DecimalMatcher.h | 0 .../globalfunctions}/matching/MatchTree.h | 0 .../globalfunctions}/matching/MatcherIF.h | 0 .../globalfunctions}/matching/RangeMatcher.h | 0 .../matching/SerializeableMatcherIF.h | 0 .../globalfunctions}/math/MatrixOperations.h | 0 .../math/QuaternionOperations.h | 0 .../globalfunctions}/math/VectorOperations.h | 0 .../fsfw/globalfunctions}/sign.h | 0 .../fsfw/globalfunctions}/timevalOperations.h | 0 {health => inc/fsfw/health}/HasHealthIF.h | 0 {health => inc/fsfw/health}/HealthHelper.h | 0 {health => inc/fsfw/health}/HealthMessage.h | 0 {health => inc/fsfw/health}/HealthTable.h | 0 {health => inc/fsfw/health}/HealthTableIF.h | 0 {health => inc/fsfw/health}/ManagesHealthIF.h | 0 .../fsfw/housekeeping}/AcceptsHkPacketsIF.h | 0 .../fsfw/housekeeping}/CMakeLists.txt | 0 .../fsfw/housekeeping}/HousekeepingMessage.h | 0 .../HousekeepingPacketDownlink.h | 0 .../housekeeping}/HousekeepingSetPacket.h | 0 .../fsfw/housekeeping}/HousekeepingSnapshot.h | 0 .../PeriodicHousekeepingHelper.h | 0 .../internalError}/InternalErrorDataset.h | 0 .../internalError}/InternalErrorReporter.h | 0 .../internalError}/InternalErrorReporterIF.h | 0 {ipc => inc/fsfw/ipc}/CommandMessage.h | 0 {ipc => inc/fsfw/ipc}/CommandMessageCleaner.h | 0 {ipc => inc/fsfw/ipc}/CommandMessageIF.h | 0 {ipc => inc/fsfw/ipc}/FwMessageTypes.h | 0 {ipc => inc/fsfw/ipc}/MessageQueueIF.h | 0 {ipc => inc/fsfw/ipc}/MessageQueueMessage.h | 0 {ipc => inc/fsfw/ipc}/MessageQueueMessageIF.h | 0 {ipc => inc/fsfw/ipc}/MessageQueueSenderIF.h | 0 {ipc => inc/fsfw/ipc}/MutexFactory.h | 0 {ipc => inc/fsfw/ipc}/MutexGuard.h | 0 {ipc => inc/fsfw/ipc}/MutexIF.h | 0 {ipc => inc/fsfw/ipc}/QueueFactory.h | 0 .../fsfw/ipc}/messageQueueDefinitions.h | 0 .../fsfw/memory}/AcceptsMemoryMessagesIF.h | 0 .../fsfw/memory}/GenericFileSystemMessage.h | 0 {memory => inc/fsfw/memory}/HasFileSystemIF.h | 0 {memory => inc/fsfw/memory}/HasMemoryIF.h | 0 {memory => inc/fsfw/memory}/MemoryHelper.h | 0 {memory => inc/fsfw/memory}/MemoryMessage.h | 0 {modes => inc/fsfw/modes}/HasModesIF.h | 0 {modes => inc/fsfw/modes}/ModeHelper.h | 0 {modes => inc/fsfw/modes}/ModeMessage.h | 0 .../fsfw/monitoring}/AbsLimitMonitor.h | 0 .../fsfw/monitoring}/HasMonitorsIF.h | 0 .../fsfw/monitoring}/LimitMonitor.h | 0 .../fsfw/monitoring}/LimitViolationReporter.h | 0 .../fsfw/monitoring}/MonitorBase.h | 0 .../fsfw/monitoring}/MonitorReporter.h | 0 .../fsfw/monitoring}/MonitoringIF.h | 3 - .../fsfw/monitoring}/MonitoringMessage.h | 0 .../monitoring}/MonitoringMessageContent.h | 0 .../monitoring}/ReceivesMonitoringReportsIF.h | 0 .../fsfw/monitoring}/TriplexMonitor.h | 0 .../fsfw/monitoring}/TwoValueLimitMonitor.h | 0 .../fsfw/objectmanager}/ObjectManager.h | 0 .../fsfw/objectmanager}/ObjectManagerIF.h | 0 .../fsfw/objectmanager}/SystemObject.h | 0 .../fsfw/objectmanager}/SystemObjectIF.h | 0 .../fsfw/objectmanager}/frameworkObjects.h | 0 {osal => inc/fsfw/osal}/Endiness.h | 0 {osal => inc/fsfw/osal}/InternalErrorCodes.h | 0 {osal => inc/fsfw/osal}/common/TcpIpBase.h | 0 .../fsfw/osal}/common/TcpTmTcBridge.h | 0 .../fsfw/osal}/common/TcpTmTcServer.h | 0 .../fsfw/osal}/common/UdpTcPollingTask.h | 0 .../fsfw/osal}/common/UdpTmTcBridge.h | 0 {osal => inc/fsfw/osal}/common/tcpipCommon.h | 0 {osal => inc/fsfw/osal}/common/tcpipHelpers.h | 0 .../fsfw/osal/freertos}/BinSemaphUsingTask.h | 0 .../fsfw/osal/freertos}/BinarySemaphore.h | 0 .../osal/freertos}/CountingSemaphUsingTask.h | 0 .../fsfw/osal/freertos}/CountingSemaphore.h | 0 .../fsfw/osal/freertos}/FixedTimeslotTask.h | 0 .../fsfw/osal/freertos}/FreeRTOSTaskIF.h | 0 .../fsfw/osal/freertos}/MessageQueue.h | 0 .../fsfw/osal/freertos}/Mutex.h | 0 .../fsfw/osal/freertos}/PeriodicTask.h | 0 .../fsfw/osal/freertos}/QueueMapManager.h | 0 .../fsfw/osal/freertos}/README.md | 0 .../fsfw/osal/freertos}/TaskManagement.h | 0 .../fsfw/osal/freertos}/Timekeeper.h | 0 .../fsfw/osal}/host/FixedTimeslotTask.h | 0 {osal => inc/fsfw/osal}/host/MessageQueue.h | 0 {osal => inc/fsfw/osal}/host/Mutex.cpp | 0 {osal => inc/fsfw/osal}/host/Mutex.h | 0 {osal => inc/fsfw/osal}/host/PeriodicTask.h | 0 .../fsfw/osal}/host/QueueMapManager.h | 0 {osal => inc/fsfw/osal}/host/taskHelpers.h | 0 .../fsfw/osal}/linux/BinarySemaphore.h | 0 .../fsfw/osal}/linux/CountingSemaphore.h | 0 .../fsfw/osal}/linux/FixedTimeslotTask.h | 0 {osal => inc/fsfw/osal}/linux/MessageQueue.h | 0 {osal => inc/fsfw/osal}/linux/Mutex.h | 0 .../fsfw/osal}/linux/PeriodicPosixTask.h | 0 {osal => inc/fsfw/osal}/linux/PosixThread.h | 0 {osal => inc/fsfw/osal}/linux/Timer.h | 0 {osal => inc/fsfw/osal}/linux/unixUtility.h | 0 {osal => inc/fsfw/osal}/rtems/CpuUsage.h | 0 .../fsfw/osal}/rtems/FixedTimeslotTask.h | 0 {osal => inc/fsfw/osal}/rtems/InitTask.h | 0 {osal => inc/fsfw/osal}/rtems/MessageQueue.h | 0 {osal => inc/fsfw/osal}/rtems/Mutex.h | 0 {osal => inc/fsfw/osal}/rtems/PeriodicTask.h | 0 {osal => inc/fsfw/osal}/rtems/RTEMSTaskBase.h | 0 {osal => inc/fsfw/osal}/rtems/RtemsBasic.h | 0 .../fsfw/osal}/windows/winTaskHelpers.h | 0 .../fsfw/parameters}/HasParametersIF.h | 0 .../fsfw/parameters}/ParameterHelper.h | 0 .../fsfw/parameters}/ParameterMessage.h | 0 .../fsfw/parameters}/ParameterWrapper.h | 0 .../parameters}/ReceivesParameterMessagesIF.h | 0 platform.h => inc/fsfw/platform.h | 0 {power => inc/fsfw/power}/Fuse.h | 0 {power => inc/fsfw/power}/PowerComponent.h | 0 {power => inc/fsfw/power}/PowerComponentIF.h | 0 {power => inc/fsfw/power}/PowerSensor.h | 0 {power => inc/fsfw/power}/PowerSwitchIF.h | 0 {power => inc/fsfw/power}/PowerSwitcher.h | 0 .../fsfw/pus}/CService200ModeCommanding.h | 0 .../fsfw/pus}/CService201HealthCommanding.h | 0 {pus => inc/fsfw/pus}/Service17Test.h | 0 .../pus}/Service1TelecommandVerification.h | 0 .../fsfw/pus}/Service20ParameterManagement.h | 0 {pus => inc/fsfw/pus}/Service2DeviceAccess.h | 0 {pus => inc/fsfw/pus}/Service3Housekeeping.h | 0 .../fsfw/pus}/Service5EventReporting.h | 0 .../fsfw/pus}/Service8FunctionManagement.h | 0 .../fsfw/pus}/Service9TimeManagement.h | 0 .../pus}/servicepackets/Service1Packets.h | 0 .../pus}/servicepackets/Service200Packets.h | 0 .../pus}/servicepackets/Service201Packets.h | 0 .../pus}/servicepackets/Service20Packets.h | 0 .../pus}/servicepackets/Service2Packets.h | 0 .../pus}/servicepackets/Service3Packets.h | 0 .../pus}/servicepackets/Service5Packets.h | 0 .../pus}/servicepackets/Service8Packets.h | 0 .../pus}/servicepackets/Service9Packets.h | 0 .../fsfw/returnvalues}/FwClassIds.h | 0 .../fsfw/returnvalues}/HasReturnvaluesIF.h | 0 {rmap => inc/fsfw/rmap}/RMAP.h | 0 {rmap => inc/fsfw/rmap}/RMAPChannelIF.h | 0 {rmap => inc/fsfw/rmap}/RMAPCookie.h | 0 .../fsfw/rmap}/RmapDeviceCommunicationIF.h | 0 {rmap => inc/fsfw/rmap}/rmapStructs.h | 0 .../fsfw/serialize}/EndianConverter.h | 0 .../fsfw/serialize}/SerialArrayListAdapter.h | 0 .../fsfw/serialize}/SerialBufferAdapter.h | 0 .../serialize}/SerialFixedArrayListAdapter.h | 0 .../fsfw/serialize}/SerialLinkedListAdapter.h | 0 .../fsfw/serialize}/SerializeAdapter.h | 0 .../fsfw/serialize}/SerializeElement.h | 0 .../fsfw/serialize}/SerializeIF.h | 0 .../fsfw/serviceinterface}/ServiceInterface.h | 0 .../ServiceInterfaceBuffer.h | 0 .../ServiceInterfacePrinter.h | 0 .../ServiceInterfaceStream.h | 0 .../serviceInterfaceDefintions.h | 0 .../storagemanager}/ConstStorageAccessor.h | 0 .../fsfw/storagemanager}/LocalPool.h | 0 .../fsfw/storagemanager}/PoolManager.h | 0 .../fsfw/storagemanager}/StorageAccessor.h | 0 .../fsfw/storagemanager}/StorageManagerIF.h | 0 .../fsfw/storagemanager}/storeAddress.h | 0 {subsystem => inc/fsfw/subsystem}/Subsystem.h | 0 .../fsfw/subsystem}/SubsystemBase.h | 0 .../fsfw/subsystem}/modes/HasModeSequenceIF.h | 0 .../fsfw/subsystem}/modes/ModeDefinitions.h | 0 .../subsystem}/modes/ModeSequenceMessage.h | 0 .../fsfw/subsystem}/modes/ModeStore.h | 0 .../fsfw/subsystem}/modes/ModeStoreIF.h | 0 .../fsfw/tasks}/ExecutableObjectIF.h | 0 {tasks => inc/fsfw/tasks}/FixedSequenceSlot.h | 0 {tasks => inc/fsfw/tasks}/FixedSlotSequence.h | 0 .../fsfw/tasks}/FixedTimeslotTaskIF.h | 0 {tasks => inc/fsfw/tasks}/PeriodicTaskIF.h | 0 {tasks => inc/fsfw/tasks}/SemaphoreFactory.h | 0 {tasks => inc/fsfw/tasks}/SemaphoreIF.h | 0 {tasks => inc/fsfw/tasks}/TaskFactory.h | 0 {tasks => inc/fsfw/tasks}/Typedef.h | 0 .../fsfw/tcdistribution}/CCSDSDistributor.h | 0 .../fsfw/tcdistribution}/CCSDSDistributorIF.h | 0 .../fsfw/tcdistribution}/PUSDistributor.h | 0 .../fsfw/tcdistribution}/PUSDistributorIF.h | 0 .../fsfw/tcdistribution}/TcDistributor.h | 0 .../fsfw/tcdistribution}/TcPacketCheck.h | 0 .../fsfw/thermal}/AbstractTemperatureSensor.h | 0 .../fsfw/thermal}/AcceptsThermalMessagesIF.h | 0 {thermal => inc/fsfw/thermal}/Heater.h | 0 .../fsfw/thermal}/RedundantHeater.h | 0 .../fsfw/thermal}/TemperatureSensor.h | 0 .../fsfw/thermal}/ThermalComponent.h | 0 .../fsfw/thermal}/ThermalComponentCore.h | 0 .../fsfw/thermal}/ThermalComponentIF.h | 0 {thermal => inc/fsfw/thermal}/ThermalModule.h | 0 .../fsfw/thermal}/ThermalModuleIF.h | 0 .../fsfw/thermal}/ThermalMonitorReporter.h | 0 .../fsfw/thermal}/tcsDefinitions.h | 0 .../fsfw/timemanager}/CCSDSTime.h | 0 {timemanager => inc/fsfw/timemanager}/Clock.h | 0 .../fsfw/timemanager}/Countdown.h | 0 .../fsfw/timemanager}/ReceivesTimeInfoIF.h | 0 .../fsfw/timemanager}/Stopwatch.h | 0 .../fsfw/timemanager}/TimeMessage.h | 0 .../fsfw/timemanager}/TimeStamper.h | 0 .../fsfw/timemanager}/TimeStamperIF.h | 0 .../fsfw/timemanager}/clockDefinitions.h | 0 .../fsfw/tmstorage}/TmStoreBackendIF.h | 0 .../fsfw/tmstorage}/TmStoreFrontendIF.h | 0 .../fsfw/tmstorage}/TmStoreMessage.h | 0 .../fsfw/tmstorage}/TmStorePackets.h | 0 .../fsfw/tmtcpacket}/SpacePacket.h | 0 .../fsfw/tmtcpacket}/SpacePacketBase.h | 0 .../fsfw/tmtcpacket}/ccsds_header.h | 0 .../tmtcpacket}/packetmatcher/ApidMatcher.h | 0 .../packetmatcher/PacketMatchTree.h | 0 .../packetmatcher/ServiceMatcher.h | 0 .../packetmatcher/SubserviceMatcher.h | 0 .../pus/PacketTimestampInterpreterIF.h | 0 {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tc.h | 0 .../fsfw/tmtcpacket}/pus/tc/TcPacketBase.h | 0 .../fsfw/tmtcpacket}/pus/tc/TcPacketPus.h | 0 .../tmtcpacket}/pus/tc/TcPacketStoredBase.h | 0 .../tmtcpacket}/pus/tc/TcPacketStoredIF.h | 0 .../tmtcpacket}/pus/tc/TcPacketStoredPus.h | 0 {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm.h | 0 .../fsfw/tmtcpacket}/pus/tm/TmPacketBase.h | 0 .../fsfw/tmtcpacket}/pus/tm/TmPacketMinimal.h | 0 .../fsfw/tmtcpacket}/pus/tm/TmPacketPusA.h | 0 .../fsfw/tmtcpacket}/pus/tm/TmPacketPusC.h | 0 .../fsfw/tmtcpacket}/pus/tm/TmPacketStored.h | 0 .../tmtcpacket}/pus/tm/TmPacketStoredBase.h | 0 .../tmtcpacket}/pus/tm/TmPacketStoredPusA.h | 0 .../tmtcpacket}/pus/tm/TmPacketStoredPusC.h | 0 .../tmtcservices}/AcceptsTelecommandsIF.h | 0 .../fsfw/tmtcservices}/AcceptsTelemetryIF.h | 0 .../tmtcservices}/AcceptsVerifyMessageIF.h | 0 .../tmtcservices}/CommandingServiceBase.h | 0 .../fsfw/tmtcservices}/PusServiceBase.h | 0 .../tmtcservices}/PusVerificationReport.h | 0 .../tmtcservices}/SourceSequenceCounter.h | 0 .../fsfw/tmtcservices}/TmTcBridge.h | 0 .../fsfw/tmtcservices}/TmTcMessage.h | 0 .../fsfw/tmtcservices}/VerificationCodes.h | 0 .../fsfw/tmtcservices}/VerificationReporter.h | 0 {defaultcfg => misc/defaultcfg}/README.md | 0 .../defaultcfg}/fsfwconfig/CMakeLists.txt | 0 .../defaultcfg}/fsfwconfig/FSFWConfig.h | 0 .../defaultcfg}/fsfwconfig/OBSWConfig.h | 0 .../defaultcfg}/fsfwconfig/OBSWVersion.h | 0 .../fsfwconfig/devices/logicalAddresses.h | 0 .../fsfwconfig/devices/powerSwitcherList.h | 0 .../fsfwconfig/events/subsystemIdRanges.h | 0 .../defaultcfg}/fsfwconfig/fsfwconfig.mk | 0 .../fsfwconfig/ipc/missionMessageTypes.cpp | 0 .../fsfwconfig/ipc/missionMessageTypes.h | 0 .../fsfwconfig/objects/FsfwFactory.cpp | 0 .../fsfwconfig/objects/FsfwFactory.h | 0 .../fsfwconfig/objects/systemObjectList.h | 0 .../PollingSequenceFactory.cpp | 0 .../pollingsequence/PollingSequenceFactory.h | 0 .../fsfwconfig/returnvalues/classIds.h | 0 .../defaultcfg}/fsfwconfig/tmtc/apid.h | 0 .../defaultcfg}/fsfwconfig/tmtc/pusIds.h | 0 {logo => misc/logo}/FSFW_Logo_V3.png | Bin {logo => misc/logo}/FSFW_Logo_V3.svg | 0 {logo => misc/logo}/FSFW_Logo_V3_bw.png | Bin .../src => src/core}/action/ActionHelper.cpp | 0 .../src => src/core}/action/ActionMessage.cpp | 0 {core/src => src/core}/action/CMakeLists.txt | 0 .../core}/action/CommandActionHelper.cpp | 0 .../core}/action/SimpleActionHelper.cpp | 0 .../src => src/core}/container/CMakeLists.txt | 0 .../core}/container/SharedRingBuffer.cpp | 0 .../core}/container/SimpleRingBuffer.cpp | 0 .../core}/controller/CMakeLists.txt | 0 .../core}/controller/ControllerBase.cpp | 0 .../controller/ExtendedControllerBase.cpp | 0 .../src => src/core}/datapool/CMakeLists.txt | 0 .../core}/datapool/HkSwitchHelper.cpp | 0 .../core}/datapool/PoolDataSetBase.cpp | 0 {core/src => src/core}/datapool/PoolEntry.cpp | 0 .../core}/datapoollocal/CMakeLists.txt | 0 .../datapoollocal/LocalDataPoolManager.cpp | 0 .../core}/datapoollocal/LocalDataSet.cpp | 0 .../datapoollocal/LocalPoolDataSetBase.cpp | 0 .../datapoollocal/LocalPoolObjectBase.cpp | 0 .../datapoollocal/SharedLocalDataSet.cpp | 0 .../datapoollocal/internal/CMakeLists.txt | 0 .../internal/HasLocalDpIFManagerAttorney.cpp | 0 .../internal/HasLocalDpIFManagerAttorney.h | 0 .../internal/HasLocalDpIFUserAttorney.cpp | 0 .../internal/HasLocalDpIFUserAttorney.h | 0 .../internal/LocalDpManagerAttorney.h | 0 .../internal/LocalPoolDataSetAttorney.h | 0 .../core/devicehandlers}/AssemblyBase.cpp | 0 .../core/devicehandlers}/ChildHandlerBase.cpp | 0 .../core/devicehandlers}/ChildHandlerFDIR.cpp | 0 .../devicehandlers}/DeviceHandlerBase.cpp | 0 .../DeviceHandlerFailureIsolation.cpp | 0 .../devicehandlers}/DeviceHandlerMessage.cpp | 0 .../DeviceTmReportingWrapper.cpp | 0 .../core/devicehandlers}/HealthDevice.cpp | 0 {events => src/core/events}/CMakeLists.txt | 0 {events => src/core/events}/EventManager.cpp | 0 {events => src/core/events}/EventMessage.cpp | 0 {fdir => src/core/fdir}/CMakeLists.txt | 0 {fdir => src/core/fdir}/EventCorrelation.cpp | 0 .../core/fdir}/FailureIsolationBase.cpp | 0 {fdir => src/core/fdir}/FaultCounter.cpp | 0 .../core/globalfunctions}/AsciiConverter.cpp | 0 .../core/globalfunctions}/CMakeLists.txt | 0 .../core/globalfunctions}/CRC.cpp | 0 .../core/globalfunctions}/DleEncoder.cpp | 0 .../PeriodicOperationDivider.cpp | 0 .../core/globalfunctions}/Type.cpp | 0 .../core/globalfunctions}/arrayprinter.cpp | 0 .../core/globalfunctions}/bitutility.cpp | 0 .../core/globalfunctions}/math/CMakeLists.txt | 0 .../math/QuaternionOperations.cpp | 0 .../globalfunctions}/timevalOperations.cpp | 0 {health => src/core/health}/CMakeLists.txt | 0 {health => src/core/health}/HealthHelper.cpp | 0 {health => src/core/health}/HealthMessage.cpp | 0 {health => src/core/health}/HealthTable.cpp | 0 .../housekeeping}/HousekeepingMessage.cpp | 0 .../PeriodicHousekeepingHelper.cpp | 0 .../core/internalError}/CMakeLists.txt | 0 .../internalError}/InternalErrorReporter.cpp | 0 {ipc => src/core/ipc}/CMakeLists.txt | 0 {ipc => src/core/ipc}/CommandMessage.cpp | 0 .../core/ipc}/CommandMessageCleaner.cpp | 0 {ipc => src/core/ipc}/MessageQueueMessage.cpp | 0 {modes => src/core/modes}/CMakeLists.txt | 0 {modes => src/core/modes}/ModeHelper.cpp | 0 {modes => src/core/modes}/ModeMessage.cpp | 0 .../core/objectmanager}/CMakeLists.txt | 0 .../core/objectmanager}/ObjectManager.cpp | 0 .../core/objectmanager}/SystemObject.cpp | 0 .../core/parameters}/CMakeLists.txt | 0 .../core/parameters}/ParameterHelper.cpp | 0 .../core/parameters}/ParameterMessage.cpp | 0 .../core/parameters}/ParameterWrapper.cpp | 0 {power => src/core/power}/CMakeLists.txt | 0 {power => src/core/power}/Fuse.cpp | 0 {power => src/core/power}/PowerComponent.cpp | 0 {power => src/core/power}/PowerSensor.cpp | 0 {power => src/core/power}/PowerSwitcher.cpp | 0 .../core/serialize}/CMakeLists.txt | 0 .../core/serialize}/SerialBufferAdapter.cpp | 0 .../core/serviceinterface}/CMakeLists.txt | 0 .../ServiceInterfaceBuffer.cpp | 0 .../ServiceInterfacePrinter.cpp | 0 .../ServiceInterfaceStream.cpp | 0 .../core/storagemanager}/CMakeLists.txt | 0 .../storagemanager}/ConstStorageAccessor.cpp | 0 .../core/storagemanager}/LocalPool.cpp | 0 .../core/storagemanager}/PoolManager.cpp | 0 .../core/storagemanager}/StorageAccessor.cpp | 0 .../core/subsystem}/CMakeLists.txt | 0 .../core/subsystem}/Subsystem.cpp | 0 .../core/subsystem}/SubsystemBase.cpp | 0 .../core/subsystem}/modes/CMakeLists.txt | 0 .../subsystem}/modes/ModeSequenceMessage.cpp | 0 .../core/subsystem}/modes/ModeStore.cpp | 0 {tasks => src/core/tasks}/CMakeLists.txt | 0 .../core/tasks}/FixedSequenceSlot.cpp | 0 .../core/tasks}/FixedSlotSequence.cpp | 0 .../core/tcdistribution}/CCSDSDistributor.cpp | 0 .../core/tcdistribution}/CMakeLists.txt | 0 .../core/tcdistribution}/PUSDistributor.cpp | 0 .../core/tcdistribution}/TcDistributor.cpp | 0 .../core/tcdistribution}/TcPacketCheck.cpp | 0 .../thermal}/AbstractTemperatureSensor.cpp | 0 {thermal => src/core/thermal}/CMakeLists.txt | 0 {thermal => src/core/thermal}/Heater.cpp | 0 .../core/thermal}/RedundantHeater.cpp | 0 .../core/thermal}/ThermalComponent.cpp | 0 .../core/thermal}/ThermalComponentCore.cpp | 0 .../core/thermal}/ThermalModule.cpp | 0 .../core/thermal}/ThermalMonitorReporter.cpp | 0 .../core/timemanager}/CCSDSTime.cpp | 0 .../core/timemanager}/CMakeLists.txt | 0 .../core/timemanager}/ClockCommon.cpp | 0 .../core/timemanager}/Countdown.cpp | 0 .../core/timemanager}/Stopwatch.cpp | 0 .../core/timemanager}/TimeMessage.cpp | 0 .../core/timemanager}/TimeStamper.cpp | 0 .../core/tmtcpacket}/CMakeLists.txt | 0 .../core/tmtcpacket}/SpacePacket.cpp | 0 .../core/tmtcpacket}/SpacePacketBase.cpp | 0 .../tmtcpacket}/packetmatcher/CMakeLists.txt | 0 .../packetmatcher/PacketMatchTree.cpp | 0 .../core/tmtcpacket}/pus/CMakeLists.txt | 0 .../core/tmtcpacket}/pus/tc/CMakeLists.txt | 0 .../core/tmtcpacket}/pus/tc/TcPacketBase.cpp | 0 .../core/tmtcpacket}/pus/tc/TcPacketPus.cpp | 0 .../tmtcpacket}/pus/tc/TcPacketStoredBase.cpp | 0 .../tmtcpacket}/pus/tc/TcPacketStoredPus.cpp | 0 .../core/tmtcpacket}/pus/tm/CMakeLists.txt | 0 .../core/tmtcpacket}/pus/tm/TmPacketBase.cpp | 0 .../tmtcpacket}/pus/tm/TmPacketMinimal.cpp | 0 .../core/tmtcpacket}/pus/tm/TmPacketPusA.cpp | 0 .../core/tmtcpacket}/pus/tm/TmPacketPusC.cpp | 0 .../tmtcpacket}/pus/tm/TmPacketStoredBase.cpp | 0 .../tmtcpacket}/pus/tm/TmPacketStoredPusA.cpp | 0 .../tmtcpacket}/pus/tm/TmPacketStoredPusC.cpp | 0 .../core/tmtcservices}/CMakeLists.txt | 0 .../tmtcservices}/CommandingServiceBase.cpp | 0 .../core/tmtcservices}/PusServiceBase.cpp | 0 .../tmtcservices}/PusVerificationReport.cpp | 0 .../core/tmtcservices}/TmTcBridge.cpp | 0 .../core/tmtcservices}/TmTcMessage.cpp | 0 .../tmtcservices}/VerificationReporter.cpp | 0 .../opt}/coordinates/CMakeLists.txt | 0 .../coordinates/CoordinateTransformations.cpp | 0 .../opt}/coordinates/Sgp4Propagator.cpp | 0 .../opt}/datalinklayer/CMakeLists.txt | 0 {opt/src => src/opt}/datalinklayer/Clcw.cpp | 0 .../opt}/datalinklayer/DataLinkLayer.cpp | 0 .../opt}/datalinklayer/Farm1StateLockout.cpp | 0 .../opt}/datalinklayer/Farm1StateOpen.cpp | 0 .../opt}/datalinklayer/Farm1StateWait.cpp | 0 .../datalinklayer/MapPacketExtraction.cpp | 0 .../opt}/datalinklayer/TcTransferFrame.cpp | 0 .../datalinklayer/TcTransferFrameLocal.cpp | 0 .../datalinklayer/VirtualChannelReception.cpp | 0 {memory => src/opt/memory}/CMakeLists.txt | 0 .../opt/memory}/GenericFileSystemMessage.cpp | 0 {memory => src/opt/memory}/MemoryHelper.cpp | 0 {memory => src/opt/memory}/MemoryMessage.cpp | 0 .../opt/monitoring}/CMakeLists.txt | 0 .../monitoring}/LimitViolationReporter.cpp | 0 .../opt/monitoring}/MonitoringMessage.cpp | 0 {pus => src/opt/pus}/CMakeLists.txt | 0 .../opt/pus}/CService200ModeCommanding.cpp | 0 .../opt/pus}/CService201HealthCommanding.cpp | 0 {pus => src/opt/pus}/Service17Test.cpp | 0 .../pus}/Service1TelecommandVerification.cpp | 0 .../opt/pus}/Service20ParameterManagement.cpp | 0 {pus => src/opt/pus}/Service2DeviceAccess.cpp | 0 {pus => src/opt/pus}/Service3Housekeeping.cpp | 0 .../opt/pus}/Service5EventReporting.cpp | 0 .../opt/pus}/Service8FunctionManagement.cpp | 0 .../opt/pus}/Service9TimeManagement.cpp | 0 {rmap => src/opt/rmap}/CMakeLists.txt | 0 {rmap => src/opt/rmap}/RMAP.cpp | 0 {rmap => src/opt/rmap}/RMAPCookie.cpp | 0 .../opt/rmap}/RmapDeviceCommunicationIF.cpp | 0 .../opt/tmstorage}/CMakeLists.txt | 0 .../opt/tmstorage}/TmStoreMessage.cpp | 0 {osal => src/osal}/CMakeLists.txt | 0 {osal => src/osal}/common/CMakeLists.txt | 0 {osal => src/osal}/common/TcpIpBase.cpp | 0 {osal => src/osal}/common/TcpTmTcBridge.cpp | 0 {osal => src/osal}/common/TcpTmTcServer.cpp | 0 .../osal}/common/UdpTcPollingTask.cpp | 0 {osal => src/osal}/common/UdpTmTcBridge.cpp | 0 {osal => src/osal}/common/tcpipCommon.cpp | 0 .../osal/freertos}/BinSemaphUsingTask.cpp | 0 .../osal/freertos}/BinarySemaphore.cpp | 0 .../osal/freertos}/CMakeLists.txt | 0 .../FreeRTOS => src/osal/freertos}/Clock.cpp | 0 .../freertos}/CountingSemaphUsingTask.cpp | 0 .../osal/freertos}/CountingSemaphore.cpp | 0 .../osal/freertos}/FixedTimeslotTask.cpp | 0 .../osal/freertos}/MessageQueue.cpp | 0 .../FreeRTOS => src/osal/freertos}/Mutex.cpp | 0 .../osal/freertos}/MutexFactory.cpp | 0 .../osal/freertos}/PeriodicTask.cpp | 0 .../osal/freertos}/QueueFactory.cpp | 0 .../osal/freertos}/QueueMapManager.cpp | 0 .../osal/freertos}/SemaphoreFactory.cpp | 0 .../osal/freertos}/TaskFactory.cpp | 0 .../osal/freertos}/TaskManagement.cpp | 0 .../osal/freertos}/Timekeeper.cpp | 0 {osal => src/osal}/host/CMakeLists.txt | 0 {osal => src/osal}/host/Clock.cpp | 0 {osal => src/osal}/host/FixedTimeslotTask.cpp | 0 {osal => src/osal}/host/MessageQueue.cpp | 0 {osal => src/osal}/host/MutexFactory.cpp | 0 {osal => src/osal}/host/PeriodicTask.cpp | 0 {osal => src/osal}/host/QueueFactory.cpp | 0 {osal => src/osal}/host/QueueMapManager.cpp | 0 {osal => src/osal}/host/SemaphoreFactory.cpp | 0 {osal => src/osal}/host/TaskFactory.cpp | 0 {osal => src/osal}/host/taskHelpers.cpp | 0 {osal => src/osal}/linux/BinarySemaphore.cpp | 0 {osal => src/osal}/linux/CMakeLists.txt | 0 {osal => src/osal}/linux/Clock.cpp | 0 .../osal}/linux/CountingSemaphore.cpp | 0 .../osal}/linux/FixedTimeslotTask.cpp | 0 .../osal}/linux/InternalErrorCodes.cpp | 0 {osal => src/osal}/linux/MessageQueue.cpp | 0 {osal => src/osal}/linux/Mutex.cpp | 0 {osal => src/osal}/linux/MutexFactory.cpp | 0 .../osal}/linux/PeriodicPosixTask.cpp | 0 {osal => src/osal}/linux/PosixThread.cpp | 0 {osal => src/osal}/linux/QueueFactory.cpp | 0 {osal => src/osal}/linux/SemaphoreFactory.cpp | 0 {osal => src/osal}/linux/TaskFactory.cpp | 0 {osal => src/osal}/linux/Timer.cpp | 0 {osal => src/osal}/linux/tcpipHelpers.cpp | 0 {osal => src/osal}/linux/unixUtility.cpp | 0 {osal => src/osal}/rtems/CMakeLists.txt | 0 {osal => src/osal}/rtems/Clock.cpp | 0 {osal => src/osal}/rtems/CpuUsage.cpp | 0 .../osal}/rtems/FixedTimeslotTask.cpp | 0 {osal => src/osal}/rtems/InitTask.cpp | 0 .../osal}/rtems/InternalErrorCodes.cpp | 0 {osal => src/osal}/rtems/MessageQueue.cpp | 0 {osal => src/osal}/rtems/Mutex.cpp | 0 {osal => src/osal}/rtems/MutexFactory.cpp | 0 {osal => src/osal}/rtems/PeriodicTask.cpp | 0 {osal => src/osal}/rtems/QueueFactory.cpp | 0 {osal => src/osal}/rtems/RTEMSTaskBase.cpp | 0 {osal => src/osal}/rtems/RtemsBasic.cpp | 0 {osal => src/osal}/rtems/TaskFactory.cpp | 0 {osal => src/osal}/windows/CMakeLists.txt | 0 {osal => src/osal}/windows/tcpipHelpers.cpp | 0 {osal => src/osal}/windows/winTaskHelpers.cpp | 0 {unittest => src/tests}/CMakeLists.txt | 0 {unittest => src/tests}/README.md | 0 .../tests}/internal/CMakeLists.txt | 0 .../tests}/internal/InternalUnitTester.cpp | 0 .../tests}/internal/InternalUnitTester.h | 0 .../tests}/internal/UnittDefinitions.cpp | 0 .../tests}/internal/UnittDefinitions.h | 0 .../internal/globalfunctions/CMakeLists.txt | 0 .../globalfunctions/TestArrayPrinter.cpp | 0 .../globalfunctions/TestArrayPrinter.h | 0 {unittest => src/tests}/internal/internal.mk | 0 .../tests}/internal/osal/CMakeLists.txt | 0 .../tests}/internal/osal/IntTestMq.cpp | 0 .../tests}/internal/osal/IntTestMq.h | 0 .../tests}/internal/osal/IntTestMutex.cpp | 0 .../tests}/internal/osal/IntTestMutex.h | 0 .../tests}/internal/osal/IntTestSemaphore.cpp | 0 .../tests}/internal/osal/IntTestSemaphore.h | 0 .../tests}/internal/serialize/CMakeLists.txt | 0 .../serialize/IntTestSerialization.cpp | 0 .../internal/serialize/IntTestSerialization.h | 0 {unittest => src/tests}/lcov.sh | 0 {unittest => src/tests}/tests/CMakeLists.txt | 0 .../tests}/tests/action/CMakeLists.txt | 0 .../tests}/tests/action/TestActionHelper.cpp | 0 .../tests}/tests/action/TestActionHelper.h | 0 .../tests}/tests/container/CMakeLists.txt | 0 .../tests}/tests/container/RingBufferTest.cpp | 0 .../tests}/tests/container/TestArrayList.cpp | 0 .../tests/container/TestDynamicFifo.cpp | 0 .../tests}/tests/container/TestFifo.cpp | 0 .../tests/container/TestFixedArrayList.cpp | 0 .../tests}/tests/container/TestFixedMap.cpp | 0 .../container/TestFixedOrderedMultimap.cpp | 0 .../tests/container/TestPlacementFactory.cpp | 0 .../tests}/tests/datapoollocal/CMakeLists.txt | 0 .../tests/datapoollocal/DataSetTest.cpp | 0 .../datapoollocal/LocalPoolManagerTest.cpp | 0 .../datapoollocal/LocalPoolOwnerBase.cpp | 0 .../tests/datapoollocal/LocalPoolOwnerBase.h | 0 .../datapoollocal/LocalPoolVariableTest.cpp | 0 .../datapoollocal/LocalPoolVectorTest.cpp | 0 .../tests/globalfunctions/CMakeLists.txt | 0 .../tests}/tests/mocks/HkReceiverMock.h | 0 .../tests}/tests/mocks/MessageQueueMockBase.h | 0 .../tests}/tests/osal/CMakeLists.txt | 0 .../tests}/tests/osal/TestMessageQueue.cpp | 0 .../tests}/tests/osal/TestSemaphore.cpp | 0 .../tests}/tests/serialize/CMakeLists.txt | 0 .../serialize/TestSerialBufferAdapter.cpp | 0 .../serialize/TestSerialLinkedPacket.cpp | 0 .../tests/serialize/TestSerialLinkedPacket.h | 0 .../tests/serialize/TestSerialization.cpp | 0 .../tests/storagemanager/CMakeLists.txt | 0 .../tests/storagemanager/TestNewAccessor.cpp | 0 .../tests}/tests/storagemanager/TestPool.cpp | 0 {unittest => src/tests}/tests/tests.mk | 0 .../tests}/tests/tmtcpacket/CMakeLists.txt | 0 .../tests}/tests/tmtcpacket/PusTmTest.cpp | 0 {unittest => src/tests}/user/CMakeLists.txt | 0 .../tests}/user/testcfg/CMakeLists.txt | 0 .../tests}/user/testcfg/FSFWConfig.h | 0 .../tests}/user/testcfg/Makefile-FSFW-Tests | 0 .../tests}/user/testcfg/TestsConfig.h | 0 .../user/testcfg/cdatapool/dataPoolInit.cpp | 0 .../user/testcfg/cdatapool/dataPoolInit.h | 0 .../user/testcfg/devices/logicalAddresses.cpp | 0 .../user/testcfg/devices/logicalAddresses.h | 0 .../testcfg/devices/powerSwitcherList.cpp | 0 .../user/testcfg/devices/powerSwitcherList.h | 0 .../user/testcfg/events/subsystemIdRanges.h | 0 .../user/testcfg/ipc/MissionMessageTypes.cpp | 0 .../user/testcfg/ipc/MissionMessageTypes.h | 0 .../user/testcfg/objects/systemObjectList.h | 0 .../PollingSequenceFactory.cpp | 0 .../pollingsequence/PollingSequenceFactory.h | 0 .../user/testcfg/returnvalues/classIds.h | 0 .../tests}/user/testcfg/testcfg.mk | 0 .../tests}/user/testcfg/tmtc/apid.h | 0 .../tests}/user/testcfg/tmtc/pusIds.h | 0 .../tests}/user/testtemplate/TestTemplate.cpp | 0 .../tests}/user/unittest/CMakeLists.txt | 0 .../tests}/user/unittest/core/CMakeLists.txt | 0 .../user/unittest/core/CatchDefinitions.cpp | 0 .../user/unittest/core/CatchDefinitions.h | 0 .../user/unittest/core/CatchFactory.cpp | 0 .../tests}/user/unittest/core/CatchFactory.h | 0 .../tests}/user/unittest/core/CatchRunner.cpp | 0 .../tests}/user/unittest/core/CatchSetup.cpp | 0 .../tests}/user/unittest/core/core.mk | 0 .../tests}/user/unittest/core/printChar.cpp | 0 .../tests}/user/unittest/core/printChar.h | 0 .../tests}/user/unlockRealtime.sh | 0 738 files changed, 78 deletions(-) delete mode 100644 fsfw.mk rename FSFW.h => inc/fsfw/FSFW.h (100%) rename FSFWVersion.h => inc/fsfw/FSFWVersion.h (100%) rename {core/inc => inc}/fsfw/action/ActionHelper.h (100%) rename {core/inc => inc}/fsfw/action/ActionMessage.h (100%) rename {core/inc => inc}/fsfw/action/CommandActionHelper.h (100%) rename {core/inc => inc}/fsfw/action/CommandsActionsIF.h (100%) rename {core/inc => inc}/fsfw/action/HasActionsIF.h (100%) rename {core/inc => inc}/fsfw/action/SimpleActionHelper.h (100%) rename {core/inc => inc}/fsfw/container/ArrayList.h (100%) rename {core/inc => inc}/fsfw/container/BinaryTree.h (100%) rename {core/inc => inc}/fsfw/container/DynamicFIFO.h (100%) rename {core/inc => inc}/fsfw/container/FIFO.h (100%) rename {core/inc => inc}/fsfw/container/FIFOBase.h (100%) rename {core/inc => inc}/fsfw/container/FIFOBase.tpp (100%) rename {core/inc => inc}/fsfw/container/FixedArrayList.h (100%) rename {core/inc => inc}/fsfw/container/FixedMap.h (100%) rename {core/inc => inc}/fsfw/container/FixedOrderedMultimap.h (100%) rename {core/inc => inc}/fsfw/container/FixedOrderedMultimap.tpp (100%) rename {core/inc => inc}/fsfw/container/HybridIterator.h (100%) rename {core/inc => inc}/fsfw/container/IndexedRingMemoryArray.h (100%) rename {core/inc => inc}/fsfw/container/PlacementFactory.h (100%) rename {core/inc => inc}/fsfw/container/RingBufferBase.h (100%) rename {core/inc => inc}/fsfw/container/SharedRingBuffer.h (100%) rename {core/inc => inc}/fsfw/container/SimpleRingBuffer.h (100%) rename {core/inc => inc}/fsfw/container/SinglyLinkedList.h (100%) rename {core/inc => inc}/fsfw/container/group.h (100%) rename {core/inc => inc}/fsfw/controller/ControllerBase.h (100%) rename {core/inc => inc}/fsfw/controller/ExtendedControllerBase.h (100%) rename {opt/inc => inc}/fsfw/coordinates/CoordinateTransformations.h (100%) rename {opt/inc => inc}/fsfw/coordinates/Jgm3Model.h (100%) rename {opt/inc => inc}/fsfw/coordinates/Sgp4Propagator.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/BCFrame.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/CCSDSReturnValuesIF.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/Clcw.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/ClcwIF.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/DataLinkLayer.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/Farm1StateIF.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/Farm1StateLockout.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/Farm1StateOpen.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/Farm1StateWait.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/MapPacketExtraction.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/MapPacketExtractionIF.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/TcTransferFrame.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/TcTransferFrameLocal.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/VirtualChannelReception.h (100%) rename {opt/inc => inc}/fsfw/datalinklayer/VirtualChannelReceptionIF.h (100%) rename {core/inc => inc}/fsfw/datapool/DataSetIF.h (100%) rename {core/inc => inc}/fsfw/datapool/HkSwitchHelper.h (100%) rename {core/inc => inc}/fsfw/datapool/PoolDataSetBase.h (100%) rename {core/inc => inc}/fsfw/datapool/PoolDataSetIF.h (100%) rename {core/inc => inc}/fsfw/datapool/PoolEntry.h (100%) rename {core/inc => inc}/fsfw/datapool/PoolEntryIF.h (100%) rename {core/inc => inc}/fsfw/datapool/PoolReadGuard.h (100%) rename {core/inc => inc}/fsfw/datapool/PoolVarList.h (100%) rename {core/inc => inc}/fsfw/datapool/PoolVariableIF.h (100%) rename {core/inc => inc}/fsfw/datapool/ReadCommitIF.h (100%) rename {core/inc => inc}/fsfw/datapool/ReadCommitIFAttorney.h (100%) rename {core/inc => inc}/fsfw/datapool/SharedDataSetIF.h (100%) rename {core/inc => inc}/fsfw/datapoollocal.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/AccessLocalPoolF.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/HasLocalDataPoolIF.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalDataPoolManager.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalDataSet.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalPoolDataSetBase.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalPoolObjectBase.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalPoolVariable.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalPoolVariable.tpp (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalPoolVector.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/LocalPoolVector.tpp (100%) rename {core/inc => inc}/fsfw/datapoollocal/MarkChangedIF.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/SharedLocalDataSet.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/StaticLocalDataSet.h (100%) rename {core/inc => inc}/fsfw/datapoollocal/localPoolDefinitions.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/AcceptsDeviceResponsesIF.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/AssemblyBase.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/CMakeLists.txt (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/ChildHandlerBase.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/ChildHandlerFDIR.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/CookieIF.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/DeviceCommunicationIF.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/DeviceHandlerBase.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/DeviceHandlerFailureIsolation.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/DeviceHandlerIF.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/DeviceHandlerMessage.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/DeviceHandlerThermalSet.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/DeviceTmReportingWrapper.h (100%) rename {devicehandlers => inc/fsfw/devicehandlers}/HealthDevice.h (100%) rename {events => inc/fsfw/events}/Event.h (100%) rename {events => inc/fsfw/events}/EventManager.h (100%) rename {events => inc/fsfw/events}/EventManagerIF.h (100%) rename {events => inc/fsfw/events}/EventMessage.h (100%) rename {events => inc/fsfw/events}/EventReportingProxyIF.h (100%) rename {events => inc/fsfw/events}/eventmatching/CMakeLists.txt (100%) rename {events => inc/fsfw/events}/eventmatching/EventIdRangeMatcher.cpp (100%) rename {events => inc/fsfw/events}/eventmatching/EventIdRangeMatcher.h (100%) rename {events => inc/fsfw/events}/eventmatching/EventMatchTree.cpp (100%) rename {events => inc/fsfw/events}/eventmatching/EventMatchTree.h (100%) rename {events => inc/fsfw/events}/eventmatching/EventRangeMatcherBase.h (100%) rename {events => inc/fsfw/events}/eventmatching/ReporterRangeMatcher.cpp (100%) rename {events => inc/fsfw/events}/eventmatching/ReporterRangeMatcher.h (100%) rename {events => inc/fsfw/events}/eventmatching/SeverityRangeMatcher.cpp (100%) rename {events => inc/fsfw/events}/eventmatching/SeverityRangeMatcher.h (100%) rename {events => inc/fsfw/events}/eventmatching/eventmatching.h (100%) rename {events => inc/fsfw/events}/fwSubsystemIdRanges.h (100%) rename {fdir => inc/fsfw/fdir}/ConfirmsFailuresIF.h (100%) rename {fdir => inc/fsfw/fdir}/EventCorrelation.h (100%) rename {fdir => inc/fsfw/fdir}/FailureIsolationBase.h (100%) rename {fdir => inc/fsfw/fdir}/FaultCounter.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/AsciiConverter.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/CRC.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/DleEncoder.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/PeriodicOperationDivider.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/Type.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/arrayprinter.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/bitutility.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/constants.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/matching/BinaryMatcher.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/matching/DecimalMatcher.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/matching/MatchTree.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/matching/MatcherIF.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/matching/RangeMatcher.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/matching/SerializeableMatcherIF.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/math/MatrixOperations.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/math/QuaternionOperations.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/math/VectorOperations.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/sign.h (100%) rename {globalfunctions => inc/fsfw/globalfunctions}/timevalOperations.h (100%) rename {health => inc/fsfw/health}/HasHealthIF.h (100%) rename {health => inc/fsfw/health}/HealthHelper.h (100%) rename {health => inc/fsfw/health}/HealthMessage.h (100%) rename {health => inc/fsfw/health}/HealthTable.h (100%) rename {health => inc/fsfw/health}/HealthTableIF.h (100%) rename {health => inc/fsfw/health}/ManagesHealthIF.h (100%) rename {housekeeping => inc/fsfw/housekeeping}/AcceptsHkPacketsIF.h (100%) rename {housekeeping => inc/fsfw/housekeeping}/CMakeLists.txt (100%) rename {housekeeping => inc/fsfw/housekeeping}/HousekeepingMessage.h (100%) rename {housekeeping => inc/fsfw/housekeeping}/HousekeepingPacketDownlink.h (100%) rename {housekeeping => inc/fsfw/housekeeping}/HousekeepingSetPacket.h (100%) rename {housekeeping => inc/fsfw/housekeeping}/HousekeepingSnapshot.h (100%) rename {housekeeping => inc/fsfw/housekeeping}/PeriodicHousekeepingHelper.h (100%) rename {internalError => inc/fsfw/internalError}/InternalErrorDataset.h (100%) rename {internalError => inc/fsfw/internalError}/InternalErrorReporter.h (100%) rename {internalError => inc/fsfw/internalError}/InternalErrorReporterIF.h (100%) rename {ipc => inc/fsfw/ipc}/CommandMessage.h (100%) rename {ipc => inc/fsfw/ipc}/CommandMessageCleaner.h (100%) rename {ipc => inc/fsfw/ipc}/CommandMessageIF.h (100%) rename {ipc => inc/fsfw/ipc}/FwMessageTypes.h (100%) rename {ipc => inc/fsfw/ipc}/MessageQueueIF.h (100%) rename {ipc => inc/fsfw/ipc}/MessageQueueMessage.h (100%) rename {ipc => inc/fsfw/ipc}/MessageQueueMessageIF.h (100%) rename {ipc => inc/fsfw/ipc}/MessageQueueSenderIF.h (100%) rename {ipc => inc/fsfw/ipc}/MutexFactory.h (100%) rename {ipc => inc/fsfw/ipc}/MutexGuard.h (100%) rename {ipc => inc/fsfw/ipc}/MutexIF.h (100%) rename {ipc => inc/fsfw/ipc}/QueueFactory.h (100%) rename {ipc => inc/fsfw/ipc}/messageQueueDefinitions.h (100%) rename {memory => inc/fsfw/memory}/AcceptsMemoryMessagesIF.h (100%) rename {memory => inc/fsfw/memory}/GenericFileSystemMessage.h (100%) rename {memory => inc/fsfw/memory}/HasFileSystemIF.h (100%) rename {memory => inc/fsfw/memory}/HasMemoryIF.h (100%) rename {memory => inc/fsfw/memory}/MemoryHelper.h (100%) rename {memory => inc/fsfw/memory}/MemoryMessage.h (100%) rename {modes => inc/fsfw/modes}/HasModesIF.h (100%) rename {modes => inc/fsfw/modes}/ModeHelper.h (100%) rename {modes => inc/fsfw/modes}/ModeMessage.h (100%) rename {monitoring => inc/fsfw/monitoring}/AbsLimitMonitor.h (100%) rename {monitoring => inc/fsfw/monitoring}/HasMonitorsIF.h (100%) rename {monitoring => inc/fsfw/monitoring}/LimitMonitor.h (100%) rename {monitoring => inc/fsfw/monitoring}/LimitViolationReporter.h (100%) rename {monitoring => inc/fsfw/monitoring}/MonitorBase.h (100%) rename {monitoring => inc/fsfw/monitoring}/MonitorReporter.h (100%) rename {monitoring => inc/fsfw/monitoring}/MonitoringIF.h (98%) rename {monitoring => inc/fsfw/monitoring}/MonitoringMessage.h (100%) rename {monitoring => inc/fsfw/monitoring}/MonitoringMessageContent.h (100%) rename {monitoring => inc/fsfw/monitoring}/ReceivesMonitoringReportsIF.h (100%) rename {monitoring => inc/fsfw/monitoring}/TriplexMonitor.h (100%) rename {monitoring => inc/fsfw/monitoring}/TwoValueLimitMonitor.h (100%) rename {objectmanager => inc/fsfw/objectmanager}/ObjectManager.h (100%) rename {objectmanager => inc/fsfw/objectmanager}/ObjectManagerIF.h (100%) rename {objectmanager => inc/fsfw/objectmanager}/SystemObject.h (100%) rename {objectmanager => inc/fsfw/objectmanager}/SystemObjectIF.h (100%) rename {objectmanager => inc/fsfw/objectmanager}/frameworkObjects.h (100%) rename {osal => inc/fsfw/osal}/Endiness.h (100%) rename {osal => inc/fsfw/osal}/InternalErrorCodes.h (100%) rename {osal => inc/fsfw/osal}/common/TcpIpBase.h (100%) rename {osal => inc/fsfw/osal}/common/TcpTmTcBridge.h (100%) rename {osal => inc/fsfw/osal}/common/TcpTmTcServer.h (100%) rename {osal => inc/fsfw/osal}/common/UdpTcPollingTask.h (100%) rename {osal => inc/fsfw/osal}/common/UdpTmTcBridge.h (100%) rename {osal => inc/fsfw/osal}/common/tcpipCommon.h (100%) rename {osal => inc/fsfw/osal}/common/tcpipHelpers.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/BinSemaphUsingTask.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/BinarySemaphore.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/CountingSemaphUsingTask.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/CountingSemaphore.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/FixedTimeslotTask.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/FreeRTOSTaskIF.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/MessageQueue.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/Mutex.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/PeriodicTask.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/QueueMapManager.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/README.md (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/TaskManagement.h (100%) rename {osal/FreeRTOS => inc/fsfw/osal/freertos}/Timekeeper.h (100%) rename {osal => inc/fsfw/osal}/host/FixedTimeslotTask.h (100%) rename {osal => inc/fsfw/osal}/host/MessageQueue.h (100%) rename {osal => inc/fsfw/osal}/host/Mutex.cpp (100%) rename {osal => inc/fsfw/osal}/host/Mutex.h (100%) rename {osal => inc/fsfw/osal}/host/PeriodicTask.h (100%) rename {osal => inc/fsfw/osal}/host/QueueMapManager.h (100%) rename {osal => inc/fsfw/osal}/host/taskHelpers.h (100%) rename {osal => inc/fsfw/osal}/linux/BinarySemaphore.h (100%) rename {osal => inc/fsfw/osal}/linux/CountingSemaphore.h (100%) rename {osal => inc/fsfw/osal}/linux/FixedTimeslotTask.h (100%) rename {osal => inc/fsfw/osal}/linux/MessageQueue.h (100%) rename {osal => inc/fsfw/osal}/linux/Mutex.h (100%) rename {osal => inc/fsfw/osal}/linux/PeriodicPosixTask.h (100%) rename {osal => inc/fsfw/osal}/linux/PosixThread.h (100%) rename {osal => inc/fsfw/osal}/linux/Timer.h (100%) rename {osal => inc/fsfw/osal}/linux/unixUtility.h (100%) rename {osal => inc/fsfw/osal}/rtems/CpuUsage.h (100%) rename {osal => inc/fsfw/osal}/rtems/FixedTimeslotTask.h (100%) rename {osal => inc/fsfw/osal}/rtems/InitTask.h (100%) rename {osal => inc/fsfw/osal}/rtems/MessageQueue.h (100%) rename {osal => inc/fsfw/osal}/rtems/Mutex.h (100%) rename {osal => inc/fsfw/osal}/rtems/PeriodicTask.h (100%) rename {osal => inc/fsfw/osal}/rtems/RTEMSTaskBase.h (100%) rename {osal => inc/fsfw/osal}/rtems/RtemsBasic.h (100%) rename {osal => inc/fsfw/osal}/windows/winTaskHelpers.h (100%) rename {parameters => inc/fsfw/parameters}/HasParametersIF.h (100%) rename {parameters => inc/fsfw/parameters}/ParameterHelper.h (100%) rename {parameters => inc/fsfw/parameters}/ParameterMessage.h (100%) rename {parameters => inc/fsfw/parameters}/ParameterWrapper.h (100%) rename {parameters => inc/fsfw/parameters}/ReceivesParameterMessagesIF.h (100%) rename platform.h => inc/fsfw/platform.h (100%) rename {power => inc/fsfw/power}/Fuse.h (100%) rename {power => inc/fsfw/power}/PowerComponent.h (100%) rename {power => inc/fsfw/power}/PowerComponentIF.h (100%) rename {power => inc/fsfw/power}/PowerSensor.h (100%) rename {power => inc/fsfw/power}/PowerSwitchIF.h (100%) rename {power => inc/fsfw/power}/PowerSwitcher.h (100%) rename {pus => inc/fsfw/pus}/CService200ModeCommanding.h (100%) rename {pus => inc/fsfw/pus}/CService201HealthCommanding.h (100%) rename {pus => inc/fsfw/pus}/Service17Test.h (100%) rename {pus => inc/fsfw/pus}/Service1TelecommandVerification.h (100%) rename {pus => inc/fsfw/pus}/Service20ParameterManagement.h (100%) rename {pus => inc/fsfw/pus}/Service2DeviceAccess.h (100%) rename {pus => inc/fsfw/pus}/Service3Housekeeping.h (100%) rename {pus => inc/fsfw/pus}/Service5EventReporting.h (100%) rename {pus => inc/fsfw/pus}/Service8FunctionManagement.h (100%) rename {pus => inc/fsfw/pus}/Service9TimeManagement.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service1Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service200Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service201Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service20Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service2Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service3Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service5Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service8Packets.h (100%) rename {pus => inc/fsfw/pus}/servicepackets/Service9Packets.h (100%) rename {returnvalues => inc/fsfw/returnvalues}/FwClassIds.h (100%) rename {returnvalues => inc/fsfw/returnvalues}/HasReturnvaluesIF.h (100%) rename {rmap => inc/fsfw/rmap}/RMAP.h (100%) rename {rmap => inc/fsfw/rmap}/RMAPChannelIF.h (100%) rename {rmap => inc/fsfw/rmap}/RMAPCookie.h (100%) rename {rmap => inc/fsfw/rmap}/RmapDeviceCommunicationIF.h (100%) rename {rmap => inc/fsfw/rmap}/rmapStructs.h (100%) rename {serialize => inc/fsfw/serialize}/EndianConverter.h (100%) rename {serialize => inc/fsfw/serialize}/SerialArrayListAdapter.h (100%) rename {serialize => inc/fsfw/serialize}/SerialBufferAdapter.h (100%) rename {serialize => inc/fsfw/serialize}/SerialFixedArrayListAdapter.h (100%) rename {serialize => inc/fsfw/serialize}/SerialLinkedListAdapter.h (100%) rename {serialize => inc/fsfw/serialize}/SerializeAdapter.h (100%) rename {serialize => inc/fsfw/serialize}/SerializeElement.h (100%) rename {serialize => inc/fsfw/serialize}/SerializeIF.h (100%) rename {serviceinterface => inc/fsfw/serviceinterface}/ServiceInterface.h (100%) rename {serviceinterface => inc/fsfw/serviceinterface}/ServiceInterfaceBuffer.h (100%) rename {serviceinterface => inc/fsfw/serviceinterface}/ServiceInterfacePrinter.h (100%) rename {serviceinterface => inc/fsfw/serviceinterface}/ServiceInterfaceStream.h (100%) rename {serviceinterface => inc/fsfw/serviceinterface}/serviceInterfaceDefintions.h (100%) rename {storagemanager => inc/fsfw/storagemanager}/ConstStorageAccessor.h (100%) rename {storagemanager => inc/fsfw/storagemanager}/LocalPool.h (100%) rename {storagemanager => inc/fsfw/storagemanager}/PoolManager.h (100%) rename {storagemanager => inc/fsfw/storagemanager}/StorageAccessor.h (100%) rename {storagemanager => inc/fsfw/storagemanager}/StorageManagerIF.h (100%) rename {storagemanager => inc/fsfw/storagemanager}/storeAddress.h (100%) rename {subsystem => inc/fsfw/subsystem}/Subsystem.h (100%) rename {subsystem => inc/fsfw/subsystem}/SubsystemBase.h (100%) rename {subsystem => inc/fsfw/subsystem}/modes/HasModeSequenceIF.h (100%) rename {subsystem => inc/fsfw/subsystem}/modes/ModeDefinitions.h (100%) rename {subsystem => inc/fsfw/subsystem}/modes/ModeSequenceMessage.h (100%) rename {subsystem => inc/fsfw/subsystem}/modes/ModeStore.h (100%) rename {subsystem => inc/fsfw/subsystem}/modes/ModeStoreIF.h (100%) rename {tasks => inc/fsfw/tasks}/ExecutableObjectIF.h (100%) rename {tasks => inc/fsfw/tasks}/FixedSequenceSlot.h (100%) rename {tasks => inc/fsfw/tasks}/FixedSlotSequence.h (100%) rename {tasks => inc/fsfw/tasks}/FixedTimeslotTaskIF.h (100%) rename {tasks => inc/fsfw/tasks}/PeriodicTaskIF.h (100%) rename {tasks => inc/fsfw/tasks}/SemaphoreFactory.h (100%) rename {tasks => inc/fsfw/tasks}/SemaphoreIF.h (100%) rename {tasks => inc/fsfw/tasks}/TaskFactory.h (100%) rename {tasks => inc/fsfw/tasks}/Typedef.h (100%) rename {tcdistribution => inc/fsfw/tcdistribution}/CCSDSDistributor.h (100%) rename {tcdistribution => inc/fsfw/tcdistribution}/CCSDSDistributorIF.h (100%) rename {tcdistribution => inc/fsfw/tcdistribution}/PUSDistributor.h (100%) rename {tcdistribution => inc/fsfw/tcdistribution}/PUSDistributorIF.h (100%) rename {tcdistribution => inc/fsfw/tcdistribution}/TcDistributor.h (100%) rename {tcdistribution => inc/fsfw/tcdistribution}/TcPacketCheck.h (100%) rename {thermal => inc/fsfw/thermal}/AbstractTemperatureSensor.h (100%) rename {thermal => inc/fsfw/thermal}/AcceptsThermalMessagesIF.h (100%) rename {thermal => inc/fsfw/thermal}/Heater.h (100%) rename {thermal => inc/fsfw/thermal}/RedundantHeater.h (100%) rename {thermal => inc/fsfw/thermal}/TemperatureSensor.h (100%) rename {thermal => inc/fsfw/thermal}/ThermalComponent.h (100%) rename {thermal => inc/fsfw/thermal}/ThermalComponentCore.h (100%) rename {thermal => inc/fsfw/thermal}/ThermalComponentIF.h (100%) rename {thermal => inc/fsfw/thermal}/ThermalModule.h (100%) rename {thermal => inc/fsfw/thermal}/ThermalModuleIF.h (100%) rename {thermal => inc/fsfw/thermal}/ThermalMonitorReporter.h (100%) rename {thermal => inc/fsfw/thermal}/tcsDefinitions.h (100%) rename {timemanager => inc/fsfw/timemanager}/CCSDSTime.h (100%) rename {timemanager => inc/fsfw/timemanager}/Clock.h (100%) rename {timemanager => inc/fsfw/timemanager}/Countdown.h (100%) rename {timemanager => inc/fsfw/timemanager}/ReceivesTimeInfoIF.h (100%) rename {timemanager => inc/fsfw/timemanager}/Stopwatch.h (100%) rename {timemanager => inc/fsfw/timemanager}/TimeMessage.h (100%) rename {timemanager => inc/fsfw/timemanager}/TimeStamper.h (100%) rename {timemanager => inc/fsfw/timemanager}/TimeStamperIF.h (100%) rename {timemanager => inc/fsfw/timemanager}/clockDefinitions.h (100%) rename {tmstorage => inc/fsfw/tmstorage}/TmStoreBackendIF.h (100%) rename {tmstorage => inc/fsfw/tmstorage}/TmStoreFrontendIF.h (100%) rename {tmstorage => inc/fsfw/tmstorage}/TmStoreMessage.h (100%) rename {tmstorage => inc/fsfw/tmstorage}/TmStorePackets.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/SpacePacket.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/SpacePacketBase.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/ccsds_header.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/packetmatcher/ApidMatcher.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/packetmatcher/PacketMatchTree.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/packetmatcher/ServiceMatcher.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/packetmatcher/SubserviceMatcher.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/PacketTimestampInterpreterIF.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tc.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tc/TcPacketBase.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tc/TcPacketPus.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tc/TcPacketStoredBase.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tc/TcPacketStoredIF.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tc/TcPacketStoredPus.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketBase.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketMinimal.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketPusA.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketPusC.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketStored.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketStoredBase.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketStoredPusA.h (100%) rename {tmtcpacket => inc/fsfw/tmtcpacket}/pus/tm/TmPacketStoredPusC.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/AcceptsTelecommandsIF.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/AcceptsTelemetryIF.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/AcceptsVerifyMessageIF.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/CommandingServiceBase.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/PusServiceBase.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/PusVerificationReport.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/SourceSequenceCounter.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/TmTcBridge.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/TmTcMessage.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/VerificationCodes.h (100%) rename {tmtcservices => inc/fsfw/tmtcservices}/VerificationReporter.h (100%) rename {defaultcfg => misc/defaultcfg}/README.md (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/CMakeLists.txt (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/FSFWConfig.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/OBSWConfig.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/OBSWVersion.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/devices/logicalAddresses.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/devices/powerSwitcherList.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/events/subsystemIdRanges.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/fsfwconfig.mk (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/ipc/missionMessageTypes.cpp (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/ipc/missionMessageTypes.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/objects/FsfwFactory.cpp (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/objects/FsfwFactory.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/objects/systemObjectList.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/pollingsequence/PollingSequenceFactory.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/returnvalues/classIds.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/tmtc/apid.h (100%) rename {defaultcfg => misc/defaultcfg}/fsfwconfig/tmtc/pusIds.h (100%) rename {logo => misc/logo}/FSFW_Logo_V3.png (100%) rename {logo => misc/logo}/FSFW_Logo_V3.svg (100%) rename {logo => misc/logo}/FSFW_Logo_V3_bw.png (100%) rename {core/src => src/core}/action/ActionHelper.cpp (100%) rename {core/src => src/core}/action/ActionMessage.cpp (100%) rename {core/src => src/core}/action/CMakeLists.txt (100%) rename {core/src => src/core}/action/CommandActionHelper.cpp (100%) rename {core/src => src/core}/action/SimpleActionHelper.cpp (100%) rename {core/src => src/core}/container/CMakeLists.txt (100%) rename {core/src => src/core}/container/SharedRingBuffer.cpp (100%) rename {core/src => src/core}/container/SimpleRingBuffer.cpp (100%) rename {core/src => src/core}/controller/CMakeLists.txt (100%) rename {core/src => src/core}/controller/ControllerBase.cpp (100%) rename {core/src => src/core}/controller/ExtendedControllerBase.cpp (100%) rename {core/src => src/core}/datapool/CMakeLists.txt (100%) rename {core/src => src/core}/datapool/HkSwitchHelper.cpp (100%) rename {core/src => src/core}/datapool/PoolDataSetBase.cpp (100%) rename {core/src => src/core}/datapool/PoolEntry.cpp (100%) rename {core/src => src/core}/datapoollocal/CMakeLists.txt (100%) rename {core/src => src/core}/datapoollocal/LocalDataPoolManager.cpp (100%) rename {core/src => src/core}/datapoollocal/LocalDataSet.cpp (100%) rename {core/src => src/core}/datapoollocal/LocalPoolDataSetBase.cpp (100%) rename {core/src => src/core}/datapoollocal/LocalPoolObjectBase.cpp (100%) rename {core/src => src/core}/datapoollocal/SharedLocalDataSet.cpp (100%) rename {core/src => src/core}/datapoollocal/internal/CMakeLists.txt (100%) rename {core/src => src/core}/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp (100%) rename {core/src => src/core}/datapoollocal/internal/HasLocalDpIFManagerAttorney.h (100%) rename {core/src => src/core}/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp (100%) rename {core/src => src/core}/datapoollocal/internal/HasLocalDpIFUserAttorney.h (100%) rename {core/src => src/core}/datapoollocal/internal/LocalDpManagerAttorney.h (100%) rename {core/src => src/core}/datapoollocal/internal/LocalPoolDataSetAttorney.h (100%) rename {devicehandlers => src/core/devicehandlers}/AssemblyBase.cpp (100%) rename {devicehandlers => src/core/devicehandlers}/ChildHandlerBase.cpp (100%) rename {devicehandlers => src/core/devicehandlers}/ChildHandlerFDIR.cpp (100%) rename {devicehandlers => src/core/devicehandlers}/DeviceHandlerBase.cpp (100%) rename {devicehandlers => src/core/devicehandlers}/DeviceHandlerFailureIsolation.cpp (100%) rename {devicehandlers => src/core/devicehandlers}/DeviceHandlerMessage.cpp (100%) rename {devicehandlers => src/core/devicehandlers}/DeviceTmReportingWrapper.cpp (100%) rename {devicehandlers => src/core/devicehandlers}/HealthDevice.cpp (100%) rename {events => src/core/events}/CMakeLists.txt (100%) rename {events => src/core/events}/EventManager.cpp (100%) rename {events => src/core/events}/EventMessage.cpp (100%) rename {fdir => src/core/fdir}/CMakeLists.txt (100%) rename {fdir => src/core/fdir}/EventCorrelation.cpp (100%) rename {fdir => src/core/fdir}/FailureIsolationBase.cpp (100%) rename {fdir => src/core/fdir}/FaultCounter.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/AsciiConverter.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/CMakeLists.txt (100%) rename {globalfunctions => src/core/globalfunctions}/CRC.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/DleEncoder.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/PeriodicOperationDivider.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/Type.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/arrayprinter.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/bitutility.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/math/CMakeLists.txt (100%) rename {globalfunctions => src/core/globalfunctions}/math/QuaternionOperations.cpp (100%) rename {globalfunctions => src/core/globalfunctions}/timevalOperations.cpp (100%) rename {health => src/core/health}/CMakeLists.txt (100%) rename {health => src/core/health}/HealthHelper.cpp (100%) rename {health => src/core/health}/HealthMessage.cpp (100%) rename {health => src/core/health}/HealthTable.cpp (100%) rename {housekeeping => src/core/housekeeping}/HousekeepingMessage.cpp (100%) rename {housekeeping => src/core/housekeeping}/PeriodicHousekeepingHelper.cpp (100%) rename {internalError => src/core/internalError}/CMakeLists.txt (100%) rename {internalError => src/core/internalError}/InternalErrorReporter.cpp (100%) rename {ipc => src/core/ipc}/CMakeLists.txt (100%) rename {ipc => src/core/ipc}/CommandMessage.cpp (100%) rename {ipc => src/core/ipc}/CommandMessageCleaner.cpp (100%) rename {ipc => src/core/ipc}/MessageQueueMessage.cpp (100%) rename {modes => src/core/modes}/CMakeLists.txt (100%) rename {modes => src/core/modes}/ModeHelper.cpp (100%) rename {modes => src/core/modes}/ModeMessage.cpp (100%) rename {objectmanager => src/core/objectmanager}/CMakeLists.txt (100%) rename {objectmanager => src/core/objectmanager}/ObjectManager.cpp (100%) rename {objectmanager => src/core/objectmanager}/SystemObject.cpp (100%) rename {parameters => src/core/parameters}/CMakeLists.txt (100%) rename {parameters => src/core/parameters}/ParameterHelper.cpp (100%) rename {parameters => src/core/parameters}/ParameterMessage.cpp (100%) rename {parameters => src/core/parameters}/ParameterWrapper.cpp (100%) rename {power => src/core/power}/CMakeLists.txt (100%) rename {power => src/core/power}/Fuse.cpp (100%) rename {power => src/core/power}/PowerComponent.cpp (100%) rename {power => src/core/power}/PowerSensor.cpp (100%) rename {power => src/core/power}/PowerSwitcher.cpp (100%) rename {serialize => src/core/serialize}/CMakeLists.txt (100%) rename {serialize => src/core/serialize}/SerialBufferAdapter.cpp (100%) rename {serviceinterface => src/core/serviceinterface}/CMakeLists.txt (100%) rename {serviceinterface => src/core/serviceinterface}/ServiceInterfaceBuffer.cpp (100%) rename {serviceinterface => src/core/serviceinterface}/ServiceInterfacePrinter.cpp (100%) rename {serviceinterface => src/core/serviceinterface}/ServiceInterfaceStream.cpp (100%) rename {storagemanager => src/core/storagemanager}/CMakeLists.txt (100%) rename {storagemanager => src/core/storagemanager}/ConstStorageAccessor.cpp (100%) rename {storagemanager => src/core/storagemanager}/LocalPool.cpp (100%) rename {storagemanager => src/core/storagemanager}/PoolManager.cpp (100%) rename {storagemanager => src/core/storagemanager}/StorageAccessor.cpp (100%) rename {subsystem => src/core/subsystem}/CMakeLists.txt (100%) rename {subsystem => src/core/subsystem}/Subsystem.cpp (100%) rename {subsystem => src/core/subsystem}/SubsystemBase.cpp (100%) rename {subsystem => src/core/subsystem}/modes/CMakeLists.txt (100%) rename {subsystem => src/core/subsystem}/modes/ModeSequenceMessage.cpp (100%) rename {subsystem => src/core/subsystem}/modes/ModeStore.cpp (100%) rename {tasks => src/core/tasks}/CMakeLists.txt (100%) rename {tasks => src/core/tasks}/FixedSequenceSlot.cpp (100%) rename {tasks => src/core/tasks}/FixedSlotSequence.cpp (100%) rename {tcdistribution => src/core/tcdistribution}/CCSDSDistributor.cpp (100%) rename {tcdistribution => src/core/tcdistribution}/CMakeLists.txt (100%) rename {tcdistribution => src/core/tcdistribution}/PUSDistributor.cpp (100%) rename {tcdistribution => src/core/tcdistribution}/TcDistributor.cpp (100%) rename {tcdistribution => src/core/tcdistribution}/TcPacketCheck.cpp (100%) rename {thermal => src/core/thermal}/AbstractTemperatureSensor.cpp (100%) rename {thermal => src/core/thermal}/CMakeLists.txt (100%) rename {thermal => src/core/thermal}/Heater.cpp (100%) rename {thermal => src/core/thermal}/RedundantHeater.cpp (100%) rename {thermal => src/core/thermal}/ThermalComponent.cpp (100%) rename {thermal => src/core/thermal}/ThermalComponentCore.cpp (100%) rename {thermal => src/core/thermal}/ThermalModule.cpp (100%) rename {thermal => src/core/thermal}/ThermalMonitorReporter.cpp (100%) rename {timemanager => src/core/timemanager}/CCSDSTime.cpp (100%) rename {timemanager => src/core/timemanager}/CMakeLists.txt (100%) rename {timemanager => src/core/timemanager}/ClockCommon.cpp (100%) rename {timemanager => src/core/timemanager}/Countdown.cpp (100%) rename {timemanager => src/core/timemanager}/Stopwatch.cpp (100%) rename {timemanager => src/core/timemanager}/TimeMessage.cpp (100%) rename {timemanager => src/core/timemanager}/TimeStamper.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/CMakeLists.txt (100%) rename {tmtcpacket => src/core/tmtcpacket}/SpacePacket.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/SpacePacketBase.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/packetmatcher/CMakeLists.txt (100%) rename {tmtcpacket => src/core/tmtcpacket}/packetmatcher/PacketMatchTree.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/CMakeLists.txt (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tc/CMakeLists.txt (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tc/TcPacketBase.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tc/TcPacketPus.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tc/TcPacketStoredBase.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tc/TcPacketStoredPus.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/CMakeLists.txt (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/TmPacketBase.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/TmPacketMinimal.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/TmPacketPusA.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/TmPacketPusC.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/TmPacketStoredBase.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/TmPacketStoredPusA.cpp (100%) rename {tmtcpacket => src/core/tmtcpacket}/pus/tm/TmPacketStoredPusC.cpp (100%) rename {tmtcservices => src/core/tmtcservices}/CMakeLists.txt (100%) rename {tmtcservices => src/core/tmtcservices}/CommandingServiceBase.cpp (100%) rename {tmtcservices => src/core/tmtcservices}/PusServiceBase.cpp (100%) rename {tmtcservices => src/core/tmtcservices}/PusVerificationReport.cpp (100%) rename {tmtcservices => src/core/tmtcservices}/TmTcBridge.cpp (100%) rename {tmtcservices => src/core/tmtcservices}/TmTcMessage.cpp (100%) rename {tmtcservices => src/core/tmtcservices}/VerificationReporter.cpp (100%) rename {opt/src => src/opt}/coordinates/CMakeLists.txt (100%) rename {opt/src => src/opt}/coordinates/CoordinateTransformations.cpp (100%) rename {opt/src => src/opt}/coordinates/Sgp4Propagator.cpp (100%) rename {opt/src => src/opt}/datalinklayer/CMakeLists.txt (100%) rename {opt/src => src/opt}/datalinklayer/Clcw.cpp (100%) rename {opt/src => src/opt}/datalinklayer/DataLinkLayer.cpp (100%) rename {opt/src => src/opt}/datalinklayer/Farm1StateLockout.cpp (100%) rename {opt/src => src/opt}/datalinklayer/Farm1StateOpen.cpp (100%) rename {opt/src => src/opt}/datalinklayer/Farm1StateWait.cpp (100%) rename {opt/src => src/opt}/datalinklayer/MapPacketExtraction.cpp (100%) rename {opt/src => src/opt}/datalinklayer/TcTransferFrame.cpp (100%) rename {opt/src => src/opt}/datalinklayer/TcTransferFrameLocal.cpp (100%) rename {opt/src => src/opt}/datalinklayer/VirtualChannelReception.cpp (100%) rename {memory => src/opt/memory}/CMakeLists.txt (100%) rename {memory => src/opt/memory}/GenericFileSystemMessage.cpp (100%) rename {memory => src/opt/memory}/MemoryHelper.cpp (100%) rename {memory => src/opt/memory}/MemoryMessage.cpp (100%) rename {monitoring => src/opt/monitoring}/CMakeLists.txt (100%) rename {monitoring => src/opt/monitoring}/LimitViolationReporter.cpp (100%) rename {monitoring => src/opt/monitoring}/MonitoringMessage.cpp (100%) rename {pus => src/opt/pus}/CMakeLists.txt (100%) rename {pus => src/opt/pus}/CService200ModeCommanding.cpp (100%) rename {pus => src/opt/pus}/CService201HealthCommanding.cpp (100%) rename {pus => src/opt/pus}/Service17Test.cpp (100%) rename {pus => src/opt/pus}/Service1TelecommandVerification.cpp (100%) rename {pus => src/opt/pus}/Service20ParameterManagement.cpp (100%) rename {pus => src/opt/pus}/Service2DeviceAccess.cpp (100%) rename {pus => src/opt/pus}/Service3Housekeeping.cpp (100%) rename {pus => src/opt/pus}/Service5EventReporting.cpp (100%) rename {pus => src/opt/pus}/Service8FunctionManagement.cpp (100%) rename {pus => src/opt/pus}/Service9TimeManagement.cpp (100%) rename {rmap => src/opt/rmap}/CMakeLists.txt (100%) rename {rmap => src/opt/rmap}/RMAP.cpp (100%) rename {rmap => src/opt/rmap}/RMAPCookie.cpp (100%) rename {rmap => src/opt/rmap}/RmapDeviceCommunicationIF.cpp (100%) rename {tmstorage => src/opt/tmstorage}/CMakeLists.txt (100%) rename {tmstorage => src/opt/tmstorage}/TmStoreMessage.cpp (100%) rename {osal => src/osal}/CMakeLists.txt (100%) rename {osal => src/osal}/common/CMakeLists.txt (100%) rename {osal => src/osal}/common/TcpIpBase.cpp (100%) rename {osal => src/osal}/common/TcpTmTcBridge.cpp (100%) rename {osal => src/osal}/common/TcpTmTcServer.cpp (100%) rename {osal => src/osal}/common/UdpTcPollingTask.cpp (100%) rename {osal => src/osal}/common/UdpTmTcBridge.cpp (100%) rename {osal => src/osal}/common/tcpipCommon.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/BinSemaphUsingTask.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/BinarySemaphore.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/CMakeLists.txt (100%) rename {osal/FreeRTOS => src/osal/freertos}/Clock.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/CountingSemaphUsingTask.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/CountingSemaphore.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/FixedTimeslotTask.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/MessageQueue.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/Mutex.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/MutexFactory.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/PeriodicTask.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/QueueFactory.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/QueueMapManager.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/SemaphoreFactory.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/TaskFactory.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/TaskManagement.cpp (100%) rename {osal/FreeRTOS => src/osal/freertos}/Timekeeper.cpp (100%) rename {osal => src/osal}/host/CMakeLists.txt (100%) rename {osal => src/osal}/host/Clock.cpp (100%) rename {osal => src/osal}/host/FixedTimeslotTask.cpp (100%) rename {osal => src/osal}/host/MessageQueue.cpp (100%) rename {osal => src/osal}/host/MutexFactory.cpp (100%) rename {osal => src/osal}/host/PeriodicTask.cpp (100%) rename {osal => src/osal}/host/QueueFactory.cpp (100%) rename {osal => src/osal}/host/QueueMapManager.cpp (100%) rename {osal => src/osal}/host/SemaphoreFactory.cpp (100%) rename {osal => src/osal}/host/TaskFactory.cpp (100%) rename {osal => src/osal}/host/taskHelpers.cpp (100%) rename {osal => src/osal}/linux/BinarySemaphore.cpp (100%) rename {osal => src/osal}/linux/CMakeLists.txt (100%) rename {osal => src/osal}/linux/Clock.cpp (100%) rename {osal => src/osal}/linux/CountingSemaphore.cpp (100%) rename {osal => src/osal}/linux/FixedTimeslotTask.cpp (100%) rename {osal => src/osal}/linux/InternalErrorCodes.cpp (100%) rename {osal => src/osal}/linux/MessageQueue.cpp (100%) rename {osal => src/osal}/linux/Mutex.cpp (100%) rename {osal => src/osal}/linux/MutexFactory.cpp (100%) rename {osal => src/osal}/linux/PeriodicPosixTask.cpp (100%) rename {osal => src/osal}/linux/PosixThread.cpp (100%) rename {osal => src/osal}/linux/QueueFactory.cpp (100%) rename {osal => src/osal}/linux/SemaphoreFactory.cpp (100%) rename {osal => src/osal}/linux/TaskFactory.cpp (100%) rename {osal => src/osal}/linux/Timer.cpp (100%) rename {osal => src/osal}/linux/tcpipHelpers.cpp (100%) rename {osal => src/osal}/linux/unixUtility.cpp (100%) rename {osal => src/osal}/rtems/CMakeLists.txt (100%) rename {osal => src/osal}/rtems/Clock.cpp (100%) rename {osal => src/osal}/rtems/CpuUsage.cpp (100%) rename {osal => src/osal}/rtems/FixedTimeslotTask.cpp (100%) rename {osal => src/osal}/rtems/InitTask.cpp (100%) rename {osal => src/osal}/rtems/InternalErrorCodes.cpp (100%) rename {osal => src/osal}/rtems/MessageQueue.cpp (100%) rename {osal => src/osal}/rtems/Mutex.cpp (100%) rename {osal => src/osal}/rtems/MutexFactory.cpp (100%) rename {osal => src/osal}/rtems/PeriodicTask.cpp (100%) rename {osal => src/osal}/rtems/QueueFactory.cpp (100%) rename {osal => src/osal}/rtems/RTEMSTaskBase.cpp (100%) rename {osal => src/osal}/rtems/RtemsBasic.cpp (100%) rename {osal => src/osal}/rtems/TaskFactory.cpp (100%) rename {osal => src/osal}/windows/CMakeLists.txt (100%) rename {osal => src/osal}/windows/tcpipHelpers.cpp (100%) rename {osal => src/osal}/windows/winTaskHelpers.cpp (100%) rename {unittest => src/tests}/CMakeLists.txt (100%) rename {unittest => src/tests}/README.md (100%) rename {unittest => src/tests}/internal/CMakeLists.txt (100%) rename {unittest => src/tests}/internal/InternalUnitTester.cpp (100%) rename {unittest => src/tests}/internal/InternalUnitTester.h (100%) rename {unittest => src/tests}/internal/UnittDefinitions.cpp (100%) rename {unittest => src/tests}/internal/UnittDefinitions.h (100%) rename {unittest => src/tests}/internal/globalfunctions/CMakeLists.txt (100%) rename {unittest => src/tests}/internal/globalfunctions/TestArrayPrinter.cpp (100%) rename {unittest => src/tests}/internal/globalfunctions/TestArrayPrinter.h (100%) rename {unittest => src/tests}/internal/internal.mk (100%) rename {unittest => src/tests}/internal/osal/CMakeLists.txt (100%) rename {unittest => src/tests}/internal/osal/IntTestMq.cpp (100%) rename {unittest => src/tests}/internal/osal/IntTestMq.h (100%) rename {unittest => src/tests}/internal/osal/IntTestMutex.cpp (100%) rename {unittest => src/tests}/internal/osal/IntTestMutex.h (100%) rename {unittest => src/tests}/internal/osal/IntTestSemaphore.cpp (100%) rename {unittest => src/tests}/internal/osal/IntTestSemaphore.h (100%) rename {unittest => src/tests}/internal/serialize/CMakeLists.txt (100%) rename {unittest => src/tests}/internal/serialize/IntTestSerialization.cpp (100%) rename {unittest => src/tests}/internal/serialize/IntTestSerialization.h (100%) rename {unittest => src/tests}/lcov.sh (100%) rename {unittest => src/tests}/tests/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/action/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/action/TestActionHelper.cpp (100%) rename {unittest => src/tests}/tests/action/TestActionHelper.h (100%) rename {unittest => src/tests}/tests/container/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/container/RingBufferTest.cpp (100%) rename {unittest => src/tests}/tests/container/TestArrayList.cpp (100%) rename {unittest => src/tests}/tests/container/TestDynamicFifo.cpp (100%) rename {unittest => src/tests}/tests/container/TestFifo.cpp (100%) rename {unittest => src/tests}/tests/container/TestFixedArrayList.cpp (100%) rename {unittest => src/tests}/tests/container/TestFixedMap.cpp (100%) rename {unittest => src/tests}/tests/container/TestFixedOrderedMultimap.cpp (100%) rename {unittest => src/tests}/tests/container/TestPlacementFactory.cpp (100%) rename {unittest => src/tests}/tests/datapoollocal/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/datapoollocal/DataSetTest.cpp (100%) rename {unittest => src/tests}/tests/datapoollocal/LocalPoolManagerTest.cpp (100%) rename {unittest => src/tests}/tests/datapoollocal/LocalPoolOwnerBase.cpp (100%) rename {unittest => src/tests}/tests/datapoollocal/LocalPoolOwnerBase.h (100%) rename {unittest => src/tests}/tests/datapoollocal/LocalPoolVariableTest.cpp (100%) rename {unittest => src/tests}/tests/datapoollocal/LocalPoolVectorTest.cpp (100%) rename {unittest => src/tests}/tests/globalfunctions/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/mocks/HkReceiverMock.h (100%) rename {unittest => src/tests}/tests/mocks/MessageQueueMockBase.h (100%) rename {unittest => src/tests}/tests/osal/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/osal/TestMessageQueue.cpp (100%) rename {unittest => src/tests}/tests/osal/TestSemaphore.cpp (100%) rename {unittest => src/tests}/tests/serialize/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/serialize/TestSerialBufferAdapter.cpp (100%) rename {unittest => src/tests}/tests/serialize/TestSerialLinkedPacket.cpp (100%) rename {unittest => src/tests}/tests/serialize/TestSerialLinkedPacket.h (100%) rename {unittest => src/tests}/tests/serialize/TestSerialization.cpp (100%) rename {unittest => src/tests}/tests/storagemanager/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/storagemanager/TestNewAccessor.cpp (100%) rename {unittest => src/tests}/tests/storagemanager/TestPool.cpp (100%) rename {unittest => src/tests}/tests/tests.mk (100%) rename {unittest => src/tests}/tests/tmtcpacket/CMakeLists.txt (100%) rename {unittest => src/tests}/tests/tmtcpacket/PusTmTest.cpp (100%) rename {unittest => src/tests}/user/CMakeLists.txt (100%) rename {unittest => src/tests}/user/testcfg/CMakeLists.txt (100%) rename {unittest => src/tests}/user/testcfg/FSFWConfig.h (100%) rename {unittest => src/tests}/user/testcfg/Makefile-FSFW-Tests (100%) rename {unittest => src/tests}/user/testcfg/TestsConfig.h (100%) rename {unittest => src/tests}/user/testcfg/cdatapool/dataPoolInit.cpp (100%) rename {unittest => src/tests}/user/testcfg/cdatapool/dataPoolInit.h (100%) rename {unittest => src/tests}/user/testcfg/devices/logicalAddresses.cpp (100%) rename {unittest => src/tests}/user/testcfg/devices/logicalAddresses.h (100%) rename {unittest => src/tests}/user/testcfg/devices/powerSwitcherList.cpp (100%) rename {unittest => src/tests}/user/testcfg/devices/powerSwitcherList.h (100%) rename {unittest => src/tests}/user/testcfg/events/subsystemIdRanges.h (100%) rename {unittest => src/tests}/user/testcfg/ipc/MissionMessageTypes.cpp (100%) rename {unittest => src/tests}/user/testcfg/ipc/MissionMessageTypes.h (100%) rename {unittest => src/tests}/user/testcfg/objects/systemObjectList.h (100%) rename {unittest => src/tests}/user/testcfg/pollingsequence/PollingSequenceFactory.cpp (100%) rename {unittest => src/tests}/user/testcfg/pollingsequence/PollingSequenceFactory.h (100%) rename {unittest => src/tests}/user/testcfg/returnvalues/classIds.h (100%) rename {unittest => src/tests}/user/testcfg/testcfg.mk (100%) rename {unittest => src/tests}/user/testcfg/tmtc/apid.h (100%) rename {unittest => src/tests}/user/testcfg/tmtc/pusIds.h (100%) rename {unittest => src/tests}/user/testtemplate/TestTemplate.cpp (100%) rename {unittest => src/tests}/user/unittest/CMakeLists.txt (100%) rename {unittest => src/tests}/user/unittest/core/CMakeLists.txt (100%) rename {unittest => src/tests}/user/unittest/core/CatchDefinitions.cpp (100%) rename {unittest => src/tests}/user/unittest/core/CatchDefinitions.h (100%) rename {unittest => src/tests}/user/unittest/core/CatchFactory.cpp (100%) rename {unittest => src/tests}/user/unittest/core/CatchFactory.h (100%) rename {unittest => src/tests}/user/unittest/core/CatchRunner.cpp (100%) rename {unittest => src/tests}/user/unittest/core/CatchSetup.cpp (100%) rename {unittest => src/tests}/user/unittest/core/core.mk (100%) rename {unittest => src/tests}/user/unittest/core/printChar.cpp (100%) rename {unittest => src/tests}/user/unittest/core/printChar.h (100%) rename {unittest => src/tests}/user/unlockRealtime.sh (100%) diff --git a/fsfw.mk b/fsfw.mk deleted file mode 100644 index 0d72fae1..00000000 --- a/fsfw.mk +++ /dev/null @@ -1,75 +0,0 @@ -# This submake file needs to be included by the primary Makefile. -# This file needs FRAMEWORK_PATH and OS_FSFW set correctly by another Makefile. -# Valid API settings: rtems, linux, freeRTOS, host - -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/action/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/container/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/contrib/sgp4/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/controller/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/coordinates/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datalinklayer/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datapool/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datapoollocal/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datapoollocal/internal/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/housekeeping/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/devicehandlers/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/eventmatching/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/fdir/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/matching/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/math/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/health/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/internalError/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/ipc/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/memory/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/modes/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/monitoring/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/objectmanager/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/*.cpp) - -# select the OS -ifeq ($(OS_FSFW),rtems) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/rtems/*.cpp) - -else ifeq ($(OS_FSFW),linux) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/linux/*.cpp) - -else ifeq ($(OS_FSFW),freeRTOS) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/FreeRTOS/*.cpp) - -else ifeq ($(OS_FSFW),host) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/host/*.cpp) -ifeq ($(OS),Windows_NT) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/windows/*.cpp) -else -# For now, the linux UDP bridge sources needs to be included manually by upper makefile -# for host OS because we can't be sure the OS is linux. -# Following lines can be used to do this: -# CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TcUnixUdpPollingTask.cpp -# CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TmTcUnixUdpBridge.cpp -endif - -else -$(error invalid OS_FSFW specified, valid OS_FSFW are rtems, linux, freeRTOS, host) -endif - -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/parameters/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/power/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/returnvalues/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/rmap/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/serialize/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/serviceinterface/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/storagemanager/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/subsystem/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/subsystem/modes/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tasks/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tcdistribution/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/thermal/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/timemanager/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmstorage/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/packetmatcher/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/pus/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcservices/*.cpp) -CXXSRC += $(wildcard $(FRAMEWORK_PATH)/pus/*.cpp) diff --git a/FSFW.h b/inc/fsfw/FSFW.h similarity index 100% rename from FSFW.h rename to inc/fsfw/FSFW.h diff --git a/FSFWVersion.h b/inc/fsfw/FSFWVersion.h similarity index 100% rename from FSFWVersion.h rename to inc/fsfw/FSFWVersion.h diff --git a/core/inc/fsfw/action/ActionHelper.h b/inc/fsfw/action/ActionHelper.h similarity index 100% rename from core/inc/fsfw/action/ActionHelper.h rename to inc/fsfw/action/ActionHelper.h diff --git a/core/inc/fsfw/action/ActionMessage.h b/inc/fsfw/action/ActionMessage.h similarity index 100% rename from core/inc/fsfw/action/ActionMessage.h rename to inc/fsfw/action/ActionMessage.h diff --git a/core/inc/fsfw/action/CommandActionHelper.h b/inc/fsfw/action/CommandActionHelper.h similarity index 100% rename from core/inc/fsfw/action/CommandActionHelper.h rename to inc/fsfw/action/CommandActionHelper.h diff --git a/core/inc/fsfw/action/CommandsActionsIF.h b/inc/fsfw/action/CommandsActionsIF.h similarity index 100% rename from core/inc/fsfw/action/CommandsActionsIF.h rename to inc/fsfw/action/CommandsActionsIF.h diff --git a/core/inc/fsfw/action/HasActionsIF.h b/inc/fsfw/action/HasActionsIF.h similarity index 100% rename from core/inc/fsfw/action/HasActionsIF.h rename to inc/fsfw/action/HasActionsIF.h diff --git a/core/inc/fsfw/action/SimpleActionHelper.h b/inc/fsfw/action/SimpleActionHelper.h similarity index 100% rename from core/inc/fsfw/action/SimpleActionHelper.h rename to inc/fsfw/action/SimpleActionHelper.h diff --git a/core/inc/fsfw/container/ArrayList.h b/inc/fsfw/container/ArrayList.h similarity index 100% rename from core/inc/fsfw/container/ArrayList.h rename to inc/fsfw/container/ArrayList.h diff --git a/core/inc/fsfw/container/BinaryTree.h b/inc/fsfw/container/BinaryTree.h similarity index 100% rename from core/inc/fsfw/container/BinaryTree.h rename to inc/fsfw/container/BinaryTree.h diff --git a/core/inc/fsfw/container/DynamicFIFO.h b/inc/fsfw/container/DynamicFIFO.h similarity index 100% rename from core/inc/fsfw/container/DynamicFIFO.h rename to inc/fsfw/container/DynamicFIFO.h diff --git a/core/inc/fsfw/container/FIFO.h b/inc/fsfw/container/FIFO.h similarity index 100% rename from core/inc/fsfw/container/FIFO.h rename to inc/fsfw/container/FIFO.h diff --git a/core/inc/fsfw/container/FIFOBase.h b/inc/fsfw/container/FIFOBase.h similarity index 100% rename from core/inc/fsfw/container/FIFOBase.h rename to inc/fsfw/container/FIFOBase.h diff --git a/core/inc/fsfw/container/FIFOBase.tpp b/inc/fsfw/container/FIFOBase.tpp similarity index 100% rename from core/inc/fsfw/container/FIFOBase.tpp rename to inc/fsfw/container/FIFOBase.tpp diff --git a/core/inc/fsfw/container/FixedArrayList.h b/inc/fsfw/container/FixedArrayList.h similarity index 100% rename from core/inc/fsfw/container/FixedArrayList.h rename to inc/fsfw/container/FixedArrayList.h diff --git a/core/inc/fsfw/container/FixedMap.h b/inc/fsfw/container/FixedMap.h similarity index 100% rename from core/inc/fsfw/container/FixedMap.h rename to inc/fsfw/container/FixedMap.h diff --git a/core/inc/fsfw/container/FixedOrderedMultimap.h b/inc/fsfw/container/FixedOrderedMultimap.h similarity index 100% rename from core/inc/fsfw/container/FixedOrderedMultimap.h rename to inc/fsfw/container/FixedOrderedMultimap.h diff --git a/core/inc/fsfw/container/FixedOrderedMultimap.tpp b/inc/fsfw/container/FixedOrderedMultimap.tpp similarity index 100% rename from core/inc/fsfw/container/FixedOrderedMultimap.tpp rename to inc/fsfw/container/FixedOrderedMultimap.tpp diff --git a/core/inc/fsfw/container/HybridIterator.h b/inc/fsfw/container/HybridIterator.h similarity index 100% rename from core/inc/fsfw/container/HybridIterator.h rename to inc/fsfw/container/HybridIterator.h diff --git a/core/inc/fsfw/container/IndexedRingMemoryArray.h b/inc/fsfw/container/IndexedRingMemoryArray.h similarity index 100% rename from core/inc/fsfw/container/IndexedRingMemoryArray.h rename to inc/fsfw/container/IndexedRingMemoryArray.h diff --git a/core/inc/fsfw/container/PlacementFactory.h b/inc/fsfw/container/PlacementFactory.h similarity index 100% rename from core/inc/fsfw/container/PlacementFactory.h rename to inc/fsfw/container/PlacementFactory.h diff --git a/core/inc/fsfw/container/RingBufferBase.h b/inc/fsfw/container/RingBufferBase.h similarity index 100% rename from core/inc/fsfw/container/RingBufferBase.h rename to inc/fsfw/container/RingBufferBase.h diff --git a/core/inc/fsfw/container/SharedRingBuffer.h b/inc/fsfw/container/SharedRingBuffer.h similarity index 100% rename from core/inc/fsfw/container/SharedRingBuffer.h rename to inc/fsfw/container/SharedRingBuffer.h diff --git a/core/inc/fsfw/container/SimpleRingBuffer.h b/inc/fsfw/container/SimpleRingBuffer.h similarity index 100% rename from core/inc/fsfw/container/SimpleRingBuffer.h rename to inc/fsfw/container/SimpleRingBuffer.h diff --git a/core/inc/fsfw/container/SinglyLinkedList.h b/inc/fsfw/container/SinglyLinkedList.h similarity index 100% rename from core/inc/fsfw/container/SinglyLinkedList.h rename to inc/fsfw/container/SinglyLinkedList.h diff --git a/core/inc/fsfw/container/group.h b/inc/fsfw/container/group.h similarity index 100% rename from core/inc/fsfw/container/group.h rename to inc/fsfw/container/group.h diff --git a/core/inc/fsfw/controller/ControllerBase.h b/inc/fsfw/controller/ControllerBase.h similarity index 100% rename from core/inc/fsfw/controller/ControllerBase.h rename to inc/fsfw/controller/ControllerBase.h diff --git a/core/inc/fsfw/controller/ExtendedControllerBase.h b/inc/fsfw/controller/ExtendedControllerBase.h similarity index 100% rename from core/inc/fsfw/controller/ExtendedControllerBase.h rename to inc/fsfw/controller/ExtendedControllerBase.h diff --git a/opt/inc/fsfw/coordinates/CoordinateTransformations.h b/inc/fsfw/coordinates/CoordinateTransformations.h similarity index 100% rename from opt/inc/fsfw/coordinates/CoordinateTransformations.h rename to inc/fsfw/coordinates/CoordinateTransformations.h diff --git a/opt/inc/fsfw/coordinates/Jgm3Model.h b/inc/fsfw/coordinates/Jgm3Model.h similarity index 100% rename from opt/inc/fsfw/coordinates/Jgm3Model.h rename to inc/fsfw/coordinates/Jgm3Model.h diff --git a/opt/inc/fsfw/coordinates/Sgp4Propagator.h b/inc/fsfw/coordinates/Sgp4Propagator.h similarity index 100% rename from opt/inc/fsfw/coordinates/Sgp4Propagator.h rename to inc/fsfw/coordinates/Sgp4Propagator.h diff --git a/opt/inc/fsfw/datalinklayer/BCFrame.h b/inc/fsfw/datalinklayer/BCFrame.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/BCFrame.h rename to inc/fsfw/datalinklayer/BCFrame.h diff --git a/opt/inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h b/inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h rename to inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h diff --git a/opt/inc/fsfw/datalinklayer/Clcw.h b/inc/fsfw/datalinklayer/Clcw.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/Clcw.h rename to inc/fsfw/datalinklayer/Clcw.h diff --git a/opt/inc/fsfw/datalinklayer/ClcwIF.h b/inc/fsfw/datalinklayer/ClcwIF.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/ClcwIF.h rename to inc/fsfw/datalinklayer/ClcwIF.h diff --git a/opt/inc/fsfw/datalinklayer/DataLinkLayer.h b/inc/fsfw/datalinklayer/DataLinkLayer.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/DataLinkLayer.h rename to inc/fsfw/datalinklayer/DataLinkLayer.h diff --git a/opt/inc/fsfw/datalinklayer/Farm1StateIF.h b/inc/fsfw/datalinklayer/Farm1StateIF.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/Farm1StateIF.h rename to inc/fsfw/datalinklayer/Farm1StateIF.h diff --git a/opt/inc/fsfw/datalinklayer/Farm1StateLockout.h b/inc/fsfw/datalinklayer/Farm1StateLockout.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/Farm1StateLockout.h rename to inc/fsfw/datalinklayer/Farm1StateLockout.h diff --git a/opt/inc/fsfw/datalinklayer/Farm1StateOpen.h b/inc/fsfw/datalinklayer/Farm1StateOpen.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/Farm1StateOpen.h rename to inc/fsfw/datalinklayer/Farm1StateOpen.h diff --git a/opt/inc/fsfw/datalinklayer/Farm1StateWait.h b/inc/fsfw/datalinklayer/Farm1StateWait.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/Farm1StateWait.h rename to inc/fsfw/datalinklayer/Farm1StateWait.h diff --git a/opt/inc/fsfw/datalinklayer/MapPacketExtraction.h b/inc/fsfw/datalinklayer/MapPacketExtraction.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/MapPacketExtraction.h rename to inc/fsfw/datalinklayer/MapPacketExtraction.h diff --git a/opt/inc/fsfw/datalinklayer/MapPacketExtractionIF.h b/inc/fsfw/datalinklayer/MapPacketExtractionIF.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/MapPacketExtractionIF.h rename to inc/fsfw/datalinklayer/MapPacketExtractionIF.h diff --git a/opt/inc/fsfw/datalinklayer/TcTransferFrame.h b/inc/fsfw/datalinklayer/TcTransferFrame.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/TcTransferFrame.h rename to inc/fsfw/datalinklayer/TcTransferFrame.h diff --git a/opt/inc/fsfw/datalinklayer/TcTransferFrameLocal.h b/inc/fsfw/datalinklayer/TcTransferFrameLocal.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/TcTransferFrameLocal.h rename to inc/fsfw/datalinklayer/TcTransferFrameLocal.h diff --git a/opt/inc/fsfw/datalinklayer/VirtualChannelReception.h b/inc/fsfw/datalinklayer/VirtualChannelReception.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/VirtualChannelReception.h rename to inc/fsfw/datalinklayer/VirtualChannelReception.h diff --git a/opt/inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h b/inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h similarity index 100% rename from opt/inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h rename to inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h diff --git a/core/inc/fsfw/datapool/DataSetIF.h b/inc/fsfw/datapool/DataSetIF.h similarity index 100% rename from core/inc/fsfw/datapool/DataSetIF.h rename to inc/fsfw/datapool/DataSetIF.h diff --git a/core/inc/fsfw/datapool/HkSwitchHelper.h b/inc/fsfw/datapool/HkSwitchHelper.h similarity index 100% rename from core/inc/fsfw/datapool/HkSwitchHelper.h rename to inc/fsfw/datapool/HkSwitchHelper.h diff --git a/core/inc/fsfw/datapool/PoolDataSetBase.h b/inc/fsfw/datapool/PoolDataSetBase.h similarity index 100% rename from core/inc/fsfw/datapool/PoolDataSetBase.h rename to inc/fsfw/datapool/PoolDataSetBase.h diff --git a/core/inc/fsfw/datapool/PoolDataSetIF.h b/inc/fsfw/datapool/PoolDataSetIF.h similarity index 100% rename from core/inc/fsfw/datapool/PoolDataSetIF.h rename to inc/fsfw/datapool/PoolDataSetIF.h diff --git a/core/inc/fsfw/datapool/PoolEntry.h b/inc/fsfw/datapool/PoolEntry.h similarity index 100% rename from core/inc/fsfw/datapool/PoolEntry.h rename to inc/fsfw/datapool/PoolEntry.h diff --git a/core/inc/fsfw/datapool/PoolEntryIF.h b/inc/fsfw/datapool/PoolEntryIF.h similarity index 100% rename from core/inc/fsfw/datapool/PoolEntryIF.h rename to inc/fsfw/datapool/PoolEntryIF.h diff --git a/core/inc/fsfw/datapool/PoolReadGuard.h b/inc/fsfw/datapool/PoolReadGuard.h similarity index 100% rename from core/inc/fsfw/datapool/PoolReadGuard.h rename to inc/fsfw/datapool/PoolReadGuard.h diff --git a/core/inc/fsfw/datapool/PoolVarList.h b/inc/fsfw/datapool/PoolVarList.h similarity index 100% rename from core/inc/fsfw/datapool/PoolVarList.h rename to inc/fsfw/datapool/PoolVarList.h diff --git a/core/inc/fsfw/datapool/PoolVariableIF.h b/inc/fsfw/datapool/PoolVariableIF.h similarity index 100% rename from core/inc/fsfw/datapool/PoolVariableIF.h rename to inc/fsfw/datapool/PoolVariableIF.h diff --git a/core/inc/fsfw/datapool/ReadCommitIF.h b/inc/fsfw/datapool/ReadCommitIF.h similarity index 100% rename from core/inc/fsfw/datapool/ReadCommitIF.h rename to inc/fsfw/datapool/ReadCommitIF.h diff --git a/core/inc/fsfw/datapool/ReadCommitIFAttorney.h b/inc/fsfw/datapool/ReadCommitIFAttorney.h similarity index 100% rename from core/inc/fsfw/datapool/ReadCommitIFAttorney.h rename to inc/fsfw/datapool/ReadCommitIFAttorney.h diff --git a/core/inc/fsfw/datapool/SharedDataSetIF.h b/inc/fsfw/datapool/SharedDataSetIF.h similarity index 100% rename from core/inc/fsfw/datapool/SharedDataSetIF.h rename to inc/fsfw/datapool/SharedDataSetIF.h diff --git a/core/inc/fsfw/datapoollocal.h b/inc/fsfw/datapoollocal.h similarity index 100% rename from core/inc/fsfw/datapoollocal.h rename to inc/fsfw/datapoollocal.h diff --git a/core/inc/fsfw/datapoollocal/AccessLocalPoolF.h b/inc/fsfw/datapoollocal/AccessLocalPoolF.h similarity index 100% rename from core/inc/fsfw/datapoollocal/AccessLocalPoolF.h rename to inc/fsfw/datapoollocal/AccessLocalPoolF.h diff --git a/core/inc/fsfw/datapoollocal/HasLocalDataPoolIF.h b/inc/fsfw/datapoollocal/HasLocalDataPoolIF.h similarity index 100% rename from core/inc/fsfw/datapoollocal/HasLocalDataPoolIF.h rename to inc/fsfw/datapoollocal/HasLocalDataPoolIF.h diff --git a/core/inc/fsfw/datapoollocal/LocalDataPoolManager.h b/inc/fsfw/datapoollocal/LocalDataPoolManager.h similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalDataPoolManager.h rename to inc/fsfw/datapoollocal/LocalDataPoolManager.h diff --git a/core/inc/fsfw/datapoollocal/LocalDataSet.h b/inc/fsfw/datapoollocal/LocalDataSet.h similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalDataSet.h rename to inc/fsfw/datapoollocal/LocalDataSet.h diff --git a/core/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h b/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h rename to inc/fsfw/datapoollocal/LocalPoolDataSetBase.h diff --git a/core/inc/fsfw/datapoollocal/LocalPoolObjectBase.h b/inc/fsfw/datapoollocal/LocalPoolObjectBase.h similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalPoolObjectBase.h rename to inc/fsfw/datapoollocal/LocalPoolObjectBase.h diff --git a/core/inc/fsfw/datapoollocal/LocalPoolVariable.h b/inc/fsfw/datapoollocal/LocalPoolVariable.h similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalPoolVariable.h rename to inc/fsfw/datapoollocal/LocalPoolVariable.h diff --git a/core/inc/fsfw/datapoollocal/LocalPoolVariable.tpp b/inc/fsfw/datapoollocal/LocalPoolVariable.tpp similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalPoolVariable.tpp rename to inc/fsfw/datapoollocal/LocalPoolVariable.tpp diff --git a/core/inc/fsfw/datapoollocal/LocalPoolVector.h b/inc/fsfw/datapoollocal/LocalPoolVector.h similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalPoolVector.h rename to inc/fsfw/datapoollocal/LocalPoolVector.h diff --git a/core/inc/fsfw/datapoollocal/LocalPoolVector.tpp b/inc/fsfw/datapoollocal/LocalPoolVector.tpp similarity index 100% rename from core/inc/fsfw/datapoollocal/LocalPoolVector.tpp rename to inc/fsfw/datapoollocal/LocalPoolVector.tpp diff --git a/core/inc/fsfw/datapoollocal/MarkChangedIF.h b/inc/fsfw/datapoollocal/MarkChangedIF.h similarity index 100% rename from core/inc/fsfw/datapoollocal/MarkChangedIF.h rename to inc/fsfw/datapoollocal/MarkChangedIF.h diff --git a/core/inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h b/inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h similarity index 100% rename from core/inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h rename to inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h diff --git a/core/inc/fsfw/datapoollocal/SharedLocalDataSet.h b/inc/fsfw/datapoollocal/SharedLocalDataSet.h similarity index 100% rename from core/inc/fsfw/datapoollocal/SharedLocalDataSet.h rename to inc/fsfw/datapoollocal/SharedLocalDataSet.h diff --git a/core/inc/fsfw/datapoollocal/StaticLocalDataSet.h b/inc/fsfw/datapoollocal/StaticLocalDataSet.h similarity index 100% rename from core/inc/fsfw/datapoollocal/StaticLocalDataSet.h rename to inc/fsfw/datapoollocal/StaticLocalDataSet.h diff --git a/core/inc/fsfw/datapoollocal/localPoolDefinitions.h b/inc/fsfw/datapoollocal/localPoolDefinitions.h similarity index 100% rename from core/inc/fsfw/datapoollocal/localPoolDefinitions.h rename to inc/fsfw/datapoollocal/localPoolDefinitions.h diff --git a/devicehandlers/AcceptsDeviceResponsesIF.h b/inc/fsfw/devicehandlers/AcceptsDeviceResponsesIF.h similarity index 100% rename from devicehandlers/AcceptsDeviceResponsesIF.h rename to inc/fsfw/devicehandlers/AcceptsDeviceResponsesIF.h diff --git a/devicehandlers/AssemblyBase.h b/inc/fsfw/devicehandlers/AssemblyBase.h similarity index 100% rename from devicehandlers/AssemblyBase.h rename to inc/fsfw/devicehandlers/AssemblyBase.h diff --git a/devicehandlers/CMakeLists.txt b/inc/fsfw/devicehandlers/CMakeLists.txt similarity index 100% rename from devicehandlers/CMakeLists.txt rename to inc/fsfw/devicehandlers/CMakeLists.txt diff --git a/devicehandlers/ChildHandlerBase.h b/inc/fsfw/devicehandlers/ChildHandlerBase.h similarity index 100% rename from devicehandlers/ChildHandlerBase.h rename to inc/fsfw/devicehandlers/ChildHandlerBase.h diff --git a/devicehandlers/ChildHandlerFDIR.h b/inc/fsfw/devicehandlers/ChildHandlerFDIR.h similarity index 100% rename from devicehandlers/ChildHandlerFDIR.h rename to inc/fsfw/devicehandlers/ChildHandlerFDIR.h diff --git a/devicehandlers/CookieIF.h b/inc/fsfw/devicehandlers/CookieIF.h similarity index 100% rename from devicehandlers/CookieIF.h rename to inc/fsfw/devicehandlers/CookieIF.h diff --git a/devicehandlers/DeviceCommunicationIF.h b/inc/fsfw/devicehandlers/DeviceCommunicationIF.h similarity index 100% rename from devicehandlers/DeviceCommunicationIF.h rename to inc/fsfw/devicehandlers/DeviceCommunicationIF.h diff --git a/devicehandlers/DeviceHandlerBase.h b/inc/fsfw/devicehandlers/DeviceHandlerBase.h similarity index 100% rename from devicehandlers/DeviceHandlerBase.h rename to inc/fsfw/devicehandlers/DeviceHandlerBase.h diff --git a/devicehandlers/DeviceHandlerFailureIsolation.h b/inc/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h similarity index 100% rename from devicehandlers/DeviceHandlerFailureIsolation.h rename to inc/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h diff --git a/devicehandlers/DeviceHandlerIF.h b/inc/fsfw/devicehandlers/DeviceHandlerIF.h similarity index 100% rename from devicehandlers/DeviceHandlerIF.h rename to inc/fsfw/devicehandlers/DeviceHandlerIF.h diff --git a/devicehandlers/DeviceHandlerMessage.h b/inc/fsfw/devicehandlers/DeviceHandlerMessage.h similarity index 100% rename from devicehandlers/DeviceHandlerMessage.h rename to inc/fsfw/devicehandlers/DeviceHandlerMessage.h diff --git a/devicehandlers/DeviceHandlerThermalSet.h b/inc/fsfw/devicehandlers/DeviceHandlerThermalSet.h similarity index 100% rename from devicehandlers/DeviceHandlerThermalSet.h rename to inc/fsfw/devicehandlers/DeviceHandlerThermalSet.h diff --git a/devicehandlers/DeviceTmReportingWrapper.h b/inc/fsfw/devicehandlers/DeviceTmReportingWrapper.h similarity index 100% rename from devicehandlers/DeviceTmReportingWrapper.h rename to inc/fsfw/devicehandlers/DeviceTmReportingWrapper.h diff --git a/devicehandlers/HealthDevice.h b/inc/fsfw/devicehandlers/HealthDevice.h similarity index 100% rename from devicehandlers/HealthDevice.h rename to inc/fsfw/devicehandlers/HealthDevice.h diff --git a/events/Event.h b/inc/fsfw/events/Event.h similarity index 100% rename from events/Event.h rename to inc/fsfw/events/Event.h diff --git a/events/EventManager.h b/inc/fsfw/events/EventManager.h similarity index 100% rename from events/EventManager.h rename to inc/fsfw/events/EventManager.h diff --git a/events/EventManagerIF.h b/inc/fsfw/events/EventManagerIF.h similarity index 100% rename from events/EventManagerIF.h rename to inc/fsfw/events/EventManagerIF.h diff --git a/events/EventMessage.h b/inc/fsfw/events/EventMessage.h similarity index 100% rename from events/EventMessage.h rename to inc/fsfw/events/EventMessage.h diff --git a/events/EventReportingProxyIF.h b/inc/fsfw/events/EventReportingProxyIF.h similarity index 100% rename from events/EventReportingProxyIF.h rename to inc/fsfw/events/EventReportingProxyIF.h diff --git a/events/eventmatching/CMakeLists.txt b/inc/fsfw/events/eventmatching/CMakeLists.txt similarity index 100% rename from events/eventmatching/CMakeLists.txt rename to inc/fsfw/events/eventmatching/CMakeLists.txt diff --git a/events/eventmatching/EventIdRangeMatcher.cpp b/inc/fsfw/events/eventmatching/EventIdRangeMatcher.cpp similarity index 100% rename from events/eventmatching/EventIdRangeMatcher.cpp rename to inc/fsfw/events/eventmatching/EventIdRangeMatcher.cpp diff --git a/events/eventmatching/EventIdRangeMatcher.h b/inc/fsfw/events/eventmatching/EventIdRangeMatcher.h similarity index 100% rename from events/eventmatching/EventIdRangeMatcher.h rename to inc/fsfw/events/eventmatching/EventIdRangeMatcher.h diff --git a/events/eventmatching/EventMatchTree.cpp b/inc/fsfw/events/eventmatching/EventMatchTree.cpp similarity index 100% rename from events/eventmatching/EventMatchTree.cpp rename to inc/fsfw/events/eventmatching/EventMatchTree.cpp diff --git a/events/eventmatching/EventMatchTree.h b/inc/fsfw/events/eventmatching/EventMatchTree.h similarity index 100% rename from events/eventmatching/EventMatchTree.h rename to inc/fsfw/events/eventmatching/EventMatchTree.h diff --git a/events/eventmatching/EventRangeMatcherBase.h b/inc/fsfw/events/eventmatching/EventRangeMatcherBase.h similarity index 100% rename from events/eventmatching/EventRangeMatcherBase.h rename to inc/fsfw/events/eventmatching/EventRangeMatcherBase.h diff --git a/events/eventmatching/ReporterRangeMatcher.cpp b/inc/fsfw/events/eventmatching/ReporterRangeMatcher.cpp similarity index 100% rename from events/eventmatching/ReporterRangeMatcher.cpp rename to inc/fsfw/events/eventmatching/ReporterRangeMatcher.cpp diff --git a/events/eventmatching/ReporterRangeMatcher.h b/inc/fsfw/events/eventmatching/ReporterRangeMatcher.h similarity index 100% rename from events/eventmatching/ReporterRangeMatcher.h rename to inc/fsfw/events/eventmatching/ReporterRangeMatcher.h diff --git a/events/eventmatching/SeverityRangeMatcher.cpp b/inc/fsfw/events/eventmatching/SeverityRangeMatcher.cpp similarity index 100% rename from events/eventmatching/SeverityRangeMatcher.cpp rename to inc/fsfw/events/eventmatching/SeverityRangeMatcher.cpp diff --git a/events/eventmatching/SeverityRangeMatcher.h b/inc/fsfw/events/eventmatching/SeverityRangeMatcher.h similarity index 100% rename from events/eventmatching/SeverityRangeMatcher.h rename to inc/fsfw/events/eventmatching/SeverityRangeMatcher.h diff --git a/events/eventmatching/eventmatching.h b/inc/fsfw/events/eventmatching/eventmatching.h similarity index 100% rename from events/eventmatching/eventmatching.h rename to inc/fsfw/events/eventmatching/eventmatching.h diff --git a/events/fwSubsystemIdRanges.h b/inc/fsfw/events/fwSubsystemIdRanges.h similarity index 100% rename from events/fwSubsystemIdRanges.h rename to inc/fsfw/events/fwSubsystemIdRanges.h diff --git a/fdir/ConfirmsFailuresIF.h b/inc/fsfw/fdir/ConfirmsFailuresIF.h similarity index 100% rename from fdir/ConfirmsFailuresIF.h rename to inc/fsfw/fdir/ConfirmsFailuresIF.h diff --git a/fdir/EventCorrelation.h b/inc/fsfw/fdir/EventCorrelation.h similarity index 100% rename from fdir/EventCorrelation.h rename to inc/fsfw/fdir/EventCorrelation.h diff --git a/fdir/FailureIsolationBase.h b/inc/fsfw/fdir/FailureIsolationBase.h similarity index 100% rename from fdir/FailureIsolationBase.h rename to inc/fsfw/fdir/FailureIsolationBase.h diff --git a/fdir/FaultCounter.h b/inc/fsfw/fdir/FaultCounter.h similarity index 100% rename from fdir/FaultCounter.h rename to inc/fsfw/fdir/FaultCounter.h diff --git a/globalfunctions/AsciiConverter.h b/inc/fsfw/globalfunctions/AsciiConverter.h similarity index 100% rename from globalfunctions/AsciiConverter.h rename to inc/fsfw/globalfunctions/AsciiConverter.h diff --git a/globalfunctions/CRC.h b/inc/fsfw/globalfunctions/CRC.h similarity index 100% rename from globalfunctions/CRC.h rename to inc/fsfw/globalfunctions/CRC.h diff --git a/globalfunctions/DleEncoder.h b/inc/fsfw/globalfunctions/DleEncoder.h similarity index 100% rename from globalfunctions/DleEncoder.h rename to inc/fsfw/globalfunctions/DleEncoder.h diff --git a/globalfunctions/PeriodicOperationDivider.h b/inc/fsfw/globalfunctions/PeriodicOperationDivider.h similarity index 100% rename from globalfunctions/PeriodicOperationDivider.h rename to inc/fsfw/globalfunctions/PeriodicOperationDivider.h diff --git a/globalfunctions/Type.h b/inc/fsfw/globalfunctions/Type.h similarity index 100% rename from globalfunctions/Type.h rename to inc/fsfw/globalfunctions/Type.h diff --git a/globalfunctions/arrayprinter.h b/inc/fsfw/globalfunctions/arrayprinter.h similarity index 100% rename from globalfunctions/arrayprinter.h rename to inc/fsfw/globalfunctions/arrayprinter.h diff --git a/globalfunctions/bitutility.h b/inc/fsfw/globalfunctions/bitutility.h similarity index 100% rename from globalfunctions/bitutility.h rename to inc/fsfw/globalfunctions/bitutility.h diff --git a/globalfunctions/constants.h b/inc/fsfw/globalfunctions/constants.h similarity index 100% rename from globalfunctions/constants.h rename to inc/fsfw/globalfunctions/constants.h diff --git a/globalfunctions/matching/BinaryMatcher.h b/inc/fsfw/globalfunctions/matching/BinaryMatcher.h similarity index 100% rename from globalfunctions/matching/BinaryMatcher.h rename to inc/fsfw/globalfunctions/matching/BinaryMatcher.h diff --git a/globalfunctions/matching/DecimalMatcher.h b/inc/fsfw/globalfunctions/matching/DecimalMatcher.h similarity index 100% rename from globalfunctions/matching/DecimalMatcher.h rename to inc/fsfw/globalfunctions/matching/DecimalMatcher.h diff --git a/globalfunctions/matching/MatchTree.h b/inc/fsfw/globalfunctions/matching/MatchTree.h similarity index 100% rename from globalfunctions/matching/MatchTree.h rename to inc/fsfw/globalfunctions/matching/MatchTree.h diff --git a/globalfunctions/matching/MatcherIF.h b/inc/fsfw/globalfunctions/matching/MatcherIF.h similarity index 100% rename from globalfunctions/matching/MatcherIF.h rename to inc/fsfw/globalfunctions/matching/MatcherIF.h diff --git a/globalfunctions/matching/RangeMatcher.h b/inc/fsfw/globalfunctions/matching/RangeMatcher.h similarity index 100% rename from globalfunctions/matching/RangeMatcher.h rename to inc/fsfw/globalfunctions/matching/RangeMatcher.h diff --git a/globalfunctions/matching/SerializeableMatcherIF.h b/inc/fsfw/globalfunctions/matching/SerializeableMatcherIF.h similarity index 100% rename from globalfunctions/matching/SerializeableMatcherIF.h rename to inc/fsfw/globalfunctions/matching/SerializeableMatcherIF.h diff --git a/globalfunctions/math/MatrixOperations.h b/inc/fsfw/globalfunctions/math/MatrixOperations.h similarity index 100% rename from globalfunctions/math/MatrixOperations.h rename to inc/fsfw/globalfunctions/math/MatrixOperations.h diff --git a/globalfunctions/math/QuaternionOperations.h b/inc/fsfw/globalfunctions/math/QuaternionOperations.h similarity index 100% rename from globalfunctions/math/QuaternionOperations.h rename to inc/fsfw/globalfunctions/math/QuaternionOperations.h diff --git a/globalfunctions/math/VectorOperations.h b/inc/fsfw/globalfunctions/math/VectorOperations.h similarity index 100% rename from globalfunctions/math/VectorOperations.h rename to inc/fsfw/globalfunctions/math/VectorOperations.h diff --git a/globalfunctions/sign.h b/inc/fsfw/globalfunctions/sign.h similarity index 100% rename from globalfunctions/sign.h rename to inc/fsfw/globalfunctions/sign.h diff --git a/globalfunctions/timevalOperations.h b/inc/fsfw/globalfunctions/timevalOperations.h similarity index 100% rename from globalfunctions/timevalOperations.h rename to inc/fsfw/globalfunctions/timevalOperations.h diff --git a/health/HasHealthIF.h b/inc/fsfw/health/HasHealthIF.h similarity index 100% rename from health/HasHealthIF.h rename to inc/fsfw/health/HasHealthIF.h diff --git a/health/HealthHelper.h b/inc/fsfw/health/HealthHelper.h similarity index 100% rename from health/HealthHelper.h rename to inc/fsfw/health/HealthHelper.h diff --git a/health/HealthMessage.h b/inc/fsfw/health/HealthMessage.h similarity index 100% rename from health/HealthMessage.h rename to inc/fsfw/health/HealthMessage.h diff --git a/health/HealthTable.h b/inc/fsfw/health/HealthTable.h similarity index 100% rename from health/HealthTable.h rename to inc/fsfw/health/HealthTable.h diff --git a/health/HealthTableIF.h b/inc/fsfw/health/HealthTableIF.h similarity index 100% rename from health/HealthTableIF.h rename to inc/fsfw/health/HealthTableIF.h diff --git a/health/ManagesHealthIF.h b/inc/fsfw/health/ManagesHealthIF.h similarity index 100% rename from health/ManagesHealthIF.h rename to inc/fsfw/health/ManagesHealthIF.h diff --git a/housekeeping/AcceptsHkPacketsIF.h b/inc/fsfw/housekeeping/AcceptsHkPacketsIF.h similarity index 100% rename from housekeeping/AcceptsHkPacketsIF.h rename to inc/fsfw/housekeeping/AcceptsHkPacketsIF.h diff --git a/housekeeping/CMakeLists.txt b/inc/fsfw/housekeeping/CMakeLists.txt similarity index 100% rename from housekeeping/CMakeLists.txt rename to inc/fsfw/housekeeping/CMakeLists.txt diff --git a/housekeeping/HousekeepingMessage.h b/inc/fsfw/housekeeping/HousekeepingMessage.h similarity index 100% rename from housekeeping/HousekeepingMessage.h rename to inc/fsfw/housekeeping/HousekeepingMessage.h diff --git a/housekeeping/HousekeepingPacketDownlink.h b/inc/fsfw/housekeeping/HousekeepingPacketDownlink.h similarity index 100% rename from housekeeping/HousekeepingPacketDownlink.h rename to inc/fsfw/housekeeping/HousekeepingPacketDownlink.h diff --git a/housekeeping/HousekeepingSetPacket.h b/inc/fsfw/housekeeping/HousekeepingSetPacket.h similarity index 100% rename from housekeeping/HousekeepingSetPacket.h rename to inc/fsfw/housekeeping/HousekeepingSetPacket.h diff --git a/housekeeping/HousekeepingSnapshot.h b/inc/fsfw/housekeeping/HousekeepingSnapshot.h similarity index 100% rename from housekeeping/HousekeepingSnapshot.h rename to inc/fsfw/housekeeping/HousekeepingSnapshot.h diff --git a/housekeeping/PeriodicHousekeepingHelper.h b/inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h similarity index 100% rename from housekeeping/PeriodicHousekeepingHelper.h rename to inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h diff --git a/internalError/InternalErrorDataset.h b/inc/fsfw/internalError/InternalErrorDataset.h similarity index 100% rename from internalError/InternalErrorDataset.h rename to inc/fsfw/internalError/InternalErrorDataset.h diff --git a/internalError/InternalErrorReporter.h b/inc/fsfw/internalError/InternalErrorReporter.h similarity index 100% rename from internalError/InternalErrorReporter.h rename to inc/fsfw/internalError/InternalErrorReporter.h diff --git a/internalError/InternalErrorReporterIF.h b/inc/fsfw/internalError/InternalErrorReporterIF.h similarity index 100% rename from internalError/InternalErrorReporterIF.h rename to inc/fsfw/internalError/InternalErrorReporterIF.h diff --git a/ipc/CommandMessage.h b/inc/fsfw/ipc/CommandMessage.h similarity index 100% rename from ipc/CommandMessage.h rename to inc/fsfw/ipc/CommandMessage.h diff --git a/ipc/CommandMessageCleaner.h b/inc/fsfw/ipc/CommandMessageCleaner.h similarity index 100% rename from ipc/CommandMessageCleaner.h rename to inc/fsfw/ipc/CommandMessageCleaner.h diff --git a/ipc/CommandMessageIF.h b/inc/fsfw/ipc/CommandMessageIF.h similarity index 100% rename from ipc/CommandMessageIF.h rename to inc/fsfw/ipc/CommandMessageIF.h diff --git a/ipc/FwMessageTypes.h b/inc/fsfw/ipc/FwMessageTypes.h similarity index 100% rename from ipc/FwMessageTypes.h rename to inc/fsfw/ipc/FwMessageTypes.h diff --git a/ipc/MessageQueueIF.h b/inc/fsfw/ipc/MessageQueueIF.h similarity index 100% rename from ipc/MessageQueueIF.h rename to inc/fsfw/ipc/MessageQueueIF.h diff --git a/ipc/MessageQueueMessage.h b/inc/fsfw/ipc/MessageQueueMessage.h similarity index 100% rename from ipc/MessageQueueMessage.h rename to inc/fsfw/ipc/MessageQueueMessage.h diff --git a/ipc/MessageQueueMessageIF.h b/inc/fsfw/ipc/MessageQueueMessageIF.h similarity index 100% rename from ipc/MessageQueueMessageIF.h rename to inc/fsfw/ipc/MessageQueueMessageIF.h diff --git a/ipc/MessageQueueSenderIF.h b/inc/fsfw/ipc/MessageQueueSenderIF.h similarity index 100% rename from ipc/MessageQueueSenderIF.h rename to inc/fsfw/ipc/MessageQueueSenderIF.h diff --git a/ipc/MutexFactory.h b/inc/fsfw/ipc/MutexFactory.h similarity index 100% rename from ipc/MutexFactory.h rename to inc/fsfw/ipc/MutexFactory.h diff --git a/ipc/MutexGuard.h b/inc/fsfw/ipc/MutexGuard.h similarity index 100% rename from ipc/MutexGuard.h rename to inc/fsfw/ipc/MutexGuard.h diff --git a/ipc/MutexIF.h b/inc/fsfw/ipc/MutexIF.h similarity index 100% rename from ipc/MutexIF.h rename to inc/fsfw/ipc/MutexIF.h diff --git a/ipc/QueueFactory.h b/inc/fsfw/ipc/QueueFactory.h similarity index 100% rename from ipc/QueueFactory.h rename to inc/fsfw/ipc/QueueFactory.h diff --git a/ipc/messageQueueDefinitions.h b/inc/fsfw/ipc/messageQueueDefinitions.h similarity index 100% rename from ipc/messageQueueDefinitions.h rename to inc/fsfw/ipc/messageQueueDefinitions.h diff --git a/memory/AcceptsMemoryMessagesIF.h b/inc/fsfw/memory/AcceptsMemoryMessagesIF.h similarity index 100% rename from memory/AcceptsMemoryMessagesIF.h rename to inc/fsfw/memory/AcceptsMemoryMessagesIF.h diff --git a/memory/GenericFileSystemMessage.h b/inc/fsfw/memory/GenericFileSystemMessage.h similarity index 100% rename from memory/GenericFileSystemMessage.h rename to inc/fsfw/memory/GenericFileSystemMessage.h diff --git a/memory/HasFileSystemIF.h b/inc/fsfw/memory/HasFileSystemIF.h similarity index 100% rename from memory/HasFileSystemIF.h rename to inc/fsfw/memory/HasFileSystemIF.h diff --git a/memory/HasMemoryIF.h b/inc/fsfw/memory/HasMemoryIF.h similarity index 100% rename from memory/HasMemoryIF.h rename to inc/fsfw/memory/HasMemoryIF.h diff --git a/memory/MemoryHelper.h b/inc/fsfw/memory/MemoryHelper.h similarity index 100% rename from memory/MemoryHelper.h rename to inc/fsfw/memory/MemoryHelper.h diff --git a/memory/MemoryMessage.h b/inc/fsfw/memory/MemoryMessage.h similarity index 100% rename from memory/MemoryMessage.h rename to inc/fsfw/memory/MemoryMessage.h diff --git a/modes/HasModesIF.h b/inc/fsfw/modes/HasModesIF.h similarity index 100% rename from modes/HasModesIF.h rename to inc/fsfw/modes/HasModesIF.h diff --git a/modes/ModeHelper.h b/inc/fsfw/modes/ModeHelper.h similarity index 100% rename from modes/ModeHelper.h rename to inc/fsfw/modes/ModeHelper.h diff --git a/modes/ModeMessage.h b/inc/fsfw/modes/ModeMessage.h similarity index 100% rename from modes/ModeMessage.h rename to inc/fsfw/modes/ModeMessage.h diff --git a/monitoring/AbsLimitMonitor.h b/inc/fsfw/monitoring/AbsLimitMonitor.h similarity index 100% rename from monitoring/AbsLimitMonitor.h rename to inc/fsfw/monitoring/AbsLimitMonitor.h diff --git a/monitoring/HasMonitorsIF.h b/inc/fsfw/monitoring/HasMonitorsIF.h similarity index 100% rename from monitoring/HasMonitorsIF.h rename to inc/fsfw/monitoring/HasMonitorsIF.h diff --git a/monitoring/LimitMonitor.h b/inc/fsfw/monitoring/LimitMonitor.h similarity index 100% rename from monitoring/LimitMonitor.h rename to inc/fsfw/monitoring/LimitMonitor.h diff --git a/monitoring/LimitViolationReporter.h b/inc/fsfw/monitoring/LimitViolationReporter.h similarity index 100% rename from monitoring/LimitViolationReporter.h rename to inc/fsfw/monitoring/LimitViolationReporter.h diff --git a/monitoring/MonitorBase.h b/inc/fsfw/monitoring/MonitorBase.h similarity index 100% rename from monitoring/MonitorBase.h rename to inc/fsfw/monitoring/MonitorBase.h diff --git a/monitoring/MonitorReporter.h b/inc/fsfw/monitoring/MonitorReporter.h similarity index 100% rename from monitoring/MonitorReporter.h rename to inc/fsfw/monitoring/MonitorReporter.h diff --git a/monitoring/MonitoringIF.h b/inc/fsfw/monitoring/MonitoringIF.h similarity index 98% rename from monitoring/MonitoringIF.h rename to inc/fsfw/monitoring/MonitoringIF.h index 32c62530..aae29475 100644 --- a/monitoring/MonitoringIF.h +++ b/inc/fsfw/monitoring/MonitoringIF.h @@ -2,7 +2,6 @@ #define FSFW_MONITORING_MONITORINGIF_H_ #include "MonitoringMessage.h" -#include "../memory/HasMemoryIF.h" #include "../serialize/SerializeIF.h" class MonitoringIF : public SerializeIF { @@ -62,6 +61,4 @@ public: } }; - - #endif /* FSFW_MONITORING_MONITORINGIF_H_ */ diff --git a/monitoring/MonitoringMessage.h b/inc/fsfw/monitoring/MonitoringMessage.h similarity index 100% rename from monitoring/MonitoringMessage.h rename to inc/fsfw/monitoring/MonitoringMessage.h diff --git a/monitoring/MonitoringMessageContent.h b/inc/fsfw/monitoring/MonitoringMessageContent.h similarity index 100% rename from monitoring/MonitoringMessageContent.h rename to inc/fsfw/monitoring/MonitoringMessageContent.h diff --git a/monitoring/ReceivesMonitoringReportsIF.h b/inc/fsfw/monitoring/ReceivesMonitoringReportsIF.h similarity index 100% rename from monitoring/ReceivesMonitoringReportsIF.h rename to inc/fsfw/monitoring/ReceivesMonitoringReportsIF.h diff --git a/monitoring/TriplexMonitor.h b/inc/fsfw/monitoring/TriplexMonitor.h similarity index 100% rename from monitoring/TriplexMonitor.h rename to inc/fsfw/monitoring/TriplexMonitor.h diff --git a/monitoring/TwoValueLimitMonitor.h b/inc/fsfw/monitoring/TwoValueLimitMonitor.h similarity index 100% rename from monitoring/TwoValueLimitMonitor.h rename to inc/fsfw/monitoring/TwoValueLimitMonitor.h diff --git a/objectmanager/ObjectManager.h b/inc/fsfw/objectmanager/ObjectManager.h similarity index 100% rename from objectmanager/ObjectManager.h rename to inc/fsfw/objectmanager/ObjectManager.h diff --git a/objectmanager/ObjectManagerIF.h b/inc/fsfw/objectmanager/ObjectManagerIF.h similarity index 100% rename from objectmanager/ObjectManagerIF.h rename to inc/fsfw/objectmanager/ObjectManagerIF.h diff --git a/objectmanager/SystemObject.h b/inc/fsfw/objectmanager/SystemObject.h similarity index 100% rename from objectmanager/SystemObject.h rename to inc/fsfw/objectmanager/SystemObject.h diff --git a/objectmanager/SystemObjectIF.h b/inc/fsfw/objectmanager/SystemObjectIF.h similarity index 100% rename from objectmanager/SystemObjectIF.h rename to inc/fsfw/objectmanager/SystemObjectIF.h diff --git a/objectmanager/frameworkObjects.h b/inc/fsfw/objectmanager/frameworkObjects.h similarity index 100% rename from objectmanager/frameworkObjects.h rename to inc/fsfw/objectmanager/frameworkObjects.h diff --git a/osal/Endiness.h b/inc/fsfw/osal/Endiness.h similarity index 100% rename from osal/Endiness.h rename to inc/fsfw/osal/Endiness.h diff --git a/osal/InternalErrorCodes.h b/inc/fsfw/osal/InternalErrorCodes.h similarity index 100% rename from osal/InternalErrorCodes.h rename to inc/fsfw/osal/InternalErrorCodes.h diff --git a/osal/common/TcpIpBase.h b/inc/fsfw/osal/common/TcpIpBase.h similarity index 100% rename from osal/common/TcpIpBase.h rename to inc/fsfw/osal/common/TcpIpBase.h diff --git a/osal/common/TcpTmTcBridge.h b/inc/fsfw/osal/common/TcpTmTcBridge.h similarity index 100% rename from osal/common/TcpTmTcBridge.h rename to inc/fsfw/osal/common/TcpTmTcBridge.h diff --git a/osal/common/TcpTmTcServer.h b/inc/fsfw/osal/common/TcpTmTcServer.h similarity index 100% rename from osal/common/TcpTmTcServer.h rename to inc/fsfw/osal/common/TcpTmTcServer.h diff --git a/osal/common/UdpTcPollingTask.h b/inc/fsfw/osal/common/UdpTcPollingTask.h similarity index 100% rename from osal/common/UdpTcPollingTask.h rename to inc/fsfw/osal/common/UdpTcPollingTask.h diff --git a/osal/common/UdpTmTcBridge.h b/inc/fsfw/osal/common/UdpTmTcBridge.h similarity index 100% rename from osal/common/UdpTmTcBridge.h rename to inc/fsfw/osal/common/UdpTmTcBridge.h diff --git a/osal/common/tcpipCommon.h b/inc/fsfw/osal/common/tcpipCommon.h similarity index 100% rename from osal/common/tcpipCommon.h rename to inc/fsfw/osal/common/tcpipCommon.h diff --git a/osal/common/tcpipHelpers.h b/inc/fsfw/osal/common/tcpipHelpers.h similarity index 100% rename from osal/common/tcpipHelpers.h rename to inc/fsfw/osal/common/tcpipHelpers.h diff --git a/osal/FreeRTOS/BinSemaphUsingTask.h b/inc/fsfw/osal/freertos/BinSemaphUsingTask.h similarity index 100% rename from osal/FreeRTOS/BinSemaphUsingTask.h rename to inc/fsfw/osal/freertos/BinSemaphUsingTask.h diff --git a/osal/FreeRTOS/BinarySemaphore.h b/inc/fsfw/osal/freertos/BinarySemaphore.h similarity index 100% rename from osal/FreeRTOS/BinarySemaphore.h rename to inc/fsfw/osal/freertos/BinarySemaphore.h diff --git a/osal/FreeRTOS/CountingSemaphUsingTask.h b/inc/fsfw/osal/freertos/CountingSemaphUsingTask.h similarity index 100% rename from osal/FreeRTOS/CountingSemaphUsingTask.h rename to inc/fsfw/osal/freertos/CountingSemaphUsingTask.h diff --git a/osal/FreeRTOS/CountingSemaphore.h b/inc/fsfw/osal/freertos/CountingSemaphore.h similarity index 100% rename from osal/FreeRTOS/CountingSemaphore.h rename to inc/fsfw/osal/freertos/CountingSemaphore.h diff --git a/osal/FreeRTOS/FixedTimeslotTask.h b/inc/fsfw/osal/freertos/FixedTimeslotTask.h similarity index 100% rename from osal/FreeRTOS/FixedTimeslotTask.h rename to inc/fsfw/osal/freertos/FixedTimeslotTask.h diff --git a/osal/FreeRTOS/FreeRTOSTaskIF.h b/inc/fsfw/osal/freertos/FreeRTOSTaskIF.h similarity index 100% rename from osal/FreeRTOS/FreeRTOSTaskIF.h rename to inc/fsfw/osal/freertos/FreeRTOSTaskIF.h diff --git a/osal/FreeRTOS/MessageQueue.h b/inc/fsfw/osal/freertos/MessageQueue.h similarity index 100% rename from osal/FreeRTOS/MessageQueue.h rename to inc/fsfw/osal/freertos/MessageQueue.h diff --git a/osal/FreeRTOS/Mutex.h b/inc/fsfw/osal/freertos/Mutex.h similarity index 100% rename from osal/FreeRTOS/Mutex.h rename to inc/fsfw/osal/freertos/Mutex.h diff --git a/osal/FreeRTOS/PeriodicTask.h b/inc/fsfw/osal/freertos/PeriodicTask.h similarity index 100% rename from osal/FreeRTOS/PeriodicTask.h rename to inc/fsfw/osal/freertos/PeriodicTask.h diff --git a/osal/FreeRTOS/QueueMapManager.h b/inc/fsfw/osal/freertos/QueueMapManager.h similarity index 100% rename from osal/FreeRTOS/QueueMapManager.h rename to inc/fsfw/osal/freertos/QueueMapManager.h diff --git a/osal/FreeRTOS/README.md b/inc/fsfw/osal/freertos/README.md similarity index 100% rename from osal/FreeRTOS/README.md rename to inc/fsfw/osal/freertos/README.md diff --git a/osal/FreeRTOS/TaskManagement.h b/inc/fsfw/osal/freertos/TaskManagement.h similarity index 100% rename from osal/FreeRTOS/TaskManagement.h rename to inc/fsfw/osal/freertos/TaskManagement.h diff --git a/osal/FreeRTOS/Timekeeper.h b/inc/fsfw/osal/freertos/Timekeeper.h similarity index 100% rename from osal/FreeRTOS/Timekeeper.h rename to inc/fsfw/osal/freertos/Timekeeper.h diff --git a/osal/host/FixedTimeslotTask.h b/inc/fsfw/osal/host/FixedTimeslotTask.h similarity index 100% rename from osal/host/FixedTimeslotTask.h rename to inc/fsfw/osal/host/FixedTimeslotTask.h diff --git a/osal/host/MessageQueue.h b/inc/fsfw/osal/host/MessageQueue.h similarity index 100% rename from osal/host/MessageQueue.h rename to inc/fsfw/osal/host/MessageQueue.h diff --git a/osal/host/Mutex.cpp b/inc/fsfw/osal/host/Mutex.cpp similarity index 100% rename from osal/host/Mutex.cpp rename to inc/fsfw/osal/host/Mutex.cpp diff --git a/osal/host/Mutex.h b/inc/fsfw/osal/host/Mutex.h similarity index 100% rename from osal/host/Mutex.h rename to inc/fsfw/osal/host/Mutex.h diff --git a/osal/host/PeriodicTask.h b/inc/fsfw/osal/host/PeriodicTask.h similarity index 100% rename from osal/host/PeriodicTask.h rename to inc/fsfw/osal/host/PeriodicTask.h diff --git a/osal/host/QueueMapManager.h b/inc/fsfw/osal/host/QueueMapManager.h similarity index 100% rename from osal/host/QueueMapManager.h rename to inc/fsfw/osal/host/QueueMapManager.h diff --git a/osal/host/taskHelpers.h b/inc/fsfw/osal/host/taskHelpers.h similarity index 100% rename from osal/host/taskHelpers.h rename to inc/fsfw/osal/host/taskHelpers.h diff --git a/osal/linux/BinarySemaphore.h b/inc/fsfw/osal/linux/BinarySemaphore.h similarity index 100% rename from osal/linux/BinarySemaphore.h rename to inc/fsfw/osal/linux/BinarySemaphore.h diff --git a/osal/linux/CountingSemaphore.h b/inc/fsfw/osal/linux/CountingSemaphore.h similarity index 100% rename from osal/linux/CountingSemaphore.h rename to inc/fsfw/osal/linux/CountingSemaphore.h diff --git a/osal/linux/FixedTimeslotTask.h b/inc/fsfw/osal/linux/FixedTimeslotTask.h similarity index 100% rename from osal/linux/FixedTimeslotTask.h rename to inc/fsfw/osal/linux/FixedTimeslotTask.h diff --git a/osal/linux/MessageQueue.h b/inc/fsfw/osal/linux/MessageQueue.h similarity index 100% rename from osal/linux/MessageQueue.h rename to inc/fsfw/osal/linux/MessageQueue.h diff --git a/osal/linux/Mutex.h b/inc/fsfw/osal/linux/Mutex.h similarity index 100% rename from osal/linux/Mutex.h rename to inc/fsfw/osal/linux/Mutex.h diff --git a/osal/linux/PeriodicPosixTask.h b/inc/fsfw/osal/linux/PeriodicPosixTask.h similarity index 100% rename from osal/linux/PeriodicPosixTask.h rename to inc/fsfw/osal/linux/PeriodicPosixTask.h diff --git a/osal/linux/PosixThread.h b/inc/fsfw/osal/linux/PosixThread.h similarity index 100% rename from osal/linux/PosixThread.h rename to inc/fsfw/osal/linux/PosixThread.h diff --git a/osal/linux/Timer.h b/inc/fsfw/osal/linux/Timer.h similarity index 100% rename from osal/linux/Timer.h rename to inc/fsfw/osal/linux/Timer.h diff --git a/osal/linux/unixUtility.h b/inc/fsfw/osal/linux/unixUtility.h similarity index 100% rename from osal/linux/unixUtility.h rename to inc/fsfw/osal/linux/unixUtility.h diff --git a/osal/rtems/CpuUsage.h b/inc/fsfw/osal/rtems/CpuUsage.h similarity index 100% rename from osal/rtems/CpuUsage.h rename to inc/fsfw/osal/rtems/CpuUsage.h diff --git a/osal/rtems/FixedTimeslotTask.h b/inc/fsfw/osal/rtems/FixedTimeslotTask.h similarity index 100% rename from osal/rtems/FixedTimeslotTask.h rename to inc/fsfw/osal/rtems/FixedTimeslotTask.h diff --git a/osal/rtems/InitTask.h b/inc/fsfw/osal/rtems/InitTask.h similarity index 100% rename from osal/rtems/InitTask.h rename to inc/fsfw/osal/rtems/InitTask.h diff --git a/osal/rtems/MessageQueue.h b/inc/fsfw/osal/rtems/MessageQueue.h similarity index 100% rename from osal/rtems/MessageQueue.h rename to inc/fsfw/osal/rtems/MessageQueue.h diff --git a/osal/rtems/Mutex.h b/inc/fsfw/osal/rtems/Mutex.h similarity index 100% rename from osal/rtems/Mutex.h rename to inc/fsfw/osal/rtems/Mutex.h diff --git a/osal/rtems/PeriodicTask.h b/inc/fsfw/osal/rtems/PeriodicTask.h similarity index 100% rename from osal/rtems/PeriodicTask.h rename to inc/fsfw/osal/rtems/PeriodicTask.h diff --git a/osal/rtems/RTEMSTaskBase.h b/inc/fsfw/osal/rtems/RTEMSTaskBase.h similarity index 100% rename from osal/rtems/RTEMSTaskBase.h rename to inc/fsfw/osal/rtems/RTEMSTaskBase.h diff --git a/osal/rtems/RtemsBasic.h b/inc/fsfw/osal/rtems/RtemsBasic.h similarity index 100% rename from osal/rtems/RtemsBasic.h rename to inc/fsfw/osal/rtems/RtemsBasic.h diff --git a/osal/windows/winTaskHelpers.h b/inc/fsfw/osal/windows/winTaskHelpers.h similarity index 100% rename from osal/windows/winTaskHelpers.h rename to inc/fsfw/osal/windows/winTaskHelpers.h diff --git a/parameters/HasParametersIF.h b/inc/fsfw/parameters/HasParametersIF.h similarity index 100% rename from parameters/HasParametersIF.h rename to inc/fsfw/parameters/HasParametersIF.h diff --git a/parameters/ParameterHelper.h b/inc/fsfw/parameters/ParameterHelper.h similarity index 100% rename from parameters/ParameterHelper.h rename to inc/fsfw/parameters/ParameterHelper.h diff --git a/parameters/ParameterMessage.h b/inc/fsfw/parameters/ParameterMessage.h similarity index 100% rename from parameters/ParameterMessage.h rename to inc/fsfw/parameters/ParameterMessage.h diff --git a/parameters/ParameterWrapper.h b/inc/fsfw/parameters/ParameterWrapper.h similarity index 100% rename from parameters/ParameterWrapper.h rename to inc/fsfw/parameters/ParameterWrapper.h diff --git a/parameters/ReceivesParameterMessagesIF.h b/inc/fsfw/parameters/ReceivesParameterMessagesIF.h similarity index 100% rename from parameters/ReceivesParameterMessagesIF.h rename to inc/fsfw/parameters/ReceivesParameterMessagesIF.h diff --git a/platform.h b/inc/fsfw/platform.h similarity index 100% rename from platform.h rename to inc/fsfw/platform.h diff --git a/power/Fuse.h b/inc/fsfw/power/Fuse.h similarity index 100% rename from power/Fuse.h rename to inc/fsfw/power/Fuse.h diff --git a/power/PowerComponent.h b/inc/fsfw/power/PowerComponent.h similarity index 100% rename from power/PowerComponent.h rename to inc/fsfw/power/PowerComponent.h diff --git a/power/PowerComponentIF.h b/inc/fsfw/power/PowerComponentIF.h similarity index 100% rename from power/PowerComponentIF.h rename to inc/fsfw/power/PowerComponentIF.h diff --git a/power/PowerSensor.h b/inc/fsfw/power/PowerSensor.h similarity index 100% rename from power/PowerSensor.h rename to inc/fsfw/power/PowerSensor.h diff --git a/power/PowerSwitchIF.h b/inc/fsfw/power/PowerSwitchIF.h similarity index 100% rename from power/PowerSwitchIF.h rename to inc/fsfw/power/PowerSwitchIF.h diff --git a/power/PowerSwitcher.h b/inc/fsfw/power/PowerSwitcher.h similarity index 100% rename from power/PowerSwitcher.h rename to inc/fsfw/power/PowerSwitcher.h diff --git a/pus/CService200ModeCommanding.h b/inc/fsfw/pus/CService200ModeCommanding.h similarity index 100% rename from pus/CService200ModeCommanding.h rename to inc/fsfw/pus/CService200ModeCommanding.h diff --git a/pus/CService201HealthCommanding.h b/inc/fsfw/pus/CService201HealthCommanding.h similarity index 100% rename from pus/CService201HealthCommanding.h rename to inc/fsfw/pus/CService201HealthCommanding.h diff --git a/pus/Service17Test.h b/inc/fsfw/pus/Service17Test.h similarity index 100% rename from pus/Service17Test.h rename to inc/fsfw/pus/Service17Test.h diff --git a/pus/Service1TelecommandVerification.h b/inc/fsfw/pus/Service1TelecommandVerification.h similarity index 100% rename from pus/Service1TelecommandVerification.h rename to inc/fsfw/pus/Service1TelecommandVerification.h diff --git a/pus/Service20ParameterManagement.h b/inc/fsfw/pus/Service20ParameterManagement.h similarity index 100% rename from pus/Service20ParameterManagement.h rename to inc/fsfw/pus/Service20ParameterManagement.h diff --git a/pus/Service2DeviceAccess.h b/inc/fsfw/pus/Service2DeviceAccess.h similarity index 100% rename from pus/Service2DeviceAccess.h rename to inc/fsfw/pus/Service2DeviceAccess.h diff --git a/pus/Service3Housekeeping.h b/inc/fsfw/pus/Service3Housekeeping.h similarity index 100% rename from pus/Service3Housekeeping.h rename to inc/fsfw/pus/Service3Housekeeping.h diff --git a/pus/Service5EventReporting.h b/inc/fsfw/pus/Service5EventReporting.h similarity index 100% rename from pus/Service5EventReporting.h rename to inc/fsfw/pus/Service5EventReporting.h diff --git a/pus/Service8FunctionManagement.h b/inc/fsfw/pus/Service8FunctionManagement.h similarity index 100% rename from pus/Service8FunctionManagement.h rename to inc/fsfw/pus/Service8FunctionManagement.h diff --git a/pus/Service9TimeManagement.h b/inc/fsfw/pus/Service9TimeManagement.h similarity index 100% rename from pus/Service9TimeManagement.h rename to inc/fsfw/pus/Service9TimeManagement.h diff --git a/pus/servicepackets/Service1Packets.h b/inc/fsfw/pus/servicepackets/Service1Packets.h similarity index 100% rename from pus/servicepackets/Service1Packets.h rename to inc/fsfw/pus/servicepackets/Service1Packets.h diff --git a/pus/servicepackets/Service200Packets.h b/inc/fsfw/pus/servicepackets/Service200Packets.h similarity index 100% rename from pus/servicepackets/Service200Packets.h rename to inc/fsfw/pus/servicepackets/Service200Packets.h diff --git a/pus/servicepackets/Service201Packets.h b/inc/fsfw/pus/servicepackets/Service201Packets.h similarity index 100% rename from pus/servicepackets/Service201Packets.h rename to inc/fsfw/pus/servicepackets/Service201Packets.h diff --git a/pus/servicepackets/Service20Packets.h b/inc/fsfw/pus/servicepackets/Service20Packets.h similarity index 100% rename from pus/servicepackets/Service20Packets.h rename to inc/fsfw/pus/servicepackets/Service20Packets.h diff --git a/pus/servicepackets/Service2Packets.h b/inc/fsfw/pus/servicepackets/Service2Packets.h similarity index 100% rename from pus/servicepackets/Service2Packets.h rename to inc/fsfw/pus/servicepackets/Service2Packets.h diff --git a/pus/servicepackets/Service3Packets.h b/inc/fsfw/pus/servicepackets/Service3Packets.h similarity index 100% rename from pus/servicepackets/Service3Packets.h rename to inc/fsfw/pus/servicepackets/Service3Packets.h diff --git a/pus/servicepackets/Service5Packets.h b/inc/fsfw/pus/servicepackets/Service5Packets.h similarity index 100% rename from pus/servicepackets/Service5Packets.h rename to inc/fsfw/pus/servicepackets/Service5Packets.h diff --git a/pus/servicepackets/Service8Packets.h b/inc/fsfw/pus/servicepackets/Service8Packets.h similarity index 100% rename from pus/servicepackets/Service8Packets.h rename to inc/fsfw/pus/servicepackets/Service8Packets.h diff --git a/pus/servicepackets/Service9Packets.h b/inc/fsfw/pus/servicepackets/Service9Packets.h similarity index 100% rename from pus/servicepackets/Service9Packets.h rename to inc/fsfw/pus/servicepackets/Service9Packets.h diff --git a/returnvalues/FwClassIds.h b/inc/fsfw/returnvalues/FwClassIds.h similarity index 100% rename from returnvalues/FwClassIds.h rename to inc/fsfw/returnvalues/FwClassIds.h diff --git a/returnvalues/HasReturnvaluesIF.h b/inc/fsfw/returnvalues/HasReturnvaluesIF.h similarity index 100% rename from returnvalues/HasReturnvaluesIF.h rename to inc/fsfw/returnvalues/HasReturnvaluesIF.h diff --git a/rmap/RMAP.h b/inc/fsfw/rmap/RMAP.h similarity index 100% rename from rmap/RMAP.h rename to inc/fsfw/rmap/RMAP.h diff --git a/rmap/RMAPChannelIF.h b/inc/fsfw/rmap/RMAPChannelIF.h similarity index 100% rename from rmap/RMAPChannelIF.h rename to inc/fsfw/rmap/RMAPChannelIF.h diff --git a/rmap/RMAPCookie.h b/inc/fsfw/rmap/RMAPCookie.h similarity index 100% rename from rmap/RMAPCookie.h rename to inc/fsfw/rmap/RMAPCookie.h diff --git a/rmap/RmapDeviceCommunicationIF.h b/inc/fsfw/rmap/RmapDeviceCommunicationIF.h similarity index 100% rename from rmap/RmapDeviceCommunicationIF.h rename to inc/fsfw/rmap/RmapDeviceCommunicationIF.h diff --git a/rmap/rmapStructs.h b/inc/fsfw/rmap/rmapStructs.h similarity index 100% rename from rmap/rmapStructs.h rename to inc/fsfw/rmap/rmapStructs.h diff --git a/serialize/EndianConverter.h b/inc/fsfw/serialize/EndianConverter.h similarity index 100% rename from serialize/EndianConverter.h rename to inc/fsfw/serialize/EndianConverter.h diff --git a/serialize/SerialArrayListAdapter.h b/inc/fsfw/serialize/SerialArrayListAdapter.h similarity index 100% rename from serialize/SerialArrayListAdapter.h rename to inc/fsfw/serialize/SerialArrayListAdapter.h diff --git a/serialize/SerialBufferAdapter.h b/inc/fsfw/serialize/SerialBufferAdapter.h similarity index 100% rename from serialize/SerialBufferAdapter.h rename to inc/fsfw/serialize/SerialBufferAdapter.h diff --git a/serialize/SerialFixedArrayListAdapter.h b/inc/fsfw/serialize/SerialFixedArrayListAdapter.h similarity index 100% rename from serialize/SerialFixedArrayListAdapter.h rename to inc/fsfw/serialize/SerialFixedArrayListAdapter.h diff --git a/serialize/SerialLinkedListAdapter.h b/inc/fsfw/serialize/SerialLinkedListAdapter.h similarity index 100% rename from serialize/SerialLinkedListAdapter.h rename to inc/fsfw/serialize/SerialLinkedListAdapter.h diff --git a/serialize/SerializeAdapter.h b/inc/fsfw/serialize/SerializeAdapter.h similarity index 100% rename from serialize/SerializeAdapter.h rename to inc/fsfw/serialize/SerializeAdapter.h diff --git a/serialize/SerializeElement.h b/inc/fsfw/serialize/SerializeElement.h similarity index 100% rename from serialize/SerializeElement.h rename to inc/fsfw/serialize/SerializeElement.h diff --git a/serialize/SerializeIF.h b/inc/fsfw/serialize/SerializeIF.h similarity index 100% rename from serialize/SerializeIF.h rename to inc/fsfw/serialize/SerializeIF.h diff --git a/serviceinterface/ServiceInterface.h b/inc/fsfw/serviceinterface/ServiceInterface.h similarity index 100% rename from serviceinterface/ServiceInterface.h rename to inc/fsfw/serviceinterface/ServiceInterface.h diff --git a/serviceinterface/ServiceInterfaceBuffer.h b/inc/fsfw/serviceinterface/ServiceInterfaceBuffer.h similarity index 100% rename from serviceinterface/ServiceInterfaceBuffer.h rename to inc/fsfw/serviceinterface/ServiceInterfaceBuffer.h diff --git a/serviceinterface/ServiceInterfacePrinter.h b/inc/fsfw/serviceinterface/ServiceInterfacePrinter.h similarity index 100% rename from serviceinterface/ServiceInterfacePrinter.h rename to inc/fsfw/serviceinterface/ServiceInterfacePrinter.h diff --git a/serviceinterface/ServiceInterfaceStream.h b/inc/fsfw/serviceinterface/ServiceInterfaceStream.h similarity index 100% rename from serviceinterface/ServiceInterfaceStream.h rename to inc/fsfw/serviceinterface/ServiceInterfaceStream.h diff --git a/serviceinterface/serviceInterfaceDefintions.h b/inc/fsfw/serviceinterface/serviceInterfaceDefintions.h similarity index 100% rename from serviceinterface/serviceInterfaceDefintions.h rename to inc/fsfw/serviceinterface/serviceInterfaceDefintions.h diff --git a/storagemanager/ConstStorageAccessor.h b/inc/fsfw/storagemanager/ConstStorageAccessor.h similarity index 100% rename from storagemanager/ConstStorageAccessor.h rename to inc/fsfw/storagemanager/ConstStorageAccessor.h diff --git a/storagemanager/LocalPool.h b/inc/fsfw/storagemanager/LocalPool.h similarity index 100% rename from storagemanager/LocalPool.h rename to inc/fsfw/storagemanager/LocalPool.h diff --git a/storagemanager/PoolManager.h b/inc/fsfw/storagemanager/PoolManager.h similarity index 100% rename from storagemanager/PoolManager.h rename to inc/fsfw/storagemanager/PoolManager.h diff --git a/storagemanager/StorageAccessor.h b/inc/fsfw/storagemanager/StorageAccessor.h similarity index 100% rename from storagemanager/StorageAccessor.h rename to inc/fsfw/storagemanager/StorageAccessor.h diff --git a/storagemanager/StorageManagerIF.h b/inc/fsfw/storagemanager/StorageManagerIF.h similarity index 100% rename from storagemanager/StorageManagerIF.h rename to inc/fsfw/storagemanager/StorageManagerIF.h diff --git a/storagemanager/storeAddress.h b/inc/fsfw/storagemanager/storeAddress.h similarity index 100% rename from storagemanager/storeAddress.h rename to inc/fsfw/storagemanager/storeAddress.h diff --git a/subsystem/Subsystem.h b/inc/fsfw/subsystem/Subsystem.h similarity index 100% rename from subsystem/Subsystem.h rename to inc/fsfw/subsystem/Subsystem.h diff --git a/subsystem/SubsystemBase.h b/inc/fsfw/subsystem/SubsystemBase.h similarity index 100% rename from subsystem/SubsystemBase.h rename to inc/fsfw/subsystem/SubsystemBase.h diff --git a/subsystem/modes/HasModeSequenceIF.h b/inc/fsfw/subsystem/modes/HasModeSequenceIF.h similarity index 100% rename from subsystem/modes/HasModeSequenceIF.h rename to inc/fsfw/subsystem/modes/HasModeSequenceIF.h diff --git a/subsystem/modes/ModeDefinitions.h b/inc/fsfw/subsystem/modes/ModeDefinitions.h similarity index 100% rename from subsystem/modes/ModeDefinitions.h rename to inc/fsfw/subsystem/modes/ModeDefinitions.h diff --git a/subsystem/modes/ModeSequenceMessage.h b/inc/fsfw/subsystem/modes/ModeSequenceMessage.h similarity index 100% rename from subsystem/modes/ModeSequenceMessage.h rename to inc/fsfw/subsystem/modes/ModeSequenceMessage.h diff --git a/subsystem/modes/ModeStore.h b/inc/fsfw/subsystem/modes/ModeStore.h similarity index 100% rename from subsystem/modes/ModeStore.h rename to inc/fsfw/subsystem/modes/ModeStore.h diff --git a/subsystem/modes/ModeStoreIF.h b/inc/fsfw/subsystem/modes/ModeStoreIF.h similarity index 100% rename from subsystem/modes/ModeStoreIF.h rename to inc/fsfw/subsystem/modes/ModeStoreIF.h diff --git a/tasks/ExecutableObjectIF.h b/inc/fsfw/tasks/ExecutableObjectIF.h similarity index 100% rename from tasks/ExecutableObjectIF.h rename to inc/fsfw/tasks/ExecutableObjectIF.h diff --git a/tasks/FixedSequenceSlot.h b/inc/fsfw/tasks/FixedSequenceSlot.h similarity index 100% rename from tasks/FixedSequenceSlot.h rename to inc/fsfw/tasks/FixedSequenceSlot.h diff --git a/tasks/FixedSlotSequence.h b/inc/fsfw/tasks/FixedSlotSequence.h similarity index 100% rename from tasks/FixedSlotSequence.h rename to inc/fsfw/tasks/FixedSlotSequence.h diff --git a/tasks/FixedTimeslotTaskIF.h b/inc/fsfw/tasks/FixedTimeslotTaskIF.h similarity index 100% rename from tasks/FixedTimeslotTaskIF.h rename to inc/fsfw/tasks/FixedTimeslotTaskIF.h diff --git a/tasks/PeriodicTaskIF.h b/inc/fsfw/tasks/PeriodicTaskIF.h similarity index 100% rename from tasks/PeriodicTaskIF.h rename to inc/fsfw/tasks/PeriodicTaskIF.h diff --git a/tasks/SemaphoreFactory.h b/inc/fsfw/tasks/SemaphoreFactory.h similarity index 100% rename from tasks/SemaphoreFactory.h rename to inc/fsfw/tasks/SemaphoreFactory.h diff --git a/tasks/SemaphoreIF.h b/inc/fsfw/tasks/SemaphoreIF.h similarity index 100% rename from tasks/SemaphoreIF.h rename to inc/fsfw/tasks/SemaphoreIF.h diff --git a/tasks/TaskFactory.h b/inc/fsfw/tasks/TaskFactory.h similarity index 100% rename from tasks/TaskFactory.h rename to inc/fsfw/tasks/TaskFactory.h diff --git a/tasks/Typedef.h b/inc/fsfw/tasks/Typedef.h similarity index 100% rename from tasks/Typedef.h rename to inc/fsfw/tasks/Typedef.h diff --git a/tcdistribution/CCSDSDistributor.h b/inc/fsfw/tcdistribution/CCSDSDistributor.h similarity index 100% rename from tcdistribution/CCSDSDistributor.h rename to inc/fsfw/tcdistribution/CCSDSDistributor.h diff --git a/tcdistribution/CCSDSDistributorIF.h b/inc/fsfw/tcdistribution/CCSDSDistributorIF.h similarity index 100% rename from tcdistribution/CCSDSDistributorIF.h rename to inc/fsfw/tcdistribution/CCSDSDistributorIF.h diff --git a/tcdistribution/PUSDistributor.h b/inc/fsfw/tcdistribution/PUSDistributor.h similarity index 100% rename from tcdistribution/PUSDistributor.h rename to inc/fsfw/tcdistribution/PUSDistributor.h diff --git a/tcdistribution/PUSDistributorIF.h b/inc/fsfw/tcdistribution/PUSDistributorIF.h similarity index 100% rename from tcdistribution/PUSDistributorIF.h rename to inc/fsfw/tcdistribution/PUSDistributorIF.h diff --git a/tcdistribution/TcDistributor.h b/inc/fsfw/tcdistribution/TcDistributor.h similarity index 100% rename from tcdistribution/TcDistributor.h rename to inc/fsfw/tcdistribution/TcDistributor.h diff --git a/tcdistribution/TcPacketCheck.h b/inc/fsfw/tcdistribution/TcPacketCheck.h similarity index 100% rename from tcdistribution/TcPacketCheck.h rename to inc/fsfw/tcdistribution/TcPacketCheck.h diff --git a/thermal/AbstractTemperatureSensor.h b/inc/fsfw/thermal/AbstractTemperatureSensor.h similarity index 100% rename from thermal/AbstractTemperatureSensor.h rename to inc/fsfw/thermal/AbstractTemperatureSensor.h diff --git a/thermal/AcceptsThermalMessagesIF.h b/inc/fsfw/thermal/AcceptsThermalMessagesIF.h similarity index 100% rename from thermal/AcceptsThermalMessagesIF.h rename to inc/fsfw/thermal/AcceptsThermalMessagesIF.h diff --git a/thermal/Heater.h b/inc/fsfw/thermal/Heater.h similarity index 100% rename from thermal/Heater.h rename to inc/fsfw/thermal/Heater.h diff --git a/thermal/RedundantHeater.h b/inc/fsfw/thermal/RedundantHeater.h similarity index 100% rename from thermal/RedundantHeater.h rename to inc/fsfw/thermal/RedundantHeater.h diff --git a/thermal/TemperatureSensor.h b/inc/fsfw/thermal/TemperatureSensor.h similarity index 100% rename from thermal/TemperatureSensor.h rename to inc/fsfw/thermal/TemperatureSensor.h diff --git a/thermal/ThermalComponent.h b/inc/fsfw/thermal/ThermalComponent.h similarity index 100% rename from thermal/ThermalComponent.h rename to inc/fsfw/thermal/ThermalComponent.h diff --git a/thermal/ThermalComponentCore.h b/inc/fsfw/thermal/ThermalComponentCore.h similarity index 100% rename from thermal/ThermalComponentCore.h rename to inc/fsfw/thermal/ThermalComponentCore.h diff --git a/thermal/ThermalComponentIF.h b/inc/fsfw/thermal/ThermalComponentIF.h similarity index 100% rename from thermal/ThermalComponentIF.h rename to inc/fsfw/thermal/ThermalComponentIF.h diff --git a/thermal/ThermalModule.h b/inc/fsfw/thermal/ThermalModule.h similarity index 100% rename from thermal/ThermalModule.h rename to inc/fsfw/thermal/ThermalModule.h diff --git a/thermal/ThermalModuleIF.h b/inc/fsfw/thermal/ThermalModuleIF.h similarity index 100% rename from thermal/ThermalModuleIF.h rename to inc/fsfw/thermal/ThermalModuleIF.h diff --git a/thermal/ThermalMonitorReporter.h b/inc/fsfw/thermal/ThermalMonitorReporter.h similarity index 100% rename from thermal/ThermalMonitorReporter.h rename to inc/fsfw/thermal/ThermalMonitorReporter.h diff --git a/thermal/tcsDefinitions.h b/inc/fsfw/thermal/tcsDefinitions.h similarity index 100% rename from thermal/tcsDefinitions.h rename to inc/fsfw/thermal/tcsDefinitions.h diff --git a/timemanager/CCSDSTime.h b/inc/fsfw/timemanager/CCSDSTime.h similarity index 100% rename from timemanager/CCSDSTime.h rename to inc/fsfw/timemanager/CCSDSTime.h diff --git a/timemanager/Clock.h b/inc/fsfw/timemanager/Clock.h similarity index 100% rename from timemanager/Clock.h rename to inc/fsfw/timemanager/Clock.h diff --git a/timemanager/Countdown.h b/inc/fsfw/timemanager/Countdown.h similarity index 100% rename from timemanager/Countdown.h rename to inc/fsfw/timemanager/Countdown.h diff --git a/timemanager/ReceivesTimeInfoIF.h b/inc/fsfw/timemanager/ReceivesTimeInfoIF.h similarity index 100% rename from timemanager/ReceivesTimeInfoIF.h rename to inc/fsfw/timemanager/ReceivesTimeInfoIF.h diff --git a/timemanager/Stopwatch.h b/inc/fsfw/timemanager/Stopwatch.h similarity index 100% rename from timemanager/Stopwatch.h rename to inc/fsfw/timemanager/Stopwatch.h diff --git a/timemanager/TimeMessage.h b/inc/fsfw/timemanager/TimeMessage.h similarity index 100% rename from timemanager/TimeMessage.h rename to inc/fsfw/timemanager/TimeMessage.h diff --git a/timemanager/TimeStamper.h b/inc/fsfw/timemanager/TimeStamper.h similarity index 100% rename from timemanager/TimeStamper.h rename to inc/fsfw/timemanager/TimeStamper.h diff --git a/timemanager/TimeStamperIF.h b/inc/fsfw/timemanager/TimeStamperIF.h similarity index 100% rename from timemanager/TimeStamperIF.h rename to inc/fsfw/timemanager/TimeStamperIF.h diff --git a/timemanager/clockDefinitions.h b/inc/fsfw/timemanager/clockDefinitions.h similarity index 100% rename from timemanager/clockDefinitions.h rename to inc/fsfw/timemanager/clockDefinitions.h diff --git a/tmstorage/TmStoreBackendIF.h b/inc/fsfw/tmstorage/TmStoreBackendIF.h similarity index 100% rename from tmstorage/TmStoreBackendIF.h rename to inc/fsfw/tmstorage/TmStoreBackendIF.h diff --git a/tmstorage/TmStoreFrontendIF.h b/inc/fsfw/tmstorage/TmStoreFrontendIF.h similarity index 100% rename from tmstorage/TmStoreFrontendIF.h rename to inc/fsfw/tmstorage/TmStoreFrontendIF.h diff --git a/tmstorage/TmStoreMessage.h b/inc/fsfw/tmstorage/TmStoreMessage.h similarity index 100% rename from tmstorage/TmStoreMessage.h rename to inc/fsfw/tmstorage/TmStoreMessage.h diff --git a/tmstorage/TmStorePackets.h b/inc/fsfw/tmstorage/TmStorePackets.h similarity index 100% rename from tmstorage/TmStorePackets.h rename to inc/fsfw/tmstorage/TmStorePackets.h diff --git a/tmtcpacket/SpacePacket.h b/inc/fsfw/tmtcpacket/SpacePacket.h similarity index 100% rename from tmtcpacket/SpacePacket.h rename to inc/fsfw/tmtcpacket/SpacePacket.h diff --git a/tmtcpacket/SpacePacketBase.h b/inc/fsfw/tmtcpacket/SpacePacketBase.h similarity index 100% rename from tmtcpacket/SpacePacketBase.h rename to inc/fsfw/tmtcpacket/SpacePacketBase.h diff --git a/tmtcpacket/ccsds_header.h b/inc/fsfw/tmtcpacket/ccsds_header.h similarity index 100% rename from tmtcpacket/ccsds_header.h rename to inc/fsfw/tmtcpacket/ccsds_header.h diff --git a/tmtcpacket/packetmatcher/ApidMatcher.h b/inc/fsfw/tmtcpacket/packetmatcher/ApidMatcher.h similarity index 100% rename from tmtcpacket/packetmatcher/ApidMatcher.h rename to inc/fsfw/tmtcpacket/packetmatcher/ApidMatcher.h diff --git a/tmtcpacket/packetmatcher/PacketMatchTree.h b/inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h similarity index 100% rename from tmtcpacket/packetmatcher/PacketMatchTree.h rename to inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h diff --git a/tmtcpacket/packetmatcher/ServiceMatcher.h b/inc/fsfw/tmtcpacket/packetmatcher/ServiceMatcher.h similarity index 100% rename from tmtcpacket/packetmatcher/ServiceMatcher.h rename to inc/fsfw/tmtcpacket/packetmatcher/ServiceMatcher.h diff --git a/tmtcpacket/packetmatcher/SubserviceMatcher.h b/inc/fsfw/tmtcpacket/packetmatcher/SubserviceMatcher.h similarity index 100% rename from tmtcpacket/packetmatcher/SubserviceMatcher.h rename to inc/fsfw/tmtcpacket/packetmatcher/SubserviceMatcher.h diff --git a/tmtcpacket/pus/PacketTimestampInterpreterIF.h b/inc/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h similarity index 100% rename from tmtcpacket/pus/PacketTimestampInterpreterIF.h rename to inc/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h diff --git a/tmtcpacket/pus/tc.h b/inc/fsfw/tmtcpacket/pus/tc.h similarity index 100% rename from tmtcpacket/pus/tc.h rename to inc/fsfw/tmtcpacket/pus/tc.h diff --git a/tmtcpacket/pus/tc/TcPacketBase.h b/inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h similarity index 100% rename from tmtcpacket/pus/tc/TcPacketBase.h rename to inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h diff --git a/tmtcpacket/pus/tc/TcPacketPus.h b/inc/fsfw/tmtcpacket/pus/tc/TcPacketPus.h similarity index 100% rename from tmtcpacket/pus/tc/TcPacketPus.h rename to inc/fsfw/tmtcpacket/pus/tc/TcPacketPus.h diff --git a/tmtcpacket/pus/tc/TcPacketStoredBase.h b/inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h similarity index 100% rename from tmtcpacket/pus/tc/TcPacketStoredBase.h rename to inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h diff --git a/tmtcpacket/pus/tc/TcPacketStoredIF.h b/inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h similarity index 100% rename from tmtcpacket/pus/tc/TcPacketStoredIF.h rename to inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h diff --git a/tmtcpacket/pus/tc/TcPacketStoredPus.h b/inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h similarity index 100% rename from tmtcpacket/pus/tc/TcPacketStoredPus.h rename to inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h diff --git a/tmtcpacket/pus/tm.h b/inc/fsfw/tmtcpacket/pus/tm.h similarity index 100% rename from tmtcpacket/pus/tm.h rename to inc/fsfw/tmtcpacket/pus/tm.h diff --git a/tmtcpacket/pus/tm/TmPacketBase.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketBase.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketBase.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketBase.h diff --git a/tmtcpacket/pus/tm/TmPacketMinimal.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketMinimal.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h diff --git a/tmtcpacket/pus/tm/TmPacketPusA.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketPusA.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h diff --git a/tmtcpacket/pus/tm/TmPacketPusC.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketPusC.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h diff --git a/tmtcpacket/pus/tm/TmPacketStored.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketStored.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketStored.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketStored.h diff --git a/tmtcpacket/pus/tm/TmPacketStoredBase.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketStoredBase.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h diff --git a/tmtcpacket/pus/tm/TmPacketStoredPusA.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketStoredPusA.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h diff --git a/tmtcpacket/pus/tm/TmPacketStoredPusC.h b/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h similarity index 100% rename from tmtcpacket/pus/tm/TmPacketStoredPusC.h rename to inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h diff --git a/tmtcservices/AcceptsTelecommandsIF.h b/inc/fsfw/tmtcservices/AcceptsTelecommandsIF.h similarity index 100% rename from tmtcservices/AcceptsTelecommandsIF.h rename to inc/fsfw/tmtcservices/AcceptsTelecommandsIF.h diff --git a/tmtcservices/AcceptsTelemetryIF.h b/inc/fsfw/tmtcservices/AcceptsTelemetryIF.h similarity index 100% rename from tmtcservices/AcceptsTelemetryIF.h rename to inc/fsfw/tmtcservices/AcceptsTelemetryIF.h diff --git a/tmtcservices/AcceptsVerifyMessageIF.h b/inc/fsfw/tmtcservices/AcceptsVerifyMessageIF.h similarity index 100% rename from tmtcservices/AcceptsVerifyMessageIF.h rename to inc/fsfw/tmtcservices/AcceptsVerifyMessageIF.h diff --git a/tmtcservices/CommandingServiceBase.h b/inc/fsfw/tmtcservices/CommandingServiceBase.h similarity index 100% rename from tmtcservices/CommandingServiceBase.h rename to inc/fsfw/tmtcservices/CommandingServiceBase.h diff --git a/tmtcservices/PusServiceBase.h b/inc/fsfw/tmtcservices/PusServiceBase.h similarity index 100% rename from tmtcservices/PusServiceBase.h rename to inc/fsfw/tmtcservices/PusServiceBase.h diff --git a/tmtcservices/PusVerificationReport.h b/inc/fsfw/tmtcservices/PusVerificationReport.h similarity index 100% rename from tmtcservices/PusVerificationReport.h rename to inc/fsfw/tmtcservices/PusVerificationReport.h diff --git a/tmtcservices/SourceSequenceCounter.h b/inc/fsfw/tmtcservices/SourceSequenceCounter.h similarity index 100% rename from tmtcservices/SourceSequenceCounter.h rename to inc/fsfw/tmtcservices/SourceSequenceCounter.h diff --git a/tmtcservices/TmTcBridge.h b/inc/fsfw/tmtcservices/TmTcBridge.h similarity index 100% rename from tmtcservices/TmTcBridge.h rename to inc/fsfw/tmtcservices/TmTcBridge.h diff --git a/tmtcservices/TmTcMessage.h b/inc/fsfw/tmtcservices/TmTcMessage.h similarity index 100% rename from tmtcservices/TmTcMessage.h rename to inc/fsfw/tmtcservices/TmTcMessage.h diff --git a/tmtcservices/VerificationCodes.h b/inc/fsfw/tmtcservices/VerificationCodes.h similarity index 100% rename from tmtcservices/VerificationCodes.h rename to inc/fsfw/tmtcservices/VerificationCodes.h diff --git a/tmtcservices/VerificationReporter.h b/inc/fsfw/tmtcservices/VerificationReporter.h similarity index 100% rename from tmtcservices/VerificationReporter.h rename to inc/fsfw/tmtcservices/VerificationReporter.h diff --git a/defaultcfg/README.md b/misc/defaultcfg/README.md similarity index 100% rename from defaultcfg/README.md rename to misc/defaultcfg/README.md diff --git a/defaultcfg/fsfwconfig/CMakeLists.txt b/misc/defaultcfg/fsfwconfig/CMakeLists.txt similarity index 100% rename from defaultcfg/fsfwconfig/CMakeLists.txt rename to misc/defaultcfg/fsfwconfig/CMakeLists.txt diff --git a/defaultcfg/fsfwconfig/FSFWConfig.h b/misc/defaultcfg/fsfwconfig/FSFWConfig.h similarity index 100% rename from defaultcfg/fsfwconfig/FSFWConfig.h rename to misc/defaultcfg/fsfwconfig/FSFWConfig.h diff --git a/defaultcfg/fsfwconfig/OBSWConfig.h b/misc/defaultcfg/fsfwconfig/OBSWConfig.h similarity index 100% rename from defaultcfg/fsfwconfig/OBSWConfig.h rename to misc/defaultcfg/fsfwconfig/OBSWConfig.h diff --git a/defaultcfg/fsfwconfig/OBSWVersion.h b/misc/defaultcfg/fsfwconfig/OBSWVersion.h similarity index 100% rename from defaultcfg/fsfwconfig/OBSWVersion.h rename to misc/defaultcfg/fsfwconfig/OBSWVersion.h diff --git a/defaultcfg/fsfwconfig/devices/logicalAddresses.h b/misc/defaultcfg/fsfwconfig/devices/logicalAddresses.h similarity index 100% rename from defaultcfg/fsfwconfig/devices/logicalAddresses.h rename to misc/defaultcfg/fsfwconfig/devices/logicalAddresses.h diff --git a/defaultcfg/fsfwconfig/devices/powerSwitcherList.h b/misc/defaultcfg/fsfwconfig/devices/powerSwitcherList.h similarity index 100% rename from defaultcfg/fsfwconfig/devices/powerSwitcherList.h rename to misc/defaultcfg/fsfwconfig/devices/powerSwitcherList.h diff --git a/defaultcfg/fsfwconfig/events/subsystemIdRanges.h b/misc/defaultcfg/fsfwconfig/events/subsystemIdRanges.h similarity index 100% rename from defaultcfg/fsfwconfig/events/subsystemIdRanges.h rename to misc/defaultcfg/fsfwconfig/events/subsystemIdRanges.h diff --git a/defaultcfg/fsfwconfig/fsfwconfig.mk b/misc/defaultcfg/fsfwconfig/fsfwconfig.mk similarity index 100% rename from defaultcfg/fsfwconfig/fsfwconfig.mk rename to misc/defaultcfg/fsfwconfig/fsfwconfig.mk diff --git a/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp b/misc/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp similarity index 100% rename from defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp rename to misc/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp diff --git a/defaultcfg/fsfwconfig/ipc/missionMessageTypes.h b/misc/defaultcfg/fsfwconfig/ipc/missionMessageTypes.h similarity index 100% rename from defaultcfg/fsfwconfig/ipc/missionMessageTypes.h rename to misc/defaultcfg/fsfwconfig/ipc/missionMessageTypes.h diff --git a/defaultcfg/fsfwconfig/objects/FsfwFactory.cpp b/misc/defaultcfg/fsfwconfig/objects/FsfwFactory.cpp similarity index 100% rename from defaultcfg/fsfwconfig/objects/FsfwFactory.cpp rename to misc/defaultcfg/fsfwconfig/objects/FsfwFactory.cpp diff --git a/defaultcfg/fsfwconfig/objects/FsfwFactory.h b/misc/defaultcfg/fsfwconfig/objects/FsfwFactory.h similarity index 100% rename from defaultcfg/fsfwconfig/objects/FsfwFactory.h rename to misc/defaultcfg/fsfwconfig/objects/FsfwFactory.h diff --git a/defaultcfg/fsfwconfig/objects/systemObjectList.h b/misc/defaultcfg/fsfwconfig/objects/systemObjectList.h similarity index 100% rename from defaultcfg/fsfwconfig/objects/systemObjectList.h rename to misc/defaultcfg/fsfwconfig/objects/systemObjectList.h diff --git a/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp b/misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp similarity index 100% rename from defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp rename to misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp diff --git a/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h b/misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h similarity index 100% rename from defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h rename to misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h diff --git a/defaultcfg/fsfwconfig/returnvalues/classIds.h b/misc/defaultcfg/fsfwconfig/returnvalues/classIds.h similarity index 100% rename from defaultcfg/fsfwconfig/returnvalues/classIds.h rename to misc/defaultcfg/fsfwconfig/returnvalues/classIds.h diff --git a/defaultcfg/fsfwconfig/tmtc/apid.h b/misc/defaultcfg/fsfwconfig/tmtc/apid.h similarity index 100% rename from defaultcfg/fsfwconfig/tmtc/apid.h rename to misc/defaultcfg/fsfwconfig/tmtc/apid.h diff --git a/defaultcfg/fsfwconfig/tmtc/pusIds.h b/misc/defaultcfg/fsfwconfig/tmtc/pusIds.h similarity index 100% rename from defaultcfg/fsfwconfig/tmtc/pusIds.h rename to misc/defaultcfg/fsfwconfig/tmtc/pusIds.h diff --git a/logo/FSFW_Logo_V3.png b/misc/logo/FSFW_Logo_V3.png similarity index 100% rename from logo/FSFW_Logo_V3.png rename to misc/logo/FSFW_Logo_V3.png diff --git a/logo/FSFW_Logo_V3.svg b/misc/logo/FSFW_Logo_V3.svg similarity index 100% rename from logo/FSFW_Logo_V3.svg rename to misc/logo/FSFW_Logo_V3.svg diff --git a/logo/FSFW_Logo_V3_bw.png b/misc/logo/FSFW_Logo_V3_bw.png similarity index 100% rename from logo/FSFW_Logo_V3_bw.png rename to misc/logo/FSFW_Logo_V3_bw.png diff --git a/core/src/action/ActionHelper.cpp b/src/core/action/ActionHelper.cpp similarity index 100% rename from core/src/action/ActionHelper.cpp rename to src/core/action/ActionHelper.cpp diff --git a/core/src/action/ActionMessage.cpp b/src/core/action/ActionMessage.cpp similarity index 100% rename from core/src/action/ActionMessage.cpp rename to src/core/action/ActionMessage.cpp diff --git a/core/src/action/CMakeLists.txt b/src/core/action/CMakeLists.txt similarity index 100% rename from core/src/action/CMakeLists.txt rename to src/core/action/CMakeLists.txt diff --git a/core/src/action/CommandActionHelper.cpp b/src/core/action/CommandActionHelper.cpp similarity index 100% rename from core/src/action/CommandActionHelper.cpp rename to src/core/action/CommandActionHelper.cpp diff --git a/core/src/action/SimpleActionHelper.cpp b/src/core/action/SimpleActionHelper.cpp similarity index 100% rename from core/src/action/SimpleActionHelper.cpp rename to src/core/action/SimpleActionHelper.cpp diff --git a/core/src/container/CMakeLists.txt b/src/core/container/CMakeLists.txt similarity index 100% rename from core/src/container/CMakeLists.txt rename to src/core/container/CMakeLists.txt diff --git a/core/src/container/SharedRingBuffer.cpp b/src/core/container/SharedRingBuffer.cpp similarity index 100% rename from core/src/container/SharedRingBuffer.cpp rename to src/core/container/SharedRingBuffer.cpp diff --git a/core/src/container/SimpleRingBuffer.cpp b/src/core/container/SimpleRingBuffer.cpp similarity index 100% rename from core/src/container/SimpleRingBuffer.cpp rename to src/core/container/SimpleRingBuffer.cpp diff --git a/core/src/controller/CMakeLists.txt b/src/core/controller/CMakeLists.txt similarity index 100% rename from core/src/controller/CMakeLists.txt rename to src/core/controller/CMakeLists.txt diff --git a/core/src/controller/ControllerBase.cpp b/src/core/controller/ControllerBase.cpp similarity index 100% rename from core/src/controller/ControllerBase.cpp rename to src/core/controller/ControllerBase.cpp diff --git a/core/src/controller/ExtendedControllerBase.cpp b/src/core/controller/ExtendedControllerBase.cpp similarity index 100% rename from core/src/controller/ExtendedControllerBase.cpp rename to src/core/controller/ExtendedControllerBase.cpp diff --git a/core/src/datapool/CMakeLists.txt b/src/core/datapool/CMakeLists.txt similarity index 100% rename from core/src/datapool/CMakeLists.txt rename to src/core/datapool/CMakeLists.txt diff --git a/core/src/datapool/HkSwitchHelper.cpp b/src/core/datapool/HkSwitchHelper.cpp similarity index 100% rename from core/src/datapool/HkSwitchHelper.cpp rename to src/core/datapool/HkSwitchHelper.cpp diff --git a/core/src/datapool/PoolDataSetBase.cpp b/src/core/datapool/PoolDataSetBase.cpp similarity index 100% rename from core/src/datapool/PoolDataSetBase.cpp rename to src/core/datapool/PoolDataSetBase.cpp diff --git a/core/src/datapool/PoolEntry.cpp b/src/core/datapool/PoolEntry.cpp similarity index 100% rename from core/src/datapool/PoolEntry.cpp rename to src/core/datapool/PoolEntry.cpp diff --git a/core/src/datapoollocal/CMakeLists.txt b/src/core/datapoollocal/CMakeLists.txt similarity index 100% rename from core/src/datapoollocal/CMakeLists.txt rename to src/core/datapoollocal/CMakeLists.txt diff --git a/core/src/datapoollocal/LocalDataPoolManager.cpp b/src/core/datapoollocal/LocalDataPoolManager.cpp similarity index 100% rename from core/src/datapoollocal/LocalDataPoolManager.cpp rename to src/core/datapoollocal/LocalDataPoolManager.cpp diff --git a/core/src/datapoollocal/LocalDataSet.cpp b/src/core/datapoollocal/LocalDataSet.cpp similarity index 100% rename from core/src/datapoollocal/LocalDataSet.cpp rename to src/core/datapoollocal/LocalDataSet.cpp diff --git a/core/src/datapoollocal/LocalPoolDataSetBase.cpp b/src/core/datapoollocal/LocalPoolDataSetBase.cpp similarity index 100% rename from core/src/datapoollocal/LocalPoolDataSetBase.cpp rename to src/core/datapoollocal/LocalPoolDataSetBase.cpp diff --git a/core/src/datapoollocal/LocalPoolObjectBase.cpp b/src/core/datapoollocal/LocalPoolObjectBase.cpp similarity index 100% rename from core/src/datapoollocal/LocalPoolObjectBase.cpp rename to src/core/datapoollocal/LocalPoolObjectBase.cpp diff --git a/core/src/datapoollocal/SharedLocalDataSet.cpp b/src/core/datapoollocal/SharedLocalDataSet.cpp similarity index 100% rename from core/src/datapoollocal/SharedLocalDataSet.cpp rename to src/core/datapoollocal/SharedLocalDataSet.cpp diff --git a/core/src/datapoollocal/internal/CMakeLists.txt b/src/core/datapoollocal/internal/CMakeLists.txt similarity index 100% rename from core/src/datapoollocal/internal/CMakeLists.txt rename to src/core/datapoollocal/internal/CMakeLists.txt diff --git a/core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp b/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp similarity index 100% rename from core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp rename to src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp diff --git a/core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.h b/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h similarity index 100% rename from core/src/datapoollocal/internal/HasLocalDpIFManagerAttorney.h rename to src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h diff --git a/core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp b/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp similarity index 100% rename from core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp rename to src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp diff --git a/core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.h b/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.h similarity index 100% rename from core/src/datapoollocal/internal/HasLocalDpIFUserAttorney.h rename to src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.h diff --git a/core/src/datapoollocal/internal/LocalDpManagerAttorney.h b/src/core/datapoollocal/internal/LocalDpManagerAttorney.h similarity index 100% rename from core/src/datapoollocal/internal/LocalDpManagerAttorney.h rename to src/core/datapoollocal/internal/LocalDpManagerAttorney.h diff --git a/core/src/datapoollocal/internal/LocalPoolDataSetAttorney.h b/src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h similarity index 100% rename from core/src/datapoollocal/internal/LocalPoolDataSetAttorney.h rename to src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h diff --git a/devicehandlers/AssemblyBase.cpp b/src/core/devicehandlers/AssemblyBase.cpp similarity index 100% rename from devicehandlers/AssemblyBase.cpp rename to src/core/devicehandlers/AssemblyBase.cpp diff --git a/devicehandlers/ChildHandlerBase.cpp b/src/core/devicehandlers/ChildHandlerBase.cpp similarity index 100% rename from devicehandlers/ChildHandlerBase.cpp rename to src/core/devicehandlers/ChildHandlerBase.cpp diff --git a/devicehandlers/ChildHandlerFDIR.cpp b/src/core/devicehandlers/ChildHandlerFDIR.cpp similarity index 100% rename from devicehandlers/ChildHandlerFDIR.cpp rename to src/core/devicehandlers/ChildHandlerFDIR.cpp diff --git a/devicehandlers/DeviceHandlerBase.cpp b/src/core/devicehandlers/DeviceHandlerBase.cpp similarity index 100% rename from devicehandlers/DeviceHandlerBase.cpp rename to src/core/devicehandlers/DeviceHandlerBase.cpp diff --git a/devicehandlers/DeviceHandlerFailureIsolation.cpp b/src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp similarity index 100% rename from devicehandlers/DeviceHandlerFailureIsolation.cpp rename to src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp diff --git a/devicehandlers/DeviceHandlerMessage.cpp b/src/core/devicehandlers/DeviceHandlerMessage.cpp similarity index 100% rename from devicehandlers/DeviceHandlerMessage.cpp rename to src/core/devicehandlers/DeviceHandlerMessage.cpp diff --git a/devicehandlers/DeviceTmReportingWrapper.cpp b/src/core/devicehandlers/DeviceTmReportingWrapper.cpp similarity index 100% rename from devicehandlers/DeviceTmReportingWrapper.cpp rename to src/core/devicehandlers/DeviceTmReportingWrapper.cpp diff --git a/devicehandlers/HealthDevice.cpp b/src/core/devicehandlers/HealthDevice.cpp similarity index 100% rename from devicehandlers/HealthDevice.cpp rename to src/core/devicehandlers/HealthDevice.cpp diff --git a/events/CMakeLists.txt b/src/core/events/CMakeLists.txt similarity index 100% rename from events/CMakeLists.txt rename to src/core/events/CMakeLists.txt diff --git a/events/EventManager.cpp b/src/core/events/EventManager.cpp similarity index 100% rename from events/EventManager.cpp rename to src/core/events/EventManager.cpp diff --git a/events/EventMessage.cpp b/src/core/events/EventMessage.cpp similarity index 100% rename from events/EventMessage.cpp rename to src/core/events/EventMessage.cpp diff --git a/fdir/CMakeLists.txt b/src/core/fdir/CMakeLists.txt similarity index 100% rename from fdir/CMakeLists.txt rename to src/core/fdir/CMakeLists.txt diff --git a/fdir/EventCorrelation.cpp b/src/core/fdir/EventCorrelation.cpp similarity index 100% rename from fdir/EventCorrelation.cpp rename to src/core/fdir/EventCorrelation.cpp diff --git a/fdir/FailureIsolationBase.cpp b/src/core/fdir/FailureIsolationBase.cpp similarity index 100% rename from fdir/FailureIsolationBase.cpp rename to src/core/fdir/FailureIsolationBase.cpp diff --git a/fdir/FaultCounter.cpp b/src/core/fdir/FaultCounter.cpp similarity index 100% rename from fdir/FaultCounter.cpp rename to src/core/fdir/FaultCounter.cpp diff --git a/globalfunctions/AsciiConverter.cpp b/src/core/globalfunctions/AsciiConverter.cpp similarity index 100% rename from globalfunctions/AsciiConverter.cpp rename to src/core/globalfunctions/AsciiConverter.cpp diff --git a/globalfunctions/CMakeLists.txt b/src/core/globalfunctions/CMakeLists.txt similarity index 100% rename from globalfunctions/CMakeLists.txt rename to src/core/globalfunctions/CMakeLists.txt diff --git a/globalfunctions/CRC.cpp b/src/core/globalfunctions/CRC.cpp similarity index 100% rename from globalfunctions/CRC.cpp rename to src/core/globalfunctions/CRC.cpp diff --git a/globalfunctions/DleEncoder.cpp b/src/core/globalfunctions/DleEncoder.cpp similarity index 100% rename from globalfunctions/DleEncoder.cpp rename to src/core/globalfunctions/DleEncoder.cpp diff --git a/globalfunctions/PeriodicOperationDivider.cpp b/src/core/globalfunctions/PeriodicOperationDivider.cpp similarity index 100% rename from globalfunctions/PeriodicOperationDivider.cpp rename to src/core/globalfunctions/PeriodicOperationDivider.cpp diff --git a/globalfunctions/Type.cpp b/src/core/globalfunctions/Type.cpp similarity index 100% rename from globalfunctions/Type.cpp rename to src/core/globalfunctions/Type.cpp diff --git a/globalfunctions/arrayprinter.cpp b/src/core/globalfunctions/arrayprinter.cpp similarity index 100% rename from globalfunctions/arrayprinter.cpp rename to src/core/globalfunctions/arrayprinter.cpp diff --git a/globalfunctions/bitutility.cpp b/src/core/globalfunctions/bitutility.cpp similarity index 100% rename from globalfunctions/bitutility.cpp rename to src/core/globalfunctions/bitutility.cpp diff --git a/globalfunctions/math/CMakeLists.txt b/src/core/globalfunctions/math/CMakeLists.txt similarity index 100% rename from globalfunctions/math/CMakeLists.txt rename to src/core/globalfunctions/math/CMakeLists.txt diff --git a/globalfunctions/math/QuaternionOperations.cpp b/src/core/globalfunctions/math/QuaternionOperations.cpp similarity index 100% rename from globalfunctions/math/QuaternionOperations.cpp rename to src/core/globalfunctions/math/QuaternionOperations.cpp diff --git a/globalfunctions/timevalOperations.cpp b/src/core/globalfunctions/timevalOperations.cpp similarity index 100% rename from globalfunctions/timevalOperations.cpp rename to src/core/globalfunctions/timevalOperations.cpp diff --git a/health/CMakeLists.txt b/src/core/health/CMakeLists.txt similarity index 100% rename from health/CMakeLists.txt rename to src/core/health/CMakeLists.txt diff --git a/health/HealthHelper.cpp b/src/core/health/HealthHelper.cpp similarity index 100% rename from health/HealthHelper.cpp rename to src/core/health/HealthHelper.cpp diff --git a/health/HealthMessage.cpp b/src/core/health/HealthMessage.cpp similarity index 100% rename from health/HealthMessage.cpp rename to src/core/health/HealthMessage.cpp diff --git a/health/HealthTable.cpp b/src/core/health/HealthTable.cpp similarity index 100% rename from health/HealthTable.cpp rename to src/core/health/HealthTable.cpp diff --git a/housekeeping/HousekeepingMessage.cpp b/src/core/housekeeping/HousekeepingMessage.cpp similarity index 100% rename from housekeeping/HousekeepingMessage.cpp rename to src/core/housekeeping/HousekeepingMessage.cpp diff --git a/housekeeping/PeriodicHousekeepingHelper.cpp b/src/core/housekeeping/PeriodicHousekeepingHelper.cpp similarity index 100% rename from housekeeping/PeriodicHousekeepingHelper.cpp rename to src/core/housekeeping/PeriodicHousekeepingHelper.cpp diff --git a/internalError/CMakeLists.txt b/src/core/internalError/CMakeLists.txt similarity index 100% rename from internalError/CMakeLists.txt rename to src/core/internalError/CMakeLists.txt diff --git a/internalError/InternalErrorReporter.cpp b/src/core/internalError/InternalErrorReporter.cpp similarity index 100% rename from internalError/InternalErrorReporter.cpp rename to src/core/internalError/InternalErrorReporter.cpp diff --git a/ipc/CMakeLists.txt b/src/core/ipc/CMakeLists.txt similarity index 100% rename from ipc/CMakeLists.txt rename to src/core/ipc/CMakeLists.txt diff --git a/ipc/CommandMessage.cpp b/src/core/ipc/CommandMessage.cpp similarity index 100% rename from ipc/CommandMessage.cpp rename to src/core/ipc/CommandMessage.cpp diff --git a/ipc/CommandMessageCleaner.cpp b/src/core/ipc/CommandMessageCleaner.cpp similarity index 100% rename from ipc/CommandMessageCleaner.cpp rename to src/core/ipc/CommandMessageCleaner.cpp diff --git a/ipc/MessageQueueMessage.cpp b/src/core/ipc/MessageQueueMessage.cpp similarity index 100% rename from ipc/MessageQueueMessage.cpp rename to src/core/ipc/MessageQueueMessage.cpp diff --git a/modes/CMakeLists.txt b/src/core/modes/CMakeLists.txt similarity index 100% rename from modes/CMakeLists.txt rename to src/core/modes/CMakeLists.txt diff --git a/modes/ModeHelper.cpp b/src/core/modes/ModeHelper.cpp similarity index 100% rename from modes/ModeHelper.cpp rename to src/core/modes/ModeHelper.cpp diff --git a/modes/ModeMessage.cpp b/src/core/modes/ModeMessage.cpp similarity index 100% rename from modes/ModeMessage.cpp rename to src/core/modes/ModeMessage.cpp diff --git a/objectmanager/CMakeLists.txt b/src/core/objectmanager/CMakeLists.txt similarity index 100% rename from objectmanager/CMakeLists.txt rename to src/core/objectmanager/CMakeLists.txt diff --git a/objectmanager/ObjectManager.cpp b/src/core/objectmanager/ObjectManager.cpp similarity index 100% rename from objectmanager/ObjectManager.cpp rename to src/core/objectmanager/ObjectManager.cpp diff --git a/objectmanager/SystemObject.cpp b/src/core/objectmanager/SystemObject.cpp similarity index 100% rename from objectmanager/SystemObject.cpp rename to src/core/objectmanager/SystemObject.cpp diff --git a/parameters/CMakeLists.txt b/src/core/parameters/CMakeLists.txt similarity index 100% rename from parameters/CMakeLists.txt rename to src/core/parameters/CMakeLists.txt diff --git a/parameters/ParameterHelper.cpp b/src/core/parameters/ParameterHelper.cpp similarity index 100% rename from parameters/ParameterHelper.cpp rename to src/core/parameters/ParameterHelper.cpp diff --git a/parameters/ParameterMessage.cpp b/src/core/parameters/ParameterMessage.cpp similarity index 100% rename from parameters/ParameterMessage.cpp rename to src/core/parameters/ParameterMessage.cpp diff --git a/parameters/ParameterWrapper.cpp b/src/core/parameters/ParameterWrapper.cpp similarity index 100% rename from parameters/ParameterWrapper.cpp rename to src/core/parameters/ParameterWrapper.cpp diff --git a/power/CMakeLists.txt b/src/core/power/CMakeLists.txt similarity index 100% rename from power/CMakeLists.txt rename to src/core/power/CMakeLists.txt diff --git a/power/Fuse.cpp b/src/core/power/Fuse.cpp similarity index 100% rename from power/Fuse.cpp rename to src/core/power/Fuse.cpp diff --git a/power/PowerComponent.cpp b/src/core/power/PowerComponent.cpp similarity index 100% rename from power/PowerComponent.cpp rename to src/core/power/PowerComponent.cpp diff --git a/power/PowerSensor.cpp b/src/core/power/PowerSensor.cpp similarity index 100% rename from power/PowerSensor.cpp rename to src/core/power/PowerSensor.cpp diff --git a/power/PowerSwitcher.cpp b/src/core/power/PowerSwitcher.cpp similarity index 100% rename from power/PowerSwitcher.cpp rename to src/core/power/PowerSwitcher.cpp diff --git a/serialize/CMakeLists.txt b/src/core/serialize/CMakeLists.txt similarity index 100% rename from serialize/CMakeLists.txt rename to src/core/serialize/CMakeLists.txt diff --git a/serialize/SerialBufferAdapter.cpp b/src/core/serialize/SerialBufferAdapter.cpp similarity index 100% rename from serialize/SerialBufferAdapter.cpp rename to src/core/serialize/SerialBufferAdapter.cpp diff --git a/serviceinterface/CMakeLists.txt b/src/core/serviceinterface/CMakeLists.txt similarity index 100% rename from serviceinterface/CMakeLists.txt rename to src/core/serviceinterface/CMakeLists.txt diff --git a/serviceinterface/ServiceInterfaceBuffer.cpp b/src/core/serviceinterface/ServiceInterfaceBuffer.cpp similarity index 100% rename from serviceinterface/ServiceInterfaceBuffer.cpp rename to src/core/serviceinterface/ServiceInterfaceBuffer.cpp diff --git a/serviceinterface/ServiceInterfacePrinter.cpp b/src/core/serviceinterface/ServiceInterfacePrinter.cpp similarity index 100% rename from serviceinterface/ServiceInterfacePrinter.cpp rename to src/core/serviceinterface/ServiceInterfacePrinter.cpp diff --git a/serviceinterface/ServiceInterfaceStream.cpp b/src/core/serviceinterface/ServiceInterfaceStream.cpp similarity index 100% rename from serviceinterface/ServiceInterfaceStream.cpp rename to src/core/serviceinterface/ServiceInterfaceStream.cpp diff --git a/storagemanager/CMakeLists.txt b/src/core/storagemanager/CMakeLists.txt similarity index 100% rename from storagemanager/CMakeLists.txt rename to src/core/storagemanager/CMakeLists.txt diff --git a/storagemanager/ConstStorageAccessor.cpp b/src/core/storagemanager/ConstStorageAccessor.cpp similarity index 100% rename from storagemanager/ConstStorageAccessor.cpp rename to src/core/storagemanager/ConstStorageAccessor.cpp diff --git a/storagemanager/LocalPool.cpp b/src/core/storagemanager/LocalPool.cpp similarity index 100% rename from storagemanager/LocalPool.cpp rename to src/core/storagemanager/LocalPool.cpp diff --git a/storagemanager/PoolManager.cpp b/src/core/storagemanager/PoolManager.cpp similarity index 100% rename from storagemanager/PoolManager.cpp rename to src/core/storagemanager/PoolManager.cpp diff --git a/storagemanager/StorageAccessor.cpp b/src/core/storagemanager/StorageAccessor.cpp similarity index 100% rename from storagemanager/StorageAccessor.cpp rename to src/core/storagemanager/StorageAccessor.cpp diff --git a/subsystem/CMakeLists.txt b/src/core/subsystem/CMakeLists.txt similarity index 100% rename from subsystem/CMakeLists.txt rename to src/core/subsystem/CMakeLists.txt diff --git a/subsystem/Subsystem.cpp b/src/core/subsystem/Subsystem.cpp similarity index 100% rename from subsystem/Subsystem.cpp rename to src/core/subsystem/Subsystem.cpp diff --git a/subsystem/SubsystemBase.cpp b/src/core/subsystem/SubsystemBase.cpp similarity index 100% rename from subsystem/SubsystemBase.cpp rename to src/core/subsystem/SubsystemBase.cpp diff --git a/subsystem/modes/CMakeLists.txt b/src/core/subsystem/modes/CMakeLists.txt similarity index 100% rename from subsystem/modes/CMakeLists.txt rename to src/core/subsystem/modes/CMakeLists.txt diff --git a/subsystem/modes/ModeSequenceMessage.cpp b/src/core/subsystem/modes/ModeSequenceMessage.cpp similarity index 100% rename from subsystem/modes/ModeSequenceMessage.cpp rename to src/core/subsystem/modes/ModeSequenceMessage.cpp diff --git a/subsystem/modes/ModeStore.cpp b/src/core/subsystem/modes/ModeStore.cpp similarity index 100% rename from subsystem/modes/ModeStore.cpp rename to src/core/subsystem/modes/ModeStore.cpp diff --git a/tasks/CMakeLists.txt b/src/core/tasks/CMakeLists.txt similarity index 100% rename from tasks/CMakeLists.txt rename to src/core/tasks/CMakeLists.txt diff --git a/tasks/FixedSequenceSlot.cpp b/src/core/tasks/FixedSequenceSlot.cpp similarity index 100% rename from tasks/FixedSequenceSlot.cpp rename to src/core/tasks/FixedSequenceSlot.cpp diff --git a/tasks/FixedSlotSequence.cpp b/src/core/tasks/FixedSlotSequence.cpp similarity index 100% rename from tasks/FixedSlotSequence.cpp rename to src/core/tasks/FixedSlotSequence.cpp diff --git a/tcdistribution/CCSDSDistributor.cpp b/src/core/tcdistribution/CCSDSDistributor.cpp similarity index 100% rename from tcdistribution/CCSDSDistributor.cpp rename to src/core/tcdistribution/CCSDSDistributor.cpp diff --git a/tcdistribution/CMakeLists.txt b/src/core/tcdistribution/CMakeLists.txt similarity index 100% rename from tcdistribution/CMakeLists.txt rename to src/core/tcdistribution/CMakeLists.txt diff --git a/tcdistribution/PUSDistributor.cpp b/src/core/tcdistribution/PUSDistributor.cpp similarity index 100% rename from tcdistribution/PUSDistributor.cpp rename to src/core/tcdistribution/PUSDistributor.cpp diff --git a/tcdistribution/TcDistributor.cpp b/src/core/tcdistribution/TcDistributor.cpp similarity index 100% rename from tcdistribution/TcDistributor.cpp rename to src/core/tcdistribution/TcDistributor.cpp diff --git a/tcdistribution/TcPacketCheck.cpp b/src/core/tcdistribution/TcPacketCheck.cpp similarity index 100% rename from tcdistribution/TcPacketCheck.cpp rename to src/core/tcdistribution/TcPacketCheck.cpp diff --git a/thermal/AbstractTemperatureSensor.cpp b/src/core/thermal/AbstractTemperatureSensor.cpp similarity index 100% rename from thermal/AbstractTemperatureSensor.cpp rename to src/core/thermal/AbstractTemperatureSensor.cpp diff --git a/thermal/CMakeLists.txt b/src/core/thermal/CMakeLists.txt similarity index 100% rename from thermal/CMakeLists.txt rename to src/core/thermal/CMakeLists.txt diff --git a/thermal/Heater.cpp b/src/core/thermal/Heater.cpp similarity index 100% rename from thermal/Heater.cpp rename to src/core/thermal/Heater.cpp diff --git a/thermal/RedundantHeater.cpp b/src/core/thermal/RedundantHeater.cpp similarity index 100% rename from thermal/RedundantHeater.cpp rename to src/core/thermal/RedundantHeater.cpp diff --git a/thermal/ThermalComponent.cpp b/src/core/thermal/ThermalComponent.cpp similarity index 100% rename from thermal/ThermalComponent.cpp rename to src/core/thermal/ThermalComponent.cpp diff --git a/thermal/ThermalComponentCore.cpp b/src/core/thermal/ThermalComponentCore.cpp similarity index 100% rename from thermal/ThermalComponentCore.cpp rename to src/core/thermal/ThermalComponentCore.cpp diff --git a/thermal/ThermalModule.cpp b/src/core/thermal/ThermalModule.cpp similarity index 100% rename from thermal/ThermalModule.cpp rename to src/core/thermal/ThermalModule.cpp diff --git a/thermal/ThermalMonitorReporter.cpp b/src/core/thermal/ThermalMonitorReporter.cpp similarity index 100% rename from thermal/ThermalMonitorReporter.cpp rename to src/core/thermal/ThermalMonitorReporter.cpp diff --git a/timemanager/CCSDSTime.cpp b/src/core/timemanager/CCSDSTime.cpp similarity index 100% rename from timemanager/CCSDSTime.cpp rename to src/core/timemanager/CCSDSTime.cpp diff --git a/timemanager/CMakeLists.txt b/src/core/timemanager/CMakeLists.txt similarity index 100% rename from timemanager/CMakeLists.txt rename to src/core/timemanager/CMakeLists.txt diff --git a/timemanager/ClockCommon.cpp b/src/core/timemanager/ClockCommon.cpp similarity index 100% rename from timemanager/ClockCommon.cpp rename to src/core/timemanager/ClockCommon.cpp diff --git a/timemanager/Countdown.cpp b/src/core/timemanager/Countdown.cpp similarity index 100% rename from timemanager/Countdown.cpp rename to src/core/timemanager/Countdown.cpp diff --git a/timemanager/Stopwatch.cpp b/src/core/timemanager/Stopwatch.cpp similarity index 100% rename from timemanager/Stopwatch.cpp rename to src/core/timemanager/Stopwatch.cpp diff --git a/timemanager/TimeMessage.cpp b/src/core/timemanager/TimeMessage.cpp similarity index 100% rename from timemanager/TimeMessage.cpp rename to src/core/timemanager/TimeMessage.cpp diff --git a/timemanager/TimeStamper.cpp b/src/core/timemanager/TimeStamper.cpp similarity index 100% rename from timemanager/TimeStamper.cpp rename to src/core/timemanager/TimeStamper.cpp diff --git a/tmtcpacket/CMakeLists.txt b/src/core/tmtcpacket/CMakeLists.txt similarity index 100% rename from tmtcpacket/CMakeLists.txt rename to src/core/tmtcpacket/CMakeLists.txt diff --git a/tmtcpacket/SpacePacket.cpp b/src/core/tmtcpacket/SpacePacket.cpp similarity index 100% rename from tmtcpacket/SpacePacket.cpp rename to src/core/tmtcpacket/SpacePacket.cpp diff --git a/tmtcpacket/SpacePacketBase.cpp b/src/core/tmtcpacket/SpacePacketBase.cpp similarity index 100% rename from tmtcpacket/SpacePacketBase.cpp rename to src/core/tmtcpacket/SpacePacketBase.cpp diff --git a/tmtcpacket/packetmatcher/CMakeLists.txt b/src/core/tmtcpacket/packetmatcher/CMakeLists.txt similarity index 100% rename from tmtcpacket/packetmatcher/CMakeLists.txt rename to src/core/tmtcpacket/packetmatcher/CMakeLists.txt diff --git a/tmtcpacket/packetmatcher/PacketMatchTree.cpp b/src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp similarity index 100% rename from tmtcpacket/packetmatcher/PacketMatchTree.cpp rename to src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp diff --git a/tmtcpacket/pus/CMakeLists.txt b/src/core/tmtcpacket/pus/CMakeLists.txt similarity index 100% rename from tmtcpacket/pus/CMakeLists.txt rename to src/core/tmtcpacket/pus/CMakeLists.txt diff --git a/tmtcpacket/pus/tc/CMakeLists.txt b/src/core/tmtcpacket/pus/tc/CMakeLists.txt similarity index 100% rename from tmtcpacket/pus/tc/CMakeLists.txt rename to src/core/tmtcpacket/pus/tc/CMakeLists.txt diff --git a/tmtcpacket/pus/tc/TcPacketBase.cpp b/src/core/tmtcpacket/pus/tc/TcPacketBase.cpp similarity index 100% rename from tmtcpacket/pus/tc/TcPacketBase.cpp rename to src/core/tmtcpacket/pus/tc/TcPacketBase.cpp diff --git a/tmtcpacket/pus/tc/TcPacketPus.cpp b/src/core/tmtcpacket/pus/tc/TcPacketPus.cpp similarity index 100% rename from tmtcpacket/pus/tc/TcPacketPus.cpp rename to src/core/tmtcpacket/pus/tc/TcPacketPus.cpp diff --git a/tmtcpacket/pus/tc/TcPacketStoredBase.cpp b/src/core/tmtcpacket/pus/tc/TcPacketStoredBase.cpp similarity index 100% rename from tmtcpacket/pus/tc/TcPacketStoredBase.cpp rename to src/core/tmtcpacket/pus/tc/TcPacketStoredBase.cpp diff --git a/tmtcpacket/pus/tc/TcPacketStoredPus.cpp b/src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp similarity index 100% rename from tmtcpacket/pus/tc/TcPacketStoredPus.cpp rename to src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp diff --git a/tmtcpacket/pus/tm/CMakeLists.txt b/src/core/tmtcpacket/pus/tm/CMakeLists.txt similarity index 100% rename from tmtcpacket/pus/tm/CMakeLists.txt rename to src/core/tmtcpacket/pus/tm/CMakeLists.txt diff --git a/tmtcpacket/pus/tm/TmPacketBase.cpp b/src/core/tmtcpacket/pus/tm/TmPacketBase.cpp similarity index 100% rename from tmtcpacket/pus/tm/TmPacketBase.cpp rename to src/core/tmtcpacket/pus/tm/TmPacketBase.cpp diff --git a/tmtcpacket/pus/tm/TmPacketMinimal.cpp b/src/core/tmtcpacket/pus/tm/TmPacketMinimal.cpp similarity index 100% rename from tmtcpacket/pus/tm/TmPacketMinimal.cpp rename to src/core/tmtcpacket/pus/tm/TmPacketMinimal.cpp diff --git a/tmtcpacket/pus/tm/TmPacketPusA.cpp b/src/core/tmtcpacket/pus/tm/TmPacketPusA.cpp similarity index 100% rename from tmtcpacket/pus/tm/TmPacketPusA.cpp rename to src/core/tmtcpacket/pus/tm/TmPacketPusA.cpp diff --git a/tmtcpacket/pus/tm/TmPacketPusC.cpp b/src/core/tmtcpacket/pus/tm/TmPacketPusC.cpp similarity index 100% rename from tmtcpacket/pus/tm/TmPacketPusC.cpp rename to src/core/tmtcpacket/pus/tm/TmPacketPusC.cpp diff --git a/tmtcpacket/pus/tm/TmPacketStoredBase.cpp b/src/core/tmtcpacket/pus/tm/TmPacketStoredBase.cpp similarity index 100% rename from tmtcpacket/pus/tm/TmPacketStoredBase.cpp rename to src/core/tmtcpacket/pus/tm/TmPacketStoredBase.cpp diff --git a/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp b/src/core/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp similarity index 100% rename from tmtcpacket/pus/tm/TmPacketStoredPusA.cpp rename to src/core/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp diff --git a/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp b/src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp similarity index 100% rename from tmtcpacket/pus/tm/TmPacketStoredPusC.cpp rename to src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp diff --git a/tmtcservices/CMakeLists.txt b/src/core/tmtcservices/CMakeLists.txt similarity index 100% rename from tmtcservices/CMakeLists.txt rename to src/core/tmtcservices/CMakeLists.txt diff --git a/tmtcservices/CommandingServiceBase.cpp b/src/core/tmtcservices/CommandingServiceBase.cpp similarity index 100% rename from tmtcservices/CommandingServiceBase.cpp rename to src/core/tmtcservices/CommandingServiceBase.cpp diff --git a/tmtcservices/PusServiceBase.cpp b/src/core/tmtcservices/PusServiceBase.cpp similarity index 100% rename from tmtcservices/PusServiceBase.cpp rename to src/core/tmtcservices/PusServiceBase.cpp diff --git a/tmtcservices/PusVerificationReport.cpp b/src/core/tmtcservices/PusVerificationReport.cpp similarity index 100% rename from tmtcservices/PusVerificationReport.cpp rename to src/core/tmtcservices/PusVerificationReport.cpp diff --git a/tmtcservices/TmTcBridge.cpp b/src/core/tmtcservices/TmTcBridge.cpp similarity index 100% rename from tmtcservices/TmTcBridge.cpp rename to src/core/tmtcservices/TmTcBridge.cpp diff --git a/tmtcservices/TmTcMessage.cpp b/src/core/tmtcservices/TmTcMessage.cpp similarity index 100% rename from tmtcservices/TmTcMessage.cpp rename to src/core/tmtcservices/TmTcMessage.cpp diff --git a/tmtcservices/VerificationReporter.cpp b/src/core/tmtcservices/VerificationReporter.cpp similarity index 100% rename from tmtcservices/VerificationReporter.cpp rename to src/core/tmtcservices/VerificationReporter.cpp diff --git a/opt/src/coordinates/CMakeLists.txt b/src/opt/coordinates/CMakeLists.txt similarity index 100% rename from opt/src/coordinates/CMakeLists.txt rename to src/opt/coordinates/CMakeLists.txt diff --git a/opt/src/coordinates/CoordinateTransformations.cpp b/src/opt/coordinates/CoordinateTransformations.cpp similarity index 100% rename from opt/src/coordinates/CoordinateTransformations.cpp rename to src/opt/coordinates/CoordinateTransformations.cpp diff --git a/opt/src/coordinates/Sgp4Propagator.cpp b/src/opt/coordinates/Sgp4Propagator.cpp similarity index 100% rename from opt/src/coordinates/Sgp4Propagator.cpp rename to src/opt/coordinates/Sgp4Propagator.cpp diff --git a/opt/src/datalinklayer/CMakeLists.txt b/src/opt/datalinklayer/CMakeLists.txt similarity index 100% rename from opt/src/datalinklayer/CMakeLists.txt rename to src/opt/datalinklayer/CMakeLists.txt diff --git a/opt/src/datalinklayer/Clcw.cpp b/src/opt/datalinklayer/Clcw.cpp similarity index 100% rename from opt/src/datalinklayer/Clcw.cpp rename to src/opt/datalinklayer/Clcw.cpp diff --git a/opt/src/datalinklayer/DataLinkLayer.cpp b/src/opt/datalinklayer/DataLinkLayer.cpp similarity index 100% rename from opt/src/datalinklayer/DataLinkLayer.cpp rename to src/opt/datalinklayer/DataLinkLayer.cpp diff --git a/opt/src/datalinklayer/Farm1StateLockout.cpp b/src/opt/datalinklayer/Farm1StateLockout.cpp similarity index 100% rename from opt/src/datalinklayer/Farm1StateLockout.cpp rename to src/opt/datalinklayer/Farm1StateLockout.cpp diff --git a/opt/src/datalinklayer/Farm1StateOpen.cpp b/src/opt/datalinklayer/Farm1StateOpen.cpp similarity index 100% rename from opt/src/datalinklayer/Farm1StateOpen.cpp rename to src/opt/datalinklayer/Farm1StateOpen.cpp diff --git a/opt/src/datalinklayer/Farm1StateWait.cpp b/src/opt/datalinklayer/Farm1StateWait.cpp similarity index 100% rename from opt/src/datalinklayer/Farm1StateWait.cpp rename to src/opt/datalinklayer/Farm1StateWait.cpp diff --git a/opt/src/datalinklayer/MapPacketExtraction.cpp b/src/opt/datalinklayer/MapPacketExtraction.cpp similarity index 100% rename from opt/src/datalinklayer/MapPacketExtraction.cpp rename to src/opt/datalinklayer/MapPacketExtraction.cpp diff --git a/opt/src/datalinklayer/TcTransferFrame.cpp b/src/opt/datalinklayer/TcTransferFrame.cpp similarity index 100% rename from opt/src/datalinklayer/TcTransferFrame.cpp rename to src/opt/datalinklayer/TcTransferFrame.cpp diff --git a/opt/src/datalinklayer/TcTransferFrameLocal.cpp b/src/opt/datalinklayer/TcTransferFrameLocal.cpp similarity index 100% rename from opt/src/datalinklayer/TcTransferFrameLocal.cpp rename to src/opt/datalinklayer/TcTransferFrameLocal.cpp diff --git a/opt/src/datalinklayer/VirtualChannelReception.cpp b/src/opt/datalinklayer/VirtualChannelReception.cpp similarity index 100% rename from opt/src/datalinklayer/VirtualChannelReception.cpp rename to src/opt/datalinklayer/VirtualChannelReception.cpp diff --git a/memory/CMakeLists.txt b/src/opt/memory/CMakeLists.txt similarity index 100% rename from memory/CMakeLists.txt rename to src/opt/memory/CMakeLists.txt diff --git a/memory/GenericFileSystemMessage.cpp b/src/opt/memory/GenericFileSystemMessage.cpp similarity index 100% rename from memory/GenericFileSystemMessage.cpp rename to src/opt/memory/GenericFileSystemMessage.cpp diff --git a/memory/MemoryHelper.cpp b/src/opt/memory/MemoryHelper.cpp similarity index 100% rename from memory/MemoryHelper.cpp rename to src/opt/memory/MemoryHelper.cpp diff --git a/memory/MemoryMessage.cpp b/src/opt/memory/MemoryMessage.cpp similarity index 100% rename from memory/MemoryMessage.cpp rename to src/opt/memory/MemoryMessage.cpp diff --git a/monitoring/CMakeLists.txt b/src/opt/monitoring/CMakeLists.txt similarity index 100% rename from monitoring/CMakeLists.txt rename to src/opt/monitoring/CMakeLists.txt diff --git a/monitoring/LimitViolationReporter.cpp b/src/opt/monitoring/LimitViolationReporter.cpp similarity index 100% rename from monitoring/LimitViolationReporter.cpp rename to src/opt/monitoring/LimitViolationReporter.cpp diff --git a/monitoring/MonitoringMessage.cpp b/src/opt/monitoring/MonitoringMessage.cpp similarity index 100% rename from monitoring/MonitoringMessage.cpp rename to src/opt/monitoring/MonitoringMessage.cpp diff --git a/pus/CMakeLists.txt b/src/opt/pus/CMakeLists.txt similarity index 100% rename from pus/CMakeLists.txt rename to src/opt/pus/CMakeLists.txt diff --git a/pus/CService200ModeCommanding.cpp b/src/opt/pus/CService200ModeCommanding.cpp similarity index 100% rename from pus/CService200ModeCommanding.cpp rename to src/opt/pus/CService200ModeCommanding.cpp diff --git a/pus/CService201HealthCommanding.cpp b/src/opt/pus/CService201HealthCommanding.cpp similarity index 100% rename from pus/CService201HealthCommanding.cpp rename to src/opt/pus/CService201HealthCommanding.cpp diff --git a/pus/Service17Test.cpp b/src/opt/pus/Service17Test.cpp similarity index 100% rename from pus/Service17Test.cpp rename to src/opt/pus/Service17Test.cpp diff --git a/pus/Service1TelecommandVerification.cpp b/src/opt/pus/Service1TelecommandVerification.cpp similarity index 100% rename from pus/Service1TelecommandVerification.cpp rename to src/opt/pus/Service1TelecommandVerification.cpp diff --git a/pus/Service20ParameterManagement.cpp b/src/opt/pus/Service20ParameterManagement.cpp similarity index 100% rename from pus/Service20ParameterManagement.cpp rename to src/opt/pus/Service20ParameterManagement.cpp diff --git a/pus/Service2DeviceAccess.cpp b/src/opt/pus/Service2DeviceAccess.cpp similarity index 100% rename from pus/Service2DeviceAccess.cpp rename to src/opt/pus/Service2DeviceAccess.cpp diff --git a/pus/Service3Housekeeping.cpp b/src/opt/pus/Service3Housekeeping.cpp similarity index 100% rename from pus/Service3Housekeeping.cpp rename to src/opt/pus/Service3Housekeeping.cpp diff --git a/pus/Service5EventReporting.cpp b/src/opt/pus/Service5EventReporting.cpp similarity index 100% rename from pus/Service5EventReporting.cpp rename to src/opt/pus/Service5EventReporting.cpp diff --git a/pus/Service8FunctionManagement.cpp b/src/opt/pus/Service8FunctionManagement.cpp similarity index 100% rename from pus/Service8FunctionManagement.cpp rename to src/opt/pus/Service8FunctionManagement.cpp diff --git a/pus/Service9TimeManagement.cpp b/src/opt/pus/Service9TimeManagement.cpp similarity index 100% rename from pus/Service9TimeManagement.cpp rename to src/opt/pus/Service9TimeManagement.cpp diff --git a/rmap/CMakeLists.txt b/src/opt/rmap/CMakeLists.txt similarity index 100% rename from rmap/CMakeLists.txt rename to src/opt/rmap/CMakeLists.txt diff --git a/rmap/RMAP.cpp b/src/opt/rmap/RMAP.cpp similarity index 100% rename from rmap/RMAP.cpp rename to src/opt/rmap/RMAP.cpp diff --git a/rmap/RMAPCookie.cpp b/src/opt/rmap/RMAPCookie.cpp similarity index 100% rename from rmap/RMAPCookie.cpp rename to src/opt/rmap/RMAPCookie.cpp diff --git a/rmap/RmapDeviceCommunicationIF.cpp b/src/opt/rmap/RmapDeviceCommunicationIF.cpp similarity index 100% rename from rmap/RmapDeviceCommunicationIF.cpp rename to src/opt/rmap/RmapDeviceCommunicationIF.cpp diff --git a/tmstorage/CMakeLists.txt b/src/opt/tmstorage/CMakeLists.txt similarity index 100% rename from tmstorage/CMakeLists.txt rename to src/opt/tmstorage/CMakeLists.txt diff --git a/tmstorage/TmStoreMessage.cpp b/src/opt/tmstorage/TmStoreMessage.cpp similarity index 100% rename from tmstorage/TmStoreMessage.cpp rename to src/opt/tmstorage/TmStoreMessage.cpp diff --git a/osal/CMakeLists.txt b/src/osal/CMakeLists.txt similarity index 100% rename from osal/CMakeLists.txt rename to src/osal/CMakeLists.txt diff --git a/osal/common/CMakeLists.txt b/src/osal/common/CMakeLists.txt similarity index 100% rename from osal/common/CMakeLists.txt rename to src/osal/common/CMakeLists.txt diff --git a/osal/common/TcpIpBase.cpp b/src/osal/common/TcpIpBase.cpp similarity index 100% rename from osal/common/TcpIpBase.cpp rename to src/osal/common/TcpIpBase.cpp diff --git a/osal/common/TcpTmTcBridge.cpp b/src/osal/common/TcpTmTcBridge.cpp similarity index 100% rename from osal/common/TcpTmTcBridge.cpp rename to src/osal/common/TcpTmTcBridge.cpp diff --git a/osal/common/TcpTmTcServer.cpp b/src/osal/common/TcpTmTcServer.cpp similarity index 100% rename from osal/common/TcpTmTcServer.cpp rename to src/osal/common/TcpTmTcServer.cpp diff --git a/osal/common/UdpTcPollingTask.cpp b/src/osal/common/UdpTcPollingTask.cpp similarity index 100% rename from osal/common/UdpTcPollingTask.cpp rename to src/osal/common/UdpTcPollingTask.cpp diff --git a/osal/common/UdpTmTcBridge.cpp b/src/osal/common/UdpTmTcBridge.cpp similarity index 100% rename from osal/common/UdpTmTcBridge.cpp rename to src/osal/common/UdpTmTcBridge.cpp diff --git a/osal/common/tcpipCommon.cpp b/src/osal/common/tcpipCommon.cpp similarity index 100% rename from osal/common/tcpipCommon.cpp rename to src/osal/common/tcpipCommon.cpp diff --git a/osal/FreeRTOS/BinSemaphUsingTask.cpp b/src/osal/freertos/BinSemaphUsingTask.cpp similarity index 100% rename from osal/FreeRTOS/BinSemaphUsingTask.cpp rename to src/osal/freertos/BinSemaphUsingTask.cpp diff --git a/osal/FreeRTOS/BinarySemaphore.cpp b/src/osal/freertos/BinarySemaphore.cpp similarity index 100% rename from osal/FreeRTOS/BinarySemaphore.cpp rename to src/osal/freertos/BinarySemaphore.cpp diff --git a/osal/FreeRTOS/CMakeLists.txt b/src/osal/freertos/CMakeLists.txt similarity index 100% rename from osal/FreeRTOS/CMakeLists.txt rename to src/osal/freertos/CMakeLists.txt diff --git a/osal/FreeRTOS/Clock.cpp b/src/osal/freertos/Clock.cpp similarity index 100% rename from osal/FreeRTOS/Clock.cpp rename to src/osal/freertos/Clock.cpp diff --git a/osal/FreeRTOS/CountingSemaphUsingTask.cpp b/src/osal/freertos/CountingSemaphUsingTask.cpp similarity index 100% rename from osal/FreeRTOS/CountingSemaphUsingTask.cpp rename to src/osal/freertos/CountingSemaphUsingTask.cpp diff --git a/osal/FreeRTOS/CountingSemaphore.cpp b/src/osal/freertos/CountingSemaphore.cpp similarity index 100% rename from osal/FreeRTOS/CountingSemaphore.cpp rename to src/osal/freertos/CountingSemaphore.cpp diff --git a/osal/FreeRTOS/FixedTimeslotTask.cpp b/src/osal/freertos/FixedTimeslotTask.cpp similarity index 100% rename from osal/FreeRTOS/FixedTimeslotTask.cpp rename to src/osal/freertos/FixedTimeslotTask.cpp diff --git a/osal/FreeRTOS/MessageQueue.cpp b/src/osal/freertos/MessageQueue.cpp similarity index 100% rename from osal/FreeRTOS/MessageQueue.cpp rename to src/osal/freertos/MessageQueue.cpp diff --git a/osal/FreeRTOS/Mutex.cpp b/src/osal/freertos/Mutex.cpp similarity index 100% rename from osal/FreeRTOS/Mutex.cpp rename to src/osal/freertos/Mutex.cpp diff --git a/osal/FreeRTOS/MutexFactory.cpp b/src/osal/freertos/MutexFactory.cpp similarity index 100% rename from osal/FreeRTOS/MutexFactory.cpp rename to src/osal/freertos/MutexFactory.cpp diff --git a/osal/FreeRTOS/PeriodicTask.cpp b/src/osal/freertos/PeriodicTask.cpp similarity index 100% rename from osal/FreeRTOS/PeriodicTask.cpp rename to src/osal/freertos/PeriodicTask.cpp diff --git a/osal/FreeRTOS/QueueFactory.cpp b/src/osal/freertos/QueueFactory.cpp similarity index 100% rename from osal/FreeRTOS/QueueFactory.cpp rename to src/osal/freertos/QueueFactory.cpp diff --git a/osal/FreeRTOS/QueueMapManager.cpp b/src/osal/freertos/QueueMapManager.cpp similarity index 100% rename from osal/FreeRTOS/QueueMapManager.cpp rename to src/osal/freertos/QueueMapManager.cpp diff --git a/osal/FreeRTOS/SemaphoreFactory.cpp b/src/osal/freertos/SemaphoreFactory.cpp similarity index 100% rename from osal/FreeRTOS/SemaphoreFactory.cpp rename to src/osal/freertos/SemaphoreFactory.cpp diff --git a/osal/FreeRTOS/TaskFactory.cpp b/src/osal/freertos/TaskFactory.cpp similarity index 100% rename from osal/FreeRTOS/TaskFactory.cpp rename to src/osal/freertos/TaskFactory.cpp diff --git a/osal/FreeRTOS/TaskManagement.cpp b/src/osal/freertos/TaskManagement.cpp similarity index 100% rename from osal/FreeRTOS/TaskManagement.cpp rename to src/osal/freertos/TaskManagement.cpp diff --git a/osal/FreeRTOS/Timekeeper.cpp b/src/osal/freertos/Timekeeper.cpp similarity index 100% rename from osal/FreeRTOS/Timekeeper.cpp rename to src/osal/freertos/Timekeeper.cpp diff --git a/osal/host/CMakeLists.txt b/src/osal/host/CMakeLists.txt similarity index 100% rename from osal/host/CMakeLists.txt rename to src/osal/host/CMakeLists.txt diff --git a/osal/host/Clock.cpp b/src/osal/host/Clock.cpp similarity index 100% rename from osal/host/Clock.cpp rename to src/osal/host/Clock.cpp diff --git a/osal/host/FixedTimeslotTask.cpp b/src/osal/host/FixedTimeslotTask.cpp similarity index 100% rename from osal/host/FixedTimeslotTask.cpp rename to src/osal/host/FixedTimeslotTask.cpp diff --git a/osal/host/MessageQueue.cpp b/src/osal/host/MessageQueue.cpp similarity index 100% rename from osal/host/MessageQueue.cpp rename to src/osal/host/MessageQueue.cpp diff --git a/osal/host/MutexFactory.cpp b/src/osal/host/MutexFactory.cpp similarity index 100% rename from osal/host/MutexFactory.cpp rename to src/osal/host/MutexFactory.cpp diff --git a/osal/host/PeriodicTask.cpp b/src/osal/host/PeriodicTask.cpp similarity index 100% rename from osal/host/PeriodicTask.cpp rename to src/osal/host/PeriodicTask.cpp diff --git a/osal/host/QueueFactory.cpp b/src/osal/host/QueueFactory.cpp similarity index 100% rename from osal/host/QueueFactory.cpp rename to src/osal/host/QueueFactory.cpp diff --git a/osal/host/QueueMapManager.cpp b/src/osal/host/QueueMapManager.cpp similarity index 100% rename from osal/host/QueueMapManager.cpp rename to src/osal/host/QueueMapManager.cpp diff --git a/osal/host/SemaphoreFactory.cpp b/src/osal/host/SemaphoreFactory.cpp similarity index 100% rename from osal/host/SemaphoreFactory.cpp rename to src/osal/host/SemaphoreFactory.cpp diff --git a/osal/host/TaskFactory.cpp b/src/osal/host/TaskFactory.cpp similarity index 100% rename from osal/host/TaskFactory.cpp rename to src/osal/host/TaskFactory.cpp diff --git a/osal/host/taskHelpers.cpp b/src/osal/host/taskHelpers.cpp similarity index 100% rename from osal/host/taskHelpers.cpp rename to src/osal/host/taskHelpers.cpp diff --git a/osal/linux/BinarySemaphore.cpp b/src/osal/linux/BinarySemaphore.cpp similarity index 100% rename from osal/linux/BinarySemaphore.cpp rename to src/osal/linux/BinarySemaphore.cpp diff --git a/osal/linux/CMakeLists.txt b/src/osal/linux/CMakeLists.txt similarity index 100% rename from osal/linux/CMakeLists.txt rename to src/osal/linux/CMakeLists.txt diff --git a/osal/linux/Clock.cpp b/src/osal/linux/Clock.cpp similarity index 100% rename from osal/linux/Clock.cpp rename to src/osal/linux/Clock.cpp diff --git a/osal/linux/CountingSemaphore.cpp b/src/osal/linux/CountingSemaphore.cpp similarity index 100% rename from osal/linux/CountingSemaphore.cpp rename to src/osal/linux/CountingSemaphore.cpp diff --git a/osal/linux/FixedTimeslotTask.cpp b/src/osal/linux/FixedTimeslotTask.cpp similarity index 100% rename from osal/linux/FixedTimeslotTask.cpp rename to src/osal/linux/FixedTimeslotTask.cpp diff --git a/osal/linux/InternalErrorCodes.cpp b/src/osal/linux/InternalErrorCodes.cpp similarity index 100% rename from osal/linux/InternalErrorCodes.cpp rename to src/osal/linux/InternalErrorCodes.cpp diff --git a/osal/linux/MessageQueue.cpp b/src/osal/linux/MessageQueue.cpp similarity index 100% rename from osal/linux/MessageQueue.cpp rename to src/osal/linux/MessageQueue.cpp diff --git a/osal/linux/Mutex.cpp b/src/osal/linux/Mutex.cpp similarity index 100% rename from osal/linux/Mutex.cpp rename to src/osal/linux/Mutex.cpp diff --git a/osal/linux/MutexFactory.cpp b/src/osal/linux/MutexFactory.cpp similarity index 100% rename from osal/linux/MutexFactory.cpp rename to src/osal/linux/MutexFactory.cpp diff --git a/osal/linux/PeriodicPosixTask.cpp b/src/osal/linux/PeriodicPosixTask.cpp similarity index 100% rename from osal/linux/PeriodicPosixTask.cpp rename to src/osal/linux/PeriodicPosixTask.cpp diff --git a/osal/linux/PosixThread.cpp b/src/osal/linux/PosixThread.cpp similarity index 100% rename from osal/linux/PosixThread.cpp rename to src/osal/linux/PosixThread.cpp diff --git a/osal/linux/QueueFactory.cpp b/src/osal/linux/QueueFactory.cpp similarity index 100% rename from osal/linux/QueueFactory.cpp rename to src/osal/linux/QueueFactory.cpp diff --git a/osal/linux/SemaphoreFactory.cpp b/src/osal/linux/SemaphoreFactory.cpp similarity index 100% rename from osal/linux/SemaphoreFactory.cpp rename to src/osal/linux/SemaphoreFactory.cpp diff --git a/osal/linux/TaskFactory.cpp b/src/osal/linux/TaskFactory.cpp similarity index 100% rename from osal/linux/TaskFactory.cpp rename to src/osal/linux/TaskFactory.cpp diff --git a/osal/linux/Timer.cpp b/src/osal/linux/Timer.cpp similarity index 100% rename from osal/linux/Timer.cpp rename to src/osal/linux/Timer.cpp diff --git a/osal/linux/tcpipHelpers.cpp b/src/osal/linux/tcpipHelpers.cpp similarity index 100% rename from osal/linux/tcpipHelpers.cpp rename to src/osal/linux/tcpipHelpers.cpp diff --git a/osal/linux/unixUtility.cpp b/src/osal/linux/unixUtility.cpp similarity index 100% rename from osal/linux/unixUtility.cpp rename to src/osal/linux/unixUtility.cpp diff --git a/osal/rtems/CMakeLists.txt b/src/osal/rtems/CMakeLists.txt similarity index 100% rename from osal/rtems/CMakeLists.txt rename to src/osal/rtems/CMakeLists.txt diff --git a/osal/rtems/Clock.cpp b/src/osal/rtems/Clock.cpp similarity index 100% rename from osal/rtems/Clock.cpp rename to src/osal/rtems/Clock.cpp diff --git a/osal/rtems/CpuUsage.cpp b/src/osal/rtems/CpuUsage.cpp similarity index 100% rename from osal/rtems/CpuUsage.cpp rename to src/osal/rtems/CpuUsage.cpp diff --git a/osal/rtems/FixedTimeslotTask.cpp b/src/osal/rtems/FixedTimeslotTask.cpp similarity index 100% rename from osal/rtems/FixedTimeslotTask.cpp rename to src/osal/rtems/FixedTimeslotTask.cpp diff --git a/osal/rtems/InitTask.cpp b/src/osal/rtems/InitTask.cpp similarity index 100% rename from osal/rtems/InitTask.cpp rename to src/osal/rtems/InitTask.cpp diff --git a/osal/rtems/InternalErrorCodes.cpp b/src/osal/rtems/InternalErrorCodes.cpp similarity index 100% rename from osal/rtems/InternalErrorCodes.cpp rename to src/osal/rtems/InternalErrorCodes.cpp diff --git a/osal/rtems/MessageQueue.cpp b/src/osal/rtems/MessageQueue.cpp similarity index 100% rename from osal/rtems/MessageQueue.cpp rename to src/osal/rtems/MessageQueue.cpp diff --git a/osal/rtems/Mutex.cpp b/src/osal/rtems/Mutex.cpp similarity index 100% rename from osal/rtems/Mutex.cpp rename to src/osal/rtems/Mutex.cpp diff --git a/osal/rtems/MutexFactory.cpp b/src/osal/rtems/MutexFactory.cpp similarity index 100% rename from osal/rtems/MutexFactory.cpp rename to src/osal/rtems/MutexFactory.cpp diff --git a/osal/rtems/PeriodicTask.cpp b/src/osal/rtems/PeriodicTask.cpp similarity index 100% rename from osal/rtems/PeriodicTask.cpp rename to src/osal/rtems/PeriodicTask.cpp diff --git a/osal/rtems/QueueFactory.cpp b/src/osal/rtems/QueueFactory.cpp similarity index 100% rename from osal/rtems/QueueFactory.cpp rename to src/osal/rtems/QueueFactory.cpp diff --git a/osal/rtems/RTEMSTaskBase.cpp b/src/osal/rtems/RTEMSTaskBase.cpp similarity index 100% rename from osal/rtems/RTEMSTaskBase.cpp rename to src/osal/rtems/RTEMSTaskBase.cpp diff --git a/osal/rtems/RtemsBasic.cpp b/src/osal/rtems/RtemsBasic.cpp similarity index 100% rename from osal/rtems/RtemsBasic.cpp rename to src/osal/rtems/RtemsBasic.cpp diff --git a/osal/rtems/TaskFactory.cpp b/src/osal/rtems/TaskFactory.cpp similarity index 100% rename from osal/rtems/TaskFactory.cpp rename to src/osal/rtems/TaskFactory.cpp diff --git a/osal/windows/CMakeLists.txt b/src/osal/windows/CMakeLists.txt similarity index 100% rename from osal/windows/CMakeLists.txt rename to src/osal/windows/CMakeLists.txt diff --git a/osal/windows/tcpipHelpers.cpp b/src/osal/windows/tcpipHelpers.cpp similarity index 100% rename from osal/windows/tcpipHelpers.cpp rename to src/osal/windows/tcpipHelpers.cpp diff --git a/osal/windows/winTaskHelpers.cpp b/src/osal/windows/winTaskHelpers.cpp similarity index 100% rename from osal/windows/winTaskHelpers.cpp rename to src/osal/windows/winTaskHelpers.cpp diff --git a/unittest/CMakeLists.txt b/src/tests/CMakeLists.txt similarity index 100% rename from unittest/CMakeLists.txt rename to src/tests/CMakeLists.txt diff --git a/unittest/README.md b/src/tests/README.md similarity index 100% rename from unittest/README.md rename to src/tests/README.md diff --git a/unittest/internal/CMakeLists.txt b/src/tests/internal/CMakeLists.txt similarity index 100% rename from unittest/internal/CMakeLists.txt rename to src/tests/internal/CMakeLists.txt diff --git a/unittest/internal/InternalUnitTester.cpp b/src/tests/internal/InternalUnitTester.cpp similarity index 100% rename from unittest/internal/InternalUnitTester.cpp rename to src/tests/internal/InternalUnitTester.cpp diff --git a/unittest/internal/InternalUnitTester.h b/src/tests/internal/InternalUnitTester.h similarity index 100% rename from unittest/internal/InternalUnitTester.h rename to src/tests/internal/InternalUnitTester.h diff --git a/unittest/internal/UnittDefinitions.cpp b/src/tests/internal/UnittDefinitions.cpp similarity index 100% rename from unittest/internal/UnittDefinitions.cpp rename to src/tests/internal/UnittDefinitions.cpp diff --git a/unittest/internal/UnittDefinitions.h b/src/tests/internal/UnittDefinitions.h similarity index 100% rename from unittest/internal/UnittDefinitions.h rename to src/tests/internal/UnittDefinitions.h diff --git a/unittest/internal/globalfunctions/CMakeLists.txt b/src/tests/internal/globalfunctions/CMakeLists.txt similarity index 100% rename from unittest/internal/globalfunctions/CMakeLists.txt rename to src/tests/internal/globalfunctions/CMakeLists.txt diff --git a/unittest/internal/globalfunctions/TestArrayPrinter.cpp b/src/tests/internal/globalfunctions/TestArrayPrinter.cpp similarity index 100% rename from unittest/internal/globalfunctions/TestArrayPrinter.cpp rename to src/tests/internal/globalfunctions/TestArrayPrinter.cpp diff --git a/unittest/internal/globalfunctions/TestArrayPrinter.h b/src/tests/internal/globalfunctions/TestArrayPrinter.h similarity index 100% rename from unittest/internal/globalfunctions/TestArrayPrinter.h rename to src/tests/internal/globalfunctions/TestArrayPrinter.h diff --git a/unittest/internal/internal.mk b/src/tests/internal/internal.mk similarity index 100% rename from unittest/internal/internal.mk rename to src/tests/internal/internal.mk diff --git a/unittest/internal/osal/CMakeLists.txt b/src/tests/internal/osal/CMakeLists.txt similarity index 100% rename from unittest/internal/osal/CMakeLists.txt rename to src/tests/internal/osal/CMakeLists.txt diff --git a/unittest/internal/osal/IntTestMq.cpp b/src/tests/internal/osal/IntTestMq.cpp similarity index 100% rename from unittest/internal/osal/IntTestMq.cpp rename to src/tests/internal/osal/IntTestMq.cpp diff --git a/unittest/internal/osal/IntTestMq.h b/src/tests/internal/osal/IntTestMq.h similarity index 100% rename from unittest/internal/osal/IntTestMq.h rename to src/tests/internal/osal/IntTestMq.h diff --git a/unittest/internal/osal/IntTestMutex.cpp b/src/tests/internal/osal/IntTestMutex.cpp similarity index 100% rename from unittest/internal/osal/IntTestMutex.cpp rename to src/tests/internal/osal/IntTestMutex.cpp diff --git a/unittest/internal/osal/IntTestMutex.h b/src/tests/internal/osal/IntTestMutex.h similarity index 100% rename from unittest/internal/osal/IntTestMutex.h rename to src/tests/internal/osal/IntTestMutex.h diff --git a/unittest/internal/osal/IntTestSemaphore.cpp b/src/tests/internal/osal/IntTestSemaphore.cpp similarity index 100% rename from unittest/internal/osal/IntTestSemaphore.cpp rename to src/tests/internal/osal/IntTestSemaphore.cpp diff --git a/unittest/internal/osal/IntTestSemaphore.h b/src/tests/internal/osal/IntTestSemaphore.h similarity index 100% rename from unittest/internal/osal/IntTestSemaphore.h rename to src/tests/internal/osal/IntTestSemaphore.h diff --git a/unittest/internal/serialize/CMakeLists.txt b/src/tests/internal/serialize/CMakeLists.txt similarity index 100% rename from unittest/internal/serialize/CMakeLists.txt rename to src/tests/internal/serialize/CMakeLists.txt diff --git a/unittest/internal/serialize/IntTestSerialization.cpp b/src/tests/internal/serialize/IntTestSerialization.cpp similarity index 100% rename from unittest/internal/serialize/IntTestSerialization.cpp rename to src/tests/internal/serialize/IntTestSerialization.cpp diff --git a/unittest/internal/serialize/IntTestSerialization.h b/src/tests/internal/serialize/IntTestSerialization.h similarity index 100% rename from unittest/internal/serialize/IntTestSerialization.h rename to src/tests/internal/serialize/IntTestSerialization.h diff --git a/unittest/lcov.sh b/src/tests/lcov.sh similarity index 100% rename from unittest/lcov.sh rename to src/tests/lcov.sh diff --git a/unittest/tests/CMakeLists.txt b/src/tests/tests/CMakeLists.txt similarity index 100% rename from unittest/tests/CMakeLists.txt rename to src/tests/tests/CMakeLists.txt diff --git a/unittest/tests/action/CMakeLists.txt b/src/tests/tests/action/CMakeLists.txt similarity index 100% rename from unittest/tests/action/CMakeLists.txt rename to src/tests/tests/action/CMakeLists.txt diff --git a/unittest/tests/action/TestActionHelper.cpp b/src/tests/tests/action/TestActionHelper.cpp similarity index 100% rename from unittest/tests/action/TestActionHelper.cpp rename to src/tests/tests/action/TestActionHelper.cpp diff --git a/unittest/tests/action/TestActionHelper.h b/src/tests/tests/action/TestActionHelper.h similarity index 100% rename from unittest/tests/action/TestActionHelper.h rename to src/tests/tests/action/TestActionHelper.h diff --git a/unittest/tests/container/CMakeLists.txt b/src/tests/tests/container/CMakeLists.txt similarity index 100% rename from unittest/tests/container/CMakeLists.txt rename to src/tests/tests/container/CMakeLists.txt diff --git a/unittest/tests/container/RingBufferTest.cpp b/src/tests/tests/container/RingBufferTest.cpp similarity index 100% rename from unittest/tests/container/RingBufferTest.cpp rename to src/tests/tests/container/RingBufferTest.cpp diff --git a/unittest/tests/container/TestArrayList.cpp b/src/tests/tests/container/TestArrayList.cpp similarity index 100% rename from unittest/tests/container/TestArrayList.cpp rename to src/tests/tests/container/TestArrayList.cpp diff --git a/unittest/tests/container/TestDynamicFifo.cpp b/src/tests/tests/container/TestDynamicFifo.cpp similarity index 100% rename from unittest/tests/container/TestDynamicFifo.cpp rename to src/tests/tests/container/TestDynamicFifo.cpp diff --git a/unittest/tests/container/TestFifo.cpp b/src/tests/tests/container/TestFifo.cpp similarity index 100% rename from unittest/tests/container/TestFifo.cpp rename to src/tests/tests/container/TestFifo.cpp diff --git a/unittest/tests/container/TestFixedArrayList.cpp b/src/tests/tests/container/TestFixedArrayList.cpp similarity index 100% rename from unittest/tests/container/TestFixedArrayList.cpp rename to src/tests/tests/container/TestFixedArrayList.cpp diff --git a/unittest/tests/container/TestFixedMap.cpp b/src/tests/tests/container/TestFixedMap.cpp similarity index 100% rename from unittest/tests/container/TestFixedMap.cpp rename to src/tests/tests/container/TestFixedMap.cpp diff --git a/unittest/tests/container/TestFixedOrderedMultimap.cpp b/src/tests/tests/container/TestFixedOrderedMultimap.cpp similarity index 100% rename from unittest/tests/container/TestFixedOrderedMultimap.cpp rename to src/tests/tests/container/TestFixedOrderedMultimap.cpp diff --git a/unittest/tests/container/TestPlacementFactory.cpp b/src/tests/tests/container/TestPlacementFactory.cpp similarity index 100% rename from unittest/tests/container/TestPlacementFactory.cpp rename to src/tests/tests/container/TestPlacementFactory.cpp diff --git a/unittest/tests/datapoollocal/CMakeLists.txt b/src/tests/tests/datapoollocal/CMakeLists.txt similarity index 100% rename from unittest/tests/datapoollocal/CMakeLists.txt rename to src/tests/tests/datapoollocal/CMakeLists.txt diff --git a/unittest/tests/datapoollocal/DataSetTest.cpp b/src/tests/tests/datapoollocal/DataSetTest.cpp similarity index 100% rename from unittest/tests/datapoollocal/DataSetTest.cpp rename to src/tests/tests/datapoollocal/DataSetTest.cpp diff --git a/unittest/tests/datapoollocal/LocalPoolManagerTest.cpp b/src/tests/tests/datapoollocal/LocalPoolManagerTest.cpp similarity index 100% rename from unittest/tests/datapoollocal/LocalPoolManagerTest.cpp rename to src/tests/tests/datapoollocal/LocalPoolManagerTest.cpp diff --git a/unittest/tests/datapoollocal/LocalPoolOwnerBase.cpp b/src/tests/tests/datapoollocal/LocalPoolOwnerBase.cpp similarity index 100% rename from unittest/tests/datapoollocal/LocalPoolOwnerBase.cpp rename to src/tests/tests/datapoollocal/LocalPoolOwnerBase.cpp diff --git a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h b/src/tests/tests/datapoollocal/LocalPoolOwnerBase.h similarity index 100% rename from unittest/tests/datapoollocal/LocalPoolOwnerBase.h rename to src/tests/tests/datapoollocal/LocalPoolOwnerBase.h diff --git a/unittest/tests/datapoollocal/LocalPoolVariableTest.cpp b/src/tests/tests/datapoollocal/LocalPoolVariableTest.cpp similarity index 100% rename from unittest/tests/datapoollocal/LocalPoolVariableTest.cpp rename to src/tests/tests/datapoollocal/LocalPoolVariableTest.cpp diff --git a/unittest/tests/datapoollocal/LocalPoolVectorTest.cpp b/src/tests/tests/datapoollocal/LocalPoolVectorTest.cpp similarity index 100% rename from unittest/tests/datapoollocal/LocalPoolVectorTest.cpp rename to src/tests/tests/datapoollocal/LocalPoolVectorTest.cpp diff --git a/unittest/tests/globalfunctions/CMakeLists.txt b/src/tests/tests/globalfunctions/CMakeLists.txt similarity index 100% rename from unittest/tests/globalfunctions/CMakeLists.txt rename to src/tests/tests/globalfunctions/CMakeLists.txt diff --git a/unittest/tests/mocks/HkReceiverMock.h b/src/tests/tests/mocks/HkReceiverMock.h similarity index 100% rename from unittest/tests/mocks/HkReceiverMock.h rename to src/tests/tests/mocks/HkReceiverMock.h diff --git a/unittest/tests/mocks/MessageQueueMockBase.h b/src/tests/tests/mocks/MessageQueueMockBase.h similarity index 100% rename from unittest/tests/mocks/MessageQueueMockBase.h rename to src/tests/tests/mocks/MessageQueueMockBase.h diff --git a/unittest/tests/osal/CMakeLists.txt b/src/tests/tests/osal/CMakeLists.txt similarity index 100% rename from unittest/tests/osal/CMakeLists.txt rename to src/tests/tests/osal/CMakeLists.txt diff --git a/unittest/tests/osal/TestMessageQueue.cpp b/src/tests/tests/osal/TestMessageQueue.cpp similarity index 100% rename from unittest/tests/osal/TestMessageQueue.cpp rename to src/tests/tests/osal/TestMessageQueue.cpp diff --git a/unittest/tests/osal/TestSemaphore.cpp b/src/tests/tests/osal/TestSemaphore.cpp similarity index 100% rename from unittest/tests/osal/TestSemaphore.cpp rename to src/tests/tests/osal/TestSemaphore.cpp diff --git a/unittest/tests/serialize/CMakeLists.txt b/src/tests/tests/serialize/CMakeLists.txt similarity index 100% rename from unittest/tests/serialize/CMakeLists.txt rename to src/tests/tests/serialize/CMakeLists.txt diff --git a/unittest/tests/serialize/TestSerialBufferAdapter.cpp b/src/tests/tests/serialize/TestSerialBufferAdapter.cpp similarity index 100% rename from unittest/tests/serialize/TestSerialBufferAdapter.cpp rename to src/tests/tests/serialize/TestSerialBufferAdapter.cpp diff --git a/unittest/tests/serialize/TestSerialLinkedPacket.cpp b/src/tests/tests/serialize/TestSerialLinkedPacket.cpp similarity index 100% rename from unittest/tests/serialize/TestSerialLinkedPacket.cpp rename to src/tests/tests/serialize/TestSerialLinkedPacket.cpp diff --git a/unittest/tests/serialize/TestSerialLinkedPacket.h b/src/tests/tests/serialize/TestSerialLinkedPacket.h similarity index 100% rename from unittest/tests/serialize/TestSerialLinkedPacket.h rename to src/tests/tests/serialize/TestSerialLinkedPacket.h diff --git a/unittest/tests/serialize/TestSerialization.cpp b/src/tests/tests/serialize/TestSerialization.cpp similarity index 100% rename from unittest/tests/serialize/TestSerialization.cpp rename to src/tests/tests/serialize/TestSerialization.cpp diff --git a/unittest/tests/storagemanager/CMakeLists.txt b/src/tests/tests/storagemanager/CMakeLists.txt similarity index 100% rename from unittest/tests/storagemanager/CMakeLists.txt rename to src/tests/tests/storagemanager/CMakeLists.txt diff --git a/unittest/tests/storagemanager/TestNewAccessor.cpp b/src/tests/tests/storagemanager/TestNewAccessor.cpp similarity index 100% rename from unittest/tests/storagemanager/TestNewAccessor.cpp rename to src/tests/tests/storagemanager/TestNewAccessor.cpp diff --git a/unittest/tests/storagemanager/TestPool.cpp b/src/tests/tests/storagemanager/TestPool.cpp similarity index 100% rename from unittest/tests/storagemanager/TestPool.cpp rename to src/tests/tests/storagemanager/TestPool.cpp diff --git a/unittest/tests/tests.mk b/src/tests/tests/tests.mk similarity index 100% rename from unittest/tests/tests.mk rename to src/tests/tests/tests.mk diff --git a/unittest/tests/tmtcpacket/CMakeLists.txt b/src/tests/tests/tmtcpacket/CMakeLists.txt similarity index 100% rename from unittest/tests/tmtcpacket/CMakeLists.txt rename to src/tests/tests/tmtcpacket/CMakeLists.txt diff --git a/unittest/tests/tmtcpacket/PusTmTest.cpp b/src/tests/tests/tmtcpacket/PusTmTest.cpp similarity index 100% rename from unittest/tests/tmtcpacket/PusTmTest.cpp rename to src/tests/tests/tmtcpacket/PusTmTest.cpp diff --git a/unittest/user/CMakeLists.txt b/src/tests/user/CMakeLists.txt similarity index 100% rename from unittest/user/CMakeLists.txt rename to src/tests/user/CMakeLists.txt diff --git a/unittest/user/testcfg/CMakeLists.txt b/src/tests/user/testcfg/CMakeLists.txt similarity index 100% rename from unittest/user/testcfg/CMakeLists.txt rename to src/tests/user/testcfg/CMakeLists.txt diff --git a/unittest/user/testcfg/FSFWConfig.h b/src/tests/user/testcfg/FSFWConfig.h similarity index 100% rename from unittest/user/testcfg/FSFWConfig.h rename to src/tests/user/testcfg/FSFWConfig.h diff --git a/unittest/user/testcfg/Makefile-FSFW-Tests b/src/tests/user/testcfg/Makefile-FSFW-Tests similarity index 100% rename from unittest/user/testcfg/Makefile-FSFW-Tests rename to src/tests/user/testcfg/Makefile-FSFW-Tests diff --git a/unittest/user/testcfg/TestsConfig.h b/src/tests/user/testcfg/TestsConfig.h similarity index 100% rename from unittest/user/testcfg/TestsConfig.h rename to src/tests/user/testcfg/TestsConfig.h diff --git a/unittest/user/testcfg/cdatapool/dataPoolInit.cpp b/src/tests/user/testcfg/cdatapool/dataPoolInit.cpp similarity index 100% rename from unittest/user/testcfg/cdatapool/dataPoolInit.cpp rename to src/tests/user/testcfg/cdatapool/dataPoolInit.cpp diff --git a/unittest/user/testcfg/cdatapool/dataPoolInit.h b/src/tests/user/testcfg/cdatapool/dataPoolInit.h similarity index 100% rename from unittest/user/testcfg/cdatapool/dataPoolInit.h rename to src/tests/user/testcfg/cdatapool/dataPoolInit.h diff --git a/unittest/user/testcfg/devices/logicalAddresses.cpp b/src/tests/user/testcfg/devices/logicalAddresses.cpp similarity index 100% rename from unittest/user/testcfg/devices/logicalAddresses.cpp rename to src/tests/user/testcfg/devices/logicalAddresses.cpp diff --git a/unittest/user/testcfg/devices/logicalAddresses.h b/src/tests/user/testcfg/devices/logicalAddresses.h similarity index 100% rename from unittest/user/testcfg/devices/logicalAddresses.h rename to src/tests/user/testcfg/devices/logicalAddresses.h diff --git a/unittest/user/testcfg/devices/powerSwitcherList.cpp b/src/tests/user/testcfg/devices/powerSwitcherList.cpp similarity index 100% rename from unittest/user/testcfg/devices/powerSwitcherList.cpp rename to src/tests/user/testcfg/devices/powerSwitcherList.cpp diff --git a/unittest/user/testcfg/devices/powerSwitcherList.h b/src/tests/user/testcfg/devices/powerSwitcherList.h similarity index 100% rename from unittest/user/testcfg/devices/powerSwitcherList.h rename to src/tests/user/testcfg/devices/powerSwitcherList.h diff --git a/unittest/user/testcfg/events/subsystemIdRanges.h b/src/tests/user/testcfg/events/subsystemIdRanges.h similarity index 100% rename from unittest/user/testcfg/events/subsystemIdRanges.h rename to src/tests/user/testcfg/events/subsystemIdRanges.h diff --git a/unittest/user/testcfg/ipc/MissionMessageTypes.cpp b/src/tests/user/testcfg/ipc/MissionMessageTypes.cpp similarity index 100% rename from unittest/user/testcfg/ipc/MissionMessageTypes.cpp rename to src/tests/user/testcfg/ipc/MissionMessageTypes.cpp diff --git a/unittest/user/testcfg/ipc/MissionMessageTypes.h b/src/tests/user/testcfg/ipc/MissionMessageTypes.h similarity index 100% rename from unittest/user/testcfg/ipc/MissionMessageTypes.h rename to src/tests/user/testcfg/ipc/MissionMessageTypes.h diff --git a/unittest/user/testcfg/objects/systemObjectList.h b/src/tests/user/testcfg/objects/systemObjectList.h similarity index 100% rename from unittest/user/testcfg/objects/systemObjectList.h rename to src/tests/user/testcfg/objects/systemObjectList.h diff --git a/unittest/user/testcfg/pollingsequence/PollingSequenceFactory.cpp b/src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp similarity index 100% rename from unittest/user/testcfg/pollingsequence/PollingSequenceFactory.cpp rename to src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp diff --git a/unittest/user/testcfg/pollingsequence/PollingSequenceFactory.h b/src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.h similarity index 100% rename from unittest/user/testcfg/pollingsequence/PollingSequenceFactory.h rename to src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.h diff --git a/unittest/user/testcfg/returnvalues/classIds.h b/src/tests/user/testcfg/returnvalues/classIds.h similarity index 100% rename from unittest/user/testcfg/returnvalues/classIds.h rename to src/tests/user/testcfg/returnvalues/classIds.h diff --git a/unittest/user/testcfg/testcfg.mk b/src/tests/user/testcfg/testcfg.mk similarity index 100% rename from unittest/user/testcfg/testcfg.mk rename to src/tests/user/testcfg/testcfg.mk diff --git a/unittest/user/testcfg/tmtc/apid.h b/src/tests/user/testcfg/tmtc/apid.h similarity index 100% rename from unittest/user/testcfg/tmtc/apid.h rename to src/tests/user/testcfg/tmtc/apid.h diff --git a/unittest/user/testcfg/tmtc/pusIds.h b/src/tests/user/testcfg/tmtc/pusIds.h similarity index 100% rename from unittest/user/testcfg/tmtc/pusIds.h rename to src/tests/user/testcfg/tmtc/pusIds.h diff --git a/unittest/user/testtemplate/TestTemplate.cpp b/src/tests/user/testtemplate/TestTemplate.cpp similarity index 100% rename from unittest/user/testtemplate/TestTemplate.cpp rename to src/tests/user/testtemplate/TestTemplate.cpp diff --git a/unittest/user/unittest/CMakeLists.txt b/src/tests/user/unittest/CMakeLists.txt similarity index 100% rename from unittest/user/unittest/CMakeLists.txt rename to src/tests/user/unittest/CMakeLists.txt diff --git a/unittest/user/unittest/core/CMakeLists.txt b/src/tests/user/unittest/core/CMakeLists.txt similarity index 100% rename from unittest/user/unittest/core/CMakeLists.txt rename to src/tests/user/unittest/core/CMakeLists.txt diff --git a/unittest/user/unittest/core/CatchDefinitions.cpp b/src/tests/user/unittest/core/CatchDefinitions.cpp similarity index 100% rename from unittest/user/unittest/core/CatchDefinitions.cpp rename to src/tests/user/unittest/core/CatchDefinitions.cpp diff --git a/unittest/user/unittest/core/CatchDefinitions.h b/src/tests/user/unittest/core/CatchDefinitions.h similarity index 100% rename from unittest/user/unittest/core/CatchDefinitions.h rename to src/tests/user/unittest/core/CatchDefinitions.h diff --git a/unittest/user/unittest/core/CatchFactory.cpp b/src/tests/user/unittest/core/CatchFactory.cpp similarity index 100% rename from unittest/user/unittest/core/CatchFactory.cpp rename to src/tests/user/unittest/core/CatchFactory.cpp diff --git a/unittest/user/unittest/core/CatchFactory.h b/src/tests/user/unittest/core/CatchFactory.h similarity index 100% rename from unittest/user/unittest/core/CatchFactory.h rename to src/tests/user/unittest/core/CatchFactory.h diff --git a/unittest/user/unittest/core/CatchRunner.cpp b/src/tests/user/unittest/core/CatchRunner.cpp similarity index 100% rename from unittest/user/unittest/core/CatchRunner.cpp rename to src/tests/user/unittest/core/CatchRunner.cpp diff --git a/unittest/user/unittest/core/CatchSetup.cpp b/src/tests/user/unittest/core/CatchSetup.cpp similarity index 100% rename from unittest/user/unittest/core/CatchSetup.cpp rename to src/tests/user/unittest/core/CatchSetup.cpp diff --git a/unittest/user/unittest/core/core.mk b/src/tests/user/unittest/core/core.mk similarity index 100% rename from unittest/user/unittest/core/core.mk rename to src/tests/user/unittest/core/core.mk diff --git a/unittest/user/unittest/core/printChar.cpp b/src/tests/user/unittest/core/printChar.cpp similarity index 100% rename from unittest/user/unittest/core/printChar.cpp rename to src/tests/user/unittest/core/printChar.cpp diff --git a/unittest/user/unittest/core/printChar.h b/src/tests/user/unittest/core/printChar.h similarity index 100% rename from unittest/user/unittest/core/printChar.h rename to src/tests/user/unittest/core/printChar.h diff --git a/unittest/user/unlockRealtime.sh b/src/tests/user/unlockRealtime.sh similarity index 100% rename from unittest/user/unlockRealtime.sh rename to src/tests/user/unlockRealtime.sh