diff --git a/Makefile b/Makefile
index c372faa..6cb9b80 100755
--- a/Makefile
+++ b/Makefile
@@ -417,49 +417,49 @@ endif
 
 ifneq ($(KERNELRELEASE),)
 
-rtk_core :=	core/rtw_cmd.o \
-		core/rtw_security.o \
-		core/rtw_debug.o \
-		core/rtw_io.o \
-		core/rtw_ioctl_query.o \
-		core/rtw_ioctl_set.o \
-		core/rtw_ieee80211.o \
-		core/rtw_mlme.o \
-		core/rtw_mlme_ext.o \
-		core/rtw_mi.o \
-		core/rtw_wlan_util.o \
-		core/rtw_pwrctrl.o \
-		core/rtw_rf.o \
-		core/rtw_recv.o \
-		core/rtw_sta_mgt.o \
-		core/rtw_ap.o \
-		core/rtw_xmit.o	\
-		core/rtw_p2p.o \
-		core/rtw_tdls.o \
-		core/rtw_br_ext.o \
-		core/rtw_iol.o \
-		core/rtw_sreset.o \
-		core/rtw_btcoex_wifionly.o \
-		core/rtw_btcoex.o \
-		core/rtw_beamforming.o \
-		core/rtw_odm.o \
-		core/rtw_efuse.o 
+rtk_core :=	rtw_cmd.o \
+		rtw_security.o \
+		rtw_debug.o \
+		rtw_io.o \
+		rtw_ioctl_query.o \
+		rtw_ioctl_set.o \
+		rtw_ieee80211.o \
+		rtw_mlme.o \
+		rtw_mlme_ext.o \
+		rtw_mi.o \
+		rtw_wlan_util.o \
+		rtw_pwrctrl.o \
+		rtw_rf.o \
+		rtw_recv.o \
+		rtw_sta_mgt.o \
+		rtw_ap.o \
+		rtw_xmit.o	\
+		rtw_p2p.o \
+		rtw_tdls.o \
+		rtw_br_ext.o \
+		rtw_iol.o \
+		rtw_sreset.o \
+		rtw_btcoex_wifionly.o \
+		rtw_btcoex.o \
+		rtw_beamforming.o \
+		rtw_odm.o \
+		rtw_efuse.o 
 
 8188eu-y += $(rtk_core)
 
-8188eu-$(CONFIG_INTEL_WIDI) += core/rtw_intel_widi.o
+8188eu-$(CONFIG_INTEL_WIDI) += rtw_intel_widi.o
 
-8188eu-$(CONFIG_WAPI_SUPPORT) += core/rtw_wapi.o	\
-					core/rtw_wapi_sms4.o
+8188eu-$(CONFIG_WAPI_SUPPORT) += rtw_wapi.o	\
+					rtw_wapi_sms4.o
 
 8188eu-y += $(_OS_INTFS_FILES)
 8188eu-y += $(_HAL_INTFS_FILES)
 8188eu-y += $(_OUTSRC_FILES)
 
-8188eu-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o
+8188eu-$(CONFIG_MP_INCLUDED) += rtw_mp.o
 
 ifeq ($(CONFIG_RTL8723B), y)
-8188eu-$(CONFIG_MP_INCLUDED)+= core/rtw_bt_mp.o
+8188eu-$(CONFIG_MP_INCLUDED)+= rtw_bt_mp.o
 endif
 
 obj-m := 8188eu.o
diff --git a/core/rtw_ap.c b/rtw_ap.c
similarity index 100%
rename from core/rtw_ap.c
rename to rtw_ap.c
diff --git a/core/rtw_beamforming.c b/rtw_beamforming.c
similarity index 100%
rename from core/rtw_beamforming.c
rename to rtw_beamforming.c
diff --git a/core/rtw_br_ext.c b/rtw_br_ext.c
similarity index 100%
rename from core/rtw_br_ext.c
rename to rtw_br_ext.c
diff --git a/core/rtw_btcoex.c b/rtw_btcoex.c
similarity index 100%
rename from core/rtw_btcoex.c
rename to rtw_btcoex.c
diff --git a/core/rtw_btcoex_wifionly.c b/rtw_btcoex_wifionly.c
similarity index 100%
rename from core/rtw_btcoex_wifionly.c
rename to rtw_btcoex_wifionly.c
diff --git a/core/rtw_cmd.c b/rtw_cmd.c
similarity index 100%
rename from core/rtw_cmd.c
rename to rtw_cmd.c
diff --git a/core/rtw_debug.c b/rtw_debug.c
similarity index 100%
rename from core/rtw_debug.c
rename to rtw_debug.c
diff --git a/core/rtw_efuse.c b/rtw_efuse.c
similarity index 100%
rename from core/rtw_efuse.c
rename to rtw_efuse.c
diff --git a/core/rtw_ieee80211.c b/rtw_ieee80211.c
similarity index 100%
rename from core/rtw_ieee80211.c
rename to rtw_ieee80211.c
diff --git a/core/rtw_io.c b/rtw_io.c
similarity index 100%
rename from core/rtw_io.c
rename to rtw_io.c
diff --git a/core/rtw_ioctl_query.c b/rtw_ioctl_query.c
similarity index 100%
rename from core/rtw_ioctl_query.c
rename to rtw_ioctl_query.c
diff --git a/core/rtw_ioctl_set.c b/rtw_ioctl_set.c
similarity index 100%
rename from core/rtw_ioctl_set.c
rename to rtw_ioctl_set.c
diff --git a/core/rtw_iol.c b/rtw_iol.c
similarity index 100%
rename from core/rtw_iol.c
rename to rtw_iol.c
diff --git a/core/rtw_led.c b/rtw_led.c
similarity index 100%
rename from core/rtw_led.c
rename to rtw_led.c
diff --git a/core/rtw_mi.c b/rtw_mi.c
similarity index 100%
rename from core/rtw_mi.c
rename to rtw_mi.c
diff --git a/core/rtw_mlme.c b/rtw_mlme.c
similarity index 100%
rename from core/rtw_mlme.c
rename to rtw_mlme.c
diff --git a/core/rtw_mlme_ext.c b/rtw_mlme_ext.c
similarity index 100%
rename from core/rtw_mlme_ext.c
rename to rtw_mlme_ext.c
diff --git a/core/rtw_mp.c b/rtw_mp.c
similarity index 100%
rename from core/rtw_mp.c
rename to rtw_mp.c
diff --git a/core/rtw_odm.c b/rtw_odm.c
similarity index 100%
rename from core/rtw_odm.c
rename to rtw_odm.c
diff --git a/core/rtw_p2p.c b/rtw_p2p.c
similarity index 100%
rename from core/rtw_p2p.c
rename to rtw_p2p.c
diff --git a/core/rtw_pwrctrl.c b/rtw_pwrctrl.c
similarity index 100%
rename from core/rtw_pwrctrl.c
rename to rtw_pwrctrl.c
diff --git a/core/rtw_recv.c b/rtw_recv.c
similarity index 100%
rename from core/rtw_recv.c
rename to rtw_recv.c
diff --git a/core/rtw_rf.c b/rtw_rf.c
similarity index 100%
rename from core/rtw_rf.c
rename to rtw_rf.c
diff --git a/core/rtw_security.c b/rtw_security.c
similarity index 100%
rename from core/rtw_security.c
rename to rtw_security.c
diff --git a/core/rtw_sreset.c b/rtw_sreset.c
similarity index 100%
rename from core/rtw_sreset.c
rename to rtw_sreset.c
diff --git a/core/rtw_sta_mgt.c b/rtw_sta_mgt.c
similarity index 100%
rename from core/rtw_sta_mgt.c
rename to rtw_sta_mgt.c
diff --git a/core/rtw_tdls.c b/rtw_tdls.c
similarity index 100%
rename from core/rtw_tdls.c
rename to rtw_tdls.c
diff --git a/core/rtw_wlan_util.c b/rtw_wlan_util.c
similarity index 100%
rename from core/rtw_wlan_util.c
rename to rtw_wlan_util.c
diff --git a/core/rtw_xmit.c b/rtw_xmit.c
similarity index 100%
rename from core/rtw_xmit.c
rename to rtw_xmit.c