diff --git a/openwrt/config b/openwrt/.config
similarity index 100%
rename from openwrt/config
rename to openwrt/.config
diff --git a/openwrt/INSTALL.txt b/openwrt/INSTALL.txt
new file mode 100644
index 0000000..a907a25
--- /dev/null
+++ b/openwrt/INSTALL.txt
@@ -0,0 +1,20 @@
+$Id$
+
+1/ Set up the OpenWRT build environment
+---------------------------------------
+svn export svn://svn.openwrt.org/openwrt/tags/8.09 8.09.flukso
+svn co http://svn.jokamajo.org/flukso/trunk/openwrt 8.09.flukso
+
+2/ Apply custom Flukso patches to OpenWRT
+-----------------------------------------
+cd 8.09.flukso
+patch -p0 < patches/100.disable.console.patch
+patch -p0 < patches/110.set.console.baud.to.4800.patch
+patch -p0 < patches/120.set.AR5315_RESET_GPIO.to.6.patch
+cd package/busybox/patches
+ln -s ../../../patches/245.ignore.dhcpc.sigterm.patch .
+
+3/ Build
+--------
+make menuconfig
+make
diff --git a/openwrt/packages/expat/Makefile b/openwrt/package/expat/Makefile
similarity index 100%
rename from openwrt/packages/expat/Makefile
rename to openwrt/package/expat/Makefile
diff --git a/openwrt/packages/expat/patches/001-destdir.patch b/openwrt/package/expat/patches/001-destdir.patch
similarity index 100%
rename from openwrt/packages/expat/patches/001-destdir.patch
rename to openwrt/package/expat/patches/001-destdir.patch
diff --git a/openwrt/packages/expat/patches/110-avr32_compile_fix.patch b/openwrt/package/expat/patches/110-avr32_compile_fix.patch
similarity index 100%
rename from openwrt/packages/expat/patches/110-avr32_compile_fix.patch
rename to openwrt/package/expat/patches/110-avr32_compile_fix.patch
diff --git a/openwrt/packages/flukso/Makefile b/openwrt/package/flukso/Makefile
similarity index 100%
rename from openwrt/packages/flukso/Makefile
rename to openwrt/package/flukso/Makefile
diff --git a/openwrt/packages/flukso/src/auth.lua b/openwrt/package/flukso/src/auth.lua
similarity index 100%
rename from openwrt/packages/flukso/src/auth.lua
rename to openwrt/package/flukso/src/auth.lua
diff --git a/openwrt/packages/flukso/src/data.lua b/openwrt/package/flukso/src/data.lua
similarity index 100%
rename from openwrt/packages/flukso/src/data.lua
rename to openwrt/package/flukso/src/data.lua
diff --git a/openwrt/packages/flukso/src/dbg.lua b/openwrt/package/flukso/src/dbg.lua
similarity index 100%
rename from openwrt/packages/flukso/src/dbg.lua
rename to openwrt/package/flukso/src/dbg.lua
diff --git a/openwrt/packages/flukso/src/flukso.init b/openwrt/package/flukso/src/flukso.init
similarity index 100%
rename from openwrt/packages/flukso/src/flukso.init
rename to openwrt/package/flukso/src/flukso.init
diff --git a/openwrt/packages/flukso/src/flukso.lua b/openwrt/package/flukso/src/flukso.lua
similarity index 100%
rename from openwrt/packages/flukso/src/flukso.lua
rename to openwrt/package/flukso/src/flukso.lua
diff --git a/openwrt/packages/flukso/src/heartbeat.lua b/openwrt/package/flukso/src/heartbeat.lua
similarity index 100%
rename from openwrt/packages/flukso/src/heartbeat.lua
rename to openwrt/package/flukso/src/heartbeat.lua
diff --git a/openwrt/packages/flukso/src/load.lua b/openwrt/package/flukso/src/load.lua
similarity index 100%
rename from openwrt/packages/flukso/src/load.lua
rename to openwrt/package/flukso/src/load.lua
diff --git a/openwrt/packages/luaexpat/Makefile b/openwrt/package/luaexpat/Makefile
similarity index 100%
rename from openwrt/packages/luaexpat/Makefile
rename to openwrt/package/luaexpat/Makefile
diff --git a/openwrt/packages/luaexpat/patches/010-compat-5.1.patch b/openwrt/package/luaexpat/patches/010-compat-5.1.patch
similarity index 100%
rename from openwrt/packages/luaexpat/patches/010-compat-5.1.patch
rename to openwrt/package/luaexpat/patches/010-compat-5.1.patch
diff --git a/openwrt/packages/luaexpat/patches/010-luaL_findstring.patch b/openwrt/package/luaexpat/patches/010-luaL_findstring.patch
similarity index 100%
rename from openwrt/packages/luaexpat/patches/010-luaL_findstring.patch
rename to openwrt/package/luaexpat/patches/010-luaL_findstring.patch
diff --git a/openwrt/packages/luasocket/Makefile b/openwrt/package/luasocket/Makefile
similarity index 100%
rename from openwrt/packages/luasocket/Makefile
rename to openwrt/package/luasocket/Makefile
diff --git a/openwrt/packages/luasocket/patches/010-compat-5.1.patch b/openwrt/package/luasocket/patches/010-compat-5.1.patch
similarity index 100%
rename from openwrt/packages/luasocket/patches/010-compat-5.1.patch
rename to openwrt/package/luasocket/patches/010-compat-5.1.patch
diff --git a/openwrt/packages/luaxmlrpc/Makefile b/openwrt/package/luaxmlrpc/Makefile
similarity index 100%
rename from openwrt/packages/luaxmlrpc/Makefile
rename to openwrt/package/luaxmlrpc/Makefile
diff --git a/openwrt/packages/luaxmlrpc/src/http.lua b/openwrt/package/luaxmlrpc/src/http.lua
similarity index 100%
rename from openwrt/packages/luaxmlrpc/src/http.lua
rename to openwrt/package/luaxmlrpc/src/http.lua
diff --git a/openwrt/packages/luaxmlrpc/src/init.lua b/openwrt/package/luaxmlrpc/src/init.lua
similarity index 100%
rename from openwrt/packages/luaxmlrpc/src/init.lua
rename to openwrt/package/luaxmlrpc/src/init.lua
diff --git a/openwrt/packages/luaxmlrpc/src/server.lua b/openwrt/package/luaxmlrpc/src/server.lua
similarity index 100%
rename from openwrt/packages/luaxmlrpc/src/server.lua
rename to openwrt/package/luaxmlrpc/src/server.lua
diff --git a/openwrt/packages/luaxyssl/Makefile b/openwrt/package/luaxyssl/Makefile
similarity index 100%
rename from openwrt/packages/luaxyssl/Makefile
rename to openwrt/package/luaxyssl/Makefile
diff --git a/openwrt/packages/luaxyssl/patches/100-compile-fixes.patch b/openwrt/package/luaxyssl/patches/100-compile-fixes.patch
similarity index 100%
rename from openwrt/packages/luaxyssl/patches/100-compile-fixes.patch
rename to openwrt/package/luaxyssl/patches/100-compile-fixes.patch
diff --git a/openwrt/packages/luci/.buildpath b/openwrt/package/luci/.buildpath
similarity index 100%
rename from openwrt/packages/luci/.buildpath
rename to openwrt/package/luci/.buildpath
diff --git a/openwrt/packages/luci/.cproject b/openwrt/package/luci/.cproject
similarity index 100%
rename from openwrt/packages/luci/.cproject
rename to openwrt/package/luci/.cproject
diff --git a/openwrt/packages/luci/.gitignore b/openwrt/package/luci/.gitignore
similarity index 100%
rename from openwrt/packages/luci/.gitignore
rename to openwrt/package/luci/.gitignore
diff --git a/openwrt/packages/luci/.project b/openwrt/package/luci/.project
similarity index 100%
rename from openwrt/packages/luci/.project
rename to openwrt/package/luci/.project
diff --git a/openwrt/packages/luci/INSTALL b/openwrt/package/luci/INSTALL
similarity index 100%
rename from openwrt/packages/luci/INSTALL
rename to openwrt/package/luci/INSTALL
diff --git a/openwrt/packages/luci/LICENSE b/openwrt/package/luci/LICENSE
similarity index 100%
rename from openwrt/packages/luci/LICENSE
rename to openwrt/package/luci/LICENSE
diff --git a/openwrt/packages/luci/Makefile b/openwrt/package/luci/Makefile
similarity index 100%
rename from openwrt/packages/luci/Makefile
rename to openwrt/package/luci/Makefile
diff --git a/openwrt/packages/luci/NOTICE b/openwrt/package/luci/NOTICE
similarity index 100%
rename from openwrt/packages/luci/NOTICE
rename to openwrt/package/luci/NOTICE
diff --git a/openwrt/packages/luci/THANKYOU b/openwrt/package/luci/THANKYOU
similarity index 100%
rename from openwrt/packages/luci/THANKYOU
rename to openwrt/package/luci/THANKYOU
diff --git a/openwrt/packages/luci/applications/freifunk-community/Makefile b/openwrt/package/luci/applications/freifunk-community/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/freifunk-community/Makefile
rename to openwrt/package/luci/applications/freifunk-community/Makefile
diff --git a/openwrt/packages/luci/applications/freifunk-community/htdocs/cgi-bin-nodes.html b/openwrt/package/luci/applications/freifunk-community/htdocs/cgi-bin-nodes.html
similarity index 100%
rename from openwrt/packages/luci/applications/freifunk-community/htdocs/cgi-bin-nodes.html
rename to openwrt/package/luci/applications/freifunk-community/htdocs/cgi-bin-nodes.html
diff --git a/openwrt/packages/luci/applications/freifunk-community/htdocs/cgi-bin-status.html b/openwrt/package/luci/applications/freifunk-community/htdocs/cgi-bin-status.html
similarity index 100%
rename from openwrt/packages/luci/applications/freifunk-community/htdocs/cgi-bin-status.html
rename to openwrt/package/luci/applications/freifunk-community/htdocs/cgi-bin-status.html
diff --git a/openwrt/packages/luci/applications/luci-ddns/Makefile b/openwrt/package/luci/applications/luci-ddns/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/Makefile
rename to openwrt/package/luci/applications/luci-ddns/Makefile
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/controller/ddns.lua b/openwrt/package/luci/applications/luci-ddns/luasrc/controller/ddns.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/controller/ddns.lua
rename to openwrt/package/luci/applications/luci-ddns/luasrc/controller/ddns.lua
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.de.lua b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.de.lua
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.de.lua
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.de.xml b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.de.xml
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.de.xml
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.en.lua b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.en.lua
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.en.lua
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.en.xml b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.en.xml
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.en.xml
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.lua b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.lua
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.lua
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.xml b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.xml
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.fr.xml
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.lua b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.lua
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.xml b/openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.xml
rename to openwrt/package/luci/applications/luci-ddns/luasrc/i18n/ddns.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/openwrt/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
rename to openwrt/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
diff --git a/openwrt/packages/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua b/openwrt/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
rename to openwrt/package/luci/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
diff --git a/openwrt/packages/luci/applications/luci-ddns/root/lib/uci/schema/default/ddns b/openwrt/package/luci/applications/luci-ddns/root/lib/uci/schema/default/ddns
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ddns/root/lib/uci/schema/default/ddns
rename to openwrt/package/luci/applications/luci-ddns/root/lib/uci/schema/default/ddns
diff --git a/openwrt/packages/luci/applications/luci-ffwizard-leipzig/Makefile b/openwrt/package/luci/applications/luci-ffwizard-leipzig/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ffwizard-leipzig/Makefile
rename to openwrt/package/luci/applications/luci-ffwizard-leipzig/Makefile
diff --git a/openwrt/packages/luci/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua b/openwrt/package/luci/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua
rename to openwrt/package/luci/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua
diff --git a/openwrt/packages/luci/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/openwrt/package/luci/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
rename to openwrt/package/luci/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
diff --git a/openwrt/packages/luci/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua b/openwrt/package/luci/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua
rename to openwrt/package/luci/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/Makefile b/openwrt/package/luci/applications/luci-fw/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/Makefile
rename to openwrt/package/luci/applications/luci-fw/Makefile
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua b/openwrt/package/luci/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.lua b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.xml b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.xml
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.de.xml
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.lua b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.xml b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.xml
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.en.xml
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.lua b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.xml b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.xml
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.fr.xml
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml b/openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml
rename to openwrt/package/luci/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua b/openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua b/openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua b/openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua b/openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua b/openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua b/openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
rename to openwrt/package/luci/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
diff --git a/openwrt/packages/luci/applications/luci-fw/root/lib/uci/schema/default/firewall b/openwrt/package/luci/applications/luci-fw/root/lib/uci/schema/default/firewall
similarity index 100%
rename from openwrt/packages/luci/applications/luci-fw/root/lib/uci/schema/default/firewall
rename to openwrt/package/luci/applications/luci-fw/root/lib/uci/schema/default/firewall
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/Makefile b/openwrt/package/luci/applications/luci-hd_idle/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/Makefile
rename to openwrt/package/luci/applications/luci-hd_idle/Makefile
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/ipkg/postinst b/openwrt/package/luci/applications/luci-hd_idle/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/ipkg/postinst
rename to openwrt/package/luci/applications/luci-hd_idle/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/controller/hd_idle.lua b/openwrt/package/luci/applications/luci-hd_idle/luasrc/controller/hd_idle.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/controller/hd_idle.lua
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/controller/hd_idle.lua
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.lua b/openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.lua
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.lua
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.xml b/openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.xml
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.de.xml
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua b/openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.xml b/openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.xml
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.en.xml
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua b/openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.xml b/openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.xml
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua b/openwrt/package/luci/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua
rename to openwrt/package/luci/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua
diff --git a/openwrt/packages/luci/applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle b/openwrt/package/luci/applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle
similarity index 100%
rename from openwrt/packages/luci/applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle
rename to openwrt/package/luci/applications/luci-hd_idle/root/etc/uci-defaults/luci-hd_idle
diff --git a/openwrt/packages/luci/applications/luci-initmgr/Makefile b/openwrt/package/luci/applications/luci-initmgr/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/Makefile
rename to openwrt/package/luci/applications/luci-initmgr/Makefile
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/controller/init.lua b/openwrt/package/luci/applications/luci-initmgr/luasrc/controller/init.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/controller/init.lua
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/controller/init.lua
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.lua b/openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.lua
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.lua
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.xml b/openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.xml
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.de.xml
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.lua b/openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.lua
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.lua
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.xml b/openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.xml
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.en.xml
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua b/openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.xml b/openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.xml
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-initmgr/luasrc/model/cbi/init/init.lua b/openwrt/package/luci/applications/luci-initmgr/luasrc/model/cbi/init/init.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-initmgr/luasrc/model/cbi/init/init.lua
rename to openwrt/package/luci/applications/luci-initmgr/luasrc/model/cbi/init/init.lua
diff --git a/openwrt/packages/luci/applications/luci-livestats/Makefile b/openwrt/package/luci/applications/luci-livestats/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/Makefile
rename to openwrt/package/luci/applications/luci-livestats/Makefile
diff --git a/openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/ExCanvas.js b/openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/ExCanvas.js
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/ExCanvas.js
rename to openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/ExCanvas.js
diff --git a/openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js b/openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js
rename to openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/GraphRPC.js
diff --git a/openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/JsonRpc.js b/openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/JsonRpc.js
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/JsonRpc.js
rename to openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/JsonRpc.js
diff --git a/openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/Legend.js b/openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/Legend.js
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/Legend.js
rename to openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/Legend.js
diff --git a/openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/MochiKit.js b/openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/MochiKit.js
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/MochiKit.js
rename to openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/MochiKit.js
diff --git a/openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/PlotKit.js b/openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/PlotKit.js
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/PlotKit.js
rename to openwrt/package/luci/applications/luci-livestats/htdocs/luci-static/resources/livestats/PlotKit.js
diff --git a/openwrt/packages/luci/applications/luci-livestats/luasrc/controller/livestats.lua b/openwrt/package/luci/applications/luci-livestats/luasrc/controller/livestats.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/luasrc/controller/livestats.lua
rename to openwrt/package/luci/applications/luci-livestats/luasrc/controller/livestats.lua
diff --git a/openwrt/packages/luci/applications/luci-livestats/luasrc/i18n/livestats.de.lua b/openwrt/package/luci/applications/luci-livestats/luasrc/i18n/livestats.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/luasrc/i18n/livestats.de.lua
rename to openwrt/package/luci/applications/luci-livestats/luasrc/i18n/livestats.de.lua
diff --git a/openwrt/packages/luci/applications/luci-livestats/luasrc/i18n/livestats.en.lua b/openwrt/package/luci/applications/luci-livestats/luasrc/i18n/livestats.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/luasrc/i18n/livestats.en.lua
rename to openwrt/package/luci/applications/luci-livestats/luasrc/i18n/livestats.en.lua
diff --git a/openwrt/packages/luci/applications/luci-livestats/luasrc/view/livestats/loadavg.htm b/openwrt/package/luci/applications/luci-livestats/luasrc/view/livestats/loadavg.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/luasrc/view/livestats/loadavg.htm
rename to openwrt/package/luci/applications/luci-livestats/luasrc/view/livestats/loadavg.htm
diff --git a/openwrt/packages/luci/applications/luci-livestats/luasrc/view/livestats/traffic.htm b/openwrt/package/luci/applications/luci-livestats/luasrc/view/livestats/traffic.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/luasrc/view/livestats/traffic.htm
rename to openwrt/package/luci/applications/luci-livestats/luasrc/view/livestats/traffic.htm
diff --git a/openwrt/packages/luci/applications/luci-livestats/luasrc/view/livestats/wireless.htm b/openwrt/package/luci/applications/luci-livestats/luasrc/view/livestats/wireless.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-livestats/luasrc/view/livestats/wireless.htm
rename to openwrt/package/luci/applications/luci-livestats/luasrc/view/livestats/wireless.htm
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/Makefile b/openwrt/package/luci/applications/luci-mmc_over_gpio/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/Makefile
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/Makefile
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/ipkg/postinst b/openwrt/package/luci/applications/luci-mmc_over_gpio/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/ipkg/postinst
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.lua b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.lua
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.lua
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.xml b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.xml
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.de.xml
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.xml b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.xml
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.xml
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.lua b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.lua
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.xml b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.xml
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua b/openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua
diff --git a/openwrt/packages/luci/applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio b/openwrt/package/luci/applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio
similarity index 100%
rename from openwrt/packages/luci/applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio
rename to openwrt/package/luci/applications/luci-mmc_over_gpio/root/etc/uci-defaults/luci-mmc_over_gpio
diff --git a/openwrt/packages/luci/applications/luci-ntpc/Makefile b/openwrt/package/luci/applications/luci-ntpc/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/Makefile
rename to openwrt/package/luci/applications/luci-ntpc/Makefile
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua b/openwrt/package/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/controller/ntpc.lua
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.lua b/openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.lua
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.lua
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.xml b/openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.xml
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.de.xml
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.lua b/openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.lua
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.lua
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.xml b/openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.xml
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.en.xml
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.lua b/openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.lua
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.xml b/openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.xml
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua b/openwrt/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
diff --git a/openwrt/packages/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua b/openwrt/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
rename to openwrt/package/luci/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
diff --git a/openwrt/packages/luci/applications/luci-ntpc/root/lib/uci/schema/default/ntpclient b/openwrt/package/luci/applications/luci-ntpc/root/lib/uci/schema/default/ntpclient
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ntpc/root/lib/uci/schema/default/ntpclient
rename to openwrt/package/luci/applications/luci-ntpc/root/lib/uci/schema/default/ntpclient
diff --git a/openwrt/packages/luci/applications/luci-olsr/Makefile b/openwrt/package/luci/applications/luci-olsr/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/Makefile
rename to openwrt/package/luci/applications/luci-olsr/Makefile
diff --git a/openwrt/packages/luci/applications/luci-olsr/ipkg/postinst b/openwrt/package/luci/applications/luci-olsr/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/ipkg/postinst
rename to openwrt/package/luci/applications/luci-olsr/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/controller/olsr.lua b/openwrt/package/luci/applications/luci-olsr/luasrc/controller/olsr.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/controller/olsr.lua
rename to openwrt/package/luci/applications/luci-olsr/luasrc/controller/olsr.lua
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.de.lua b/openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.de.lua
rename to openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.de.lua
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.de.xml b/openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.de.xml
rename to openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.de.xml
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.en.lua b/openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.en.lua
rename to openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.en.lua
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.en.xml b/openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/i18n/olsr.en.xml
rename to openwrt/package/luci/applications/luci-olsr/luasrc/i18n/olsr.en.xml
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/openwrt/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
rename to openwrt/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/openwrt/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
rename to openwrt/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/openwrt/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
rename to openwrt/package/luci/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm b/openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
rename to openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
rename to openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/index.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/index.htm
rename to openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/index.htm
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
rename to openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
rename to openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
diff --git a/openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
rename to openwrt/package/luci/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
diff --git a/openwrt/packages/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr b/openwrt/package/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr
similarity index 100%
rename from openwrt/packages/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr
rename to openwrt/package/luci/applications/luci-olsr/root/etc/uci-defaults/luci-olsr
diff --git a/openwrt/packages/luci/applications/luci-p910nd/Makefile b/openwrt/package/luci/applications/luci-p910nd/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/Makefile
rename to openwrt/package/luci/applications/luci-p910nd/Makefile
diff --git a/openwrt/packages/luci/applications/luci-p910nd/ipkg/postinst b/openwrt/package/luci/applications/luci-p910nd/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/ipkg/postinst
rename to openwrt/package/luci/applications/luci-p910nd/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua b/openwrt/package/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/controller/p910nd.lua
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua b/openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.xml b/openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.xml
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.de.xml
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua b/openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.xml b/openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.xml
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.en.xml
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua b/openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml b/openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua b/openwrt/package/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
rename to openwrt/package/luci/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua
diff --git a/openwrt/packages/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd b/openwrt/package/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd
similarity index 100%
rename from openwrt/packages/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd
rename to openwrt/package/luci/applications/luci-p910nd/root/etc/uci-defaults/luci-p910nd
diff --git a/openwrt/packages/luci/applications/luci-polipo/Makefile b/openwrt/package/luci/applications/luci-polipo/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/Makefile
rename to openwrt/package/luci/applications/luci-polipo/Makefile
diff --git a/openwrt/packages/luci/applications/luci-polipo/ipkg/postinst b/openwrt/package/luci/applications/luci-polipo/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/ipkg/postinst
rename to openwrt/package/luci/applications/luci-polipo/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-polipo/luasrc/controller/polipo.lua b/openwrt/package/luci/applications/luci-polipo/luasrc/controller/polipo.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/luasrc/controller/polipo.lua
rename to openwrt/package/luci/applications/luci-polipo/luasrc/controller/polipo.lua
diff --git a/openwrt/packages/luci/applications/luci-polipo/luasrc/i18n/polipo.en.lua b/openwrt/package/luci/applications/luci-polipo/luasrc/i18n/polipo.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/luasrc/i18n/polipo.en.lua
rename to openwrt/package/luci/applications/luci-polipo/luasrc/i18n/polipo.en.lua
diff --git a/openwrt/packages/luci/applications/luci-polipo/luasrc/i18n/polipo.en.xml b/openwrt/package/luci/applications/luci-polipo/luasrc/i18n/polipo.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/luasrc/i18n/polipo.en.xml
rename to openwrt/package/luci/applications/luci-polipo/luasrc/i18n/polipo.en.xml
diff --git a/openwrt/packages/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua b/openwrt/package/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua
rename to openwrt/package/luci/applications/luci-polipo/luasrc/model/cbi/polipo.lua
diff --git a/openwrt/packages/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo b/openwrt/package/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo
rename to openwrt/package/luci/applications/luci-polipo/root/etc/uci-defaults/luci-polipo
diff --git a/openwrt/packages/luci/applications/luci-polipo/root/usr/sbin/polipo_purge b/openwrt/package/luci/applications/luci-polipo/root/usr/sbin/polipo_purge
similarity index 100%
rename from openwrt/packages/luci/applications/luci-polipo/root/usr/sbin/polipo_purge
rename to openwrt/package/luci/applications/luci-polipo/root/usr/sbin/polipo_purge
diff --git a/openwrt/packages/luci/applications/luci-qos/Makefile b/openwrt/package/luci/applications/luci-qos/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/Makefile
rename to openwrt/package/luci/applications/luci-qos/Makefile
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/controller/qos.lua b/openwrt/package/luci/applications/luci-qos/luasrc/controller/qos.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/controller/qos.lua
rename to openwrt/package/luci/applications/luci-qos/luasrc/controller/qos.lua
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.de.lua b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.de.lua
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.de.lua
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.de.xml b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.de.xml
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.de.xml
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.en.lua b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.en.lua
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.en.lua
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.en.xml b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.en.xml
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.en.xml
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.fr.lua b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.fr.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.fr.lua
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.fr.lua
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.fr.xml b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.fr.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.fr.xml
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.fr.xml
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.lua b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.lua
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.xml b/openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.xml
rename to openwrt/package/luci/applications/luci-qos/luasrc/i18n/qos.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/openwrt/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
rename to openwrt/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
diff --git a/openwrt/packages/luci/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/openwrt/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
rename to openwrt/package/luci/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
diff --git a/openwrt/packages/luci/applications/luci-qos/root/lib/uci/schema/default/qos b/openwrt/package/luci/applications/luci-qos/root/lib/uci/schema/default/qos
similarity index 100%
rename from openwrt/packages/luci/applications/luci-qos/root/lib/uci/schema/default/qos
rename to openwrt/package/luci/applications/luci-qos/root/lib/uci/schema/default/qos
diff --git a/openwrt/packages/luci/applications/luci-samba/Makefile b/openwrt/package/luci/applications/luci-samba/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/Makefile
rename to openwrt/package/luci/applications/luci-samba/Makefile
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/controller/samba.lua b/openwrt/package/luci/applications/luci-samba/luasrc/controller/samba.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/controller/samba.lua
rename to openwrt/package/luci/applications/luci-samba/luasrc/controller/samba.lua
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.de.lua b/openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.de.lua
rename to openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.de.lua
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.de.xml b/openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.de.xml
rename to openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.de.xml
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.en.lua b/openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.en.lua
rename to openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.en.lua
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.en.xml b/openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.en.xml
rename to openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.en.xml
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.lua b/openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.lua
rename to openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.xml b/openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.xml
rename to openwrt/package/luci/applications/luci-samba/luasrc/i18n/samba.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-samba/luasrc/model/cbi/samba.lua b/openwrt/package/luci/applications/luci-samba/luasrc/model/cbi/samba.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/luasrc/model/cbi/samba.lua
rename to openwrt/package/luci/applications/luci-samba/luasrc/model/cbi/samba.lua
diff --git a/openwrt/packages/luci/applications/luci-samba/root/lib/uci/schema/default/samba b/openwrt/package/luci/applications/luci-samba/root/lib/uci/schema/default/samba
similarity index 100%
rename from openwrt/packages/luci/applications/luci-samba/root/lib/uci/schema/default/samba
rename to openwrt/package/luci/applications/luci-samba/root/lib/uci/schema/default/samba
diff --git a/openwrt/packages/luci/applications/luci-siitwizard/Makefile b/openwrt/package/luci/applications/luci-siitwizard/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-siitwizard/Makefile
rename to openwrt/package/luci/applications/luci-siitwizard/Makefile
diff --git a/openwrt/packages/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua b/openwrt/package/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua
rename to openwrt/package/luci/applications/luci-siitwizard/luasrc/controller/siitwizard.lua
diff --git a/openwrt/packages/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/openwrt/package/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
rename to openwrt/package/luci/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
diff --git a/openwrt/packages/luci/applications/luci-siitwizard/root/etc/config/siit b/openwrt/package/luci/applications/luci-siitwizard/root/etc/config/siit
similarity index 100%
rename from openwrt/packages/luci/applications/luci-siitwizard/root/etc/config/siit
rename to openwrt/package/luci/applications/luci-siitwizard/root/etc/config/siit
diff --git a/openwrt/packages/luci/applications/luci-splash/Makefile b/openwrt/package/luci/applications/luci-splash/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/Makefile
rename to openwrt/package/luci/applications/luci-splash/Makefile
diff --git a/openwrt/packages/luci/applications/luci-splash/htdocs/luci/splash/index.html b/openwrt/package/luci/applications/luci-splash/htdocs/luci/splash/index.html
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/htdocs/luci/splash/index.html
rename to openwrt/package/luci/applications/luci-splash/htdocs/luci/splash/index.html
diff --git a/openwrt/packages/luci/applications/luci-splash/ipkg/postinst b/openwrt/package/luci/applications/luci-splash/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/ipkg/postinst
rename to openwrt/package/luci/applications/luci-splash/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-splash/luasrc/controller/splash/splash.lua b/openwrt/package/luci/applications/luci-splash/luasrc/controller/splash/splash.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/luasrc/controller/splash/splash.lua
rename to openwrt/package/luci/applications/luci-splash/luasrc/controller/splash/splash.lua
diff --git a/openwrt/packages/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua b/openwrt/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
rename to openwrt/package/luci/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
diff --git a/openwrt/packages/luci/applications/luci-splash/luasrc/view/splash/splash.htm b/openwrt/package/luci/applications/luci-splash/luasrc/view/splash/splash.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/luasrc/view/splash/splash.htm
rename to openwrt/package/luci/applications/luci-splash/luasrc/view/splash/splash.htm
diff --git a/openwrt/packages/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm b/openwrt/package/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm
rename to openwrt/package/luci/applications/luci-splash/luasrc/view/splash_splash/index.htm
diff --git a/openwrt/packages/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/openwrt/package/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm
rename to openwrt/package/luci/applications/luci-splash/luasrc/view/splash_splash/splash.htm
diff --git a/openwrt/packages/luci/applications/luci-splash/root/etc/config/luci_splash b/openwrt/package/luci/applications/luci-splash/root/etc/config/luci_splash
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/root/etc/config/luci_splash
rename to openwrt/package/luci/applications/luci-splash/root/etc/config/luci_splash
diff --git a/openwrt/packages/luci/applications/luci-splash/root/etc/cron.minutely/luci_splash b/openwrt/package/luci/applications/luci-splash/root/etc/cron.minutely/luci_splash
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/root/etc/cron.minutely/luci_splash
rename to openwrt/package/luci/applications/luci-splash/root/etc/cron.minutely/luci_splash
diff --git a/openwrt/packages/luci/applications/luci-splash/root/etc/init.d/luci_splash b/openwrt/package/luci/applications/luci-splash/root/etc/init.d/luci_splash
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/root/etc/init.d/luci_splash
rename to openwrt/package/luci/applications/luci-splash/root/etc/init.d/luci_splash
diff --git a/openwrt/packages/luci/applications/luci-splash/root/lib/uci/schema/default/luci_splash b/openwrt/package/luci/applications/luci-splash/root/lib/uci/schema/default/luci_splash
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/root/lib/uci/schema/default/luci_splash
rename to openwrt/package/luci/applications/luci-splash/root/lib/uci/schema/default/luci_splash
diff --git a/openwrt/packages/luci/applications/luci-splash/root/usr/bin/luci-splashd b/openwrt/package/luci/applications/luci-splash/root/usr/bin/luci-splashd
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/root/usr/bin/luci-splashd
rename to openwrt/package/luci/applications/luci-splash/root/usr/bin/luci-splashd
diff --git a/openwrt/packages/luci/applications/luci-splash/root/usr/sbin/luci-splash b/openwrt/package/luci/applications/luci-splash/root/usr/sbin/luci-splash
similarity index 100%
rename from openwrt/packages/luci/applications/luci-splash/root/usr/sbin/luci-splash
rename to openwrt/package/luci/applications/luci-splash/root/usr/sbin/luci-splash
diff --git a/openwrt/packages/luci/applications/luci-statistics/Makefile b/openwrt/package/luci/applications/luci-statistics/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/Makefile
rename to openwrt/package/luci/applications/luci-statistics/Makefile
diff --git a/openwrt/packages/luci/applications/luci-statistics/ipkg/postinst b/openwrt/package/luci/applications/luci-statistics/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/ipkg/postinst
rename to openwrt/package/luci/applications/luci-statistics/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.xml.hide b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.xml.hide
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.xml.hide
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.de.xml.hide
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.xml.hide b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.xml.hide
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.xml.hide
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.en.xml.hide
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.xml.hide b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.xml.hide
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.xml.hide
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.xml.hide
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.de.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.de.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.de.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.de.xml b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.de.xml
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.de.xml
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.en.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.en.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.en.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.en.xml b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.en.xml
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.en.xml
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml b/openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
rename to openwrt/package/luci/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/csv.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/df.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/disk.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/dns.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/email.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/exec.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/interface.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iptables.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/irq.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/load.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/netlink.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/network.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/ping.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/wireless.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/wireless.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/wireless.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/model/cbi/luci_statistics/wireless.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/datatree.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/datatree.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/datatree.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/datatree.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/i18n.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/i18n.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/i18n.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/i18n.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/colors.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df/df.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df/df.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df/df.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df/df.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_bytes.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_bytes.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_bytes.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_bytes.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq/irq.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq/irq.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq/irq.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/irq/irq.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load/load.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load/load.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load/load.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/load/load.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua b/openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua
rename to openwrt/package/luci/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm b/openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
rename to openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm b/openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
rename to openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm b/openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
rename to openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm b/openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
rename to openwrt/package/luci/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
diff --git a/openwrt/packages/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm b/openwrt/package/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
rename to openwrt/package/luci/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
diff --git a/openwrt/packages/luci/applications/luci-statistics/root/etc/config/luci_statistics b/openwrt/package/luci/applications/luci-statistics/root/etc/config/luci_statistics
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/root/etc/config/luci_statistics
rename to openwrt/package/luci/applications/luci-statistics/root/etc/config/luci_statistics
diff --git a/openwrt/packages/luci/applications/luci-statistics/root/etc/init.d/luci_statistics b/openwrt/package/luci/applications/luci-statistics/root/etc/init.d/luci_statistics
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/root/etc/init.d/luci_statistics
rename to openwrt/package/luci/applications/luci-statistics/root/etc/init.d/luci_statistics
diff --git a/openwrt/packages/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics b/openwrt/package/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics
rename to openwrt/package/luci/applications/luci-statistics/root/etc/uci-defaults/luci-statistics
diff --git a/openwrt/packages/luci/applications/luci-statistics/root/usr/bin/stat-genconfig b/openwrt/package/luci/applications/luci-statistics/root/usr/bin/stat-genconfig
similarity index 100%
rename from openwrt/packages/luci/applications/luci-statistics/root/usr/bin/stat-genconfig
rename to openwrt/package/luci/applications/luci-statistics/root/usr/bin/stat-genconfig
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/Makefile b/openwrt/package/luci/applications/luci-tinyproxy/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/Makefile
rename to openwrt/package/luci/applications/luci-tinyproxy/Makefile
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.lua b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.lua
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.lua
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.xml b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.xml
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.de.xml
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.xml b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.xml
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.xml
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.lua b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.lua
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.lua
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.xml b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.xml
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.fr.xml
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.lua b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.lua
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/openwrt/package/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua
rename to openwrt/package/luci/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua
diff --git a/openwrt/packages/luci/applications/luci-upnp/Makefile b/openwrt/package/luci/applications/luci-upnp/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/Makefile
rename to openwrt/package/luci/applications/luci-upnp/Makefile
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/controller/upnp.lua b/openwrt/package/luci/applications/luci-upnp/luasrc/controller/upnp.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/controller/upnp.lua
rename to openwrt/package/luci/applications/luci-upnp/luasrc/controller/upnp.lua
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.de.lua b/openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.de.lua
rename to openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.de.lua
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.de.xml b/openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.de.xml
rename to openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.de.xml
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.en.lua b/openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.en.lua
rename to openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.en.lua
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.en.xml b/openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.en.xml
rename to openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.en.xml
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua b/openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
rename to openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml b/openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
rename to openwrt/package/luci/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/openwrt/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
rename to openwrt/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
diff --git a/openwrt/packages/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua b/openwrt/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
rename to openwrt/package/luci/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
diff --git a/openwrt/packages/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp b/openwrt/package/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp
rename to openwrt/package/luci/applications/luci-upnp/root/etc/uci-defaults/luci-upnp
diff --git a/openwrt/packages/luci/applications/luci-upnp/root/lib/uci/schema/default/upnpd b/openwrt/package/luci/applications/luci-upnp/root/lib/uci/schema/default/upnpd
similarity index 100%
rename from openwrt/packages/luci/applications/luci-upnp/root/lib/uci/schema/default/upnpd
rename to openwrt/package/luci/applications/luci-upnp/root/lib/uci/schema/default/upnpd
diff --git a/openwrt/packages/luci/applications/luci-ushare/Makefile b/openwrt/package/luci/applications/luci-ushare/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/Makefile
rename to openwrt/package/luci/applications/luci-ushare/Makefile
diff --git a/openwrt/packages/luci/applications/luci-ushare/ipkg/postinst b/openwrt/package/luci/applications/luci-ushare/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/ipkg/postinst
rename to openwrt/package/luci/applications/luci-ushare/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/controller/ushare.lua b/openwrt/package/luci/applications/luci-ushare/luasrc/controller/ushare.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/controller/ushare.lua
rename to openwrt/package/luci/applications/luci-ushare/luasrc/controller/ushare.lua
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.de.lua b/openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.de.lua
rename to openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.de.lua
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.de.xml b/openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.de.xml
rename to openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.de.xml
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.en.lua b/openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.en.lua
rename to openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.en.lua
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.en.xml b/openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.en.xml
rename to openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.en.xml
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.lua b/openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.lua
rename to openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.xml b/openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.xml
rename to openwrt/package/luci/applications/luci-ushare/luasrc/i18n/ushare.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua b/openwrt/package/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua
rename to openwrt/package/luci/applications/luci-ushare/luasrc/model/cbi/ushare.lua
diff --git a/openwrt/packages/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare b/openwrt/package/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare
similarity index 100%
rename from openwrt/packages/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare
rename to openwrt/package/luci/applications/luci-ushare/root/etc/uci-defaults/luci-ushare
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/Makefile b/openwrt/package/luci/applications/luci-uvc_streamer/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/Makefile
rename to openwrt/package/luci/applications/luci-uvc_streamer/Makefile
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/ipkg/postinst b/openwrt/package/luci/applications/luci-uvc_streamer/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/ipkg/postinst
rename to openwrt/package/luci/applications/luci-uvc_streamer/ipkg/postinst
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.lua
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.de.xml
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.xml
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.lua b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.lua
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.lua
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.xml b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.xml
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.fr.xml
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua b/openwrt/package/luci/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua
rename to openwrt/package/luci/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer b/openwrt/package/luci/applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer
rename to openwrt/package/luci/applications/luci-uvc_streamer/root/etc/uci-defaults/luci-uvc_streamer
diff --git a/openwrt/packages/luci/applications/luci-uvc_streamer/root/lib/uci/schema/default/uvc-streamer b/openwrt/package/luci/applications/luci-uvc_streamer/root/lib/uci/schema/default/uvc-streamer
similarity index 100%
rename from openwrt/packages/luci/applications/luci-uvc_streamer/root/lib/uci/schema/default/uvc-streamer
rename to openwrt/package/luci/applications/luci-uvc_streamer/root/lib/uci/schema/default/uvc-streamer
diff --git a/openwrt/packages/luci/applications/myapplication/Makefile b/openwrt/package/luci/applications/myapplication/Makefile
similarity index 100%
rename from openwrt/packages/luci/applications/myapplication/Makefile
rename to openwrt/package/luci/applications/myapplication/Makefile
diff --git a/openwrt/packages/luci/build/cbi2uvl.lua b/openwrt/package/luci/build/cbi2uvl.lua
similarity index 100%
rename from openwrt/packages/luci/build/cbi2uvl.lua
rename to openwrt/package/luci/build/cbi2uvl.lua
diff --git a/openwrt/packages/luci/build/config.mk b/openwrt/package/luci/build/config.mk
similarity index 100%
rename from openwrt/packages/luci/build/config.mk
rename to openwrt/package/luci/build/config.mk
diff --git a/openwrt/packages/luci/build/gccconfig.mk b/openwrt/package/luci/build/gccconfig.mk
similarity index 100%
rename from openwrt/packages/luci/build/gccconfig.mk
rename to openwrt/package/luci/build/gccconfig.mk
diff --git a/openwrt/packages/luci/build/hostenv.sh b/openwrt/package/luci/build/hostenv.sh
similarity index 100%
rename from openwrt/packages/luci/build/hostenv.sh
rename to openwrt/package/luci/build/hostenv.sh
diff --git a/openwrt/packages/luci/build/i18n-lua-xhtml1.xsl b/openwrt/package/luci/build/i18n-lua-xhtml1.xsl
similarity index 100%
rename from openwrt/packages/luci/build/i18n-lua-xhtml1.xsl
rename to openwrt/package/luci/build/i18n-lua-xhtml1.xsl
diff --git a/openwrt/packages/luci/build/i18n-lua2xml.lua b/openwrt/package/luci/build/i18n-lua2xml.lua
similarity index 100%
rename from openwrt/packages/luci/build/i18n-lua2xml.lua
rename to openwrt/package/luci/build/i18n-lua2xml.lua
diff --git a/openwrt/packages/luci/build/i18n-xml2lua.sh b/openwrt/package/luci/build/i18n-xml2lua.sh
similarity index 100%
rename from openwrt/packages/luci/build/i18n-xml2lua.sh
rename to openwrt/package/luci/build/i18n-xml2lua.sh
diff --git a/openwrt/packages/luci/build/makedocs.sh b/openwrt/package/luci/build/makedocs.sh
similarity index 100%
rename from openwrt/packages/luci/build/makedocs.sh
rename to openwrt/package/luci/build/makedocs.sh
diff --git a/openwrt/packages/luci/build/mkversion.sh b/openwrt/package/luci/build/mkversion.sh
similarity index 100%
rename from openwrt/packages/luci/build/mkversion.sh
rename to openwrt/package/luci/build/mkversion.sh
diff --git a/openwrt/packages/luci/build/module.mk b/openwrt/package/luci/build/module.mk
similarity index 100%
rename from openwrt/packages/luci/build/module.mk
rename to openwrt/package/luci/build/module.mk
diff --git a/openwrt/packages/luci/build/uvl2cbi.lua b/openwrt/package/luci/build/uvl2cbi.lua
similarity index 100%
rename from openwrt/packages/luci/build/uvl2cbi.lua
rename to openwrt/package/luci/build/uvl2cbi.lua
diff --git a/openwrt/packages/luci/build/uvl2i18n.lua b/openwrt/package/luci/build/uvl2i18n.lua
similarity index 100%
rename from openwrt/packages/luci/build/uvl2i18n.lua
rename to openwrt/package/luci/build/uvl2i18n.lua
diff --git a/openwrt/packages/luci/build/uvldoc b/openwrt/package/luci/build/uvldoc
similarity index 100%
rename from openwrt/packages/luci/build/uvldoc
rename to openwrt/package/luci/build/uvldoc
diff --git a/openwrt/packages/luci/build/zoneinfo2lua.pl b/openwrt/package/luci/build/zoneinfo2lua.pl
similarity index 100%
rename from openwrt/packages/luci/build/zoneinfo2lua.pl
rename to openwrt/package/luci/build/zoneinfo2lua.pl
diff --git a/openwrt/packages/luci/contrib/axtls/Makefile b/openwrt/package/luci/contrib/axtls/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/axtls/Makefile
rename to openwrt/package/luci/contrib/axtls/Makefile
diff --git a/openwrt/packages/luci/contrib/axtls/files/axtls-config b/openwrt/package/luci/contrib/axtls/files/axtls-config
similarity index 100%
rename from openwrt/packages/luci/contrib/axtls/files/axtls-config
rename to openwrt/package/luci/contrib/axtls/files/axtls-config
diff --git a/openwrt/packages/luci/contrib/axtls/files/axtls-config.h b/openwrt/package/luci/contrib/axtls/files/axtls-config.h
similarity index 100%
rename from openwrt/packages/luci/contrib/axtls/files/axtls-config.h
rename to openwrt/package/luci/contrib/axtls/files/axtls-config.h
diff --git a/openwrt/packages/luci/contrib/axtls/patches/001-ld-fix.patch b/openwrt/package/luci/contrib/axtls/patches/001-ld-fix.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/axtls/patches/001-ld-fix.patch
rename to openwrt/package/luci/contrib/axtls/patches/001-ld-fix.patch
diff --git a/openwrt/packages/luci/contrib/axtls/patches/002-httpd-fix.patch b/openwrt/package/luci/contrib/axtls/patches/002-httpd-fix.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/axtls/patches/002-httpd-fix.patch
rename to openwrt/package/luci/contrib/axtls/patches/002-httpd-fix.patch
diff --git a/openwrt/packages/luci/contrib/axtls/patches/003-content-type.patch b/openwrt/package/luci/contrib/axtls/patches/003-content-type.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/axtls/patches/003-content-type.patch
rename to openwrt/package/luci/contrib/axtls/patches/003-content-type.patch
diff --git a/openwrt/packages/luci/contrib/axtls/patches/004-cgi-nph-mode.patch b/openwrt/package/luci/contrib/axtls/patches/004-cgi-nph-mode.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/axtls/patches/004-cgi-nph-mode.patch
rename to openwrt/package/luci/contrib/axtls/patches/004-cgi-nph-mode.patch
diff --git a/openwrt/packages/luci/contrib/bitlib/.gitignore b/openwrt/package/luci/contrib/bitlib/.gitignore
similarity index 100%
rename from openwrt/packages/luci/contrib/bitlib/.gitignore
rename to openwrt/package/luci/contrib/bitlib/.gitignore
diff --git a/openwrt/packages/luci/contrib/bitlib/Makefile b/openwrt/package/luci/contrib/bitlib/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/bitlib/Makefile
rename to openwrt/package/luci/contrib/bitlib/Makefile
diff --git a/openwrt/packages/luci/contrib/lpeg/.gitignore b/openwrt/package/luci/contrib/lpeg/.gitignore
similarity index 100%
rename from openwrt/packages/luci/contrib/lpeg/.gitignore
rename to openwrt/package/luci/contrib/lpeg/.gitignore
diff --git a/openwrt/packages/luci/contrib/lpeg/Makefile b/openwrt/package/luci/contrib/lpeg/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/lpeg/Makefile
rename to openwrt/package/luci/contrib/lpeg/Makefile
diff --git a/openwrt/packages/luci/contrib/luacurses/Makefile b/openwrt/package/luci/contrib/luacurses/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/Makefile
rename to openwrt/package/luci/contrib/luacurses/Makefile
diff --git a/openwrt/packages/luci/contrib/luacurses/doc/curses.pdf b/openwrt/package/luci/contrib/luacurses/doc/curses.pdf
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/doc/curses.pdf
rename to openwrt/package/luci/contrib/luacurses/doc/curses.pdf
diff --git a/openwrt/packages/luci/contrib/luacurses/doc/curses.ps.gz b/openwrt/package/luci/contrib/luacurses/doc/curses.ps.gz
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/doc/curses.ps.gz
rename to openwrt/package/luci/contrib/luacurses/doc/curses.ps.gz
diff --git a/openwrt/packages/luci/contrib/luacurses/src/curses.c b/openwrt/package/luci/contrib/luacurses/src/curses.c
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/src/curses.c
rename to openwrt/package/luci/contrib/luacurses/src/curses.c
diff --git a/openwrt/packages/luci/contrib/luacurses/src/luacurses.c b/openwrt/package/luci/contrib/luacurses/src/luacurses.c
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/src/luacurses.c
rename to openwrt/package/luci/contrib/luacurses/src/luacurses.c
diff --git a/openwrt/packages/luci/contrib/luacurses/src/luacurses.h b/openwrt/package/luci/contrib/luacurses/src/luacurses.h
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/src/luacurses.h
rename to openwrt/package/luci/contrib/luacurses/src/luacurses.h
diff --git a/openwrt/packages/luci/contrib/luacurses/test/filter.lua b/openwrt/package/luci/contrib/luacurses/test/filter.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/test/filter.lua
rename to openwrt/package/luci/contrib/luacurses/test/filter.lua
diff --git a/openwrt/packages/luci/contrib/luacurses/test/getnstr.lua b/openwrt/package/luci/contrib/luacurses/test/getnstr.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/test/getnstr.lua
rename to openwrt/package/luci/contrib/luacurses/test/getnstr.lua
diff --git a/openwrt/packages/luci/contrib/luacurses/test/getyx.lua b/openwrt/package/luci/contrib/luacurses/test/getyx.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/test/getyx.lua
rename to openwrt/package/luci/contrib/luacurses/test/getyx.lua
diff --git a/openwrt/packages/luci/contrib/luacurses/test/hello.lua b/openwrt/package/luci/contrib/luacurses/test/hello.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/test/hello.lua
rename to openwrt/package/luci/contrib/luacurses/test/hello.lua
diff --git a/openwrt/packages/luci/contrib/luacurses/test/mouse.lua b/openwrt/package/luci/contrib/luacurses/test/mouse.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/test/mouse.lua
rename to openwrt/package/luci/contrib/luacurses/test/mouse.lua
diff --git a/openwrt/packages/luci/contrib/luacurses/test/pair.lua b/openwrt/package/luci/contrib/luacurses/test/pair.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/test/pair.lua
rename to openwrt/package/luci/contrib/luacurses/test/pair.lua
diff --git a/openwrt/packages/luci/contrib/luacurses/test/rain.lua b/openwrt/package/luci/contrib/luacurses/test/rain.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luacurses/test/rain.lua
rename to openwrt/package/luci/contrib/luacurses/test/rain.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/Makefile b/openwrt/package/luci/contrib/luadoc/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/Makefile
rename to openwrt/package/luci/contrib/luadoc/Makefile
diff --git a/openwrt/packages/luci/contrib/luadoc/hostfiles/bin/luadoc b/openwrt/package/luci/contrib/luadoc/hostfiles/bin/luadoc
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/hostfiles/bin/luadoc
rename to openwrt/package/luci/contrib/luadoc/hostfiles/bin/luadoc
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/config.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/config.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/config.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/config.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/debug.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/formatter.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/constant.lp
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/file.lp
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/function.lp
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/index.lp
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/luadoc.css
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/menu.lp
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/module.lp
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/html/table.lp
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/doclet/raw.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/init.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/init.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/init.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/init.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/lp.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/lp.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/lp.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/lp.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/taglet/standard.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/taglet/standard/tags.lua
diff --git a/openwrt/packages/luci/contrib/luadoc/lua/luadoc/util.lua b/openwrt/package/luci/contrib/luadoc/lua/luadoc/util.lua
similarity index 100%
rename from openwrt/packages/luci/contrib/luadoc/lua/luadoc/util.lua
rename to openwrt/package/luci/contrib/luadoc/lua/luadoc/util.lua
diff --git a/openwrt/packages/luci/contrib/luaposix/.gitignore b/openwrt/package/luci/contrib/luaposix/.gitignore
similarity index 100%
rename from openwrt/packages/luci/contrib/luaposix/.gitignore
rename to openwrt/package/luci/contrib/luaposix/.gitignore
diff --git a/openwrt/packages/luci/contrib/luaposix/Makefile b/openwrt/package/luci/contrib/luaposix/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/luaposix/Makefile
rename to openwrt/package/luci/contrib/luaposix/Makefile
diff --git a/openwrt/packages/luci/contrib/luasocket/.gitignore b/openwrt/package/luci/contrib/luasocket/.gitignore
similarity index 100%
rename from openwrt/packages/luci/contrib/luasocket/.gitignore
rename to openwrt/package/luci/contrib/luasocket/.gitignore
diff --git a/openwrt/packages/luci/contrib/luasocket/Makefile b/openwrt/package/luci/contrib/luasocket/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/luasocket/Makefile
rename to openwrt/package/luci/contrib/luasocket/Makefile
diff --git a/openwrt/packages/luci/contrib/package/Makefile b/openwrt/package/luci/contrib/package/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/package/Makefile
rename to openwrt/package/luci/contrib/package/Makefile
diff --git a/openwrt/packages/luci/contrib/package/lpeg/Makefile b/openwrt/package/luci/contrib/package/lpeg/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/package/lpeg/Makefile
rename to openwrt/package/luci/contrib/package/lpeg/Makefile
diff --git a/openwrt/packages/luci/contrib/package/luasocket/Makefile b/openwrt/package/luci/contrib/package/luasocket/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/package/luasocket/Makefile
rename to openwrt/package/luci/contrib/package/luasocket/Makefile
diff --git a/openwrt/packages/luci/contrib/package/luaxyssl/Makefile b/openwrt/package/luci/contrib/package/luaxyssl/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/package/luaxyssl/Makefile
rename to openwrt/package/luci/contrib/package/luaxyssl/Makefile
diff --git a/openwrt/packages/luci/contrib/package/luaxyssl/patches/100-compile-fixes.patch b/openwrt/package/luci/contrib/package/luaxyssl/patches/100-compile-fixes.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/package/luaxyssl/patches/100-compile-fixes.patch
rename to openwrt/package/luci/contrib/package/luaxyssl/patches/100-compile-fixes.patch
diff --git a/openwrt/packages/luci/contrib/package/luci/Makefile b/openwrt/package/luci/contrib/package/luci/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/package/luci/Makefile
rename to openwrt/package/luci/contrib/package/luci/Makefile
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/Makefile b/openwrt/package/luci/contrib/package/olsrd-luci/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/Makefile
rename to openwrt/package/luci/contrib/package/olsrd-luci/Makefile
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/files/etc/config/olsrd b/openwrt/package/luci/contrib/package/olsrd-luci/files/etc/config/olsrd
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/files/etc/config/olsrd
rename to openwrt/package/luci/contrib/package/olsrd-luci/files/etc/config/olsrd
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/files/etc/default/olsrd b/openwrt/package/luci/contrib/package/olsrd-luci/files/etc/default/olsrd
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/files/etc/default/olsrd
rename to openwrt/package/luci/contrib/package/olsrd-luci/files/etc/default/olsrd
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/files/etc/init.d/olsrd b/openwrt/package/luci/contrib/package/olsrd-luci/files/etc/init.d/olsrd
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/files/etc/init.d/olsrd
rename to openwrt/package/luci/contrib/package/olsrd-luci/files/etc/init.d/olsrd
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/ipkg/postinst b/openwrt/package/luci/contrib/package/olsrd-luci/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/ipkg/postinst
rename to openwrt/package/luci/contrib/package/olsrd-luci/ipkg/postinst
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/patches/100-olsrd-hg-r3.patch b/openwrt/package/luci/contrib/package/olsrd-luci/patches/100-olsrd-hg-r3.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/patches/100-olsrd-hg-r3.patch
rename to openwrt/package/luci/contrib/package/olsrd-luci/patches/100-olsrd-hg-r3.patch
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/patches/131-olsrd-tweak-ffetx.patch b/openwrt/package/luci/contrib/package/olsrd-luci/patches/131-olsrd-tweak-ffetx.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/patches/131-olsrd-tweak-ffetx.patch
rename to openwrt/package/luci/contrib/package/olsrd-luci/patches/131-olsrd-tweak-ffetx.patch
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/patches/137-olsrd-192.168.1.1.patch b/openwrt/package/luci/contrib/package/olsrd-luci/patches/137-olsrd-192.168.1.1.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/patches/137-olsrd-192.168.1.1.patch
rename to openwrt/package/luci/contrib/package/olsrd-luci/patches/137-olsrd-192.168.1.1.patch
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/patches/139-olsrd-magicarprefresh.patch b/openwrt/package/luci/contrib/package/olsrd-luci/patches/139-olsrd-magicarprefresh.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/patches/139-olsrd-magicarprefresh.patch
rename to openwrt/package/luci/contrib/package/olsrd-luci/patches/139-olsrd-magicarprefresh.patch
diff --git a/openwrt/packages/luci/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch b/openwrt/package/luci/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
similarity index 100%
rename from openwrt/packages/luci/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
rename to openwrt/package/luci/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
diff --git a/openwrt/packages/luci/contrib/package/xrelayd/Makefile b/openwrt/package/luci/contrib/package/xrelayd/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/package/xrelayd/Makefile
rename to openwrt/package/luci/contrib/package/xrelayd/Makefile
diff --git a/openwrt/packages/luci/contrib/uci/.gitignore b/openwrt/package/luci/contrib/uci/.gitignore
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/.gitignore
rename to openwrt/package/luci/contrib/uci/.gitignore
diff --git a/openwrt/packages/luci/contrib/uci/Makefile b/openwrt/package/luci/contrib/uci/Makefile
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/Makefile
rename to openwrt/package/luci/contrib/uci/Makefile
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/bin/uci b/openwrt/package/luci/contrib/uci/hostfiles/bin/uci
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/bin/uci
rename to openwrt/package/luci/contrib/uci/hostfiles/bin/uci
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/bin/uci-defaults b/openwrt/package/luci/contrib/uci/hostfiles/bin/uci-defaults
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/bin/uci-defaults
rename to openwrt/package/luci/contrib/uci/hostfiles/bin/uci-defaults
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/batmand b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/batmand
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/batmand
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/batmand
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/ddns b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/ddns
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/ddns
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/ddns
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/dhcp b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/dhcp
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/dhcp
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/dhcp
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/dropbear b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/dropbear
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/dropbear
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/dropbear
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/firewall b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/firewall
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/firewall
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/firewall
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/fstab b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/fstab
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/fstab
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/fstab
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/httpd b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/httpd
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/httpd
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/httpd
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/network b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/network
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/network
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/network
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/ntpclient b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/ntpclient
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/ntpclient
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/ntpclient
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/qos b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/qos
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/qos
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/qos
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/system b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/system
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/system
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/system
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/upnpd b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/upnpd
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/upnpd
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/upnpd
diff --git a/openwrt/packages/luci/contrib/uci/hostfiles/etc/config/wireless b/openwrt/package/luci/contrib/uci/hostfiles/etc/config/wireless
similarity index 100%
rename from openwrt/packages/luci/contrib/uci/hostfiles/etc/config/wireless
rename to openwrt/package/luci/contrib/uci/hostfiles/etc/config/wireless
diff --git a/openwrt/packages/luci/host/bin/luadoc b/openwrt/package/luci/host/bin/luadoc
similarity index 100%
rename from openwrt/packages/luci/host/bin/luadoc
rename to openwrt/package/luci/host/bin/luadoc
diff --git a/openwrt/packages/luci/host/bin/uci b/openwrt/package/luci/host/bin/uci
similarity index 100%
rename from openwrt/packages/luci/host/bin/uci
rename to openwrt/package/luci/host/bin/uci
diff --git a/openwrt/packages/luci/host/bin/uci-defaults b/openwrt/package/luci/host/bin/uci-defaults
similarity index 100%
rename from openwrt/packages/luci/host/bin/uci-defaults
rename to openwrt/package/luci/host/bin/uci-defaults
diff --git a/openwrt/packages/luci/host/etc/boa/boa.conf b/openwrt/package/luci/host/etc/boa/boa.conf
similarity index 100%
rename from openwrt/packages/luci/host/etc/boa/boa.conf
rename to openwrt/package/luci/host/etc/boa/boa.conf
diff --git a/openwrt/packages/luci/host/etc/config/batmand b/openwrt/package/luci/host/etc/config/batmand
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/batmand
rename to openwrt/package/luci/host/etc/config/batmand
diff --git a/openwrt/packages/luci/host/etc/config/ddns b/openwrt/package/luci/host/etc/config/ddns
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/ddns
rename to openwrt/package/luci/host/etc/config/ddns
diff --git a/openwrt/packages/luci/host/etc/config/dhcp b/openwrt/package/luci/host/etc/config/dhcp
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/dhcp
rename to openwrt/package/luci/host/etc/config/dhcp
diff --git a/openwrt/packages/luci/host/etc/config/dropbear b/openwrt/package/luci/host/etc/config/dropbear
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/dropbear
rename to openwrt/package/luci/host/etc/config/dropbear
diff --git a/openwrt/packages/luci/host/etc/config/firewall b/openwrt/package/luci/host/etc/config/firewall
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/firewall
rename to openwrt/package/luci/host/etc/config/firewall
diff --git a/openwrt/packages/luci/host/etc/config/freifunk b/openwrt/package/luci/host/etc/config/freifunk
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/freifunk
rename to openwrt/package/luci/host/etc/config/freifunk
diff --git a/openwrt/packages/luci/host/etc/config/freifunk_augsburg b/openwrt/package/luci/host/etc/config/freifunk_augsburg
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/freifunk_augsburg
rename to openwrt/package/luci/host/etc/config/freifunk_augsburg
diff --git a/openwrt/packages/luci/host/etc/config/freifunk_berlin b/openwrt/package/luci/host/etc/config/freifunk_berlin
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/freifunk_berlin
rename to openwrt/package/luci/host/etc/config/freifunk_berlin
diff --git a/openwrt/packages/luci/host/etc/config/freifunk_hannover b/openwrt/package/luci/host/etc/config/freifunk_hannover
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/freifunk_hannover
rename to openwrt/package/luci/host/etc/config/freifunk_hannover
diff --git a/openwrt/packages/luci/host/etc/config/fstab b/openwrt/package/luci/host/etc/config/fstab
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/fstab
rename to openwrt/package/luci/host/etc/config/fstab
diff --git a/openwrt/packages/luci/host/etc/config/httpd b/openwrt/package/luci/host/etc/config/httpd
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/httpd
rename to openwrt/package/luci/host/etc/config/httpd
diff --git a/openwrt/packages/luci/host/etc/config/luci b/openwrt/package/luci/host/etc/config/luci
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/luci
rename to openwrt/package/luci/host/etc/config/luci
diff --git a/openwrt/packages/luci/host/etc/config/luci_ethers b/openwrt/package/luci/host/etc/config/luci_ethers
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/luci_ethers
rename to openwrt/package/luci/host/etc/config/luci_ethers
diff --git a/openwrt/packages/luci/host/etc/config/luci_hosts b/openwrt/package/luci/host/etc/config/luci_hosts
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/luci_hosts
rename to openwrt/package/luci/host/etc/config/luci_hosts
diff --git a/openwrt/packages/luci/host/etc/config/luci_splash b/openwrt/package/luci/host/etc/config/luci_splash
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/luci_splash
rename to openwrt/package/luci/host/etc/config/luci_splash
diff --git a/openwrt/packages/luci/host/etc/config/luci_statistics b/openwrt/package/luci/host/etc/config/luci_statistics
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/luci_statistics
rename to openwrt/package/luci/host/etc/config/luci_statistics
diff --git a/openwrt/packages/luci/host/etc/config/lucittpd b/openwrt/package/luci/host/etc/config/lucittpd
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/lucittpd
rename to openwrt/package/luci/host/etc/config/lucittpd
diff --git a/openwrt/packages/luci/host/etc/config/network b/openwrt/package/luci/host/etc/config/network
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/network
rename to openwrt/package/luci/host/etc/config/network
diff --git a/openwrt/packages/luci/host/etc/config/ntpclient b/openwrt/package/luci/host/etc/config/ntpclient
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/ntpclient
rename to openwrt/package/luci/host/etc/config/ntpclient
diff --git a/openwrt/packages/luci/host/etc/config/qos b/openwrt/package/luci/host/etc/config/qos
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/qos
rename to openwrt/package/luci/host/etc/config/qos
diff --git a/openwrt/packages/luci/host/etc/config/siit b/openwrt/package/luci/host/etc/config/siit
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/siit
rename to openwrt/package/luci/host/etc/config/siit
diff --git a/openwrt/packages/luci/host/etc/config/system b/openwrt/package/luci/host/etc/config/system
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/system
rename to openwrt/package/luci/host/etc/config/system
diff --git a/openwrt/packages/luci/host/etc/config/ucitrack b/openwrt/package/luci/host/etc/config/ucitrack
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/ucitrack
rename to openwrt/package/luci/host/etc/config/ucitrack
diff --git a/openwrt/packages/luci/host/etc/config/upnpd b/openwrt/package/luci/host/etc/config/upnpd
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/upnpd
rename to openwrt/package/luci/host/etc/config/upnpd
diff --git a/openwrt/packages/luci/host/etc/config/wireless b/openwrt/package/luci/host/etc/config/wireless
similarity index 100%
rename from openwrt/packages/luci/host/etc/config/wireless
rename to openwrt/package/luci/host/etc/config/wireless
diff --git a/openwrt/packages/luci/host/etc/cron.minutely/luci_splash b/openwrt/package/luci/host/etc/cron.minutely/luci_splash
similarity index 100%
rename from openwrt/packages/luci/host/etc/cron.minutely/luci_splash
rename to openwrt/package/luci/host/etc/cron.minutely/luci_splash
diff --git a/openwrt/packages/luci/host/etc/firewall.freifunk b/openwrt/package/luci/host/etc/firewall.freifunk
similarity index 100%
rename from openwrt/packages/luci/host/etc/firewall.freifunk
rename to openwrt/package/luci/host/etc/firewall.freifunk
diff --git a/openwrt/packages/luci/host/etc/hotplug.d/iface/22-firewall-nat-fix b/openwrt/package/luci/host/etc/hotplug.d/iface/22-firewall-nat-fix
similarity index 100%
rename from openwrt/packages/luci/host/etc/hotplug.d/iface/22-firewall-nat-fix
rename to openwrt/package/luci/host/etc/hotplug.d/iface/22-firewall-nat-fix
diff --git a/openwrt/packages/luci/host/etc/init.d/boa b/openwrt/package/luci/host/etc/init.d/boa
similarity index 100%
rename from openwrt/packages/luci/host/etc/init.d/boa
rename to openwrt/package/luci/host/etc/init.d/boa
diff --git a/openwrt/packages/luci/host/etc/init.d/freifunk b/openwrt/package/luci/host/etc/init.d/freifunk
similarity index 100%
rename from openwrt/packages/luci/host/etc/init.d/freifunk
rename to openwrt/package/luci/host/etc/init.d/freifunk
diff --git a/openwrt/packages/luci/host/etc/init.d/luci_ethers b/openwrt/package/luci/host/etc/init.d/luci_ethers
similarity index 100%
rename from openwrt/packages/luci/host/etc/init.d/luci_ethers
rename to openwrt/package/luci/host/etc/init.d/luci_ethers
diff --git a/openwrt/packages/luci/host/etc/init.d/luci_hosts b/openwrt/package/luci/host/etc/init.d/luci_hosts
similarity index 100%
rename from openwrt/packages/luci/host/etc/init.d/luci_hosts
rename to openwrt/package/luci/host/etc/init.d/luci_hosts
diff --git a/openwrt/packages/luci/host/etc/init.d/luci_splash b/openwrt/package/luci/host/etc/init.d/luci_splash
similarity index 100%
rename from openwrt/packages/luci/host/etc/init.d/luci_splash
rename to openwrt/package/luci/host/etc/init.d/luci_splash
diff --git a/openwrt/packages/luci/host/etc/init.d/luci_statistics b/openwrt/package/luci/host/etc/init.d/luci_statistics
similarity index 100%
rename from openwrt/packages/luci/host/etc/init.d/luci_statistics
rename to openwrt/package/luci/host/etc/init.d/luci_statistics
diff --git a/openwrt/packages/luci/host/etc/init.d/lucittpd b/openwrt/package/luci/host/etc/init.d/lucittpd
similarity index 100%
rename from openwrt/packages/luci/host/etc/init.d/lucittpd
rename to openwrt/package/luci/host/etc/init.d/lucittpd
diff --git a/openwrt/packages/luci/host/etc/lpk.conf b/openwrt/package/luci/host/etc/lpk.conf
similarity index 100%
rename from openwrt/packages/luci/host/etc/lpk.conf
rename to openwrt/package/luci/host/etc/lpk.conf
diff --git a/openwrt/packages/luci/host/etc/mime.types b/openwrt/package/luci/host/etc/mime.types
similarity index 100%
rename from openwrt/packages/luci/host/etc/mime.types
rename to openwrt/package/luci/host/etc/mime.types
diff --git a/openwrt/packages/luci/host/etc/rc.local b/openwrt/package/luci/host/etc/rc.local
similarity index 100%
rename from openwrt/packages/luci/host/etc/rc.local
rename to openwrt/package/luci/host/etc/rc.local
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/ddns b/openwrt/package/luci/host/lib/uci/schema/default/ddns
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/ddns
rename to openwrt/package/luci/host/lib/uci/schema/default/ddns
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/dhcp b/openwrt/package/luci/host/lib/uci/schema/default/dhcp
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/dhcp
rename to openwrt/package/luci/host/lib/uci/schema/default/dhcp
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/dropbear b/openwrt/package/luci/host/lib/uci/schema/default/dropbear
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/dropbear
rename to openwrt/package/luci/host/lib/uci/schema/default/dropbear
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/firewall b/openwrt/package/luci/host/lib/uci/schema/default/firewall
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/firewall
rename to openwrt/package/luci/host/lib/uci/schema/default/firewall
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/fstab b/openwrt/package/luci/host/lib/uci/schema/default/fstab
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/fstab
rename to openwrt/package/luci/host/lib/uci/schema/default/fstab
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/httpd b/openwrt/package/luci/host/lib/uci/schema/default/httpd
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/httpd
rename to openwrt/package/luci/host/lib/uci/schema/default/httpd
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/luci_hosts b/openwrt/package/luci/host/lib/uci/schema/default/luci_hosts
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/luci_hosts
rename to openwrt/package/luci/host/lib/uci/schema/default/luci_hosts
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/luci_splash b/openwrt/package/luci/host/lib/uci/schema/default/luci_splash
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/luci_splash
rename to openwrt/package/luci/host/lib/uci/schema/default/luci_splash
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/network b/openwrt/package/luci/host/lib/uci/schema/default/network
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/network
rename to openwrt/package/luci/host/lib/uci/schema/default/network
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/ntpclient b/openwrt/package/luci/host/lib/uci/schema/default/ntpclient
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/ntpclient
rename to openwrt/package/luci/host/lib/uci/schema/default/ntpclient
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/qos b/openwrt/package/luci/host/lib/uci/schema/default/qos
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/qos
rename to openwrt/package/luci/host/lib/uci/schema/default/qos
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/samba b/openwrt/package/luci/host/lib/uci/schema/default/samba
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/samba
rename to openwrt/package/luci/host/lib/uci/schema/default/samba
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/system b/openwrt/package/luci/host/lib/uci/schema/default/system
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/system
rename to openwrt/package/luci/host/lib/uci/schema/default/system
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/upnpd b/openwrt/package/luci/host/lib/uci/schema/default/upnpd
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/upnpd
rename to openwrt/package/luci/host/lib/uci/schema/default/upnpd
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/uvc-streamer b/openwrt/package/luci/host/lib/uci/schema/default/uvc-streamer
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/uvc-streamer
rename to openwrt/package/luci/host/lib/uci/schema/default/uvc-streamer
diff --git a/openwrt/packages/luci/host/lib/uci/schema/default/wireless b/openwrt/package/luci/host/lib/uci/schema/default/wireless
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/default/wireless
rename to openwrt/package/luci/host/lib/uci/schema/default/wireless
diff --git a/openwrt/packages/luci/host/lib/uci/schema/meta/schema b/openwrt/package/luci/host/lib/uci/schema/meta/schema
similarity index 100%
rename from openwrt/packages/luci/host/lib/uci/schema/meta/schema
rename to openwrt/package/luci/host/lib/uci/schema/meta/schema
diff --git a/openwrt/packages/luci/host/luci b/openwrt/package/luci/host/luci
similarity index 100%
rename from openwrt/packages/luci/host/luci
rename to openwrt/package/luci/host/luci
diff --git a/openwrt/packages/luci/host/sbin/luci-flash b/openwrt/package/luci/host/sbin/luci-flash
similarity index 100%
rename from openwrt/packages/luci/host/sbin/luci-flash
rename to openwrt/package/luci/host/sbin/luci-flash
diff --git a/openwrt/packages/luci/host/sbin/luci-reload b/openwrt/package/luci/host/sbin/luci-reload
similarity index 100%
rename from openwrt/packages/luci/host/sbin/luci-reload
rename to openwrt/package/luci/host/sbin/luci-reload
diff --git a/openwrt/packages/luci/host/tmp/.uci/luci b/openwrt/package/luci/host/tmp/.uci/luci
similarity index 100%
rename from openwrt/packages/luci/host/tmp/.uci/luci
rename to openwrt/package/luci/host/tmp/.uci/luci
diff --git a/openwrt/packages/luci/host/usr/bin/boa b/openwrt/package/luci/host/usr/bin/boa
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/boa
rename to openwrt/package/luci/host/usr/bin/boa
diff --git a/openwrt/packages/luci/host/usr/bin/boa_indexer b/openwrt/package/luci/host/usr/bin/boa_indexer
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/boa_indexer
rename to openwrt/package/luci/host/usr/bin/boa_indexer
diff --git a/openwrt/packages/luci/host/usr/bin/lpk b/openwrt/package/luci/host/usr/bin/lpk
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/lpk
rename to openwrt/package/luci/host/usr/bin/lpk
diff --git a/openwrt/packages/luci/host/usr/bin/luci-splashd b/openwrt/package/luci/host/usr/bin/luci-splashd
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/luci-splashd
rename to openwrt/package/luci/host/usr/bin/luci-splashd
diff --git a/openwrt/packages/luci/host/usr/bin/lucittpd b/openwrt/package/luci/host/usr/bin/lucittpd
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/lucittpd
rename to openwrt/package/luci/host/usr/bin/lucittpd
diff --git a/openwrt/packages/luci/host/usr/bin/stat-genconfig b/openwrt/package/luci/host/usr/bin/stat-genconfig
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/stat-genconfig
rename to openwrt/package/luci/host/usr/bin/stat-genconfig
diff --git a/openwrt/packages/luci/host/usr/bin/uci b/openwrt/package/luci/host/usr/bin/uci
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/uci
rename to openwrt/package/luci/host/usr/bin/uci
diff --git a/openwrt/packages/luci/host/usr/bin/uvl b/openwrt/package/luci/host/usr/bin/uvl
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/uvl
rename to openwrt/package/luci/host/usr/bin/uvl
diff --git a/openwrt/packages/luci/host/usr/bin/uvlc b/openwrt/package/luci/host/usr/bin/uvlc
similarity index 100%
rename from openwrt/packages/luci/host/usr/bin/uvlc
rename to openwrt/package/luci/host/usr/bin/uvlc
diff --git a/openwrt/packages/luci/host/usr/include/uci.h b/openwrt/package/luci/host/usr/include/uci.h
similarity index 100%
rename from openwrt/packages/luci/host/usr/include/uci.h
rename to openwrt/package/luci/host/usr/include/uci.h
diff --git a/openwrt/packages/luci/host/usr/include/uci_config.h b/openwrt/package/luci/host/usr/include/uci_config.h
similarity index 100%
rename from openwrt/packages/luci/host/usr/include/uci_config.h
rename to openwrt/package/luci/host/usr/include/uci_config.h
diff --git a/openwrt/packages/luci/host/usr/include/uci_list.h b/openwrt/package/luci/host/usr/include/uci_list.h
similarity index 100%
rename from openwrt/packages/luci/host/usr/include/uci_list.h
rename to openwrt/package/luci/host/usr/include/uci_list.h
diff --git a/openwrt/packages/luci/host/usr/include/ucimap.h b/openwrt/package/luci/host/usr/include/ucimap.h
similarity index 100%
rename from openwrt/packages/luci/host/usr/include/ucimap.h
rename to openwrt/package/luci/host/usr/include/ucimap.h
diff --git a/openwrt/packages/luci/host/usr/lib/boa/luci.lua b/openwrt/package/luci/host/usr/lib/boa/luci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/boa/luci.lua
rename to openwrt/package/luci/host/usr/lib/boa/luci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/ltn12.lua b/openwrt/package/luci/host/usr/lib/lua/ltn12.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/ltn12.lua
rename to openwrt/package/luci/host/usr/lib/lua/ltn12.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/config.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/config.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/config.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/config.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/debug.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/debug.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/debug.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/debug.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/formatter.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/formatter.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/formatter.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/formatter.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/constant.lp b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/constant.lp
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/constant.lp
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/constant.lp
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/file.lp b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/file.lp
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/file.lp
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/file.lp
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/function.lp b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/function.lp
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/function.lp
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/function.lp
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/index.lp b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/index.lp
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/index.lp
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/index.lp
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/luadoc.css b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/luadoc.css
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/luadoc.css
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/luadoc.css
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/menu.lp b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/menu.lp
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/menu.lp
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/menu.lp
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/module.lp b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/module.lp
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/module.lp
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/module.lp
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/table.lp b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/table.lp
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/html/table.lp
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/html/table.lp
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/raw.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/raw.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/doclet/raw.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/doclet/raw.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/init.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/init.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/init.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/init.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/lp.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/lp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/lp.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/lp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/taglet/standard.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/taglet/standard.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/taglet/standard.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/taglet/standard.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/taglet/standard/tags.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/taglet/standard/tags.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/taglet/standard/tags.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/taglet/standard/tags.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luadoc/util.lua b/openwrt/package/luci/host/usr/lib/lua/luadoc/util.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luadoc/util.lua
rename to openwrt/package/luci/host/usr/lib/lua/luadoc/util.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/cacheloader.lua b/openwrt/package/luci/host/usr/lib/lua/luci/cacheloader.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/cacheloader.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/cacheloader.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/cbi.lua b/openwrt/package/luci/host/usr/lib/lua/luci/cbi.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/cbi.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/cbi.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/ccache.lua b/openwrt/package/luci/host/usr/lib/lua/luci/ccache.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/ccache.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/ccache.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/config.lua b/openwrt/package/luci/host/usr/lib/lua/luci/config.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/config.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/config.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/filebrowser.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/filebrowser.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/filebrowser.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/filebrowser.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/index.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/index.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/index.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/index.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/network.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/network.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/network.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/network.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/services.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/services.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/services.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/services.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/status.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/status.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/status.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/status.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/system.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/system.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/system.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/system.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/uci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/uci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/admin/uci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/admin/uci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/ddns.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/ddns.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/ddns.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/ddns.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/ffwizard.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/ffwizard.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/ffwizard.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/ffwizard.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/freifunk/freifunk.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/freifunk/freifunk.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/freifunk/freifunk.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/freifunk/freifunk.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/hd_idle.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/hd_idle.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/hd_idle.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/hd_idle.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/init.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/init.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/init.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/init.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/livestats.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/livestats.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/livestats.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/livestats.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/luci_fw/luci_fw.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/luci_fw/luci_fw.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/luci_fw/luci_fw.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/luci_fw/luci_fw.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/luci_statistics/luci_statistics.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/luci_statistics/luci_statistics.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/luci_statistics/luci_statistics.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/luci_statistics/luci_statistics.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/mini/index.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/mini/index.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/mini/index.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/mini/index.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/mini/network.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/mini/network.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/mini/network.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/mini/network.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/mini/system.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/mini/system.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/mini/system.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/mini/system.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/mmc_over_gpio.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/mmc_over_gpio.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/mmc_over_gpio.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/mmc_over_gpio.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/ntpc.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/ntpc.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/ntpc.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/ntpc.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/olsr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/olsr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/olsr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/olsr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/p910nd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/p910nd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/p910nd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/p910nd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/polipo.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/polipo.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/polipo.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/polipo.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/qos.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/qos.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/qos.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/qos.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/rpc.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/rpc.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/rpc.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/rpc.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/samba.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/samba.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/samba.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/samba.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/siitwizard.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/siitwizard.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/siitwizard.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/siitwizard.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/splash/splash.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/splash/splash.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/splash/splash.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/splash/splash.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/tinyproxy.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/tinyproxy.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/tinyproxy.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/tinyproxy.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/upnp.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/upnp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/upnp.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/upnp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/ushare.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/ushare.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/ushare.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/ushare.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/controller/uvc_streamer.lua b/openwrt/package/luci/host/usr/lib/lua/luci/controller/uvc_streamer.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/controller/uvc_streamer.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/controller/uvc_streamer.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/debug.lua b/openwrt/package/luci/host/usr/lib/lua/luci/debug.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/debug.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/debug.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/dispatcher.lua b/openwrt/package/luci/host/usr/lib/lua/luci/dispatcher.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/dispatcher.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/dispatcher.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/fs.lua b/openwrt/package/luci/host/usr/lib/lua/luci/fs.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/fs.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/fs.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/http.lua b/openwrt/package/luci/host/usr/lib/lua/luci/http.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/http.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/http.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol.lua b/openwrt/package/luci/host/usr/lib/lua/luci/http/protocol.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/http/protocol.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol/conditionals.lua b/openwrt/package/luci/host/usr/lib/lua/luci/http/protocol/conditionals.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol/conditionals.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/http/protocol/conditionals.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol/date.lua b/openwrt/package/luci/host/usr/lib/lua/luci/http/protocol/date.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol/date.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/http/protocol/date.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol/mime.lua b/openwrt/package/luci/host/usr/lib/lua/luci/http/protocol/mime.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/http/protocol/mime.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/http/protocol/mime.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/httpd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/httpd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/httpd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/httpd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/httpd/handler/file.lua b/openwrt/package/luci/host/usr/lib/lua/luci/httpd/handler/file.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/httpd/handler/file.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/httpd/handler/file.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/httpd/handler/luci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/httpd/handler/luci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/httpd/handler/luci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/httpd/handler/luci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/httpd/module.lua b/openwrt/package/luci/host/usr/lib/lua/luci/httpd/module.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/httpd/module.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/httpd/module.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/httpd/server.lua b/openwrt/package/luci/host/usr/lib/lua/luci/httpd/server.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/httpd/server.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/httpd/server.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.it.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.it.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.it.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.it.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.ru.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.ru.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/admin-core.ru.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/admin-core.ru.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.it.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.it.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.it.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.it.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.ru.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.ru.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/cbi.ru.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/cbi.ru.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ddns.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ddns.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.it.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.it.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.it.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.it.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.ru.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.ru.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/default.ru.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/default.ru.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/freifunk.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/freifunk.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/freifunk.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/freifunk.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/freifunk.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/freifunk.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/freifunk.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/freifunk.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/hd_idle.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/hd_idle.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/hd_idle.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/hd_idle.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/hd_idle.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/hd_idle.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/hd_idle.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/hd_idle.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/hd_idle.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/hd_idle.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/hd_idle.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/hd_idle.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/initmgr.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/initmgr.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/initmgr.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/initmgr.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/initmgr.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/initmgr.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/initmgr.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/initmgr.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/initmgr.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/initmgr.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/initmgr.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/initmgr.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/livestats.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/livestats.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/livestats.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/livestats.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/livestats.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/livestats.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/livestats.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/livestats.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/luci-fw.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/luci-fw.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/mmc_over_gpio.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ntpc.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ntpc.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ntpc.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ntpc.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ntpc.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ntpc.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ntpc.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ntpc.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ntpc.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ntpc.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ntpc.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ntpc.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/olsr.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/olsr.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/olsr.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/olsr.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/olsr.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/olsr.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/olsr.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/olsr.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/p910nd.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/p910nd.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/p910nd.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/p910nd.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/p910nd.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/p910nd.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/p910nd.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/p910nd.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/p910nd.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/p910nd.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/p910nd.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/p910nd.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/polipo.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/polipo.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/polipo.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/polipo.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/qos.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/qos.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.xml.hide b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.xml.hide
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.xml.hide
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.de.xml.hide
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.xml.hide b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.xml.hide
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.xml.hide
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.en.xml.hide
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.xml.hide b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.xml.hide
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.xml.hide
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/rrdtool.pt-br.xml.hide
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/samba.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/samba.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/samba.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/samba.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/samba.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/samba.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/samba.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/samba.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/samba.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/samba.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/samba.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/samba.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/statistics.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/statistics.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/statistics.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/statistics.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/statistics.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/statistics.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/statistics.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/statistics.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/statistics.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/statistics.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/statistics.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/statistics.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.it.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.it.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.it.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.it.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.ru.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.ru.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/sysauth.ru.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/sysauth.ru.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/tinyproxy.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/tinyproxy.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/upnp.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/upnp.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/upnp.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/upnp.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/upnp.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/upnp.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/upnp.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/upnp.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/upnp.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/upnp.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/upnp.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/upnp.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ushare.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ushare.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ushare.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ushare.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ushare.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ushare.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ushare.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ushare.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ushare.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/ushare.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/ushare.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/ushare.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.fr.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.fr.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.fr.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.fr.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvc_streamer.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvl.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvl.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvl.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvl.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvl.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvl.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvl.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvl.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvl.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvl.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/uvl.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/uvl.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.de.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.de.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.de.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.de.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.en.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.en.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.en.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.en.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.it.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.it.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.it.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.it.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.pt-br.lua b/openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/i18n/wifi.pt-br.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/i18n/wifi.pt-br.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/init.lua b/openwrt/package/luci/host/usr/lib/lua/luci/init.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/init.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/init.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/ip.lua b/openwrt/package/luci/host/usr/lib/lua/luci/ip.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/ip.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/ip.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/json.lua b/openwrt/package/luci/host/usr/lib/lua/luci/json.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/json.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/json.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/jsonrpc.lua b/openwrt/package/luci/host/usr/lib/lua/luci/jsonrpc.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/jsonrpc.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/jsonrpc.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/jsonrpcbind/uci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/jsonrpcbind/uci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/jsonrpcbind/uci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/jsonrpcbind/uci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/jsonrpcbind/uvl.lua b/openwrt/package/luci/host/usr/lib/lua/luci/jsonrpcbind/uvl.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/jsonrpcbind/uvl.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/jsonrpcbind/uvl.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk/core.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk/core.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/download.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/download.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/download.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/download.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/install.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/install.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/install.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/install.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/resolve.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/resolve.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/resolve.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/resolve.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/retrieve.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/retrieve.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/retrieve.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/retrieve.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/unpack.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/unpack.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk/core/unpack.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk/core/unpack.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/lpk/util.lua b/openwrt/package/luci/host/usr/lib/lua/luci/lpk/util.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/lpk/util.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/lpk/util.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/ltn12.lua b/openwrt/package/luci/host/usr/lib/lua/luci/ltn12.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/ltn12.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/ltn12.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_index/luci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_index/luci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_index/luci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_index/luci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/conntrack.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/conntrack.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/conntrack.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/conntrack.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcp.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcp.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcpleases.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcpleases.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcpleases.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/dhcpleases.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/hosts.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/hosts.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/hosts.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/hosts.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/ifaces.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/ifaces.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/ifaces.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/ifaces.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/network.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/network.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/network.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/network.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/routes.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/routes.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/routes.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/routes.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/vlan.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/vlan.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/vlan.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/vlan.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wifi.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wifi.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wifi.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wifi.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wireless.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wireless.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wireless.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_network/wireless.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/crontab.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/crontab.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/crontab.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/crontab.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dnsmasq.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dnsmasq.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dnsmasq.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dnsmasq.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dropbear.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dropbear.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dropbear.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/dropbear.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/httpd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/httpd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/httpd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/httpd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/lucittpd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/lucittpd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_services/lucittpd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_services/lucittpd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/buttons.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/buttons.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/buttons.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/buttons.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/fstab.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/fstab.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/fstab.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/fstab.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/ipkg.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/ipkg.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/ipkg.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/ipkg.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/leds.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/leds.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/leds.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/leds.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/passwd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/passwd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/passwd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/passwd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/processes.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/processes.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/processes.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/processes.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/sshkeys.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/sshkeys.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/sshkeys.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/sshkeys.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/system.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/system.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/admin_system/system.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/admin_system/system.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddns.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddns.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddns.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddns.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddnsmini.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddnsmini.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddnsmini.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ddns/ddnsmini.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ffwizard.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ffwizard.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ffwizard.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ffwizard.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/freifunk/contact.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/freifunk/contact.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/freifunk/contact.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/freifunk/contact.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/freifunk/freifunk.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/freifunk/freifunk.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/freifunk/freifunk.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/freifunk/freifunk.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/freifunk/public_status.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/freifunk/public_status.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/freifunk/public_status.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/freifunk/public_status.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/hd_idle.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/hd_idle.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/hd_idle.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/hd_idle.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/init/init.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/init/init.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/init/init.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/init/init.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/miniportfw.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/miniportfw.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/miniportfw.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/miniportfw.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/redirect.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/redirect.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/redirect.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/redirect.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/rrule.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/rrule.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/rrule.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/rrule.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/traffic.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/traffic.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/traffic.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/traffic.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/trule.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/trule.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/trule.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/trule.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/zones.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/zones.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/zones.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_fw/zones.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/collectd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/collectd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/collectd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/collectd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/cpu.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/cpu.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/cpu.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/cpu.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/csv.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/csv.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/csv.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/csv.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/df.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/df.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/df.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/df.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/disk.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/disk.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/disk.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/disk.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/dns.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/dns.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/dns.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/dns.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/email.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/email.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/email.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/email.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/exec.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/exec.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/exec.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/exec.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/interface.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/interface.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/interface.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/interface.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/iptables.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/iptables.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/iptables.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/iptables.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/irq.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/irq.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/irq.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/irq.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/load.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/load.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/load.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/load.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/netlink.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/netlink.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/netlink.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/netlink.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/network.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/network.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/network.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/network.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/ping.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/ping.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/ping.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/ping.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/processes.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/processes.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/processes.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/processes.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/rrdtool.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/rrdtool.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/rrdtool.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/rrdtool.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/tcpconns.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/tcpconns.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/tcpconns.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/tcpconns.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/unixsock.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/unixsock.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/unixsock.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/unixsock.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/wireless.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/wireless.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/wireless.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/luci_statistics/wireless.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/dhcp.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/dhcp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/dhcp.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/dhcp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/index.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/index.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/index.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/index.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/luci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/luci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/luci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/luci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/network.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/network.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/network.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/network.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/passwd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/passwd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/passwd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/passwd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/system.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/system.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/system.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/system.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/wifi.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/wifi.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mini/wifi.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mini/wifi.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mmc_over_gpio.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mmc_over_gpio.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/mmc_over_gpio.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/mmc_over_gpio.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpc.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpc.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpc.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpc.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpcmini.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpcmini.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpcmini.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ntpc/ntpcmini.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdhna.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdhna.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdhna.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdhna.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdplugins.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdplugins.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdplugins.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/olsr/olsrdplugins.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/p910nd.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/p910nd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/p910nd.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/p910nd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/polipo.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/polipo.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/polipo.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/polipo.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/qos/qos.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/qos/qos.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/qos/qos.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/qos/qos.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/qos/qosmini.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/qos/qosmini.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/qos/qosmini.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/qos/qosmini.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/samba.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/samba.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/samba.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/samba.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/siitwizard.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/siitwizard.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/siitwizard.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/siitwizard.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/splash/splash.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/splash/splash.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/splash/splash.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/splash/splash.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/tinyproxy.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/tinyproxy.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/tinyproxy.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/tinyproxy.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnp.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnp.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnpmini.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnpmini.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnpmini.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/upnp/upnpmini.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ushare.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ushare.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/ushare.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/ushare.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/uvc_streamer.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/uvc_streamer.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/cbi/uvc_streamer.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/cbi/uvc_streamer.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/ipkg.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/ipkg.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/ipkg.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/ipkg.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/model/uci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/model/uci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/model/uci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/model/uci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/sauth.lua b/openwrt/package/luci/host/usr/lib/lua/luci/sauth.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/sauth.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/sauth.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/sgi/cgi.lua b/openwrt/package/luci/host/usr/lib/lua/luci/sgi/cgi.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/sgi/cgi.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/sgi/cgi.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/sgi/webuci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/sgi/webuci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/sgi/webuci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/sgi/webuci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/sgi/wsapi.lua b/openwrt/package/luci/host/usr/lib/lua/luci/sgi/wsapi.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/sgi/wsapi.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/sgi/wsapi.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/datatree.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/datatree.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/datatree.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/datatree.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/i18n.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/i18n.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/i18n.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/i18n.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/colors.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/colors.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/colors.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/colors.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/cpu/cpu.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/cpu/cpu.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/cpu/cpu.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/cpu/cpu.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/df/df.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/df/df.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/df/df.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/df/df.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/interface.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/interface.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/interface.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/interface.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_bytes.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_bytes.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_bytes.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_bytes.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_packets.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_packets.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_packets.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/iptables/ipt_packets.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/irq/irq.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/irq/irq.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/irq/irq.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/irq/irq.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/load/load.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/load/load.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/load/load.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/load/load.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/netlink.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/netlink.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/netlink.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/netlink.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/ping/ping.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/ping/ping.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/ping/ping.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/ping/ping.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/processes.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/processes.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/processes.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/processes.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/wireless.lua b/openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/wireless.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/wireless.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/statistics/rrdtool/definitions/wireless.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/sys.lua b/openwrt/package/luci/host/usr/lib/lua/luci/sys.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/sys.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/sys.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/sys/iptparser.lua b/openwrt/package/luci/host/usr/lib/lua/luci/sys/iptparser.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/sys/iptparser.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/sys/iptparser.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/sys/zoneinfo.lua b/openwrt/package/luci/host/usr/lib/lua/luci/sys/zoneinfo.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/sys/zoneinfo.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/sys/zoneinfo.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/template.lua b/openwrt/package/luci/host/usr/lib/lua/luci/template.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/template.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/template.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/tools/ffwizard.lua b/openwrt/package/luci/host/usr/lib/lua/luci/tools/ffwizard.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/tools/ffwizard.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/tools/ffwizard.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/tools/webadmin.lua b/openwrt/package/luci/host/usr/lib/lua/luci/tools/webadmin.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/tools/webadmin.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/tools/webadmin.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/handler/file.lua b/openwrt/package/luci/host/usr/lib/lua/luci/ttpd/handler/file.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/handler/file.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/ttpd/handler/file.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/handler/luci.lua b/openwrt/package/luci/host/usr/lib/lua/luci/ttpd/handler/luci.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/handler/luci.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/ttpd/handler/luci.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/module.lua b/openwrt/package/luci/host/usr/lib/lua/luci/ttpd/module.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/module.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/ttpd/module.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/server.lua b/openwrt/package/luci/host/usr/lib/lua/luci/ttpd/server.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/ttpd/server.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/ttpd/server.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/util.lua b/openwrt/package/luci/host/usr/lib/lua/luci/util.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/util.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/util.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvl.lua b/openwrt/package/luci/host/usr/lib/lua/luci/uvl.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvl.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvl.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvl/datatypes.lua b/openwrt/package/luci/host/usr/lib/lua/luci/uvl/datatypes.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvl/datatypes.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvl/datatypes.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvl/dependencies.lua b/openwrt/package/luci/host/usr/lib/lua/luci/uvl/dependencies.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvl/dependencies.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvl/dependencies.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvl/errors.lua b/openwrt/package/luci/host/usr/lib/lua/luci/uvl/errors.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvl/errors.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvl/errors.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvl/validation.lua b/openwrt/package/luci/host/usr/lib/lua/luci/uvl/validation.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvl/validation.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvl/validation.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/footer.xml b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/footer.xml
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/footer.xml
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/footer.xml
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/header.xml b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/header.xml
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/header.xml
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/header.xml
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/index.xml b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/index.xml
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/index.xml
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/index.xml
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/menu.xml b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/menu.xml
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/menu.xml
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/menu.xml
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/scheme.xml b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/scheme.xml
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/scheme.xml
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/scheme.xml
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/section.xml b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/section.xml
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/section.xml
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/section.xml
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/uvldoc.css b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/uvldoc.css
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/uvldoc.css
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/proto/xhtml/uvldoc.css
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/renderer.lua b/openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/renderer.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/uvldoc/renderer.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/uvldoc/renderer.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/version.lua b/openwrt/package/luci/host/usr/lib/lua/luci/version.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/version.lua
rename to openwrt/package/luci/host/usr/lib/lua/luci/version.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/about.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/about.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/about.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/about.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_index/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_index/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_index/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_index/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_services/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_services/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_services/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_services/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/networkplugins.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/networkplugins.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/networkplugins.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/networkplugins.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/outputplugins.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/outputplugins.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/outputplugins.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/outputplugins.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/systemplugins.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/systemplugins.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_statistics/systemplugins.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_statistics/systemplugins.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_status/dmesg.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_status/dmesg.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_status/dmesg.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_status/dmesg.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_status/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_status/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_status/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_status/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_status/syslog.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_status/syslog.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_status/syslog.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_status/syslog.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/applyreboot.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/applyreboot.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/applyreboot.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/applyreboot.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/backup.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/backup.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/backup.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/backup.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/ipkg.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/ipkg.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/ipkg.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/ipkg.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/packages.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/packages.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/packages.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/packages.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/reboot.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/reboot.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/reboot.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/reboot.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/upgrade.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/upgrade.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_system/upgrade.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_system/upgrade.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_uci/apply.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_uci/apply.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_uci/apply.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_uci/apply.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_uci/changes.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_uci/changes.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_uci/changes.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_uci/changes.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_uci/revert.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/admin_uci/revert.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/admin_uci/revert.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/admin_uci/revert.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/browser.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/browser.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/browser.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/browser.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/button.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/button.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/button.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/button.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/cell_valuefooter.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/cell_valuefooter.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/cell_valuefooter.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/cell_valuefooter.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/cell_valueheader.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/cell_valueheader.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/cell_valueheader.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/cell_valueheader.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/dvalue.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/dvalue.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/dvalue.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/dvalue.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/dynlist.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/dynlist.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/dynlist.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/dynlist.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/filebrowser.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/filebrowser.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/filebrowser.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/filebrowser.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/full_valuefooter.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/full_valuefooter.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/full_valuefooter.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/full_valuefooter.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/full_valueheader.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/full_valueheader.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/full_valueheader.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/full_valueheader.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/fvalue.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/fvalue.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/fvalue.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/fvalue.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/lvalue.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/lvalue.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/lvalue.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/lvalue.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/map.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/map.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/map.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/map.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/mvalue.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/mvalue.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/mvalue.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/mvalue.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/nsection.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/nsection.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/nsection.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/nsection.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/nullsection.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/nullsection.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/nullsection.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/nullsection.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/simpleform.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/simpleform.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/simpleform.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/simpleform.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/tblsection.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/tblsection.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/tblsection.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/tblsection.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/tsection.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/tsection.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/tsection.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/tsection.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/tvalue.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/tvalue.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/tvalue.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/tvalue.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/ucisection.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/ucisection.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/ucisection.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/ucisection.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/upload.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/upload.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/upload.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/upload.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/value.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/value.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/value.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/value.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/valuefooter.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/valuefooter.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/valuefooter.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/valuefooter.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/valueheader.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/valueheader.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/cbi/valueheader.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/cbi/valueheader.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/error404.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/error404.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/error404.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/error404.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/error500.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/error500.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/error500.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/error500.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/freifunk/contact.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/freifunk/contact.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/freifunk/contact.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/freifunk/contact.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/freifunk/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/freifunk/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/freifunk/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/freifunk/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/indexer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/indexer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/indexer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/indexer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/livestats/loadavg.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/livestats/loadavg.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/livestats/loadavg.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/livestats/loadavg.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/livestats/traffic.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/livestats/traffic.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/livestats/traffic.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/livestats/traffic.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/livestats/wireless.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/livestats/wireless.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/livestats/wireless.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/livestats/wireless.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/applyreboot.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/mini/applyreboot.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/applyreboot.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/mini/applyreboot.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/backup.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/mini/backup.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/backup.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/mini/backup.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/mini/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/mini/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/reboot.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/mini/reboot.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/reboot.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/mini/reboot.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/upgrade.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/mini/upgrade.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/mini/upgrade.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/mini/upgrade.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/public_statistics/graph.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/public_statistics/graph.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/public_statistics/graph.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/public_statistics/graph.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/splash/splash.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/splash/splash.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/splash/splash.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/splash/splash.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/splash_splash/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/splash_splash/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/splash_splash/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/splash_splash/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/splash_splash/splash.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/splash_splash/splash.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/splash_splash/splash.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/splash_splash/splash.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/error_olsr.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/error_olsr.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/error_olsr.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/error_olsr.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/hna.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/hna.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/hna.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/hna.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/index.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/index.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/index.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/index.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/mid.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/mid.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/mid.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/mid.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/routes.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/routes.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/routes.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/routes.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/topology.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/topology.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/status-olsr/topology.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/status-olsr/topology.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/sysauth.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/sysauth.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/sysauth.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/sysauth.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/fledermaus/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/fledermaus/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/fledermaus/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/fledermaus/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/fledermaus/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/fledermaus/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/fledermaus/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/fledermaus/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk-bno/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/freifunk/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/freifunk/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt-light/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/dashboard.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/dashboard.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/dashboard.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/dashboard.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/indexer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/indexer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/indexer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org-oxygen/indexer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/openwrt.org/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/dashboard.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/dashboard.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/dashboard.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/dashboard.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/footer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/footer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/footer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/footer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/header.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/header.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/header.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/header.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/indexer.htm b/openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/indexer.htm
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/luci/view/themes/oxygen/indexer.htm
rename to openwrt/package/luci/host/usr/lib/lua/luci/view/themes/oxygen/indexer.htm
diff --git a/openwrt/packages/luci/host/usr/lib/lua/mime.lua b/openwrt/package/luci/host/usr/lib/lua/mime.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/mime.lua
rename to openwrt/package/luci/host/usr/lib/lua/mime.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/socket.lua b/openwrt/package/luci/host/usr/lib/lua/socket.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/socket.lua
rename to openwrt/package/luci/host/usr/lib/lua/socket.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/socket/ftp.lua b/openwrt/package/luci/host/usr/lib/lua/socket/ftp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/socket/ftp.lua
rename to openwrt/package/luci/host/usr/lib/lua/socket/ftp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/socket/http.lua b/openwrt/package/luci/host/usr/lib/lua/socket/http.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/socket/http.lua
rename to openwrt/package/luci/host/usr/lib/lua/socket/http.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/socket/smtp.lua b/openwrt/package/luci/host/usr/lib/lua/socket/smtp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/socket/smtp.lua
rename to openwrt/package/luci/host/usr/lib/lua/socket/smtp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/socket/tp.lua b/openwrt/package/luci/host/usr/lib/lua/socket/tp.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/socket/tp.lua
rename to openwrt/package/luci/host/usr/lib/lua/socket/tp.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lua/socket/url.lua b/openwrt/package/luci/host/usr/lib/lua/socket/url.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lua/socket/url.lua
rename to openwrt/package/luci/host/usr/lib/lua/socket/url.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lucittpd/plugins/httpd.lua b/openwrt/package/luci/host/usr/lib/lucittpd/plugins/httpd.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lucittpd/plugins/httpd.lua
rename to openwrt/package/luci/host/usr/lib/lucittpd/plugins/httpd.lua
diff --git a/openwrt/packages/luci/host/usr/lib/lucittpd/plugins/luci-webui.lua b/openwrt/package/luci/host/usr/lib/lucittpd/plugins/luci-webui.lua
similarity index 100%
rename from openwrt/packages/luci/host/usr/lib/lucittpd/plugins/luci-webui.lua
rename to openwrt/package/luci/host/usr/lib/lucittpd/plugins/luci-webui.lua
diff --git a/openwrt/packages/luci/host/usr/sbin/ff_olsr_test_gw b/openwrt/package/luci/host/usr/sbin/ff_olsr_test_gw
similarity index 100%
rename from openwrt/packages/luci/host/usr/sbin/ff_olsr_test_gw
rename to openwrt/package/luci/host/usr/sbin/ff_olsr_test_gw
diff --git a/openwrt/packages/luci/host/usr/sbin/luci-splash b/openwrt/package/luci/host/usr/sbin/luci-splash
similarity index 100%
rename from openwrt/packages/luci/host/usr/sbin/luci-splash
rename to openwrt/package/luci/host/usr/sbin/luci-splash
diff --git a/openwrt/packages/luci/host/usr/sbin/polipo_purge b/openwrt/package/luci/host/usr/sbin/polipo_purge
similarity index 100%
rename from openwrt/packages/luci/host/usr/sbin/polipo_purge
rename to openwrt/package/luci/host/usr/sbin/polipo_purge
diff --git a/openwrt/packages/luci/host/www/cgi-bin-nodes.html b/openwrt/package/luci/host/www/cgi-bin-nodes.html
similarity index 100%
rename from openwrt/packages/luci/host/www/cgi-bin-nodes.html
rename to openwrt/package/luci/host/www/cgi-bin-nodes.html
diff --git a/openwrt/packages/luci/host/www/cgi-bin-status.html b/openwrt/package/luci/host/www/cgi-bin-status.html
similarity index 100%
rename from openwrt/packages/luci/host/www/cgi-bin-status.html
rename to openwrt/package/luci/host/www/cgi-bin-status.html
diff --git a/openwrt/packages/luci/host/www/cgi-bin/luci b/openwrt/package/luci/host/www/cgi-bin/luci
similarity index 100%
rename from openwrt/packages/luci/host/www/cgi-bin/luci
rename to openwrt/package/luci/host/www/cgi-bin/luci
diff --git a/openwrt/packages/luci/host/www/index.html b/openwrt/package/luci/host/www/index.html
similarity index 100%
rename from openwrt/packages/luci/host/www/index.html
rename to openwrt/package/luci/host/www/index.html
diff --git a/openwrt/packages/luci/host/www/luci-static/fledermaus/cascade.css b/openwrt/package/luci/host/www/luci-static/fledermaus/cascade.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/fledermaus/cascade.css
rename to openwrt/package/luci/host/www/luci-static/fledermaus/cascade.css
diff --git a/openwrt/packages/luci/host/www/luci-static/fledermaus/fledermaus.png b/openwrt/package/luci/host/www/luci-static/fledermaus/fledermaus.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/fledermaus/fledermaus.png
rename to openwrt/package/luci/host/www/luci-static/fledermaus/fledermaus.png
diff --git a/openwrt/packages/luci/host/www/luci-static/fledermaus/logo.png b/openwrt/package/luci/host/www/luci-static/fledermaus/logo.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/fledermaus/logo.png
rename to openwrt/package/luci/host/www/luci-static/fledermaus/logo.png
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/cascade.css b/openwrt/package/luci/host/www/luci-static/freifunk-bno/cascade.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/cascade.css
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/cascade.css
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/bgoption.png b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/bgoption.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/bgoption.png
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/bgoption.png
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/favicon.ico b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/favicon.ico
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/favicon.ico
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/favicon.ico
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/header-back.gif b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/header-back.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/header-back.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/header-back.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/header-left.gif b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/header-left.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/header-left.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/header-left.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/header-right.gif b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/header-right.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/header-right.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/header-right.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/logo.gif b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/logo.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/logo.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/logo.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/main-back.png b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/main-back.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/main-back.png
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/main-back.png
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/schriftzug.gif b/openwrt/package/luci/host/www/luci-static/freifunk-bno/images/schriftzug.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk-bno/images/schriftzug.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk-bno/images/schriftzug.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/cascade.css b/openwrt/package/luci/host/www/luci-static/freifunk/cascade.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/cascade.css
rename to openwrt/package/luci/host/www/luci-static/freifunk/cascade.css
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/bgoption.png b/openwrt/package/luci/host/www/luci-static/freifunk/images/bgoption.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/bgoption.png
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/bgoption.png
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/favicon.ico b/openwrt/package/luci/host/www/luci-static/freifunk/images/favicon.ico
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/favicon.ico
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/favicon.ico
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/header-back.gif b/openwrt/package/luci/host/www/luci-static/freifunk/images/header-back.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/header-back.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/header-back.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/header-left.gif b/openwrt/package/luci/host/www/luci-static/freifunk/images/header-left.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/header-left.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/header-left.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/header-right.gif b/openwrt/package/luci/host/www/luci-static/freifunk/images/header-right.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/header-right.gif
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/header-right.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/logo.png b/openwrt/package/luci/host/www/luci-static/freifunk/images/logo.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/logo.png
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/logo.png
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/main-back.png b/openwrt/package/luci/host/www/luci-static/freifunk/images/main-back.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/main-back.png
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/main-back.png
diff --git a/openwrt/packages/luci/host/www/luci-static/freifunk/images/schriftzug.png b/openwrt/package/luci/host/www/luci-static/freifunk/images/schriftzug.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/freifunk/images/schriftzug.png
rename to openwrt/package/luci/host/www/luci-static/freifunk/images/schriftzug.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt-light/cascade.css b/openwrt/package/luci/host/www/luci-static/openwrt-light/cascade.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt-light/cascade.css
rename to openwrt/package/luci/host/www/luci-static/openwrt-light/cascade.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt-light/ie6.css b/openwrt/package/luci/host/www/luci-static/openwrt-light/ie6.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt-light/ie6.css
rename to openwrt/package/luci/host/www/luci-static/openwrt-light/ie6.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt-light/ie7.css b/openwrt/package/luci/host/www/luci-static/openwrt-light/ie7.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt-light/ie7.css
rename to openwrt/package/luci/host/www/luci-static/openwrt-light/ie7.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/bg.jpg b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/bg.jpg
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/bg.jpg
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/bg.jpg
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/cascade.css b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/cascade.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/cascade.css
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/cascade.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/dashboard.css b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/dashboard.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/dashboard.css
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/dashboard.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/header.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/header.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/header.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/header.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/datetime.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/datetime.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/datetime.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/datetime.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/default.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/default.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/default.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/default.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/desktop.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/desktop.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/desktop.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/desktop.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/flash.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/flash.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/flash.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/flash.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/freifunk.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/freifunk.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/freifunk.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/freifunk.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/harddisk.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/harddisk.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/harddisk.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/harddisk.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/key.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/key.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/key.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/key.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/lightbulb.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/lightbulb.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/lightbulb.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/lightbulb.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/login.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/login.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/login.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/login.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/logout.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/logout.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/logout.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/logout.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/network.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/network.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/network.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/network.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/overview.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/overview.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/overview.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/overview.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/package.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/package.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/package.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/package.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/restart.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/restart.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/restart.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/restart.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/services.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/services.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/services.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/services.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/shell.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/shell.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/shell.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/shell.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/stats.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/stats.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/stats.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/stats.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/status.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/status.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/status.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/status.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/switch.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/switch.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/switch.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/switch.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/system.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/system.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/system.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/system.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/worker.png b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/worker.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/icons/worker.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/icons/worker.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/ie6.css b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/ie6.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/ie6.css
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/ie6.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/ie7.css b/openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/ie7.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org-oxygen/ie7.css
rename to openwrt/package/luci/host/www/luci-static/openwrt.org-oxygen/ie7.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org/bg.jpg b/openwrt/package/luci/host/www/luci-static/openwrt.org/bg.jpg
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org/bg.jpg
rename to openwrt/package/luci/host/www/luci-static/openwrt.org/bg.jpg
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org/cascade.css b/openwrt/package/luci/host/www/luci-static/openwrt.org/cascade.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org/cascade.css
rename to openwrt/package/luci/host/www/luci-static/openwrt.org/cascade.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org/header.png b/openwrt/package/luci/host/www/luci-static/openwrt.org/header.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org/header.png
rename to openwrt/package/luci/host/www/luci-static/openwrt.org/header.png
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org/ie6.css b/openwrt/package/luci/host/www/luci-static/openwrt.org/ie6.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org/ie6.css
rename to openwrt/package/luci/host/www/luci-static/openwrt.org/ie6.css
diff --git a/openwrt/packages/luci/host/www/luci-static/openwrt.org/ie7.css b/openwrt/package/luci/host/www/luci-static/openwrt.org/ie7.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/openwrt.org/ie7.css
rename to openwrt/package/luci/host/www/luci-static/openwrt.org/ie7.css
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/bg.png b/openwrt/package/luci/host/www/luci-static/oxygen/bg.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/bg.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/bg.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/cascade.css b/openwrt/package/luci/host/www/luci-static/oxygen/cascade.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/cascade.css
rename to openwrt/package/luci/host/www/luci-static/oxygen/cascade.css
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/dashboard.css b/openwrt/package/luci/host/www/luci-static/oxygen/dashboard.css
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/dashboard.css
rename to openwrt/package/luci/host/www/luci-static/oxygen/dashboard.css
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/flukso.png b/openwrt/package/luci/host/www/luci-static/oxygen/flukso.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/flukso.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/flukso.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/footer.png b/openwrt/package/luci/host/www/luci-static/oxygen/footer.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/footer.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/footer.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/header.png b/openwrt/package/luci/host/www/luci-static/oxygen/header.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/header.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/header.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/COPYING.oxygen b/openwrt/package/luci/host/www/luci-static/oxygen/icons/COPYING.oxygen
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/COPYING.oxygen
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/COPYING.oxygen
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/datetime.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/datetime.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/datetime.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/datetime.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/default.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/default.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/default.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/default.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/desktop.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/desktop.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/desktop.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/desktop.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/flash.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/flash.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/flash.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/flash.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/freifunk.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/freifunk.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/freifunk.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/freifunk.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/harddisk.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/harddisk.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/harddisk.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/harddisk.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/key.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/key.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/key.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/key.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/lightbulb.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/lightbulb.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/lightbulb.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/lightbulb.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/login.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/login.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/login.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/login.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/logout.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/logout.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/logout.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/logout.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/network.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/network.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/network.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/network.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/overview.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/overview.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/overview.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/overview.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/package.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/package.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/package.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/package.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/restart.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/restart.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/restart.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/restart.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/services.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/services.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/services.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/services.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/shell.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/shell.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/shell.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/shell.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/stats.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/stats.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/stats.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/stats.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/status.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/status.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/status.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/status.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/switch.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/switch.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/switch.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/switch.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/system.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/system.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/system.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/system.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/wifi.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/wifi.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/wifi.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/wifi.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/wireless.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/wireless.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/wireless.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/wireless.png
diff --git a/openwrt/packages/luci/host/www/luci-static/oxygen/icons/worker.png b/openwrt/package/luci/host/www/luci-static/oxygen/icons/worker.png
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/oxygen/icons/worker.png
rename to openwrt/package/luci/host/www/luci-static/oxygen/icons/worker.png
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/Dropdowns.js b/openwrt/package/luci/host/www/luci-static/resources/Dropdowns.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/Dropdowns.js
rename to openwrt/package/luci/host/www/luci-static/resources/Dropdowns.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/VarType.js b/openwrt/package/luci/host/www/luci-static/resources/VarType.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/VarType.js
rename to openwrt/package/luci/host/www/luci-static/resources/VarType.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/XHTML1.js b/openwrt/package/luci/host/www/luci-static/resources/XHTML1.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/XHTML1.js
rename to openwrt/package/luci/host/www/luci-static/resources/XHTML1.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi.js b/openwrt/package/luci/host/www/luci-static/resources/cbi.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi.js
rename to openwrt/package/luci/host/www/luci-static/resources/cbi.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/add.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/add.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/add.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/add.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/apply.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/apply.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/apply.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/apply.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/arrow.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/arrow.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/arrow.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/arrow.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/download.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/download.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/download.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/download.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/edit.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/edit.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/edit.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/edit.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/fieldadd.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/fieldadd.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/fieldadd.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/fieldadd.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/find.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/find.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/find.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/find.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/help.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/help.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/help.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/help.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/key.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/key.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/key.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/key.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/link.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/link.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/link.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/link.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/reload.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/reload.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/reload.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/reload.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/remove.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/remove.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/remove.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/remove.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/reset.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/reset.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/reset.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/reset.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/save.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/save.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/save.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/save.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/cbi/user.gif b/openwrt/package/luci/host/www/luci-static/resources/cbi/user.gif
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/cbi/user.gif
rename to openwrt/package/luci/host/www/luci-static/resources/cbi/user.gif
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/livestats/ExCanvas.js b/openwrt/package/luci/host/www/luci-static/resources/livestats/ExCanvas.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/livestats/ExCanvas.js
rename to openwrt/package/luci/host/www/luci-static/resources/livestats/ExCanvas.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/livestats/GraphRPC.js b/openwrt/package/luci/host/www/luci-static/resources/livestats/GraphRPC.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/livestats/GraphRPC.js
rename to openwrt/package/luci/host/www/luci-static/resources/livestats/GraphRPC.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/livestats/JsonRpc.js b/openwrt/package/luci/host/www/luci-static/resources/livestats/JsonRpc.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/livestats/JsonRpc.js
rename to openwrt/package/luci/host/www/luci-static/resources/livestats/JsonRpc.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/livestats/Legend.js b/openwrt/package/luci/host/www/luci-static/resources/livestats/Legend.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/livestats/Legend.js
rename to openwrt/package/luci/host/www/luci-static/resources/livestats/Legend.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/livestats/MochiKit.js b/openwrt/package/luci/host/www/luci-static/resources/livestats/MochiKit.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/livestats/MochiKit.js
rename to openwrt/package/luci/host/www/luci-static/resources/livestats/MochiKit.js
diff --git a/openwrt/packages/luci/host/www/luci-static/resources/livestats/PlotKit.js b/openwrt/package/luci/host/www/luci-static/resources/livestats/PlotKit.js
similarity index 100%
rename from openwrt/packages/luci/host/www/luci-static/resources/livestats/PlotKit.js
rename to openwrt/package/luci/host/www/luci-static/resources/livestats/PlotKit.js
diff --git a/openwrt/packages/luci/host/www/luci/splash/index.html b/openwrt/package/luci/host/www/luci/splash/index.html
similarity index 100%
rename from openwrt/packages/luci/host/www/luci/splash/index.html
rename to openwrt/package/luci/host/www/luci/splash/index.html
diff --git a/openwrt/packages/luci/i18n/english/Makefile b/openwrt/package/luci/i18n/english/Makefile
similarity index 100%
rename from openwrt/packages/luci/i18n/english/Makefile
rename to openwrt/package/luci/i18n/english/Makefile
diff --git a/openwrt/packages/luci/i18n/english/ipkg/postinst b/openwrt/package/luci/i18n/english/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/i18n/english/ipkg/postinst
rename to openwrt/package/luci/i18n/english/ipkg/postinst
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/admin-core.en.lua b/openwrt/package/luci/i18n/english/luasrc/i18n/admin-core.en.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/admin-core.en.lua
rename to openwrt/package/luci/i18n/english/luasrc/i18n/admin-core.en.lua
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/admin-core.en.xml b/openwrt/package/luci/i18n/english/luasrc/i18n/admin-core.en.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/admin-core.en.xml
rename to openwrt/package/luci/i18n/english/luasrc/i18n/admin-core.en.xml
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/cbi.en.lua b/openwrt/package/luci/i18n/english/luasrc/i18n/cbi.en.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/cbi.en.lua
rename to openwrt/package/luci/i18n/english/luasrc/i18n/cbi.en.lua
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/cbi.en.xml b/openwrt/package/luci/i18n/english/luasrc/i18n/cbi.en.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/cbi.en.xml
rename to openwrt/package/luci/i18n/english/luasrc/i18n/cbi.en.xml
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/default.en.lua b/openwrt/package/luci/i18n/english/luasrc/i18n/default.en.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/default.en.lua
rename to openwrt/package/luci/i18n/english/luasrc/i18n/default.en.lua
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/default.en.xml b/openwrt/package/luci/i18n/english/luasrc/i18n/default.en.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/default.en.xml
rename to openwrt/package/luci/i18n/english/luasrc/i18n/default.en.xml
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/sysauth.en.lua b/openwrt/package/luci/i18n/english/luasrc/i18n/sysauth.en.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/sysauth.en.lua
rename to openwrt/package/luci/i18n/english/luasrc/i18n/sysauth.en.lua
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/sysauth.en.xml b/openwrt/package/luci/i18n/english/luasrc/i18n/sysauth.en.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/sysauth.en.xml
rename to openwrt/package/luci/i18n/english/luasrc/i18n/sysauth.en.xml
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/wifi.en.lua b/openwrt/package/luci/i18n/english/luasrc/i18n/wifi.en.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/wifi.en.lua
rename to openwrt/package/luci/i18n/english/luasrc/i18n/wifi.en.lua
diff --git a/openwrt/packages/luci/i18n/english/luasrc/i18n/wifi.en.xml b/openwrt/package/luci/i18n/english/luasrc/i18n/wifi.en.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/english/luasrc/i18n/wifi.en.xml
rename to openwrt/package/luci/i18n/english/luasrc/i18n/wifi.en.xml
diff --git a/openwrt/packages/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english b/openwrt/package/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english
similarity index 100%
rename from openwrt/packages/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english
rename to openwrt/package/luci/i18n/english/root/etc/uci-defaults/luci-i18n-english
diff --git a/openwrt/packages/luci/i18n/french/Makefile b/openwrt/package/luci/i18n/french/Makefile
similarity index 100%
rename from openwrt/packages/luci/i18n/french/Makefile
rename to openwrt/package/luci/i18n/french/Makefile
diff --git a/openwrt/packages/luci/i18n/french/ipkg/postinst b/openwrt/package/luci/i18n/french/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/i18n/french/ipkg/postinst
rename to openwrt/package/luci/i18n/french/ipkg/postinst
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/admin-core.fr.lua b/openwrt/package/luci/i18n/french/luasrc/i18n/admin-core.fr.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/admin-core.fr.lua
rename to openwrt/package/luci/i18n/french/luasrc/i18n/admin-core.fr.lua
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/admin-core.fr.xml b/openwrt/package/luci/i18n/french/luasrc/i18n/admin-core.fr.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/admin-core.fr.xml
rename to openwrt/package/luci/i18n/french/luasrc/i18n/admin-core.fr.xml
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/cbi.fr.lua b/openwrt/package/luci/i18n/french/luasrc/i18n/cbi.fr.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/cbi.fr.lua
rename to openwrt/package/luci/i18n/french/luasrc/i18n/cbi.fr.lua
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/cbi.fr.xml b/openwrt/package/luci/i18n/french/luasrc/i18n/cbi.fr.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/cbi.fr.xml
rename to openwrt/package/luci/i18n/french/luasrc/i18n/cbi.fr.xml
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/default.fr.lua b/openwrt/package/luci/i18n/french/luasrc/i18n/default.fr.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/default.fr.lua
rename to openwrt/package/luci/i18n/french/luasrc/i18n/default.fr.lua
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/default.fr.xml b/openwrt/package/luci/i18n/french/luasrc/i18n/default.fr.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/default.fr.xml
rename to openwrt/package/luci/i18n/french/luasrc/i18n/default.fr.xml
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/sysauth.fr.lua b/openwrt/package/luci/i18n/french/luasrc/i18n/sysauth.fr.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/sysauth.fr.lua
rename to openwrt/package/luci/i18n/french/luasrc/i18n/sysauth.fr.lua
diff --git a/openwrt/packages/luci/i18n/french/luasrc/i18n/sysauth.fr.xml b/openwrt/package/luci/i18n/french/luasrc/i18n/sysauth.fr.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/french/luasrc/i18n/sysauth.fr.xml
rename to openwrt/package/luci/i18n/french/luasrc/i18n/sysauth.fr.xml
diff --git a/openwrt/packages/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french b/openwrt/package/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french
similarity index 100%
rename from openwrt/packages/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french
rename to openwrt/package/luci/i18n/french/root/etc/uci-defaults/luci-i18n-french
diff --git a/openwrt/packages/luci/i18n/german/Makefile b/openwrt/package/luci/i18n/german/Makefile
similarity index 100%
rename from openwrt/packages/luci/i18n/german/Makefile
rename to openwrt/package/luci/i18n/german/Makefile
diff --git a/openwrt/packages/luci/i18n/german/ipkg/postinst b/openwrt/package/luci/i18n/german/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/i18n/german/ipkg/postinst
rename to openwrt/package/luci/i18n/german/ipkg/postinst
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/admin-core.de.lua b/openwrt/package/luci/i18n/german/luasrc/i18n/admin-core.de.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/admin-core.de.lua
rename to openwrt/package/luci/i18n/german/luasrc/i18n/admin-core.de.lua
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/admin-core.de.xml b/openwrt/package/luci/i18n/german/luasrc/i18n/admin-core.de.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/admin-core.de.xml
rename to openwrt/package/luci/i18n/german/luasrc/i18n/admin-core.de.xml
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/cbi.de.lua b/openwrt/package/luci/i18n/german/luasrc/i18n/cbi.de.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/cbi.de.lua
rename to openwrt/package/luci/i18n/german/luasrc/i18n/cbi.de.lua
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/cbi.de.xml b/openwrt/package/luci/i18n/german/luasrc/i18n/cbi.de.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/cbi.de.xml
rename to openwrt/package/luci/i18n/german/luasrc/i18n/cbi.de.xml
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/default.de.lua b/openwrt/package/luci/i18n/german/luasrc/i18n/default.de.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/default.de.lua
rename to openwrt/package/luci/i18n/german/luasrc/i18n/default.de.lua
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/default.de.xml b/openwrt/package/luci/i18n/german/luasrc/i18n/default.de.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/default.de.xml
rename to openwrt/package/luci/i18n/german/luasrc/i18n/default.de.xml
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/sysauth.de.lua b/openwrt/package/luci/i18n/german/luasrc/i18n/sysauth.de.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/sysauth.de.lua
rename to openwrt/package/luci/i18n/german/luasrc/i18n/sysauth.de.lua
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/sysauth.de.xml b/openwrt/package/luci/i18n/german/luasrc/i18n/sysauth.de.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/sysauth.de.xml
rename to openwrt/package/luci/i18n/german/luasrc/i18n/sysauth.de.xml
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/wifi.de.lua b/openwrt/package/luci/i18n/german/luasrc/i18n/wifi.de.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/wifi.de.lua
rename to openwrt/package/luci/i18n/german/luasrc/i18n/wifi.de.lua
diff --git a/openwrt/packages/luci/i18n/german/luasrc/i18n/wifi.de.xml b/openwrt/package/luci/i18n/german/luasrc/i18n/wifi.de.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/german/luasrc/i18n/wifi.de.xml
rename to openwrt/package/luci/i18n/german/luasrc/i18n/wifi.de.xml
diff --git a/openwrt/packages/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german b/openwrt/package/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german
similarity index 100%
rename from openwrt/packages/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german
rename to openwrt/package/luci/i18n/german/root/etc/uci-defaults/luci-i18n-german
diff --git a/openwrt/packages/luci/i18n/italian/Makefile b/openwrt/package/luci/i18n/italian/Makefile
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/Makefile
rename to openwrt/package/luci/i18n/italian/Makefile
diff --git a/openwrt/packages/luci/i18n/italian/ipkg/postinst b/openwrt/package/luci/i18n/italian/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/ipkg/postinst
rename to openwrt/package/luci/i18n/italian/ipkg/postinst
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/admin-core.it.lua b/openwrt/package/luci/i18n/italian/luasrc/i18n/admin-core.it.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/admin-core.it.lua
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/admin-core.it.lua
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/admin-core.it.xml b/openwrt/package/luci/i18n/italian/luasrc/i18n/admin-core.it.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/admin-core.it.xml
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/admin-core.it.xml
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/cbi.it.lua b/openwrt/package/luci/i18n/italian/luasrc/i18n/cbi.it.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/cbi.it.lua
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/cbi.it.lua
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/cbi.it.xml b/openwrt/package/luci/i18n/italian/luasrc/i18n/cbi.it.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/cbi.it.xml
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/cbi.it.xml
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/default.it.lua b/openwrt/package/luci/i18n/italian/luasrc/i18n/default.it.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/default.it.lua
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/default.it.lua
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/default.it.xml b/openwrt/package/luci/i18n/italian/luasrc/i18n/default.it.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/default.it.xml
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/default.it.xml
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/sysauth.it.lua b/openwrt/package/luci/i18n/italian/luasrc/i18n/sysauth.it.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/sysauth.it.lua
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/sysauth.it.lua
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/sysauth.it.xml b/openwrt/package/luci/i18n/italian/luasrc/i18n/sysauth.it.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/sysauth.it.xml
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/sysauth.it.xml
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/wifi.it.lua b/openwrt/package/luci/i18n/italian/luasrc/i18n/wifi.it.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/wifi.it.lua
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/wifi.it.lua
diff --git a/openwrt/packages/luci/i18n/italian/luasrc/i18n/wifi.it.xml b/openwrt/package/luci/i18n/italian/luasrc/i18n/wifi.it.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/luasrc/i18n/wifi.it.xml
rename to openwrt/package/luci/i18n/italian/luasrc/i18n/wifi.it.xml
diff --git a/openwrt/packages/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian b/openwrt/package/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian
similarity index 100%
rename from openwrt/packages/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian
rename to openwrt/package/luci/i18n/italian/root/etc/uci-defaults/luci-i18n-italian
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/Makefile b/openwrt/package/luci/i18n/portuguese_brazilian/Makefile
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/Makefile
rename to openwrt/package/luci/i18n/portuguese_brazilian/Makefile
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/ipkg/postinst b/openwrt/package/luci/i18n/portuguese_brazilian/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/ipkg/postinst
rename to openwrt/package/luci/i18n/portuguese_brazilian/ipkg/postinst
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.lua b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.lua
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.lua
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.xml b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.xml
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.xml
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.lua b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.lua
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.lua
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.xml b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.xml
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.xml
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.lua b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.lua
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.lua
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.xml b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.xml
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.xml
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.lua b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.lua
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.lua
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.xml b/openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.xml
rename to openwrt/package/luci/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.xml
diff --git a/openwrt/packages/luci/i18n/portuguese_brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian b/openwrt/package/luci/i18n/portuguese_brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
similarity index 100%
rename from openwrt/packages/luci/i18n/portuguese_brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
rename to openwrt/package/luci/i18n/portuguese_brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
diff --git a/openwrt/packages/luci/i18n/russian/Makefile b/openwrt/package/luci/i18n/russian/Makefile
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/Makefile
rename to openwrt/package/luci/i18n/russian/Makefile
diff --git a/openwrt/packages/luci/i18n/russian/ipkg/postinst b/openwrt/package/luci/i18n/russian/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/ipkg/postinst
rename to openwrt/package/luci/i18n/russian/ipkg/postinst
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/admin-core.ru.lua b/openwrt/package/luci/i18n/russian/luasrc/i18n/admin-core.ru.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/admin-core.ru.lua
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/admin-core.ru.lua
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/admin-core.ru.xml b/openwrt/package/luci/i18n/russian/luasrc/i18n/admin-core.ru.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/admin-core.ru.xml
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/admin-core.ru.xml
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/cbi.ru.lua b/openwrt/package/luci/i18n/russian/luasrc/i18n/cbi.ru.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/cbi.ru.lua
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/cbi.ru.lua
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/cbi.ru.xml b/openwrt/package/luci/i18n/russian/luasrc/i18n/cbi.ru.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/cbi.ru.xml
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/cbi.ru.xml
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/default.ru.lua b/openwrt/package/luci/i18n/russian/luasrc/i18n/default.ru.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/default.ru.lua
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/default.ru.lua
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/default.ru.xml b/openwrt/package/luci/i18n/russian/luasrc/i18n/default.ru.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/default.ru.xml
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/default.ru.xml
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/sysauth.ru.lua b/openwrt/package/luci/i18n/russian/luasrc/i18n/sysauth.ru.lua
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/sysauth.ru.lua
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/sysauth.ru.lua
diff --git a/openwrt/packages/luci/i18n/russian/luasrc/i18n/sysauth.ru.xml b/openwrt/package/luci/i18n/russian/luasrc/i18n/sysauth.ru.xml
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/luasrc/i18n/sysauth.ru.xml
rename to openwrt/package/luci/i18n/russian/luasrc/i18n/sysauth.ru.xml
diff --git a/openwrt/packages/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian b/openwrt/package/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian
similarity index 100%
rename from openwrt/packages/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian
rename to openwrt/package/luci/i18n/russian/root/etc/uci-defaults/luci-i18n-russian
diff --git a/openwrt/packages/luci/libs/cbi/Makefile b/openwrt/package/luci/libs/cbi/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/Makefile
rename to openwrt/package/luci/libs/cbi/Makefile
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi.js b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi.js
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi.js
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi.js
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/add.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/add.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/add.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/add.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/arrow.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/arrow.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/arrow.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/arrow.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/download.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/download.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/download.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/download.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/edit.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/edit.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/edit.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/edit.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/find.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/find.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/find.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/find.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/help.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/help.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/help.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/help.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/key.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/key.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/key.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/key.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/link.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/link.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/link.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/link.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/remove.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/remove.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/remove.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/remove.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/save.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/save.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/save.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/save.gif
diff --git a/openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/user.gif b/openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/user.gif
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/htdocs/luci-static/resources/cbi/user.gif
rename to openwrt/package/luci/libs/cbi/htdocs/luci-static/resources/cbi/user.gif
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/cbi.lua b/openwrt/package/luci/libs/cbi/luasrc/cbi.lua
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/cbi.lua
rename to openwrt/package/luci/libs/cbi/luasrc/cbi.lua
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/browser.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/browser.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/browser.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/browser.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/button.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/button.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/button.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/button.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/cell_valueheader.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/cell_valueheader.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/cell_valueheader.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/cell_valueheader.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/dvalue.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/dvalue.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/dvalue.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/dvalue.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/dynlist.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/dynlist.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/dynlist.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/dynlist.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/filebrowser.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/filebrowser.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/filebrowser.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/filebrowser.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/footer.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/footer.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/footer.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/footer.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/full_valueheader.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/full_valueheader.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/full_valueheader.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/full_valueheader.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/fvalue.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/fvalue.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/fvalue.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/fvalue.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/header.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/header.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/header.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/header.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/lvalue.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/lvalue.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/lvalue.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/lvalue.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/map.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/map.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/map.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/map.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/mvalue.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/mvalue.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/mvalue.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/mvalue.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/nsection.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/nsection.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/nsection.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/nsection.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/nullsection.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/nullsection.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/nullsection.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/nullsection.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/simpleform.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/simpleform.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/simpleform.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/simpleform.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/tblsection.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/tblsection.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/tblsection.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/tblsection.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/tsection.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/tsection.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/tsection.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/tsection.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/tvalue.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/tvalue.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/tvalue.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/tvalue.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/ucisection.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/ucisection.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/ucisection.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/ucisection.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/upload.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/upload.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/upload.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/upload.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/value.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/value.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/value.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/value.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/valuefooter.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/valuefooter.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/valuefooter.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/valuefooter.htm
diff --git a/openwrt/packages/luci/libs/cbi/luasrc/view/cbi/valueheader.htm b/openwrt/package/luci/libs/cbi/luasrc/view/cbi/valueheader.htm
similarity index 100%
rename from openwrt/packages/luci/libs/cbi/luasrc/view/cbi/valueheader.htm
rename to openwrt/package/luci/libs/cbi/luasrc/view/cbi/valueheader.htm
diff --git a/openwrt/packages/luci/libs/core/Makefile b/openwrt/package/luci/libs/core/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/core/Makefile
rename to openwrt/package/luci/libs/core/Makefile
diff --git a/openwrt/packages/luci/libs/core/luasrc/ccache.lua b/openwrt/package/luci/libs/core/luasrc/ccache.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/ccache.lua
rename to openwrt/package/luci/libs/core/luasrc/ccache.lua
diff --git a/openwrt/packages/luci/libs/core/luasrc/debug.lua b/openwrt/package/luci/libs/core/luasrc/debug.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/debug.lua
rename to openwrt/package/luci/libs/core/luasrc/debug.lua
diff --git a/openwrt/packages/luci/libs/core/luasrc/fs.lua b/openwrt/package/luci/libs/core/luasrc/fs.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/fs.lua
rename to openwrt/package/luci/libs/core/luasrc/fs.lua
diff --git a/openwrt/packages/luci/libs/core/luasrc/init.lua b/openwrt/package/luci/libs/core/luasrc/init.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/init.lua
rename to openwrt/package/luci/libs/core/luasrc/init.lua
diff --git a/openwrt/packages/luci/libs/core/luasrc/ip.lua b/openwrt/package/luci/libs/core/luasrc/ip.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/ip.lua
rename to openwrt/package/luci/libs/core/luasrc/ip.lua
diff --git a/openwrt/packages/luci/libs/core/luasrc/ltn12.lua b/openwrt/package/luci/libs/core/luasrc/ltn12.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/ltn12.lua
rename to openwrt/package/luci/libs/core/luasrc/ltn12.lua
diff --git a/openwrt/packages/luci/libs/core/luasrc/util.lua b/openwrt/package/luci/libs/core/luasrc/util.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/util.lua
rename to openwrt/package/luci/libs/core/luasrc/util.lua
diff --git a/openwrt/packages/luci/libs/core/luasrc/version.lua b/openwrt/package/luci/libs/core/luasrc/version.lua
similarity index 100%
rename from openwrt/packages/luci/libs/core/luasrc/version.lua
rename to openwrt/package/luci/libs/core/luasrc/version.lua
diff --git a/openwrt/packages/luci/libs/fastindex/Makefile b/openwrt/package/luci/libs/fastindex/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/fastindex/Makefile
rename to openwrt/package/luci/libs/fastindex/Makefile
diff --git a/openwrt/packages/luci/libs/fastindex/src/fastindex.c b/openwrt/package/luci/libs/fastindex/src/fastindex.c
similarity index 100%
rename from openwrt/packages/luci/libs/fastindex/src/fastindex.c
rename to openwrt/package/luci/libs/fastindex/src/fastindex.c
diff --git a/openwrt/packages/luci/libs/fastindex/src/list.h b/openwrt/package/luci/libs/fastindex/src/list.h
similarity index 100%
rename from openwrt/packages/luci/libs/fastindex/src/list.h
rename to openwrt/package/luci/libs/fastindex/src/list.h
diff --git a/openwrt/packages/luci/libs/http/Makefile b/openwrt/package/luci/libs/http/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/http/Makefile
rename to openwrt/package/luci/libs/http/Makefile
diff --git a/openwrt/packages/luci/libs/http/luasrc/http/protocol.lua b/openwrt/package/luci/libs/http/luasrc/http/protocol.lua
similarity index 100%
rename from openwrt/packages/luci/libs/http/luasrc/http/protocol.lua
rename to openwrt/package/luci/libs/http/luasrc/http/protocol.lua
diff --git a/openwrt/packages/luci/libs/http/luasrc/http/protocol/conditionals.lua b/openwrt/package/luci/libs/http/luasrc/http/protocol/conditionals.lua
similarity index 100%
rename from openwrt/packages/luci/libs/http/luasrc/http/protocol/conditionals.lua
rename to openwrt/package/luci/libs/http/luasrc/http/protocol/conditionals.lua
diff --git a/openwrt/packages/luci/libs/http/luasrc/http/protocol/date.lua b/openwrt/package/luci/libs/http/luasrc/http/protocol/date.lua
similarity index 100%
rename from openwrt/packages/luci/libs/http/luasrc/http/protocol/date.lua
rename to openwrt/package/luci/libs/http/luasrc/http/protocol/date.lua
diff --git a/openwrt/packages/luci/libs/http/luasrc/http/protocol/mime.lua b/openwrt/package/luci/libs/http/luasrc/http/protocol/mime.lua
similarity index 100%
rename from openwrt/packages/luci/libs/http/luasrc/http/protocol/mime.lua
rename to openwrt/package/luci/libs/http/luasrc/http/protocol/mime.lua
diff --git a/openwrt/packages/luci/libs/httpd/Makefile b/openwrt/package/luci/libs/httpd/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/Makefile
rename to openwrt/package/luci/libs/httpd/Makefile
diff --git a/openwrt/packages/luci/libs/httpd/host/runluci b/openwrt/package/luci/libs/httpd/host/runluci
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/host/runluci
rename to openwrt/package/luci/libs/httpd/host/runluci
diff --git a/openwrt/packages/luci/libs/httpd/hostfiles/www/index.html b/openwrt/package/luci/libs/httpd/hostfiles/www/index.html
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/hostfiles/www/index.html
rename to openwrt/package/luci/libs/httpd/hostfiles/www/index.html
diff --git a/openwrt/packages/luci/libs/httpd/luasrc/httpd.lua b/openwrt/package/luci/libs/httpd/luasrc/httpd.lua
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/luasrc/httpd.lua
rename to openwrt/package/luci/libs/httpd/luasrc/httpd.lua
diff --git a/openwrt/packages/luci/libs/httpd/luasrc/httpd/handler/file.lua b/openwrt/package/luci/libs/httpd/luasrc/httpd/handler/file.lua
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/luasrc/httpd/handler/file.lua
rename to openwrt/package/luci/libs/httpd/luasrc/httpd/handler/file.lua
diff --git a/openwrt/packages/luci/libs/httpd/luasrc/httpd/handler/luci.lua b/openwrt/package/luci/libs/httpd/luasrc/httpd/handler/luci.lua
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/luasrc/httpd/handler/luci.lua
rename to openwrt/package/luci/libs/httpd/luasrc/httpd/handler/luci.lua
diff --git a/openwrt/packages/luci/libs/httpd/luasrc/httpd/module.lua b/openwrt/package/luci/libs/httpd/luasrc/httpd/module.lua
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/luasrc/httpd/module.lua
rename to openwrt/package/luci/libs/httpd/luasrc/httpd/module.lua
diff --git a/openwrt/packages/luci/libs/httpd/luasrc/httpd/server.lua b/openwrt/package/luci/libs/httpd/luasrc/httpd/server.lua
similarity index 100%
rename from openwrt/packages/luci/libs/httpd/luasrc/httpd/server.lua
rename to openwrt/package/luci/libs/httpd/luasrc/httpd/server.lua
diff --git a/openwrt/packages/luci/libs/ipkg/Makefile b/openwrt/package/luci/libs/ipkg/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/ipkg/Makefile
rename to openwrt/package/luci/libs/ipkg/Makefile
diff --git a/openwrt/packages/luci/libs/ipkg/luasrc/model/ipkg.lua b/openwrt/package/luci/libs/ipkg/luasrc/model/ipkg.lua
similarity index 100%
rename from openwrt/packages/luci/libs/ipkg/luasrc/model/ipkg.lua
rename to openwrt/package/luci/libs/ipkg/luasrc/model/ipkg.lua
diff --git a/openwrt/packages/luci/libs/json/Makefile b/openwrt/package/luci/libs/json/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/json/Makefile
rename to openwrt/package/luci/libs/json/Makefile
diff --git a/openwrt/packages/luci/libs/json/luasrc/json.lua b/openwrt/package/luci/libs/json/luasrc/json.lua
similarity index 100%
rename from openwrt/packages/luci/libs/json/luasrc/json.lua
rename to openwrt/package/luci/libs/json/luasrc/json.lua
diff --git a/openwrt/packages/luci/libs/lpk/Makefile b/openwrt/package/luci/libs/lpk/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/Makefile
rename to openwrt/package/luci/libs/lpk/Makefile
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk.lua
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk/core.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk/core.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk/core.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk/core.lua
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk/core/download.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk/core/download.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk/core/download.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk/core/download.lua
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk/core/install.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk/core/install.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk/core/install.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk/core/install.lua
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk/core/resolve.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk/core/resolve.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk/core/resolve.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk/core/resolve.lua
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk/core/retrieve.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk/core/retrieve.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk/core/retrieve.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk/core/retrieve.lua
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk/core/unpack.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk/core/unpack.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk/core/unpack.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk/core/unpack.lua
diff --git a/openwrt/packages/luci/libs/lpk/luasrc/lpk/util.lua b/openwrt/package/luci/libs/lpk/luasrc/lpk/util.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/luasrc/lpk/util.lua
rename to openwrt/package/luci/libs/lpk/luasrc/lpk/util.lua
diff --git a/openwrt/packages/luci/libs/lpk/root/etc/lpk.conf b/openwrt/package/luci/libs/lpk/root/etc/lpk.conf
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/root/etc/lpk.conf
rename to openwrt/package/luci/libs/lpk/root/etc/lpk.conf
diff --git a/openwrt/packages/luci/libs/lpk/root/usr/bin/lpk b/openwrt/package/luci/libs/lpk/root/usr/bin/lpk
similarity index 100%
rename from openwrt/packages/luci/libs/lpk/root/usr/bin/lpk
rename to openwrt/package/luci/libs/lpk/root/usr/bin/lpk
diff --git a/openwrt/packages/luci/libs/lucittpd/Makefile b/openwrt/package/luci/libs/lucittpd/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/Makefile
rename to openwrt/package/luci/libs/lucittpd/Makefile
diff --git a/openwrt/packages/luci/libs/lucittpd/hostfiles/usr/lib/lucittpd/plugins/httpd.lua b/openwrt/package/luci/libs/lucittpd/hostfiles/usr/lib/lucittpd/plugins/httpd.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/hostfiles/usr/lib/lucittpd/plugins/httpd.lua
rename to openwrt/package/luci/libs/lucittpd/hostfiles/usr/lib/lucittpd/plugins/httpd.lua
diff --git a/openwrt/packages/luci/libs/lucittpd/ipkg/postinst b/openwrt/package/luci/libs/lucittpd/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/ipkg/postinst
rename to openwrt/package/luci/libs/lucittpd/ipkg/postinst
diff --git a/openwrt/packages/luci/libs/lucittpd/luasrc/ttpd/handler/file.lua b/openwrt/package/luci/libs/lucittpd/luasrc/ttpd/handler/file.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/luasrc/ttpd/handler/file.lua
rename to openwrt/package/luci/libs/lucittpd/luasrc/ttpd/handler/file.lua
diff --git a/openwrt/packages/luci/libs/lucittpd/luasrc/ttpd/module.lua b/openwrt/package/luci/libs/lucittpd/luasrc/ttpd/module.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/luasrc/ttpd/module.lua
rename to openwrt/package/luci/libs/lucittpd/luasrc/ttpd/module.lua
diff --git a/openwrt/packages/luci/libs/lucittpd/luasrc/ttpd/server.lua b/openwrt/package/luci/libs/lucittpd/luasrc/ttpd/server.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/luasrc/ttpd/server.lua
rename to openwrt/package/luci/libs/lucittpd/luasrc/ttpd/server.lua
diff --git a/openwrt/packages/luci/libs/lucittpd/root/etc/config/lucittpd b/openwrt/package/luci/libs/lucittpd/root/etc/config/lucittpd
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/root/etc/config/lucittpd
rename to openwrt/package/luci/libs/lucittpd/root/etc/config/lucittpd
diff --git a/openwrt/packages/luci/libs/lucittpd/root/etc/init.d/lucittpd b/openwrt/package/luci/libs/lucittpd/root/etc/init.d/lucittpd
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/root/etc/init.d/lucittpd
rename to openwrt/package/luci/libs/lucittpd/root/etc/init.d/lucittpd
diff --git a/openwrt/packages/luci/libs/lucittpd/root/usr/lib/lucittpd/plugins/httpd.lua b/openwrt/package/luci/libs/lucittpd/root/usr/lib/lucittpd/plugins/httpd.lua
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/root/usr/lib/lucittpd/plugins/httpd.lua
rename to openwrt/package/luci/libs/lucittpd/root/usr/lib/lucittpd/plugins/httpd.lua
diff --git a/openwrt/packages/luci/libs/lucittpd/src/.gitignore b/openwrt/package/luci/libs/lucittpd/src/.gitignore
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/.gitignore
rename to openwrt/package/luci/libs/lucittpd/src/.gitignore
diff --git a/openwrt/packages/luci/libs/lucittpd/src/Makefile b/openwrt/package/luci/libs/lucittpd/src/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/Makefile
rename to openwrt/package/luci/libs/lucittpd/src/Makefile
diff --git a/openwrt/packages/luci/libs/lucittpd/src/include/lib/list.h b/openwrt/package/luci/libs/lucittpd/src/include/lib/list.h
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/include/lib/list.h
rename to openwrt/package/luci/libs/lucittpd/src/include/lib/list.h
diff --git a/openwrt/packages/luci/libs/lucittpd/src/include/lib/log.h b/openwrt/package/luci/libs/lucittpd/src/include/lib/log.h
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/include/lib/log.h
rename to openwrt/package/luci/libs/lucittpd/src/include/lib/log.h
diff --git a/openwrt/packages/luci/libs/lucittpd/src/include/lib/luaplugin.h b/openwrt/package/luci/libs/lucittpd/src/include/lib/luaplugin.h
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/include/lib/luaplugin.h
rename to openwrt/package/luci/libs/lucittpd/src/include/lib/luaplugin.h
diff --git a/openwrt/packages/luci/libs/lucittpd/src/include/lib/signal.h b/openwrt/package/luci/libs/lucittpd/src/include/lib/signal.h
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/include/lib/signal.h
rename to openwrt/package/luci/libs/lucittpd/src/include/lib/signal.h
diff --git a/openwrt/packages/luci/libs/lucittpd/src/include/lib/uci.h b/openwrt/package/luci/libs/lucittpd/src/include/lib/uci.h
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/include/lib/uci.h
rename to openwrt/package/luci/libs/lucittpd/src/include/lib/uci.h
diff --git a/openwrt/packages/luci/libs/lucittpd/src/include/uci.h b/openwrt/package/luci/libs/lucittpd/src/include/uci.h
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/include/uci.h
rename to openwrt/package/luci/libs/lucittpd/src/include/uci.h
diff --git a/openwrt/packages/luci/libs/lucittpd/src/include/uci_config.h b/openwrt/package/luci/libs/lucittpd/src/include/uci_config.h
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/include/uci_config.h
rename to openwrt/package/luci/libs/lucittpd/src/include/uci_config.h
diff --git a/openwrt/packages/luci/libs/lucittpd/src/lib/log.c b/openwrt/package/luci/libs/lucittpd/src/lib/log.c
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/lib/log.c
rename to openwrt/package/luci/libs/lucittpd/src/lib/log.c
diff --git a/openwrt/packages/luci/libs/lucittpd/src/lib/luaplugin.c b/openwrt/package/luci/libs/lucittpd/src/lib/luaplugin.c
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/lib/luaplugin.c
rename to openwrt/package/luci/libs/lucittpd/src/lib/luaplugin.c
diff --git a/openwrt/packages/luci/libs/lucittpd/src/lib/signal.c b/openwrt/package/luci/libs/lucittpd/src/lib/signal.c
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/lib/signal.c
rename to openwrt/package/luci/libs/lucittpd/src/lib/signal.c
diff --git a/openwrt/packages/luci/libs/lucittpd/src/lib/uci.c b/openwrt/package/luci/libs/lucittpd/src/lib/uci.c
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/lib/uci.c
rename to openwrt/package/luci/libs/lucittpd/src/lib/uci.c
diff --git a/openwrt/packages/luci/libs/lucittpd/src/main.c b/openwrt/package/luci/libs/lucittpd/src/main.c
similarity index 100%
rename from openwrt/packages/luci/libs/lucittpd/src/main.c
rename to openwrt/package/luci/libs/lucittpd/src/main.c
diff --git a/openwrt/packages/luci/libs/sgi-cgi/Makefile b/openwrt/package/luci/libs/sgi-cgi/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-cgi/Makefile
rename to openwrt/package/luci/libs/sgi-cgi/Makefile
diff --git a/openwrt/packages/luci/libs/sgi-cgi/htdocs/cgi-bin/luci b/openwrt/package/luci/libs/sgi-cgi/htdocs/cgi-bin/luci
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-cgi/htdocs/cgi-bin/luci
rename to openwrt/package/luci/libs/sgi-cgi/htdocs/cgi-bin/luci
diff --git a/openwrt/packages/luci/libs/sgi-cgi/htdocs/index.html b/openwrt/package/luci/libs/sgi-cgi/htdocs/index.html
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-cgi/htdocs/index.html
rename to openwrt/package/luci/libs/sgi-cgi/htdocs/index.html
diff --git a/openwrt/packages/luci/libs/sgi-cgi/luasrc/sgi/cgi.lua b/openwrt/package/luci/libs/sgi-cgi/luasrc/sgi/cgi.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-cgi/luasrc/sgi/cgi.lua
rename to openwrt/package/luci/libs/sgi-cgi/luasrc/sgi/cgi.lua
diff --git a/openwrt/packages/luci/libs/sgi-luci/Makefile b/openwrt/package/luci/libs/sgi-luci/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-luci/Makefile
rename to openwrt/package/luci/libs/sgi-luci/Makefile
diff --git a/openwrt/packages/luci/libs/sgi-luci/hostfiles/usr/lib/lucittpd/plugins/luci-webui.lua b/openwrt/package/luci/libs/sgi-luci/hostfiles/usr/lib/lucittpd/plugins/luci-webui.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-luci/hostfiles/usr/lib/lucittpd/plugins/luci-webui.lua
rename to openwrt/package/luci/libs/sgi-luci/hostfiles/usr/lib/lucittpd/plugins/luci-webui.lua
diff --git a/openwrt/packages/luci/libs/sgi-luci/luasrc/ttpd/handler/luci.lua b/openwrt/package/luci/libs/sgi-luci/luasrc/ttpd/handler/luci.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-luci/luasrc/ttpd/handler/luci.lua
rename to openwrt/package/luci/libs/sgi-luci/luasrc/ttpd/handler/luci.lua
diff --git a/openwrt/packages/luci/libs/sgi-luci/root/usr/lib/lucittpd/plugins/luci-webui.lua b/openwrt/package/luci/libs/sgi-luci/root/usr/lib/lucittpd/plugins/luci-webui.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-luci/root/usr/lib/lucittpd/plugins/luci-webui.lua
rename to openwrt/package/luci/libs/sgi-luci/root/usr/lib/lucittpd/plugins/luci-webui.lua
diff --git a/openwrt/packages/luci/libs/sgi-webuci/.gitignore b/openwrt/package/luci/libs/sgi-webuci/.gitignore
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/.gitignore
rename to openwrt/package/luci/libs/sgi-webuci/.gitignore
diff --git a/openwrt/packages/luci/libs/sgi-webuci/Makefile b/openwrt/package/luci/libs/sgi-webuci/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/Makefile
rename to openwrt/package/luci/libs/sgi-webuci/Makefile
diff --git a/openwrt/packages/luci/libs/sgi-webuci/boa-patches/100-no_tz.patch b/openwrt/package/luci/libs/sgi-webuci/boa-patches/100-no_tz.patch
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/boa-patches/100-no_tz.patch
rename to openwrt/package/luci/libs/sgi-webuci/boa-patches/100-no_tz.patch
diff --git a/openwrt/packages/luci/libs/sgi-webuci/boa-patches/110-host_lookup.patch b/openwrt/package/luci/libs/sgi-webuci/boa-patches/110-host_lookup.patch
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/boa-patches/110-host_lookup.patch
rename to openwrt/package/luci/libs/sgi-webuci/boa-patches/110-host_lookup.patch
diff --git a/openwrt/packages/luci/libs/sgi-webuci/boa-patches/120-setuid_fix.patch b/openwrt/package/luci/libs/sgi-webuci/boa-patches/120-setuid_fix.patch
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/boa-patches/120-setuid_fix.patch
rename to openwrt/package/luci/libs/sgi-webuci/boa-patches/120-setuid_fix.patch
diff --git a/openwrt/packages/luci/libs/sgi-webuci/boa-patches/200-plugin_api.patch b/openwrt/package/luci/libs/sgi-webuci/boa-patches/200-plugin_api.patch
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/boa-patches/200-plugin_api.patch
rename to openwrt/package/luci/libs/sgi-webuci/boa-patches/200-plugin_api.patch
diff --git a/openwrt/packages/luci/libs/sgi-webuci/boa-patches/210-accept_fix.patch b/openwrt/package/luci/libs/sgi-webuci/boa-patches/210-accept_fix.patch
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/boa-patches/210-accept_fix.patch
rename to openwrt/package/luci/libs/sgi-webuci/boa-patches/210-accept_fix.patch
diff --git a/openwrt/packages/luci/libs/sgi-webuci/boa-patches/220-ipv6-vs-ipv4.patch b/openwrt/package/luci/libs/sgi-webuci/boa-patches/220-ipv6-vs-ipv4.patch
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/boa-patches/220-ipv6-vs-ipv4.patch
rename to openwrt/package/luci/libs/sgi-webuci/boa-patches/220-ipv6-vs-ipv4.patch
diff --git a/openwrt/packages/luci/libs/sgi-webuci/host/buildconfig.sh b/openwrt/package/luci/libs/sgi-webuci/host/buildconfig.sh
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/host/buildconfig.sh
rename to openwrt/package/luci/libs/sgi-webuci/host/buildconfig.sh
diff --git a/openwrt/packages/luci/libs/sgi-webuci/luasrc/sgi/webuci.lua b/openwrt/package/luci/libs/sgi-webuci/luasrc/sgi/webuci.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/luasrc/sgi/webuci.lua
rename to openwrt/package/luci/libs/sgi-webuci/luasrc/sgi/webuci.lua
diff --git a/openwrt/packages/luci/libs/sgi-webuci/root/etc/boa/boa.conf b/openwrt/package/luci/libs/sgi-webuci/root/etc/boa/boa.conf
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/root/etc/boa/boa.conf
rename to openwrt/package/luci/libs/sgi-webuci/root/etc/boa/boa.conf
diff --git a/openwrt/packages/luci/libs/sgi-webuci/root/etc/init.d/boa b/openwrt/package/luci/libs/sgi-webuci/root/etc/init.d/boa
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/root/etc/init.d/boa
rename to openwrt/package/luci/libs/sgi-webuci/root/etc/init.d/boa
diff --git a/openwrt/packages/luci/libs/sgi-webuci/root/etc/mime.types b/openwrt/package/luci/libs/sgi-webuci/root/etc/mime.types
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/root/etc/mime.types
rename to openwrt/package/luci/libs/sgi-webuci/root/etc/mime.types
diff --git a/openwrt/packages/luci/libs/sgi-webuci/root/usr/lib/boa/luci.lua b/openwrt/package/luci/libs/sgi-webuci/root/usr/lib/boa/luci.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/root/usr/lib/boa/luci.lua
rename to openwrt/package/luci/libs/sgi-webuci/root/usr/lib/boa/luci.lua
diff --git a/openwrt/packages/luci/libs/sgi-webuci/src/cgi.c b/openwrt/package/luci/libs/sgi-webuci/src/cgi.c
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/src/cgi.c
rename to openwrt/package/luci/libs/sgi-webuci/src/cgi.c
diff --git a/openwrt/packages/luci/libs/sgi-webuci/src/luci.c b/openwrt/package/luci/libs/sgi-webuci/src/luci.c
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-webuci/src/luci.c
rename to openwrt/package/luci/libs/sgi-webuci/src/luci.c
diff --git a/openwrt/packages/luci/libs/sgi-wsapi/Makefile b/openwrt/package/luci/libs/sgi-wsapi/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-wsapi/Makefile
rename to openwrt/package/luci/libs/sgi-wsapi/Makefile
diff --git a/openwrt/packages/luci/libs/sgi-wsapi/luasrc/sgi/wsapi.lua b/openwrt/package/luci/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
rename to openwrt/package/luci/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
diff --git a/openwrt/packages/luci/libs/sys/Makefile b/openwrt/package/luci/libs/sys/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/sys/Makefile
rename to openwrt/package/luci/libs/sys/Makefile
diff --git a/openwrt/packages/luci/libs/sys/luasrc/sys.lua b/openwrt/package/luci/libs/sys/luasrc/sys.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sys/luasrc/sys.lua
rename to openwrt/package/luci/libs/sys/luasrc/sys.lua
diff --git a/openwrt/packages/luci/libs/sys/luasrc/sys/iptparser.lua b/openwrt/package/luci/libs/sys/luasrc/sys/iptparser.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sys/luasrc/sys/iptparser.lua
rename to openwrt/package/luci/libs/sys/luasrc/sys/iptparser.lua
diff --git a/openwrt/packages/luci/libs/sys/luasrc/sys/zoneinfo.lua b/openwrt/package/luci/libs/sys/luasrc/sys/zoneinfo.lua
similarity index 100%
rename from openwrt/packages/luci/libs/sys/luasrc/sys/zoneinfo.lua
rename to openwrt/package/luci/libs/sys/luasrc/sys/zoneinfo.lua
diff --git a/openwrt/packages/luci/libs/uci/Makefile b/openwrt/package/luci/libs/uci/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/uci/Makefile
rename to openwrt/package/luci/libs/uci/Makefile
diff --git a/openwrt/packages/luci/libs/uci/luasrc/model/uci.lua b/openwrt/package/luci/libs/uci/luasrc/model/uci.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uci/luasrc/model/uci.lua
rename to openwrt/package/luci/libs/uci/luasrc/model/uci.lua
diff --git a/openwrt/packages/luci/libs/uci/root/etc/config/ucitrack b/openwrt/package/luci/libs/uci/root/etc/config/ucitrack
similarity index 100%
rename from openwrt/packages/luci/libs/uci/root/etc/config/ucitrack
rename to openwrt/package/luci/libs/uci/root/etc/config/ucitrack
diff --git a/openwrt/packages/luci/libs/uci/root/sbin/luci-reload b/openwrt/package/luci/libs/uci/root/sbin/luci-reload
similarity index 100%
rename from openwrt/packages/luci/libs/uci/root/sbin/luci-reload
rename to openwrt/package/luci/libs/uci/root/sbin/luci-reload
diff --git a/openwrt/packages/luci/libs/uvl/Makefile b/openwrt/package/luci/libs/uvl/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/Makefile
rename to openwrt/package/luci/libs/uvl/Makefile
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.de.lua b/openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.de.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.de.lua
rename to openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.de.lua
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.de.xml b/openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.de.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.de.xml
rename to openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.de.xml
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.en.lua b/openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.en.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.en.lua
rename to openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.en.lua
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.en.xml b/openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.en.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.en.xml
rename to openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.en.xml
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.pt-br.lua b/openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.pt-br.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.pt-br.lua
rename to openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.pt-br.lua
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.pt-br.xml b/openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.pt-br.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/i18n/uvl.pt-br.xml
rename to openwrt/package/luci/libs/uvl/luasrc/i18n/uvl.pt-br.xml
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/uvl.lua b/openwrt/package/luci/libs/uvl/luasrc/uvl.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/uvl.lua
rename to openwrt/package/luci/libs/uvl/luasrc/uvl.lua
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/uvl/datatypes.lua b/openwrt/package/luci/libs/uvl/luasrc/uvl/datatypes.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/uvl/datatypes.lua
rename to openwrt/package/luci/libs/uvl/luasrc/uvl/datatypes.lua
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/uvl/dependencies.lua b/openwrt/package/luci/libs/uvl/luasrc/uvl/dependencies.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/uvl/dependencies.lua
rename to openwrt/package/luci/libs/uvl/luasrc/uvl/dependencies.lua
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/uvl/errors.lua b/openwrt/package/luci/libs/uvl/luasrc/uvl/errors.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/uvl/errors.lua
rename to openwrt/package/luci/libs/uvl/luasrc/uvl/errors.lua
diff --git a/openwrt/packages/luci/libs/uvl/luasrc/uvl/validation.lua b/openwrt/package/luci/libs/uvl/luasrc/uvl/validation.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/luasrc/uvl/validation.lua
rename to openwrt/package/luci/libs/uvl/luasrc/uvl/validation.lua
diff --git a/openwrt/packages/luci/libs/uvl/root/lib/uci/schema/meta/schema b/openwrt/package/luci/libs/uvl/root/lib/uci/schema/meta/schema
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/root/lib/uci/schema/meta/schema
rename to openwrt/package/luci/libs/uvl/root/lib/uci/schema/meta/schema
diff --git a/openwrt/packages/luci/libs/uvl/root/usr/bin/uvl b/openwrt/package/luci/libs/uvl/root/usr/bin/uvl
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/root/usr/bin/uvl
rename to openwrt/package/luci/libs/uvl/root/usr/bin/uvl
diff --git a/openwrt/packages/luci/libs/uvl/root/usr/bin/uvlc b/openwrt/package/luci/libs/uvl/root/usr/bin/uvlc
similarity index 100%
rename from openwrt/packages/luci/libs/uvl/root/usr/bin/uvlc
rename to openwrt/package/luci/libs/uvl/root/usr/bin/uvlc
diff --git a/openwrt/packages/luci/libs/uvldoc/Makefile b/openwrt/package/luci/libs/uvldoc/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/Makefile
rename to openwrt/package/luci/libs/uvldoc/Makefile
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/footer.xml b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/footer.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/footer.xml
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/footer.xml
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/header.xml b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/header.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/header.xml
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/header.xml
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/index.xml b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/index.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/index.xml
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/index.xml
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/menu.xml b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/menu.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/menu.xml
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/menu.xml
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/scheme.xml b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/scheme.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/scheme.xml
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/scheme.xml
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/section.xml b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/section.xml
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/section.xml
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/section.xml
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/uvldoc.css b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/uvldoc.css
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/uvldoc.css
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/proto/xhtml/uvldoc.css
diff --git a/openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/renderer.lua b/openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/renderer.lua
similarity index 100%
rename from openwrt/packages/luci/libs/uvldoc/luasrc/uvldoc/renderer.lua
rename to openwrt/package/luci/libs/uvldoc/luasrc/uvldoc/renderer.lua
diff --git a/openwrt/packages/luci/libs/web/Makefile b/openwrt/package/luci/libs/web/Makefile
similarity index 100%
rename from openwrt/packages/luci/libs/web/Makefile
rename to openwrt/package/luci/libs/web/Makefile
diff --git a/openwrt/packages/luci/libs/web/luasrc/cacheloader.lua b/openwrt/package/luci/libs/web/luasrc/cacheloader.lua
similarity index 100%
rename from openwrt/packages/luci/libs/web/luasrc/cacheloader.lua
rename to openwrt/package/luci/libs/web/luasrc/cacheloader.lua
diff --git a/openwrt/packages/luci/libs/web/luasrc/config.lua b/openwrt/package/luci/libs/web/luasrc/config.lua
similarity index 100%
rename from openwrt/packages/luci/libs/web/luasrc/config.lua
rename to openwrt/package/luci/libs/web/luasrc/config.lua
diff --git a/openwrt/packages/luci/libs/web/luasrc/dispatcher.lua b/openwrt/package/luci/libs/web/luasrc/dispatcher.lua
similarity index 100%
rename from openwrt/packages/luci/libs/web/luasrc/dispatcher.lua
rename to openwrt/package/luci/libs/web/luasrc/dispatcher.lua
diff --git a/openwrt/packages/luci/libs/web/luasrc/http.lua b/openwrt/package/luci/libs/web/luasrc/http.lua
similarity index 100%
rename from openwrt/packages/luci/libs/web/luasrc/http.lua
rename to openwrt/package/luci/libs/web/luasrc/http.lua
diff --git a/openwrt/packages/luci/libs/web/luasrc/i18n.lua b/openwrt/package/luci/libs/web/luasrc/i18n.lua
similarity index 100%
rename from openwrt/packages/luci/libs/web/luasrc/i18n.lua
rename to openwrt/package/luci/libs/web/luasrc/i18n.lua
diff --git a/openwrt/packages/luci/libs/web/luasrc/sauth.lua b/openwrt/package/luci/libs/web/luasrc/sauth.lua
similarity index 100%
rename from openwrt/packages/luci/libs/web/luasrc/sauth.lua
rename to openwrt/package/luci/libs/web/luasrc/sauth.lua
diff --git a/openwrt/packages/luci/libs/web/luasrc/template.lua b/openwrt/package/luci/libs/web/luasrc/template.lua
similarity index 100%
rename from openwrt/packages/luci/libs/web/luasrc/template.lua
rename to openwrt/package/luci/libs/web/luasrc/template.lua
diff --git a/openwrt/packages/luci/libs/web/root/etc/config/luci b/openwrt/package/luci/libs/web/root/etc/config/luci
similarity index 100%
rename from openwrt/packages/luci/libs/web/root/etc/config/luci
rename to openwrt/package/luci/libs/web/root/etc/config/luci
diff --git a/openwrt/packages/luci/modules/admin-core/Makefile b/openwrt/package/luci/modules/admin-core/Makefile
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/Makefile
rename to openwrt/package/luci/modules/admin-core/Makefile
diff --git a/openwrt/packages/luci/modules/admin-core/ipkg/postinst b/openwrt/package/luci/modules/admin-core/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/ipkg/postinst
rename to openwrt/package/luci/modules/admin-core/ipkg/postinst
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/tools/webadmin.lua b/openwrt/package/luci/modules/admin-core/luasrc/tools/webadmin.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/tools/webadmin.lua
rename to openwrt/package/luci/modules/admin-core/luasrc/tools/webadmin.lua
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/view/about.htm b/openwrt/package/luci/modules/admin-core/luasrc/view/about.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/view/about.htm
rename to openwrt/package/luci/modules/admin-core/luasrc/view/about.htm
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/view/error404.htm b/openwrt/package/luci/modules/admin-core/luasrc/view/error404.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/view/error404.htm
rename to openwrt/package/luci/modules/admin-core/luasrc/view/error404.htm
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/view/error500.htm b/openwrt/package/luci/modules/admin-core/luasrc/view/error500.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/view/error500.htm
rename to openwrt/package/luci/modules/admin-core/luasrc/view/error500.htm
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/view/footer.htm b/openwrt/package/luci/modules/admin-core/luasrc/view/footer.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/view/footer.htm
rename to openwrt/package/luci/modules/admin-core/luasrc/view/footer.htm
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/view/header.htm b/openwrt/package/luci/modules/admin-core/luasrc/view/header.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/view/header.htm
rename to openwrt/package/luci/modules/admin-core/luasrc/view/header.htm
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/view/indexer.htm b/openwrt/package/luci/modules/admin-core/luasrc/view/indexer.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/view/indexer.htm
rename to openwrt/package/luci/modules/admin-core/luasrc/view/indexer.htm
diff --git a/openwrt/packages/luci/modules/admin-core/luasrc/view/sysauth.htm b/openwrt/package/luci/modules/admin-core/luasrc/view/sysauth.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/luasrc/view/sysauth.htm
rename to openwrt/package/luci/modules/admin-core/luasrc/view/sysauth.htm
diff --git a/openwrt/packages/luci/modules/admin-core/root/etc/config/luci_ethers b/openwrt/package/luci/modules/admin-core/root/etc/config/luci_ethers
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/etc/config/luci_ethers
rename to openwrt/package/luci/modules/admin-core/root/etc/config/luci_ethers
diff --git a/openwrt/packages/luci/modules/admin-core/root/etc/config/luci_hosts b/openwrt/package/luci/modules/admin-core/root/etc/config/luci_hosts
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/etc/config/luci_hosts
rename to openwrt/package/luci/modules/admin-core/root/etc/config/luci_hosts
diff --git a/openwrt/packages/luci/modules/admin-core/root/etc/init.d/luci_ethers b/openwrt/package/luci/modules/admin-core/root/etc/init.d/luci_ethers
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/etc/init.d/luci_ethers
rename to openwrt/package/luci/modules/admin-core/root/etc/init.d/luci_ethers
diff --git a/openwrt/packages/luci/modules/admin-core/root/etc/init.d/luci_hosts b/openwrt/package/luci/modules/admin-core/root/etc/init.d/luci_hosts
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/etc/init.d/luci_hosts
rename to openwrt/package/luci/modules/admin-core/root/etc/init.d/luci_hosts
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/dhcp b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/dhcp
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/dhcp
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/dhcp
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/dropbear b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/dropbear
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/dropbear
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/dropbear
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/fstab b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/fstab
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/fstab
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/fstab
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/httpd b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/httpd
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/httpd
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/httpd
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/luci_hosts b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/luci_hosts
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/luci_hosts
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/luci_hosts
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/network b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/network
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/network
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/network
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/system b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/system
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/system
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/system
diff --git a/openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/wireless b/openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/wireless
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/lib/uci/schema/default/wireless
rename to openwrt/package/luci/modules/admin-core/root/lib/uci/schema/default/wireless
diff --git a/openwrt/packages/luci/modules/admin-core/root/sbin/luci-flash b/openwrt/package/luci/modules/admin-core/root/sbin/luci-flash
similarity index 100%
rename from openwrt/packages/luci/modules/admin-core/root/sbin/luci-flash
rename to openwrt/package/luci/modules/admin-core/root/sbin/luci-flash
diff --git a/openwrt/packages/luci/modules/admin-full/Makefile b/openwrt/package/luci/modules/admin-full/Makefile
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/Makefile
rename to openwrt/package/luci/modules/admin-full/Makefile
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua b/openwrt/package/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/controller/admin/filebrowser.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/index.lua b/openwrt/package/luci/modules/admin-full/luasrc/controller/admin/index.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/index.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/controller/admin/index.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/network.lua b/openwrt/package/luci/modules/admin-full/luasrc/controller/admin/network.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/network.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/controller/admin/network.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/services.lua b/openwrt/package/luci/modules/admin-full/luasrc/controller/admin/services.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/services.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/controller/admin/services.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/status.lua b/openwrt/package/luci/modules/admin-full/luasrc/controller/admin/status.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/status.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/controller/admin/status.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/system.lua b/openwrt/package/luci/modules/admin-full/luasrc/controller/admin/system.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/system.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/controller/admin/system.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/uci.lua b/openwrt/package/luci/modules/admin-full/luasrc/controller/admin/uci.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/controller/admin/uci.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/controller/admin/uci.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/conntrack.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
rename to openwrt/package/luci/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_index/index.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_index/index.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_index/index.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_index/index.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_services/index.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_services/index.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_services/index.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_services/index.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_status/dmesg.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_status/index.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_status/index.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_status/index.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_status/index.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_status/syslog.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/backup.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/backup.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/backup.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/backup.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/ipkg.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/packages.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/packages.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/packages.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/packages.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/reboot.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_system/upgrade.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_uci/apply.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_uci/changes.htm
diff --git a/openwrt/packages/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm b/openwrt/package/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm
rename to openwrt/package/luci/modules/admin-full/luasrc/view/admin_uci/revert.htm
diff --git a/openwrt/packages/luci/modules/admin-mini/Makefile b/openwrt/package/luci/modules/admin-mini/Makefile
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/Makefile
rename to openwrt/package/luci/modules/admin-mini/Makefile
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/controller/mini/index.lua b/openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/index.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/controller/mini/index.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/index.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/controller/mini/network.lua b/openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/network.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/controller/mini/network.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/network.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/controller/mini/system.lua b/openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/system.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/controller/mini/system.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/controller/mini/system.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua b/openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/index.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/network.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua b/openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/system.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
rename to openwrt/package/luci/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm b/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm
rename to openwrt/package/luci/modules/admin-mini/luasrc/view/mini/applyreboot.htm
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/backup.htm b/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/backup.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/backup.htm
rename to openwrt/package/luci/modules/admin-mini/luasrc/view/mini/backup.htm
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/index.htm b/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/index.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/index.htm
rename to openwrt/package/luci/modules/admin-mini/luasrc/view/mini/index.htm
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/reboot.htm b/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/reboot.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/reboot.htm
rename to openwrt/package/luci/modules/admin-mini/luasrc/view/mini/reboot.htm
diff --git a/openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm b/openwrt/package/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm
similarity index 100%
rename from openwrt/packages/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm
rename to openwrt/package/luci/modules/admin-mini/luasrc/view/mini/upgrade.htm
diff --git a/openwrt/packages/luci/modules/freifunk/Makefile b/openwrt/package/luci/modules/freifunk/Makefile
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/Makefile
rename to openwrt/package/luci/modules/freifunk/Makefile
diff --git a/openwrt/packages/luci/modules/freifunk/ipkg/postinst b/openwrt/package/luci/modules/freifunk/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/ipkg/postinst
rename to openwrt/package/luci/modules/freifunk/ipkg/postinst
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/openwrt/package/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
rename to openwrt/package/luci/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.de.lua b/openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.de.lua
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.de.lua
rename to openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.de.lua
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.de.xml b/openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.de.xml
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.de.xml
rename to openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.de.xml
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.en.lua b/openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.en.lua
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.en.lua
rename to openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.en.lua
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.en.xml b/openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.en.xml
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/i18n/freifunk.en.xml
rename to openwrt/package/luci/modules/freifunk/luasrc/i18n/freifunk.en.xml
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/openwrt/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
rename to openwrt/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua b/openwrt/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua
rename to openwrt/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/freifunk.lua
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua b/openwrt/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
rename to openwrt/package/luci/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/view/freifunk/contact.htm b/openwrt/package/luci/modules/freifunk/luasrc/view/freifunk/contact.htm
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/view/freifunk/contact.htm
rename to openwrt/package/luci/modules/freifunk/luasrc/view/freifunk/contact.htm
diff --git a/openwrt/packages/luci/modules/freifunk/luasrc/view/freifunk/index.htm b/openwrt/package/luci/modules/freifunk/luasrc/view/freifunk/index.htm
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/luasrc/view/freifunk/index.htm
rename to openwrt/package/luci/modules/freifunk/luasrc/view/freifunk/index.htm
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk b/openwrt/package/luci/modules/freifunk/root/etc/config/freifunk
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk
rename to openwrt/package/luci/modules/freifunk/root/etc/config/freifunk
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk_augsburg b/openwrt/package/luci/modules/freifunk/root/etc/config/freifunk_augsburg
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk_augsburg
rename to openwrt/package/luci/modules/freifunk/root/etc/config/freifunk_augsburg
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk_berlin b/openwrt/package/luci/modules/freifunk/root/etc/config/freifunk_berlin
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk_berlin
rename to openwrt/package/luci/modules/freifunk/root/etc/config/freifunk_berlin
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk_hannover b/openwrt/package/luci/modules/freifunk/root/etc/config/freifunk_hannover
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/config/freifunk_hannover
rename to openwrt/package/luci/modules/freifunk/root/etc/config/freifunk_hannover
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/firewall.freifunk b/openwrt/package/luci/modules/freifunk/root/etc/firewall.freifunk
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/firewall.freifunk
rename to openwrt/package/luci/modules/freifunk/root/etc/firewall.freifunk
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix b/openwrt/package/luci/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix
rename to openwrt/package/luci/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/init.d/freifunk b/openwrt/package/luci/modules/freifunk/root/etc/init.d/freifunk
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/init.d/freifunk
rename to openwrt/package/luci/modules/freifunk/root/etc/init.d/freifunk
diff --git a/openwrt/packages/luci/modules/freifunk/root/etc/rc.local b/openwrt/package/luci/modules/freifunk/root/etc/rc.local
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/etc/rc.local
rename to openwrt/package/luci/modules/freifunk/root/etc/rc.local
diff --git a/openwrt/packages/luci/modules/freifunk/root/usr/sbin/ff_olsr_test_gw b/openwrt/package/luci/modules/freifunk/root/usr/sbin/ff_olsr_test_gw
similarity index 100%
rename from openwrt/packages/luci/modules/freifunk/root/usr/sbin/ff_olsr_test_gw
rename to openwrt/package/luci/modules/freifunk/root/usr/sbin/ff_olsr_test_gw
diff --git a/openwrt/packages/luci/modules/rpc/Makefile b/openwrt/package/luci/modules/rpc/Makefile
similarity index 100%
rename from openwrt/packages/luci/modules/rpc/Makefile
rename to openwrt/package/luci/modules/rpc/Makefile
diff --git a/openwrt/packages/luci/modules/rpc/luasrc/controller/rpc.lua b/openwrt/package/luci/modules/rpc/luasrc/controller/rpc.lua
similarity index 100%
rename from openwrt/packages/luci/modules/rpc/luasrc/controller/rpc.lua
rename to openwrt/package/luci/modules/rpc/luasrc/controller/rpc.lua
diff --git a/openwrt/packages/luci/modules/rpc/luasrc/jsonrpc.lua b/openwrt/package/luci/modules/rpc/luasrc/jsonrpc.lua
similarity index 100%
rename from openwrt/packages/luci/modules/rpc/luasrc/jsonrpc.lua
rename to openwrt/package/luci/modules/rpc/luasrc/jsonrpc.lua
diff --git a/openwrt/packages/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua b/openwrt/package/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua
similarity index 100%
rename from openwrt/packages/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua
rename to openwrt/package/luci/modules/rpc/luasrc/jsonrpcbind/uci.lua
diff --git a/openwrt/packages/luci/modules/rpc/luasrc/jsonrpcbind/uvl.lua b/openwrt/package/luci/modules/rpc/luasrc/jsonrpcbind/uvl.lua
similarity index 100%
rename from openwrt/packages/luci/modules/rpc/luasrc/jsonrpcbind/uvl.lua
rename to openwrt/package/luci/modules/rpc/luasrc/jsonrpcbind/uvl.lua
diff --git a/openwrt/packages/luci/themes/base/Makefile b/openwrt/package/luci/themes/base/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/base/Makefile
rename to openwrt/package/luci/themes/base/Makefile
diff --git a/openwrt/packages/luci/themes/base/htdocs/luci-static/resources/Dropdowns.js b/openwrt/package/luci/themes/base/htdocs/luci-static/resources/Dropdowns.js
similarity index 100%
rename from openwrt/packages/luci/themes/base/htdocs/luci-static/resources/Dropdowns.js
rename to openwrt/package/luci/themes/base/htdocs/luci-static/resources/Dropdowns.js
diff --git a/openwrt/packages/luci/themes/base/htdocs/luci-static/resources/VarType.js b/openwrt/package/luci/themes/base/htdocs/luci-static/resources/VarType.js
similarity index 100%
rename from openwrt/packages/luci/themes/base/htdocs/luci-static/resources/VarType.js
rename to openwrt/package/luci/themes/base/htdocs/luci-static/resources/VarType.js
diff --git a/openwrt/packages/luci/themes/base/htdocs/luci-static/resources/XHTML1.js b/openwrt/package/luci/themes/base/htdocs/luci-static/resources/XHTML1.js
similarity index 100%
rename from openwrt/packages/luci/themes/base/htdocs/luci-static/resources/XHTML1.js
rename to openwrt/package/luci/themes/base/htdocs/luci-static/resources/XHTML1.js
diff --git a/openwrt/packages/luci/themes/fledermaus/Makefile b/openwrt/package/luci/themes/fledermaus/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/Makefile
rename to openwrt/package/luci/themes/fledermaus/Makefile
diff --git a/openwrt/packages/luci/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/openwrt/package/luci/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
rename to openwrt/package/luci/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
diff --git a/openwrt/packages/luci/themes/fledermaus/htdocs/luci-static/fledermaus/fledermaus.png b/openwrt/package/luci/themes/fledermaus/htdocs/luci-static/fledermaus/fledermaus.png
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/htdocs/luci-static/fledermaus/fledermaus.png
rename to openwrt/package/luci/themes/fledermaus/htdocs/luci-static/fledermaus/fledermaus.png
diff --git a/openwrt/packages/luci/themes/fledermaus/htdocs/luci-static/fledermaus/logo.png b/openwrt/package/luci/themes/fledermaus/htdocs/luci-static/fledermaus/logo.png
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/htdocs/luci-static/fledermaus/logo.png
rename to openwrt/package/luci/themes/fledermaus/htdocs/luci-static/fledermaus/logo.png
diff --git a/openwrt/packages/luci/themes/fledermaus/ipkg/postinst b/openwrt/package/luci/themes/fledermaus/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/ipkg/postinst
rename to openwrt/package/luci/themes/fledermaus/ipkg/postinst
diff --git a/openwrt/packages/luci/themes/fledermaus/luasrc/view/themes/fledermaus/footer.htm b/openwrt/package/luci/themes/fledermaus/luasrc/view/themes/fledermaus/footer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/luasrc/view/themes/fledermaus/footer.htm
rename to openwrt/package/luci/themes/fledermaus/luasrc/view/themes/fledermaus/footer.htm
diff --git a/openwrt/packages/luci/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/openwrt/package/luci/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
rename to openwrt/package/luci/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
diff --git a/openwrt/packages/luci/themes/fledermaus/root/etc/uci-defaults/luci-theme-fledermaus b/openwrt/package/luci/themes/fledermaus/root/etc/uci-defaults/luci-theme-fledermaus
similarity index 100%
rename from openwrt/packages/luci/themes/fledermaus/root/etc/uci-defaults/luci-theme-fledermaus
rename to openwrt/package/luci/themes/fledermaus/root/etc/uci-defaults/luci-theme-fledermaus
diff --git a/openwrt/packages/luci/themes/freifunk-bno/Makefile b/openwrt/package/luci/themes/freifunk-bno/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/Makefile
rename to openwrt/package/luci/themes/freifunk-bno/Makefile
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
diff --git a/openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif b/openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
rename to openwrt/package/luci/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
diff --git a/openwrt/packages/luci/themes/freifunk-bno/ipkg/postinst b/openwrt/package/luci/themes/freifunk-bno/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/ipkg/postinst
rename to openwrt/package/luci/themes/freifunk-bno/ipkg/postinst
diff --git a/openwrt/packages/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm b/openwrt/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
rename to openwrt/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
diff --git a/openwrt/packages/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/openwrt/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
rename to openwrt/package/luci/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
diff --git a/openwrt/packages/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno b/openwrt/package/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
rename to openwrt/package/luci/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
diff --git a/openwrt/packages/luci/themes/freifunk/Makefile b/openwrt/package/luci/themes/freifunk/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/Makefile
rename to openwrt/package/luci/themes/freifunk/Makefile
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/cascade.css b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/cascade.css
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/bgoption.png b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/bgoption.png
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/bgoption.png
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/bgoption.png
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/favicon.ico b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/favicon.ico
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/favicon.ico
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/favicon.ico
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-back.gif b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-back.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-back.gif
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-back.gif
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-left.gif b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-left.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-left.gif
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-left.gif
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-right.gif b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-right.gif
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-right.gif
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/header-right.gif
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/logo.png b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/logo.png
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/logo.png
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/logo.png
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/main-back.png b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/main-back.png
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/main-back.png
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/main-back.png
diff --git a/openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/schriftzug.png b/openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/schriftzug.png
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/htdocs/luci-static/freifunk/images/schriftzug.png
rename to openwrt/package/luci/themes/freifunk/htdocs/luci-static/freifunk/images/schriftzug.png
diff --git a/openwrt/packages/luci/themes/freifunk/ipkg/postinst b/openwrt/package/luci/themes/freifunk/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/ipkg/postinst
rename to openwrt/package/luci/themes/freifunk/ipkg/postinst
diff --git a/openwrt/packages/luci/themes/freifunk/luasrc/view/themes/freifunk/footer.htm b/openwrt/package/luci/themes/freifunk/luasrc/view/themes/freifunk/footer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/luasrc/view/themes/freifunk/footer.htm
rename to openwrt/package/luci/themes/freifunk/luasrc/view/themes/freifunk/footer.htm
diff --git a/openwrt/packages/luci/themes/freifunk/luasrc/view/themes/freifunk/header.htm b/openwrt/package/luci/themes/freifunk/luasrc/view/themes/freifunk/header.htm
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/luasrc/view/themes/freifunk/header.htm
rename to openwrt/package/luci/themes/freifunk/luasrc/view/themes/freifunk/header.htm
diff --git a/openwrt/packages/luci/themes/freifunk/root/etc/uci-defaults/luci-theme-freifunk b/openwrt/package/luci/themes/freifunk/root/etc/uci-defaults/luci-theme-freifunk
similarity index 100%
rename from openwrt/packages/luci/themes/freifunk/root/etc/uci-defaults/luci-theme-freifunk
rename to openwrt/package/luci/themes/freifunk/root/etc/uci-defaults/luci-theme-freifunk
diff --git a/openwrt/packages/luci/themes/openwrt-light/Makefile b/openwrt/package/luci/themes/openwrt-light/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/Makefile
rename to openwrt/package/luci/themes/openwrt-light/Makefile
diff --git a/openwrt/packages/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css b/openwrt/package/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
rename to openwrt/package/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
diff --git a/openwrt/packages/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css b/openwrt/package/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
rename to openwrt/package/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
diff --git a/openwrt/packages/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css b/openwrt/package/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
rename to openwrt/package/luci/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
diff --git a/openwrt/packages/luci/themes/openwrt-light/ipkg/postinst b/openwrt/package/luci/themes/openwrt-light/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/ipkg/postinst
rename to openwrt/package/luci/themes/openwrt-light/ipkg/postinst
diff --git a/openwrt/packages/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm b/openwrt/package/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm
rename to openwrt/package/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/footer.htm
diff --git a/openwrt/packages/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm b/openwrt/package/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
rename to openwrt/package/luci/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
diff --git a/openwrt/packages/luci/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight b/openwrt/package/luci/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
rename to openwrt/package/luci/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/Makefile b/openwrt/package/luci/themes/openwrt.org-oxygen/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/Makefile
rename to openwrt/package/luci/themes/openwrt.org-oxygen/Makefile
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/bg.jpg b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/bg.jpg
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/bg.jpg
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/bg.jpg
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/cascade.css b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/cascade.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/cascade.css
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/cascade.css
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/dashboard.css b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/dashboard.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/dashboard.css
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/dashboard.css
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/header.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/header.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/header.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/header.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/COPYING.oxygen
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/datetime.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/datetime.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/datetime.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/datetime.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/default.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/default.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/default.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/default.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/desktop.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/desktop.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/desktop.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/desktop.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/flash.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/flash.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/flash.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/flash.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/freifunk.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/freifunk.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/freifunk.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/freifunk.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/harddisk.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/harddisk.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/harddisk.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/harddisk.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/key.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/key.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/key.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/key.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/lightbulb.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/lightbulb.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/lightbulb.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/lightbulb.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/login.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/login.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/login.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/login.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/logout.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/logout.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/logout.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/logout.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/network.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/network.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/network.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/network.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/overview.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/overview.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/overview.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/overview.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/package.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/package.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/package.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/package.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/restart.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/restart.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/restart.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/restart.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/services.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/services.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/services.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/services.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/shell.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/shell.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/shell.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/shell.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/stats.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/stats.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/stats.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/stats.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/status.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/status.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/status.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/status.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/switch.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/switch.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/switch.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/switch.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/system.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/system.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/system.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/system.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/worker.png b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/worker.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/worker.png
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/icons/worker.png
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie6.css b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie6.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie6.css
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie6.css
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie7.css b/openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie7.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie7.css
rename to openwrt/package/luci/themes/openwrt.org-oxygen/htdocs/luci-static/openwrt.org-oxygen/ie7.css
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/ipkg/postinst b/openwrt/package/luci/themes/openwrt.org-oxygen/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/ipkg/postinst
rename to openwrt/package/luci/themes/openwrt.org-oxygen/ipkg/postinst
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/dashboard.htm b/openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/dashboard.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/dashboard.htm
rename to openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/dashboard.htm
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/footer.htm b/openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/footer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/footer.htm
rename to openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/footer.htm
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm b/openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
rename to openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/indexer.htm b/openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/indexer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/indexer.htm
rename to openwrt/package/luci/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/indexer.htm
diff --git a/openwrt/packages/luci/themes/openwrt.org-oxygen/root/etc/uci-defaults/luci-theme-openwrt-oxygen b/openwrt/package/luci/themes/openwrt.org-oxygen/root/etc/uci-defaults/luci-theme-openwrt-oxygen
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org-oxygen/root/etc/uci-defaults/luci-theme-openwrt-oxygen
rename to openwrt/package/luci/themes/openwrt.org-oxygen/root/etc/uci-defaults/luci-theme-openwrt-oxygen
diff --git a/openwrt/packages/luci/themes/openwrt.org/Makefile b/openwrt/package/luci/themes/openwrt.org/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/Makefile
rename to openwrt/package/luci/themes/openwrt.org/Makefile
diff --git a/openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/bg.jpg b/openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/bg.jpg
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/bg.jpg
rename to openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/bg.jpg
diff --git a/openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
rename to openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
diff --git a/openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/header.png b/openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/header.png
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/header.png
rename to openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/header.png
diff --git a/openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css b/openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
rename to openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
diff --git a/openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css b/openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
rename to openwrt/package/luci/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
diff --git a/openwrt/packages/luci/themes/openwrt.org/ipkg/postinst b/openwrt/package/luci/themes/openwrt.org/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/ipkg/postinst
rename to openwrt/package/luci/themes/openwrt.org/ipkg/postinst
diff --git a/openwrt/packages/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm b/openwrt/package/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
rename to openwrt/package/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
diff --git a/openwrt/packages/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/openwrt/package/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
rename to openwrt/package/luci/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
diff --git a/openwrt/packages/luci/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt b/openwrt/package/luci/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
similarity index 100%
rename from openwrt/packages/luci/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
rename to openwrt/package/luci/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
diff --git a/openwrt/packages/luci/themes/oxygen/Makefile b/openwrt/package/luci/themes/oxygen/Makefile
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/Makefile
rename to openwrt/package/luci/themes/oxygen/Makefile
diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css b/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css
rename to openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/cascade.css
diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css b/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css
rename to openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/dashboard.css
diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/flukso.png b/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/flukso.png
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/flukso.png
rename to openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/flukso.png
diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/COPYING.oxygen b/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/COPYING.oxygen
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/COPYING.oxygen
rename to openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/COPYING.oxygen
diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/network.png b/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/network.png
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/network.png
rename to openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/network.png
diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/system.png b/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/system.png
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/system.png
rename to openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/system.png
diff --git a/openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/wifi.png b/openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/wifi.png
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/wifi.png
rename to openwrt/package/luci/themes/oxygen/htdocs/luci-static/oxygen/icons/wifi.png
diff --git a/openwrt/packages/luci/themes/oxygen/ipkg/postinst b/openwrt/package/luci/themes/oxygen/ipkg/postinst
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/ipkg/postinst
rename to openwrt/package/luci/themes/oxygen/ipkg/postinst
diff --git a/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/dashboard.htm b/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/dashboard.htm
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/dashboard.htm
rename to openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/dashboard.htm
diff --git a/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/footer.htm b/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/footer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/footer.htm
rename to openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/footer.htm
diff --git a/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm b/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm
rename to openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/header.htm
diff --git a/openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/indexer.htm b/openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/indexer.htm
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/luasrc/view/themes/oxygen/indexer.htm
rename to openwrt/package/luci/themes/oxygen/luasrc/view/themes/oxygen/indexer.htm
diff --git a/openwrt/packages/luci/themes/oxygen/root/etc/uci-defaults/luci-theme-oxygen b/openwrt/package/luci/themes/oxygen/root/etc/uci-defaults/luci-theme-oxygen
similarity index 100%
rename from openwrt/packages/luci/themes/oxygen/root/etc/uci-defaults/luci-theme-oxygen
rename to openwrt/package/luci/themes/oxygen/root/etc/uci-defaults/luci-theme-oxygen
diff --git a/openwrt/packages/ntpclient/Makefile b/openwrt/package/ntpclient/Makefile
similarity index 100%
rename from openwrt/packages/ntpclient/Makefile
rename to openwrt/package/ntpclient/Makefile
diff --git a/openwrt/packages/ntpclient/files/ntpclient.config b/openwrt/package/ntpclient/files/ntpclient.config
similarity index 100%
rename from openwrt/packages/ntpclient/files/ntpclient.config
rename to openwrt/package/ntpclient/files/ntpclient.config
diff --git a/openwrt/packages/ntpclient/files/ntpclient.hotplug b/openwrt/package/ntpclient/files/ntpclient.hotplug
similarity index 100%
rename from openwrt/packages/ntpclient/files/ntpclient.hotplug
rename to openwrt/package/ntpclient/files/ntpclient.hotplug
diff --git a/openwrt/packages/ntpclient/patches/100-daemon.patch b/openwrt/package/ntpclient/patches/100-daemon.patch
similarity index 100%
rename from openwrt/packages/ntpclient/patches/100-daemon.patch
rename to openwrt/package/ntpclient/patches/100-daemon.patch
diff --git a/openwrt/packages/xyssl/Makefile b/openwrt/package/xyssl/Makefile
similarity index 100%
rename from openwrt/packages/xyssl/Makefile
rename to openwrt/package/xyssl/Makefile
diff --git a/openwrt/packages/xyssl/patches/100-shared.patch b/openwrt/package/xyssl/patches/100-shared.patch
similarity index 100%
rename from openwrt/packages/xyssl/patches/100-shared.patch
rename to openwrt/package/xyssl/patches/100-shared.patch
diff --git a/openwrt/packages/xyssl/patches/110-make.patch b/openwrt/package/xyssl/patches/110-make.patch
similarity index 100%
rename from openwrt/packages/xyssl/patches/110-make.patch
rename to openwrt/package/xyssl/patches/110-make.patch
diff --git a/openwrt/patches/100.disable.console.patch b/openwrt/patches/100.disable.console.patch
index 1c67ddf..487bddf 100644
--- a/openwrt/patches/100.disable.console.patch
+++ b/openwrt/patches/100.disable.console.patch
@@ -1,7 +1,7 @@
-Index: config-2.6.26
+Index: target/linux/generic-2.6/config-2.6.26
 ===================================================================
---- config-2.6.26	(revision 16491)
-+++ config-2.6.26	(working copy)
+--- target/linux/generic-2.6/config-2.6.26	(revision 16491)
++++ target/linux/generic-2.6/config-2.6.26	(working copy)
 @@ -1359,7 +1359,7 @@
  # CONFIG_SENSORS_W83L785TS is not set
  # CONFIG_SENSORS_W83L786NG is not set
diff --git a/openwrt/patches/110.set.console.baud.to.4800.patch b/openwrt/patches/110.set.console.baud.to.4800.patch
index 2e9ca59..a5f9987 100644
--- a/openwrt/patches/110.set.console.baud.to.4800.patch
+++ b/openwrt/patches/110.set.console.baud.to.4800.patch
@@ -1,7 +1,20 @@
-Index: config-2.6.26
+Index: target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/ar5315.h
 ===================================================================
---- config-2.6.26	(revision 16491)
-+++ config-2.6.26	(working copy)
+--- target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/ar5315.h	(revision 16491)
++++ target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/ar5315.h	(working copy)
+@@ -355,7 +355,7 @@
+ #define AR5315_GPIO_INT_LVL_HIGH			2   /* High Level Triggered */
+ #define AR5315_GPIO_INT_LVL_EDGE			3   /* Edge Triggered */
+ 
+-#define AR5315_RESET_GPIO       5
++#define AR5315_RESET_GPIO       6
+ #define AR5315_NUM_GPIO         22
+ 
+ 
+Index: target/linux/atheros/config-2.6.26
+===================================================================
+--- target/linux/atheros/config-2.6.26	(revision 16491)
++++ target/linux/atheros/config-2.6.26	(working copy)
 @@ -20,7 +20,7 @@
  # CONFIG_BT is not set
  CONFIG_CEVT_R4K=y
diff --git a/openwrt/patches/120.set.AR5315_RESET_GPIO.to.6.patch b/openwrt/patches/120.set.AR5315_RESET_GPIO.to.6.patch
index 7412146..63296c5 100644
--- a/openwrt/patches/120.set.AR5315_RESET_GPIO.to.6.patch
+++ b/openwrt/patches/120.set.AR5315_RESET_GPIO.to.6.patch
@@ -1,7 +1,7 @@
-Index: ar5315.h
+Index: target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/ar5315.h
 ===================================================================
---- ar5315.h	(revision 16491)
-+++ ar5315.h	(working copy)
+--- target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/ar5315.h	(revision 16491)
++++ target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/ar5315.h	(working copy)
 @@ -355,7 +355,7 @@
  #define AR5315_GPIO_INT_LVL_HIGH			2   /* High Level Triggered */
  #define AR5315_GPIO_INT_LVL_EDGE			3   /* Edge Triggered */
diff --git a/openwrt/patches/INSTALL.txt b/openwrt/patches/INSTALL.txt
deleted file mode 100644
index 034a1e7..0000000
--- a/openwrt/patches/INSTALL.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id$
-
-apply following patches to a fresh 8.09 installation:
------------------------------------------------------
-100.disable.console.patch		in	8.09_base_dir/target/linux/generic-2.6/
-110.set.console.baud.to.4800.patch	in	8.09_base_dir/target/linux/atheros/
-120.set.AR5315_RESET_GPIO.to.6.patch	in	8.09_base_dir/target/linux/atheros/files/include/asm-mips/mach-atheros/ar5315/
-
-symlink these patches in the appropriate directory:
----------------------------------------------------
-245.ignore.dhcpc.sigterm.patch		in	8.09_base_dir/package/busybox/patches/