diff --git a/Makefile b/Makefile
index 2ebeea0dfe..48a490615c 100644
--- a/Makefile
+++ b/Makefile
@@ -471,10 +471,10 @@ COMMON_SRC = \
             common/printf.c \
             common/typeconversion.c \
             common/streambuf.c \
-            config/config.c \
             config/feature.c \
             config/config_eeprom.c \
             config/parameter_group.c \
+            fc/config.c \
             fc/runtime_config.c \
             drivers/logging.c \
             drivers/adc.c \
diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index 14f4c52469..f7991cda40 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -49,6 +49,7 @@
 #include "sensors/gyro.h"
 #include "sensors/battery.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
@@ -73,7 +74,6 @@
 #include "flight/imu.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/blackbox/blackbox_io.c b/src/main/blackbox/blackbox_io.c
index a3f5fff81a..60e79cb530 100644
--- a/src/main/blackbox/blackbox_io.c
+++ b/src/main/blackbox/blackbox_io.c
@@ -76,8 +76,9 @@
 #include "flight/imu.h"
 #include "flight/navigation_rewrite.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "config/config.h"
+
 #include "config/config_profile.h"
 #include "config/config_master.h"
 
diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index fc3aaed6cf..f4f6d3adf7 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -44,7 +44,7 @@
 
 #include "drivers/system.h"
 
-#include "config/config.h"
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c
index 9fb92b323d..eb4efaa1f9 100644
--- a/src/main/cms/cms_menu_blackbox.c
+++ b/src/main/cms/cms_menu_blackbox.c
@@ -43,10 +43,11 @@
 #include "flight/pid.h"
 #include "flight/mixer.h"
 #include "flight/servos.h"
+
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/cms/cms_menu_imu.c b/src/main/cms/cms_menu_imu.c
index ba6604c6d8..adadfa6fa6 100644
--- a/src/main/cms/cms_menu_imu.c
+++ b/src/main/cms/cms_menu_imu.c
@@ -40,10 +40,11 @@
 #include "flight/pid.h"
 #include "flight/mixer.h"
 #include "flight/servos.h"
+
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/cms/cms_menu_ledstrip.c b/src/main/cms/cms_menu_ledstrip.c
index 2fb552f264..508f75b266 100644
--- a/src/main/cms/cms_menu_ledstrip.c
+++ b/src/main/cms/cms_menu_ledstrip.c
@@ -31,10 +31,11 @@
 #include "flight/pid.h"
 #include "flight/mixer.h"
 #include "flight/servos.h"
+
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/cms/cms_menu_misc.c b/src/main/cms/cms_menu_misc.c
index 0aa0090b25..c63cb6c1fe 100644
--- a/src/main/cms/cms_menu_misc.c
+++ b/src/main/cms/cms_menu_misc.c
@@ -31,10 +31,11 @@
 #include "flight/pid.h"
 #include "flight/mixer.h"
 #include "flight/servos.h"
+
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c
index 9861c19970..82b951c198 100644
--- a/src/main/cms/cms_menu_osd.c
+++ b/src/main/cms/cms_menu_osd.c
@@ -32,10 +32,11 @@
 #include "flight/pid.h"
 #include "flight/mixer.h"
 #include "flight/servos.h"
+
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/config/config_eeprom.c b/src/main/config/config_eeprom.c
index 8801c38710..1cdbcb658a 100755
--- a/src/main/config/config_eeprom.c
+++ b/src/main/config/config_eeprom.c
@@ -43,8 +43,11 @@
 #include "io/gimbal.h"
 #include "io/motors.h"
 #include "io/servos.h"
+
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
+
 #include "io/ledstrip.h"
 #include "io/gps.h"
 
@@ -58,7 +61,6 @@
 #include "flight/failsafe.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_eeprom.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
diff --git a/src/main/config/config_master.h b/src/main/config/config_master.h
index 2148ffae43..4eca7baa5a 100644
--- a/src/main/config/config_master.h
+++ b/src/main/config/config_master.h
@@ -27,11 +27,14 @@
 #include "common/color.h"
 #include "common/maths.h"
 
+#include "config/config_profile.h"
+
 #include "drivers/sensor.h"
 #include "drivers/accgyro.h"
 #include "drivers/pwm_rx.h"
 #include "drivers/serial.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 
 #include "flight/failsafe.h"
@@ -62,9 +65,6 @@
 
 #include "telemetry/telemetry.h"
 
-#include "config/config.h"
-#include "config/config_profile.h"
-
 #define motorConfig(x) (&masterConfig.motorConfig)
 #define flight3DConfig(x) (&masterConfig.flight3DConfig)
 #define servoConfig(x) (&masterConfig.servoConfig)
diff --git a/src/main/config/parameter_group.c b/src/main/config/parameter_group.c
index 38d19962e9..2711639cc1 100644
--- a/src/main/config/parameter_group.c
+++ b/src/main/config/parameter_group.c
@@ -32,16 +32,6 @@ const pgRegistry_t* pgFind(pgn_t pgn)
     return NULL;
 }
 
-const pgRegistry_t* pgMatcher(pgMatcherFuncPtr matcher, const void *criteria)
-{
-    PG_FOREACH(candidate) {
-        if (matcher(candidate, criteria)) {
-            return candidate;
-        }
-    }
-    return NULL;
-}
-
 static uint8_t *pgOffset(const pgRegistry_t* reg, uint8_t profileIndex)
 {
     const uint16_t regSize = pgSize(reg);
@@ -58,7 +48,7 @@ static void pgResetInstance(const pgRegistry_t *reg, uint8_t *base)
     const uint16_t regSize = pgSize(reg);
 
     memset(base, 0, regSize);
-    if(reg->reset.ptr >= (void*)__pg_resetdata_start && reg->reset.ptr < (void*)__pg_resetdata_end) {
+    if (reg->reset.ptr >= (void*)__pg_resetdata_start && reg->reset.ptr < (void*)__pg_resetdata_end) {
         // pointer points to resetdata section, to it is data template
         memcpy(base, reg->reset.ptr, regSize);
     } else if (reg->reset.fn) {
@@ -67,21 +57,38 @@ static void pgResetInstance(const pgRegistry_t *reg, uint8_t *base)
     }
 }
 
+void pgReset(const pgRegistry_t* reg, int profileIndex)
+{
+    pgResetInstance(reg, pgOffset(reg, profileIndex));
+}
+
 void pgResetCurrent(const pgRegistry_t *reg)
 {
-    if(pgIsSystem(reg)) {
+    if (pgIsSystem(reg)) {
         pgResetInstance(reg, reg->address);
     } else {
         pgResetInstance(reg, *reg->ptr);
     }
 }
 
-void pgLoad(const pgRegistry_t* reg, const void *from, int size, uint8_t profileIndex)
+bool pgResetCopy(void *copy, pgn_t pgn)
 {
-    pgResetInstance(reg,pgOffset(reg, profileIndex));
+    const pgRegistry_t *reg = pgFind(pgn);
+    if (reg) {
+        pgResetInstance(reg, copy);
+        return true;
+    }
+    return false;
+}
 
-    const int take = MIN(size, pgSize(reg));
-    memcpy(pgOffset(reg, profileIndex), from, take);
+void pgLoad(const pgRegistry_t* reg, int profileIndex, const void *from, int size, int version)
+{
+    pgResetInstance(reg, pgOffset(reg, profileIndex));
+    // restore only matching version, keep defaults otherwise
+    if (version == pgVersion(reg)) {
+        const int take = MIN(size, pgSize(reg));
+        memcpy(pgOffset(reg, profileIndex), from, take);
+    }
 }
 
 int pgStore(const pgRegistry_t* reg, void *to, int size, uint8_t profileIndex)
@@ -92,25 +99,25 @@ int pgStore(const pgRegistry_t* reg, void *to, int size, uint8_t profileIndex)
 }
 
 
-void pgResetAll(uint8_t profileCount)
+void pgResetAll(int profileCount)
 {
     PG_FOREACH(reg) {
         if (pgIsSystem(reg)) {
-            pgResetInstance(reg, reg->address);
+            pgReset(reg, 0);
         } else {
             // reset one instance for each profile
-            for (uint8_t profileIndex = 0; profileIndex < profileCount; profileIndex++) {
-                pgResetInstance(reg, pgOffset(reg, profileIndex));
+            for (int profileIndex = 0; profileIndex < profileCount; profileIndex++) {
+                pgReset(reg, profileIndex);
             }
         }
     }
 }
 
-void pgActivateProfile(uint8_t profileIndexToActivate)
+void pgActivateProfile(int profileIndex)
 {
     PG_FOREACH(reg) {
         if (!pgIsSystem(reg)) {
-            uint8_t *ptr = pgOffset(reg, profileIndexToActivate);
+            uint8_t *ptr = pgOffset(reg, profileIndex);
             *(reg->ptr) = ptr;
         }
     }
diff --git a/src/main/config/parameter_group.h b/src/main/config/parameter_group.h
index ddf3f4bb7b..734933ca9c 100644
--- a/src/main/config/parameter_group.h
+++ b/src/main/config/parameter_group.h
@@ -17,12 +17,15 @@
 
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+
 typedef uint16_t pgn_t;
 
 // parameter group registry flags
 typedef enum {
     PGRF_NONE = 0,
-    PGRF_CLASSIFICATON_BIT = (1 << 0),
+    PGRF_CLASSIFICATON_BIT = (1 << 0)
 } pgRegistryFlags_e;
 
 typedef enum {
@@ -30,7 +33,7 @@ typedef enum {
     PGR_PGN_VERSION_MASK =  0xf000,
     PGR_SIZE_MASK =         0x0fff,
     PGR_SIZE_SYSTEM_FLAG =  0x0000, // documentary
-    PGR_SIZE_PROFILE_FLAG = 0x8000, // start using flags from the top bit down
+    PGR_SIZE_PROFILE_FLAG = 0x8000  // start using flags from the top bit down
 } pgRegistryInternal_e;
 
 // function that resets a single parameter group instance
@@ -167,7 +170,7 @@ extern const uint8_t __pg_resetdata_end[];
     /**/
 
 #if 0
-// ARRAY reset mechanism is not implemented yet, only few places in code would benefit from it.
+// ARRAY reset mechanism is not implemented yet, only few places in code would benefit from it - See pgResetInstance
 #define PG_REGISTER_ARR_WITH_RESET_TEMPLATE(_type, _size, _name, _pgn, _version) \
     extern const _type pgResetTemplate_ ## _name;                       \
     PG_REGISTER_ARR_I(_type, _size, _name, _pgn, _version, .reset = {.ptr = (void*)&pgResetTemplate_ ## _name}) \
@@ -219,12 +222,12 @@ extern const uint8_t __pg_resetdata_end[];
     }                                                                   \
     /**/
 
-typedef uint8_t (*pgMatcherFuncPtr)(const pgRegistry_t *candidate, const void *criteria);
-
 const pgRegistry_t* pgFind(pgn_t pgn);
-const pgRegistry_t* pgMatcher(pgMatcherFuncPtr matcher, const void *criteria);
-void pgLoad(const pgRegistry_t* reg, const void *from, int size, uint8_t profileIndex);
+
+void pgLoad(const pgRegistry_t* reg, int profileIndex, const void *from, int size, int version);
 int pgStore(const pgRegistry_t* reg, void *to, int size, uint8_t profileIndex);
-void pgResetAll(uint8_t profileCount);
-void pgActivateProfile(uint8_t profileIndexToActivate);
+void pgResetAll(int profileCount);
 void pgResetCurrent(const pgRegistry_t *reg);
+bool pgResetCopy(void *copy, pgn_t pgn);
+void pgReset(const pgRegistry_t* reg, int profileIndex);
+void pgActivateProfile(int profileIndex);
diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
index a86e81e700..a73fd00546 100644
--- a/src/main/drivers/pwm_output.c
+++ b/src/main/drivers/pwm_output.c
@@ -29,11 +29,10 @@
 
 #include "io/pwmdriver_i2c.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "config/feature.h"
 
 #if defined(STM32F40_41xxx) // must be multiples of timer clock
 #define ONESHOT125_TIMER_MHZ  12
diff --git a/src/main/config/config.c b/src/main/fc/config.c
similarity index 99%
rename from src/main/config/config.c
rename to src/main/fc/config.c
index a104140bfa..01cd1bd275 100755
--- a/src/main/config/config.c
+++ b/src/main/fc/config.c
@@ -67,9 +67,9 @@
 #include "flight/failsafe.h"
 #include "flight/navigation_rewrite.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/config_eeprom.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
diff --git a/src/main/config/config.h b/src/main/fc/config.h
similarity index 100%
rename from src/main/config/config.h
rename to src/main/fc/config.h
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 545d1bac18..76f1798e3f 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -105,6 +105,8 @@
 
 #include "telemetry/telemetry.h"
 
+#include "fc/config.h"
+
 #include "flight/pid.h"
 #include "flight/imu.h"
 #include "flight/mixer.h"
@@ -112,7 +114,6 @@
 #include "flight/failsafe.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_eeprom.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
index d255c47384..29b72ec4b0 100644
--- a/src/main/fc/fc_msp.c
+++ b/src/main/fc/fc_msp.c
@@ -78,6 +78,8 @@
 
 #include "telemetry/telemetry.h"
 
+#include "fc/config.h"
+
 #include "flight/mixer.h"
 #include "flight/servos.h"
 #include "flight/pid.h"
@@ -86,7 +88,6 @@
 #include "flight/failsafe.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_eeprom.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index 537f4628bd..7bae136b8f 100755
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -33,6 +33,7 @@
 #include "drivers/serial.h"
 #include "drivers/stack_check.h"
 
+#include "fc/config.h"
 #include "fc/fc_msp.h"
 #include "fc/fc_tasks.h"
 #include "fc/mw.h"
@@ -69,7 +70,6 @@
 
 #include "telemetry/telemetry.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
diff --git a/src/main/fc/mw.c b/src/main/fc/mw.c
index 0974b1bf04..cea9e5ad99 100755
--- a/src/main/fc/mw.c
+++ b/src/main/fc/mw.c
@@ -45,6 +45,7 @@
 #include "sensors/gyro.h"
 #include "sensors/battery.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
 #include "fc/runtime_config.h"
@@ -76,7 +77,6 @@
 #include "flight/failsafe.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c
index 262c46bdf9..f868e5c8f0 100644
--- a/src/main/fc/rc_controls.c
+++ b/src/main/fc/rc_controls.c
@@ -29,11 +29,11 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "drivers/system.h"
 
+#include "fc/config.h"
 #include "fc/mw.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c
index 9a9bc73a05..9f86025ea1 100644
--- a/src/main/flight/failsafe.c
+++ b/src/main/flight/failsafe.c
@@ -26,20 +26,20 @@
 
 #include "common/axis.h"
 
-#include "rx/rx.h"
 #include "drivers/system.h"
+
 #include "io/beeper.h"
 #include "io/motors.h"
-#include "fc/rc_controls.h"
 
+#include "fc/config.h"
+#include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
-
 #include "flight/failsafe.h"
-
 #include "flight/navigation_rewrite.h"
 
+#include "rx/rx.h"
+
 /*
  * Usage:
  *
diff --git a/src/main/flight/hil.c b/src/main/flight/hil.c
index 4e01e4d057..540584bbe6 100644
--- a/src/main/flight/hil.c
+++ b/src/main/flight/hil.c
@@ -43,10 +43,9 @@
 #include "flight/navigation_rewrite.h"
 #include "flight/navigation_rewrite_private.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
-
 #ifdef HIL
 
 bool hilActive = false;
diff --git a/src/main/flight/imu.c b/src/main/flight/imu.c
index 4963fc49c9..953ae577ff 100644
--- a/src/main/flight/imu.c
+++ b/src/main/flight/imu.c
@@ -35,6 +35,9 @@
 
 #include "drivers/system.h"
 
+#include "fc/config.h"
+#include "fc/runtime_config.h"
+
 #include "sensors/sensors.h"
 #include "sensors/gyro.h"
 #include "sensors/compass.h"
@@ -47,9 +50,6 @@
 #include "flight/hil.h"
 
 #include "io/gps.h"
-#include "fc/runtime_config.h"
-
-#include "config/config.h"
 
 /**
  * In Cleanflight accelerometer is aligned in the following way:
diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
index df867e5617..42bf04befb 100755
--- a/src/main/flight/mixer.c
+++ b/src/main/flight/mixer.c
@@ -41,6 +41,7 @@
 #include "sensors/acceleration.h"
 #include "sensors/gyro.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
@@ -51,7 +52,6 @@
 #include "flight/imu.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/feature.h"
 
diff --git a/src/main/flight/navigation_rewrite.c b/src/main/flight/navigation_rewrite.c
index f06463ea61..82229a0f8d 100755
--- a/src/main/flight/navigation_rewrite.c
+++ b/src/main/flight/navigation_rewrite.c
@@ -43,8 +43,8 @@
 #include "flight/navigation_rewrite.h"
 #include "flight/navigation_rewrite_private.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "config/config.h"
 
 /*-----------------------------------------------------------
  * Compatibility for home position
diff --git a/src/main/flight/navigation_rewrite_fixedwing.c b/src/main/flight/navigation_rewrite_fixedwing.c
index 0bef7a3f5f..b7753465ef 100755
--- a/src/main/flight/navigation_rewrite_fixedwing.c
+++ b/src/main/flight/navigation_rewrite_fixedwing.c
@@ -41,8 +41,8 @@
 #include "flight/navigation_rewrite.h"
 #include "flight/navigation_rewrite_private.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "config/config.h"
 
 // If we are going slower than NAV_FW_MIN_VEL_SPEED_BOOST - boost throttle to fight against the wind
 #define NAV_FW_THROTTLE_SPEED_BOOST_GAIN        1.5f
diff --git a/src/main/flight/navigation_rewrite_fw_launch.c b/src/main/flight/navigation_rewrite_fw_launch.c
index ae728b237f..17c59f36ca 100755
--- a/src/main/flight/navigation_rewrite_fw_launch.c
+++ b/src/main/flight/navigation_rewrite_fw_launch.c
@@ -49,8 +49,9 @@
 #include "flight/navigation_rewrite.h"
 #include "flight/navigation_rewrite_private.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "config/config.h"
+
 #include "config/feature.h"
 
 
diff --git a/src/main/flight/navigation_rewrite_geo.c b/src/main/flight/navigation_rewrite_geo.c
index af32688587..37f732e777 100755
--- a/src/main/flight/navigation_rewrite_geo.c
+++ b/src/main/flight/navigation_rewrite_geo.c
@@ -38,8 +38,8 @@
 #include "flight/navigation_rewrite.h"
 #include "flight/navigation_rewrite_private.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "config/config.h"
 
 #if defined(NAV_AUTO_MAG_DECLINATION)
 /* Declination calculation code from PX4 project */
diff --git a/src/main/flight/navigation_rewrite_multicopter.c b/src/main/flight/navigation_rewrite_multicopter.c
index 317ec1a317..5c8bab88f7 100755
--- a/src/main/flight/navigation_rewrite_multicopter.c
+++ b/src/main/flight/navigation_rewrite_multicopter.c
@@ -38,6 +38,7 @@
 
 #include "io/motors.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
 #include "fc/runtime_config.h"
@@ -48,8 +49,6 @@
 #include "flight/navigation_rewrite_private.h"
 #include "flight/failsafe.h"
 
-#include "config/config.h"
-
 /*-----------------------------------------------------------
  * Altitude controller for multicopter aircraft
  *-----------------------------------------------------------*/
diff --git a/src/main/flight/navigation_rewrite_pos_estimator.c b/src/main/flight/navigation_rewrite_pos_estimator.c
index 7df74a97d1..7c599e5b47 100755
--- a/src/main/flight/navigation_rewrite_pos_estimator.c
+++ b/src/main/flight/navigation_rewrite_pos_estimator.c
@@ -47,8 +47,8 @@
 #include "flight/navigation_rewrite.h"
 #include "flight/navigation_rewrite_private.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
-#include "config/config.h"
 
 /**
  * Model-identification based position estimator
diff --git a/src/main/flight/servos.c b/src/main/flight/servos.c
index a7a5c72cde..32ebeea5a7 100755
--- a/src/main/flight/servos.c
+++ b/src/main/flight/servos.c
@@ -44,6 +44,7 @@
 #include "sensors/acceleration.h"
 #include "sensors/gyro.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
@@ -54,7 +55,6 @@
 #include "flight/imu.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/feature.h"
 
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index b6cf0f7701..6aae20a7c4 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -38,10 +38,10 @@
 #include "io/gps.h"
 #endif
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "io/beeper.h"
diff --git a/src/main/io/dashboard.c b/src/main/io/dashboard.c
index 59b2fa7244..9629fdd664 100644
--- a/src/main/io/dashboard.c
+++ b/src/main/io/dashboard.c
@@ -37,6 +37,7 @@
 #include "common/axis.h"
 #include "common/typeconversion.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 #include "fc/rc_controls.h"
 
@@ -61,7 +62,6 @@
 
 #include "rx/rx.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 
diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index 60eb87ec39..1704b5e984 100755
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -46,9 +46,9 @@
 
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 // GPS timeout for wrong baud rate/disconnection/etc in milliseconds (default 2000 ms)
diff --git a/src/main/io/gps_i2cnav.c b/src/main/io/gps_i2cnav.c
index 4e2157da73..87b1be26ae 100755
--- a/src/main/io/gps_i2cnav.c
+++ b/src/main/io/gps_i2cnav.c
@@ -43,7 +43,7 @@
 #include "flight/hil.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #define GPS_I2C_POLL_RATE_HZ    20  // Poll I2C GPS at this rate
diff --git a/src/main/io/gps_naza.c b/src/main/io/gps_naza.c
index 35bb55b965..6191539746 100644
--- a/src/main/io/gps_naza.c
+++ b/src/main/io/gps_naza.c
@@ -42,7 +42,7 @@
 
 #include "flight/gps_conversion.h"
 
-#include "config/config.h"
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 
diff --git a/src/main/io/gps_nmea.c b/src/main/io/gps_nmea.c
index 63514308f1..86d11f532a 100755
--- a/src/main/io/gps_nmea.c
+++ b/src/main/io/gps_nmea.c
@@ -41,7 +41,7 @@
 
 #include "flight/gps_conversion.h"
 
-#include "config/config.h"
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 /* This is a light implementation of a GPS frame decoding
diff --git a/src/main/io/gps_ublox.c b/src/main/io/gps_ublox.c
index 0dbac8acbe..f061ae53c1 100755
--- a/src/main/io/gps_ublox.c
+++ b/src/main/io/gps_ublox.c
@@ -44,7 +44,7 @@
 
 #include "flight/gps_conversion.h"
 
-#include "config/config.h"
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 //#define GPS_PROTO_UBLOX_NEO7PLUS
diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c
index 2393b1d099..56f998bfc4 100644
--- a/src/main/io/ledstrip.c
+++ b/src/main/io/ledstrip.c
@@ -40,6 +40,7 @@
 #include "common/printf.h"
 #include "common/utils.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
@@ -71,7 +72,6 @@
 #include "flight/imu.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/config_master.h"
 #include "config/config_profile.h"
 #include "config/feature.h"
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index d5d2e19f91..a8e67a478b 100644
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -41,13 +41,15 @@
 
 #include "common/axis.h"
 #include "io/gimbal.h"
+
 #include "flight/pid.h"
 #include "flight/mixer.h"
 #include "flight/servos.h"
+
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
 #include "config/feature.h"
diff --git a/src/main/io/pwmdriver_i2c.c b/src/main/io/pwmdriver_i2c.c
index d198ea1b88..71eee09154 100644
--- a/src/main/io/pwmdriver_i2c.c
+++ b/src/main/io/pwmdriver_i2c.c
@@ -1,9 +1,11 @@
 #include <stdbool.h>
 #include <stdint.h>
+
 #include "drivers/io_pca9685.h"
 
-#include "config/config.h"
+#include "fc/config.h"
 #include "fc/runtime_config.h"
+
 #include "config/feature.h"
 
 #define PWM_DRIVER_IMPLEMENTATION_COUNT 1
diff --git a/src/main/io/serial_4way_stk500v2.c b/src/main/io/serial_4way_stk500v2.c
index 9d87137a1f..e16c59d1c3 100644
--- a/src/main/io/serial_4way_stk500v2.c
+++ b/src/main/io/serial_4way_stk500v2.c
@@ -24,13 +24,17 @@
 #include <stdlib.h>
 
 #include <platform.h>
+
 #include "common/utils.h"
+
 #include "drivers/gpio.h"
 #include "drivers/buf_writer.h"
 #include "drivers/pwm_mapping.h"
 #include "drivers/serial.h"
 #include "drivers/system.h"
-#include "config/config.h"
+
+#include "fc/config.h"
+
 #include "io/serial.h"
 #include "io/serial_4way.h"
 #include "io/serial_4way_impl.h"
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index ef5590c310..f14dca8116 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -35,7 +35,6 @@
 #include "common/printf.h"
 #include "common/typeconversion.h"
 
-#include "config/config.h"
 #include "config/config_eeprom.h"
 #include "config/config_profile.h"
 #include "config/config_master.h"
@@ -56,6 +55,7 @@
 #include "drivers/system.h"
 #include "drivers/timer.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c
index 775f989bd2..004709e8d9 100644
--- a/src/main/rx/pwm.c
+++ b/src/main/rx/pwm.c
@@ -27,11 +27,12 @@
 
 #include "common/utils.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "drivers/pwm_rx.h"
 
+#include "fc/config.h"
+
 #include "rx/rx.h"
 #include "rx/pwm.h"
 
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 8a09b1938e..13dc03a242 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -29,7 +29,6 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "drivers/adc.h"
@@ -38,6 +37,7 @@
 #include "drivers/serial.h"
 #include "drivers/system.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 
 #include "flight/failsafe.h"
diff --git a/src/main/rx/rx_spi.c b/src/main/rx/rx_spi.c
index 4a92c68886..03e3805a14 100644
--- a/src/main/rx/rx_spi.c
+++ b/src/main/rx/rx_spi.c
@@ -26,9 +26,10 @@
 
 #include "drivers/rx_nrf24l01.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
+#include "fc/config.h"
+
 #include "rx/rx.h"
 #include "rx/rx_spi.h"
 #include "rx/nrf24_cx10.h"
diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c
index 7b4bf0e02d..c10fd78647 100644
--- a/src/main/rx/spektrum.c
+++ b/src/main/rx/spektrum.c
@@ -31,9 +31,9 @@
 #include "drivers/serial.h"
 #include "drivers/system.h"
 
-#include "io/serial.h"
+#include "fc/config.h"
 
-#include "config/config.h"
+#include "io/serial.h"
 
 #ifdef TELEMETRY
 #include "telemetry/telemetry.h"
diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c
index 3c841f3ba5..e9039fadc1 100644
--- a/src/main/sensors/acceleration.c
+++ b/src/main/sensors/acceleration.c
@@ -26,8 +26,6 @@
 #include "common/maths.h"
 #include "common/filter.h"
 
-#include "config/config.h"
-
 #include "drivers/accgyro.h"
 #include "drivers/accgyro_adxl345.h"
 #include "drivers/accgyro_bma280.h"
@@ -51,6 +49,7 @@
 #include "sensors/gyro.h"
 #include "sensors/sensors.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "io/beeper.h"
diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index b6d4cf9da8..7f9ead4893 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -26,9 +26,9 @@
 #include "drivers/adc.h"
 #include "drivers/system.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "sensors/battery.h"
diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index d44c86530b..2abefcaacc 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -25,8 +25,6 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "config/config.h"
-
 #include "drivers/compass.h"
 #include "drivers/compass_ak8963.h"
 #include "drivers/compass_ak8975.h"
@@ -39,6 +37,7 @@
 #include "drivers/logging.h"
 #include "drivers/system.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "io/gps.h"
diff --git a/src/main/sensors/diagnostics.c b/src/main/sensors/diagnostics.c
index 3d533075f2..b79849a093 100644
--- a/src/main/sensors/diagnostics.c
+++ b/src/main/sensors/diagnostics.c
@@ -8,9 +8,9 @@
 #include "common/maths.h"
 #include "common/time.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "io/gps.h"
diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c
index af3ee3104c..36bfb2b493 100644
--- a/src/main/sensors/gyro.c
+++ b/src/main/sensors/gyro.c
@@ -26,8 +26,6 @@
 #include "common/maths.h"
 #include "common/filter.h"
 
-#include "config/config.h"
-
 #include "drivers/accgyro.h"
 #include "drivers/accgyro_adxl345.h"
 #include "drivers/accgyro_bma280.h"
@@ -46,6 +44,7 @@
 #include "drivers/io.h"
 #include "drivers/logging.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "io/beeper.h"
diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c
index a061c6398b..46b1e03c65 100755
--- a/src/main/sensors/initialisation.c
+++ b/src/main/sensors/initialisation.c
@@ -22,11 +22,11 @@
 
 #include "common/utils.h"
 
-#include "config/config.h"
 #include "config/config_eeprom.h"
 
 #include "drivers/logging.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "sensors/sensors.h"
diff --git a/src/main/sensors/pitotmeter.c b/src/main/sensors/pitotmeter.c
index c08432494d..10f8749073 100644
--- a/src/main/sensors/pitotmeter.c
+++ b/src/main/sensors/pitotmeter.c
@@ -25,12 +25,11 @@
 
 #include "common/maths.h"
 
-#include "config/config.h"
-
 #include "drivers/logging.h"
 #include "drivers/pitotmeter.h"
 #include "drivers/pitotmeter_ms4525.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "sensors/pitotmeter.h"
diff --git a/src/main/sensors/rangefinder.c b/src/main/sensors/rangefinder.c
index e4003e6ea2..c8cb1f672b 100644
--- a/src/main/sensors/rangefinder.c
+++ b/src/main/sensors/rangefinder.c
@@ -29,7 +29,6 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "drivers/io.h"
@@ -38,6 +37,7 @@
 #include "drivers/sonar_srf10.h"
 #include "drivers/rangefinder.h"
 
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "sensors/sensors.h"
diff --git a/src/main/target/BLUEJAYF4/config.c b/src/main/target/BLUEJAYF4/config.c
index 38c3afbdb3..e90075c2fc 100644
--- a/src/main/target/BLUEJAYF4/config.c
+++ b/src/main/target/BLUEJAYF4/config.c
@@ -19,10 +19,11 @@
 
 #include <platform.h>
 
-#include "config/config.h"
 #include "config/config_master.h"
 #include "config/config_profile.h"
 
+#include "fc/config.h"
+
 #include "hardware_revision.h"
 
 // alternative defaults settings for BlueJayF4 targets
diff --git a/src/main/target/COLIBRI/config.c b/src/main/target/COLIBRI/config.c
index 28e22e831d..79d11bf988 100755
--- a/src/main/target/COLIBRI/config.c
+++ b/src/main/target/COLIBRI/config.c
@@ -58,6 +58,7 @@
 
 #include "telemetry/telemetry.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
 #include "fc/runtime_config.h"
@@ -67,7 +68,6 @@
 #include "flight/imu.h"
 #include "flight/failsafe.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "config/config_master.h"
diff --git a/src/main/target/COLIBRI_RACE/config.c b/src/main/target/COLIBRI_RACE/config.c
index 3891559bbb..4648e7d73a 100755
--- a/src/main/target/COLIBRI_RACE/config.c
+++ b/src/main/target/COLIBRI_RACE/config.c
@@ -58,6 +58,7 @@
 
 #include "telemetry/telemetry.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
 #include "fc/runtime_config.h"
@@ -67,7 +68,6 @@
 #include "flight/imu.h"
 #include "flight/failsafe.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "config/config_master.h"
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 3053557f61..c8972a2158 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -17,6 +17,9 @@
 
 #pragma once
 
+// !!Temporarily remove blackbox until ROM recovered for NAZE target
+#undef BLACKBOX
+
 #define TARGET_BOARD_IDENTIFIER "AFNA" // AFroNAze - NAZE might be considered misleading on Naze clones like the flip32.
 #define USE_HARDWARE_REVISION_DETECTION
 
diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c
index 8ce0003d1b..97cb44bc7b 100644
--- a/src/main/telemetry/frsky.c
+++ b/src/main/telemetry/frsky.c
@@ -48,12 +48,13 @@
 
 #include "rx/rx.h"
 
+#include "fc/config.h"
+
 #include "flight/mixer.h"
 #include "flight/pid.h"
 #include "flight/imu.h"
 #include "flight/navigation_rewrite.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 #include "telemetry/telemetry.h"
diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c
index 0192f6208b..88014e210e 100644
--- a/src/main/telemetry/ltm.c
+++ b/src/main/telemetry/ltm.c
@@ -65,7 +65,7 @@
 #include "io/gps.h"
 #include "io/ledstrip.h"
 
-#include "rx/rx.h"
+#include "fc/config.h"
 
 #include "flight/mixer.h"
 #include "flight/pid.h"
@@ -73,11 +73,11 @@
 #include "flight/failsafe.h"
 #include "flight/navigation_rewrite.h"
 
+#include "rx/rx.h"
+
 #include "telemetry/telemetry.h"
 #include "telemetry/ltm.h"
 
-#include "config/config.h"
-
 #define TELEMETRY_LTM_INITIAL_PORT_MODE MODE_TX
 #define LTM_CYCLETIME   100
 
diff --git a/src/main/telemetry/mavlink.c b/src/main/telemetry/mavlink.c
index beb9909fe1..9d3a084e02 100755
--- a/src/main/telemetry/mavlink.c
+++ b/src/main/telemetry/mavlink.c
@@ -67,7 +67,7 @@
 #include "telemetry/telemetry.h"
 #include "telemetry/mavlink.h"
 
-#include "config/config.h"
+#include "fc/config.h"
 #include "fc/runtime_config.h"
 
 #include "config/config_profile.h"
diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c
index 273dd48bd1..f89e3d082d 100644
--- a/src/main/telemetry/smartport.c
+++ b/src/main/telemetry/smartport.c
@@ -21,6 +21,7 @@
 #include "rx/rx.h"
 #include "rx/msp.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
@@ -39,7 +40,6 @@
 #include "telemetry/telemetry.h"
 #include "telemetry/smartport.h"
 
-#include "config/config.h"
 #include "config/feature.h"
 
 enum
diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c
index 059a95abff..f2c1dc1d5f 100644
--- a/src/main/telemetry/telemetry.c
+++ b/src/main/telemetry/telemetry.c
@@ -29,11 +29,10 @@
 
 #include "io/serial.h"
 
+#include "fc/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "config/config.h"
-
 #include "rx/rx.h"
 
 #include "telemetry/telemetry.h"