diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index a977c91b..89a6f375 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -37,7 +37,7 @@
 #include <mission/devices/devicedefinitions/RadSensorDefinitions.h>
 #include <mission/devices/devicedefinitions/Max31865Definitions.h>
 #include <mission/utility/TmFunnel.h>
-#include <mission/obc/CCSDSIPCoreBridge.h>
+#include <linux/obc/CCSDSIPCoreBridge.h>
 
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "fsfw_hal/linux/uart/UartCookie.h"
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index 8314ee97..79891a84 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -2,4 +2,5 @@ add_subdirectory(csp)
 add_subdirectory(utility)
 add_subdirectory(boardtest)
 add_subdirectory(devices)
-add_subdirectory(fsfwconfig)
\ No newline at end of file
+add_subdirectory(fsfwconfig)
+add_subdirectory(obc)
\ No newline at end of file
diff --git a/linux/fsfwconfig/FSFWConfig.h.in b/linux/fsfwconfig/FSFWConfig.h.in
index 539b0073..8ec01cb9 100644
--- a/linux/fsfwconfig/FSFWConfig.h.in
+++ b/linux/fsfwconfig/FSFWConfig.h.in
@@ -68,6 +68,6 @@ static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6;
 static constexpr size_t FSFW_PRINT_BUFFER_SIZE = 124;
 }
 
-#define FSFW_HAL_LINUX_SPI_WIRETAPPING  1
+#define FSFW_HAL_LINUX_SPI_WIRETAPPING  0
 
 #endif /* CONFIG_FSFWCONFIG_H_ */
diff --git a/mission/obc/CCSDSIPCoreBridge.cpp b/linux/obc/CCSDSIPCoreBridge.cpp
similarity index 98%
rename from mission/obc/CCSDSIPCoreBridge.cpp
rename to linux/obc/CCSDSIPCoreBridge.cpp
index 0dc5ffa2..2678e76f 100644
--- a/mission/obc/CCSDSIPCoreBridge.cpp
+++ b/linux/obc/CCSDSIPCoreBridge.cpp
@@ -1,7 +1,7 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 
-#include <mission/obc/CCSDSIPCoreBridge.h>
+#include <linux/obc/CCSDSIPCoreBridge.h>
 
 CCSDSIPCoreBridge::CCSDSIPCoreBridge(object_id_t objectId, object_id_t tcDestination,
         object_id_t tmStoreId, object_id_t tcStoreId, LinuxLibgpioIF* gpioComIF,
diff --git a/mission/obc/CCSDSIPCoreBridge.h b/linux/obc/CCSDSIPCoreBridge.h
similarity index 100%
rename from mission/obc/CCSDSIPCoreBridge.h
rename to linux/obc/CCSDSIPCoreBridge.h
diff --git a/mission/obc/CMakeLists.txt b/linux/obc/CMakeLists.txt
similarity index 100%
rename from mission/obc/CMakeLists.txt
rename to linux/obc/CMakeLists.txt
diff --git a/mission/CMakeLists.txt b/mission/CMakeLists.txt
index 8a18094c..9cb18749 100644
--- a/mission/CMakeLists.txt
+++ b/mission/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_subdirectory(core)
 add_subdirectory(devices)
-add_subdirectory(obc)
 add_subdirectory(utility)