diff --git a/src/driver/serial_vtx_msp.c b/src/driver/vtx/msp.c
similarity index 99%
rename from src/driver/serial_vtx_msp.c
rename to src/driver/vtx/msp.c
index 53b80ef40..0475ec586 100644
--- a/src/driver/serial_vtx_msp.c
+++ b/src/driver/vtx/msp.c
@@ -1,5 +1,5 @@
 
-#include "driver/serial_vtx_msp.h"
+#include "driver/vtx/msp.h"
 
 #include <string.h>
 
diff --git a/src/driver/serial_vtx_msp.h b/src/driver/vtx/msp.h
similarity index 77%
rename from src/driver/serial_vtx_msp.h
rename to src/driver/vtx/msp.h
index 33b78dc0e..332c71810 100644
--- a/src/driver/serial_vtx_msp.h
+++ b/src/driver/vtx/msp.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-#include "driver/serial_vtx.h"
+#include "driver/vtx/vtx.h"
 
 void serial_msp_vtx_init();
 vtx_update_result_t serial_msp_vtx_update();
diff --git a/src/driver/serial_vtx_sa.c b/src/driver/vtx/sa.c
similarity index 99%
rename from src/driver/serial_vtx_sa.c
rename to src/driver/vtx/sa.c
index 9b8b56eac..ed04b23b9 100644
--- a/src/driver/serial_vtx_sa.c
+++ b/src/driver/vtx/sa.c
@@ -1,12 +1,12 @@
-#include "driver/serial_vtx_sa.h"
+#include "driver/vtx/sa.h"
 
 #include <stddef.h>
 
 #include "core/debug.h"
 #include "core/profile.h"
 #include "driver/serial.h"
-#include "driver/serial_vtx.h"
 #include "driver/time.h"
+#include "driver/vtx/vtx.h"
 #include "io/usb_configurator.h"
 #include "io/vtx.h"
 #include "util/crc.h"
diff --git a/src/driver/serial_vtx_sa.h b/src/driver/vtx/sa.h
similarity index 96%
rename from src/driver/serial_vtx_sa.h
rename to src/driver/vtx/sa.h
index 190ae053b..c8102c459 100644
--- a/src/driver/serial_vtx_sa.h
+++ b/src/driver/vtx/sa.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-#include "driver/serial_vtx.h"
+#include "driver/vtx/vtx.h"
 
 typedef enum {
   SA_CMD_GET_SETTINGS = 0x01,
diff --git a/src/driver/serial_vtx_tramp.c b/src/driver/vtx/tramp.c
similarity index 98%
rename from src/driver/serial_vtx_tramp.c
rename to src/driver/vtx/tramp.c
index 7c23643a0..1605d6868 100644
--- a/src/driver/serial_vtx_tramp.c
+++ b/src/driver/vtx/tramp.c
@@ -1,12 +1,12 @@
-#include "driver/serial_vtx_tramp.h"
+#include "driver/vtx/tramp.h"
 
 #include <string.h>
 
 #include "core/debug.h"
 #include "core/profile.h"
 #include "driver/serial.h"
-#include "driver/serial_vtx.h"
 #include "driver/time.h"
+#include "driver/vtx/vtx.h"
 #include "util/ring_buffer.h"
 
 typedef enum {
diff --git a/src/driver/serial_vtx_tramp.h b/src/driver/vtx/tramp.h
similarity index 92%
rename from src/driver/serial_vtx_tramp.h
rename to src/driver/vtx/tramp.h
index 999a7a28e..4eb7b3945 100644
--- a/src/driver/serial_vtx_tramp.h
+++ b/src/driver/vtx/tramp.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-#include "driver/serial_vtx.h"
+#include "driver/vtx/vtx.h"
 
 typedef struct {
   uint16_t freq_min;
diff --git a/src/driver/serial_vtx.c b/src/driver/vtx/vtx.c
similarity index 97%
rename from src/driver/serial_vtx.c
rename to src/driver/vtx/vtx.c
index a233e6a25..8cfca2ee9 100644
--- a/src/driver/serial_vtx.c
+++ b/src/driver/vtx/vtx.c
@@ -1,4 +1,4 @@
-#include "driver/serial_vtx.h"
+#include "driver/vtx/vtx.h"
 
 #include "driver/serial.h"
 #include "driver/serial_soft.h"
diff --git a/src/driver/serial_vtx.h b/src/driver/vtx/vtx.h
similarity index 100%
rename from src/driver/serial_vtx.h
rename to src/driver/vtx/vtx.h
diff --git a/src/io/vtx.c b/src/io/vtx.c
index ac1aacba8..9183adf19 100644
--- a/src/io/vtx.c
+++ b/src/io/vtx.c
@@ -8,10 +8,10 @@
 #include "core/project.h"
 #include "driver/gpio.h"
 #include "driver/serial.h"
-#include "driver/serial_vtx_msp.h"
-#include "driver/serial_vtx_sa.h"
-#include "driver/serial_vtx_tramp.h"
 #include "driver/time.h"
+#include "driver/vtx/msp.h"
+#include "driver/vtx/sa.h"
+#include "driver/vtx/tramp.h"
 #include "flight/control.h"
 #include "rx/rx.h"
 #include "rx/unified_serial.h"
diff --git a/src/io/vtx_msp.c b/src/io/vtx_msp.c
index 8d34f3fb3..236d152e8 100644
--- a/src/io/vtx_msp.c
+++ b/src/io/vtx_msp.c
@@ -4,7 +4,7 @@
 
 #include "core/profile.h"
 #include "driver/serial.h"
-#include "driver/serial_vtx_msp.h"
+#include "driver/vtx/msp.h"
 #include "io/msp.h"
 
 #define MSP_VTX_DETECT_TRIES 5
diff --git a/src/io/vtx_smartaudio.c b/src/io/vtx_smartaudio.c
index 0e09182af..e35526279 100644
--- a/src/io/vtx_smartaudio.c
+++ b/src/io/vtx_smartaudio.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "driver/serial.h"
-#include "driver/serial_vtx_sa.h"
+#include "driver/vtx/sa.h"
 #include "util/util.h"
 
 #define SMART_AUDIO_DETECT_TRIES 30
diff --git a/src/io/vtx_tramp.c b/src/io/vtx_tramp.c
index 6dd17f6e8..459cfd29e 100644
--- a/src/io/vtx_tramp.c
+++ b/src/io/vtx_tramp.c
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "driver/serial.h"
-#include "driver/serial_vtx_tramp.h"
+#include "driver/vtx/tramp.h"
 
 #define TRAMP_DETECT_TRIES 5