diff --git a/Makefile b/Makefile
index 1686a78c..8a3631d8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,11 @@
 EXTRA_CFLAGS += -Werror
 
 obj-m := mt76.o
-obj-$(CONFIG_MT76X2E) += mt76x2e.o
 obj-$(CONFIG_MT7603E) += mt7603/
-obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o
 obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o
 obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o
 obj-$(CONFIG_MT76_USB) += mt76-usb.o
-obj-$(CONFIG_MT76X2U) += mt76x2u.o
+obj-$(CONFIG_MT76x2_COMMON) += mt76x2/
 obj-$(CONFIG_MT76x0_COMMON) += mt76x0/
 
 mt76-y := \
@@ -19,19 +17,3 @@ mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \
 		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o
 
 mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o
-
-mt76x2-common-y := \
-	mt76x2_eeprom.o mt76x2_tx_common.o mt76x2_mac_common.o \
-	mt76x2_init_common.o mt76x2_common.o mt76x2_phy_common.o \
-	mt76x2_debugfs.o mt76x2_mcu_common.o
-
-mt76x2e-y := \
-	mt76x2_pci.o mt76x2_dma.o \
-	mt76x2_main.o mt76x2_init.o mt76x2_tx.o \
-	mt76x2_core.o mt76x2_mac.o mt76x2_mcu.o mt76x2_phy.o \
-	mt76x2_dfs.o mt76x2_trace.o
-
-mt76x2u-y := \
-	mt76x2_usb.o mt76x2u_init.o mt76x2u_main.o mt76x2u_mac.o \
-	mt76x2u_mcu.o mt76x2u_phy.o mt76x2u_core.o
-
diff --git a/mt76x2/Makefile b/mt76x2/Makefile
new file mode 100644
index 00000000..2b5a3164
--- /dev/null
+++ b/mt76x2/Makefile
@@ -0,0 +1,18 @@
+obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o
+obj-$(CONFIG_MT76x2E) += mt76x2e.o
+obj-$(CONFIG_MT76x2U) += mt76x2u.o
+
+mt76x2-common-y := \
+	eeprom.o tx.o mac.o init.o common.o phy.o \
+	debugfs.o mcu.o
+
+mt76x2e-y := \
+	pci.o pci_dma.o pci_main.o pci_init.o pci_tx.o \
+	pci_core.o pci_mac.o pci_mcu.o pci_phy.o \
+	pci_dfs.o pci_trace.o
+
+mt76x2u-y := \
+	usb.o usb_init.o usb_main.o usb_mac.o usb_mcu.o \
+	usb_phy.o usb_core.o
+
+CFLAGS_pci_trace.o := -I$(src)
diff --git a/mt76x2_common.c b/mt76x2/common.c
similarity index 98%
rename from mt76x2_common.c
rename to mt76x2/common.c
index 3e667d8c..fa6bad3b 100644
--- a/mt76x2_common.c
+++ b/mt76x2/common.c
@@ -16,7 +16,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_mac.h"
+#include "../mt76x02_mac.h"
 
 void mt76x2_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
 			 struct sk_buff *skb)
diff --git a/mt76x2_debugfs.c b/mt76x2/debugfs.c
similarity index 100%
rename from mt76x2_debugfs.c
rename to mt76x2/debugfs.c
diff --git a/mt76x2_dfs.h b/mt76x2/dfs.h
similarity index 100%
rename from mt76x2_dfs.h
rename to mt76x2/dfs.h
diff --git a/mt76x2_eeprom.c b/mt76x2/eeprom.c
similarity index 99%
rename from mt76x2_eeprom.c
rename to mt76x2/eeprom.c
index 136faa40..55eda67f 100644
--- a/mt76x2_eeprom.c
+++ b/mt76x2/eeprom.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <asm/unaligned.h>
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
+#include "eeprom.h"
 
 #define EE_FIELD(_name, _value) [MT_EE_##_name] = (_value) | 1
 
diff --git a/mt76x2_eeprom.h b/mt76x2/eeprom.h
similarity index 98%
rename from mt76x2_eeprom.h
rename to mt76x2/eeprom.h
index c2e99bbe..33277c7b 100644
--- a/mt76x2_eeprom.h
+++ b/mt76x2/eeprom.h
@@ -17,7 +17,7 @@
 #ifndef __MT76x2_EEPROM_H
 #define __MT76x2_EEPROM_H
 
-#include "mt76x02_eeprom.h"
+#include "../mt76x02_eeprom.h"
 
 enum mt76x2_cal_channel_group {
 	MT_CH_5G_JAPAN,
diff --git a/mt76x2_init_common.c b/mt76x2/init.c
similarity index 99%
rename from mt76x2_init_common.c
rename to mt76x2/init.c
index f4c4cde9..d6727719 100644
--- a/mt76x2_init_common.c
+++ b/mt76x2/init.c
@@ -16,8 +16,8 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_phy.h"
+#include "eeprom.h"
+#include "../mt76x02_phy.h"
 
 static void
 mt76x2_set_wlan_state(struct mt76x2_dev *dev, bool enable)
diff --git a/mt76x2_mac_common.c b/mt76x2/mac.c
similarity index 99%
rename from mt76x2_mac_common.c
rename to mt76x2/mac.c
index ed4f56a3..568bac76 100644
--- a/mt76x2_mac_common.c
+++ b/mt76x2/mac.c
@@ -16,7 +16,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_mac_stop(struct mt76x2_dev *dev, bool force)
 {
diff --git a/mt76x2_mac.h b/mt76x2/mac.h
similarity index 97%
rename from mt76x2_mac.h
rename to mt76x2/mac.h
index 66a57294..b2176f9a 100644
--- a/mt76x2_mac.h
+++ b/mt76x2/mac.h
@@ -17,8 +17,8 @@
 #ifndef __MT76x2_MAC_H
 #define __MT76x2_MAC_H
 
-#include "mt76.h"
-#include "mt76x02_mac.h"
+#include "../mt76.h"
+#include "../mt76x02_mac.h"
 
 struct mt76x2_dev;
 struct mt76x2_sta;
diff --git a/mt76x2_mcu_common.c b/mt76x2/mcu.c
similarity index 97%
rename from mt76x2_mcu_common.c
rename to mt76x2/mcu.c
index eff48333..86b09534 100644
--- a/mt76x2_mcu_common.c
+++ b/mt76x2/mcu.c
@@ -20,9 +20,9 @@
 #include <linux/delay.h>
 
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_dma.h"
+#include "mcu.h"
+#include "eeprom.h"
+#include "../mt76x02_dma.h"
 
 int mt76x2_mcu_set_channel(struct mt76x2_dev *dev, u8 channel, u8 bw,
 			   u8 bw_index, bool scan)
diff --git a/mt76x2_mcu.h b/mt76x2/mcu.h
similarity index 99%
rename from mt76x2_mcu.h
rename to mt76x2/mcu.h
index fa72d5a5..98a73e28 100644
--- a/mt76x2_mcu.h
+++ b/mt76x2/mcu.h
@@ -17,7 +17,7 @@
 #ifndef __MT76x2_MCU_H
 #define __MT76x2_MCU_H
 
-#include "mt76x02_mcu.h"
+#include "../mt76x02_mcu.h"
 
 /* Register definitions */
 #define MT_MCU_CPU_CTL			0x0704
diff --git a/mt76x2.h b/mt76x2/mt76x2.h
similarity index 98%
rename from mt76x2.h
rename to mt76x2/mt76x2.h
index d6ccab06..ecbb9e4a 100644
--- a/mt76x2.h
+++ b/mt76x2/mt76x2.h
@@ -39,10 +39,10 @@
 
 #define MT_CALIBRATE_INTERVAL	HZ
 
-#include "mt76.h"
-#include "mt76x02_regs.h"
-#include "mt76x2_mac.h"
-#include "mt76x2_dfs.h"
+#include "../mt76.h"
+#include "../mt76x02_regs.h"
+#include "mac.h"
+#include "dfs.h"
 
 struct mt76x2_rx_freq_cal {
 	s8 high_gain[MT_MAX_CHAINS];
diff --git a/mt76x2u.h b/mt76x2/mt76x2u.h
similarity index 98%
rename from mt76x2u.h
rename to mt76x2/mt76x2u.h
index 5d2ebdf4..969e8e15 100644
--- a/mt76x2u.h
+++ b/mt76x2/mt76x2u.h
@@ -20,8 +20,8 @@
 #include <linux/device.h>
 
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x02_dma.h"
+#include "mcu.h"
+#include "../mt76x02_dma.h"
 
 #define MT7612U_EEPROM_SIZE		512
 
diff --git a/mt76x2_pci.c b/mt76x2/pci.c
similarity index 99%
rename from mt76x2_pci.c
rename to mt76x2/pci.c
index 26cfda24..49556bec 100644
--- a/mt76x2_pci.c
+++ b/mt76x2/pci.c
@@ -19,7 +19,7 @@
 #include <linux/pci.h>
 
 #include "mt76x2.h"
-#include "mt76x2_trace.h"
+#include "trace.h"
 
 static const struct pci_device_id mt76pci_device_table[] = {
 	{ PCI_DEVICE(0x14c3, 0x7662) },
diff --git a/mt76x2_core.c b/mt76x2/pci_core.c
similarity index 97%
rename from mt76x2_core.c
rename to mt76x2/pci_core.c
index 06e47f96..b343742b 100644
--- a/mt76x2_core.c
+++ b/mt76x2/pci_core.c
@@ -16,8 +16,8 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_trace.h"
-#include "mt76x02_util.h"
+#include "trace.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
 {
diff --git a/mt76x2_dfs.c b/mt76x2/pci_dfs.c
similarity index 99%
rename from mt76x2_dfs.c
rename to mt76x2/pci_dfs.c
index 8cfa3a06..18926a64 100644
--- a/mt76x2_dfs.c
+++ b/mt76x2/pci_dfs.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 #define RADAR_SPEC(m, len, el, eh, wl, wh,		\
 		   w_tolerance, tl, th, t_tolerance,	\
diff --git a/mt76x2_dma.c b/mt76x2/pci_dma.c
similarity index 95%
rename from mt76x2_dma.c
rename to mt76x2/pci_dma.c
index 7e5eccda..fdd5103e 100644
--- a/mt76x2_dma.c
+++ b/mt76x2/pci_dma.c
@@ -15,8 +15,8 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_dma.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_dma.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_tx_tasklet(unsigned long data)
 {
diff --git a/mt76x2_init.c b/mt76x2/pci_init.c
similarity index 99%
rename from mt76x2_init.c
rename to mt76x2/pci_init.c
index 3f77c13a..7036f4cb 100644
--- a/mt76x2_init.c
+++ b/mt76x2/pci_init.c
@@ -16,10 +16,10 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x2_mcu.h"
-#include "mt76x02_util.h"
-#include "mt76x02_dma.h"
+#include "eeprom.h"
+#include "mcu.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_dma.h"
 
 static void
 mt76x2_mac_pbf_init(struct mt76x2_dev *dev)
diff --git a/mt76x2_mac.c b/mt76x2/pci_mac.c
similarity index 98%
rename from mt76x2_mac.c
rename to mt76x2/pci_mac.c
index bb9c0a05..c1be3fe8 100644
--- a/mt76x2_mac.c
+++ b/mt76x2/pci_mac.c
@@ -16,10 +16,10 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x2_trace.h"
-#include "mt76x02_util.h"
+#include "mcu.h"
+#include "eeprom.h"
+#include "trace.h"
+#include "../mt76x02_util.h"
 
 void mt76x2_mac_set_bssid(struct mt76x2_dev *dev, u8 idx, const u8 *addr)
 {
diff --git a/mt76x2_main.c b/mt76x2/pci_main.c
similarity index 99%
rename from mt76x2_main.c
rename to mt76x2/pci_main.c
index 63691b68..521c9265 100644
--- a/mt76x2_main.c
+++ b/mt76x2/pci_main.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 static int
 mt76x2_start(struct ieee80211_hw *hw)
diff --git a/mt76x2_mcu.c b/mt76x2/pci_mcu.c
similarity index 98%
rename from mt76x2_mcu.c
rename to mt76x2/pci_mcu.c
index 55716fd7..38fa84bd 100644
--- a/mt76x2_mcu.c
+++ b/mt76x2/pci_mcu.c
@@ -19,9 +19,9 @@
 #include <linux/delay.h>
 
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_dma.h"
+#include "mcu.h"
+#include "eeprom.h"
+#include "../mt76x02_dma.h"
 
 static int
 mt76pci_load_rom_patch(struct mt76x2_dev *dev)
diff --git a/mt76x2_phy.c b/mt76x2/pci_phy.c
similarity index 99%
rename from mt76x2_phy.c
rename to mt76x2/pci_phy.c
index 22e66006..39260131 100644
--- a/mt76x2_phy.c
+++ b/mt76x2/pci_phy.c
@@ -16,8 +16,8 @@
 
 #include <linux/delay.h>
 #include "mt76x2.h"
-#include "mt76x2_mcu.h"
-#include "mt76x2_eeprom.h"
+#include "mcu.h"
+#include "eeprom.h"
 
 static bool
 mt76x2_phy_tssi_init_cal(struct mt76x2_dev *dev)
diff --git a/mt76x2_trace.c b/mt76x2/pci_trace.c
similarity index 97%
rename from mt76x2_trace.c
rename to mt76x2/pci_trace.c
index a09f1178..ea4ab872 100644
--- a/mt76x2_trace.c
+++ b/mt76x2/pci_trace.c
@@ -18,6 +18,6 @@
 
 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
-#include "mt76x2_trace.h"
+#include "trace.h"
 
 #endif
diff --git a/mt76x2_tx.c b/mt76x2/pci_tx.c
similarity index 98%
rename from mt76x2_tx.c
rename to mt76x2/pci_tx.c
index fcdf1879..69dc1f36 100644
--- a/mt76x2_tx.c
+++ b/mt76x2/pci_tx.c
@@ -15,8 +15,8 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x02_util.h"
-#include "mt76x02_dma.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_dma.h"
 
 struct beacon_bc_data {
 	struct mt76x2_dev *dev;
diff --git a/mt76x2_phy_common.c b/mt76x2/phy.c
similarity index 99%
rename from mt76x2_phy_common.c
rename to mt76x2/phy.c
index dd32e756..b3ecb803 100644
--- a/mt76x2_phy_common.c
+++ b/mt76x2/phy.c
@@ -16,9 +16,9 @@
  */
 
 #include "mt76x2.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x2_mcu.h"
-#include "mt76x02_phy.h"
+#include "eeprom.h"
+#include "mcu.h"
+#include "../mt76x02_phy.h"
 
 static void
 mt76x2_adjust_high_lna_gain(struct mt76x2_dev *dev, int reg, s8 offset)
diff --git a/mt76x2_trace.h b/mt76x2/trace.h
similarity index 97%
rename from mt76x2_trace.h
rename to mt76x2/trace.h
index eb5afeae..7953bd5e 100644
--- a/mt76x2_trace.h
+++ b/mt76x2/trace.h
@@ -137,8 +137,8 @@ TRACE_EVENT(dev_irq,
 #endif
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH mt76x2
 #undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE mt76x2_trace
+#define TRACE_INCLUDE_FILE trace
 
 #include <trace/define_trace.h>
diff --git a/mt76x2_tx_common.c b/mt76x2/tx.c
similarity index 99%
rename from mt76x2_tx_common.c
rename to mt76x2/tx.c
index 1ec3c293..aea14260 100644
--- a/mt76x2_tx_common.c
+++ b/mt76x2/tx.c
@@ -16,7 +16,7 @@
  */
 
 #include "mt76x2.h"
-#include "dma.h"
+#include "../dma.h"
 
 void mt76x2_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
 	       struct sk_buff *skb)
diff --git a/mt76x2_usb.c b/mt76x2/usb.c
similarity index 99%
rename from mt76x2_usb.c
rename to mt76x2/usb.c
index feb5cec6..b0c17210 100644
--- a/mt76x2_usb.c
+++ b/mt76x2/usb.c
@@ -17,7 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "mt76x02_usb.h"
+#include "../mt76x02_usb.h"
 #include "mt76x2u.h"
 
 static const struct usb_device_id mt76x2u_device_table[] = {
diff --git a/mt76x2u_core.c b/mt76x2/usb_core.c
similarity index 95%
rename from mt76x2u_core.c
rename to mt76x2/usb_core.c
index c2ccdebc..6eb7b28d 100644
--- a/mt76x2u_core.c
+++ b/mt76x2/usb_core.c
@@ -15,9 +15,9 @@
  */
 
 #include "mt76x2u.h"
-#include "dma.h"
-#include "mt76x02_util.h"
-#include "mt76x02_usb.h"
+#include "../dma.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_usb.h"
 
 static int
 mt76x2u_check_skb_rooms(struct sk_buff *skb)
diff --git a/mt76x2u_init.c b/mt76x2/usb_init.c
similarity index 99%
rename from mt76x2u_init.c
rename to mt76x2/usb_init.c
index 5759a72d..55e0dea5 100644
--- a/mt76x2u_init.c
+++ b/mt76x2/usb_init.c
@@ -17,9 +17,9 @@
 #include <linux/delay.h>
 
 #include "mt76x2u.h"
-#include "mt76x02_util.h"
-#include "mt76x02_phy.h"
-#include "mt76x2_eeprom.h"
+#include "../mt76x02_util.h"
+#include "../mt76x02_phy.h"
+#include "eeprom.h"
 
 static void mt76x2u_init_dma(struct mt76x2_dev *dev)
 {
diff --git a/mt76x2u_mac.c b/mt76x2/usb_mac.c
similarity index 99%
rename from mt76x2u_mac.c
rename to mt76x2/usb_mac.c
index f28c6fbc..ae89461f 100644
--- a/mt76x2u_mac.c
+++ b/mt76x2/usb_mac.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2u.h"
-#include "mt76x2_eeprom.h"
+#include "eeprom.h"
 
 static void mt76x2u_mac_reset_counters(struct mt76x2_dev *dev)
 {
diff --git a/mt76x2u_main.c b/mt76x2/usb_main.c
similarity index 99%
rename from mt76x2u_main.c
rename to mt76x2/usb_main.c
index a8070456..26f1c04e 100644
--- a/mt76x2u_main.c
+++ b/mt76x2/usb_main.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2u.h"
-#include "mt76x02_util.h"
+#include "../mt76x02_util.h"
 
 static int mt76x2u_start(struct ieee80211_hw *hw)
 {
diff --git a/mt76x2u_mcu.c b/mt76x2/usb_mcu.c
similarity index 99%
rename from mt76x2u_mcu.c
rename to mt76x2/usb_mcu.c
index fdd94cad..35e157be 100644
--- a/mt76x2u_mcu.c
+++ b/mt76x2/usb_mcu.c
@@ -17,8 +17,8 @@
 #include <linux/firmware.h>
 
 #include "mt76x2u.h"
-#include "mt76x2_eeprom.h"
-#include "mt76x02_usb.h"
+#include "eeprom.h"
+#include "../mt76x02_usb.h"
 
 #define MT_CMD_HDR_LEN			4
 
diff --git a/mt76x2u_phy.c b/mt76x2/usb_phy.c
similarity index 99%
rename from mt76x2u_phy.c
rename to mt76x2/usb_phy.c
index 06362d34..9dd1943a 100644
--- a/mt76x2u_phy.c
+++ b/mt76x2/usb_phy.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2u.h"
-#include "mt76x2_eeprom.h"
+#include "eeprom.h"
 
 void mt76x2u_phy_channel_calibrate(struct mt76x2_dev *dev)
 {