diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6acd9770..5ff66a6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,6 @@ option(FSFW_ADD_INTERNAL_TESTS "Add internal unit tests" ON)
 option(FSFW_ADD_UNITTESTS "Add regular unittests. Requires Catch2" OFF)
 option(FSFW_ADD_HAL "Add Hardware Abstraction Layer" ON)
 
-if(FSFW_ADD_UNITTESTS)
-    option(FSFW_CUSTOM_UNITTEST_RUNNER "Add FSFW custom main runner" ON)
-endif()
-
 # Optional sources
 option(FSFW_ADD_PUS "Compile with PUS sources" ON)
 option(FSFW_ADD_MONITORING "Compile with monitoring components" ON)
@@ -190,4 +186,4 @@ target_compile_options(${LIB_FSFW_NAME} PRIVATE
 
 target_link_libraries(${LIB_FSFW_NAME} PRIVATE
     ${FSFW_ADDITIONAL_LINK_LIBS}
-)
+)
\ No newline at end of file
diff --git a/hal/src/fsfw_hal/linux/CMakeLists.txt b/hal/src/fsfw_hal/linux/CMakeLists.txt
index 5944b0e5..0ec77524 100644
--- a/hal/src/fsfw_hal/linux/CMakeLists.txt
+++ b/hal/src/fsfw_hal/linux/CMakeLists.txt
@@ -4,6 +4,7 @@ endif()
 
 target_sources(${LIB_FSFW_NAME} PRIVATE
 	UnixFileGuard.cpp
+	CommandExecutor.cpp
 	utility.cpp
 )
 
diff --git a/src/fsfw/osal/linux/CommandExecutor.cpp b/hal/src/fsfw_hal/linux/CommandExecutor.cpp
similarity index 100%
rename from src/fsfw/osal/linux/CommandExecutor.cpp
rename to hal/src/fsfw_hal/linux/CommandExecutor.cpp
diff --git a/src/fsfw/osal/linux/CommandExecutor.h b/hal/src/fsfw_hal/linux/CommandExecutor.h
similarity index 100%
rename from src/fsfw/osal/linux/CommandExecutor.h
rename to hal/src/fsfw_hal/linux/CommandExecutor.h
diff --git a/src/fsfw/osal/linux/CMakeLists.txt b/src/fsfw/osal/linux/CMakeLists.txt
index 63206cb2..679b2931 100644
--- a/src/fsfw/osal/linux/CMakeLists.txt
+++ b/src/fsfw/osal/linux/CMakeLists.txt
@@ -1,31 +1,29 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		Clock.cpp
-		BinarySemaphore.cpp
-		CountingSemaphore.cpp
-		FixedTimeslotTask.cpp
-		InternalErrorCodes.cpp
-		MessageQueue.cpp
-		Mutex.cpp
-		MutexFactory.cpp
-		PeriodicPosixTask.cpp
-		PosixThread.cpp
-		QueueFactory.cpp
-		SemaphoreFactory.cpp
-		TaskFactory.cpp
-		tcpipHelpers.cpp
-		unixUtility.cpp
-		CommandExecutor.cpp
+target_sources(${LIB_FSFW_NAME} PRIVATE
+    Clock.cpp
+    BinarySemaphore.cpp
+    CountingSemaphore.cpp
+    FixedTimeslotTask.cpp
+    InternalErrorCodes.cpp
+    MessageQueue.cpp
+    Mutex.cpp
+    MutexFactory.cpp
+    PeriodicPosixTask.cpp
+    PosixThread.cpp
+    QueueFactory.cpp
+    SemaphoreFactory.cpp
+    TaskFactory.cpp
+    tcpipHelpers.cpp
+    unixUtility.cpp
 )
 
 find_package(Threads REQUIRED)
 
 target_link_libraries(${LIB_FSFW_NAME} PRIVATE
-	${CMAKE_THREAD_LIBS_INIT}
-	rt
+    ${CMAKE_THREAD_LIBS_INIT}
+    rt
 )
 
 target_link_libraries(${LIB_FSFW_NAME} INTERFACE
-	${CMAKE_THREAD_LIBS_INIT}
+    ${CMAKE_THREAD_LIBS_INIT}
 )