diff --git a/make/source.mk b/make/source.mk
index baad3efeea..7cf45d8f85 100644
--- a/make/source.mk
+++ b/make/source.mk
@@ -51,10 +51,10 @@ COMMON_SRC = \
             fc/config.c \
             fc/fc_dispatch.c \
             fc/fc_hardfaults.c \
-            fc/fc_msp.c \
-            fc/fc_msp_box.c \
             fc/fc_tasks.c \
             fc/runtime_config.c \
+            interface/fc_msp.c \
+            interface/fc_msp_box.c \
             io/beeper.c \
             io/serial.c \
             io/statusindicator.c \
@@ -87,14 +87,14 @@ FC_SRC = \
             fc/rc_adjustments.c \
             fc/rc_controls.c \
             fc/rc_modes.c \
-            fc/cli.c \
-            fc/settings.c \
             flight/altitude.c \
             flight/failsafe.c \
             flight/imu.c \
             flight/mixer.c \
             flight/pid.c \
             flight/servos.c \
+            interface/cli.c \
+            interface/settings.c \
             io/serial_4way.c \
             io/serial_4way_avrootloader.c \
             io/serial_4way_stk500v2.c \
@@ -253,12 +253,12 @@ SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \
             drivers/vtx_rtc6705.c \
             drivers/vtx_common.c \
             fc/fc_init.c \
-            fc/cli.c \
-            fc/settings.c \
             config/config_eeprom.c \
             config/feature.c \
             config/parameter_group.c \
             config/config_streamer.c \
+            interface/cli.c \
+            interface/settings.c \
             io/serial_4way.c \
             io/serial_4way_avrootloader.c \
             io/serial_4way_stk500v2.c \
diff --git a/src/main/cms/cms_menu_builtin.c b/src/main/cms/cms_menu_builtin.c
index 07216c2482..f1634807c4 100644
--- a/src/main/cms/cms_menu_builtin.c
+++ b/src/main/cms/cms_menu_builtin.c
@@ -56,7 +56,7 @@
 static char infoGitRev[GIT_SHORT_REVISION_LENGTH];
 static char infoTargetName[] = __TARGET__;
 
-#include "msp/msp_protocol.h" // XXX for FC identification... not available elsewhere
+#include "interface/msp_protocol.h" // XXX for FC identification... not available elsewhere
 
 static long cmsx_InfoInit(void)
 {
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index 2a9e1aec57..abaa7d6d63 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -47,7 +47,6 @@
 #include "sensors/gyro.h"
 #include "sensors/sensors.h"
 
-#include "fc/cli.h"
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/fc_core.h"
@@ -58,6 +57,8 @@
 
 #include "msp/msp_serial.h"
 
+#include "interface/cli.h"
+
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/beeper.h"
 #include "io/gps.h"
@@ -67,6 +68,7 @@
 #include "io/statusindicator.h"
 #include "io/transponder_ir.h"
 #include "io/vtx_control.h"
+
 #include "rx/rx.h"
 
 #include "scheduler/scheduler.h"
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 74a32d87f2..ae537be90a 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -72,11 +72,12 @@
 
 #include "fc/config.h"
 #include "fc/fc_init.h"
-#include "fc/fc_msp.h"
 #include "fc/fc_tasks.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
-#include "fc/cli.h"
+
+#include "interface/fc_msp.h"
+#include "interface/cli.h"
 
 #include "msp/msp_serial.h"
 
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index 45fa58228b..0878a0edf2 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -39,11 +39,9 @@
 #include "drivers/transponder_ir.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/cli.h"
 #include "fc/config.h"
 #include "fc/fc_core.h"
 #include "fc/fc_dispatch.h"
-#include "fc/fc_msp.h"
 #include "fc/fc_tasks.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
@@ -53,6 +51,9 @@
 #include "flight/mixer.h"
 #include "flight/pid.h"
 
+#include "interface/cli.h"
+#include "interface/fc_msp.h"
+
 #include "io/beeper.h"
 #include "io/dashboard.h"
 #include "io/gps.h"
diff --git a/src/main/fc/cli.c b/src/main/interface/cli.c
similarity index 99%
rename from src/main/fc/cli.c
rename to src/main/interface/cli.c
index 6d5e8e1176..125323edda 100755
--- a/src/main/fc/cli.c
+++ b/src/main/interface/cli.c
@@ -83,13 +83,9 @@ extern uint8_t __config_end;
 #include "drivers/camera_control.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/settings.h"
-#include "fc/cli.h"
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/fc_core.h"
-#include "fc/fc_msp.h"
-#include "fc/fc_msp_box.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
@@ -102,6 +98,12 @@ extern uint8_t __config_end;
 #include "flight/pid.h"
 #include "flight/servos.h"
 
+#include "interface/cli.h"
+#include "interface/fc_msp.h"
+#include "interface/fc_msp_box.h"
+#include "interface/msp_protocol.h"
+#include "interface/settings.h"
+
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/beeper.h"
 #include "io/flashfs.h"
@@ -116,8 +118,6 @@ extern uint8_t __config_end;
 #include "io/vtx_control.h"
 #include "io/vtx.h"
 
-#include "msp/msp_protocol.h"
-
 #include "rx/rx.h"
 #include "rx/spektrum.h"
 #include "rx/frsky_d.h"
diff --git a/src/main/fc/cli.h b/src/main/interface/cli.h
similarity index 100%
rename from src/main/fc/cli.h
rename to src/main/interface/cli.h
diff --git a/src/main/fc/fc_msp.c b/src/main/interface/fc_msp.c
similarity index 99%
rename from src/main/fc/fc_msp.c
rename to src/main/interface/fc_msp.c
index c2d26e8525..ac4560573b 100644
--- a/src/main/fc/fc_msp.c
+++ b/src/main/interface/fc_msp.c
@@ -60,8 +60,6 @@
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/fc_core.h"
-#include "fc/fc_msp.h"
-#include "fc/fc_msp_box.h"
 #include "fc/fc_rc.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
@@ -76,6 +74,10 @@
 #include "flight/pid.h"
 #include "flight/servos.h"
 
+#include "interface/fc_msp.h"
+#include "interface/fc_msp_box.h"
+#include "interface/msp_protocol.h"
+
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/beeper.h"
 #include "io/flashfs.h"
@@ -94,7 +96,6 @@
 #include "io/vtx_string.h"
 
 #include "msp/msp.h"
-#include "msp/msp_protocol.h"
 #include "msp/msp_serial.h"
 
 #include "rx/msp.h"
diff --git a/src/main/fc/fc_msp.h b/src/main/interface/fc_msp.h
similarity index 100%
rename from src/main/fc/fc_msp.h
rename to src/main/interface/fc_msp.h
diff --git a/src/main/fc/fc_msp_box.c b/src/main/interface/fc_msp_box.c
similarity index 99%
rename from src/main/fc/fc_msp_box.c
rename to src/main/interface/fc_msp_box.c
index 9329329b2e..7ffa253f6b 100644
--- a/src/main/fc/fc_msp_box.c
+++ b/src/main/interface/fc_msp_box.c
@@ -28,11 +28,12 @@
 #include "config/feature.h"
 
 #include "fc/config.h"
-#include "fc/fc_msp_box.h"
 #include "fc/runtime_config.h"
 
 #include "flight/mixer.h"
 
+#include "interface/fc_msp_box.h"
+
 #include "sensors/sensors.h"
 
 #include "telemetry/telemetry.h"
diff --git a/src/main/fc/fc_msp_box.h b/src/main/interface/fc_msp_box.h
similarity index 100%
rename from src/main/fc/fc_msp_box.h
rename to src/main/interface/fc_msp_box.h
diff --git a/src/main/msp/msp_protocol.h b/src/main/interface/msp_protocol.h
similarity index 100%
rename from src/main/msp/msp_protocol.h
rename to src/main/interface/msp_protocol.h
diff --git a/src/main/fc/settings.c b/src/main/interface/settings.c
similarity index 99%
rename from src/main/fc/settings.c
rename to src/main/interface/settings.c
index b94c99aa1b..d0cafaf14e 100644
--- a/src/main/fc/settings.c
+++ b/src/main/interface/settings.c
@@ -48,7 +48,6 @@
 #include "fc/fc_core.h"
 #include "fc/rc_adjustments.h"
 #include "fc/rc_controls.h"
-#include "fc/settings.h"
 
 #include "flight/altitude.h"
 #include "flight/failsafe.h"
@@ -58,6 +57,8 @@
 #include "flight/pid.h"
 #include "flight/servos.h"
 
+#include "interface/settings.h"
+
 #include "io/beeper.h"
 #include "io/dashboard.h"
 #include "io/gimbal.h"
diff --git a/src/main/fc/settings.h b/src/main/interface/settings.h
similarity index 100%
rename from src/main/fc/settings.h
rename to src/main/interface/settings.h
diff --git a/src/main/io/displayport_msp.c b/src/main/io/displayport_msp.c
index 2631dcbf14..4bdc14f743 100644
--- a/src/main/io/displayport_msp.c
+++ b/src/main/io/displayport_msp.c
@@ -31,11 +31,11 @@
 
 #include "drivers/display.h"
 
-#include "fc/fc_msp.h"
+#include "interface/fc_msp.h"
+#include "interface/msp_protocol.h"
 
 #include "io/displayport_msp.h"
 
-#include "msp/msp_protocol.h"
 #include "msp/msp_serial.h"
 
 // no template required since defaults are zero
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index 0e0ac62876..a45be6bb3f 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -50,7 +50,7 @@
 
 #include "io/serial.h"
 
-#include "fc/cli.h"
+#include "interface/cli.h"
 
 #include "msp/msp_serial.h"
 
diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index a7e6644f7b..d4e85832c7 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -54,13 +54,14 @@
 #include "drivers/transponder_ir.h"
 #include "drivers/usb_io.h"
 
-#include "fc/cli.h"
 #include "fc/config.h"
 #include "fc/rc_controls.h"
-#include "fc/fc_msp.h"
 #include "fc/fc_tasks.h"
 #include "fc/runtime_config.h"
 
+#include "interface/cli.h"
+#include "interface/fc_msp.h"
+
 #include "msp/msp_serial.h"
 
 #include "rx/rx.h"
diff --git a/src/main/sensors/current.c b/src/main/sensors/current.c
index fd2078a855..f747c68137 100644
--- a/src/main/sensors/current.c
+++ b/src/main/sensors/current.c
@@ -229,7 +229,7 @@ void currentMeterESCReadMotor(uint8_t motorNumber, currentMeter_t *meter)
 
 #ifdef USE_MSP_CURRENT_METER
 #include "common/streambuf.h"
-#include "msp/msp_protocol.h"
+#include "interface/msp_protocol.h"
 #include "msp/msp_serial.h"
 
 currentMeterMSPState_t currentMeterMSPState;
diff --git a/src/main/telemetry/msp_shared.c b/src/main/telemetry/msp_shared.c
index ebd732d168..d0bb1fd91a 100644
--- a/src/main/telemetry/msp_shared.c
+++ b/src/main/telemetry/msp_shared.c
@@ -12,7 +12,7 @@
 
 #include "common/utils.h"
 
-#include "fc/fc_msp.h"
+#include "interface/fc_msp.h"
 
 #include "msp/msp.h"
 
diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c
index 886dfbf3cb..82c75a8f94 100644
--- a/src/main/telemetry/smartport.c
+++ b/src/main/telemetry/smartport.c
@@ -28,7 +28,6 @@
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
-#include "fc/fc_msp.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
@@ -39,6 +38,8 @@
 #include "flight/pid.h"
 #include "flight/navigation.h"
 
+#include "interface/fc_msp.h"
+
 #include "io/beeper.h"
 #include "io/motors.h"
 #include "io/gps.h"
diff --git a/src/test/Makefile b/src/test/Makefile
index 4ce72191d2..6e5690db02 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -83,7 +83,7 @@ blackbox_encoding_unittest_SRC :=  \
 		$(USER_DIR)/common/typeconversion.c
 
 cli_unittest_SRC := \
-		$(USER_DIR)/fc/cli.c \
+		$(USER_DIR)/interface/cli.c \
 		$(USER_DIR)/config/feature.c \
 		$(USER_DIR)/config/parameter_group.c \
                 $(USER_DIR)/common/typeconversion.c
diff --git a/src/test/unit/cli_unittest.cc b/src/test/unit/cli_unittest.cc
index 73c1540ca3..25a8b12f30 100644
--- a/src/test/unit/cli_unittest.cc
+++ b/src/test/unit/cli_unittest.cc
@@ -26,32 +26,30 @@
 extern "C" {
     #include "platform.h"
     #include "target.h"
-    #include "fc/runtime_config.h"
-    #include "fc/fc_msp.h"
-    #include "fc/fc_msp_box.h"
+    #include "build/version.h"
     #include "config/parameter_group.h"
     #include "config/feature.h"
     #include "config/parameter_group_ids.h"
-    #include "sensors/battery.h"
     #include "drivers/buf_writer.h"
     #include "drivers/vtx_common.h"
-    #include "io/vtx.h"
-    #include "flight/mixer.h"
-    #include "flight/servos.h"
-    #include "flight/pid.h"
-    #include "io/ledstrip.h"
-    #include "io/serial.h"
-    #include "io/osd.h"
-    #include "fc/settings.h"
-    #include "rx/rx.h"
-    #include "io/beeper.h"
-    #include "fc/rc_adjustments.h"
-    #include "scheduler/scheduler.h"
-    #include "fc/runtime_config.h"
-    #include "build/version.h"
     #include "fc/config.h"
-    #include "drivers/buf_writer.h"
-    #include "fc/cli.h"
+    #include "fc/rc_adjustments.h"
+    #include "fc/runtime_config.h"
+    #include "flight/mixer.h"
+    #include "flight/pid.h"
+    #include "flight/servos.h"
+    #include "interface/cli.h"
+    #include "interface/fc_msp.h"
+    #include "interface/fc_msp_box.h"
+    #include "interface/settings.h"
+    #include "io/beeper.h"
+    #include "io/ledstrip.h"
+    #include "io/osd.h"
+    #include "io/serial.h"
+    #include "io/vtx.h"
+    #include "rx/rx.h"
+    #include "scheduler/scheduler.h"
+    #include "sensors/battery.h"
 
     void cliSet(char *cmdline);
     void cliGet(char *cmdline);
diff --git a/src/test/unit/telemetry_crsf_msp_unittest.cc b/src/test/unit/telemetry_crsf_msp_unittest.cc
index 4333b26d48..12396285ec 100644
--- a/src/test/unit/telemetry_crsf_msp_unittest.cc
+++ b/src/test/unit/telemetry_crsf_msp_unittest.cc
@@ -45,7 +45,8 @@ extern "C" {
     #include "fc/runtime_config.h"
     #include "fc/config.h"
     #include "flight/imu.h"
-    #include "fc/fc_msp.h"
+
+    #include "interface/fc_msp.h"
 
     #include "io/serial.h"
     #include "io/gps.h"