52 files changed, 76 insertions, 57 deletions

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 3c5e1d87e..f2a26245d 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -30,35 +30,65 @@ define Build/Compile
 endef
 
 
-define Package/luci/template
+### Templates ###
+
+define Package/luci/libtemplate
   SECTION:=admin
   CATEGORY:=Administration
   TITLE:=LuCI - Lua Configuration Interface
   URL:=http://luci.freifunk-halle.net/
   MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
+  SUBMENU:=LuCI - Libraries
+  DEPENDS:=+luci-core
+endef
+
+define Package/luci/fftemplate
+  $(call Package/luci/libtemplate)
+  SUBMENU:=LuCI - Freifunk Support
+  DEPENDS:=+luci-mod-freifunk
+endef
+
+define Package/luci/webtemplate
+  $(call Package/luci/libtemplate)
+  SUBMENU:=LuCI - Webinterface Components
 endef
 
+
 define Package/luci/install/template
 	$(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
 endef
 
 
-define Package/luci
-  $(call Package/luci/template)
-  MENU:=1
+
+### Core package ###
+
+define Package/luci-core
+  $(call Package/luci/libtemplate)
   DEPENDS:=+lua +luaposix
+  TITLE:=LuCI core libraries
+endef
+
+define Package/luci-core/install		
+	$(call Package/luci/install/template,$(1),libs/core)
 endef
 
-define Package/luci/install		
-	$(call Package/luci/install/template,$(1),core)
+
+### Libraries ###
+define Package/luci-cbi
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-web
+  TITLE:=Configuration Binding Interface
+endef
+
+define Package/luci-cbi/install
+	$(call Package/luci/install/template,$(1),libs/cbi)
 endef
 
 
-### Web Packages ###
 define Package/luci-web
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-addons
-  TITLE:=LuCI - Webframework
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-addons
+  TITLE:=MVC Webframework
 endef
 
 define Package/luci-web/conffiles
@@ -66,7 +96,7 @@ define Package/luci-web/conffiles
 endef
 
 define Package/luci-web/install
-	$(call Package/luci/install/template,$(1),web)
+	$(call Package/luci/install/template,$(1),libs/web)
 	$(call Package/luci/install/template,$(1),themes/fledermaus)
 endef
 
@@ -75,9 +105,9 @@ endef
 ### Community Packages ###
 
 define Package/luci-ff-halle
-  $(call Package/luci/template)
-  DEPENDS:=luci \
-   +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \
+  $(call Package/luci/fftemplate)
+  DEPENDS+= \
+   +luci-sgi-haserl +luci-app-splash \
    +luci-app-ffwizard-leipzig \
    +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
    +kmod-tun +ip
@@ -89,9 +119,9 @@ endef
 
 
 define Package/luci-ff-leipzig
-  $(call Package/luci/template)
-  DEPENDS:=luci \
-   +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \
+  $(call Package/luci/fftemplate)
+  DEPENDS+= \
+   +luci-sgi-haserl +luci-app-splash \
    +luci-app-ffwizard-leipzig \
    +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
    +kmod-tun +ip
@@ -105,9 +135,9 @@ endef
 
 
 define Package/luci-ff-hannover
-  $(call Package/luci/template)
-  DEPENDS:=luci \
-   +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \
+  $(call Package/luci/fftemplate)
+  DEPENDS+= \
+   +luci-sgi-haserl +luci-app-splash \
    +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice
   TITLE:=Freifunk Hannover Community Meta-Package
   URL:=http://www.freifunk-hannover.de/
@@ -123,9 +153,9 @@ endef
 ### Modules ###
 
 define Package/luci-mod-admin-core
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web +luci-app-cbi
-  TITLE:=Core administrative pages
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-web +luci-cbi
+  TITLE:=Administration module
 endef
 
 define Package/luci-mod-admin-core/install
@@ -134,9 +164,9 @@ endef
 
 
 define Package/luci-mod-freifunk
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-admin-core +luci-app-firewall
-  TITLE:=Freifunk public and administrative pages
+  $(call Package/luci/fftemplate)
+  DEPENDS:=+luci-mod-admin-core
+  TITLE:=LuCI Freifunk module
 endef
 
 define Package/luci-mod-freifunk/conffiles
@@ -151,20 +181,9 @@ endef
 
 ### Applications ###
 
-define Package/luci-app-cbi
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web
-  TITLE:=Configuration Binding Interface
-endef
-
-define Package/luci-app-cbi/install
-	$(call Package/luci/install/template,$(1),applications/cbi)
-endef
-
-
 define Package/luci-app-ffwizard-leipzig
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-freifunk
+  $(call Package/luci/fftemplate)
+  DEPENDS+=+luci-app-firewall
   TITLE:=Freifunk Leipzig configuration wizard
 endef
 
@@ -174,8 +193,8 @@ endef
 
 
 define Package/luci-app-firewall
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-admin-core
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-mod-admin-core
   TITLE:=Firewall and Portforwarding application
 endef
 
@@ -190,8 +209,8 @@ endef
 
 
 define Package/luci-app-splash
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-freifunk +luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
+  $(call Package/luci/fftemplate)
+  DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
   TITLE:=Freifunk DHCP-Splash application
 endef
 
@@ -210,8 +229,8 @@ endef
 
 
 define Package/luci-app-statistics
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1
+  $(call Package/luci/webtemplate)
+  DEPENDS+=+luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1
   TITLE:=LuCI Statistics Application (incomplete)
 endef
 
@@ -229,31 +248,32 @@ endef
 ### Server Gateway Interfaces ###
 
 define Package/luci-sgi-haserl
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web +haserl-lua
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-web +haserl-lua
   TITLE:=SGI for Haserl
 endef
 
 define Package/luci-sgi-haserl/install
-	$(call Package/luci/install/template,$(1),applications/sgi-haserl)
+	$(call Package/luci/install/template,$(1),libs/sgi-haserl)
 	$(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst
 endef
 
 
 define Package/luci-sgi-webuci
-  $(call Package/luci/template)
-  DEPENDS:=luci +luci-web
+  $(call Package/luci/libtemplate)
+  DEPENDS+=+luci-web
   TITLE:=SGI for Webuci
 endef
 
 define Package/luci-sgi-webuci/install
-	$(call Package/luci/install/template,$(1),applications/sgi-webuci)
+	$(call Package/luci/install/template,$(1),libs/sgi-webuci)
 endef
 
 
 
 
-$(eval $(call BuildPackage,luci))
+$(eval $(call BuildPackage,luci-core))
+$(eval $(call BuildPackage,luci-cbi))
 $(eval $(call BuildPackage,luci-web))
 
 $(eval $(call BuildPackage,luci-ff-halle))
@@ -263,7 +283,6 @@ $(eval $(call BuildPackage,luci-ff-hannover))
 $(eval $(call BuildPackage,luci-mod-admin-core))
 $(eval $(call BuildPackage,luci-mod-freifunk))
 
-$(eval $(call BuildPackage,luci-app-cbi))
 $(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
 $(eval $(call BuildPackage,luci-app-firewall))
 $(eval $(call BuildPackage,luci-app-splash))
diff --git a/core/Makefile b/core/Makefile
deleted file mode 100644
index 5e64bcd1f..000000000
--- a/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/applications/cbi/Makefile b/libs/cbi/Makefile
index 81a96f6a8..81a96f6a8 100644
--- a/applications/cbi/Makefile
+++ b/libs/cbi/Makefile
diff --git a/applications/cbi/root/www/resources/cbi.js b/libs/cbi/root/www/resources/cbi.js
index a3a47aa45..a3a47aa45 100644
--- a/applications/cbi/root/www/resources/cbi.js
+++ b/libs/cbi/root/www/resources/cbi.js
diff --git a/applications/cbi/src/cbi.lua b/libs/cbi/src/cbi.lua
index b7097b5d9..b7097b5d9 100644
--- a/applications/cbi/src/cbi.lua
+++ b/libs/cbi/src/cbi.lua
diff --git a/applications/cbi/src/view/cbi/dvalue.htm b/libs/cbi/src/view/cbi/dvalue.htm
index f54667def..f54667def 100644
--- a/applications/cbi/src/view/cbi/dvalue.htm
+++ b/libs/cbi/src/view/cbi/dvalue.htm
diff --git a/applications/cbi/src/view/cbi/footer.htm b/libs/cbi/src/view/cbi/footer.htm
index 2acf710cd..2acf710cd 100644
--- a/applications/cbi/src/view/cbi/footer.htm
+++ b/libs/cbi/src/view/cbi/footer.htm
diff --git a/applications/cbi/src/view/cbi/full_valuefooter.htm b/libs/cbi/src/view/cbi/full_valuefooter.htm
index 6151a3a66..6151a3a66 100644
--- a/applications/cbi/src/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/src/view/cbi/full_valuefooter.htm
diff --git a/applications/cbi/src/view/cbi/full_valueheader.htm b/libs/cbi/src/view/cbi/full_valueheader.htm
index 062efa2dd..062efa2dd 100644
--- a/applications/cbi/src/view/cbi/full_valueheader.htm
+++ b/libs/cbi/src/view/cbi/full_valueheader.htm
diff --git a/applications/cbi/src/view/cbi/fvalue.htm b/libs/cbi/src/view/cbi/fvalue.htm
index b609f1d4f..b609f1d4f 100644
--- a/applications/cbi/src/view/cbi/fvalue.htm
+++ b/libs/cbi/src/view/cbi/fvalue.htm
diff --git a/applications/cbi/src/view/cbi/header.htm b/libs/cbi/src/view/cbi/header.htm
index 4229aaf0d..4229aaf0d 100644
--- a/applications/cbi/src/view/cbi/header.htm
+++ b/libs/cbi/src/view/cbi/header.htm
diff --git a/applications/cbi/src/view/cbi/lvalue.htm b/libs/cbi/src/view/cbi/lvalue.htm
index f1ae5a093..f1ae5a093 100644
--- a/applications/cbi/src/view/cbi/lvalue.htm
+++ b/libs/cbi/src/view/cbi/lvalue.htm
diff --git a/applications/cbi/src/view/cbi/map.htm b/libs/cbi/src/view/cbi/map.htm
index 835393c1c..835393c1c 100644
--- a/applications/cbi/src/view/cbi/map.htm
+++ b/libs/cbi/src/view/cbi/map.htm
diff --git a/applications/cbi/src/view/cbi/mvalue.htm b/libs/cbi/src/view/cbi/mvalue.htm
index bed66e569..bed66e569 100644
--- a/applications/cbi/src/view/cbi/mvalue.htm
+++ b/libs/cbi/src/view/cbi/mvalue.htm
diff --git a/applications/cbi/src/view/cbi/nsection.htm b/libs/cbi/src/view/cbi/nsection.htm
index fff597ad0..fff597ad0 100644
--- a/applications/cbi/src/view/cbi/nsection.htm
+++ b/libs/cbi/src/view/cbi/nsection.htm
diff --git a/applications/cbi/src/view/cbi/tblsection.htm b/libs/cbi/src/view/cbi/tblsection.htm
index df16efbed..df16efbed 100644
--- a/applications/cbi/src/view/cbi/tblsection.htm
+++ b/libs/cbi/src/view/cbi/tblsection.htm
diff --git a/applications/cbi/src/view/cbi/tiny_valuefooter.htm b/libs/cbi/src/view/cbi/tiny_valuefooter.htm
index e65ebb6c0..e65ebb6c0 100644
--- a/applications/cbi/src/view/cbi/tiny_valuefooter.htm
+++ b/libs/cbi/src/view/cbi/tiny_valuefooter.htm
diff --git a/applications/cbi/src/view/cbi/tiny_valueheader.htm b/libs/cbi/src/view/cbi/tiny_valueheader.htm
index b9b26bd6a..b9b26bd6a 100644
--- a/applications/cbi/src/view/cbi/tiny_valueheader.htm
+++ b/libs/cbi/src/view/cbi/tiny_valueheader.htm
diff --git a/applications/cbi/src/view/cbi/tsection.htm b/libs/cbi/src/view/cbi/tsection.htm
index 37b18b5d4..37b18b5d4 100644
--- a/applications/cbi/src/view/cbi/tsection.htm
+++ b/libs/cbi/src/view/cbi/tsection.htm
diff --git a/applications/cbi/src/view/cbi/ucisection.htm b/libs/cbi/src/view/cbi/ucisection.htm
index 0abc37e7c..0abc37e7c 100644
--- a/applications/cbi/src/view/cbi/ucisection.htm
+++ b/libs/cbi/src/view/cbi/ucisection.htm
diff --git a/applications/cbi/src/view/cbi/value.htm b/libs/cbi/src/view/cbi/value.htm
index 31bf38f77..31bf38f77 100644
--- a/applications/cbi/src/view/cbi/value.htm
+++ b/libs/cbi/src/view/cbi/value.htm
diff --git a/applications/cbi/src/view/cbi/valuefooter.htm b/libs/cbi/src/view/cbi/valuefooter.htm
index bc9d1b127..bc9d1b127 100644
--- a/applications/cbi/src/view/cbi/valuefooter.htm
+++ b/libs/cbi/src/view/cbi/valuefooter.htm
diff --git a/applications/cbi/src/view/cbi/valueheader.htm b/libs/cbi/src/view/cbi/valueheader.htm
index 8d9802f57..8d9802f57 100644
--- a/applications/cbi/src/view/cbi/valueheader.htm
+++ b/libs/cbi/src/view/cbi/valueheader.htm
diff --git a/libs/core/Makefile b/libs/core/Makefile
new file mode 100644
index 000000000..f7fac7740
--- /dev/null
+++ b/libs/core/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/core/src/bits.lua b/libs/core/src/bits.lua
index 13b4c3066..13b4c3066 100644
--- a/core/src/bits.lua
+++ b/libs/core/src/bits.lua
diff --git a/core/src/debug.lua b/libs/core/src/debug.lua
index a56400f34..a56400f34 100644
--- a/core/src/debug.lua
+++ b/libs/core/src/debug.lua
diff --git a/core/src/fs.lua b/libs/core/src/fs.lua
index 5c1f2a051..5c1f2a051 100644
--- a/core/src/fs.lua
+++ b/libs/core/src/fs.lua
diff --git a/core/src/init.lua b/libs/core/src/init.lua
index ce52d0aad..ce52d0aad 100644
--- a/core/src/init.lua
+++ b/libs/core/src/init.lua
diff --git a/core/src/model/ipkg.lua b/libs/core/src/model/ipkg.lua
index e95a2620a..e95a2620a 100644
--- a/core/src/model/ipkg.lua
+++ b/libs/core/src/model/ipkg.lua
diff --git a/core/src/model/uci.lua b/libs/core/src/model/uci.lua
index 39354bed1..39354bed1 100644
--- a/core/src/model/uci.lua
+++ b/libs/core/src/model/uci.lua
diff --git a/core/src/model/uci/libuci.lua b/libs/core/src/model/uci/libuci.lua
index 9a1112500..9a1112500 100644
--- a/core/src/model/uci/libuci.lua
+++ b/libs/core/src/model/uci/libuci.lua
diff --git a/core/src/model/uci/wrapper.lua b/libs/core/src/model/uci/wrapper.lua
index e063b272c..e063b272c 100644
--- a/core/src/model/uci/wrapper.lua
+++ b/libs/core/src/model/uci/wrapper.lua
diff --git a/core/src/sys.lua b/libs/core/src/sys.lua
index 0399d0e5f..0399d0e5f 100644
--- a/core/src/sys.lua
+++ b/libs/core/src/sys.lua
diff --git a/core/src/sys/iptparser.lua b/libs/core/src/sys/iptparser.lua
index 6450c3072..6450c3072 100644
--- a/core/src/sys/iptparser.lua
+++ b/libs/core/src/sys/iptparser.lua
diff --git a/core/src/util.lua b/libs/core/src/util.lua
index 0559fff6f..0559fff6f 100644
--- a/core/src/util.lua
+++ b/libs/core/src/util.lua
diff --git a/applications/sgi-haserl/Makefile b/libs/sgi-haserl/Makefile
index 81a96f6a8..81a96f6a8 100644
--- a/applications/sgi-haserl/Makefile
+++ b/libs/sgi-haserl/Makefile
diff --git a/applications/sgi-haserl/root/www/cgi-bin/index.cgi b/libs/sgi-haserl/root/www/cgi-bin/index.cgi
index aae8591c6..aae8591c6 100755
--- a/applications/sgi-haserl/root/www/cgi-bin/index.cgi
+++ b/libs/sgi-haserl/root/www/cgi-bin/index.cgi
diff --git a/applications/sgi-haserl/root/www/cgi-bin/luci b/libs/sgi-haserl/root/www/cgi-bin/luci
index 13fec754e..13fec754e 100755
--- a/applications/sgi-haserl/root/www/cgi-bin/luci
+++ b/libs/sgi-haserl/root/www/cgi-bin/luci
diff --git a/applications/sgi-haserl/root/www/cgi-bin/luci-upload b/libs/sgi-haserl/root/www/cgi-bin/luci-upload
index 371967ce9..371967ce9 100755
--- a/applications/sgi-haserl/root/www/cgi-bin/luci-upload
+++ b/libs/sgi-haserl/root/www/cgi-bin/luci-upload
diff --git a/applications/sgi-haserl/root/www/index.html b/libs/sgi-haserl/root/www/index.html
index 39ba558df..39ba558df 100644
--- a/applications/sgi-haserl/root/www/index.html
+++ b/libs/sgi-haserl/root/www/index.html
diff --git a/applications/sgi-haserl/src/sgi/haserl.lua b/libs/sgi-haserl/src/sgi/haserl.lua
index f3994b5c8..f3994b5c8 100644
--- a/applications/sgi-haserl/src/sgi/haserl.lua
+++ b/libs/sgi-haserl/src/sgi/haserl.lua
diff --git a/applications/sgi-webuci/Makefile b/libs/sgi-webuci/Makefile
index 81a96f6a8..81a96f6a8 100644
--- a/applications/sgi-webuci/Makefile
+++ b/libs/sgi-webuci/Makefile
diff --git a/applications/sgi-webuci/root/lib/webuci/main.lua b/libs/sgi-webuci/root/lib/webuci/main.lua
index cb2730d14..cb2730d14 100644
--- a/applications/sgi-webuci/root/lib/webuci/main.lua
+++ b/libs/sgi-webuci/root/lib/webuci/main.lua
diff --git a/applications/sgi-webuci/src/sgi/webuci.lua b/libs/sgi-webuci/src/sgi/webuci.lua
index 498bca921..498bca921 100644
--- a/applications/sgi-webuci/src/sgi/webuci.lua
+++ b/libs/sgi-webuci/src/sgi/webuci.lua
diff --git a/libs/web/Makefile b/libs/web/Makefile
new file mode 100644
index 000000000..f7fac7740
--- /dev/null
+++ b/libs/web/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/web/root/etc/config/luci b/libs/web/root/etc/config/luci
index 87170a9b1..87170a9b1 100644
--- a/web/root/etc/config/luci
+++ b/libs/web/root/etc/config/luci
diff --git a/web/src/config.lua b/libs/web/src/config.lua
index 854b12814..854b12814 100644
--- a/web/src/config.lua
+++ b/libs/web/src/config.lua
diff --git a/web/src/dispatcher.lua b/libs/web/src/dispatcher.lua
index 175f0dcb0..175f0dcb0 100644
--- a/web/src/dispatcher.lua
+++ b/libs/web/src/dispatcher.lua
diff --git a/web/src/http.lua b/libs/web/src/http.lua
index fa8821c5a..fa8821c5a 100644
--- a/web/src/http.lua
+++ b/libs/web/src/http.lua
diff --git a/web/src/i18n.lua b/libs/web/src/i18n.lua
index 3a8a9a6c7..3a8a9a6c7 100644
--- a/web/src/i18n.lua
+++ b/libs/web/src/i18n.lua
diff --git a/web/src/template.lua b/libs/web/src/template.lua
index 369aa0a30..369aa0a30 100644
--- a/web/src/template.lua
+++ b/libs/web/src/template.lua
diff --git a/web/Makefile b/web/Makefile
deleted file mode 100644
index 5e64bcd1f..000000000
--- a/web/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../build/config.mk
-include ../build/module.mk
\ No newline at end of file