159 files changed, 32 insertions, 151 deletions

diff --git a/Makefile b/Makefile
index b99e8f710d..70a7e92a40 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	make -C libs/web CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
+	make -C modules/base CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)" host-install
 	for i in $(MODULES); do \
 		make -C$$i SDK="$(shell test -f .running-sdk && echo 1)" compile || { \
 			echo "*** Compilation of $$i failed!"; \
@@ -33,7 +33,7 @@ i18nbuild:
 clean:
 	rm -f .running-sdk
 	rm -rf docs
-	make -C libs/web host-clean
+	make -C modules/base host-clean
 	for i in $(MODULES); do make -C$$i clean; done
 
 
diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index c223054a23..6a51a6adf7 100644
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -49,7 +49,7 @@ define Package/luci-mod-freifunk-community
   TITLE:=Freifunk Community Meta-Package
   DEPENDS+=$(call add_deps,mod-freifunk-community, \
     iptables-mod-nat-extra iptables-mod-ipopt \
-	luci-lib-web luci-app-splash luci-i18n-german \
+	luci-app-splash luci-i18n-german \
 	olsrd olsrd-mod-dyn-gw-plain \
 	olsrd-mod-jsoninfo olsrd-mod-nameservice \
 	olsrd-mod-watchdog kmod-tun \
@@ -224,8 +224,7 @@ define theme
     SUBMENU:=4. Themes
     TITLE:=$(if $(2),$(2),LuCI $(1) theme)
 	MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
-	DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4)
-	$(if $(5),DEFAULT:=PACKAGE_luci-lib-core)
+	DEPENDS:=+luci-base $(4)
   endef
 
   define Package/luci-theme-$(1)/install
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 8bb35319bf..b875f0d706 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -32,7 +32,7 @@ endef
 
 
 ### Core package ###
-define Package/luci-lib-core
+define Package/luci-base
   SECTION:=luci
   CATEGORY:=LuCI
   TITLE:=LuCI - Lua Configuration Interface
@@ -43,8 +43,8 @@ define Package/luci-lib-core
   TITLE:=LuCI core libraries
 endef
 
-define Package/luci-lib-core/install
-	$(call Package/luci/install/template,$(1),libs/core)
+define Package/luci-base/install
+	$(call Package/luci/install/template,$(1),modules/base)
 	$(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
 		"OpenWrt Firmware" \
 		"$(OPENWRTVERSION)" \
@@ -52,43 +52,47 @@ define Package/luci-lib-core/install
 		"$(PKG_VERSION)"
 endef
 
-define Package/luci-lib-core/config
+define Package/luci-base/config
        choice
                prompt "Build Target"
-               default PACKAGE_luci-lib-core_source
+               default PACKAGE_luci-base_source
 
-       config PACKAGE_luci-lib-core_compile
+       config PACKAGE_luci-base_compile
                bool "Precompiled"
 
-       config PACKAGE_luci-lib-core_stripped
+       config PACKAGE_luci-base_stripped
                bool "Stripped"
 
-       config PACKAGE_luci-lib-core_srcdiet
+       config PACKAGE_luci-base_srcdiet
                bool "Compressed Source"
 
-       config PACKAGE_luci-lib-core_source
+       config PACKAGE_luci-base_source
                bool "Full Source"
 
        endchoice
 endef
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_compile),)
+define Package/luci-base/conffiles
+/etc/config/luci
+endef
+
+ifneq ($(CONFIG_PACKAGE_luci-base_compile),)
   LUA_TARGET:=compile
 endif
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),)
+ifneq ($(CONFIG_PACKAGE_luci-base_stripped),)
   LUA_TARGET:=strip
 endif
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_srcdiet),)
+ifneq ($(CONFIG_PACKAGE_luci-base_srcdiet),)
   LUA_TARGET:=diet
 endif
 
-ifneq ($(CONFIG_PACKAGE_luci-lib-core),)
-  LUCI_SELECTED_MODULES+=libs/core
+ifneq ($(CONFIG_PACKAGE_luci-base),)
+  LUCI_SELECTED_MODULES+=modules/base
 endif
 
-LUCI_BUILD_PACKAGES += luci-lib-core
+LUCI_BUILD_PACKAGES += luci-base
 
 
 ### Libraries ###
@@ -101,7 +105,7 @@ define library
     MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
     SUBMENU:=8. Libraries
     TITLE:=$(if $(2),$(2),LuCI $(1) library)
-    $(if $(3),DEPENDS:=+luci-lib-core $(3))
+    $(if $(3),DEPENDS:=+luci-base $(3))
   endef
 
   define Package/luci-lib-$(1)/install
@@ -116,10 +120,6 @@ define library
   LUCI_BUILD_PACKAGES += luci-lib-$(1)
 endef
 
-define Package/luci-lib-web/conffiles
-/etc/config/luci
-endef
-
 define Package/luci-lib-nixio/config
 	choice
 		prompt "TLS Provider"
@@ -158,14 +158,11 @@ ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),)
 endif
 
 
-$(eval $(call library,httpclient,HTTP(S) client library,+luci-lib-web +luci-lib-nixio))
-$(eval $(call library,ipkg,LuCI IPKG/OPKG call abstraction library))
+$(eval $(call library,httpclient,HTTP(S) client library,+luci-base +luci-lib-nixio))
 $(eval $(call library,json,LuCI JSON library))
 $(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl))
 $(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio))
-$(eval $(call library,sys,LuCI Linux/POSIX system library))
-$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi))
-$(eval $(call library,luaneightbl,neightbl - Lua lib for IPv6 neighbors,+luci-lib-core))
+$(eval $(call library,luaneightbl,neightbl - Lua lib for IPv6 neighbors,+luci-base))
 
 
 ### Protocols ###
@@ -192,7 +189,6 @@ define protocol
   LUCI_BUILD_PACKAGES += luci-proto-$(1)
 endef
 
-$(eval $(call protocol,core,Support for static/dhcp/none))
 $(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
 $(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd/DS-Lite))
 $(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
@@ -225,14 +221,9 @@ define module
 endef
 
 
-define Package/luci-mod-admin-core/extra-install
-	touch $(1)/etc/init.d/luci_fixtime || true
-endef
-
-$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-i18n-english))
-$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN))
-$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg))
-$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-mod-admin-core))
+$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-base @BROKEN))
+$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-base))
+$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-base))
 $(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json))
 
 
@@ -270,34 +261,6 @@ $(eval $(call application,qos,Quality of Service configuration module,\
 $(eval $(call application,commands,LuCI Shell Command Module))
 
 
-### Server Gateway Interfaces ###
-define sgi
-  define Package/luci-sgi-$(1)
-    SECTION:=luci
-    CATEGORY:=LuCI
-    TITLE:=LuCI - Lua Configuration Interface
-    URL:=http://luci.subsignal.org/
-    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
-    SUBMENU:=7. Server Interfaces
-    TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface)
-	DEPENDS:=$(3)
-  endef
-
-  define Package/luci-sgi-$(1)/install
-	$(call Package/luci/install/template,$$(1),libs/sgi-$(1))
-  endef
-
-  ifneq ($(CONFIG_PACKAGE_luci-sgi-$(1)),)
-    LUCI_SELECTED_MODULES+=libs/sgi-$(1)
-  endif
-
-  LUCI_BUILD_PACKAGES += luci-sgi-$(1)
-endef
-
-$(eval $(call sgi,cgi,CGI Gateway behind existing Webserver))
-$(eval $(call sgi,uhttpd,Binding for the uHTTPd server,+uhttpd +uhttpd-mod-lua))
-
-
 ### Themes ###
 define theme
   define Package/luci-theme-$(1)
@@ -308,8 +271,8 @@ define theme
     SUBMENU:=4. Themes
     TITLE:=$(if $(2),$(2),LuCI $(1) theme)
 	MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
-	DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4)
-	$(if $(5),DEFAULT:=PACKAGE_luci-lib-core)
+	DEPENDS:=+luci-base $(4)
+	$(if $(5),DEFAULT:=PACKAGE_luci-base)
   endef
 
   define Package/luci-theme-$(1)/install
@@ -323,7 +286,6 @@ define theme
   LUCI_BUILD_PACKAGES += luci-theme-$(1)
 endef
 
-$(eval $(call theme,base,Common base for all themes))
 $(eval $(call theme,openwrt,OpenWrt.org))
 $(eval $(call theme,bootstrap,Bootstrap Theme (default),,,1))
 
@@ -397,7 +359,7 @@ $(eval $(call collection,,\
 	Standard OpenWrt set including full admin with ppp support and the \
 	default OpenWrt theme,\
 	+uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-bootstrap \
-	+luci-app-firewall +luci-proto-core +luci-proto-ppp +libiwinfo-lua))
+	+luci-app-firewall +luci-proto-ppp +libiwinfo-lua))
 
 $(eval $(call collection,ssl,\
 	Standard OpenWrt set with HTTPS support,\
diff --git a/libs/core/Makefile b/libs/core/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/libs/core/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/libs/ipkg/Makefile b/libs/ipkg/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/libs/ipkg/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/libs/sgi-cgi/Makefile b/libs/sgi-cgi/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/libs/sgi-cgi/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/libs/sgi-uhttpd/Makefile b/libs/sgi-uhttpd/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/libs/sgi-uhttpd/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/libs/sys/Makefile b/libs/sys/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/libs/sys/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/modules/admin-core/Makefile b/modules/admin-core/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/modules/admin-core/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/modules/admin-core/ipkg/postinst b/modules/admin-core/ipkg/postinst
deleted file mode 100755
index a756b5b29a..0000000000
--- a/modules/admin-core/ipkg/postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ -n "${IPKG_INSTROOT}" ] || {
-	/etc/init.d/luci_fixtime enabled || /etc/init.d/luci_fixtime enable
-	/etc/init.d/luci_dhcp_migrate enabled || /etc/init.d/luci_dhcp_migrate enable
-	exit 0
-}
diff --git a/modules/admin-core/root/etc/init.d/luci_dhcp_migrate b/modules/admin-core/root/etc/init.d/luci_dhcp_migrate
deleted file mode 100755
index 7fb4435273..0000000000
--- a/modules/admin-core/root/etc/init.d/luci_dhcp_migrate
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=59
-
-boot() {
-	if [ -f /etc/config/luci_ethers ]; then
-		logger -t luci_dhcp_migrate "Migrating luci_ethers configuration ..."
-
-		lua -lluci.model.uci -e '
-			x=luci.model.uci.cursor()
-			x:foreach("luci_ethers", "static_lease",
-			function(s)
-				x:section("dhcp", "host", nil, {mac=s.macaddr, ip=s.ipaddr})
-			end)
-			x:save("dhcp")
-			x:commit("dhcp")
-		'
-
-		rm -f /etc/config/luci_ethers
-	fi
-
-	if [ -f /etc/config/luci_hosts ]; then
-		logger -t luci_dhcp_migrate "Migrating luci_hosts configuration ..."
-
-		lua -lluci.model.uci -e '
-			x=luci.model.uci.cursor()
-			x:foreach("luci_hosts", "host",
-			function(s)
-				x:section("dhcp", "domain", nil, {name=s.hostname, ip=s.ipaddr})
-			end)
-			x:save("dhcp")
-			x:commit("dhcp")
-		'
-
-		rm -f /etc/config/luci_hosts
-	fi
-}
-
-start() { :; }
-stop() { :; }
-
diff --git a/modules/admin-core/root/etc/init.d/luci_fixtime b/modules/admin-core/root/etc/init.d/luci_fixtime
deleted file mode 100755
index 154a786f5a..0000000000
--- a/modules/admin-core/root/etc/init.d/luci_fixtime
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=05
-STOP=95
-
-start() {
-	cat <<'	EOF' | lua -l luci.fs -l luci.util -
-		if (os.time() < 1000000000) then
-			os.execute('date -s ' .. os.date('%Y%m%d%H%M', luci.fs.mtime("/etc/init.d/luci_fixtime")))
-		end
-	EOF
-}
-
-stop() {
-	[[ -w /etc/init.d/luci_fixtime ]] && cat /dev/null >> /etc/init.d/luci_fixtime && touch /etc/init.d/luci_fixtime
-}
diff --git a/libs/web/Makefile b/modules/base/Makefile
index ad16ec7376..ad16ec7376 100644
--- a/libs/web/Makefile
+++ b/modules/base/Makefile
diff --git a/libs/sgi-cgi/htdocs/cgi-bin/luci b/modules/base/htdocs/cgi-bin/luci
index 529d1d0bc5..529d1d0bc5 100755
--- a/libs/sgi-cgi/htdocs/cgi-bin/luci
+++ b/modules/base/htdocs/cgi-bin/luci
diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/modules/base/htdocs/luci-static/resources/cbi.js
index 02814a5428..02814a5428 100644
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/modules/base/htdocs/luci-static/resources/cbi.js
diff --git a/libs/web/htdocs/luci-static/resources/cbi/add.gif b/modules/base/htdocs/luci-static/resources/cbi/add.gif
index 0888abf85e..0888abf85e 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/add.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/add.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/apply.gif b/modules/base/htdocs/luci-static/resources/cbi/apply.gif
index 82ae7ed821..82ae7ed821 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/apply.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/apply.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/arrow.gif b/modules/base/htdocs/luci-static/resources/cbi/arrow.gif
index 10d797e9b0..10d797e9b0 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/arrow.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/arrow.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/down.gif b/modules/base/htdocs/luci-static/resources/cbi/down.gif
index f0bb6a4ea6..f0bb6a4ea6 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/down.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/down.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/download.gif b/modules/base/htdocs/luci-static/resources/cbi/download.gif
index f99a5383b2..f99a5383b2 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/download.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/download.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/edit.gif b/modules/base/htdocs/luci-static/resources/cbi/edit.gif
index 7b02b6e72a..7b02b6e72a 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/edit.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/edit.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/fieldadd.gif b/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif
index 431ff64d1f..431ff64d1f 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/fieldadd.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/fieldadd.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/file.gif b/modules/base/htdocs/luci-static/resources/cbi/file.gif
index 3b1217dd65..3b1217dd65 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/file.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/file.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/find.gif b/modules/base/htdocs/luci-static/resources/cbi/find.gif
index 9ae5e3489b..9ae5e3489b 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/find.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/find.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/folder.gif b/modules/base/htdocs/luci-static/resources/cbi/folder.gif
index 22b583bb59..22b583bb59 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/folder.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/folder.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/help.gif b/modules/base/htdocs/luci-static/resources/cbi/help.gif
index 9dfa0e196a..9dfa0e196a 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/help.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/help.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/key.gif b/modules/base/htdocs/luci-static/resources/cbi/key.gif
index e3853e5afd..e3853e5afd 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/key.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/key.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/link.gif b/modules/base/htdocs/luci-static/resources/cbi/link.gif
index f0bb78da6b..f0bb78da6b 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/link.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/link.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/reload.gif b/modules/base/htdocs/luci-static/resources/cbi/reload.gif
index 8268958a19..8268958a19 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/reload.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/reload.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/remove.gif b/modules/base/htdocs/luci-static/resources/cbi/remove.gif
index bf43a0a0bc..bf43a0a0bc 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/remove.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/remove.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/reset.gif b/modules/base/htdocs/luci-static/resources/cbi/reset.gif
index c941c19028..c941c19028 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/reset.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/reset.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/save.gif b/modules/base/htdocs/luci-static/resources/cbi/save.gif
index 35e949963e..35e949963e 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/save.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/save.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/up.gif b/modules/base/htdocs/luci-static/resources/cbi/up.gif
index e8234178ef..e8234178ef 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/up.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/up.gif
diff --git a/libs/web/htdocs/luci-static/resources/cbi/user.gif b/modules/base/htdocs/luci-static/resources/cbi/user.gif
index dcb5c2a899..dcb5c2a899 100644
--- a/libs/web/htdocs/luci-static/resources/cbi/user.gif
+++ b/modules/base/htdocs/luci-static/resources/cbi/user.gif
diff --git a/themes/base/htdocs/luci-static/resources/icons/bridge.png b/modules/base/htdocs/luci-static/resources/icons/bridge.png
index 4c163bf692..4c163bf692 100644
--- a/themes/base/htdocs/luci-static/resources/icons/bridge.png
+++ b/modules/base/htdocs/luci-static/resources/icons/bridge.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/bridge_disabled.png b/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png
index 0f367c5369..0f367c5369 100644
--- a/themes/base/htdocs/luci-static/resources/icons/bridge_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/bridge_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/encryption.png b/modules/base/htdocs/luci-static/resources/icons/encryption.png
index 41d2ba9ace..41d2ba9ace 100644
--- a/themes/base/htdocs/luci-static/resources/icons/encryption.png
+++ b/modules/base/htdocs/luci-static/resources/icons/encryption.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/encryption_disabled.png b/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png
index f2e05a4251..f2e05a4251 100644
--- a/themes/base/htdocs/luci-static/resources/icons/encryption_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/encryption_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/ethernet.png b/modules/base/htdocs/luci-static/resources/icons/ethernet.png
index a02538124c..a02538124c 100644
--- a/themes/base/htdocs/luci-static/resources/icons/ethernet.png
+++ b/modules/base/htdocs/luci-static/resources/icons/ethernet.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/ethernet_disabled.png b/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
index 2bb02e455a..2bb02e455a 100644
--- a/themes/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/ethernet_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/loading.gif b/modules/base/htdocs/luci-static/resources/icons/loading.gif
index 5bb90fd6a4..5bb90fd6a4 100644
--- a/themes/base/htdocs/luci-static/resources/icons/loading.gif
+++ b/modules/base/htdocs/luci-static/resources/icons/loading.gif
diff --git a/themes/base/htdocs/luci-static/resources/icons/port_down.png b/modules/base/htdocs/luci-static/resources/icons/port_down.png
index 25ea172324..25ea172324 100644
--- a/themes/base/htdocs/luci-static/resources/icons/port_down.png
+++ b/modules/base/htdocs/luci-static/resources/icons/port_down.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/port_up.png b/modules/base/htdocs/luci-static/resources/icons/port_up.png
index e063037910..e063037910 100644
--- a/themes/base/htdocs/luci-static/resources/icons/port_up.png
+++ b/modules/base/htdocs/luci-static/resources/icons/port_up.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-0-25.png b/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png
index 2e5dff4663..2e5dff4663 100644
--- a/themes/base/htdocs/luci-static/resources/icons/signal-0-25.png
+++ b/modules/base/htdocs/luci-static/resources/icons/signal-0-25.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-0.png b/modules/base/htdocs/luci-static/resources/icons/signal-0.png
index 114583a676..114583a676 100644
--- a/themes/base/htdocs/luci-static/resources/icons/signal-0.png
+++ b/modules/base/htdocs/luci-static/resources/icons/signal-0.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-25-50.png b/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png
index ee8cc4f1ce..ee8cc4f1ce 100644
--- a/themes/base/htdocs/luci-static/resources/icons/signal-25-50.png
+++ b/modules/base/htdocs/luci-static/resources/icons/signal-25-50.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-50-75.png b/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png
index 26bcbf715d..26bcbf715d 100644
--- a/themes/base/htdocs/luci-static/resources/icons/signal-50-75.png
+++ b/modules/base/htdocs/luci-static/resources/icons/signal-50-75.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-75-100.png b/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png
index 5cffaa1b84..5cffaa1b84 100644
--- a/themes/base/htdocs/luci-static/resources/icons/signal-75-100.png
+++ b/modules/base/htdocs/luci-static/resources/icons/signal-75-100.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/signal-none.png b/modules/base/htdocs/luci-static/resources/icons/signal-none.png
index b77585c0f0..b77585c0f0 100644
--- a/themes/base/htdocs/luci-static/resources/icons/signal-none.png
+++ b/modules/base/htdocs/luci-static/resources/icons/signal-none.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/switch.png b/modules/base/htdocs/luci-static/resources/icons/switch.png
index 5c99ba5684..5c99ba5684 100644
--- a/themes/base/htdocs/luci-static/resources/icons/switch.png
+++ b/modules/base/htdocs/luci-static/resources/icons/switch.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/switch_disabled.png b/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png
index b8c84c8dc4..b8c84c8dc4 100644
--- a/themes/base/htdocs/luci-static/resources/icons/switch_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/switch_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/tunnel.png b/modules/base/htdocs/luci-static/resources/icons/tunnel.png
index c5a09dd685..c5a09dd685 100644
--- a/themes/base/htdocs/luci-static/resources/icons/tunnel.png
+++ b/modules/base/htdocs/luci-static/resources/icons/tunnel.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/tunnel_disabled.png b/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
index ad9856cfec..ad9856cfec 100644
--- a/themes/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/tunnel_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/vlan.png b/modules/base/htdocs/luci-static/resources/icons/vlan.png
index 5c99ba5684..5c99ba5684 100644
--- a/themes/base/htdocs/luci-static/resources/icons/vlan.png
+++ b/modules/base/htdocs/luci-static/resources/icons/vlan.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/vlan_disabled.png b/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png
index b8c84c8dc4..b8c84c8dc4 100644
--- a/themes/base/htdocs/luci-static/resources/icons/vlan_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/vlan_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi.png b/modules/base/htdocs/luci-static/resources/icons/wifi.png
index 528ce2b4e9..528ce2b4e9 100644
--- a/themes/base/htdocs/luci-static/resources/icons/wifi.png
+++ b/modules/base/htdocs/luci-static/resources/icons/wifi.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi_big.png b/modules/base/htdocs/luci-static/resources/icons/wifi_big.png
index d73a5e7401..d73a5e7401 100644
--- a/themes/base/htdocs/luci-static/resources/icons/wifi_big.png
+++ b/modules/base/htdocs/luci-static/resources/icons/wifi_big.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png b/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
index af93b37b7a..af93b37b7a 100644
--- a/themes/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/icons/wifi_disabled.png b/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png
index 338a34f78c..338a34f78c 100644
--- a/themes/base/htdocs/luci-static/resources/icons/wifi_disabled.png
+++ b/modules/base/htdocs/luci-static/resources/icons/wifi_disabled.png
diff --git a/themes/base/htdocs/luci-static/resources/xhr.js b/modules/base/htdocs/luci-static/resources/xhr.js
index 701c12ac19..701c12ac19 100644
--- a/themes/base/htdocs/luci-static/resources/xhr.js
+++ b/modules/base/htdocs/luci-static/resources/xhr.js
diff --git a/libs/core/luasrc/ccache.lua b/modules/base/luasrc/ccache.lua
index 56ccbc3efe..56ccbc3efe 100644
--- a/libs/core/luasrc/ccache.lua
+++ b/modules/base/luasrc/ccache.lua
diff --git a/modules/admin-core/luasrc/controller/admin/servicectl.lua b/modules/base/luasrc/controller/admin/servicectl.lua
index 753d2c77f1..753d2c77f1 100644
--- a/modules/admin-core/luasrc/controller/admin/servicectl.lua
+++ b/modules/base/luasrc/controller/admin/servicectl.lua
diff --git a/libs/core/luasrc/debug.lua b/modules/base/luasrc/debug.lua
index 8ff1bb6981..8ff1bb6981 100644
--- a/libs/core/luasrc/debug.lua
+++ b/modules/base/luasrc/debug.lua
diff --git a/libs/core/luasrc/fs.lua b/modules/base/luasrc/fs.lua
index a81ff675d4..a81ff675d4 100644
--- a/libs/core/luasrc/fs.lua
+++ b/modules/base/luasrc/fs.lua
diff --git a/libs/core/luasrc/init.lua b/modules/base/luasrc/init.lua
index 4d66e86734..4d66e86734 100644
--- a/libs/core/luasrc/init.lua
+++ b/modules/base/luasrc/init.lua
diff --git a/libs/core/luasrc/ip.lua b/modules/base/luasrc/ip.lua
index 60ca090135..60ca090135 100644
--- a/libs/core/luasrc/ip.lua
+++ b/modules/base/luasrc/ip.lua
diff --git a/libs/core/luasrc/ltn12.lua b/modules/base/luasrc/ltn12.lua
index 9371290c61..9371290c61 100644
--- a/libs/core/luasrc/ltn12.lua
+++ b/modules/base/luasrc/ltn12.lua
diff --git a/libs/web/luasrc/cacheloader.lua b/modules/base/luasrc/luasrc/cacheloader.lua
index 942c4b7b48..942c4b7b48 100644
--- a/libs/web/luasrc/cacheloader.lua
+++ b/modules/base/luasrc/luasrc/cacheloader.lua
diff --git a/libs/web/luasrc/cbi.lua b/modules/base/luasrc/luasrc/cbi.lua
index ae570b1556..ae570b1556 100644
--- a/libs/web/luasrc/cbi.lua
+++ b/modules/base/luasrc/luasrc/cbi.lua
diff --git a/libs/web/luasrc/cbi/datatypes.lua b/modules/base/luasrc/luasrc/cbi/datatypes.lua
index c5f4ec0f0d..c5f4ec0f0d 100644
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/modules/base/luasrc/luasrc/cbi/datatypes.lua
diff --git a/libs/web/luasrc/config.lua b/modules/base/luasrc/luasrc/config.lua
index 53db82b322..53db82b322 100644
--- a/libs/web/luasrc/config.lua
+++ b/modules/base/luasrc/luasrc/config.lua
diff --git a/libs/web/luasrc/dispatcher.lua b/modules/base/luasrc/luasrc/dispatcher.lua
index 9e5b78d5e9..9e5b78d5e9 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/modules/base/luasrc/luasrc/dispatcher.lua
diff --git a/libs/web/luasrc/http.lua b/modules/base/luasrc/luasrc/http.lua
index c53307a5a1..c53307a5a1 100644
--- a/libs/web/luasrc/http.lua
+++ b/modules/base/luasrc/luasrc/http.lua
diff --git a/libs/web/luasrc/http/protocol.lua b/modules/base/luasrc/luasrc/http/protocol.lua
index 0d41550b23..0d41550b23 100644
--- a/libs/web/luasrc/http/protocol.lua
+++ b/modules/base/luasrc/luasrc/http/protocol.lua
diff --git a/libs/web/luasrc/http/protocol/conditionals.lua b/modules/base/luasrc/luasrc/http/protocol/conditionals.lua
index 75e1f7b37c..75e1f7b37c 100644
--- a/libs/web/luasrc/http/protocol/conditionals.lua
+++ b/modules/base/luasrc/luasrc/http/protocol/conditionals.lua
diff --git a/libs/web/luasrc/http/protocol/date.lua b/modules/base/luasrc/luasrc/http/protocol/date.lua
index 83d11e2c25..83d11e2c25 100644
--- a/libs/web/luasrc/http/protocol/date.lua
+++ b/modules/base/luasrc/luasrc/http/protocol/date.lua
diff --git a/libs/web/luasrc/http/protocol/mime.lua b/modules/base/luasrc/luasrc/http/protocol/mime.lua
index c878160664..c878160664 100644
--- a/libs/web/luasrc/http/protocol/mime.lua
+++ b/modules/base/luasrc/luasrc/http/protocol/mime.lua
diff --git a/libs/web/luasrc/i18n.lua b/modules/base/luasrc/luasrc/i18n.lua
index 545a8aed93..545a8aed93 100644
--- a/libs/web/luasrc/i18n.lua
+++ b/modules/base/luasrc/luasrc/i18n.lua
diff --git a/libs/web/luasrc/sauth.lua b/modules/base/luasrc/luasrc/sauth.lua
index 32f172dcda..32f172dcda 100644
--- a/libs/web/luasrc/sauth.lua
+++ b/modules/base/luasrc/luasrc/sauth.lua
diff --git a/libs/web/luasrc/template.lua b/modules/base/luasrc/luasrc/template.lua
index 72127d1df1..72127d1df1 100644
--- a/libs/web/luasrc/template.lua
+++ b/modules/base/luasrc/luasrc/template.lua
diff --git a/libs/web/luasrc/view/cbi/apply_xhr.htm b/modules/base/luasrc/luasrc/view/cbi/apply_xhr.htm
index 1814c9393b..1814c9393b 100644
--- a/libs/web/luasrc/view/cbi/apply_xhr.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/apply_xhr.htm
diff --git a/libs/web/luasrc/view/cbi/browser.htm b/modules/base/luasrc/luasrc/view/cbi/browser.htm
index e4a4077d55..e4a4077d55 100644
--- a/libs/web/luasrc/view/cbi/browser.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/browser.htm
diff --git a/libs/web/luasrc/view/cbi/button.htm b/modules/base/luasrc/luasrc/view/cbi/button.htm
index 30f8ddfda5..30f8ddfda5 100644
--- a/libs/web/luasrc/view/cbi/button.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/button.htm
diff --git a/libs/web/luasrc/view/cbi/cell_valuefooter.htm b/modules/base/luasrc/luasrc/view/cbi/cell_valuefooter.htm
index 220ebd42ba..220ebd42ba 100644
--- a/libs/web/luasrc/view/cbi/cell_valuefooter.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/cell_valuefooter.htm
diff --git a/libs/web/luasrc/view/cbi/cell_valueheader.htm b/modules/base/luasrc/luasrc/view/cbi/cell_valueheader.htm
index 9e2e145ddb..9e2e145ddb 100644
--- a/libs/web/luasrc/view/cbi/cell_valueheader.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/cell_valueheader.htm
diff --git a/libs/web/luasrc/view/cbi/compound.htm b/modules/base/luasrc/luasrc/view/cbi/compound.htm
index 12d02bb1d8..12d02bb1d8 100644
--- a/libs/web/luasrc/view/cbi/compound.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/compound.htm
diff --git a/libs/web/luasrc/view/cbi/delegator.htm b/modules/base/luasrc/luasrc/view/cbi/delegator.htm
index 4fd19265d8..4fd19265d8 100644
--- a/libs/web/luasrc/view/cbi/delegator.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/delegator.htm
diff --git a/libs/web/luasrc/view/cbi/dvalue.htm b/modules/base/luasrc/luasrc/view/cbi/dvalue.htm
index 78e6f323d7..78e6f323d7 100644
--- a/libs/web/luasrc/view/cbi/dvalue.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/dvalue.htm
diff --git a/libs/web/luasrc/view/cbi/dynlist.htm b/modules/base/luasrc/luasrc/view/cbi/dynlist.htm
index fd626a4ecf..fd626a4ecf 100644
--- a/libs/web/luasrc/view/cbi/dynlist.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/dynlist.htm
diff --git a/libs/web/luasrc/view/cbi/filebrowser.htm b/modules/base/luasrc/luasrc/view/cbi/filebrowser.htm
index a79beebba7..a79beebba7 100644
--- a/libs/web/luasrc/view/cbi/filebrowser.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/filebrowser.htm
diff --git a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm b/modules/base/luasrc/luasrc/view/cbi/firewall_zoneforwards.htm
index 2a433b5696..2a433b5696 100644
--- a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/firewall_zoneforwards.htm
diff --git a/libs/web/luasrc/view/cbi/firewall_zonelist.htm b/modules/base/luasrc/luasrc/view/cbi/firewall_zonelist.htm
index 7973437f40..7973437f40 100644
--- a/libs/web/luasrc/view/cbi/firewall_zonelist.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/firewall_zonelist.htm
diff --git a/libs/web/luasrc/view/cbi/footer.htm b/modules/base/luasrc/luasrc/view/cbi/footer.htm
index 2c34028e58..2c34028e58 100644
--- a/libs/web/luasrc/view/cbi/footer.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/footer.htm
diff --git a/libs/web/luasrc/view/cbi/full_valuefooter.htm b/modules/base/luasrc/luasrc/view/cbi/full_valuefooter.htm
index 4876fbcc99..4876fbcc99 100644
--- a/libs/web/luasrc/view/cbi/full_valuefooter.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/full_valuefooter.htm
diff --git a/libs/web/luasrc/view/cbi/full_valueheader.htm b/modules/base/luasrc/luasrc/view/cbi/full_valueheader.htm
index aaf085473a..aaf085473a 100644
--- a/libs/web/luasrc/view/cbi/full_valueheader.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/full_valueheader.htm
diff --git a/libs/web/luasrc/view/cbi/fvalue.htm b/modules/base/luasrc/luasrc/view/cbi/fvalue.htm
index a1e0808e8d..a1e0808e8d 100644
--- a/libs/web/luasrc/view/cbi/fvalue.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/fvalue.htm
diff --git a/libs/web/luasrc/view/cbi/header.htm b/modules/base/luasrc/luasrc/view/cbi/header.htm
index 2bddaba61a..2bddaba61a 100644
--- a/libs/web/luasrc/view/cbi/header.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/header.htm
diff --git a/libs/web/luasrc/view/cbi/lvalue.htm b/modules/base/luasrc/luasrc/view/cbi/lvalue.htm
index 8cc086db42..8cc086db42 100644
--- a/libs/web/luasrc/view/cbi/lvalue.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/lvalue.htm
diff --git a/libs/web/luasrc/view/cbi/map.htm b/modules/base/luasrc/luasrc/view/cbi/map.htm
index 053220d185..053220d185 100644
--- a/libs/web/luasrc/view/cbi/map.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/map.htm
diff --git a/libs/web/luasrc/view/cbi/mvalue.htm b/modules/base/luasrc/luasrc/view/cbi/mvalue.htm
index 6a0b3881d0..6a0b3881d0 100644
--- a/libs/web/luasrc/view/cbi/mvalue.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/mvalue.htm
diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/modules/base/luasrc/luasrc/view/cbi/network_ifacelist.htm
index 643d849a50..643d849a50 100644
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/network_ifacelist.htm
diff --git a/libs/web/luasrc/view/cbi/network_netinfo.htm b/modules/base/luasrc/luasrc/view/cbi/network_netinfo.htm
index 4fd84112a4..4fd84112a4 100644
--- a/libs/web/luasrc/view/cbi/network_netinfo.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/network_netinfo.htm
diff --git a/libs/web/luasrc/view/cbi/network_netlist.htm b/modules/base/luasrc/luasrc/view/cbi/network_netlist.htm
index 7e23d149a8..7e23d149a8 100644
--- a/libs/web/luasrc/view/cbi/network_netlist.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/network_netlist.htm
diff --git a/libs/web/luasrc/view/cbi/nsection.htm b/modules/base/luasrc/luasrc/view/cbi/nsection.htm
index 95e7658822..95e7658822 100644
--- a/libs/web/luasrc/view/cbi/nsection.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/nsection.htm
diff --git a/libs/web/luasrc/view/cbi/nullsection.htm b/modules/base/luasrc/luasrc/view/cbi/nullsection.htm
index bd48950958..bd48950958 100644
--- a/libs/web/luasrc/view/cbi/nullsection.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/nullsection.htm
diff --git a/libs/web/luasrc/view/cbi/simpleform.htm b/modules/base/luasrc/luasrc/view/cbi/simpleform.htm
index 5216cd50f1..5216cd50f1 100644
--- a/libs/web/luasrc/view/cbi/simpleform.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/simpleform.htm
diff --git a/libs/web/luasrc/view/cbi/tabcontainer.htm b/modules/base/luasrc/luasrc/view/cbi/tabcontainer.htm
index 38c435d6a1..38c435d6a1 100644
--- a/libs/web/luasrc/view/cbi/tabcontainer.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/tabcontainer.htm
diff --git a/libs/web/luasrc/view/cbi/tabmenu.htm b/modules/base/luasrc/luasrc/view/cbi/tabmenu.htm
index b96ac9ce4b..b96ac9ce4b 100644
--- a/libs/web/luasrc/view/cbi/tabmenu.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/tabmenu.htm
diff --git a/libs/web/luasrc/view/cbi/tblsection.htm b/modules/base/luasrc/luasrc/view/cbi/tblsection.htm
index d928791167..d928791167 100644
--- a/libs/web/luasrc/view/cbi/tblsection.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/tblsection.htm
diff --git a/libs/web/luasrc/view/cbi/tsection.htm b/modules/base/luasrc/luasrc/view/cbi/tsection.htm
index 087548bf28..087548bf28 100644
--- a/libs/web/luasrc/view/cbi/tsection.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/tsection.htm
diff --git a/libs/web/luasrc/view/cbi/tvalue.htm b/modules/base/luasrc/luasrc/view/cbi/tvalue.htm
index fcf7a6c94c..fcf7a6c94c 100644
--- a/libs/web/luasrc/view/cbi/tvalue.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/tvalue.htm
diff --git a/libs/web/luasrc/view/cbi/ucisection.htm b/modules/base/luasrc/luasrc/view/cbi/ucisection.htm
index 3b69f12f2e..3b69f12f2e 100644
--- a/libs/web/luasrc/view/cbi/ucisection.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/ucisection.htm
diff --git a/libs/web/luasrc/view/cbi/upload.htm b/modules/base/luasrc/luasrc/view/cbi/upload.htm
index 7770934111..7770934111 100644
--- a/libs/web/luasrc/view/cbi/upload.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/upload.htm
diff --git a/libs/web/luasrc/view/cbi/value.htm b/modules/base/luasrc/luasrc/view/cbi/value.htm
index d1a7bea5c6..d1a7bea5c6 100644
--- a/libs/web/luasrc/view/cbi/value.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/value.htm
diff --git a/libs/web/luasrc/view/cbi/valuefooter.htm b/modules/base/luasrc/luasrc/view/cbi/valuefooter.htm
index 805312e451..805312e451 100644
--- a/libs/web/luasrc/view/cbi/valuefooter.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/valuefooter.htm
diff --git a/libs/web/luasrc/view/cbi/valueheader.htm b/modules/base/luasrc/luasrc/view/cbi/valueheader.htm
index 761a54aed0..761a54aed0 100644
--- a/libs/web/luasrc/view/cbi/valueheader.htm
+++ b/modules/base/luasrc/luasrc/view/cbi/valueheader.htm
diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua b/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua
index fe3fec6fa1..fe3fec6fa1 100644
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
+++ b/modules/base/luasrc/model/cbi/admin_network/proto_dhcp.lua
diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_none.lua b/modules/base/luasrc/model/cbi/admin_network/proto_none.lua
index 0e34b67de6..0e34b67de6 100644
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_none.lua
+++ b/modules/base/luasrc/model/cbi/admin_network/proto_none.lua
diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua b/modules/base/luasrc/model/cbi/admin_network/proto_static.lua
index 338c0b7d83..338c0b7d83 100644
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
+++ b/modules/base/luasrc/model/cbi/admin_network/proto_static.lua
diff --git a/libs/core/luasrc/model/firewall.lua b/modules/base/luasrc/model/firewall.lua
index a9f6fdb7fc..a9f6fdb7fc 100644
--- a/libs/core/luasrc/model/firewall.lua
+++ b/modules/base/luasrc/model/firewall.lua
diff --git a/libs/ipkg/luasrc/model/ipkg.lua b/modules/base/luasrc/model/ipkg.lua
index c927e71163..c927e71163 100644
--- a/libs/ipkg/luasrc/model/ipkg.lua
+++ b/modules/base/luasrc/model/ipkg.lua
diff --git a/libs/core/luasrc/model/network.lua b/modules/base/luasrc/model/network.lua
index a409621f8e..a409621f8e 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/modules/base/luasrc/model/network.lua
diff --git a/libs/core/luasrc/model/uci.lua b/modules/base/luasrc/model/uci.lua
index a394563047..a394563047 100644
--- a/libs/core/luasrc/model/uci.lua
+++ b/modules/base/luasrc/model/uci.lua
diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/modules/base/luasrc/sgi/cgi.lua
index 04ae9aa592..04ae9aa592 100644
--- a/libs/sgi-cgi/luasrc/sgi/cgi.lua
+++ b/modules/base/luasrc/sgi/cgi.lua
diff --git a/libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua b/modules/base/luasrc/sgi/uhttpd.lua
index db8780f7ec..db8780f7ec 100644
--- a/libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua
+++ b/modules/base/luasrc/sgi/uhttpd.lua
diff --git a/libs/core/luasrc/store.lua b/modules/base/luasrc/store.lua
index c33ef07e11..c33ef07e11 100644
--- a/libs/core/luasrc/store.lua
+++ b/modules/base/luasrc/store.lua
diff --git a/libs/sys/luasrc/sys.lua b/modules/base/luasrc/sys.lua
index df6280dda0..df6280dda0 100644
--- a/libs/sys/luasrc/sys.lua
+++ b/modules/base/luasrc/sys.lua
diff --git a/libs/sys/luasrc/sys/iptparser.lua b/modules/base/luasrc/sys/iptparser.lua
index d82363309a..d82363309a 100644
--- a/libs/sys/luasrc/sys/iptparser.lua
+++ b/modules/base/luasrc/sys/iptparser.lua
diff --git a/libs/sys/luasrc/sys/zoneinfo.lua b/modules/base/luasrc/sys/zoneinfo.lua
index f5a12bfcb6..f5a12bfcb6 100644
--- a/libs/sys/luasrc/sys/zoneinfo.lua
+++ b/modules/base/luasrc/sys/zoneinfo.lua
diff --git a/libs/sys/luasrc/sys/zoneinfo/tzdata.lua b/modules/base/luasrc/sys/zoneinfo/tzdata.lua
index 1a99f6a7eb..1a99f6a7eb 100644
--- a/libs/sys/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/base/luasrc/sys/zoneinfo/tzdata.lua
diff --git a/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
index bbe75d5a47..bbe75d5a47 100644
--- a/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
diff --git a/protocols/core/luasrc/tools/proto.lua b/modules/base/luasrc/tools/proto.lua
index 4df02696b0..4df02696b0 100644
--- a/protocols/core/luasrc/tools/proto.lua
+++ b/modules/base/luasrc/tools/proto.lua
diff --git a/modules/admin-core/luasrc/tools/status.lua b/modules/base/luasrc/tools/status.lua
index 27bc925bd2..27bc925bd2 100644
--- a/modules/admin-core/luasrc/tools/status.lua
+++ b/modules/base/luasrc/tools/status.lua
diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/base/luasrc/tools/webadmin.lua
index 0e09be9800..0e09be9800 100644
--- a/modules/admin-core/luasrc/tools/webadmin.lua
+++ b/modules/base/luasrc/tools/webadmin.lua
diff --git a/libs/core/luasrc/util.lua b/modules/base/luasrc/util.lua
index da761e219a..da761e219a 100644
--- a/libs/core/luasrc/util.lua
+++ b/modules/base/luasrc/util.lua
diff --git a/libs/core/luasrc/version.lua b/modules/base/luasrc/version.lua
index 9e5cb719c4..9e5cb719c4 100644
--- a/libs/core/luasrc/version.lua
+++ b/modules/base/luasrc/version.lua
diff --git a/modules/admin-core/luasrc/view/error404.htm b/modules/base/luasrc/view/error404.htm
index 813604d12c..813604d12c 100644
--- a/modules/admin-core/luasrc/view/error404.htm
+++ b/modules/base/luasrc/view/error404.htm
diff --git a/modules/admin-core/luasrc/view/error500.htm b/modules/base/luasrc/view/error500.htm
index 14ba0410a4..14ba0410a4 100644
--- a/modules/admin-core/luasrc/view/error500.htm
+++ b/modules/base/luasrc/view/error500.htm
diff --git a/modules/admin-core/luasrc/view/footer.htm b/modules/base/luasrc/view/footer.htm
index 6c6d214210..6c6d214210 100644
--- a/modules/admin-core/luasrc/view/footer.htm
+++ b/modules/base/luasrc/view/footer.htm
diff --git a/modules/admin-core/luasrc/view/header.htm b/modules/base/luasrc/view/header.htm
index 77018b1173..77018b1173 100644
--- a/modules/admin-core/luasrc/view/header.htm
+++ b/modules/base/luasrc/view/header.htm
diff --git a/modules/admin-core/luasrc/view/indexer.htm b/modules/base/luasrc/view/indexer.htm
index c628289711..c628289711 100644
--- a/modules/admin-core/luasrc/view/indexer.htm
+++ b/modules/base/luasrc/view/indexer.htm
diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/base/luasrc/view/sysauth.htm
index 7c39f0da51..7c39f0da51 100644
--- a/modules/admin-core/luasrc/view/sysauth.htm
+++ b/modules/base/luasrc/view/sysauth.htm
diff --git a/libs/core/root/etc/config/ucitrack b/modules/base/root/etc/config/ucitrack
index 04467f4fdf..04467f4fdf 100644
--- a/libs/core/root/etc/config/ucitrack
+++ b/modules/base/root/etc/config/ucitrack
diff --git a/libs/web/root/etc/config/luci b/modules/base/root/root/etc/config/luci
index c503a8f1e0..c503a8f1e0 100644
--- a/libs/web/root/etc/config/luci
+++ b/modules/base/root/root/etc/config/luci
diff --git a/libs/web/root/lib/uci/upload/.gitignore b/modules/base/root/root/lib/uci/upload/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/libs/web/root/lib/uci/upload/.gitignore
+++ b/modules/base/root/root/lib/uci/upload/.gitignore
diff --git a/libs/core/root/sbin/luci-reload b/modules/base/root/sbin/luci-reload
index cc41da2bb7..cc41da2bb7 100755
--- a/libs/core/root/sbin/luci-reload
+++ b/modules/base/root/sbin/luci-reload
diff --git a/modules/admin-core/root/www/index.html b/modules/base/root/www/index.html
index 0a7238b556..0a7238b556 100644
--- a/modules/admin-core/root/www/index.html
+++ b/modules/base/root/www/index.html
diff --git a/libs/web/src/po2lmo.c b/modules/base/src/po2lmo.c
index 0da792b680..0da792b680 100644
--- a/libs/web/src/po2lmo.c
+++ b/modules/base/src/po2lmo.c
diff --git a/libs/web/src/template_lmo.c b/modules/base/src/template_lmo.c
index 27205a7228..27205a7228 100644
--- a/libs/web/src/template_lmo.c
+++ b/modules/base/src/template_lmo.c
diff --git a/libs/web/src/template_lmo.h b/modules/base/src/template_lmo.h
index 57f59aa56b..57f59aa56b 100644
--- a/libs/web/src/template_lmo.h
+++ b/modules/base/src/template_lmo.h
diff --git a/libs/web/src/template_lualib.c b/modules/base/src/template_lualib.c
index 0d43641041..0d43641041 100644
--- a/libs/web/src/template_lualib.c
+++ b/modules/base/src/template_lualib.c
diff --git a/libs/web/src/template_lualib.h b/modules/base/src/template_lualib.h
index 1b659be126..1b659be126 100644
--- a/libs/web/src/template_lualib.h
+++ b/modules/base/src/template_lualib.h
diff --git a/libs/web/src/template_parser.c b/modules/base/src/template_parser.c
index 6054451315..6054451315 100644
--- a/libs/web/src/template_parser.c
+++ b/modules/base/src/template_parser.c
diff --git a/libs/web/src/template_parser.h b/modules/base/src/template_parser.h
index d1c606272e..d1c606272e 100644
--- a/libs/web/src/template_parser.h
+++ b/modules/base/src/template_parser.h
diff --git a/libs/web/src/template_utils.c b/modules/base/src/template_utils.c
index 80542bd4f3..80542bd4f3 100644
--- a/libs/web/src/template_utils.c
+++ b/modules/base/src/template_utils.c
diff --git a/libs/web/src/template_utils.h b/modules/base/src/template_utils.h
index c54af757c5..c54af757c5 100644
--- a/libs/web/src/template_utils.h
+++ b/modules/base/src/template_utils.h
diff --git a/libs/web/standalone.mk b/modules/base/standalone.mk
index 66a0e5a2e7..66a0e5a2e7 100644
--- a/libs/web/standalone.mk
+++ b/modules/base/standalone.mk
diff --git a/protocols/core/Makefile b/protocols/core/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/protocols/core/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/themes/base/Makefile b/themes/base/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/themes/base/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file