diff --git a/Makefile b/Makefile
index b5522ab..f4bb5dd 100755
--- a/Makefile
+++ b/Makefile
@@ -175,31 +175,31 @@ endif
 
 
 _OS_INTFS_FILES :=	os_dep/osdep_service.o \
-			os_dep/linux/os_intfs.o \
-			os_dep/linux/$(HCI_NAME)_intf.o \
-			os_dep/linux/$(HCI_NAME)_ops_linux.o \
-			os_dep/linux/ioctl_linux.o \
-			os_dep/linux/xmit_linux.o \
-			os_dep/linux/mlme_linux.o \
-			os_dep/linux/recv_linux.o \
-			os_dep/linux/ioctl_cfg80211.o \
-			os_dep/linux/rtw_cfgvendor.o \
-			os_dep/linux/wifi_regd.o \
-			os_dep/linux/rtw_android.o \
-			os_dep/linux/rtw_proc.o
+			os_dep/os_intfs.o \
+			os_dep/$(HCI_NAME)_intf.o \
+			os_dep/$(HCI_NAME)_ops_linux.o \
+			os_dep/ioctl_linux.o \
+			os_dep/xmit_linux.o \
+			os_dep/mlme_linux.o \
+			os_dep/recv_linux.o \
+			os_dep/ioctl_cfg80211.o \
+			os_dep/rtw_cfgvendor.o \
+			os_dep/wifi_regd.o \
+			os_dep/rtw_android.o \
+			os_dep/rtw_proc.o
 
 ifeq ($(CONFIG_MP_INCLUDED), y)
-_OS_INTFS_FILES += os_dep/linux/ioctl_mp.o
+_OS_INTFS_FILES += os_dep/ioctl_mp.o
 endif
 
 ifeq ($(CONFIG_SDIO_HCI), y)
-_OS_INTFS_FILES += os_dep/linux/custom_gpio_linux.o
-_OS_INTFS_FILES += os_dep/linux/$(HCI_NAME)_ops_linux.o
+_OS_INTFS_FILES += os_dep/custom_gpio_linux.o
+_OS_INTFS_FILES += os_dep/$(HCI_NAME)_ops_linux.o
 endif
 
 ifeq ($(CONFIG_GSPI_HCI), y)
-_OS_INTFS_FILES += os_dep/linux/custom_gpio_linux.o
-_OS_INTFS_FILES += os_dep/linux/$(HCI_NAME)_ops_linux.o
+_OS_INTFS_FILES += os_dep/custom_gpio_linux.o
+_OS_INTFS_FILES += os_dep/$(HCI_NAME)_ops_linux.o
 endif
 
 
diff --git a/include/osdep_intf.h b/include/osdep_intf.h
index 7381d5d..3a03159 100644
--- a/include/osdep_intf.h
+++ b/include/osdep_intf.h
@@ -104,10 +104,10 @@ u16 rtw_recv_select_queue(struct sk_buff *skb);
 int rtw_ndev_notifier_register(void);
 void rtw_ndev_notifier_unregister(void);
 
-#include "../os_dep/linux/rtw_proc.h"
+#include "../os_dep/rtw_proc.h"
 
 #ifdef CONFIG_IOCTL_CFG80211
-	#include "../os_dep/linux/ioctl_cfg80211.h"
+	#include "../os_dep/ioctl_cfg80211.h"
 #endif /* CONFIG_IOCTL_CFG80211 */
 
 u8 rtw_rtnl_lock_needed(struct dvobj_priv *dvobj);
diff --git a/os_dep/linux/custom_gpio_linux.c b/os_dep/custom_gpio_linux.c
similarity index 100%
rename from os_dep/linux/custom_gpio_linux.c
rename to os_dep/custom_gpio_linux.c
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c
similarity index 100%
rename from os_dep/linux/ioctl_cfg80211.c
rename to os_dep/ioctl_cfg80211.c
diff --git a/os_dep/linux/ioctl_cfg80211.h b/os_dep/ioctl_cfg80211.h
similarity index 100%
rename from os_dep/linux/ioctl_cfg80211.h
rename to os_dep/ioctl_cfg80211.h
diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/ioctl_linux.c
similarity index 100%
rename from os_dep/linux/ioctl_linux.c
rename to os_dep/ioctl_linux.c
diff --git a/os_dep/linux/ioctl_mp.c b/os_dep/ioctl_mp.c
similarity index 100%
rename from os_dep/linux/ioctl_mp.c
rename to os_dep/ioctl_mp.c
diff --git a/os_dep/linux/mlme_linux.c b/os_dep/mlme_linux.c
similarity index 100%
rename from os_dep/linux/mlme_linux.c
rename to os_dep/mlme_linux.c
diff --git a/os_dep/linux/os_intfs.c b/os_dep/os_intfs.c
similarity index 100%
rename from os_dep/linux/os_intfs.c
rename to os_dep/os_intfs.c
diff --git a/os_dep/linux/recv_linux.c b/os_dep/recv_linux.c
similarity index 100%
rename from os_dep/linux/recv_linux.c
rename to os_dep/recv_linux.c
diff --git a/os_dep/linux/rtw_android.c b/os_dep/rtw_android.c
similarity index 100%
rename from os_dep/linux/rtw_android.c
rename to os_dep/rtw_android.c
diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/rtw_cfgvendor.c
similarity index 100%
rename from os_dep/linux/rtw_cfgvendor.c
rename to os_dep/rtw_cfgvendor.c
diff --git a/os_dep/linux/rtw_cfgvendor.h b/os_dep/rtw_cfgvendor.h
similarity index 100%
rename from os_dep/linux/rtw_cfgvendor.h
rename to os_dep/rtw_cfgvendor.h
diff --git a/os_dep/linux/rtw_proc.c b/os_dep/rtw_proc.c
similarity index 100%
rename from os_dep/linux/rtw_proc.c
rename to os_dep/rtw_proc.c
diff --git a/os_dep/linux/rtw_proc.h b/os_dep/rtw_proc.h
similarity index 100%
rename from os_dep/linux/rtw_proc.h
rename to os_dep/rtw_proc.h
diff --git a/os_dep/linux/usb_intf.c b/os_dep/usb_intf.c
similarity index 100%
rename from os_dep/linux/usb_intf.c
rename to os_dep/usb_intf.c
diff --git a/os_dep/linux/usb_ops_linux.c b/os_dep/usb_ops_linux.c
similarity index 100%
rename from os_dep/linux/usb_ops_linux.c
rename to os_dep/usb_ops_linux.c
diff --git a/os_dep/linux/wifi_regd.c b/os_dep/wifi_regd.c
similarity index 100%
rename from os_dep/linux/wifi_regd.c
rename to os_dep/wifi_regd.c
diff --git a/os_dep/linux/xmit_linux.c b/os_dep/xmit_linux.c
similarity index 100%
rename from os_dep/linux/xmit_linux.c
rename to os_dep/xmit_linux.c