diff --git a/luci-app-modem-hc/Makefile b/luci/luci-app-modem-hc/Makefile
similarity index 100%
rename from luci-app-modem-hc/Makefile
rename to luci/luci-app-modem-hc/Makefile
diff --git a/luci-app-modem-hc/luasrc/controller/modem_hc.lua b/luci/luci-app-modem-hc/luasrc/controller/modem_hc.lua
similarity index 100%
rename from luci-app-modem-hc/luasrc/controller/modem_hc.lua
rename to luci/luci-app-modem-hc/luasrc/controller/modem_hc.lua
diff --git a/luci-app-modem-hc/luasrc/model/cbi/modem_hc/modem_sim.lua b/luci/luci-app-modem-hc/luasrc/model/cbi/modem_hc/modem_sim.lua
similarity index 100%
rename from luci-app-modem-hc/luasrc/model/cbi/modem_hc/modem_sim.lua
rename to luci/luci-app-modem-hc/luasrc/model/cbi/modem_hc/modem_sim.lua
diff --git a/luci-app-modem-hc/luasrc/view/modem_hc/modem_sim.htm b/luci/luci-app-modem-hc/luasrc/view/modem_hc/modem_sim.htm
similarity index 100%
rename from luci-app-modem-hc/luasrc/view/modem_hc/modem_sim.htm
rename to luci/luci-app-modem-hc/luasrc/view/modem_hc/modem_sim.htm
diff --git a/luci-app-modem-hc/po/zh-cn/modem_hc.po b/luci/luci-app-modem-hc/po/zh-cn/modem_hc.po
similarity index 100%
rename from luci-app-modem-hc/po/zh-cn/modem_hc.po
rename to luci/luci-app-modem-hc/po/zh-cn/modem_hc.po
diff --git a/luci-app-modem-hc/po/zh_Hans/modem_hc.po b/luci/luci-app-modem-hc/po/zh_Hans/modem_hc.po
similarity index 100%
rename from luci-app-modem-hc/po/zh_Hans/modem_hc.po
rename to luci/luci-app-modem-hc/po/zh_Hans/modem_hc.po
diff --git a/luci-app-modem-hc/root/etc/config/modem_sim b/luci/luci-app-modem-hc/root/etc/config/modem_sim
similarity index 100%
rename from luci-app-modem-hc/root/etc/config/modem_sim
rename to luci/luci-app-modem-hc/root/etc/config/modem_sim
diff --git a/luci-app-modem-hc/root/etc/init.d/modem_sim b/luci/luci-app-modem-hc/root/etc/init.d/modem_sim
similarity index 100%
rename from luci-app-modem-hc/root/etc/init.d/modem_sim
rename to luci/luci-app-modem-hc/root/etc/init.d/modem_sim
diff --git a/luci-app-modem-hc/root/usr/share/modem/modem_sim.sh b/luci/luci-app-modem-hc/root/usr/share/modem/modem_sim.sh
similarity index 100%
rename from luci-app-modem-hc/root/usr/share/modem/modem_sim.sh
rename to luci/luci-app-modem-hc/root/usr/share/modem/modem_sim.sh
diff --git a/luci-app-qmodem-mwan/Makefile b/luci/luci-app-qmodem-mwan/Makefile
similarity index 100%
rename from luci-app-qmodem-mwan/Makefile
rename to luci/luci-app-qmodem-mwan/Makefile
diff --git a/luci-app-qmodem-mwan/luasrc/controller/qmodem_mwan.lua b/luci/luci-app-qmodem-mwan/luasrc/controller/qmodem_mwan.lua
similarity index 100%
rename from luci-app-qmodem-mwan/luasrc/controller/qmodem_mwan.lua
rename to luci/luci-app-qmodem-mwan/luasrc/controller/qmodem_mwan.lua
diff --git a/luci-app-qmodem-mwan/luasrc/model/cbi/qmodem/mwan_config.lua b/luci/luci-app-qmodem-mwan/luasrc/model/cbi/qmodem/mwan_config.lua
similarity index 100%
rename from luci-app-qmodem-mwan/luasrc/model/cbi/qmodem/mwan_config.lua
rename to luci/luci-app-qmodem-mwan/luasrc/model/cbi/qmodem/mwan_config.lua
diff --git a/luci-app-qmodem-mwan/po/zh-cn/modem_mwan.po b/luci/luci-app-qmodem-mwan/po/zh-cn/modem_mwan.po
similarity index 100%
rename from luci-app-qmodem-mwan/po/zh-cn/modem_mwan.po
rename to luci/luci-app-qmodem-mwan/po/zh-cn/modem_mwan.po
diff --git a/luci-app-qmodem-mwan/po/zh_Hans/modem_mwan.po b/luci/luci-app-qmodem-mwan/po/zh_Hans/modem_mwan.po
similarity index 100%
rename from luci-app-qmodem-mwan/po/zh_Hans/modem_mwan.po
rename to luci/luci-app-qmodem-mwan/po/zh_Hans/modem_mwan.po
diff --git a/luci-app-qmodem-mwan/root/etc/config/qmodem_mwan b/luci/luci-app-qmodem-mwan/root/etc/config/qmodem_mwan
similarity index 100%
rename from luci-app-qmodem-mwan/root/etc/config/qmodem_mwan
rename to luci/luci-app-qmodem-mwan/root/etc/config/qmodem_mwan
diff --git a/luci-app-qmodem-mwan/root/etc/init.d/qmodem_mwan b/luci/luci-app-qmodem-mwan/root/etc/init.d/qmodem_mwan
similarity index 100%
rename from luci-app-qmodem-mwan/root/etc/init.d/qmodem_mwan
rename to luci/luci-app-qmodem-mwan/root/etc/init.d/qmodem_mwan
diff --git a/luci-app-qmodem-mwan/root/etc/uci-defaults/99-setup-mwan b/luci/luci-app-qmodem-mwan/root/etc/uci-defaults/99-setup-mwan
similarity index 100%
rename from luci-app-qmodem-mwan/root/etc/uci-defaults/99-setup-mwan
rename to luci/luci-app-qmodem-mwan/root/etc/uci-defaults/99-setup-mwan
diff --git a/luci-app-qmodem-mwan/root/etc/uci-defaults/luci-app-modem-mwan b/luci/luci-app-qmodem-mwan/root/etc/uci-defaults/luci-app-modem-mwan
similarity index 100%
rename from luci-app-qmodem-mwan/root/etc/uci-defaults/luci-app-modem-mwan
rename to luci/luci-app-qmodem-mwan/root/etc/uci-defaults/luci-app-modem-mwan
diff --git a/luci-app-qmodem-mwan/root/usr/share/qmodem/modem_mwan.sh b/luci/luci-app-qmodem-mwan/root/usr/share/qmodem/modem_mwan.sh
similarity index 100%
rename from luci-app-qmodem-mwan/root/usr/share/qmodem/modem_mwan.sh
rename to luci/luci-app-qmodem-mwan/root/usr/share/qmodem/modem_mwan.sh
diff --git a/luci-app-qmodem-sms/Makefile b/luci/luci-app-qmodem-sms/Makefile
similarity index 100%
rename from luci-app-qmodem-sms/Makefile
rename to luci/luci-app-qmodem-sms/Makefile
diff --git a/luci-app-qmodem-sms/luasrc/controller/qmodem_sms.lua b/luci/luci-app-qmodem-sms/luasrc/controller/qmodem_sms.lua
similarity index 100%
rename from luci-app-qmodem-sms/luasrc/controller/qmodem_sms.lua
rename to luci/luci-app-qmodem-sms/luasrc/controller/qmodem_sms.lua
diff --git a/luci-app-qmodem-sms/luasrc/view/modem_sms/modem_sms.htm b/luci/luci-app-qmodem-sms/luasrc/view/modem_sms/modem_sms.htm
similarity index 100%
rename from luci-app-qmodem-sms/luasrc/view/modem_sms/modem_sms.htm
rename to luci/luci-app-qmodem-sms/luasrc/view/modem_sms/modem_sms.htm
diff --git a/luci-app-qmodem-sms/po/zh-cn/modem_sms.po b/luci/luci-app-qmodem-sms/po/zh-cn/modem_sms.po
similarity index 100%
rename from luci-app-qmodem-sms/po/zh-cn/modem_sms.po
rename to luci/luci-app-qmodem-sms/po/zh-cn/modem_sms.po
diff --git a/luci-app-qmodem-sms/po/zh_Hans/modem_sms.po b/luci/luci-app-qmodem-sms/po/zh_Hans/modem_sms.po
similarity index 100%
rename from luci-app-qmodem-sms/po/zh_Hans/modem_sms.po
rename to luci/luci-app-qmodem-sms/po/zh_Hans/modem_sms.po
diff --git a/luci-app-qmodem-ttl/Makefile b/luci/luci-app-qmodem-ttl/Makefile
similarity index 100%
rename from luci-app-qmodem-ttl/Makefile
rename to luci/luci-app-qmodem-ttl/Makefile
diff --git a/luci-app-qmodem-ttl/luasrc/controller/qmodem_ttl.lua b/luci/luci-app-qmodem-ttl/luasrc/controller/qmodem_ttl.lua
similarity index 100%
rename from luci-app-qmodem-ttl/luasrc/controller/qmodem_ttl.lua
rename to luci/luci-app-qmodem-ttl/luasrc/controller/qmodem_ttl.lua
diff --git a/luci-app-qmodem-ttl/luasrc/model/cbi/qmodem/modem_ttl.lua b/luci/luci-app-qmodem-ttl/luasrc/model/cbi/qmodem/modem_ttl.lua
similarity index 100%
rename from luci-app-qmodem-ttl/luasrc/model/cbi/qmodem/modem_ttl.lua
rename to luci/luci-app-qmodem-ttl/luasrc/model/cbi/qmodem/modem_ttl.lua
diff --git a/luci-app-qmodem-ttl/root/etc/config/qmodem_ttl b/luci/luci-app-qmodem-ttl/root/etc/config/qmodem_ttl
similarity index 100%
rename from luci-app-qmodem-ttl/root/etc/config/qmodem_ttl
rename to luci/luci-app-qmodem-ttl/root/etc/config/qmodem_ttl
diff --git a/luci-app-qmodem-ttl/root/etc/init.d/qmodem_ttl b/luci/luci-app-qmodem-ttl/root/etc/init.d/qmodem_ttl
similarity index 100%
rename from luci-app-qmodem-ttl/root/etc/init.d/qmodem_ttl
rename to luci/luci-app-qmodem-ttl/root/etc/init.d/qmodem_ttl
diff --git a/luci-app-qmodem/Makefile b/luci/luci-app-qmodem/Makefile
similarity index 100%
rename from luci-app-qmodem/Makefile
rename to luci/luci-app-qmodem/Makefile
diff --git a/luci-app-qmodem/htdocs/luci-static/resources/view/status/include/11_modem.js b/luci/luci-app-qmodem/htdocs/luci-static/resources/view/status/include/11_modem.js
similarity index 100%
rename from luci-app-qmodem/htdocs/luci-static/resources/view/status/include/11_modem.js
rename to luci/luci-app-qmodem/htdocs/luci-static/resources/view/status/include/11_modem.js
diff --git a/luci-app-qmodem/luasrc/controller/qmodem.lua b/luci/luci-app-qmodem/luasrc/controller/qmodem.lua
similarity index 100%
rename from luci-app-qmodem/luasrc/controller/qmodem.lua
rename to luci/luci-app-qmodem/luasrc/controller/qmodem.lua
diff --git a/luci-app-qmodem/luasrc/model/cbi/qmodem/dial_config.lua b/luci/luci-app-qmodem/luasrc/model/cbi/qmodem/dial_config.lua
similarity index 100%
rename from luci-app-qmodem/luasrc/model/cbi/qmodem/dial_config.lua
rename to luci/luci-app-qmodem/luasrc/model/cbi/qmodem/dial_config.lua
diff --git a/luci-app-qmodem/luasrc/model/cbi/qmodem/dial_overview.lua b/luci/luci-app-qmodem/luasrc/model/cbi/qmodem/dial_overview.lua
similarity index 100%
rename from luci-app-qmodem/luasrc/model/cbi/qmodem/dial_overview.lua
rename to luci/luci-app-qmodem/luasrc/model/cbi/qmodem/dial_overview.lua
diff --git a/luci-app-qmodem/luasrc/view/qmodem/dial_overview.htm b/luci/luci-app-qmodem/luasrc/view/qmodem/dial_overview.htm
similarity index 100%
rename from luci-app-qmodem/luasrc/view/qmodem/dial_overview.htm
rename to luci/luci-app-qmodem/luasrc/view/qmodem/dial_overview.htm
diff --git a/luci-app-qmodem/luasrc/view/qmodem/modem_debug.htm b/luci/luci-app-qmodem/luasrc/view/qmodem/modem_debug.htm
similarity index 100%
rename from luci-app-qmodem/luasrc/view/qmodem/modem_debug.htm
rename to luci/luci-app-qmodem/luasrc/view/qmodem/modem_debug.htm
diff --git a/luci-app-qmodem/luasrc/view/qmodem/modem_info.htm b/luci/luci-app-qmodem/luasrc/view/qmodem/modem_info.htm
similarity index 100%
rename from luci-app-qmodem/luasrc/view/qmodem/modem_info.htm
rename to luci/luci-app-qmodem/luasrc/view/qmodem/modem_info.htm
diff --git a/luci-app-qmodem/luasrc/view/qmodem/modem_scan.htm b/luci/luci-app-qmodem/luasrc/view/qmodem/modem_scan.htm
similarity index 100%
rename from luci-app-qmodem/luasrc/view/qmodem/modem_scan.htm
rename to luci/luci-app-qmodem/luasrc/view/qmodem/modem_scan.htm
diff --git a/luci-app-qmodem/po/ru/modem.po b/luci/luci-app-qmodem/po/ru/modem.po
similarity index 100%
rename from luci-app-qmodem/po/ru/modem.po
rename to luci/luci-app-qmodem/po/ru/modem.po
diff --git a/luci-app-qmodem/po/zh-cn/modem.po b/luci/luci-app-qmodem/po/zh-cn/modem.po
similarity index 100%
rename from luci-app-qmodem/po/zh-cn/modem.po
rename to luci/luci-app-qmodem/po/zh-cn/modem.po
diff --git a/luci-app-qmodem/po/zh_Hans/modem.po b/luci/luci-app-qmodem/po/zh_Hans/modem.po
similarity index 100%
rename from luci-app-qmodem/po/zh_Hans/modem.po
rename to luci/luci-app-qmodem/po/zh_Hans/modem.po
diff --git a/luci-app-qmodem/root/etc/config/qmodem b/luci/luci-app-qmodem/root/etc/config/qmodem
similarity index 100%
rename from luci-app-qmodem/root/etc/config/qmodem
rename to luci/luci-app-qmodem/root/etc/config/qmodem
diff --git a/luci-app-qmodem/root/etc/hotplug.d/net/20-modem-net b/luci/luci-app-qmodem/root/etc/hotplug.d/net/20-modem-net
similarity index 100%
rename from luci-app-qmodem/root/etc/hotplug.d/net/20-modem-net
rename to luci/luci-app-qmodem/root/etc/hotplug.d/net/20-modem-net
diff --git a/luci-app-qmodem/root/etc/hotplug.d/usb/20-modem-usb b/luci/luci-app-qmodem/root/etc/hotplug.d/usb/20-modem-usb
similarity index 100%
rename from luci-app-qmodem/root/etc/hotplug.d/usb/20-modem-usb
rename to luci/luci-app-qmodem/root/etc/hotplug.d/usb/20-modem-usb
diff --git a/luci-app-qmodem/root/etc/init.d/qmodem_init b/luci/luci-app-qmodem/root/etc/init.d/qmodem_init
similarity index 100%
rename from luci-app-qmodem/root/etc/init.d/qmodem_init
rename to luci/luci-app-qmodem/root/etc/init.d/qmodem_init
diff --git a/luci-app-qmodem/root/etc/init.d/qmodem_network b/luci/luci-app-qmodem/root/etc/init.d/qmodem_network
similarity index 100%
rename from luci-app-qmodem/root/etc/init.d/qmodem_network
rename to luci/luci-app-qmodem/root/etc/init.d/qmodem_network
diff --git a/luci-app-qmodem/root/etc/uci-defaults/99-add-5g-handler b/luci/luci-app-qmodem/root/etc/uci-defaults/99-add-5g-handler
similarity index 100%
rename from luci-app-qmodem/root/etc/uci-defaults/99-add-5g-handler
rename to luci/luci-app-qmodem/root/etc/uci-defaults/99-add-5g-handler
diff --git a/luci-app-qmodem/root/etc/uci-defaults/luci-app-modem b/luci/luci-app-qmodem/root/etc/uci-defaults/luci-app-modem
similarity index 100%
rename from luci-app-qmodem/root/etc/uci-defaults/luci-app-modem
rename to luci/luci-app-qmodem/root/etc/uci-defaults/luci-app-modem
diff --git a/luci-app-qmodem/root/usr/libexec/rpcd/modem_ctrl b/luci/luci-app-qmodem/root/usr/libexec/rpcd/modem_ctrl
similarity index 100%
rename from luci-app-qmodem/root/usr/libexec/rpcd/modem_ctrl
rename to luci/luci-app-qmodem/root/usr/libexec/rpcd/modem_ctrl
diff --git a/luci-app-qmodem/root/usr/share/qmodem/at_commands.json b/luci/luci-app-qmodem/root/usr/share/qmodem/at_commands.json
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/at_commands.json
rename to luci/luci-app-qmodem/root/usr/share/qmodem/at_commands.json
diff --git a/luci-app-qmodem/root/usr/share/qmodem/fibocom.sh b/luci/luci-app-qmodem/root/usr/share/qmodem/fibocom.sh
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/fibocom.sh
rename to luci/luci-app-qmodem/root/usr/share/qmodem/fibocom.sh
diff --git a/luci-app-qmodem/root/usr/share/qmodem/generic.sh b/luci/luci-app-qmodem/root/usr/share/qmodem/generic.sh
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/generic.sh
rename to luci/luci-app-qmodem/root/usr/share/qmodem/generic.sh
diff --git a/luci-app-qmodem/root/usr/share/qmodem/modem_ctrl.sh b/luci/luci-app-qmodem/root/usr/share/qmodem/modem_ctrl.sh
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/modem_ctrl.sh
rename to luci/luci-app-qmodem/root/usr/share/qmodem/modem_ctrl.sh
diff --git a/luci-app-qmodem/root/usr/share/qmodem/modem_dial.sh b/luci/luci-app-qmodem/root/usr/share/qmodem/modem_dial.sh
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/modem_dial.sh
rename to luci/luci-app-qmodem/root/usr/share/qmodem/modem_dial.sh
diff --git a/luci-app-qmodem/root/usr/share/qmodem/modem_scan.sh b/luci/luci-app-qmodem/root/usr/share/qmodem/modem_scan.sh
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/modem_scan.sh
rename to luci/luci-app-qmodem/root/usr/share/qmodem/modem_scan.sh
diff --git a/luci-app-qmodem/root/usr/share/qmodem/modem_support.json b/luci/luci-app-qmodem/root/usr/share/qmodem/modem_support.json
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/modem_support.json
rename to luci/luci-app-qmodem/root/usr/share/qmodem/modem_support.json
diff --git a/luci-app-qmodem/root/usr/share/qmodem/modem_util.sh b/luci/luci-app-qmodem/root/usr/share/qmodem/modem_util.sh
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/modem_util.sh
rename to luci/luci-app-qmodem/root/usr/share/qmodem/modem_util.sh
diff --git a/luci-app-qmodem/root/usr/share/qmodem/quectel.sh b/luci/luci-app-qmodem/root/usr/share/qmodem/quectel.sh
similarity index 100%
rename from luci-app-qmodem/root/usr/share/qmodem/quectel.sh
rename to luci/luci-app-qmodem/root/usr/share/qmodem/quectel.sh
diff --git a/luci-app-qmodem/root/usr/share/rpcd/acl.d/luci-app-qmodem.json b/luci/luci-app-qmodem/root/usr/share/rpcd/acl.d/luci-app-qmodem.json
similarity index 100%
rename from luci-app-qmodem/root/usr/share/rpcd/acl.d/luci-app-qmodem.json
rename to luci/luci-app-qmodem/root/usr/share/rpcd/acl.d/luci-app-qmodem.json
diff --git a/sms-tool_q/Makefile b/luci/sms-tool_q/Makefile
similarity index 100%
rename from sms-tool_q/Makefile
rename to luci/sms-tool_q/Makefile
diff --git a/sms-tool_q/patches/send_raw_pdu.patch b/luci/sms-tool_q/patches/send_raw_pdu.patch
similarity index 100%
rename from sms-tool_q/patches/send_raw_pdu.patch
rename to luci/sms-tool_q/patches/send_raw_pdu.patch