diff --git a/defaultcfg/config/FSFWConfig.h b/defaultcfg/fsfwconfig/FSFWConfig.h
similarity index 100%
rename from defaultcfg/config/FSFWConfig.h
rename to defaultcfg/fsfwconfig/FSFWConfig.h
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/config.mk b/defaultcfg/fsfwconfig/config.mk
similarity index 100%
rename from defaultcfg/config/config.mk
rename to defaultcfg/fsfwconfig/config.mk
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 100%
rename from defaultcfg/config/devices/logicalAddresses.h
rename to defaultcfg/fsfwconfig/devices/logicalAddresses.h
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/ipc/missionMessageTypes.cpp b/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
similarity index 100%
rename from defaultcfg/config/ipc/missionMessageTypes.cpp
rename to defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
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 100%
rename from defaultcfg/config/objects/Factory.cpp
rename to defaultcfg/fsfwconfig/objects/Factory.cpp
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/objects/translateObjects.cpp b/defaultcfg/fsfwconfig/objects/translateObjects.cpp
similarity index 100%
rename from defaultcfg/config/objects/translateObjects.cpp
rename to defaultcfg/fsfwconfig/objects/translateObjects.cpp
diff --git a/defaultcfg/config/objects/translateObjects.h b/defaultcfg/fsfwconfig/objects/translateObjects.h
similarity index 100%
rename from defaultcfg/config/objects/translateObjects.h
rename to defaultcfg/fsfwconfig/objects/translateObjects.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