diff --git a/CMakeLists.txt b/CMakeLists.txt
index f940ea0f..97b7601c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -235,10 +235,6 @@ set(LIB_JSON_PATH ${THIRD_PARTY_FOLDER}/json)
 set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF)
 set(EIVE_ADD_LINUX_FILES OFF)
 
-if(UNIX)
-  set(EIVE_ADD_LINUX_FILES ON)
-endif()
-
 # Analyse different OS and architecture/target options, determine BSP_PATH,
 # display information about compiler etc.
 pre_source_hw_os_config()
@@ -257,12 +253,15 @@ if(TGT_BSP)
     set(FSFW_CONFIG_PATH "linux/fsfwconfig")
     if(NOT BUILD_Q7S_SIMPLE_MODE)
       set(EIVE_ADD_LINUX_FILES TRUE)
+      set(EIVE_ADD_LINUX_FSFWCONFIG TRUE)
       set(ADD_GOMSPACE_CSP TRUE)
       set(ADD_GOMSPACE_CLIENTS TRUE)
       set(FSFW_HAL_ADD_LINUX ON)
       set(FSFW_HAL_LINUX_ADD_LIBGPIOD ON)
       set(FSFW_HAL_LINUX_ADD_PERIPHERAL_DRIVERS ON)
     endif()
+  elseif(UNIX)
+    set(EIVE_ADD_LINUX_FILES ON)
   endif()
 
   if(TGT_BSP MATCHES "arm/raspberrypi")
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 718594e1..07eb0d22 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -71,8 +71,8 @@
 #include "fsfw_hal/linux/i2c/I2cCookie.h"
 #include "fsfw_hal/linux/spi/SpiComIF.h"
 #include "fsfw_hal/linux/spi/SpiCookie.h"
-#include "fsfw_hal/linux/uart/UartComIF.h"
-#include "fsfw_hal/linux/uart/UartCookie.h"
+#include "fsfw_hal/linux/serial/SerialComIF.h"
+#include "fsfw_hal/linux/serial/SerialCookie.h"
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/ACUHandler.h"
 #include "mission/devices/BpxBatteryHandler.h"
@@ -137,7 +137,7 @@ void ObjectFactory::createTmpComponents() {
   (void)tmp1075Handler_2;
 }
 
-void ObjectFactory::createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, UartComIF** uartComIF,
+void ObjectFactory::createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, SerialComIF** uartComIF,
                                                   SpiComIF** spiMainComIF, I2cComIF** i2cComIF,
                                                   SpiComIF** spiRWComIF) {
   if (gpioComIF == nullptr or uartComIF == nullptr or spiMainComIF == nullptr or
@@ -150,7 +150,7 @@ void ObjectFactory::createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, Ua
   /* Communication interfaces */
   new CspComIF(objects::CSP_COM_IF);
   *i2cComIF = new I2cComIF(objects::I2C_COM_IF);
-  *uartComIF = new UartComIF(objects::UART_COM_IF);
+  *uartComIF = new SerialComIF(objects::UART_COM_IF);
   *spiMainComIF = new SpiComIF(objects::SPI_MAIN_COM_IF, q7s::SPI_DEFAULT_DEV, **gpioComIF);
   *spiRWComIF = new SpiComIF(objects::SPI_RW_COM_IF, q7s::SPI_RW_DEV, **gpioComIF);
 }
@@ -230,7 +230,7 @@ ReturnValue_t ObjectFactory::createRadSensorComponent(LinuxLibgpioIF* gpioComIF)
   return returnvalue::OK;
 }
 
-void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComIF* uartComIF,
+void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, SerialComIF* uartComIF,
                                              PowerSwitchIF* pwrSwitcher) {
   using namespace gpio;
   GpioCookie* gpioCookieAcsBoard = new GpioCookie();
diff --git a/bsp_q7s/core/ObjectFactory.h b/bsp_q7s/core/ObjectFactory.h
index 40a4e2ed..c67353c4 100644
--- a/bsp_q7s/core/ObjectFactory.h
+++ b/bsp_q7s/core/ObjectFactory.h
@@ -9,7 +9,7 @@
 #include <string>
 
 class LinuxLibgpioIF;
-class UartComIF;
+class SerialComIF;
 class SpiComIF;
 class I2cComIF;
 class PowerSwitchIF;
@@ -22,7 +22,7 @@ namespace ObjectFactory {
 void setStatics();
 void produce(void* args);
 
-void createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, UartComIF** uartComIF,
+void createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, SerialComIF** uartComIF,
                                    SpiComIF** spiMainComIF, I2cComIF** i2cComIF,
                                    SpiComIF** spiRwComIF);
 void createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF** pwrSwitcher);
@@ -30,7 +30,7 @@ void createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,
                             PowerSwitchIF* pwrSwitcher);
 void createTmpComponents();
 ReturnValue_t createRadSensorComponent(LinuxLibgpioIF* gpioComIF);
-void createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComIF* uartComIF,
+void createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, SerialComIF* uartComIF,
                               PowerSwitchIF* pwrSwitcher);
 void createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher, HealthTableIF* healthTable);
 void createImtqComponents(PowerSwitchIF* pwrSwitcher);
diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index 6ac2498a..c56dcf8d 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -21,7 +21,7 @@ void ObjectFactory::produce(void* args) {
   ObjectFactory::produceGenericObjects(&healthTable, &pusFunnel, &cfdpFunnel);
 
   LinuxLibgpioIF* gpioComIF = nullptr;
-  UartComIF* uartComIF = nullptr;
+  SerialComIF* uartComIF = nullptr;
   SpiComIF* spiMainComIF = nullptr;
   I2cComIF* i2cComIF = nullptr;
   PowerSwitchIF* pwrSwitcher = nullptr;
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index 7b99da46..f8c8935f 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -5,4 +5,8 @@ add_subdirectory(boardtest)
 add_subdirectory(devices)
 add_subdirectory(ipcore)
 
+if(EIVE_ADD_LINUX_FSFWCONFIG)
+  add_subdirectory(fsfwconfig)
+endif()
+
 target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp InitMission.cpp)
diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp
index ea314b4b..575bd6cb 100644
--- a/linux/boardtest/SpiTestClass.cpp
+++ b/linux/boardtest/SpiTestClass.cpp
@@ -335,7 +335,7 @@ void SpiTestClass::performPeriodicMax1227Test() {
 void SpiTestClass::performMax1227Test() {
   std::string deviceName = "";
 #ifdef XIPHOS_Q7S
-  std::string deviceName = q7s::SPI_DEFAULT_DEV;
+  deviceName = q7s::SPI_DEFAULT_DEV;
 #elif defined(RASPBERRY_PI)
 #elif defined(EGSE)
 #elif defined(TE0720_1CFA)
diff --git a/bsp_linux_board/fsfwconfig/CMakeLists.txt b/linux/fsfwconfig/CMakeLists.txt
similarity index 100%
rename from bsp_linux_board/fsfwconfig/CMakeLists.txt
rename to linux/fsfwconfig/CMakeLists.txt
diff --git a/bsp_linux_board/fsfwconfig/FSFWConfig.h.in b/linux/fsfwconfig/FSFWConfig.h.in
similarity index 100%
rename from bsp_linux_board/fsfwconfig/FSFWConfig.h.in
rename to linux/fsfwconfig/FSFWConfig.h.in
diff --git a/bsp_linux_board/fsfwconfig/events/subsystemIdRanges.h b/linux/fsfwconfig/events/subsystemIdRanges.h
similarity index 100%
rename from bsp_linux_board/fsfwconfig/events/subsystemIdRanges.h
rename to linux/fsfwconfig/events/subsystemIdRanges.h
diff --git a/bsp_linux_board/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
similarity index 100%
rename from bsp_linux_board/fsfwconfig/events/translateEvents.cpp
rename to linux/fsfwconfig/events/translateEvents.cpp
diff --git a/bsp_linux_board/fsfwconfig/events/translateEvents.h b/linux/fsfwconfig/events/translateEvents.h
similarity index 100%
rename from bsp_linux_board/fsfwconfig/events/translateEvents.h
rename to linux/fsfwconfig/events/translateEvents.h
diff --git a/bsp_linux_board/fsfwconfig/ipc/MissionMessageTypes.cpp b/linux/fsfwconfig/ipc/MissionMessageTypes.cpp
similarity index 100%
rename from bsp_linux_board/fsfwconfig/ipc/MissionMessageTypes.cpp
rename to linux/fsfwconfig/ipc/MissionMessageTypes.cpp
diff --git a/bsp_linux_board/fsfwconfig/ipc/MissionMessageTypes.h b/linux/fsfwconfig/ipc/MissionMessageTypes.h
similarity index 100%
rename from bsp_linux_board/fsfwconfig/ipc/MissionMessageTypes.h
rename to linux/fsfwconfig/ipc/MissionMessageTypes.h
diff --git a/bsp_linux_board/fsfwconfig/objects/systemObjectList.h b/linux/fsfwconfig/objects/systemObjectList.h
similarity index 100%
rename from bsp_linux_board/fsfwconfig/objects/systemObjectList.h
rename to linux/fsfwconfig/objects/systemObjectList.h
diff --git a/bsp_linux_board/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
similarity index 100%
rename from bsp_linux_board/fsfwconfig/objects/translateObjects.cpp
rename to linux/fsfwconfig/objects/translateObjects.cpp
diff --git a/bsp_linux_board/fsfwconfig/objects/translateObjects.h b/linux/fsfwconfig/objects/translateObjects.h
similarity index 100%
rename from bsp_linux_board/fsfwconfig/objects/translateObjects.h
rename to linux/fsfwconfig/objects/translateObjects.h
diff --git a/bsp_linux_board/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
similarity index 100%
rename from bsp_linux_board/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
rename to linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
diff --git a/bsp_linux_board/fsfwconfig/pollingsequence/pollingSequenceFactory.h b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h
similarity index 100%
rename from bsp_linux_board/fsfwconfig/pollingsequence/pollingSequenceFactory.h
rename to linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h
diff --git a/bsp_linux_board/fsfwconfig/returnvalues/classIds.h b/linux/fsfwconfig/returnvalues/classIds.h
similarity index 100%
rename from bsp_linux_board/fsfwconfig/returnvalues/classIds.h
rename to linux/fsfwconfig/returnvalues/classIds.h