diff --git a/Makefile-Hosted b/Makefile-Hosted
index bb56fec5..9dff3677 100644
--- a/Makefile-Hosted
+++ b/Makefile-Hosted
@@ -15,7 +15,7 @@ CUSTOM_DEFINES :=
 
 # Chip & board used for compilation
 # (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
-BOARD_FILE_ROOT = hosted
+BOARD_FILE_ROOT = bsp_hosted
 BOARD = host
 OS_FSFW = host
 CUSTOM_DEFINES += -D$(OS_FSFW) 
diff --git a/hosted/InitMission.cpp b/bsp_hosted/InitMission.cpp
similarity index 100%
rename from hosted/InitMission.cpp
rename to bsp_hosted/InitMission.cpp
diff --git a/hosted/InitMission.h b/bsp_hosted/InitMission.h
similarity index 100%
rename from hosted/InitMission.h
rename to bsp_hosted/InitMission.h
diff --git a/hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
similarity index 100%
rename from hosted/ObjectFactory.cpp
rename to bsp_hosted/ObjectFactory.cpp
index 09c69082..798fa7ec 100644
--- a/hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -1,7 +1,7 @@
 #include "ObjectFactory.h"
 
-#include <objects/systemObjectList.h>
 #include <OBSWConfig.h>
+#include <objects/systemObjectList.h>
 #include <tmtc/apid.h>
 #include <tmtc/pusIds.h>
 
diff --git a/hosted/ObjectFactory.h b/bsp_hosted/ObjectFactory.h
similarity index 100%
rename from hosted/ObjectFactory.h
rename to bsp_hosted/ObjectFactory.h
diff --git a/hosted/boardconfig/etl_profile.h b/bsp_hosted/boardconfig/etl_profile.h
similarity index 100%
rename from hosted/boardconfig/etl_profile.h
rename to bsp_hosted/boardconfig/etl_profile.h
diff --git a/hosted/boardconfig/gcov.h b/bsp_hosted/boardconfig/gcov.h
similarity index 100%
rename from hosted/boardconfig/gcov.h
rename to bsp_hosted/boardconfig/gcov.h
diff --git a/hosted/boardconfig/print.c b/bsp_hosted/boardconfig/print.c
similarity index 99%
rename from hosted/boardconfig/print.c
rename to bsp_hosted/boardconfig/print.c
index f409ee1b..f35f9447 100644
--- a/hosted/boardconfig/print.c
+++ b/bsp_hosted/boardconfig/print.c
@@ -1,4 +1,5 @@
 #include "print.h"
+
 #include <stdio.h>
 
 void printChar(const char* character, bool errStream) {
diff --git a/bsp_hosted/boardconfig/print.h b/bsp_hosted/boardconfig/print.h
new file mode 100644
index 00000000..84798490
--- /dev/null
+++ b/bsp_hosted/boardconfig/print.h
@@ -0,0 +1,8 @@
+#ifndef BSP_HOSTED_BOARDCONFIG_PRINT_H_
+#define BSP_HOSTED_BOARDCONFIG_PRINT_H_
+
+#include <stdbool.h>
+
+void printChar(const char* character, bool errStream);
+
+#endif /* BSP_HOSTED_BOARDCONFIG_PRINT_H_ */
diff --git a/hosted/hosted.mk b/bsp_hosted/bsp_hosted.mk
similarity index 76%
rename from hosted/hosted.mk
rename to bsp_hosted/bsp_hosted.mk
index 8bd29bc1..9595ffbf 100644
--- a/hosted/hosted.mk
+++ b/bsp_hosted/bsp_hosted.mk
@@ -7,4 +7,5 @@ CSRC += $(wildcard $(CURRENTPATH)/boardconfig/*.c)
 CXXSRC += $(wildcard $(CURRENTPATH)/comIF/*.cpp)
 CSRC += $(wildcard $(CURRENTPATH)/comIF/*.c)
 
-INCLUDES += $(CURRENTPATH)/boardconfig
\ No newline at end of file
+INCLUDES += $(CURRENTPATH)/boardconfig
+INCLUDES += $(CURRENTPATH)/fsfwconfig
\ No newline at end of file
diff --git a/hosted/comIF/ArduinoComIF.cpp b/bsp_hosted/comIF/ArduinoComIF.cpp
similarity index 99%
rename from hosted/comIF/ArduinoComIF.cpp
rename to bsp_hosted/comIF/ArduinoComIF.cpp
index 11555f55..047a60ae 100644
--- a/hosted/comIF/ArduinoComIF.cpp
+++ b/bsp_hosted/comIF/ArduinoComIF.cpp
@@ -1,6 +1,5 @@
-#include "ArduinoComIF.h"
-#include "ArduinoCookie.h"
-
+#include <bsp_hosted/comIF/ArduinoComIF.h>
+#include <bsp_hosted/comIF/ArduinoCookie.h>
 #include <fsfw/globalfunctions/DleEncoder.h>
 #include <fsfw/globalfunctions/CRC.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
diff --git a/hosted/comIF/ArduinoComIF.h b/bsp_hosted/comIF/ArduinoComIF.h
similarity index 100%
rename from hosted/comIF/ArduinoComIF.h
rename to bsp_hosted/comIF/ArduinoComIF.h
diff --git a/hosted/comIF/ArduinoCookie.cpp b/bsp_hosted/comIF/ArduinoCookie.cpp
similarity index 83%
rename from hosted/comIF/ArduinoCookie.cpp
rename to bsp_hosted/comIF/ArduinoCookie.cpp
index 7d9a9f3c..bc698720 100644
--- a/hosted/comIF/ArduinoCookie.cpp
+++ b/bsp_hosted/comIF/ArduinoCookie.cpp
@@ -1,4 +1,4 @@
-#include "ArduinoCookie.h"
+#include <bsp_hosted/comIF/ArduinoCookie.h>
 
 ArduinoCookie::ArduinoCookie(Protocol_t protocol, uint8_t address,
 		const size_t maxReplySize) :
diff --git a/hosted/comIF/ArduinoCookie.h b/bsp_hosted/comIF/ArduinoCookie.h
similarity index 100%
rename from hosted/comIF/ArduinoCookie.h
rename to bsp_hosted/comIF/ArduinoCookie.h
diff --git a/hosted/fsfwconfig/FSFWConfig.h b/bsp_hosted/fsfwconfig/FSFWConfig.h
similarity index 100%
rename from hosted/fsfwconfig/FSFWConfig.h
rename to bsp_hosted/fsfwconfig/FSFWConfig.h
diff --git a/hosted/fsfwconfig/OBSWConfig.h b/bsp_hosted/fsfwconfig/OBSWConfig.h
similarity index 100%
rename from hosted/fsfwconfig/OBSWConfig.h
rename to bsp_hosted/fsfwconfig/OBSWConfig.h
diff --git a/hosted/fsfwconfig/OBSWVersion.h b/bsp_hosted/fsfwconfig/OBSWVersion.h
similarity index 100%
rename from hosted/fsfwconfig/OBSWVersion.h
rename to bsp_hosted/fsfwconfig/OBSWVersion.h
diff --git a/hosted/fsfwconfig/events/subsystemIdRanges.h b/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h
similarity index 100%
rename from hosted/fsfwconfig/events/subsystemIdRanges.h
rename to bsp_hosted/fsfwconfig/events/subsystemIdRanges.h
diff --git a/hosted/fsfwconfig/fsfwconfig.mk b/bsp_hosted/fsfwconfig/fsfwconfig.mk
similarity index 100%
rename from hosted/fsfwconfig/fsfwconfig.mk
rename to bsp_hosted/fsfwconfig/fsfwconfig.mk
diff --git a/hosted/fsfwconfig/ipc/MissionMessageTypes.cpp b/bsp_hosted/fsfwconfig/ipc/MissionMessageTypes.cpp
similarity index 75%
rename from hosted/fsfwconfig/ipc/MissionMessageTypes.cpp
rename to bsp_hosted/fsfwconfig/ipc/MissionMessageTypes.cpp
index b91abcd3..36ef1b73 100644
--- a/hosted/fsfwconfig/ipc/MissionMessageTypes.cpp
+++ b/bsp_hosted/fsfwconfig/ipc/MissionMessageTypes.cpp
@@ -1,5 +1,5 @@
+#include "MissionMessageTypes.h"
 #include <fsfw/ipc/CommandMessage.h>
-#include <hosted/fsfwconfig/ipc/MissionMessageTypes.h>
 
 void messagetypes::clearMissionMessage(CommandMessage* message) {
 	switch(message->getMessageType()) {
diff --git a/hosted/fsfwconfig/ipc/MissionMessageTypes.h b/bsp_hosted/fsfwconfig/ipc/MissionMessageTypes.h
similarity index 100%
rename from hosted/fsfwconfig/ipc/MissionMessageTypes.h
rename to bsp_hosted/fsfwconfig/ipc/MissionMessageTypes.h
diff --git a/hosted/fsfwconfig/returnvalues/classIds.h b/bsp_hosted/fsfwconfig/returnvalues/classIds.h
similarity index 100%
rename from hosted/fsfwconfig/returnvalues/classIds.h
rename to bsp_hosted/fsfwconfig/returnvalues/classIds.h
diff --git a/hosted/main.cpp b/bsp_hosted/main.cpp
similarity index 95%
rename from hosted/main.cpp
rename to bsp_hosted/main.cpp
index e5ca6d02..50d1e7f2 100644
--- a/hosted/main.cpp
+++ b/bsp_hosted/main.cpp
@@ -1,7 +1,6 @@
+#include <bsp_hosted/fsfwconfig/OBSWVersion.h>
 #include <bsp_linux/InitMission.h>
 #include <fsfw/tasks/TaskFactory.h>
-#include <hosted/fsfwconfig/OBSWVersion.h>
-
 #include <iostream>
 
 #ifdef WIN32
diff --git a/fsfw b/fsfw
index ca34250e..81c00cd3 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit ca34250e8d74cec8a75bed284bf0ec9252019b65
+Subproject commit 81c00cd3dcdabf57142d488dd348e0cd335f55a8
diff --git a/hosted/boardconfig/print.h b/hosted/boardconfig/print.h
deleted file mode 100644
index 8e7e2e5d..00000000
--- a/hosted/boardconfig/print.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HOSTED_BOARDCONFIG_PRINT_H_
-#define HOSTED_BOARDCONFIG_PRINT_H_
-
-#include <stdbool.h>
-
-void printChar(const char* character, bool errStream);
-
-#endif /* HOSTED_BOARDCONFIG_PRINT_H_ */