diff --git a/Makefile b/Makefile
index b38f5e0c..1686a78c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ EXTRA_CFLAGS += -Werror
 
 obj-m := mt76.o
 obj-$(CONFIG_MT76X2E) += mt76x2e.o
-obj-$(CONFIG_MT7603E) += mt7603e.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
@@ -35,7 +35,3 @@ mt76x2u-y := \
 	mt76x2_usb.o mt76x2u_init.o mt76x2u_main.o mt76x2u_mac.o \
 	mt76x2u_mcu.o mt76x2u_phy.o mt76x2u_core.o
 
-mt7603e-y := \
-	mt7603_pci.o mt7603_soc.o mt7603_main.o mt7603_init.o mt7603_mcu.o \
-	mt7603_core.o mt7603_dma.o mt7603_mac.o mt7603_eeprom.o \
-	mt7603_beacon.o mt7603_debugfs.o
diff --git a/mt7603/Makefile b/mt7603/Makefile
new file mode 100644
index 00000000..15c0931a
--- /dev/null
+++ b/mt7603/Makefile
@@ -0,0 +1,6 @@
+obj-m := mt7603e.o
+
+mt7603e-y := \
+	pci.o soc.o main.o init.o mcu.o \
+	core.o dma.o mac.o eeprom.o \
+	beacon.o debugfs.o
diff --git a/mt7603_beacon.c b/mt7603/beacon.c
similarity index 100%
rename from mt7603_beacon.c
rename to mt7603/beacon.c
diff --git a/mt7603_core.c b/mt7603/core.c
similarity index 100%
rename from mt7603_core.c
rename to mt7603/core.c
diff --git a/mt7603_debugfs.c b/mt7603/debugfs.c
similarity index 100%
rename from mt7603_debugfs.c
rename to mt7603/debugfs.c
diff --git a/mt7603_dma.c b/mt7603/dma.c
similarity index 99%
rename from mt7603_dma.c
rename to mt7603/dma.c
index 001e42c8..a82bedaf 100644
--- a/mt7603_dma.c
+++ b/mt7603/dma.c
@@ -15,8 +15,8 @@
  */
 
 #include "mt7603.h"
-#include "mt7603_mac.h"
-#include "dma.h"
+#include "mac.h"
+#include "../dma.h"
 
 int
 mt7603_tx_queue_mcu(struct mt7603_dev *dev, enum mt76_txq_id qid,
diff --git a/mt7603_eeprom.c b/mt7603/eeprom.c
similarity index 99%
rename from mt7603_eeprom.c
rename to mt7603/eeprom.c
index 00899a09..9476aca7 100644
--- a/mt7603_eeprom.c
+++ b/mt7603/eeprom.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt7603.h"
-#include "mt7603_eeprom.h"
+#include "eeprom.h"
 
 static int
 mt7603_efuse_read(struct mt7603_dev *dev, u32 base, u16 addr, u8 *data)
diff --git a/mt7603_eeprom.h b/mt7603/eeprom.h
similarity index 100%
rename from mt7603_eeprom.h
rename to mt7603/eeprom.h
diff --git a/mt7603_init.c b/mt7603/init.c
similarity index 99%
rename from mt7603_init.c
rename to mt7603/init.c
index 0ba8fe37..3cc39808 100644
--- a/mt7603_init.c
+++ b/mt7603/init.c
@@ -16,8 +16,8 @@
 
 #include <linux/etherdevice.h>
 #include "mt7603.h"
-#include "mt7603_mac.h"
-#include "mt7603_eeprom.h"
+#include "mac.h"
+#include "eeprom.h"
 
 struct mt7603_dev *mt7603_alloc_device(struct device *pdev)
 {
diff --git a/mt7603_mac.c b/mt7603/mac.c
similarity index 99%
rename from mt7603_mac.c
rename to mt7603/mac.c
index 0c0dc1ae..2029b186 100644
--- a/mt7603_mac.c
+++ b/mt7603/mac.c
@@ -17,7 +17,7 @@
 #include <linux/etherdevice.h>
 #include <linux/timekeeping.h>
 #include "mt7603.h"
-#include "mt7603_mac.h"
+#include "mac.h"
 
 #define MT_PSE_PAGE_SIZE	128
 
diff --git a/mt7603_mac.h b/mt7603/mac.h
similarity index 100%
rename from mt7603_mac.h
rename to mt7603/mac.h
diff --git a/mt7603_main.c b/mt7603/main.c
similarity index 99%
rename from mt7603_main.c
rename to mt7603/main.c
index 8b9d4cbb..a42ecce2 100644
--- a/mt7603_main.c
+++ b/mt7603/main.c
@@ -19,7 +19,7 @@
 #include <linux/pci.h>
 #include <linux/module.h>
 #include "mt7603.h"
-#include "mt7603_eeprom.h"
+#include "eeprom.h"
 
 static int
 mt7603_start(struct ieee80211_hw *hw)
diff --git a/mt7603_mcu.c b/mt7603/mcu.c
similarity index 99%
rename from mt7603_mcu.c
rename to mt7603/mcu.c
index be49e02a..86700c05 100644
--- a/mt7603_mcu.c
+++ b/mt7603/mcu.c
@@ -16,8 +16,8 @@
 
 #include <linux/firmware.h>
 #include "mt7603.h"
-#include "mt7603_mcu.h"
-#include "mt7603_eeprom.h"
+#include "mcu.h"
+#include "eeprom.h"
 
 #define MCU_SKB_RESERVE	8
 
diff --git a/mt7603_mcu.h b/mt7603/mcu.h
similarity index 100%
rename from mt7603_mcu.h
rename to mt7603/mcu.h
diff --git a/mt7603.h b/mt7603/mt7603.h
similarity index 99%
rename from mt7603.h
rename to mt7603/mt7603.h
index 0f96bf9c..1097c142 100644
--- a/mt7603.h
+++ b/mt7603/mt7603.h
@@ -19,8 +19,8 @@
 
 #include <linux/interrupt.h>
 #include <linux/ktime.h>
-#include "mt76.h"
-#include "mt7603_regs.h"
+#include "../mt76.h"
+#include "regs.h"
 
 #define MT7603_MAX_INTERFACES	4
 #define MT7603_WTBL_SIZE	128
diff --git a/mt7603_pci.c b/mt7603/pci.c
similarity index 100%
rename from mt7603_pci.c
rename to mt7603/pci.c
diff --git a/mt7603_regs.h b/mt7603/regs.h
similarity index 100%
rename from mt7603_regs.h
rename to mt7603/regs.h
diff --git a/mt7603_soc.c b/mt7603/soc.c
similarity index 100%
rename from mt7603_soc.c
rename to mt7603/soc.c