diff --git a/wwan/app/luci-app-pcimodem/Makefile b/wwan/app/luci-app-pcimodem/Makefile
index de20f9d..af4d326 100644
--- a/wwan/app/luci-app-pcimodem/Makefile
+++ b/wwan/app/luci-app-pcimodem/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=PCI Modem Server
-LUCI_DEPENDS:=+kmod-pcie_mhi +pciutils +quectel-cm
+LUCI_DEPENDS:=+kmod-mhi-pcie +pciutils +quectel-cm
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/wwan/app/luci-app-usbmodem/Makefile b/wwan/app/luci-app-usbmodem/Makefile
index 7efe2ec..658fa40 100644
--- a/wwan/app/luci-app-usbmodem/Makefile
+++ b/wwan/app/luci-app-usbmodem/Makefile
@@ -12,7 +12,7 @@ LUCI_DEPENDS:=+luci-compat +quectel-cm +kmod-usb-acm \
 	+kmod-usb-net-cdc-ether +kmod-usb-net-cdc-mbim \
 	+kmod-usb-net-qmi-wwan +kmod-usb-net-rndis \
 	+kmod-usb-serial-option +kmod-usb-wdm \
-	+kmod-qmi_wwan_q
+	+kmod-usb-net-qmi-wwan-quectel
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/wwan/driver/quectel_MHI/Makefile b/wwan/driver/quectel-mhi-pcie/Makefile
similarity index 81%
rename from wwan/driver/quectel_MHI/Makefile
rename to wwan/driver/quectel-mhi-pcie/Makefile
index fda7961..06b5ae1 100755
--- a/wwan/driver/quectel_MHI/Makefile
+++ b/wwan/driver/quectel-mhi-pcie/Makefile
@@ -1,25 +1,25 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=pcie_mhi
+PKG_NAME:=quectel-mhi-pcie
 PKG_VERSION:=1.3.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 PKG_BUILD_PARALLEL:=1
 
-define KernelPackage/pcie_mhi
+define KernelPackage/mhi-pcie
   SUBMENU:=Network Devices
   TITLE:=Kernel PCIe driver for MHI device
   DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq50xx) \
-	    +pciids +pciutils +quectel-cm \
+	    @PCI_SUPPORT \
 	    +PACKAGE_kmod-rmnet-nss:kmod-rmnet-nss
   FILES:=$(PKG_BUILD_DIR)/pcie_mhi.ko
   AUTOLOAD:=$(call AutoLoad,90,pcie_mhi)
 endef
 
-define KernelPackage/pcie_mhi/description
+define KernelPackage/mhi-pcie/description
   Kernel module for register a custom pciemhi platform device.
 endef
 
@@ -38,4 +38,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,pcie_mhi))
+$(eval $(call KernelPackage,mhi-pcie))
diff --git a/wwan/driver/quectel_MHI/src/Makefile b/wwan/driver/quectel-mhi-pcie/src/Makefile
similarity index 100%
rename from wwan/driver/quectel_MHI/src/Makefile
rename to wwan/driver/quectel-mhi-pcie/src/Makefile
diff --git a/wwan/driver/quectel_MHI/src/README b/wwan/driver/quectel-mhi-pcie/src/README
similarity index 100%
rename from wwan/driver/quectel_MHI/src/README
rename to wwan/driver/quectel-mhi-pcie/src/README
diff --git a/wwan/driver/quectel_MHI/src/ReleaseNote.txt b/wwan/driver/quectel-mhi-pcie/src/ReleaseNote.txt
similarity index 100%
rename from wwan/driver/quectel_MHI/src/ReleaseNote.txt
rename to wwan/driver/quectel-mhi-pcie/src/ReleaseNote.txt
diff --git a/wwan/driver/quectel_MHI/src/controllers/Kconfig b/wwan/driver/quectel-mhi-pcie/src/controllers/Kconfig
similarity index 100%
rename from wwan/driver/quectel_MHI/src/controllers/Kconfig
rename to wwan/driver/quectel-mhi-pcie/src/controllers/Kconfig
diff --git a/wwan/driver/quectel_MHI/src/controllers/Makefile b/wwan/driver/quectel-mhi-pcie/src/controllers/Makefile
similarity index 100%
rename from wwan/driver/quectel_MHI/src/controllers/Makefile
rename to wwan/driver/quectel-mhi-pcie/src/controllers/Makefile
diff --git a/wwan/driver/quectel_MHI/src/controllers/mhi_arch_qti.c b/wwan/driver/quectel-mhi-pcie/src/controllers/mhi_arch_qti.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/controllers/mhi_arch_qti.c
rename to wwan/driver/quectel-mhi-pcie/src/controllers/mhi_arch_qti.c
diff --git a/wwan/driver/quectel_MHI/src/controllers/mhi_qcom.c b/wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qcom.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/controllers/mhi_qcom.c
rename to wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qcom.c
diff --git a/wwan/driver/quectel_MHI/src/controllers/mhi_qcom.h b/wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qcom.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/controllers/mhi_qcom.h
rename to wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qcom.h
diff --git a/wwan/driver/quectel_MHI/src/controllers/mhi_qti.c b/wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qti.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/controllers/mhi_qti.c
rename to wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qti.c
diff --git a/wwan/driver/quectel_MHI/src/controllers/mhi_qti.h b/wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qti.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/controllers/mhi_qti.h
rename to wwan/driver/quectel-mhi-pcie/src/controllers/mhi_qti.h
diff --git a/wwan/driver/quectel_MHI/src/core/Makefile b/wwan/driver/quectel-mhi-pcie/src/core/Makefile
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/Makefile
rename to wwan/driver/quectel-mhi-pcie/src/core/Makefile
diff --git a/wwan/driver/quectel_MHI/src/core/mhi.h b/wwan/driver/quectel-mhi-pcie/src/core/mhi.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi.h
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi.h
diff --git a/wwan/driver/quectel_MHI/src/core/mhi_boot.c b/wwan/driver/quectel-mhi-pcie/src/core/mhi_boot.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi_boot.c
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi_boot.c
diff --git a/wwan/driver/quectel_MHI/src/core/mhi_dtr.c b/wwan/driver/quectel-mhi-pcie/src/core/mhi_dtr.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi_dtr.c
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi_dtr.c
diff --git a/wwan/driver/quectel_MHI/src/core/mhi_init.c b/wwan/driver/quectel-mhi-pcie/src/core/mhi_init.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi_init.c
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi_init.c
diff --git a/wwan/driver/quectel_MHI/src/core/mhi_internal.h b/wwan/driver/quectel-mhi-pcie/src/core/mhi_internal.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi_internal.h
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi_internal.h
diff --git a/wwan/driver/quectel_MHI/src/core/mhi_main.c b/wwan/driver/quectel-mhi-pcie/src/core/mhi_main.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi_main.c
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi_main.c
diff --git a/wwan/driver/quectel_MHI/src/core/mhi_pm.c b/wwan/driver/quectel-mhi-pcie/src/core/mhi_pm.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi_pm.c
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi_pm.c
diff --git a/wwan/driver/quectel_MHI/src/core/mhi_sdx20.h b/wwan/driver/quectel-mhi-pcie/src/core/mhi_sdx20.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/mhi_sdx20.h
rename to wwan/driver/quectel-mhi-pcie/src/core/mhi_sdx20.h
diff --git a/wwan/driver/quectel_MHI/src/core/sdx20_mhi.h b/wwan/driver/quectel-mhi-pcie/src/core/sdx20_mhi.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/core/sdx20_mhi.h
rename to wwan/driver/quectel-mhi-pcie/src/core/sdx20_mhi.h
diff --git a/wwan/driver/quectel_MHI/src/devices/Kconfig b/wwan/driver/quectel-mhi-pcie/src/devices/Kconfig
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/Kconfig
rename to wwan/driver/quectel-mhi-pcie/src/devices/Kconfig
diff --git a/wwan/driver/quectel_MHI/src/devices/Makefile b/wwan/driver/quectel-mhi-pcie/src/devices/Makefile
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/Makefile
rename to wwan/driver/quectel-mhi-pcie/src/devices/Makefile
diff --git a/wwan/driver/quectel_MHI/src/devices/mhi_netdev.c b/wwan/driver/quectel-mhi-pcie/src/devices/mhi_netdev.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/mhi_netdev.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/mhi_netdev.c
diff --git a/wwan/driver/quectel_MHI/src/devices/mhi_netdev_quectel.c b/wwan/driver/quectel-mhi-pcie/src/devices/mhi_netdev_quectel.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/mhi_netdev_quectel.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/mhi_netdev_quectel.c
diff --git a/wwan/driver/quectel_MHI/src/devices/mhi_satellite.c b/wwan/driver/quectel-mhi-pcie/src/devices/mhi_satellite.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/mhi_satellite.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/mhi_satellite.c
diff --git a/wwan/driver/quectel_MHI/src/devices/mhi_uci.c b/wwan/driver/quectel-mhi-pcie/src/devices/mhi_uci.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/mhi_uci.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/mhi_uci.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/Kconfig b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/Kconfig
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/Kconfig
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/Kconfig
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/Makefile b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/Makefile
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/Makefile
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/Makefile
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_config.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_config.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_config.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_config.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_config.h b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_config.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_config.h
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_config.h
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_data.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_data.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_data.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_data.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_descriptor.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_descriptor.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_descriptor.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_descriptor.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_descriptor.h b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_descriptor.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_descriptor.h
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_descriptor.h
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_handlers.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_handlers.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_handlers.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_handlers.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_handlers.h b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_handlers.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_handlers.h
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_handlers.h
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_map.h b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_map.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_map.h
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_map.h
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_map_command.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_map_command.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_map_command.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_map_command.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_map_data.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_map_data.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_map_data.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_map_data.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_private.h b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_private.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_private.h
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_private.h
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_trace.h b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_trace.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_trace.h
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_trace.h
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_vnd.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_vnd.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_vnd.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_vnd.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_vnd.h b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_vnd.h
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet/rmnet_vnd.h
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet/rmnet_vnd.h
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet_handler.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet_handler.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet_handler.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet_handler.c
diff --git a/wwan/driver/quectel_MHI/src/devices/rmnet_nss.c b/wwan/driver/quectel-mhi-pcie/src/devices/rmnet_nss.c
similarity index 100%
rename from wwan/driver/quectel_MHI/src/devices/rmnet_nss.c
rename to wwan/driver/quectel-mhi-pcie/src/devices/rmnet_nss.c
diff --git a/wwan/driver/quectel_QMI_WWAN/Makefile b/wwan/driver/quectel-qmi-wwan/Makefile
similarity index 76%
rename from wwan/driver/quectel_QMI_WWAN/Makefile
rename to wwan/driver/quectel-qmi-wwan/Makefile
index 37f92a4..f98149d 100644
--- a/wwan/driver/quectel_QMI_WWAN/Makefile
+++ b/wwan/driver/quectel-qmi-wwan/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=qmi_wwan_q
+PKG_NAME:=quectel-qmi-wwan
 PKG_VERSION:=1.2.9
 PKG_RELEASE:=2
 
@@ -9,9 +9,10 @@ include $(INCLUDE_DIR)/package.mk
 
 PKG_BUILD_PARALLEL:=1
 
-define KernelPackage/qmi_wwan_q
-  SUBMENU:=WWAN Support
-  TITLE:=Quectel Linux USB QMI WWAN Driver
+define KernelPackage/usb-net-qmi-wwan-quectel
+  SUBMENU:=USB Support
+  TITLE:=QMI WWAN driver for Quectel modules
+  DEPENDS:=+kmod-usb-net +kmod-usb-wdm
   DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq50xx) \
 	    +kmod-usb-net \
 	    +kmod-usb-wdm \
@@ -20,7 +21,6 @@ define KernelPackage/qmi_wwan_q
   AUTOLOAD:=$(call AutoLoad,81,qmi_wwan_q)
 endef
 
-
 EXTRA_CFLAGS+= \
 	-Wno-unused-function \
 	-Wno-missing-prototypes \
@@ -36,4 +36,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,qmi_wwan_q))
+$(eval $(call KernelPackage,usb-net-qmi-wwan-quectel))
diff --git a/wwan/driver/quectel_QMI_WWAN/src/Makefile b/wwan/driver/quectel-qmi-wwan/src/Makefile
similarity index 100%
rename from wwan/driver/quectel_QMI_WWAN/src/Makefile
rename to wwan/driver/quectel-qmi-wwan/src/Makefile
diff --git a/wwan/driver/quectel_QMI_WWAN/src/ReleaseNote.txt b/wwan/driver/quectel-qmi-wwan/src/ReleaseNote.txt
similarity index 100%
rename from wwan/driver/quectel_QMI_WWAN/src/ReleaseNote.txt
rename to wwan/driver/quectel-qmi-wwan/src/ReleaseNote.txt
diff --git a/wwan/driver/quectel_QMI_WWAN/src/qmi_wwan_q.c b/wwan/driver/quectel-qmi-wwan/src/qmi_wwan_q.c
similarity index 100%
rename from wwan/driver/quectel_QMI_WWAN/src/qmi_wwan_q.c
rename to wwan/driver/quectel-qmi-wwan/src/qmi_wwan_q.c
diff --git a/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.c b/wwan/driver/quectel-qmi-wwan/src/rmnet_nss.c
similarity index 100%
rename from wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.c
rename to wwan/driver/quectel-qmi-wwan/src/rmnet_nss.c
diff --git a/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.h b/wwan/driver/quectel-qmi-wwan/src/rmnet_nss.h
similarity index 100%
rename from wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.h
rename to wwan/driver/quectel-qmi-wwan/src/rmnet_nss.h
diff --git a/wwan/app/quectel-cm/Makefile b/wwan/utils/quectel-cm/Makefile
similarity index 94%
rename from wwan/app/quectel-cm/Makefile
rename to wwan/utils/quectel-cm/Makefile
index 6ce3b17..60f794d 100644
--- a/wwan/app/quectel-cm/Makefile
+++ b/wwan/utils/quectel-cm/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quectel-cm
 PKG_VERSION:=1.6.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -15,7 +15,7 @@ define Package/quectel-cm
   DEPENDS:= \
     +kmod-usb-net-cdc-mbim \
     +kmod-usb-net-qmi-wwan \
-    +kmod-qmi_wwan_q \
+    +kmod-usb-net-qmi-wwan-quectel \
     +kmod-usb-serial-option
 endef
 
diff --git a/wwan/app/quectel-cm/files/quectel.sh b/wwan/utils/quectel-cm/files/quectel.sh
similarity index 100%
rename from wwan/app/quectel-cm/files/quectel.sh
rename to wwan/utils/quectel-cm/files/quectel.sh
diff --git a/wwan/app/quectel-cm/files/smp-affinity-mhi-pcie.sh b/wwan/utils/quectel-cm/files/smp-affinity-mhi-pcie.sh
similarity index 100%
rename from wwan/app/quectel-cm/files/smp-affinity-mhi-pcie.sh
rename to wwan/utils/quectel-cm/files/smp-affinity-mhi-pcie.sh
diff --git a/wwan/app/quectel-cm/files/smp-affinity-qmi-usb.sh b/wwan/utils/quectel-cm/files/smp-affinity-qmi-usb.sh
similarity index 100%
rename from wwan/app/quectel-cm/files/smp-affinity-qmi-usb.sh
rename to wwan/utils/quectel-cm/files/smp-affinity-qmi-usb.sh
diff --git a/wwan/app/quectel-cm/src/CMakeLists.txt b/wwan/utils/quectel-cm/src/CMakeLists.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/CMakeLists.txt
rename to wwan/utils/quectel-cm/src/CMakeLists.txt
diff --git a/wwan/app/quectel-cm/src/GobiNetCM.c b/wwan/utils/quectel-cm/src/GobiNetCM.c
similarity index 100%
rename from wwan/app/quectel-cm/src/GobiNetCM.c
rename to wwan/utils/quectel-cm/src/GobiNetCM.c
diff --git a/wwan/app/quectel-cm/src/Makefile b/wwan/utils/quectel-cm/src/Makefile
similarity index 100%
rename from wwan/app/quectel-cm/src/Makefile
rename to wwan/utils/quectel-cm/src/Makefile
diff --git a/wwan/app/quectel-cm/src/Makefile.am b/wwan/utils/quectel-cm/src/Makefile.am
similarity index 100%
rename from wwan/app/quectel-cm/src/Makefile.am
rename to wwan/utils/quectel-cm/src/Makefile.am
diff --git a/wwan/app/quectel-cm/src/NOTICE b/wwan/utils/quectel-cm/src/NOTICE
similarity index 100%
rename from wwan/app/quectel-cm/src/NOTICE
rename to wwan/utils/quectel-cm/src/NOTICE
diff --git a/wwan/app/quectel-cm/src/QCQCTL.h b/wwan/utils/quectel-cm/src/QCQCTL.h
similarity index 100%
rename from wwan/app/quectel-cm/src/QCQCTL.h
rename to wwan/utils/quectel-cm/src/QCQCTL.h
diff --git a/wwan/app/quectel-cm/src/QCQMI.h b/wwan/utils/quectel-cm/src/QCQMI.h
similarity index 100%
rename from wwan/app/quectel-cm/src/QCQMI.h
rename to wwan/utils/quectel-cm/src/QCQMI.h
diff --git a/wwan/app/quectel-cm/src/QCQMUX.c b/wwan/utils/quectel-cm/src/QCQMUX.c
similarity index 100%
rename from wwan/app/quectel-cm/src/QCQMUX.c
rename to wwan/utils/quectel-cm/src/QCQMUX.c
diff --git a/wwan/app/quectel-cm/src/QCQMUX.h b/wwan/utils/quectel-cm/src/QCQMUX.h
similarity index 100%
rename from wwan/app/quectel-cm/src/QCQMUX.h
rename to wwan/utils/quectel-cm/src/QCQMUX.h
diff --git a/wwan/app/quectel-cm/src/QMIThread.c b/wwan/utils/quectel-cm/src/QMIThread.c
similarity index 100%
rename from wwan/app/quectel-cm/src/QMIThread.c
rename to wwan/utils/quectel-cm/src/QMIThread.c
diff --git a/wwan/app/quectel-cm/src/QMIThread.h b/wwan/utils/quectel-cm/src/QMIThread.h
similarity index 100%
rename from wwan/app/quectel-cm/src/QMIThread.h
rename to wwan/utils/quectel-cm/src/QMIThread.h
diff --git a/wwan/app/quectel-cm/src/QmiWwanCM.c b/wwan/utils/quectel-cm/src/QmiWwanCM.c
similarity index 100%
rename from wwan/app/quectel-cm/src/QmiWwanCM.c
rename to wwan/utils/quectel-cm/src/QmiWwanCM.c
diff --git a/wwan/app/quectel-cm/src/ReleaseNote.txt b/wwan/utils/quectel-cm/src/ReleaseNote.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/ReleaseNote.txt
rename to wwan/utils/quectel-cm/src/ReleaseNote.txt
diff --git a/wwan/app/quectel-cm/src/at_tok.c b/wwan/utils/quectel-cm/src/at_tok.c
similarity index 100%
rename from wwan/app/quectel-cm/src/at_tok.c
rename to wwan/utils/quectel-cm/src/at_tok.c
diff --git a/wwan/app/quectel-cm/src/at_tok.h b/wwan/utils/quectel-cm/src/at_tok.h
similarity index 100%
rename from wwan/app/quectel-cm/src/at_tok.h
rename to wwan/utils/quectel-cm/src/at_tok.h
diff --git a/wwan/app/quectel-cm/src/atc.c b/wwan/utils/quectel-cm/src/atc.c
similarity index 100%
rename from wwan/app/quectel-cm/src/atc.c
rename to wwan/utils/quectel-cm/src/atc.c
diff --git a/wwan/app/quectel-cm/src/atchannel.c b/wwan/utils/quectel-cm/src/atchannel.c
similarity index 100%
rename from wwan/app/quectel-cm/src/atchannel.c
rename to wwan/utils/quectel-cm/src/atchannel.c
diff --git a/wwan/app/quectel-cm/src/atchannel.h b/wwan/utils/quectel-cm/src/atchannel.h
similarity index 100%
rename from wwan/app/quectel-cm/src/atchannel.h
rename to wwan/utils/quectel-cm/src/atchannel.h
diff --git a/wwan/app/quectel-cm/src/configure.ac b/wwan/utils/quectel-cm/src/configure.ac
similarity index 100%
rename from wwan/app/quectel-cm/src/configure.ac
rename to wwan/utils/quectel-cm/src/configure.ac
diff --git a/wwan/app/quectel-cm/src/default.script b/wwan/utils/quectel-cm/src/default.script
similarity index 100%
rename from wwan/app/quectel-cm/src/default.script
rename to wwan/utils/quectel-cm/src/default.script
diff --git a/wwan/app/quectel-cm/src/default.script_ip b/wwan/utils/quectel-cm/src/default.script_ip
similarity index 100%
rename from wwan/app/quectel-cm/src/default.script_ip
rename to wwan/utils/quectel-cm/src/default.script_ip
diff --git a/wwan/app/quectel-cm/src/device.c b/wwan/utils/quectel-cm/src/device.c
similarity index 100%
rename from wwan/app/quectel-cm/src/device.c
rename to wwan/utils/quectel-cm/src/device.c
diff --git a/wwan/app/quectel-cm/src/ethtool-copy.h b/wwan/utils/quectel-cm/src/ethtool-copy.h
similarity index 100%
rename from wwan/app/quectel-cm/src/ethtool-copy.h
rename to wwan/utils/quectel-cm/src/ethtool-copy.h
diff --git a/wwan/app/quectel-cm/src/log/cdc_mbim.txt b/wwan/utils/quectel-cm/src/log/cdc_mbim.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/cdc_mbim.txt
rename to wwan/utils/quectel-cm/src/log/cdc_mbim.txt
diff --git a/wwan/app/quectel-cm/src/log/cdc_mbim_vlan.txt b/wwan/utils/quectel-cm/src/log/cdc_mbim_vlan.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/cdc_mbim_vlan.txt
rename to wwan/utils/quectel-cm/src/log/cdc_mbim_vlan.txt
diff --git a/wwan/app/quectel-cm/src/log/ecm_ncm_rndis.txt b/wwan/utils/quectel-cm/src/log/ecm_ncm_rndis.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/ecm_ncm_rndis.txt
rename to wwan/utils/quectel-cm/src/log/ecm_ncm_rndis.txt
diff --git a/wwan/app/quectel-cm/src/log/gobinet.txt b/wwan/utils/quectel-cm/src/log/gobinet.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/gobinet.txt
rename to wwan/utils/quectel-cm/src/log/gobinet.txt
diff --git a/wwan/app/quectel-cm/src/log/gobinet_bridge.txt b/wwan/utils/quectel-cm/src/log/gobinet_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/gobinet_bridge.txt
rename to wwan/utils/quectel-cm/src/log/gobinet_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/gobinet_qmap=1.txt b/wwan/utils/quectel-cm/src/log/gobinet_qmap=1.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/gobinet_qmap=1.txt
rename to wwan/utils/quectel-cm/src/log/gobinet_qmap=1.txt
diff --git a/wwan/app/quectel-cm/src/log/gobinet_qmap=1_bridge.txt b/wwan/utils/quectel-cm/src/log/gobinet_qmap=1_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/gobinet_qmap=1_bridge.txt
rename to wwan/utils/quectel-cm/src/log/gobinet_qmap=1_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/gobinet_qmap=4.txt b/wwan/utils/quectel-cm/src/log/gobinet_qmap=4.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/gobinet_qmap=4.txt
rename to wwan/utils/quectel-cm/src/log/gobinet_qmap=4.txt
diff --git a/wwan/app/quectel-cm/src/log/gobinet_qmap=4_bridge.txt b/wwan/utils/quectel-cm/src/log/gobinet_qmap=4_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/gobinet_qmap=4_bridge.txt
rename to wwan/utils/quectel-cm/src/log/gobinet_qmap=4_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/pcie_mhi_mbim.txt b/wwan/utils/quectel-cm/src/log/pcie_mhi_mbim.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/pcie_mhi_mbim.txt
rename to wwan/utils/quectel-cm/src/log/pcie_mhi_mbim.txt
diff --git a/wwan/app/quectel-cm/src/log/pcie_mhi_mbim_qmap=4.txt b/wwan/utils/quectel-cm/src/log/pcie_mhi_mbim_qmap=4.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/pcie_mhi_mbim_qmap=4.txt
rename to wwan/utils/quectel-cm/src/log/pcie_mhi_mbim_qmap=4.txt
diff --git a/wwan/app/quectel-cm/src/log/pcie_mhi_qmap=1.txt b/wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=1.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/pcie_mhi_qmap=1.txt
rename to wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=1.txt
diff --git a/wwan/app/quectel-cm/src/log/pcie_mhi_qmap=1_bridge.txt b/wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=1_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/pcie_mhi_qmap=1_bridge.txt
rename to wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=1_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/pcie_mhi_qmap=4.txt b/wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=4.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/pcie_mhi_qmap=4.txt
rename to wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=4.txt
diff --git a/wwan/app/quectel-cm/src/log/pcie_mhi_qmap=4_bridge.txt b/wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=4_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/pcie_mhi_qmap=4_bridge.txt
rename to wwan/utils/quectel-cm/src/log/pcie_mhi_qmap=4_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/qmi_wwan_q.txt b/wwan/utils/quectel-cm/src/log/qmi_wwan_q.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/qmi_wwan_q.txt
rename to wwan/utils/quectel-cm/src/log/qmi_wwan_q.txt
diff --git a/wwan/app/quectel-cm/src/log/qmi_wwan_q_bridge.txt b/wwan/utils/quectel-cm/src/log/qmi_wwan_q_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/qmi_wwan_q_bridge.txt
rename to wwan/utils/quectel-cm/src/log/qmi_wwan_q_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=1.txt b/wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=1.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=1.txt
rename to wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=1.txt
diff --git a/wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=1_bridge.txt b/wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=1_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=1_bridge.txt
rename to wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=1_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=4.txt b/wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=4.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=4.txt
rename to wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=4.txt
diff --git a/wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=4_bridge.txt b/wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=4_bridge.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/qmi_wwan_q_qmap=4_bridge.txt
rename to wwan/utils/quectel-cm/src/log/qmi_wwan_q_qmap=4_bridge.txt
diff --git a/wwan/app/quectel-cm/src/log/qmi_wwan_qmap=4.txt b/wwan/utils/quectel-cm/src/log/qmi_wwan_qmap=4.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/qmi_wwan_qmap=4.txt
rename to wwan/utils/quectel-cm/src/log/qmi_wwan_qmap=4.txt
diff --git a/wwan/app/quectel-cm/src/log/usage_of_argument/6.txt b/wwan/utils/quectel-cm/src/log/usage_of_argument/6.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/usage_of_argument/6.txt
rename to wwan/utils/quectel-cm/src/log/usage_of_argument/6.txt
diff --git a/wwan/app/quectel-cm/src/log/usage_of_argument/m.txt b/wwan/utils/quectel-cm/src/log/usage_of_argument/m.txt
similarity index 100%
rename from wwan/app/quectel-cm/src/log/usage_of_argument/m.txt
rename to wwan/utils/quectel-cm/src/log/usage_of_argument/m.txt
diff --git a/wwan/app/quectel-cm/src/main.c b/wwan/utils/quectel-cm/src/main.c
similarity index 100%
rename from wwan/app/quectel-cm/src/main.c
rename to wwan/utils/quectel-cm/src/main.c
diff --git a/wwan/app/quectel-cm/src/mbim-cm.c b/wwan/utils/quectel-cm/src/mbim-cm.c
similarity index 100%
rename from wwan/app/quectel-cm/src/mbim-cm.c
rename to wwan/utils/quectel-cm/src/mbim-cm.c
diff --git a/wwan/app/quectel-cm/src/qendian.h b/wwan/utils/quectel-cm/src/qendian.h
similarity index 100%
rename from wwan/app/quectel-cm/src/qendian.h
rename to wwan/utils/quectel-cm/src/qendian.h
diff --git a/wwan/app/quectel-cm/src/qlist.h b/wwan/utils/quectel-cm/src/qlist.h
similarity index 100%
rename from wwan/app/quectel-cm/src/qlist.h
rename to wwan/utils/quectel-cm/src/qlist.h
diff --git a/wwan/app/quectel-cm/src/qmap_bridge_mode.c b/wwan/utils/quectel-cm/src/qmap_bridge_mode.c
similarity index 100%
rename from wwan/app/quectel-cm/src/qmap_bridge_mode.c
rename to wwan/utils/quectel-cm/src/qmap_bridge_mode.c
diff --git a/wwan/app/quectel-cm/src/qrtr.c b/wwan/utils/quectel-cm/src/qrtr.c
similarity index 100%
rename from wwan/app/quectel-cm/src/qrtr.c
rename to wwan/utils/quectel-cm/src/qrtr.c
diff --git a/wwan/app/quectel-cm/src/qrtr.h b/wwan/utils/quectel-cm/src/qrtr.h
similarity index 100%
rename from wwan/app/quectel-cm/src/qrtr.h
rename to wwan/utils/quectel-cm/src/qrtr.h
diff --git a/wwan/app/quectel-cm/src/quectel-atc-proxy.c b/wwan/utils/quectel-cm/src/quectel-atc-proxy.c
similarity index 100%
rename from wwan/app/quectel-cm/src/quectel-atc-proxy.c
rename to wwan/utils/quectel-cm/src/quectel-atc-proxy.c
diff --git a/wwan/app/quectel-cm/src/quectel-mbim-proxy.c b/wwan/utils/quectel-cm/src/quectel-mbim-proxy.c
similarity index 100%
rename from wwan/app/quectel-cm/src/quectel-mbim-proxy.c
rename to wwan/utils/quectel-cm/src/quectel-mbim-proxy.c
diff --git a/wwan/app/quectel-cm/src/quectel-qmi-proxy.c b/wwan/utils/quectel-cm/src/quectel-qmi-proxy.c
similarity index 100%
rename from wwan/app/quectel-cm/src/quectel-qmi-proxy.c
rename to wwan/utils/quectel-cm/src/quectel-qmi-proxy.c
diff --git a/wwan/app/quectel-cm/src/quectel-qrtr-proxy.c b/wwan/utils/quectel-cm/src/quectel-qrtr-proxy.c
similarity index 100%
rename from wwan/app/quectel-cm/src/quectel-qrtr-proxy.c
rename to wwan/utils/quectel-cm/src/quectel-qrtr-proxy.c
diff --git a/wwan/app/quectel-cm/src/rmnetctl.c b/wwan/utils/quectel-cm/src/rmnetctl.c
similarity index 100%
rename from wwan/app/quectel-cm/src/rmnetctl.c
rename to wwan/utils/quectel-cm/src/rmnetctl.c
diff --git a/wwan/app/quectel-cm/src/udhcpc.c b/wwan/utils/quectel-cm/src/udhcpc.c
similarity index 100%
rename from wwan/app/quectel-cm/src/udhcpc.c
rename to wwan/utils/quectel-cm/src/udhcpc.c
diff --git a/wwan/app/quectel-cm/src/udhcpc_netlink.c b/wwan/utils/quectel-cm/src/udhcpc_netlink.c
similarity index 100%
rename from wwan/app/quectel-cm/src/udhcpc_netlink.c
rename to wwan/utils/quectel-cm/src/udhcpc_netlink.c
diff --git a/wwan/app/quectel-cm/src/udhcpc_script.c b/wwan/utils/quectel-cm/src/udhcpc_script.c
similarity index 100%
rename from wwan/app/quectel-cm/src/udhcpc_script.c
rename to wwan/utils/quectel-cm/src/udhcpc_script.c
diff --git a/wwan/app/quectel-cm/src/util.c b/wwan/utils/quectel-cm/src/util.c
similarity index 100%
rename from wwan/app/quectel-cm/src/util.c
rename to wwan/utils/quectel-cm/src/util.c
diff --git a/wwan/app/quectel-cm/src/util.h b/wwan/utils/quectel-cm/src/util.h
similarity index 100%
rename from wwan/app/quectel-cm/src/util.h
rename to wwan/utils/quectel-cm/src/util.h