diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 3a987228..8c252e82 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -1,11 +1,9 @@
-if(FSFW_ADD_SPG4_PROPAGATOR)
-    target_sources(${LIB_FSFW_NAME} PRIVATE
-        sgp4/sgp4unit.cpp
-    )
-    target_include_directories(${LIB_FSFW_NAME} PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
-    )
-    target_include_directories(${LIB_FSFW_NAME} INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
-    )
-endif()
+target_include_directories(${LIB_FSFW_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_include_directories(${LIB_FSFW_NAME} INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_subdirectory(fsfw-contrib)
diff --git a/contrib/fsfw-contrib/CMakeLists.txt b/contrib/fsfw-contrib/CMakeLists.txt
new file mode 100644
index 00000000..3a987228
--- /dev/null
+++ b/contrib/fsfw-contrib/CMakeLists.txt
@@ -0,0 +1,11 @@
+if(FSFW_ADD_SPG4_PROPAGATOR)
+    target_sources(${LIB_FSFW_NAME} PRIVATE
+        sgp4/sgp4unit.cpp
+    )
+    target_include_directories(${LIB_FSFW_NAME} PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
+    )
+    target_include_directories(${LIB_FSFW_NAME} INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
+    )
+endif()
diff --git a/contrib/sgp4/LICENSE b/contrib/fsfw-contrib/sgp4/LICENSE
similarity index 100%
rename from contrib/sgp4/LICENSE
rename to contrib/fsfw-contrib/sgp4/LICENSE
diff --git a/contrib/sgp4/sgp4unit.cpp b/contrib/fsfw-contrib/sgp4/sgp4unit.cpp
similarity index 100%
rename from contrib/sgp4/sgp4unit.cpp
rename to contrib/fsfw-contrib/sgp4/sgp4unit.cpp
diff --git a/contrib/sgp4/sgp4unit.h b/contrib/fsfw-contrib/sgp4/sgp4unit.h
similarity index 100%
rename from contrib/sgp4/sgp4unit.h
rename to contrib/fsfw-contrib/sgp4/sgp4unit.h
diff --git a/hal/src/CMakeLists.txt b/hal/src/CMakeLists.txt
index ed2f2522..ff3f1beb 100644
--- a/hal/src/CMakeLists.txt
+++ b/hal/src/CMakeLists.txt
@@ -6,4 +6,4 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_subdirectory(fsfw)
+add_subdirectory(fsfw-hal)
diff --git a/hal/src/fsfw/hal/CMakeLists.txt b/hal/src/fsfw-hal/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/CMakeLists.txt
rename to hal/src/fsfw-hal/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/common/CMakeLists.txt b/hal/src/fsfw-hal/common/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/common/CMakeLists.txt
rename to hal/src/fsfw-hal/common/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/common/gpio/CMakeLists.txt b/hal/src/fsfw-hal/common/gpio/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/common/gpio/CMakeLists.txt
rename to hal/src/fsfw-hal/common/gpio/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/common/gpio/GpioCookie.cpp b/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp
similarity index 100%
rename from hal/src/fsfw/hal/common/gpio/GpioCookie.cpp
rename to hal/src/fsfw-hal/common/gpio/GpioCookie.cpp
diff --git a/hal/src/fsfw/hal/common/gpio/GpioCookie.h b/hal/src/fsfw-hal/common/gpio/GpioCookie.h
similarity index 100%
rename from hal/src/fsfw/hal/common/gpio/GpioCookie.h
rename to hal/src/fsfw-hal/common/gpio/GpioCookie.h
diff --git a/hal/src/fsfw/hal/common/gpio/GpioIF.h b/hal/src/fsfw-hal/common/gpio/GpioIF.h
similarity index 100%
rename from hal/src/fsfw/hal/common/gpio/GpioIF.h
rename to hal/src/fsfw-hal/common/gpio/GpioIF.h
diff --git a/hal/src/fsfw/hal/common/gpio/gpioDefinitions.h b/hal/src/fsfw-hal/common/gpio/gpioDefinitions.h
similarity index 100%
rename from hal/src/fsfw/hal/common/gpio/gpioDefinitions.h
rename to hal/src/fsfw-hal/common/gpio/gpioDefinitions.h
diff --git a/hal/src/fsfw/hal/common/spi/spiCommon.h b/hal/src/fsfw-hal/common/spi/spiCommon.h
similarity index 100%
rename from hal/src/fsfw/hal/common/spi/spiCommon.h
rename to hal/src/fsfw-hal/common/spi/spiCommon.h
diff --git a/hal/src/fsfw/hal/devicehandlers/CMakeLists.txt b/hal/src/fsfw-hal/devicehandlers/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/devicehandlers/CMakeLists.txt
rename to hal/src/fsfw-hal/devicehandlers/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.cpp b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp
similarity index 100%
rename from hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.cpp
rename to hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp
diff --git a/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.h
similarity index 100%
rename from hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h
rename to hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.h
diff --git a/hal/src/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h b/hal/src/fsfw-hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h
similarity index 100%
rename from hal/src/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h
rename to hal/src/fsfw-hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h
diff --git a/hal/src/fsfw/hal/host/CMakeLists.txt b/hal/src/fsfw-hal/host/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/host/CMakeLists.txt
rename to hal/src/fsfw-hal/host/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/linux/CMakeLists.txt b/hal/src/fsfw-hal/linux/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/linux/CMakeLists.txt
rename to hal/src/fsfw-hal/linux/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/linux/UnixFileGuard.cpp b/hal/src/fsfw-hal/linux/UnixFileGuard.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/UnixFileGuard.cpp
rename to hal/src/fsfw-hal/linux/UnixFileGuard.cpp
diff --git a/hal/src/fsfw/hal/linux/UnixFileGuard.h b/hal/src/fsfw-hal/linux/UnixFileGuard.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/UnixFileGuard.h
rename to hal/src/fsfw-hal/linux/UnixFileGuard.h
diff --git a/hal/src/fsfw/hal/linux/gpio/CMakeLists.txt b/hal/src/fsfw-hal/linux/gpio/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/linux/gpio/CMakeLists.txt
rename to hal/src/fsfw-hal/linux/gpio/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.cpp b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.cpp
rename to hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp
diff --git a/hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.h b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.h
rename to hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.h
diff --git a/hal/src/fsfw/hal/linux/i2c/CMakeLists.txt b/hal/src/fsfw-hal/linux/i2c/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/linux/i2c/CMakeLists.txt
rename to hal/src/fsfw-hal/linux/i2c/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/linux/i2c/I2cComIF.cpp b/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/i2c/I2cComIF.cpp
rename to hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp
diff --git a/hal/src/fsfw/hal/linux/i2c/I2cComIF.h b/hal/src/fsfw-hal/linux/i2c/I2cComIF.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/i2c/I2cComIF.h
rename to hal/src/fsfw-hal/linux/i2c/I2cComIF.h
diff --git a/hal/src/fsfw/hal/linux/i2c/I2cCookie.cpp b/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/i2c/I2cCookie.cpp
rename to hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp
diff --git a/hal/src/fsfw/hal/linux/i2c/I2cCookie.h b/hal/src/fsfw-hal/linux/i2c/I2cCookie.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/i2c/I2cCookie.h
rename to hal/src/fsfw-hal/linux/i2c/I2cCookie.h
diff --git a/hal/src/fsfw/hal/linux/rpi/CMakeLists.txt b/hal/src/fsfw-hal/linux/rpi/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/linux/rpi/CMakeLists.txt
rename to hal/src/fsfw-hal/linux/rpi/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/linux/rpi/GpioRPi.cpp b/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/rpi/GpioRPi.cpp
rename to hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp
diff --git a/hal/src/fsfw/hal/linux/rpi/GpioRPi.h b/hal/src/fsfw-hal/linux/rpi/GpioRPi.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/rpi/GpioRPi.h
rename to hal/src/fsfw-hal/linux/rpi/GpioRPi.h
diff --git a/hal/src/fsfw/hal/linux/spi/CMakeLists.txt b/hal/src/fsfw-hal/linux/spi/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/linux/spi/CMakeLists.txt
rename to hal/src/fsfw-hal/linux/spi/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/linux/spi/SpiComIF.cpp b/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/spi/SpiComIF.cpp
rename to hal/src/fsfw-hal/linux/spi/SpiComIF.cpp
diff --git a/hal/src/fsfw/hal/linux/spi/SpiComIF.h b/hal/src/fsfw-hal/linux/spi/SpiComIF.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/spi/SpiComIF.h
rename to hal/src/fsfw-hal/linux/spi/SpiComIF.h
diff --git a/hal/src/fsfw/hal/linux/spi/SpiCookie.cpp b/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/spi/SpiCookie.cpp
rename to hal/src/fsfw-hal/linux/spi/SpiCookie.cpp
diff --git a/hal/src/fsfw/hal/linux/spi/SpiCookie.h b/hal/src/fsfw-hal/linux/spi/SpiCookie.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/spi/SpiCookie.h
rename to hal/src/fsfw-hal/linux/spi/SpiCookie.h
diff --git a/hal/src/fsfw/hal/linux/spi/spiDefinitions.h b/hal/src/fsfw-hal/linux/spi/spiDefinitions.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/spi/spiDefinitions.h
rename to hal/src/fsfw-hal/linux/spi/spiDefinitions.h
diff --git a/hal/src/fsfw/hal/linux/uart/CMakeLists.txt b/hal/src/fsfw-hal/linux/uart/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/linux/uart/CMakeLists.txt
rename to hal/src/fsfw-hal/linux/uart/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/linux/uart/UartComIF.cpp b/hal/src/fsfw-hal/linux/uart/UartComIF.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/uart/UartComIF.cpp
rename to hal/src/fsfw-hal/linux/uart/UartComIF.cpp
diff --git a/hal/src/fsfw/hal/linux/uart/UartComIF.h b/hal/src/fsfw-hal/linux/uart/UartComIF.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/uart/UartComIF.h
rename to hal/src/fsfw-hal/linux/uart/UartComIF.h
diff --git a/hal/src/fsfw/hal/linux/uart/UartCookie.cpp b/hal/src/fsfw-hal/linux/uart/UartCookie.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/uart/UartCookie.cpp
rename to hal/src/fsfw-hal/linux/uart/UartCookie.cpp
diff --git a/hal/src/fsfw/hal/linux/uart/UartCookie.h b/hal/src/fsfw-hal/linux/uart/UartCookie.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/uart/UartCookie.h
rename to hal/src/fsfw-hal/linux/uart/UartCookie.h
diff --git a/hal/src/fsfw/hal/linux/utility.cpp b/hal/src/fsfw-hal/linux/utility.cpp
similarity index 100%
rename from hal/src/fsfw/hal/linux/utility.cpp
rename to hal/src/fsfw-hal/linux/utility.cpp
diff --git a/hal/src/fsfw/hal/linux/utility.h b/hal/src/fsfw-hal/linux/utility.h
similarity index 100%
rename from hal/src/fsfw/hal/linux/utility.h
rename to hal/src/fsfw-hal/linux/utility.h
diff --git a/hal/src/fsfw/hal/stm32h7/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/CMakeLists.txt
rename to hal/src/fsfw-hal/stm32h7/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/stm32h7/devicetest/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/devicetest/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/devicetest/CMakeLists.txt
rename to hal/src/fsfw-hal/stm32h7/devicetest/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.cpp b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.cpp
rename to hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h
rename to hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.h
diff --git a/hal/src/fsfw/hal/stm32h7/dma.cpp b/hal/src/fsfw-hal/stm32h7/dma.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/dma.cpp
rename to hal/src/fsfw-hal/stm32h7/dma.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/dma.h b/hal/src/fsfw-hal/stm32h7/dma.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/dma.h
rename to hal/src/fsfw-hal/stm32h7/dma.h
diff --git a/hal/src/fsfw/hal/stm32h7/gpio/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/gpio/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/gpio/CMakeLists.txt
rename to hal/src/fsfw-hal/stm32h7/gpio/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/stm32h7/gpio/gpio.cpp b/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/gpio/gpio.cpp
rename to hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/gpio/gpio.h b/hal/src/fsfw-hal/stm32h7/gpio/gpio.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/gpio/gpio.h
rename to hal/src/fsfw-hal/stm32h7/gpio/gpio.h
diff --git a/hal/src/fsfw/hal/stm32h7/i2c/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/i2c/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/i2c/CMakeLists.txt
rename to hal/src/fsfw-hal/stm32h7/i2c/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/stm32h7/interrupts.h b/hal/src/fsfw-hal/stm32h7/interrupts.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/interrupts.h
rename to hal/src/fsfw-hal/stm32h7/interrupts.h
diff --git a/hal/src/fsfw/hal/stm32h7/spi/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/spi/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/CMakeLists.txt
rename to hal/src/fsfw-hal/stm32h7/spi/CMakeLists.txt
diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.cpp b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/SpiComIF.cpp
rename to hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.h b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/SpiComIF.h
rename to hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h
diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiCookie.cpp b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/SpiCookie.cpp
rename to hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiCookie.h b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/SpiCookie.h
rename to hal/src/fsfw-hal/stm32h7/spi/SpiCookie.h
diff --git a/hal/src/fsfw/hal/stm32h7/spi/mspInit.cpp b/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/mspInit.cpp
rename to hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/spi/mspInit.h b/hal/src/fsfw-hal/stm32h7/spi/mspInit.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/mspInit.h
rename to hal/src/fsfw-hal/stm32h7/spi/mspInit.h
diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiCore.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/spiCore.cpp
rename to hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiCore.h b/hal/src/fsfw-hal/stm32h7/spi/spiCore.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/spiCore.h
rename to hal/src/fsfw-hal/stm32h7/spi/spiCore.h
diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.cpp
rename to hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.h b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.h
rename to hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.h
diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.cpp
rename to hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.h b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.h
rename to hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.h
diff --git a/hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.cpp b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.cpp
rename to hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp
diff --git a/hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.h
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h
rename to hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.h
diff --git a/hal/src/fsfw/hal/stm32h7/uart/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/uart/CMakeLists.txt
similarity index 100%
rename from hal/src/fsfw/hal/stm32h7/uart/CMakeLists.txt
rename to hal/src/fsfw-hal/stm32h7/uart/CMakeLists.txt
diff --git a/hal/src/fsfw/CMakeLists.txt b/hal/src/fsfw/CMakeLists.txt
deleted file mode 100644
index c034e0b7..00000000
--- a/hal/src/fsfw/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(hal)
diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt
index ed2f2522..18bf7f8c 100644
--- a/tests/src/CMakeLists.txt
+++ b/tests/src/CMakeLists.txt
@@ -6,4 +6,4 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_subdirectory(fsfw)
+add_subdirectory(fsfw-tests)
diff --git a/tests/src/fsfw/tests/CMakeLists.txt b/tests/src/fsfw-tests/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/CMakeLists.txt
rename to tests/src/fsfw-tests/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/internal/CMakeLists.txt b/tests/src/fsfw-tests/internal/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/internal/CMakeLists.txt
rename to tests/src/fsfw-tests/internal/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/internal/InternalUnitTester.cpp b/tests/src/fsfw-tests/internal/InternalUnitTester.cpp
similarity index 100%
rename from tests/src/fsfw/tests/internal/InternalUnitTester.cpp
rename to tests/src/fsfw-tests/internal/InternalUnitTester.cpp
diff --git a/tests/src/fsfw/tests/internal/InternalUnitTester.h b/tests/src/fsfw-tests/internal/InternalUnitTester.h
similarity index 100%
rename from tests/src/fsfw/tests/internal/InternalUnitTester.h
rename to tests/src/fsfw-tests/internal/InternalUnitTester.h
diff --git a/tests/src/fsfw/tests/internal/UnittDefinitions.cpp b/tests/src/fsfw-tests/internal/UnittDefinitions.cpp
similarity index 100%
rename from tests/src/fsfw/tests/internal/UnittDefinitions.cpp
rename to tests/src/fsfw-tests/internal/UnittDefinitions.cpp
diff --git a/tests/src/fsfw/tests/internal/UnittDefinitions.h b/tests/src/fsfw-tests/internal/UnittDefinitions.h
similarity index 100%
rename from tests/src/fsfw/tests/internal/UnittDefinitions.h
rename to tests/src/fsfw-tests/internal/UnittDefinitions.h
diff --git a/tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt b/tests/src/fsfw-tests/internal/globalfunctions/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt
rename to tests/src/fsfw-tests/internal/globalfunctions/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp
similarity index 100%
rename from tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp
rename to tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp
diff --git a/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.h
similarity index 100%
rename from tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h
rename to tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.h
diff --git a/tests/src/fsfw/tests/internal/osal/CMakeLists.txt b/tests/src/fsfw-tests/internal/osal/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/internal/osal/CMakeLists.txt
rename to tests/src/fsfw-tests/internal/osal/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMq.cpp b/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp
similarity index 100%
rename from tests/src/fsfw/tests/internal/osal/IntTestMq.cpp
rename to tests/src/fsfw-tests/internal/osal/IntTestMq.cpp
diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMq.h b/tests/src/fsfw-tests/internal/osal/IntTestMq.h
similarity index 100%
rename from tests/src/fsfw/tests/internal/osal/IntTestMq.h
rename to tests/src/fsfw-tests/internal/osal/IntTestMq.h
diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp b/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp
similarity index 100%
rename from tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp
rename to tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp
diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMutex.h b/tests/src/fsfw-tests/internal/osal/IntTestMutex.h
similarity index 100%
rename from tests/src/fsfw/tests/internal/osal/IntTestMutex.h
rename to tests/src/fsfw-tests/internal/osal/IntTestMutex.h
diff --git a/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp
similarity index 100%
rename from tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp
rename to tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp
diff --git a/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.h
similarity index 100%
rename from tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h
rename to tests/src/fsfw-tests/internal/osal/IntTestSemaphore.h
diff --git a/tests/src/fsfw/tests/internal/serialize/CMakeLists.txt b/tests/src/fsfw-tests/internal/serialize/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/internal/serialize/CMakeLists.txt
rename to tests/src/fsfw-tests/internal/serialize/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp
similarity index 100%
rename from tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp
rename to tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp
diff --git a/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.h
similarity index 100%
rename from tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h
rename to tests/src/fsfw-tests/internal/serialize/IntTestSerialization.h
diff --git a/tests/src/fsfw/tests/unit/CMakeLists.txt b/tests/src/fsfw-tests/unit/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/action/CMakeLists.txt b/tests/src/fsfw-tests/unit/action/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/action/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/action/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp b/tests/src/fsfw-tests/unit/action/TestActionHelper.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/action/TestActionHelper.cpp
rename to tests/src/fsfw-tests/unit/action/TestActionHelper.cpp
diff --git a/tests/src/fsfw/tests/unit/action/TestActionHelper.h b/tests/src/fsfw-tests/unit/action/TestActionHelper.h
similarity index 100%
rename from tests/src/fsfw/tests/unit/action/TestActionHelper.h
rename to tests/src/fsfw-tests/unit/action/TestActionHelper.h
diff --git a/tests/src/fsfw/tests/unit/container/CMakeLists.txt b/tests/src/fsfw-tests/unit/container/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/container/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/container/RingBufferTest.cpp b/tests/src/fsfw-tests/unit/container/RingBufferTest.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/RingBufferTest.cpp
rename to tests/src/fsfw-tests/unit/container/RingBufferTest.cpp
diff --git a/tests/src/fsfw/tests/unit/container/TestArrayList.cpp b/tests/src/fsfw-tests/unit/container/TestArrayList.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/TestArrayList.cpp
rename to tests/src/fsfw-tests/unit/container/TestArrayList.cpp
diff --git a/tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp b/tests/src/fsfw-tests/unit/container/TestDynamicFifo.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp
rename to tests/src/fsfw-tests/unit/container/TestDynamicFifo.cpp
diff --git a/tests/src/fsfw/tests/unit/container/TestFifo.cpp b/tests/src/fsfw-tests/unit/container/TestFifo.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/TestFifo.cpp
rename to tests/src/fsfw-tests/unit/container/TestFifo.cpp
diff --git a/tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp b/tests/src/fsfw-tests/unit/container/TestFixedArrayList.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp
rename to tests/src/fsfw-tests/unit/container/TestFixedArrayList.cpp
diff --git a/tests/src/fsfw/tests/unit/container/TestFixedMap.cpp b/tests/src/fsfw-tests/unit/container/TestFixedMap.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/TestFixedMap.cpp
rename to tests/src/fsfw-tests/unit/container/TestFixedMap.cpp
diff --git a/tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp b/tests/src/fsfw-tests/unit/container/TestFixedOrderedMultimap.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp
rename to tests/src/fsfw-tests/unit/container/TestFixedOrderedMultimap.cpp
diff --git a/tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp b/tests/src/fsfw-tests/unit/container/TestPlacementFactory.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp
rename to tests/src/fsfw-tests/unit/container/TestPlacementFactory.cpp
diff --git a/tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt b/tests/src/fsfw-tests/unit/datapoollocal/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/datapoollocal/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/DataSetTest.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp
rename to tests/src/fsfw-tests/unit/datapoollocal/DataSetTest.cpp
diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolManagerTest.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp
rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolManagerTest.cpp
diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp
rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.cpp
diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.h
similarity index 100%
rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h
rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.h
diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVariableTest.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp
rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVariableTest.cpp
diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVectorTest.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp
rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVectorTest.cpp
diff --git a/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt b/tests/src/fsfw-tests/unit/globalfunctions/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/globalfunctions/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h b/tests/src/fsfw-tests/unit/mocks/HkReceiverMock.h
similarity index 100%
rename from tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h
rename to tests/src/fsfw-tests/unit/mocks/HkReceiverMock.h
diff --git a/tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h b/tests/src/fsfw-tests/unit/mocks/MessageQueueMockBase.h
similarity index 100%
rename from tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h
rename to tests/src/fsfw-tests/unit/mocks/MessageQueueMockBase.h
diff --git a/tests/src/fsfw/tests/unit/osal/CMakeLists.txt b/tests/src/fsfw-tests/unit/osal/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/osal/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/osal/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp b/tests/src/fsfw-tests/unit/osal/TestMessageQueue.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp
rename to tests/src/fsfw-tests/unit/osal/TestMessageQueue.cpp
diff --git a/tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp b/tests/src/fsfw-tests/unit/osal/TestSemaphore.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp
rename to tests/src/fsfw-tests/unit/osal/TestSemaphore.cpp
diff --git a/tests/src/fsfw/tests/unit/serialize/CMakeLists.txt b/tests/src/fsfw-tests/unit/serialize/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/serialize/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/serialize/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp b/tests/src/fsfw-tests/unit/serialize/TestSerialBufferAdapter.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp
rename to tests/src/fsfw-tests/unit/serialize/TestSerialBufferAdapter.cpp
diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp b/tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp
rename to tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.cpp
diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h b/tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.h
similarity index 100%
rename from tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h
rename to tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.h
diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp b/tests/src/fsfw-tests/unit/serialize/TestSerialization.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp
rename to tests/src/fsfw-tests/unit/serialize/TestSerialization.cpp
diff --git a/tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt b/tests/src/fsfw-tests/unit/storagemanager/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/storagemanager/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp b/tests/src/fsfw-tests/unit/storagemanager/TestNewAccessor.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp
rename to tests/src/fsfw-tests/unit/storagemanager/TestNewAccessor.cpp
diff --git a/tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp b/tests/src/fsfw-tests/unit/storagemanager/TestPool.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp
rename to tests/src/fsfw-tests/unit/storagemanager/TestPool.cpp
diff --git a/tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt b/tests/src/fsfw-tests/unit/tmtcpacket/CMakeLists.txt
similarity index 100%
rename from tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt
rename to tests/src/fsfw-tests/unit/tmtcpacket/CMakeLists.txt
diff --git a/tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp b/tests/src/fsfw-tests/unit/tmtcpacket/PusTmTest.cpp
similarity index 100%
rename from tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp
rename to tests/src/fsfw-tests/unit/tmtcpacket/PusTmTest.cpp
diff --git a/tests/src/fsfw/CMakeLists.txt b/tests/src/fsfw/CMakeLists.txt
deleted file mode 100644
index 571a126e..00000000
--- a/tests/src/fsfw/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(tests)
\ No newline at end of file