From 58d97b5e271bc0d7507eab5b9bd2902181864e02 Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <cshored@thecshore.com>
Date: Fri, 3 Aug 2018 12:36:51 -0400
Subject: [PATCH] modules: Split luci-mod-full

Move some common elements to luci-base, and otherwise make three
packages out of status, system, and network.  They were mostly
separated already, but there were some shared elements between
status and network that are now in luci-base.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
---
 .../luasrc/controller/admin/index.lua         | 40 +++++++++++++++++++
 .../luasrc/view/cbi/wireless_modefreq.htm     |  0
 .../luasrc/view}/lease_status.htm             |  2 +-
 .../luasrc/view}/wifi_assoclist.htm           |  2 +-
 modules/luci-mod-admin-full/Makefile          |  3 +-
 modules/luci-mod-network/Makefile             | 17 ++++++++
 .../luasrc/controller/admin/network.lua       | 25 ------------
 .../luasrc/model/cbi/admin_network/dhcp.lua   |  2 +-
 .../luasrc/model/cbi/admin_network/hosts.lua  |  0
 .../model/cbi/admin_network/iface_add.lua     |  0
 .../luasrc/model/cbi/admin_network/ifaces.lua |  0
 .../model/cbi/admin_network/network.lua       |  0
 .../model/cbi/admin_network/proto_ahcp.lua    |  0
 .../luasrc/model/cbi/admin_network/routes.lua |  0
 .../luasrc/model/cbi/admin_network/vlan.lua   |  0
 .../luasrc/model/cbi/admin_network/wifi.lua   |  0
 .../model/cbi/admin_network/wifi_add.lua      |  0
 .../model/cbi/admin_network/wifi_overview.lua |  2 +-
 .../luasrc/view/admin_network/diagnostics.htm |  0
 .../admin_network/iface_overview_status.htm   |  0
 .../view/admin_network/iface_status.htm       |  0
 .../view/admin_network/switch_status.htm      |  0
 .../luasrc/view/admin_network/wifi_join.htm   |  0
 .../admin_network/wifi_overview_status.htm    |  0
 .../luasrc/view/admin_network/wifi_status.htm |  0
 .../etc/uci-defaults/50_luci-mod-admin-full   |  0
 modules/luci-mod-status/Makefile              | 18 +++++++++
 .../luci-static/resources/bandwidth.svg       |  0
 .../luci-static/resources/connections.svg     |  0
 .../htdocs/luci-static/resources/load.svg     |  0
 .../htdocs/luci-static/resources/wifirate.svg |  0
 .../htdocs/luci-static/resources/wireless.svg |  0
 .../luasrc/controller/admin/status.lua        |  0
 .../model/cbi/admin_status/processes.lua      |  0
 .../luasrc/view/admin_status/bandwidth.htm    |  0
 .../luasrc/view/admin_status/connections.htm  |  0
 .../luasrc/view/admin_status/dmesg.htm        |  0
 .../luasrc/view/admin_status/index.htm        |  4 +-
 .../luasrc/view/admin_status/iptables.htm     |  0
 .../luasrc/view/admin_status/load.htm         |  0
 .../luasrc/view/admin_status/routes.htm       |  0
 .../luasrc/view/admin_status/syslog.htm       |  0
 .../luasrc/view/admin_status/wireless.htm     |  0
 .../src/Makefile                              |  0
 .../src/luci-bwc.c                            |  0
 modules/luci-mod-system/Makefile              | 17 ++++++++
 .../luasrc/controller/admin/system.lua        |  0
 .../luasrc/model/cbi/admin_system/admin.lua   |  0
 .../model/cbi/admin_system/backupfiles.lua    |  0
 .../luasrc/model/cbi/admin_system/crontab.lua |  0
 .../luasrc/model/cbi/admin_system/fstab.lua   |  0
 .../model/cbi/admin_system/fstab/mount.lua    |  0
 .../model/cbi/admin_system/fstab/swap.lua     |  0
 .../luasrc/model/cbi/admin_system/ipkg.lua    |  0
 .../luasrc/model/cbi/admin_system/leds.lua    |  0
 .../luasrc/model/cbi/admin_system/startup.lua |  0
 .../luasrc/model/cbi/admin_system/system.lua  |  0
 .../luasrc/view/admin_system/applyreboot.htm  |  0
 .../luasrc/view/admin_system/backupfiles.htm  |  0
 .../luasrc/view/admin_system/clock_status.htm |  0
 .../luasrc/view/admin_system/flashops.htm     |  0
 .../luasrc/view/admin_system/ipkg.htm         |  0
 .../luasrc/view/admin_system/packages.htm     |  0
 .../luasrc/view/admin_system/reboot.htm       |  0
 .../luasrc/view/admin_system/upgrade.htm      |  0
 65 files changed, 99 insertions(+), 33 deletions(-)
 rename modules/{luci-mod-admin-full => luci-base}/luasrc/view/cbi/wireless_modefreq.htm (100%)
 rename modules/{luci-mod-admin-full/luasrc/view/admin_network => luci-base/luasrc/view}/lease_status.htm (97%)
 rename modules/{luci-mod-admin-full/luasrc/view/admin_network => luci-base/luasrc/view}/wifi_assoclist.htm (97%)
 create mode 100644 modules/luci-mod-network/Makefile
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/controller/admin/network.lua (94%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/dhcp.lua (99%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/hosts.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/iface_add.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/ifaces.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/network.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/proto_ahcp.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/routes.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/vlan.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/wifi.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/wifi_add.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/model/cbi/admin_network/wifi_overview.lua (99%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/view/admin_network/diagnostics.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/view/admin_network/iface_overview_status.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/view/admin_network/iface_status.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/view/admin_network/switch_status.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/view/admin_network/wifi_join.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/view/admin_network/wifi_overview_status.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/luasrc/view/admin_network/wifi_status.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-network}/root/etc/uci-defaults/50_luci-mod-admin-full (100%)
 create mode 100644 modules/luci-mod-status/Makefile
 rename modules/{luci-mod-admin-full => luci-mod-status}/htdocs/luci-static/resources/bandwidth.svg (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/htdocs/luci-static/resources/connections.svg (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/htdocs/luci-static/resources/load.svg (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/htdocs/luci-static/resources/wifirate.svg (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/htdocs/luci-static/resources/wireless.svg (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/controller/admin/status.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/model/cbi/admin_status/processes.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/bandwidth.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/connections.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/dmesg.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/index.htm (99%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/iptables.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/load.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/routes.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/syslog.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/luasrc/view/admin_status/wireless.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/src/Makefile (100%)
 rename modules/{luci-mod-admin-full => luci-mod-status}/src/luci-bwc.c (100%)
 create mode 100644 modules/luci-mod-system/Makefile
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/controller/admin/system.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/admin.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/backupfiles.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/crontab.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/fstab.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/fstab/mount.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/fstab/swap.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/ipkg.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/leds.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/startup.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/model/cbi/admin_system/system.lua (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/applyreboot.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/backupfiles.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/clock_status.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/flashops.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/ipkg.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/packages.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/reboot.htm (100%)
 rename modules/{luci-mod-admin-full => luci-mod-system}/luasrc/view/admin_system/upgrade.htm (100%)

diff --git a/modules/luci-base/luasrc/controller/admin/index.lua b/modules/luci-base/luasrc/controller/admin/index.lua
index 39e6e573b1..360298b1cd 100644
--- a/modules/luci-base/luasrc/controller/admin/index.lua
+++ b/modules/luci-base/luasrc/controller/admin/index.lua
@@ -16,6 +16,8 @@ function index()
 		end
 	end
 
+	local uci = require("luci.model.uci").cursor()
+
 	local root = node()
 	if not root.target then
 		root.target = alias("admin")
@@ -23,6 +25,7 @@ function index()
 	end
 
 	local page   = node("admin")
+	
 	page.title   = _("Administration")
 	page.order   = 10
 	page.sysauth = "root"
@@ -61,6 +64,24 @@ function index()
 	page.index = true
 	toplevel_page(page, false, false)
 
+	if nixio.fs.access("/etc/config/dhcp") then
+		page = entry({"admin", "dhcplease_status"}, call("lease_status"), nil)
+		page.leaf = true
+	end
+
+	local has_wifi = false
+
+	uci:foreach("wireless", "wifi-device",
+		function(s)
+			has_wifi = true
+			return false
+		end)
+
+	if has_wifi then
+		page = entry({"admin", "wireless_assoclist"}, call("wifi_assoclist"), nil)
+		page.leaf = true
+	end
+
 	-- Logout is last
 	entry({"admin", "logout"}, call("action_logout"), _("Logout"), 999)
 end
@@ -80,3 +101,22 @@ function action_logout()
 
 	luci.http.redirect(dsp.build_url())
 end
+
+
+function lease_status()
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write('[')
+	luci.http.write_json(s.dhcp_leases())
+	luci.http.write(',')
+	luci.http.write_json(s.dhcp6_leases())
+	luci.http.write(']')
+end
+
+function wifi_assoclist()
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(s.wifi_assoclist())
+end
diff --git a/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
rename to modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm b/modules/luci-base/luasrc/view/lease_status.htm
similarity index 97%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
rename to modules/luci-base/luasrc/view/lease_status.htm
index 8fbbdc9477..15b6b6908e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
+++ b/modules/luci-base/luasrc/view/lease_status.htm
@@ -1,5 +1,5 @@
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=url('admin/network/dhcplease_status')%>', null,
+	XHR.poll(5, '<%=url('admin/dhcplease_status')%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('lease_status_table');
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm b/modules/luci-base/luasrc/view/wifi_assoclist.htm
similarity index 97%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm
rename to modules/luci-base/luasrc/view/wifi_assoclist.htm
index b6f84c0607..700d998ad8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm
+++ b/modules/luci-base/luasrc/view/wifi_assoclist.htm
@@ -17,7 +17,7 @@
 		return s;
 	}
 
-	XHR.poll(5, '<%=url('admin/network/wireless_assoclist')%>', null,
+	XHR.poll(5, '<%=url('admin/wireless_assoclist')%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('wifi_assoclist_table');
diff --git a/modules/luci-mod-admin-full/Makefile b/modules/luci-mod-admin-full/Makefile
index 36ddf13f16..b376b35e55 100644
--- a/modules/luci-mod-admin-full/Makefile
+++ b/modules/luci-mod-admin-full/Makefile
@@ -7,9 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Administration - full-featured for full control
-LUCI_DEPENDS:=+luci-base
+LUCI_DEPENDS:=+luci-base +luci-mod-status +luci-mod-system +luci-mod-network
 
-PKG_BUILD_DEPENDS:=iwinfo
 PKG_LICENSE:=Apache-2.0
 
 include ../../luci.mk
diff --git a/modules/luci-mod-network/Makefile b/modules/luci-mod-network/Makefile
new file mode 100644
index 0000000000..5958765da7
--- /dev/null
+++ b/modules/luci-mod-network/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Network Administration
+LUCI_DEPENDS:=+luci-base +libiwinfo-lua
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua
similarity index 94%
rename from modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
rename to modules/luci-mod-network/luasrc/controller/admin/network.lua
index c4e1c3aa16..a587b7e513 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-network/luasrc/controller/admin/network.lua
@@ -37,9 +37,6 @@ function index()
 			end)
 
 		if has_wifi then
-			page = entry({"admin", "network", "wireless_assoclist"}, call("wifi_assoclist"), nil)
-			page.leaf = true
-
 			page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil)
 			page.leaf = true
 
@@ -110,9 +107,6 @@ function index()
 			page.title  = _("DHCP and DNS")
 			page.order  = 30
 
-			page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
-			page.leaf = true
-
 			page = node("admin", "network", "hosts")
 			page.target = cbi("admin_network/hosts")
 			page.title  = _("Hostnames")
@@ -302,14 +296,6 @@ function wifi_reconnect(radio)
 	end
 end
 
-function wifi_assoclist()
-	local s = require "luci.tools.status"
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(s.wifi_assoclist())
-end
-
-
 local function _wifi_get_scan_results(cache_key)
 	local results = luci.util.ubus("session", "get", {
 		ubus_rpc_session = luci.model.uci:get_session_id(),
@@ -381,17 +367,6 @@ function wifi_scan_results(radio)
 	end
 end
 
-function lease_status()
-	local s = require "luci.tools.status"
-
-	luci.http.prepare_content("application/json")
-	luci.http.write('[')
-	luci.http.write_json(s.dhcp_leases())
-	luci.http.write(',')
-	luci.http.write_json(s.dhcp6_leases())
-	luci.http.write(']')
-end
-
 function switch_status(switches)
 	local s = require "luci.tools.status"
 
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
similarity index 99%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
index ae8a95f9ce..3ac49d635d 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
@@ -266,7 +266,7 @@ o = s:taboption("general", DynamicList, "notinterface",
 o.optional = true
 o:depends("nonwildcard", true)
 
-m:section(SimpleSection).template = "admin_network/lease_status"
+m:section(SimpleSection).template = "lease_status"
 
 s = m:section(TypedSection, "host", translate("Static Leases"),
 	translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " ..
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/proto_ahcp.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/proto_ahcp.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
similarity index 99%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
rename to modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
index ad20f09187..3bffb3502c 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
@@ -216,7 +216,7 @@ s = m:section(NamedSection, "__assoclist__")
 function s.render(self, sid)
 	tpl.render_string([[
 		<h2><%:Associated Stations%></h2>
-		<%+admin_network/wifi_assoclist%>
+		<%+wifi_assoclist%>
 	]])
 end
 
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
rename to modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm
rename to modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
rename to modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm
rename to modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
rename to modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm
rename to modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
rename to modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
diff --git a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full b/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
similarity index 100%
rename from modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full
rename to modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
diff --git a/modules/luci-mod-status/Makefile b/modules/luci-mod-status/Makefile
new file mode 100644
index 0000000000..cf8c8ddf83
--- /dev/null
+++ b/modules/luci-mod-status/Makefile
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Status Pages
+LUCI_DEPENDS:=+luci-base +libiwinfo +libiwinfo-lua
+
+PKG_BUILD_DEPENDS:=iwinfo
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg b/modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg
similarity index 100%
rename from modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
rename to modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg b/modules/luci-mod-status/htdocs/luci-static/resources/connections.svg
similarity index 100%
rename from modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
rename to modules/luci-mod-status/htdocs/luci-static/resources/connections.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg b/modules/luci-mod-status/htdocs/luci-static/resources/load.svg
similarity index 100%
rename from modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
rename to modules/luci-mod-status/htdocs/luci-static/resources/load.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg b/modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg
similarity index 100%
rename from modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
rename to modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg b/modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg
similarity index 100%
rename from modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
rename to modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua b/modules/luci-mod-status/luasrc/controller/admin/status.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
rename to modules/luci-mod-status/luasrc/controller/admin/status.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua b/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
rename to modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/connections.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-status/luasrc/view/admin_status/index.htm
similarity index 99%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/index.htm
index 8820ae1cf3..3edfd92047 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/index.htm
@@ -442,7 +442,7 @@
 
 <%
 	if has_dhcp then
-		include("admin_network/lease_status")
+		include("lease_status")
 	end
 %>
 
@@ -468,7 +468,7 @@
 <div class="cbi-section">
 	<h3><%:Associated Stations%></h3>
 
-	<%+admin_network/wifi_assoclist%>
+	<%+wifi_assoclist%>
 </div>
 <% end %>
 
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-status/luasrc/view/admin_status/load.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/load.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-status/luasrc/view/admin_status/routes.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/routes.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
rename to modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
diff --git a/modules/luci-mod-admin-full/src/Makefile b/modules/luci-mod-status/src/Makefile
similarity index 100%
rename from modules/luci-mod-admin-full/src/Makefile
rename to modules/luci-mod-status/src/Makefile
diff --git a/modules/luci-mod-admin-full/src/luci-bwc.c b/modules/luci-mod-status/src/luci-bwc.c
similarity index 100%
rename from modules/luci-mod-admin-full/src/luci-bwc.c
rename to modules/luci-mod-status/src/luci-bwc.c
diff --git a/modules/luci-mod-system/Makefile b/modules/luci-mod-system/Makefile
new file mode 100644
index 0000000000..a6d5a7a456
--- /dev/null
+++ b/modules/luci-mod-system/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Administration - Global System Settings
+LUCI_DEPENDS:=+luci-base
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
rename to modules/luci-mod-system/luasrc/controller/admin/system.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/admin.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/admin.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/ipkg.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/ipkg.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
rename to modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm b/modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm b/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-system/luasrc/view/admin_system/flashops.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/flashops.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm b/modules/luci-mod-system/luasrc/view/admin_system/ipkg.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/ipkg.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/packages.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-system/luasrc/view/admin_system/reboot.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/reboot.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm
similarity index 100%
rename from modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
rename to modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm