diff --git a/bsp_hosted/core/InitMission.cpp b/bsp_hosted/core/InitMission.cpp
index f359404..9dc4f31 100644
--- a/bsp_hosted/core/InitMission.cpp
+++ b/bsp_hosted/core/InitMission.cpp
@@ -3,16 +3,17 @@
 #include <bsp_hosted/core/InitMission.h>
 #include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
 #include <bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.h>
+#include "example/utility/TaskCreation.h"
+
+#include "fsfw_tests/integration/assemblies/TestAssembly.h"
+
 #include <fsfw/modes/HasModesIF.h>
-
-#include <mission/utility/TaskCreation.h>
-
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 #include <fsfw/tasks/PeriodicTaskIF.h>
 #include <fsfw/tasks/TaskFactory.h>
-#include <mission/assemblies/TestAssembly.h>
+
 
 #ifdef _WIN32
 #include <fsfw/osal/windows/winTaskHelpers.h>
diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index 321c80b..4af03fe 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -4,10 +4,10 @@
 #include <bsp_hosted/fsfwconfig/tmtc/apid.h>
 #include <bsp_hosted/fsfwconfig/tmtc/pusIds.h>
 
-#include <test/TestTask.h>
+#include "fsfw_tests/integration/task/TestTask.h"
 
-#include <mission/utility/TmFunnel.h>
-#include <mission/core/GenericFactory.h>
+#include "example/utility/TmFunnel.h"
+#include "example/core/GenericFactory.h"
 
 #include <fsfw/monitoring/MonitoringMessageContent.h>
 #include <fsfw/storagemanager/PoolManager.h>
diff --git a/bsp_hosted/main.cpp b/bsp_hosted/main.cpp
index 9ddc77e..7440204 100644
--- a/bsp_hosted/main.cpp
+++ b/bsp_hosted/main.cpp
@@ -1,9 +1,8 @@
 #include <bsp_hosted/core/InitMission.h>
 #include <bsp_hosted/core/ObjectFactory.h>
 
-#include <test/MutexExample.h>
-#include <utility/utility.h>
-#include <mission/utility/PusPacketCreator.h>
+#include "example/test/MutexExample.h"
+#include "example/utility/utility.h"
 
 #include <fsfw/platform.h>
 #include <fsfw/objectmanager/ObjectManager.h>
@@ -58,7 +57,7 @@ int main() {
 	InitMission::createTasks();
 
 	MutexExample::example();
-	PusPacketCreator::createPusPacketAndPrint();
+	//PusPacketCreator::createPusPacketAndPrint();
 
 	/* Permanent loop. */
 	for(;;) {
diff --git a/example_common b/example_common
index 127a0f6..349ada8 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 127a0f6e16ac33f3e2af03a0a5e050ecc02a90cf
+Subproject commit 349ada87f1d32aa36a5a1b12f3baa1b03006dbfe
diff --git a/fsfw b/fsfw
index f8e9042..6e97bd4 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit f8e90429438a857b518ae46364bdba08ef5464b4
+Subproject commit 6e97bd4db4a51db75c6b5f4fc8998dcc3a731191