diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 23993cfc3..824444f0c 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -107,21 +107,21 @@ if(NOT PCB STREQUAL 9XR AND NOT PCB STREQUAL 9XRPRO)
 endif()
 
 if(CPU_TYPE STREQUAL STM32F4)
-  include(common/arm/stm32/f4/CMakeLists.txt)
+  include(targets/common/arm/stm32/f4/CMakeLists.txt)
 endif()
 
 if(CPU_TYPE STREQUAL STM32F2)
-  include(common/arm/stm32/f2/CMakeLists.txt)
+  include(targets/common/arm/stm32/f2/CMakeLists.txt)
 endif()
 
 if(CPU_FAMILY STREQUAL STM32)
-  include(common/arm/stm32/CMakeLists.txt)
+  include(targets/common/arm/stm32/CMakeLists.txt)
 endif()
 
 if(ARCH STREQUAL ARM)
-  include(common/arm/CMakeLists.txt)
+  include(targets/common/arm/CMakeLists.txt)
 else()
-  include(common/avr/CMakeLists.txt)
+  include(targets/common/avr/CMakeLists.txt)
 endif()
 
 foreach(LANGUAGE ${GUI_LANGUAGES})
diff --git a/radio/src/gui/9x/view_mavlink.h b/radio/src/gui/9x/view_mavlink.h
index 19d15bb69..f62f7f559 100644
--- a/radio/src/gui/9x/view_mavlink.h
+++ b/radio/src/gui/9x/view_mavlink.h
@@ -27,7 +27,7 @@
 
 #include "opentx.h"
 #include "telemetry/mavlink.h"
-#include "targets/common_avr/serial_driver.h"
+#include "targets/common/avr/serial_driver.h"
 
 #define APSIZE (BSS | DBLSIZE)
 
diff --git a/radio/src/targets/9x/board_stock.h b/radio/src/targets/9x/board_stock.h
index ac2011783..7821e969d 100644
--- a/radio/src/targets/9x/board_stock.h
+++ b/radio/src/targets/9x/board_stock.h
@@ -21,7 +21,7 @@
 #ifndef _BOARD_STOCK_H_
 #define _BOARD_STOCK_H_
 
-#include "../common_avr/board_avr.h"
+#include "../common/avr/board_avr.h"
 
 //
 //                  elev                        thr
diff --git a/radio/src/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt
similarity index 100%
rename from radio/src/common/arm/CMakeLists.txt
rename to radio/src/targets/common/arm/CMakeLists.txt
diff --git a/radio/src/common/arm/stm32/CMakeLists.txt b/radio/src/targets/common/arm/stm32/CMakeLists.txt
similarity index 100%
rename from radio/src/common/arm/stm32/CMakeLists.txt
rename to radio/src/targets/common/arm/stm32/CMakeLists.txt
diff --git a/radio/src/common/arm/stm32/f2/CMakeLists.txt b/radio/src/targets/common/arm/stm32/f2/CMakeLists.txt
similarity index 100%
rename from radio/src/common/arm/stm32/f2/CMakeLists.txt
rename to radio/src/targets/common/arm/stm32/f2/CMakeLists.txt
diff --git a/radio/src/common/arm/stm32/f4/CMakeLists.txt b/radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
similarity index 100%
rename from radio/src/common/arm/stm32/f4/CMakeLists.txt
rename to radio/src/targets/common/arm/stm32/f4/CMakeLists.txt
diff --git a/radio/src/common/avr/CMakeLists.txt b/radio/src/targets/common/avr/CMakeLists.txt
similarity index 94%
rename from radio/src/common/avr/CMakeLists.txt
rename to radio/src/targets/common/avr/CMakeLists.txt
index fbc9c73b8..6512fac5f 100644
--- a/radio/src/common/avr/CMakeLists.txt
+++ b/radio/src/targets/common/avr/CMakeLists.txt
@@ -11,7 +11,7 @@ set(DSM2 "NO" CACHE STRING "LCD type (NO/PPM/SERIAL)")
 set(LUA NO)
 set(PULSES_SRC pulses_avr.cpp)
 set(SRC ${SRC} main_avr.cpp)
-set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common_avr/adc_driver.cpp)
+set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common/avr/adc_driver.cpp)
 add_definitions(-DLCD_${LCD})
 if(DSM2)
   add_definitions(-DDSM2 -DDSM2_${DSM2})
@@ -67,8 +67,8 @@ elseif(EXT STREQUAL JETI)
   set(SRC ${SRC} telemetry/jeti.cpp)
 elseif(EXT STREQUAL MAVLINK)
   add_definitions(-DMAVLINK)
-  include_directories(${THIRDPARTY_DIR} gui/${GUI_DIR} targets/common_avr)
-  set(SRC ${SRC} telemetry/mavlink.cpp targets/common_avr/serial_driver.cpp)
+  include_directories(${THIRDPARTY_DIR} gui/${GUI_DIR} targets/common/avr)
+  set(SRC ${SRC} telemetry/mavlink.cpp targets/common/avr/serial_driver.cpp)
   set(GUI_SRC ${GUI_SRC} view_mavlink.cpp)
   math(EXPR EEPROM_VARIANT ${EEPROM_VARIANT}+${MAVLINK_VARIANT})
 elseif(EXT STREQUAL TELEMETREZ)
@@ -86,7 +86,7 @@ if(EXT STREQUAL FRSKY OR EXT STREQUAL FRSKY_SPORT OR EXT STREQUAL TELEMETREZ)
   option(VARIO "Vario support" ON)
   add_definitions(-DFRSKY)
   set(SRC ${SRC} telemetry/telemetry.cpp telemetry/telemetry_holders.cpp telemetry/frsky.cpp telemetry/frsky_d.cpp)
-  set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common_avr/telemetry_driver.cpp)
+  set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common/avr/telemetry_driver.cpp)
   set(GUI_SRC ${GUI_SRC} view_telemetry.cpp)
   if(FRSKY_HUB)
     add_definitions(-DFRSKY_HUB)
diff --git a/radio/src/targets/common_avr/adc_driver.cpp b/radio/src/targets/common/avr/adc_driver.cpp
similarity index 100%
rename from radio/src/targets/common_avr/adc_driver.cpp
rename to radio/src/targets/common/avr/adc_driver.cpp
diff --git a/radio/src/targets/common_avr/board_avr.h b/radio/src/targets/common/avr/board_avr.h
similarity index 100%
rename from radio/src/targets/common_avr/board_avr.h
rename to radio/src/targets/common/avr/board_avr.h
diff --git a/radio/src/targets/common_avr/serial_driver.cpp b/radio/src/targets/common/avr/serial_driver.cpp
similarity index 100%
rename from radio/src/targets/common_avr/serial_driver.cpp
rename to radio/src/targets/common/avr/serial_driver.cpp
diff --git a/radio/src/targets/common_avr/serial_driver.h b/radio/src/targets/common/avr/serial_driver.h
similarity index 100%
rename from radio/src/targets/common_avr/serial_driver.h
rename to radio/src/targets/common/avr/serial_driver.h
diff --git a/radio/src/targets/common_avr/telemetry_driver.cpp b/radio/src/targets/common/avr/telemetry_driver.cpp
similarity index 100%
rename from radio/src/targets/common_avr/telemetry_driver.cpp
rename to radio/src/targets/common/avr/telemetry_driver.cpp
diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h
index d4c11f4cc..6a5eceff0 100644
--- a/radio/src/targets/gruvin9x/board_gruvin9x.h
+++ b/radio/src/targets/gruvin9x/board_gruvin9x.h
@@ -21,7 +21,7 @@
 #ifndef _BOARD_GRUVIN9X_H_
 #define _BOARD_GRUVIN9X_H_
 
-#include "../common_avr/board_avr.h"
+#include "../common/avr/board_avr.h"
 
 // Board driver
 void boardInit(void);
diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h
index a62ff9d5f..940c7bfc2 100644
--- a/radio/src/targets/mega2560/board_mega2560.h
+++ b/radio/src/targets/mega2560/board_mega2560.h
@@ -21,7 +21,7 @@
 #ifndef _BOARD_MEGA2560_H_
 #define _BOARD_MEGA2560_H_
 
-#include "../common_avr/board_avr.h"
+#include "../common/avr/board_avr.h"
 
 //Mods for futur use ? Beta tester love it 
 //#define ROTENC_DIV2 // rotenc resolution/2
diff --git a/radio/src/telemetry/mavlink.h b/radio/src/telemetry/mavlink.h
index fb2281259..c580a9e60 100644
--- a/radio/src/telemetry/mavlink.h
+++ b/radio/src/telemetry/mavlink.h
@@ -29,7 +29,7 @@
 #define MAVLINK_COMM_NUM_BUFFERS 1
 
 #include "GCS_MAVLink/include_v1.0/mavlink_types.h"
-#include "targets/common_avr/serial_driver.h"
+#include "targets/common/avr/serial_driver.h"
 #include "opentx.h"
 
 extern int8_t mav_heartbeat;