diff --git a/defaultcfg/config/FSFWConfig.h b/defaultcfg/fsfwconfig/FSFWConfig.h
similarity index 98%
rename from defaultcfg/config/FSFWConfig.h
rename to defaultcfg/fsfwconfig/FSFWConfig.h
index ea86152c..be3717b4 100644
--- a/defaultcfg/config/FSFWConfig.h
+++ b/defaultcfg/fsfwconfig/FSFWConfig.h
@@ -3,6 +3,7 @@
 
 #include <FSFWVersion.h>
 #include <cstddef>
+#include <cstdint>
 
 //! Used to determine whether C++ ostreams are used
 //! Those can lead to code bloat.
diff --git a/defaultcfg/config/OBSWConfig.h b/defaultcfg/fsfwconfig/OBSWConfig.h
similarity index 100%
rename from defaultcfg/config/OBSWConfig.h
rename to defaultcfg/fsfwconfig/OBSWConfig.h
diff --git a/defaultcfg/config/OBSWVersion.h b/defaultcfg/fsfwconfig/OBSWVersion.h
similarity index 100%
rename from defaultcfg/config/OBSWVersion.h
rename to defaultcfg/fsfwconfig/OBSWVersion.h
diff --git a/defaultcfg/config/devices/logicalAddresses.cpp b/defaultcfg/fsfwconfig/devices/logicalAddresses.cpp
similarity index 100%
rename from defaultcfg/config/devices/logicalAddresses.cpp
rename to defaultcfg/fsfwconfig/devices/logicalAddresses.cpp
diff --git a/defaultcfg/config/devices/logicalAddresses.h b/defaultcfg/fsfwconfig/devices/logicalAddresses.h
similarity index 89%
rename from defaultcfg/config/devices/logicalAddresses.h
rename to defaultcfg/fsfwconfig/devices/logicalAddresses.h
index 174fa788..e0827ba3 100644
--- a/defaultcfg/config/devices/logicalAddresses.h
+++ b/defaultcfg/fsfwconfig/devices/logicalAddresses.h
@@ -1,8 +1,8 @@
 #ifndef CONFIG_DEVICES_LOGICALADDRESSES_H_
 #define CONFIG_DEVICES_LOGICALADDRESSES_H_
 
-#include <config/objects/systemObjectList.h>
 #include <fsfw/devicehandlers/CookieIF.h>
+#include "../objects/systemObjectList.h"
 #include <cstdint>
 
 /**
diff --git a/defaultcfg/config/devices/powerSwitcherList.cpp b/defaultcfg/fsfwconfig/devices/powerSwitcherList.cpp
similarity index 100%
rename from defaultcfg/config/devices/powerSwitcherList.cpp
rename to defaultcfg/fsfwconfig/devices/powerSwitcherList.cpp
diff --git a/defaultcfg/config/devices/powerSwitcherList.h b/defaultcfg/fsfwconfig/devices/powerSwitcherList.h
similarity index 100%
rename from defaultcfg/config/devices/powerSwitcherList.h
rename to defaultcfg/fsfwconfig/devices/powerSwitcherList.h
diff --git a/defaultcfg/config/events/subsystemIdRanges.h b/defaultcfg/fsfwconfig/events/subsystemIdRanges.h
similarity index 100%
rename from defaultcfg/config/events/subsystemIdRanges.h
rename to defaultcfg/fsfwconfig/events/subsystemIdRanges.h
diff --git a/defaultcfg/config/config.mk b/defaultcfg/fsfwconfig/fsfwconfig.mk
similarity index 100%
rename from defaultcfg/config/config.mk
rename to defaultcfg/fsfwconfig/fsfwconfig.mk
diff --git a/defaultcfg/config/ipc/missionMessageTypes.cpp b/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
similarity index 79%
rename from defaultcfg/config/ipc/missionMessageTypes.cpp
rename to defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
index e2edbf9c..b41b87ba 100644
--- a/defaultcfg/config/ipc/missionMessageTypes.cpp
+++ b/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
@@ -1,4 +1,5 @@
-#include <config/ipc/MissionMessageTypes.h>
+#include "missionMessageTypes.h"
+
 #include <fsfw/ipc/CommandMessageIF.h>
 
 void messagetypes::clearMissionMessage(CommandMessage* message) {
diff --git a/defaultcfg/config/ipc/missionMessageTypes.h b/defaultcfg/fsfwconfig/ipc/missionMessageTypes.h
similarity index 100%
rename from defaultcfg/config/ipc/missionMessageTypes.h
rename to defaultcfg/fsfwconfig/ipc/missionMessageTypes.h
diff --git a/defaultcfg/config/objects/Factory.cpp b/defaultcfg/fsfwconfig/objects/Factory.cpp
similarity index 75%
rename from defaultcfg/config/objects/Factory.cpp
rename to defaultcfg/fsfwconfig/objects/Factory.cpp
index 51dd6130..41333b1c 100644
--- a/defaultcfg/config/objects/Factory.cpp
+++ b/defaultcfg/fsfwconfig/objects/Factory.cpp
@@ -11,6 +11,7 @@
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
+#include <internalError/InternalErrorReporter.h>
 
 #include <cstdint>
 
@@ -31,15 +32,15 @@ void Factory::produce(void) {
 	setStaticFrameworkObjectIds();
 	new EventManager(objects::EVENT_MANAGER);
 	new HealthTable(objects::HEALTH_TABLE);
-	//new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
+	new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
 }
 
 void Factory::setStaticFrameworkObjectIds() {
-	PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
-	PusServiceBase::packetDestination = objects::TM_FUNNEL;
+	PusServiceBase::packetSource = objects::NO_OBJECT;
+	PusServiceBase::packetDestination = objects::NO_OBJECT;
 
-	CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
-	CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
+	CommandingServiceBase::defaultPacketSource = objects::NO_OBJECT;
+	CommandingServiceBase::defaultPacketDestination = objects::NO_OBJECT;
 
 	VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
 
@@ -48,7 +49,6 @@ void Factory::setStaticFrameworkObjectIds() {
 
 	DeviceHandlerFailureIsolation::powerConfirmationId = objects::NO_OBJECT;
 
-	TmPacketStored::timeStamperId = objects::PUS_TIME;
-	//TmFunnel::downlinkDestination = objects::NO_OBJECT;
+	TmPacketStored::timeStamperId = objects::NO_OBJECT;
 }
 
diff --git a/defaultcfg/config/objects/Factory.h b/defaultcfg/fsfwconfig/objects/Factory.h
similarity index 100%
rename from defaultcfg/config/objects/Factory.h
rename to defaultcfg/fsfwconfig/objects/Factory.h
diff --git a/defaultcfg/config/objects/systemObjectList.h b/defaultcfg/fsfwconfig/objects/systemObjectList.h
similarity index 100%
rename from defaultcfg/config/objects/systemObjectList.h
rename to defaultcfg/fsfwconfig/objects/systemObjectList.h
diff --git a/defaultcfg/config/pollingsequence/PollingSequenceFactory.cpp b/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp
similarity index 100%
rename from defaultcfg/config/pollingsequence/PollingSequenceFactory.cpp
rename to defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp
diff --git a/defaultcfg/config/pollingsequence/PollingSequenceFactory.h b/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h
similarity index 100%
rename from defaultcfg/config/pollingsequence/PollingSequenceFactory.h
rename to defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h
diff --git a/defaultcfg/config/returnvalues/classIds.h b/defaultcfg/fsfwconfig/returnvalues/classIds.h
similarity index 100%
rename from defaultcfg/config/returnvalues/classIds.h
rename to defaultcfg/fsfwconfig/returnvalues/classIds.h
diff --git a/defaultcfg/config/tmtc/apid.h b/defaultcfg/fsfwconfig/tmtc/apid.h
similarity index 100%
rename from defaultcfg/config/tmtc/apid.h
rename to defaultcfg/fsfwconfig/tmtc/apid.h
diff --git a/defaultcfg/config/tmtc/pusIds.h b/defaultcfg/fsfwconfig/tmtc/pusIds.h
similarity index 100%
rename from defaultcfg/config/tmtc/pusIds.h
rename to defaultcfg/fsfwconfig/tmtc/pusIds.h