diff --git a/src/fsfw_tests/unit/CMakeLists.txt b/unittests/CMakeLists.txt
similarity index 96%
rename from src/fsfw_tests/unit/CMakeLists.txt
rename to unittests/CMakeLists.txt
index f54e1fc9..49b1840f 100644
--- a/src/fsfw_tests/unit/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -2,7 +2,7 @@ target_sources(${FSFW_TEST_TGT} PRIVATE
     CatchDefinitions.cpp
     CatchFactory.cpp
     printChar.cpp
-    version.cpp
+    testVersion.cpp
 )
 
 target_sources(${FSFW_TEST_TGT} PRIVATE
diff --git a/src/fsfw_tests/unit/CatchDefinitions.cpp b/unittests/CatchDefinitions.cpp
similarity index 100%
rename from src/fsfw_tests/unit/CatchDefinitions.cpp
rename to unittests/CatchDefinitions.cpp
diff --git a/src/fsfw_tests/unit/CatchDefinitions.h b/unittests/CatchDefinitions.h
similarity index 100%
rename from src/fsfw_tests/unit/CatchDefinitions.h
rename to unittests/CatchDefinitions.h
diff --git a/src/fsfw_tests/unit/CatchFactory.cpp b/unittests/CatchFactory.cpp
similarity index 100%
rename from src/fsfw_tests/unit/CatchFactory.cpp
rename to unittests/CatchFactory.cpp
diff --git a/src/fsfw_tests/unit/CatchFactory.h b/unittests/CatchFactory.h
similarity index 100%
rename from src/fsfw_tests/unit/CatchFactory.h
rename to unittests/CatchFactory.h
diff --git a/src/fsfw_tests/unit/CatchRunner.cpp b/unittests/CatchRunner.cpp
similarity index 100%
rename from src/fsfw_tests/unit/CatchRunner.cpp
rename to unittests/CatchRunner.cpp
diff --git a/src/fsfw_tests/unit/CatchRunner.h b/unittests/CatchRunner.h
similarity index 100%
rename from src/fsfw_tests/unit/CatchRunner.h
rename to unittests/CatchRunner.h
diff --git a/src/fsfw_tests/unit/CatchSetup.cpp b/unittests/CatchSetup.cpp
similarity index 100%
rename from src/fsfw_tests/unit/CatchSetup.cpp
rename to unittests/CatchSetup.cpp
diff --git a/src/fsfw_tests/unit/action/CMakeLists.txt b/unittests/action/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/action/CMakeLists.txt
rename to unittests/action/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/action/TestActionHelper.cpp b/unittests/action/TestActionHelper.cpp
similarity index 100%
rename from src/fsfw_tests/unit/action/TestActionHelper.cpp
rename to unittests/action/TestActionHelper.cpp
diff --git a/src/fsfw_tests/unit/action/TestActionHelper.h b/unittests/action/TestActionHelper.h
similarity index 100%
rename from src/fsfw_tests/unit/action/TestActionHelper.h
rename to unittests/action/TestActionHelper.h
diff --git a/src/fsfw_tests/unit/cfdp/CMakeLists.txt b/unittests/cfdp/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/CMakeLists.txt
rename to unittests/cfdp/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/cfdp/testAckPdu.cpp b/unittests/cfdp/testAckPdu.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testAckPdu.cpp
rename to unittests/cfdp/testAckPdu.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testCfdp.cpp b/unittests/cfdp/testCfdp.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testCfdp.cpp
rename to unittests/cfdp/testCfdp.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testEofPdu.cpp b/unittests/cfdp/testEofPdu.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testEofPdu.cpp
rename to unittests/cfdp/testEofPdu.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testFileData.cpp b/unittests/cfdp/testFileData.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testFileData.cpp
rename to unittests/cfdp/testFileData.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testFinishedPdu.cpp b/unittests/cfdp/testFinishedPdu.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testFinishedPdu.cpp
rename to unittests/cfdp/testFinishedPdu.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testKeepAlivePdu.cpp b/unittests/cfdp/testKeepAlivePdu.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testKeepAlivePdu.cpp
rename to unittests/cfdp/testKeepAlivePdu.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testMetadataPdu.cpp b/unittests/cfdp/testMetadataPdu.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testMetadataPdu.cpp
rename to unittests/cfdp/testMetadataPdu.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testNakPdu.cpp b/unittests/cfdp/testNakPdu.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testNakPdu.cpp
rename to unittests/cfdp/testNakPdu.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testPromptPdu.cpp b/unittests/cfdp/testPromptPdu.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testPromptPdu.cpp
rename to unittests/cfdp/testPromptPdu.cpp
diff --git a/src/fsfw_tests/unit/cfdp/testTlvsLvs.cpp b/unittests/cfdp/testTlvsLvs.cpp
similarity index 100%
rename from src/fsfw_tests/unit/cfdp/testTlvsLvs.cpp
rename to unittests/cfdp/testTlvsLvs.cpp
diff --git a/src/fsfw_tests/unit/container/CMakeLists.txt b/unittests/container/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/container/CMakeLists.txt
rename to unittests/container/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/container/RingBufferTest.cpp b/unittests/container/RingBufferTest.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/RingBufferTest.cpp
rename to unittests/container/RingBufferTest.cpp
diff --git a/src/fsfw_tests/unit/container/TestArrayList.cpp b/unittests/container/TestArrayList.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/TestArrayList.cpp
rename to unittests/container/TestArrayList.cpp
diff --git a/src/fsfw_tests/unit/container/TestDynamicFifo.cpp b/unittests/container/TestDynamicFifo.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/TestDynamicFifo.cpp
rename to unittests/container/TestDynamicFifo.cpp
diff --git a/src/fsfw_tests/unit/container/TestFifo.cpp b/unittests/container/TestFifo.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/TestFifo.cpp
rename to unittests/container/TestFifo.cpp
diff --git a/src/fsfw_tests/unit/container/TestFixedArrayList.cpp b/unittests/container/TestFixedArrayList.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/TestFixedArrayList.cpp
rename to unittests/container/TestFixedArrayList.cpp
diff --git a/src/fsfw_tests/unit/container/TestFixedMap.cpp b/unittests/container/TestFixedMap.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/TestFixedMap.cpp
rename to unittests/container/TestFixedMap.cpp
diff --git a/src/fsfw_tests/unit/container/TestFixedOrderedMultimap.cpp b/unittests/container/TestFixedOrderedMultimap.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/TestFixedOrderedMultimap.cpp
rename to unittests/container/TestFixedOrderedMultimap.cpp
diff --git a/src/fsfw_tests/unit/container/TestPlacementFactory.cpp b/unittests/container/TestPlacementFactory.cpp
similarity index 100%
rename from src/fsfw_tests/unit/container/TestPlacementFactory.cpp
rename to unittests/container/TestPlacementFactory.cpp
diff --git a/src/fsfw_tests/unit/datapoollocal/CMakeLists.txt b/unittests/datapoollocal/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/datapoollocal/CMakeLists.txt
rename to unittests/datapoollocal/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/datapoollocal/DataSetTest.cpp b/unittests/datapoollocal/DataSetTest.cpp
similarity index 100%
rename from src/fsfw_tests/unit/datapoollocal/DataSetTest.cpp
rename to unittests/datapoollocal/DataSetTest.cpp
diff --git a/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp b/unittests/datapoollocal/LocalPoolManagerTest.cpp
similarity index 100%
rename from src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
rename to unittests/datapoollocal/LocalPoolManagerTest.cpp
diff --git a/src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.cpp b/unittests/datapoollocal/LocalPoolOwnerBase.cpp
similarity index 100%
rename from src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.cpp
rename to unittests/datapoollocal/LocalPoolOwnerBase.cpp
diff --git a/src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.h b/unittests/datapoollocal/LocalPoolOwnerBase.h
similarity index 100%
rename from src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.h
rename to unittests/datapoollocal/LocalPoolOwnerBase.h
diff --git a/src/fsfw_tests/unit/datapoollocal/LocalPoolVariableTest.cpp b/unittests/datapoollocal/LocalPoolVariableTest.cpp
similarity index 100%
rename from src/fsfw_tests/unit/datapoollocal/LocalPoolVariableTest.cpp
rename to unittests/datapoollocal/LocalPoolVariableTest.cpp
diff --git a/src/fsfw_tests/unit/datapoollocal/LocalPoolVectorTest.cpp b/unittests/datapoollocal/LocalPoolVectorTest.cpp
similarity index 100%
rename from src/fsfw_tests/unit/datapoollocal/LocalPoolVectorTest.cpp
rename to unittests/datapoollocal/LocalPoolVectorTest.cpp
diff --git a/src/fsfw_tests/unit/devicehandler/CMakeLists.txt b/unittests/devicehandler/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/CMakeLists.txt
rename to unittests/devicehandler/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/devicehandler/ComIFMock.cpp b/unittests/devicehandler/ComIFMock.cpp
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/ComIFMock.cpp
rename to unittests/devicehandler/ComIFMock.cpp
diff --git a/src/fsfw_tests/unit/devicehandler/ComIFMock.h b/unittests/devicehandler/ComIFMock.h
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/ComIFMock.h
rename to unittests/devicehandler/ComIFMock.h
diff --git a/src/fsfw_tests/unit/devicehandler/CookieIFMock.cpp b/unittests/devicehandler/CookieIFMock.cpp
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/CookieIFMock.cpp
rename to unittests/devicehandler/CookieIFMock.cpp
diff --git a/src/fsfw_tests/unit/devicehandler/CookieIFMock.h b/unittests/devicehandler/CookieIFMock.h
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/CookieIFMock.h
rename to unittests/devicehandler/CookieIFMock.h
diff --git a/src/fsfw_tests/unit/devicehandler/DeviceFdirMock.cpp b/unittests/devicehandler/DeviceFdirMock.cpp
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/DeviceFdirMock.cpp
rename to unittests/devicehandler/DeviceFdirMock.cpp
diff --git a/src/fsfw_tests/unit/devicehandler/DeviceFdirMock.h b/unittests/devicehandler/DeviceFdirMock.h
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/DeviceFdirMock.h
rename to unittests/devicehandler/DeviceFdirMock.h
diff --git a/src/fsfw_tests/unit/devicehandler/DeviceHandlerCommander.cpp b/unittests/devicehandler/DeviceHandlerCommander.cpp
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/DeviceHandlerCommander.cpp
rename to unittests/devicehandler/DeviceHandlerCommander.cpp
diff --git a/src/fsfw_tests/unit/devicehandler/DeviceHandlerCommander.h b/unittests/devicehandler/DeviceHandlerCommander.h
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/DeviceHandlerCommander.h
rename to unittests/devicehandler/DeviceHandlerCommander.h
diff --git a/src/fsfw_tests/unit/devicehandler/DeviceHandlerMock.cpp b/unittests/devicehandler/DeviceHandlerMock.cpp
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/DeviceHandlerMock.cpp
rename to unittests/devicehandler/DeviceHandlerMock.cpp
diff --git a/src/fsfw_tests/unit/devicehandler/DeviceHandlerMock.h b/unittests/devicehandler/DeviceHandlerMock.h
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/DeviceHandlerMock.h
rename to unittests/devicehandler/DeviceHandlerMock.h
diff --git a/src/fsfw_tests/unit/devicehandler/TestDeviceHandlerBase.cpp b/unittests/devicehandler/TestDeviceHandlerBase.cpp
similarity index 100%
rename from src/fsfw_tests/unit/devicehandler/TestDeviceHandlerBase.cpp
rename to unittests/devicehandler/TestDeviceHandlerBase.cpp
diff --git a/src/fsfw_tests/unit/globalfunctions/CMakeLists.txt b/unittests/globalfunctions/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/globalfunctions/CMakeLists.txt
rename to unittests/globalfunctions/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/globalfunctions/testBitutil.cpp b/unittests/globalfunctions/testBitutil.cpp
similarity index 100%
rename from src/fsfw_tests/unit/globalfunctions/testBitutil.cpp
rename to unittests/globalfunctions/testBitutil.cpp
diff --git a/src/fsfw_tests/unit/globalfunctions/testCRC.cpp b/unittests/globalfunctions/testCRC.cpp
similarity index 100%
rename from src/fsfw_tests/unit/globalfunctions/testCRC.cpp
rename to unittests/globalfunctions/testCRC.cpp
diff --git a/src/fsfw_tests/unit/globalfunctions/testDleEncoder.cpp b/unittests/globalfunctions/testDleEncoder.cpp
similarity index 100%
rename from src/fsfw_tests/unit/globalfunctions/testDleEncoder.cpp
rename to unittests/globalfunctions/testDleEncoder.cpp
diff --git a/src/fsfw_tests/unit/globalfunctions/testOpDivider.cpp b/unittests/globalfunctions/testOpDivider.cpp
similarity index 100%
rename from src/fsfw_tests/unit/globalfunctions/testOpDivider.cpp
rename to unittests/globalfunctions/testOpDivider.cpp
diff --git a/src/fsfw_tests/unit/globalfunctions/testTimevalOperations.cpp b/unittests/globalfunctions/testTimevalOperations.cpp
similarity index 100%
rename from src/fsfw_tests/unit/globalfunctions/testTimevalOperations.cpp
rename to unittests/globalfunctions/testTimevalOperations.cpp
diff --git a/src/fsfw_tests/unit/hal/CMakeLists.txt b/unittests/hal/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/hal/CMakeLists.txt
rename to unittests/hal/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/hal/testCommandExecutor.cpp b/unittests/hal/testCommandExecutor.cpp
similarity index 100%
rename from src/fsfw_tests/unit/hal/testCommandExecutor.cpp
rename to unittests/hal/testCommandExecutor.cpp
diff --git a/src/fsfw_tests/unit/internalerror/CMakeLists.txt b/unittests/internalerror/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/internalerror/CMakeLists.txt
rename to unittests/internalerror/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/internalerror/TestInternalErrorReporter.cpp b/unittests/internalerror/TestInternalErrorReporter.cpp
similarity index 100%
rename from src/fsfw_tests/unit/internalerror/TestInternalErrorReporter.cpp
rename to unittests/internalerror/TestInternalErrorReporter.cpp
diff --git a/src/fsfw_tests/unit/mocks/CMakeLists.txt b/unittests/mocks/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/mocks/CMakeLists.txt
rename to unittests/mocks/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/mocks/HkReceiverMock.h b/unittests/mocks/HkReceiverMock.h
similarity index 100%
rename from src/fsfw_tests/unit/mocks/HkReceiverMock.h
rename to unittests/mocks/HkReceiverMock.h
diff --git a/src/fsfw_tests/unit/mocks/MessageQueueMockBase.h b/unittests/mocks/MessageQueueMockBase.h
similarity index 100%
rename from src/fsfw_tests/unit/mocks/MessageQueueMockBase.h
rename to unittests/mocks/MessageQueueMockBase.h
diff --git a/src/fsfw_tests/unit/mocks/PeriodicTaskIFMock.h b/unittests/mocks/PeriodicTaskIFMock.h
similarity index 100%
rename from src/fsfw_tests/unit/mocks/PeriodicTaskIFMock.h
rename to unittests/mocks/PeriodicTaskIFMock.h
diff --git a/src/fsfw_tests/unit/mocks/PowerSwitcherMock.cpp b/unittests/mocks/PowerSwitcherMock.cpp
similarity index 100%
rename from src/fsfw_tests/unit/mocks/PowerSwitcherMock.cpp
rename to unittests/mocks/PowerSwitcherMock.cpp
diff --git a/src/fsfw_tests/unit/mocks/PowerSwitcherMock.h b/unittests/mocks/PowerSwitcherMock.h
similarity index 100%
rename from src/fsfw_tests/unit/mocks/PowerSwitcherMock.h
rename to unittests/mocks/PowerSwitcherMock.h
diff --git a/src/fsfw_tests/unit/osal/CMakeLists.txt b/unittests/osal/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/osal/CMakeLists.txt
rename to unittests/osal/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/osal/TestClock.cpp b/unittests/osal/TestClock.cpp
similarity index 100%
rename from src/fsfw_tests/unit/osal/TestClock.cpp
rename to unittests/osal/TestClock.cpp
diff --git a/src/fsfw_tests/unit/osal/TestMessageQueue.cpp b/unittests/osal/TestMessageQueue.cpp
similarity index 100%
rename from src/fsfw_tests/unit/osal/TestMessageQueue.cpp
rename to unittests/osal/TestMessageQueue.cpp
diff --git a/src/fsfw_tests/unit/osal/TestSemaphore.cpp b/unittests/osal/TestSemaphore.cpp
similarity index 100%
rename from src/fsfw_tests/unit/osal/TestSemaphore.cpp
rename to unittests/osal/TestSemaphore.cpp
diff --git a/src/fsfw_tests/unit/power/CMakeLists.txt b/unittests/power/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/power/CMakeLists.txt
rename to unittests/power/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/power/testPowerSwitcher.cpp b/unittests/power/testPowerSwitcher.cpp
similarity index 100%
rename from src/fsfw_tests/unit/power/testPowerSwitcher.cpp
rename to unittests/power/testPowerSwitcher.cpp
diff --git a/src/fsfw_tests/unit/printChar.cpp b/unittests/printChar.cpp
similarity index 100%
rename from src/fsfw_tests/unit/printChar.cpp
rename to unittests/printChar.cpp
diff --git a/src/fsfw_tests/unit/printChar.h b/unittests/printChar.h
similarity index 100%
rename from src/fsfw_tests/unit/printChar.h
rename to unittests/printChar.h
diff --git a/src/fsfw_tests/unit/serialize/CMakeLists.txt b/unittests/serialize/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/serialize/CMakeLists.txt
rename to unittests/serialize/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/serialize/TestSerialBufferAdapter.cpp b/unittests/serialize/TestSerialBufferAdapter.cpp
similarity index 100%
rename from src/fsfw_tests/unit/serialize/TestSerialBufferAdapter.cpp
rename to unittests/serialize/TestSerialBufferAdapter.cpp
diff --git a/src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.cpp b/unittests/serialize/TestSerialLinkedPacket.cpp
similarity index 100%
rename from src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.cpp
rename to unittests/serialize/TestSerialLinkedPacket.cpp
diff --git a/src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.h b/unittests/serialize/TestSerialLinkedPacket.h
similarity index 100%
rename from src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.h
rename to unittests/serialize/TestSerialLinkedPacket.h
diff --git a/src/fsfw_tests/unit/serialize/TestSerialization.cpp b/unittests/serialize/TestSerialization.cpp
similarity index 100%
rename from src/fsfw_tests/unit/serialize/TestSerialization.cpp
rename to unittests/serialize/TestSerialization.cpp
diff --git a/src/fsfw_tests/unit/storagemanager/CMakeLists.txt b/unittests/storagemanager/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/storagemanager/CMakeLists.txt
rename to unittests/storagemanager/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp b/unittests/storagemanager/TestNewAccessor.cpp
similarity index 100%
rename from src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp
rename to unittests/storagemanager/TestNewAccessor.cpp
diff --git a/src/fsfw_tests/unit/storagemanager/TestPool.cpp b/unittests/storagemanager/TestPool.cpp
similarity index 100%
rename from src/fsfw_tests/unit/storagemanager/TestPool.cpp
rename to unittests/storagemanager/TestPool.cpp
diff --git a/src/fsfw_tests/unit/version.cpp b/unittests/testVersion.cpp
similarity index 100%
rename from src/fsfw_tests/unit/version.cpp
rename to unittests/testVersion.cpp
diff --git a/src/fsfw_tests/unit/testcfg/CMakeLists.txt b/unittests/testcfg/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/CMakeLists.txt
rename to unittests/testcfg/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/testcfg/FSFWConfig.h.in b/unittests/testcfg/FSFWConfig.h.in
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/FSFWConfig.h.in
rename to unittests/testcfg/FSFWConfig.h.in
diff --git a/src/fsfw_tests/unit/testcfg/OBSWConfig.h.in b/unittests/testcfg/OBSWConfig.h.in
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/OBSWConfig.h.in
rename to unittests/testcfg/OBSWConfig.h.in
diff --git a/src/fsfw_tests/unit/testcfg/TestsConfig.h.in b/unittests/testcfg/TestsConfig.h.in
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/TestsConfig.h.in
rename to unittests/testcfg/TestsConfig.h.in
diff --git a/src/fsfw_tests/unit/testcfg/devices/logicalAddresses.cpp b/unittests/testcfg/devices/logicalAddresses.cpp
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/devices/logicalAddresses.cpp
rename to unittests/testcfg/devices/logicalAddresses.cpp
diff --git a/src/fsfw_tests/unit/testcfg/devices/logicalAddresses.h b/unittests/testcfg/devices/logicalAddresses.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/devices/logicalAddresses.h
rename to unittests/testcfg/devices/logicalAddresses.h
diff --git a/src/fsfw_tests/unit/testcfg/devices/powerSwitcherList.cpp b/unittests/testcfg/devices/powerSwitcherList.cpp
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/devices/powerSwitcherList.cpp
rename to unittests/testcfg/devices/powerSwitcherList.cpp
diff --git a/src/fsfw_tests/unit/testcfg/devices/powerSwitcherList.h b/unittests/testcfg/devices/powerSwitcherList.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/devices/powerSwitcherList.h
rename to unittests/testcfg/devices/powerSwitcherList.h
diff --git a/src/fsfw_tests/unit/testcfg/events/subsystemIdRanges.h b/unittests/testcfg/events/subsystemIdRanges.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/events/subsystemIdRanges.h
rename to unittests/testcfg/events/subsystemIdRanges.h
diff --git a/src/fsfw_tests/unit/testcfg/ipc/MissionMessageTypes.cpp b/unittests/testcfg/ipc/MissionMessageTypes.cpp
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/ipc/MissionMessageTypes.cpp
rename to unittests/testcfg/ipc/MissionMessageTypes.cpp
diff --git a/src/fsfw_tests/unit/testcfg/ipc/MissionMessageTypes.h b/unittests/testcfg/ipc/MissionMessageTypes.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/ipc/MissionMessageTypes.h
rename to unittests/testcfg/ipc/MissionMessageTypes.h
diff --git a/src/fsfw_tests/unit/testcfg/objects/systemObjectList.h b/unittests/testcfg/objects/systemObjectList.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/objects/systemObjectList.h
rename to unittests/testcfg/objects/systemObjectList.h
diff --git a/src/fsfw_tests/unit/testcfg/pollingsequence/PollingSequenceFactory.cpp b/unittests/testcfg/pollingsequence/PollingSequenceFactory.cpp
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/pollingsequence/PollingSequenceFactory.cpp
rename to unittests/testcfg/pollingsequence/PollingSequenceFactory.cpp
diff --git a/src/fsfw_tests/unit/testcfg/pollingsequence/PollingSequenceFactory.h b/unittests/testcfg/pollingsequence/PollingSequenceFactory.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/pollingsequence/PollingSequenceFactory.h
rename to unittests/testcfg/pollingsequence/PollingSequenceFactory.h
diff --git a/src/fsfw_tests/unit/testcfg/returnvalues/classIds.h b/unittests/testcfg/returnvalues/classIds.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/returnvalues/classIds.h
rename to unittests/testcfg/returnvalues/classIds.h
diff --git a/src/fsfw_tests/unit/testcfg/tmtc/apid.h b/unittests/testcfg/tmtc/apid.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/tmtc/apid.h
rename to unittests/testcfg/tmtc/apid.h
diff --git a/src/fsfw_tests/unit/testcfg/tmtc/pusIds.h b/unittests/testcfg/tmtc/pusIds.h
similarity index 100%
rename from src/fsfw_tests/unit/testcfg/tmtc/pusIds.h
rename to unittests/testcfg/tmtc/pusIds.h
diff --git a/src/fsfw_tests/unit/testtemplate/TestTemplate.cpp b/unittests/testtemplate/TestTemplate.cpp
similarity index 100%
rename from src/fsfw_tests/unit/testtemplate/TestTemplate.cpp
rename to unittests/testtemplate/TestTemplate.cpp
diff --git a/src/fsfw_tests/unit/timemanager/CMakeLists.txt b/unittests/timemanager/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/timemanager/CMakeLists.txt
rename to unittests/timemanager/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/timemanager/TestCCSDSTime.cpp b/unittests/timemanager/TestCCSDSTime.cpp
similarity index 100%
rename from src/fsfw_tests/unit/timemanager/TestCCSDSTime.cpp
rename to unittests/timemanager/TestCCSDSTime.cpp
diff --git a/src/fsfw_tests/unit/timemanager/TestCountdown.cpp b/unittests/timemanager/TestCountdown.cpp
similarity index 100%
rename from src/fsfw_tests/unit/timemanager/TestCountdown.cpp
rename to unittests/timemanager/TestCountdown.cpp
diff --git a/src/fsfw_tests/unit/tmtcpacket/CMakeLists.txt b/unittests/tmtcpacket/CMakeLists.txt
similarity index 100%
rename from src/fsfw_tests/unit/tmtcpacket/CMakeLists.txt
rename to unittests/tmtcpacket/CMakeLists.txt
diff --git a/src/fsfw_tests/unit/tmtcpacket/PusTmTest.cpp b/unittests/tmtcpacket/PusTmTest.cpp
similarity index 100%
rename from src/fsfw_tests/unit/tmtcpacket/PusTmTest.cpp
rename to unittests/tmtcpacket/PusTmTest.cpp
diff --git a/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp b/unittests/tmtcpacket/testCcsds.cpp
similarity index 100%
rename from src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp
rename to unittests/tmtcpacket/testCcsds.cpp