* Mördercommit ;-)

* Major Repository Reorganisation
* API 0.4 Softfreeze to come

76 files changed, 0 insertions, 2571 deletions

diff --git a/module/admin-core/Makefile b/module/admin-core/Makefile
deleted file mode 100644
index 708c1c239..000000000
--- a/module/admin-core/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-LUAC = luac
-LUAC_OPTIONS = -s
-
-FILES = i18n/* view/*/*.htm
-
-CFILES = controller/*/*.lua model/cbi/*/*.lua model/menu/*.lua 
-
-DIRECTORIES = model/cbi model/menu controller i18n view
-
-
-INFILES = $(CFILES:%=src/%)
-OUTDIRS = $(DIRECTORIES:%=dist/%)
-CPFILES = $(FILES:%=src/%)
-
-.PHONY: all compile source clean depends
-
-all: compile
-
-depends:
-	mkdir -p $(OUTDIRS)
-	for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done
-
-compile: depends
-	for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done
-	
-source: depends
-	for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done
-	
-	
-clean:
-	rm dist -rf
diff --git a/module/admin-core/contrib/ffluci-flash b/module/admin-core/contrib/ffluci-flash
deleted file mode 100644
index 3ff478f0f..000000000
--- a/module/admin-core/contrib/ffluci-flash
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-. /etc/functions.sh
-
-# initialize defaults
-RAMFS_COPY_BIN=""       # extra programs for temporary ramfs root
-RAMFS_COPY_DATA=""      # extra data files
-export KEEP_PATTERN=""
-export VERBOSE=1
-
-# parse options
-while [ -n "$1" ]; do
-        case "$1" in
-                -k)
-                		shift
-                		export KEEP_PATTERN="$1"
-                ;;
-                -*)
-                        echo "Invalid option: $1"
-                        exit 1
-                ;;
-                *) break;;
-        esac
-        shift;
-done
-
-export CONFFILES=/tmp/sysupgrade.conffiles
-export CONF_TAR=/tmp/sysupgrade.tgz
-
-[ -f $CONFFILES ] && rm $CONFFILES
-[ -f $CONF_TAR ]  && rm $CONF_TAR
-
-export ARGV="$*"
-export ARGC="$#"
-
-[ -z "$ARGV" ] && {
-        cat <<EOF
-Usage: $0 [options] <image file or URL>
-
-Options:
-        -k	<"file 1, file 2, ...">	Files to be kept
-EOF
-        exit 1
-}
-
-add_pattern_conffiles() {
-	local file="$1"
-	find $KEEP_PATTERN >> "$file" 2>/dev/null
-	return 0
-}
-
-# hooks
-sysupgrade_image_check="platform_check_image"
-sysupgrade_init_conffiles=""
-
-[ -n "$KEEP_PATTERN" ] && append sysupgrade_init_conffiles "add_pattern_conffiles"
-
-include /lib/upgrade
-
-do_save_conffiles() {
-        [ -z "$(rootfs_type)" ] && {
-                echo "Cannot save config while running from ramdisk."
-                exit 3
-                return 0
-        }
-        run_hooks "$CONFFILES" $sysupgrade_init_conffiles
-
-        v "Saving config files..."
-        [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
-        tar c${TAR_V}zf "$CONF_TAR" -T "$CONFFILES" 2>/dev/null
-}
-
-type platform_check_image >/dev/null 2>/dev/null || {
-        echo "Firmware upgrade is not implemented for this platform."
-        exit 1
-}
-
-for check in $sysupgrade_image_check; do
-        ( eval "$check \"\$ARGV\"" ) || {
-                echo "Image check '$check' failed."
-                exit 2
-        }
-done
-
-[ -n "$sysupgrade_init_conffiles" ] && do_save_conffiles
-run_hooks "" $sysupgrade_pre_upgrade
-
-v "Switching to ramdisk..."
-run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
\ No newline at end of file
diff --git a/module/admin-core/contrib/init.d/luci_freifunk b/module/admin-core/contrib/init.d/luci_freifunk
deleted file mode 100644
index 38779cb8b..000000000
--- a/module/admin-core/contrib/init.d/luci_freifunk
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=70
-
-start() {
-	include /lib/network
-	scan_interfaces
-	
-	
-	### Read interface names
-	config_get wanif wan ifname
-	config_get lanif lan ifname
-	config_get ffif  ff  ifname
-	config_get ffdif ffdhcp  ifname
-	
-	config_get lanip   lan ipaddr
-	config_get lanmask lan netmask
-	
-	config_get ffip    ff ipaddr
-	config_get ffmask  ff netmask
-	
-	config_get ffdip   ffdhcp ipaddr
-	config_get ffdmask ffdhcp netmask
-	
-	[ -n "$ffif" ] || return 0
-	
-	
-	### Creating chains
-	iptables -N luci_freifunk_forwarding
-	iptables -t nat -N luci_freifunk_postrouting
-		
-	
-	### Read from config
-	config_load freifunk
-	
-	config_get_bool internal routing internal
-	[ -n "$wanif" ] && config_get_bool internet routing internet
-	
-	
-	### Freifunk to Freifunk
-	[ "$internal" -gt 0 ] && {
-		iptables -A luci_freifunk_forwarding -i "$ffif" -o "$ffif" -j ACCEPT
-	}
-	
-	### Freifunk DHCP to Freifunk
-	[ "$internal" -gt 0 -a -n "$ffdif" ] && {
-		eval "$(ipcalc.sh $ffdip $ffdmask)"
-		
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$ffif" -j MASQUERADE
-	}
-	
-	### Lan to Freifunk	
-	[ -n "$lanif" ] && {
-		eval "$(ipcalc.sh $lanip $lanmask)"
-		
-		iptables -A luci_freifunk_forwarding -i "$lanif" -o "$ffif" -j ACCEPT
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$ffif" -j MASQUERADE
-	}
-	
-	### Freifunk to Wan
-	[ "$internet" -gt 0 ] && {		
-		eval "$(ipcalc.sh $ffip $ffmask)"		
-		
-		iptables -A luci_freifunk_forwarding -i "$ffif" -o "$wanif" -j ACCEPT
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$wanif" -j MASQUERADE
-	}
-	
-	### Freifunk DHCP to Wan
-	[ "$internet" -gt 0 -a -n "$ffdif" ] && {		
-		eval "$(ipcalc.sh $ffdip $ffdmask)"		
-		
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$wanif" -j MASQUERADE
-	}
-	
-	### Hook in the chains
-	iptables -A forwarding_rule -j luci_freifunk_forwarding
-	iptables -t nat -A postrouting_rule -j luci_freifunk_postrouting
-}
-
-stop() {
-	### Hook out the chains
-	iptables -D forwarding_rule -j luci_freifunk_forwarding
-	iptables -t nat -D postrouting_rule -j luci_freifunk_postrouting
-	
-	### Clear the chains
-	iptables -F luci_freifunk_forwarding
-	iptables -t nat -F luci_freifunk_postrouting
-	
-	### Delete chains
-	iptables -X luci_freifunk_forwarding
-	iptables -t nat -X luci_freifunk_postrouting
-}
diff --git a/module/admin-core/contrib/init.d/luci_fw b/module/admin-core/contrib/init.d/luci_fw
deleted file mode 100644
index e98b3f729..000000000
--- a/module/admin-core/contrib/init.d/luci_fw
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=46
-
-apply_portfw() {
-	local cfg="$1"
-	config_get proto "$cfg" proto
-	config_get dport "$cfg" dport
-	config_get iface "$cfg" iface
-	config_get to    "$cfg" to
-
-	ports=$(echo $to | cut -sd: -f2)
-	if [ -n "$ports" ]; then
-		ports="--dport $(echo $ports | sed -e 's/-/:/')"
-	else
-		ports="--dport $dport"
-	fi
-
-	ip=$(echo $to | cut -d: -f1)
-	
-	if ([ "$proto" == "tcpudp" ] || [ "$proto" == "tcp" ]); then
-		iptables -t nat -A luci_fw_prerouting -i "$iface" -p tcp --dport "$dport" -j DNAT --to "$to"
-		iptables -A luci_fw_forward -i "$iface" -p tcp -d "$ip" $ports -j ACCEPT
-	fi
-
-	if ([ "$proto" == "tcpudp" ] || [ "$proto" == "udp" ]); then
-		iptables -t nat -A luci_fw_prerouting -i "$iface" -p udp --dport "$dport" -j DNAT --to "$to"
-		iptables -A luci_fw_forward -i "$iface" -p udp -d "$ip" $ports -j ACCEPT
-	fi
-}
-
-apply_rule() {
-	local cfg="$1"
-	local cmd=""
-
-	config_get chain "$cfg" chain
-	[ -n "$chain" ] || return 0
-	[ "$chain" == "forward" ] && cmd="$cmd -A luci_fw_forward"
-	[ "$chain" == "input" ] && cmd="$cmd -A luci_fw_input"
-	[ "$chain" == "output" ] && cmd="$cmd -A luci_fw_output"
-	[ "$chain" == "prerouting" ] && cmd="$cmd -t nat -A luci_fw_prerouting"
-	[ "$chain" == "postrouting" ] && cmd="$cmd -t nat -A luci_fw_postrouting"
-	
-	config_get iface "$cfg" iface
-	[ -n "$iface" ] && cmd="$cmd -i $iface"	
-
-	config_get oface "$cfg" oface
-	[ -n "$oface" ] && cmd="$cmd -o $oface"	
-
-	config_get proto "$cfg" proto
-	[ -n "$proto" ] && cmd="$cmd -p $proto"	
-
-	config_get source "$cfg" source
-	[ -n "$source" ] && cmd="$cmd -s $source"	
-
-	config_get destination "$cfg" destination
-	[ -n "$destination" ] && cmd="$cmd -d $destination"	
-
-	config_get sport "$cfg" sport
-	[ -n "$sport" ] && cmd="$cmd --sport $sport"	
-
-	config_get dport "$cfg" dport
-	[ -n "$dport" ] && cmd="$cmd --dport $dport"	
-	
-	config_get todest "$cfg" todest
-	[ -n "$todest" ] && cmd="$cmd --to-destination $todest"	
-
-	config_get tosrc "$cfg" tosrc
-	[ -n "$tosrc" ] && cmd="$cmd --to-source $tosrc"	
-	
-	config_get mac "$cfg" mac
-	[ -n "$mac" ] && cmd="$cmd -m mac --mac-source $mac"
-
-	config_get jump "$cfg" jump
-	[ -n "$jump" ] && cmd="$cmd -j $jump"	
-
-	config_get command "$cfg" command
-	[ -n "$command" ] && cmd="$cmd $command"	
-
-	iptables $cmd
-}
-
-start() {
-	### Create subchains
-	iptables -N luci_fw_input
-	iptables -N luci_fw_output
-	iptables -N luci_fw_forward
-	iptables -t nat -N luci_fw_prerouting
-	iptables -t nat -N luci_fw_postrouting
-	
-	### Hook in the chains
-	iptables -A input_rule -j luci_fw_input
-	iptables -A output_rule -j luci_fw_output
-	iptables -A forwarding_rule -j luci_fw_forward
-	iptables -t nat -A prerouting_rule -j luci_fw_prerouting
-	iptables -t nat -A postrouting_rule -j luci_fw_postrouting
-	
-	### Read chains from config
-	config_load luci_fw
-	config_foreach apply_portfw portfw
-	config_foreach apply_rule rule
-}
-
-stop() {
-	### Hook out the chains
-	iptables -D input_rule -j luci_fw_input
-	iptables -D output_rule -j luci_fw_output
-	iptables -D forwarding_rule -j luci_fw_forward
-	iptables -t nat -D prerouting_rule -j luci_fw_prerouting
-	iptables -t nat -D postrouting_rule -j luci_fw_postrouting	
-	
-	### Clear subchains
-	iptables -F luci_fw_input
-	iptables -F luci_fw_output
-	iptables -F luci_fw_forward
-	iptables -t nat -F luci_fw_prerouting
-	iptables -t nat -F luci_fw_postrouting
-	
-	### Delete subchains
-	iptables -X luci_fw_input
-	iptables -X luci_fw_output
-	iptables -X luci_fw_forward
-	iptables -t nat -X luci_fw_prerouting
-	iptables -t nat -X luci_fw_postrouting
-}
diff --git a/module/admin-core/contrib/luci-splash b/module/admin-core/contrib/luci-splash
deleted file mode 100644
index 188ad7aa0..000000000
--- a/module/admin-core/contrib/luci-splash
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-echo "Status: 302 Found"
-echo "Location: /cgi-bin/ffluci/splash/splash$PATH_INFO"
-echo
\ No newline at end of file
diff --git a/module/admin-core/contrib/uci/luci_fw b/module/admin-core/contrib/uci/luci_fw
deleted file mode 100644
index c7dec7f2c..000000000
--- a/module/admin-core/contrib/uci/luci_fw
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 
\ No newline at end of file
diff --git a/module/admin-core/src/controller/admin/index.lua b/module/admin-core/src/controller/admin/index.lua
deleted file mode 100644
index edca5721e..000000000
--- a/module/admin-core/src/controller/admin/index.lua
+++ /dev/null
@@ -1,171 +0,0 @@
-module("ffluci.controller.admin.index", package.seeall)
-
-function action_wizard()
-	if ffluci.http.formvalue("ip") then
-		return configure_freifunk()
-	end
-	
-	local ifaces = {}
-	local wldevs = ffluci.model.uci.sections("wireless")
-	
-	if wldevs then
-		for k, v in pairs(wldevs) do
-			if v[".type"] == "wifi-device" then
-				table.insert(ifaces, k)
-			end
-		end
-	end
-	
-	ffluci.template.render("admin_index/wizard", {ifaces=ifaces})
-end
-
-function configure_freifunk()
-	local ip  = ffluci.http.formvalue("ip")
-	local uci = ffluci.model.uci.Session()
-	
-	-- Load UCI
-	uci:t_load("network")
-	uci:t_load("dhcp")
-	uci:t_load("freifunk")
-	uci:t_load("luci_splash")
-	uci:t_load("olsr")
-	uci:t_load("wireless")
-	
-	
-	-- Configure FF-Interface
-	uci:t_del("network", "ff")
-	uci:t_del("network", "ffdhcp")
-	
-	uci:t_set("network", "ff", nil, "interface")
-	uci:t_set("network", "ff", "type", "bridge")
-	uci:t_set("network", "ff", "proto", "static")
-	uci:t_set("network", "ff", "ipaddr", ip)
-	uci:t_set("network", "ff", "netmask", uci:t_get("freifunk", "community", "mask")) 
-	uci:t_set("network", "ff", "dns", uci:t_get("freifunk", "community", "dns")) 
-	
-	-- Enable internal routing
-	uci:t_set("freifunk", "routing", "internal", "1")
-	
-	-- Enable internet routing
-	if ffluci.http.formvalue("shareinet") then
-		uci:t_set("freifunk", "routing", "internet", "1")
-	else
-		uci:t_set("freifunk", "routing", "internet", "0")
-	end
-	
-	-- Configure DHCP
-	if ffluci.http.formvalue("dhcp") then
-		local dhcpnet = uci:t_get("freifunk", "community", "dhcp"):match("^([0-9]+)")
-		local dhcpip  = ip:gsub("^[0-9]+", dhcpnet)
-	
-		uci:t_set("network", "ffdhcp", nil, "interface")
-		uci:t_set("network", "ffdhcp", "proto", "static")
-		uci:t_set("network", "ffdhcp", "ifname", "br-ff:dhcp")
-		uci:t_set("network", "ffdhcp", "ipaddr", dhcpip)
-		uci:t_set("network", "ffdhcp", "netmask", uci:t_get("freifunk", "community", "dhcpmask"))
-		
-		local dhcp = uci:t_sections("dhcp")
-		if dhcp then
-			for k, v in pairs(dhcp) do
-				if v[".type"] == "dhcp" and v.interface == "ffdhcp" then
-					uci:t_del("dhcp", k)
-				end
-			end		
-			
-			local dhcpbeg = 48 + tonumber(ip:match("[0-9]+$")) * 4
-			
-			local sk = uci:t_add("dhcp", "dhcp")
-			uci:t_set("dhcp", sk, "interface", "ffdhcp")
-			uci:t_set("dhcp", sk, "start", dhcpbeg)
-			uci:t_set("dhcp", sk, "limit", (dhcpbeg < 252) and 3 or 2)
-			uci:t_set("dhcp", sk, "leasetime", "30m")
-		end 
-		
-		local splash = uci:t_sections("luci_splash")
-		if splash then
-			for k, v in pairs(splash) do
-				if v[".type"] == "iface" then
-					uci:t_del("luci_splash", k)
-				end
-			end		
-			
-			local sk = uci:t_add("luci_splash", "iface")
-			uci:t_set("luci_splash", sk, "network", "ffdhcp")
-		end 		
-	end
-	
-	-- Configure OLSR
-	if ffluci.http.formvalue("olsr") and uci:t_sections("olsr") then
-		for k, v in pairs(uci:t_sections("olsr")) do
-			if v[".type"] == "Interface" or v[".type"] == "LoadPlugin" then
-				uci:t_del("olsr", k)
-			end
-		end
-		
-		if ffluci.http.formvalue("shareinet") then
-			uci:t_set("olsr", "dyn_gw", nil, "LoadPlugin")
-			uci:t_set("olsr", "dyn_gw", "Library", "olsrd_dyn_gw.so.0.4")
-		end
-		
-		uci:t_set("olsr", "nameservice", nil, "LoadPlugin")
-		uci:t_set("olsr", "nameservice", "Library", "olsrd_nameservice.so.0.3")
-		uci:t_set("olsr", "nameservice", "name", ip:gsub("%.", "-"))
-		uci:t_set("olsr", "nameservice", "hosts_file", "/var/etc/hosts")
-		uci:t_set("olsr", "nameservice", "suffix", ".olsr")
-		uci:t_set("olsr", "nameservice", "latlon_infile", "/tmp/latlon.txt")
-		
-		uci:t_set("olsr", "txtinfo", nil, "LoadPlugin")
-		uci:t_set("olsr", "txtinfo", "Library", "olsrd_txtinfo.so.0.1")
-		uci:t_set("olsr", "txtinfo", "Accept", "127.0.0.1")
-		
-		local oif = uci:t_add("olsr", "Interface")
-		uci:t_set("olsr", oif, "Interface", "ff")
-		uci:t_set("olsr", oif, "HelloInterval", "6.0")
-		uci:t_set("olsr", oif, "HelloValidityTime", "108.0")
-		uci:t_set("olsr", oif, "TcInterval", "4.0")
-		uci:t_set("olsr", oif, "TcValidityTime", "324.0")
-		uci:t_set("olsr", oif, "MidInterval", "18.0")
-		uci:t_set("olsr", oif, "MidValidityTime", "324.0")
-		uci:t_set("olsr", oif, "HnaInterval", "18.0")
-		uci:t_set("olsr", oif, "HnaValidityTime", "108.0")
-	end
-	
-	-- Configure Wifi
-	local wcfg = uci:t_sections("wireless")
-	if wcfg then
-		for iface, v in pairs(wcfg) do
-			if v[".type"] == "wifi-device" and ffluci.http.formvalue("wifi."..iface) then
-				-- Cleanup
-				for k, j in pairs(wcfg) do
-					if j[".type"] == "wifi-iface" and j.device == iface then
-						uci:t_del("wireless", k)
-					end
-				end
-				
-				uci:t_set("wireless", iface, "disabled", "0")
-				uci:t_set("wireless", iface, "mode", "11g")
-				uci:t_set("wireless", iface, "txantenna", 1)
-				uci:t_set("wireless", iface, "rxantenna", 1)
-				uci:t_set("wireless", iface, "channel", uci:t_get("freifunk", "community", "channel")) 
-				
-				local wif = uci:t_add("wireless", "wifi-iface")
-				uci:t_set("wireless", wif, "device", iface)
-				uci:t_set("wireless", wif, "network", "ff")
-				uci:t_set("wireless", wif, "mode", "adhoc")
-				uci:t_set("wireless", wif, "ssid", uci:t_get("freifunk", "community", "essid"))
-				uci:t_set("wireless", wif, "bssid", uci:t_get("freifunk", "community", "bssid"))
-				uci:t_set("wireless", wif, "txpower", 13)
-			end
-		end
-	end
-	
-	-- Save UCI
-	uci:t_save("network")
-	uci:t_save("dhcp")
-	uci:t_save("freifunk")
-	uci:t_save("luci_splash")
-	uci:t_save("olsr")
-	uci:t_save("wireless")
-
-	ffluci.http.redirect(ffluci.dispatcher.build_url("admin", "uci", "changes"))
-end
\ No newline at end of file
diff --git a/module/admin-core/src/controller/admin/network.lua b/module/admin-core/src/controller/admin/network.lua
deleted file mode 100644
index 0e3165f08..000000000
--- a/module/admin-core/src/controller/admin/network.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.admin.network", package.seeall)
\ No newline at end of file
diff --git a/module/admin-core/src/controller/admin/services.lua b/module/admin-core/src/controller/admin/services.lua
deleted file mode 100644
index 42181212b..000000000
--- a/module/admin-core/src/controller/admin/services.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.admin.services", package.seeall)
\ No newline at end of file
diff --git a/module/admin-core/src/controller/admin/system.lua b/module/admin-core/src/controller/admin/system.lua
deleted file mode 100644
index 7a927d604..000000000
--- a/module/admin-core/src/controller/admin/system.lua
+++ /dev/null
@@ -1,200 +0,0 @@
-module("ffluci.controller.admin.system", package.seeall)
-
-require("ffluci.sys")
-require("ffluci.http")
-require("ffluci.util")
-require("ffluci.fs")
-require("ffluci.model.ipkg")
-require("ffluci.model.uci")
-
-function action_editor()
-	local file = ffluci.http.formvalue("file", "")
-	local data = ffluci.http.formvalue("data")
-	local err  = nil
-	local msg  = nil
-	local stat = true
-	
-	if file and data then
-		stat, err = ffluci.fs.writefile(file, data)
-	end
-	
-	if not stat then
-		err = ffluci.util.split(err, " ")
-		table.remove(err, 1)
-		msg = table.concat(err, " ")
-	end
-	
-	local cnt, err = ffluci.fs.readfile(file)
-	if cnt then
-		cnt = ffluci.util.pcdata(cnt)
-	end
-	ffluci.template.render("admin_system/editor", {fn=file, cnt=cnt, msg=msg})	
-end
-
-function action_ipkg()
-	local file = "/etc/ipkg.conf"
-	local data = ffluci.http.formvalue("data")
-	local stat = nil
-	local err  = nil
-	
-	if data then
-		stat, err = ffluci.fs.writefile(file, data)
-	end	
-	
-	local cnt  = ffluci.fs.readfile(file)	
-	if cnt then
-		cnt = ffluci.util.pcdata(cnt)
-	end
-	
-	ffluci.template.render("admin_system/ipkg", {cnt=cnt, msg=err})	
-end
-
-function action_packages()
-	local ipkg = ffluci.model.ipkg
-	local void = nil
-	local submit = ffluci.http.formvalue("submit")
-	
-	
-	-- Search query
-	local query = ffluci.http.formvalue("query")
-	query = (query ~= '') and query or nil
-	
-	
-	-- Packets to be installed
-	local install = submit and ffluci.http.formvaluetable("install")
-	
-	-- Install from URL
-	local url = ffluci.http.formvalue("url")
-	if url and url ~= '' and submit then
-		if not install then
-			install = {}
-		end
-		install[url] = 1
-	end
-	
-	-- Do install
-	if install then
-		for k, v in pairs(install) do
-			void, install[k] = ipkg.install(k)
-		end
-	end
-	
-	
-	-- Remove packets
-	local remove = submit and ffluci.http.formvaluetable("remove")
-	if remove then	
-		for k, v in pairs(remove) do
-			void, remove[k] = ipkg.remove(k)
-		end	
-	end
-	
-	
-	-- Update all packets
-	local update = ffluci.http.formvalue("update")
-	if update then
-		void, update = ipkg.update()
-	end
-	
-	
-	-- Upgrade all packets
-	local upgrade = ffluci.http.formvalue("upgrade")
-	if upgrade then
-		void, upgrade = ipkg.upgrade()
-	end
-	
-	
-	-- Package info
-	local info = ffluci.model.ipkg.info(query)
-	info = info or {}
-	local pkgs = {}
-	
-	-- Sort after status and name
-	for k, v in pairs(info) do
-		local x = 0
-		for i, j in pairs(pkgs) do
-			local vins = (v.Status and v.Status.installed)
-			local jins = (j.Status and j.Status.installed)
-			if vins ~= jins then
-				if vins then
-					break
-				end
-			else
-				if j.Package > v.Package then
-					break
-				end
-			end
-			x = i
-		end
-		table.insert(pkgs, x+1, v)
-	end 
-	
-	ffluci.template.render("admin_system/packages", {pkgs=pkgs, query=query,
-	 install=install, remove=remove, update=update, upgrade=upgrade})	
-end
-
-function action_passwd()
-	local p1 = ffluci.http.formvalue("pwd1")
-	local p2 = ffluci.http.formvalue("pwd2")
-	local stat = nil
-	
-	if p1 or p2 then
-		if p1 == p2 then
-			stat = ffluci.sys.user.setpasswd("root", p1)
-		else
-			stat = 10
-		end
-	end
-	
-	ffluci.template.render("admin_system/passwd", {stat=stat})
-end
-
-function action_reboot()
-	local reboot = ffluci.http.formvalue("reboot")
-	ffluci.template.render("admin_system/reboot", {reboot=reboot})
-	if reboot then
-		ffluci.sys.reboot()
-	end
-end
-
-function action_sshkeys()
-	local file = "/etc/dropbear/authorized_keys"
-	local data = ffluci.http.formvalue("data")
-	local stat = nil
-	local err  = nil
-	
-	if data then
-		stat, err = ffluci.fs.writefile(file, data)
-	end	
-	
-	local cnt  = ffluci.fs.readfile(file)	
-	if cnt then
-		cnt = ffluci.util.pcdata(cnt)
-	end
-	
-	ffluci.template.render("admin_system/sshkeys", {cnt=cnt, msg=err})	
-end
-
-function action_upgrade()
-	local ret  = nil
-	local plat = ffluci.fs.mtime("/lib/upgrade/platform.sh")
-	
-	local image   = ffluci.http.formvalue("image")
-	local imgname = ffluci.http.formvalue("image_name")
-	local keepcfg = ffluci.http.formvalue("keepcfg")
-	
-	if plat and imgname then
-		local kpattern = nil
-		if keepcfg then
-			local files = ffluci.model.uci.sections("luci").flash_keep
-			if files.luci and files.luci.flash_keep then
-				kpattern = ""
-				for k,v in pairs(files.luci.flash_keep) do
-					kpattern = kpattern .. " " ..  v
-				end
-			end
-		end
-		ret = ffluci.sys.flash(image, kpattern)
-	end
-	
-	ffluci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret})
-end
\ No newline at end of file
diff --git a/module/admin-core/src/controller/admin/uci.lua b/module/admin-core/src/controller/admin/uci.lua
deleted file mode 100644
index cb4a95ba5..000000000
--- a/module/admin-core/src/controller/admin/uci.lua
+++ /dev/null
@@ -1,61 +0,0 @@
-module("ffluci.controller.admin.uci", package.seeall)
-require("ffluci.util")
-require("ffluci.sys")
-
--- This function has a higher priority than the admin_uci/apply template
-function action_apply()
-	local changes = ffluci.model.uci.changes()
-	local output  = ""
-	
-	if changes then
-		local com = {}
-		local run = {}
-		
-		-- Collect files to be applied and commit changes
-		for i, line in ipairs(ffluci.util.split(changes)) do
-			local r = line:match("^-?([^.]+)")
-			if r then
-				com[r] = true
-				
-				if ffluci.config.uci_oncommit and ffluci.config.uci_oncommit[r] then
-					run[ffluci.config.uci_oncommit[r]] = true
-				end
-			end
-		end
-		
-		-- Apply
-		for config, i in pairs(com) do
-			ffluci.model.uci.commit(config)
-		end 
-		
-		-- Search for post-commit commands
-		for cmd, i in pairs(run) do
-			output = output .. cmd .. ":" .. ffluci.sys.exec(cmd) .. "\n"
-		end
-	end
-	
-	ffluci.template.render("admin_uci/apply", {changes=changes, output=output})
-end
-
-
-function action_revert()
-	local changes = ffluci.model.uci.changes()
-	if changes then
-		local revert = {}
-		
-		-- Collect files to be reverted
-		for i, line in ipairs(ffluci.util.split(changes)) do
-			local r = line:match("^-?([^.]+)")
-			if r then
-				revert[r] = true
-			end
-		end
-		
-		-- Revert them
-		for k, v in pairs(revert) do
-			ffluci.model.uci.revert(k)
-		end
-	end
-	
-	ffluci.template.render("admin_uci/revert", {changes=changes})
-end
\ No newline at end of file
diff --git a/module/admin-core/src/controller/admin/wifi.lua b/module/admin-core/src/controller/admin/wifi.lua
deleted file mode 100644
index bc1040c71..000000000
--- a/module/admin-core/src/controller/admin/wifi.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.admin.wifi", package.seeall)
\ No newline at end of file
diff --git a/module/admin-core/src/controller/splash/splash.lua b/module/admin-core/src/controller/splash/splash.lua
deleted file mode 100644
index 62088be52..000000000
--- a/module/admin-core/src/controller/splash/splash.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-module("ffluci.controller.splash.splash", package.seeall)
-
-function action_activate()
-	local mac = ffluci.sys.net.ip4mac(ffluci.http.env.REMOTE_ADDR)
-	if mac and ffluci.http.formvalue("accept") then
-		os.execute("luci-splash add "..mac.." >/dev/null 2>&1")
-		ffluci.http.redirect(ffluci.model.uci.get("freifunk", "community", "homepage"))
-	else
-		ffluci.http.redirect(ffluci.dispatcher.build_url())
-	end
-end
-
-function action_accepted()
-	ffluci.http.redirect(ffluci.dispatcher.build_url())
-end
-
-function action_unknown()
-	ffluci.http.redirect(ffluci.dispatcher.build_url())
-end
\ No newline at end of file
diff --git a/module/admin-core/src/i18n/admin_index.en b/module/admin-core/src/i18n/admin_index.en
deleted file mode 100644
index 652627ab0..000000000
--- a/module/admin-core/src/i18n/admin_index.en
+++ /dev/null
@@ -1,37 +0,0 @@
-contact = "Contact"
-luci = "User Interface"
-
-hello = "Hello!"
-admin1 = "This is the administration area of FFLuCI."
-admin2 = "FFLuCI is a free, flexible, and user friendly graphical interface for configuring OpenWRT Kamikaze."
-admin3 = "On the following pages you can adjust all important settings of your router."
-admin4 = "You will find a navigation leading to the different configuration pages on the left side."
-admin5 = [[As we are always want to improve this interface we are looking forward
-to your feedback and suggestions.]]
-admin6 = "And now have fun with your router!"
-team   = "The FFLuCI Team"
-
-contact1 = [[This information will be available on the public contact page.
-As stated in the Picopeering Agreement you should at least enter your e-mail address.
-To display your router on any topography map, please enter your geographical coordinates or at least
-your street and house number in the location field.]]
-nickname = "Nickname"
-mail1 = "This field is essential!"
-phone = "Phone"
-location = "Location"
-coord = "Coordinates"
-coord1 = "Latitude;Longitude (e.g. 51.5;12.9)"
-note = "Note"
-
-luci1 = "Here you can customize the settings and the functionality of FFLuCI."
-language = "Language"
-general = "General"
-catpriv = "Category Privileges"
-catpriv1 = [[To secure FFLuCI even further the user and group privileges of
-each category can be decreased. Therefore an attacker cannot takeover the whole system
-when a security exploit for any publicly available page is found.]]
-ucicommit = "Post-commit actions"
-ucicommit1 = [[These commands will be executed automatically when a given UCI configuration is committed allowing
-changes to be applied instantly.]]
-keepflash = "Files to be kept when flashing a new firmware"
-keepflash1 = "When flashing a new firmware with FFLuCI these files will be added to the new firmware installation." 
\ No newline at end of file
diff --git a/module/admin-core/src/i18n/admin_uci.en b/module/admin-core/src/i18n/admin_uci.en
deleted file mode 100644
index 00ac5f5ff..000000000
--- a/module/admin-core/src/i18n/admin_uci.en
+++ /dev/null
@@ -1,2 +0,0 @@
-uci_applied = "The following changes were applied"
-uci_reverted = "The following changes were reverted"
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_index/contact.lua b/module/admin-core/src/model/cbi/admin_index/contact.lua
deleted file mode 100644
index 66a1ec4bd..000000000
--- a/module/admin-core/src/model/cbi/admin_index/contact.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- Todo: Translate
-m = Map("freifunk", translate("contact", "Kontakt"), translate("contact1", [[Diese Daten sind
-auf der öffentlichen Kontaktseite sichtbar. Bitte gib an, wie man dich am besten kontaktieren kann.
-Diese Informationen sollten nach der Picopeering Vereinbarung mindestens deine E-Mail-Adresse enthalten.
-Damit dein Knoten durch Topographieprogramme erfasst werden kann, gib bitte deine Geokoordinaten oder
-zumindest deine Straße und Hausnummer unter Standort an.]]))
-
-c = m:section(NamedSection, "contact", "public")
-
-c:option(Value, "nickname", translate("nickname", "Pseudonym"))
-c:option(Value, "name", translate("name", "Name"))
-c:option(Value, "mail", translate("mail", "E-Mail"), translate("mail1", "Bitte unbedingt angeben!"))
-c:option(Value, "phone", translate("phone", "Telefon"))
-c:option(Value, "location", translate("location", "Standort"))
-c:option(Value, "geo", translate("coord", "Koordinaten"), translate("coord1", "Bitte als Breite;Länge (z.B: 51.5;12.9) angeben"))
-c:option(Value, "note", translate("note", "Notiz"))
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_index/freifunk.lua b/module/admin-core/src/model/cbi/admin_index/freifunk.lua
deleted file mode 100644
index ec4d100b8..000000000
--- a/module/admin-core/src/model/cbi/admin_index/freifunk.lua
+++ /dev/null
@@ -1,23 +0,0 @@
--- Todo: Translate
-m = Map("freifunk", "Freifunk")
-
-s = m:section(NamedSection, "routing", "settings", "Netzverkehr")
-s:option(Flag, "internal", "Freifunk zulassen", "immer aktivieren!")
-s:option(Flag, "internet", "Internet zulassen")
-
-c = m:section(NamedSection, "community", "public", "Gemeinschaft", [[Dies sind die Grundeinstellungen
-für die lokale Freifunkgemeinschaft. Diese Werte wirken sich NICHT auf die Konfiguration
-des Routers aus, sondern definieren nur die Vorgaben für den Freifunkassistenten.]])
-c:option(Value, "name", "Gemeinschaft")
-c:option(Value, "homepage", "Webseite")
-c:option(Value, "essid", "ESSID")
-c:option(Value, "bssid", "BSSID")
-c:option(Value, "channel", "Funkkanal")
-c:option(Value, "realm", "Realm")
-c:option(Value, "net", "Adressbereich")
-c:option(Value, "mask", "Netzmaske")
-c:option(Value, "dns", "DNS-Server")
-c:option(Value, "dhcp", "DHCP-Bereich")
-c:option(Value, "dhcpmask", "DHCP-Maske")
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_index/luci.lua b/module/admin-core/src/model/cbi/admin_index/luci.lua
deleted file mode 100644
index 4f6910eee..000000000
--- a/module/admin-core/src/model/cbi/admin_index/luci.lua
+++ /dev/null
@@ -1,39 +0,0 @@
--- ToDo: Translate
-require("ffluci.config")
-m = Map("luci", translate("luci", "Oberfläche"), translate("luci1", 
- "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst werden."))
-
-c = m:section(NamedSection, "main", "core", translate("general", "Allgemein"))
-
-l = c:option(ListValue, "lang", translate("language", "Sprache"))
-for k, v in pairs(ffluci.config.languages) do
-	if k:sub(1, 1) ~= "." then
-		l:value(k, v)
-	end
-end
-
-t = c:option(ListValue, "mediaurlbase", translate("design", "Design"))
-for k, v in pairs(ffluci.config.themes) do
-	if k:sub(1, 1) ~= "." then
-		t:value(v, k)
-	end
-end
-
-p = m:section(NamedSection, "category_privileges", "core", translate("catpriv", "Kategorieprivilegien"),
- translate("catpriv1", [[Zur zusätzlichen Sicherung der Oberfläche gegen Angreifer, können hier die
-Ausführungsrechte der Seiten für einzelne Kategorien reduziert werden. So können z.B. Sicherheitslücken im
-ungeschützten Bereich der Oberfläche nicht mehr zur Übernahme des Routers genutzt werden.]]))
-p.dynamic = true
-
-u = m:section(NamedSection, "uci_oncommit", "event", translate("ucicommit", "UCI-Befehle beim Anwenden"),
- translate("ucicommit1", [[Beim Anwenden
-der Konfiguration aus der Oberflächliche heraus können automatisch die relevanten Dienste neugestart werden,
-sodass Änderungen sofort nach dem Anwenden aktiv werden und der Router nicht erst neugestartet werden muss.]]))
-u.dynamic = true
-
-f = m:section(NamedSection, "flash_keep", "extern", translate("keepflash", "Zu übernehmende Dateien bei Firmwareupgrade"),
- translate("keepflash1", [[Die folgenden Dateien und Verzeichnisse werden beim Aktualisieren der Firmware
-über die Oberfläche automatisch in die neue Firmware übernommen.]]))
-f.dynamic = true
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_network/dhcp.lua b/module/admin-core/src/model/cbi/admin_network/dhcp.lua
deleted file mode 100644
index caac277c4..000000000
--- a/module/admin-core/src/model/cbi/admin_network/dhcp.lua
+++ /dev/null
@@ -1,41 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-require("ffluci.model.uci")
-require("ffluci.sys")
-
-m = Map("dhcp", "DHCP", [[Mit Hilfe von DHCP können Netzteilnehmer automatisch
-ihre Netzwerkkonfiguration (IP-Adresse, Netzmaske, DNS-Server, DHCP, ...) beziehen.]])
-
-s = m:section(TypedSection, "dhcp")
-s.addremove = true
-s.anonymous = true
-
-iface = s:option(ListValue, "interface", "Schnittstelle")
-for k, v in pairs(ffluci.model.uci.sections("network")) do
-	if v[".type"] == "interface" and k ~= "loopback" then
-		iface:value(k)
-		s:depends("interface", k) -- Only change sections with existing interfaces
-	end
-end
-
-s:option(Value, "start", "Start", "Erste vergebene Adresse (letztes Oktett)").rmempty = true
-
-s:option(Value, "limit", "Limit", "Anzahl zu vergebender Adressen -1").rmempty = true
-
-s:option(Value, "leasetime", "Laufzeit").rmempty = true
-
-s:option(Flag, "dynamicdhcp", "Dynamisches DHCP").rmempty = true
-
-s:option(Value, "name", "Name").optional = true
-
-s:option(Flag, "ignore", "Schnittstelle ignorieren", "DHCP für dieses Netzwerk deaktivieren").optional = true
-
-s:option(Value, "netmask", "Netzmaske").optional = true
-
-s:option(Flag, "force", "Start erzwingen").optional = true
-
-for i, line in pairs(ffluci.sys.execl("dnsmasq --help dhcp")) do
-	k, v = line:match("([^ ]+) +([^ ]+)")
-	s:option(Value, "dhcp"..k, v).optional = true
-end
-	
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_network/firewall.lua b/module/admin-core/src/model/cbi/admin_network/firewall.lua
deleted file mode 100644
index 4ff15db53..000000000
--- a/module/admin-core/src/model/cbi/admin_network/firewall.lua
+++ /dev/null
@@ -1,63 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-m = Map("luci_fw", "Firewall", [[Mit Hilfe der Firewall können Zugriffe auf das Netzwerk
-erlaubt, verboten oder umgeleitet werden.]])
-
-s = m:section(TypedSection, "rule")
-s.addremove = true
-s.anonymous = true
-
-chain = s:option(ListValue, "chain", "Kette")
-chain:value("forward", "Forward")
-chain:value("input", "Input")
-chain:value("output", "Output")
-chain:value("prerouting", "Prerouting")
-chain:value("postrouting", "Postrouting")
-
-s:option(Value, "iface", "Eingangsschnittstelle").optional = true
-s:option(Value, "oface", "Ausgangsschnittstelle").optional = true
-
-proto = s:option(ListValue, "proto", "Protokoll")
-proto.optional = true
-proto:value("")
-proto:value("tcp", "TCP")
-proto:value("udp", "UDP")
-
-s:option(Value, "source", "Quelladresse").optional = true
-s:option(Value, "destination", "Zieladresse").optional = true
-s:option(Value, "mac", "MAC-Adresse").optional = true
-
-sport = s:option(Value, "sport", "Quellport")
-sport.optional = true
-sport:depends("proto", "tcp")
-sport:depends("proto", "udp")
-
-dport = s:option(Value, "dport", "Zielport")
-dport.optional = true
-dport:depends("proto", "tcp")
-dport:depends("proto", "udp")
-
-tosrc = s:option(Value, "tosrc", "Neue Quelladresse [SNAT]")
-tosrc.optional = true
-tosrc:depends("jump", "SNAT")
-
-tosrc = s:option(Value, "todest", "Neue Zieladresse [DNAT]")
-tosrc.optional = true
-tosrc:depends("jump", "DNAT")
-
-jump = s:option(ListValue, "jump", "Aktion")
-jump.rmempty = true
-jump:value("", "")
-jump:value("ACCEPT", "annehmen (ACCEPT)")
-jump:value("REJECT", "zurückweisen (REJECT)")
-jump:value("DROP", "verwerfen (DROP)")
-jump:value("LOG", "protokollieren (LOG)")
-jump:value("DNAT", "Ziel umschreiben (DNAT) [nur Prerouting]")
-jump:value("MASQUERADE", "maskieren (MASQUERADE) [nur Postrouting]")
-jump:value("SNAT", "Quelle umschreiben (SNAT) [nur Postrouting]")
-
-
-add = s:option(Value, "command", "Eigener Befehl")
-add.size = 50
-add.rmempty = true
-
-return m
diff --git a/module/admin-core/src/model/cbi/admin_network/ifaces.lua b/module/admin-core/src/model/cbi/admin_network/ifaces.lua
deleted file mode 100644
index 2dd190957..000000000
--- a/module/admin-core/src/model/cbi/admin_network/ifaces.lua
+++ /dev/null
@@ -1,43 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-m = Map("network", "Schnittstellen", [[An dieser Stelle können die einzelnen Schnittstellen 
-des Netzwerkes konfiguriert werden. Es können mehrere Schnittstellen zu einer Brücke zusammengefasst werden,
-indem diese durch Leerzeichen getrennt aufgezählt werden und ein entsprechender Haken im Feld Netzwerkbrücke
-gesetzt wird. Es können VLANs in der Notation SCHNITTSTELLE.VLANNR (z.B.: eth0.1) verwendet werden.]])
-
-s = m:section(TypedSection, "interface")
-s.addremove = true
-s:exclude("loopback")
-s:depends("proto", "static")
-s:depends("proto", "dhcp")
-
-p = s:option(ListValue, "proto", "Protokoll")
-p:value("static", "statisch")
-p:value("dhcp", "DHCP")
-p.default = "static"
-
-br = s:option(Flag, "type", "Netzwerkbrücke", "überbrückt angegebene Schnittstelle(n)")
-br.enabled = "bridge"
-br.rmempty = true
-
-s:option(Value, "ifname", "Schnittstelle")
-
-s:option(Value, "ipaddr", "IP-Adresse")
-
-s:option(Value, "netmask", "Netzmaske"):depends("proto", "static")
-
-gw = s:option(Value, "gateway", "Gateway")
-gw:depends("proto", "static")
-gw.rmempty = true
-
-dns = s:option(Value, "dns", "DNS-Server")
-dns:depends("proto", "static")
-dns.optional = true
-
-mtu = s:option(Value, "mtu", "MTU")
-mtu.optional = true
-mtu.isinteger = true
-
-mac = s:option(Value, "macaddr", "MAC-Adresse")
-mac.optional = true
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_network/portfw.lua b/module/admin-core/src/model/cbi/admin_network/portfw.lua
deleted file mode 100644
index 96822b53a..000000000
--- a/module/admin-core/src/model/cbi/admin_network/portfw.lua
+++ /dev/null
@@ -1,25 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-require("ffluci.sys")
-m = Map("luci_fw", "Portweiterleitung", [[Portweiterleitungen ermöglichen es interne
-Netzwerkdienste von einem anderen externen Netzwerk aus erreichbar zu machen.]])
-
-s = m:section(TypedSection, "portfw")
-s.addremove = true
-s.anonymous = true
-
-iface = s:option(ListValue, "iface", "Externes Interface")
-iface:value("")
-for k,v in pairs(ffluci.sys.net.devices()) do
-	iface:value(v)
-end
-
-proto = s:option(ListValue, "proto", "Protokoll")
-proto:value("tcp", "TCP")
-proto:value("udp", "UDP")
-proto:value("tcpudp", "TCP + UDP")
-
-dport = s:option(Value, "dport", "Externer Port", "Port[:Endport]")
-
-to = s:option(Value, "to", "Interne Adresse", "IP-Adresse[:Zielport[-Zielendport]]")
-
-return m
diff --git a/module/admin-core/src/model/cbi/admin_network/ptp.lua b/module/admin-core/src/model/cbi/admin_network/ptp.lua
deleted file mode 100644
index 6a627f268..000000000
--- a/module/admin-core/src/model/cbi/admin_network/ptp.lua
+++ /dev/null
@@ -1,33 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-m = Map("network", "Punkt-zu-Punkt Verbindungen", [[Punkt-zu-Punkt Verbindungen
-über PPPoE oder PPTP werden häufig dazu verwendet, um über DSL o.ä. Techniken eine
-Verbindung zum Internetgateway eines Internetzugangsanbieters aufzubauen.]])
-
-s = m:section(TypedSection, "interface")
-s.addremove = true
-s:depends("proto", "pppoe")
-s:depends("proto", "pptp")
-
-p = s:option(ListValue, "proto", "Protokoll")
-p:value("pppoe", "PPPoE")
-p:value("pptp", "PPTP")
-p.default = "pppoe"
-
-s:option(Value, "ifname", "Schnittstelle")
-
-s:option(Value, "username", "Benutzername")
-s:option(Value, "password", "Passwort")
-
-s:option(Value, "keepalive", "Keep-Alive", "Bei einer Verbindungstrennung automatisch neu verbinden").optional = true
-
-s:option(Value, "demand", "Dial on Demand (idle time)", "Zeit nach der die Verbindung bei Inaktivität getrennt wird").optional = true
-
-srv = s:option(Value, "server", "PPTP-Server")
-srv:depends("proto", "pptp")
-srv.optional = true
-
-mtu = s:option(Value, "mtu", "MTU")
-mtu.optional = true
-mtu.isinteger = true
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_network/qos.lua b/module/admin-core/src/model/cbi/admin_network/qos.lua
deleted file mode 100644
index d58130f10..000000000
--- a/module/admin-core/src/model/cbi/admin_network/qos.lua
+++ /dev/null
@@ -1,56 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-m = Map("qos", "Quality of Service", [[Mit Hilfe von QoS kann einzelnen Rechnern oder Netzwerkdiensten
-eine höhere oder niedrigere Priorität zugewiesen werden.]])
-
-s = m:section(TypedSection, "interface", "Schnittstellen")
-s.addremove = true
-
-s:option(Flag, "enabled", "aktiviert")
-
-c = s:option(ListValue, "classgroup", "Klassifizierung")
-c:value("Default", "standard")
-c.default = "Default"
-
-s:option(Flag, "overhead", "Overheadberechnung")
-
-s:option(Value, "download", "Downlink", "kb/s")
-
-s:option(Value, "upload", "Uplink", "kb/s")
-
-s = m:section(TypedSection, "classify", "Klassifizierung")
-
-s.anonymous = true
-s.addremove = true
-
-t = s:option(ListValue, "target", "Klasse")
-t:value("Priority")
-t:value("Express")
-t:value("Normal")
-t:value("Bulk")
-t.default = "Normal"
-
-s:option(Value, "srchost", "Quelladresse", "Quellhost / Quellnetz").optional = true
-s:option(Value, "dsthost", "Zieladresse", "Zielhost / Zielnetz").optional = true
-s:option(Value, "layer7", "Layer 7").optional = true
-
-p2p = s:option(ListValue, "ipp2p", "P2P")
-p2p:value("")
-p2p:value("all", "Alle")
-p2p:value("bit", "Bittorrent")
-p2p:value("dc", "DirectConnect")
-p2p:value("edk", "eDonkey")
-p2p:value("gnu", "Gnutella")
-p2p:value("kazaa", "Kazaa")
-p2p.optional = true
-
-p = s:option(ListValue, "proto", "Protokoll")
-p:value("")
-p:value("tcp", "TCP")
-p:value("udp", "UDP")
-p:value("icmp", "ICMP")
-p.optional = true
-
-s:option(Value, "ports", "Port").optional = true
-s:option(Value, "portrange", "Portbereich").optional = true
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_network/routes.lua b/module/admin-core/src/model/cbi/admin_network/routes.lua
deleted file mode 100644
index 49e432180..000000000
--- a/module/admin-core/src/model/cbi/admin_network/routes.lua
+++ /dev/null
@@ -1,23 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-m = Map("network", "Statische Routen", [[Statische Routen geben an,
-über welche Schnittstelle und welches Gateway ein bestimmter Host
-oder ein bestimmtes Netzwerk erreicht werden kann.]])
-
-s = m:section(TypedSection, "route")
-s.addremove = true
-s.anonymous = true
-
-iface = s:option(ListValue, "interface", "Schnittstelle")
-for k, v in pairs(ffluci.model.uci.sections("network")) do
-	if v[".type"] == "interface" and k ~= "loopback" then
-		iface:value(k)
-	end
-end
-
-s:option(Value, "target", "Ziel", "Host-IP oder Netzwerk")
-
-s:option(Value, "netmask", "Netzmaske", "falls Ziel ein Netzwerk ist").rmemepty = true
-
-s:option(Value, "gateway", "Gateway")
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_network/vlan.lua b/module/admin-core/src/model/cbi/admin_network/vlan.lua
deleted file mode 100644
index 7b493643b..000000000
--- a/module/admin-core/src/model/cbi/admin_network/vlan.lua
+++ /dev/null
@@ -1,17 +0,0 @@
--- ToDo: Autodetect things, maybe use MultiValue instead, Translate, Add descriptions
-m = Map("network", "VLAN", [[Die Netzwerkschnittstellen am Router
-können zu verschienden VLANs zusammengefasst werden, in denen Geräte miteinander direkt
-kommunizieren können. VLANs werden auch häufig dazu genutzt, um Netzwerke voneiander zu trennen.
-So ist oftmals eine Schnittstelle als Uplink zu einem größerem Netz, wie dem Internet vorkonfiguriert
-und die anderen Schnittstellen bilden ein VLAN für das lokale Netzwerk.]])
-
-s = m:section(TypedSection, "switch", nil, [[Die zu einem VLAN gehörenden Schnittstellen
-werden durch Leerzeichen getrennt. Die Schnittstelle mit der höchsten Nummer (meistens 5) bildet
-in der Regel die Verbindung zur internen Netzschnittstelle des Routers. Bei Geräten mit 5 Schnittstellen
-ist in der Regel die Schnittstelle mit der niedrigsten Nummer (0) die standardmäßige Uplinkschnittstelle des Routers.]])
-
-for i = 0, 15 do
-	s:option(Value, "vlan"..i, "vlan"..i).optional = true
-end
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_services/dnsmasq.lua b/module/admin-core/src/model/cbi/admin_services/dnsmasq.lua
deleted file mode 100644
index 86716ff9f..000000000
--- a/module/admin-core/src/model/cbi/admin_services/dnsmasq.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-m = Map("dhcp", "Dnsmasq", "Dnsmasq ist ein kombinierter DHCP-Server und DNS-Forwarder für NAT-Firewalls.")
-
-s = m:section(TypedSection, "dnsmasq", "Einstellungen")
-s.anonymous = true
-
-s:option(Flag, "domainneeded", "Anfragen nur mit Domain", "Anfragen ohne Domainnamen nicht weiterleiten")
-s:option(Flag, "authoritative", "Authoritativ", "Dies ist der einzige DHCP im lokalen Netz")
-s:option(Flag, "boguspriv", "Private Anfragen filtern", "Reverse DNS-Anfragen für lokalen Netze nicht weiterleiten")
-s:option(Flag, "filterwin2k", "Windowsanfragen filtern", "nutzlose DNS-Anfragen aktueller Windowssysteme filtern")
-s:option(Flag, "localise_queries", "Lokalisiere Anfragen", "Gibt die Adresse eines Hostnamen entsprechend seines Subnetzes zurück")
-s:option(Value, "local", "Lokale Server")
-s:option(Value, "domain", "Lokale Domain")
-s:option(Flag, "expandhosts", "Erweitere Hosts", "Fügt Domainnamen zu einfachen Hosteinträgen in der Resolvdatei hinzu")
-s:option(Flag, "nonegcache", "Unbekannte nicht cachen", "Negative DNS-Antworten nicht zwischenspeichern")
-s:option(Flag, "readethers", "Verwende /etc/ethers", "Lese Informationen aus /etc/ethers um den DHCP-Server zu konfigurieren")
-s:option(Value, "leasefile", "Leasedatei", "Speicherort für vergebenen DHCP-Adressen")
-s:option(Value, "resolvfile", "Resolvdatei", "Lokale DNS-Datei")
-s:option(Flag, "nohosts", "Ignoriere /etc/hosts").optional = true
-s:option(Flag, "strictorder", "Strikte Reihenfolge", "DNS-Server werden strikt der Reihenfolge in der Resolvdatei nach abgefragt").optional = true
-s:option(Flag, "logqueries", "Schreibe Abfragelog").optional = true
-s:option(Flag, "noresolv", "Ignoriere Resolvdatei").optional = true
-s:option(Value, "dnsforwardmax", "gleichzeitige Abfragen").optional = true
-s:option(Value, "port", "DNS-Port").optional = true
-s:option(Value, "ednspacket_max", "max. EDNS.0 Paketgröße").optional = true
-s:option(Value, "dhcpleasemax", "max. DHCP-Leases").optional = true
-s:option(Value, "addnhosts", "Zusätzliche Hostdatei").optional = true
-s:option(Value, "queryport", "Abfrageport").optional = true
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_services/dropbear.lua b/module/admin-core/src/model/cbi/admin_services/dropbear.lua
deleted file mode 100644
index 3ecf95335..000000000
--- a/module/admin-core/src/model/cbi/admin_services/dropbear.lua
+++ /dev/null
@@ -1,15 +0,0 @@
--- ToDo: Translate, Add descriptions
-m = Map("dropbear", "SSH-Server", [[Der SSH-Server ermöglicht Shell-Zugriff
-über das Netzwerk und bietet einen integrierten SCP-Dienst.]])
-
-s = m:section(TypedSection, "dropbear")
-s.anonymous = true
-
-port = s:option(Value, "Port", "Port")
-port.isinteger = true
-
-pwauth = s:option(Flag, "PasswordAuth", "Passwortanmeldung", "Erlaube Anmeldung per Passwort")
-pwauth.enabled = 'on'
-pwauth.disabled = 'off'
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_services/httpd.lua b/module/admin-core/src/model/cbi/admin_services/httpd.lua
deleted file mode 100644
index 3bd49a2d7..000000000
--- a/module/admin-core/src/model/cbi/admin_services/httpd.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- ToDo: Translate, Add descriptions
-m = Map("httpd", "HTTP-Server", "Der HTTP-Server ist u.a. für die Bereitstellung dieser Obefläche zuständig.")
-
-s = m:section(TypedSection, "httpd")
-s.anonymous = true
-
-port = s:option(Value, "port", "Port")
-port.isinteger = true
-
-s:option(Value, "home", "Wurzelverzeichnis")
-
-config = s:option(Value, "c_file", "Konfigurationsdatei", "/etc/httpd.conf wenn leer")
-config.rmempty = true
-
-realm = s:option(Value, "realm", "Anmeldeaufforderung", "Aufforderungstext zum Anmelden im Administrationsbereich")
-realm.rmempty = true
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_services/olsrd.lua b/module/admin-core/src/model/cbi/admin_services/olsrd.lua
deleted file mode 100644
index 8431a8104..000000000
--- a/module/admin-core/src/model/cbi/admin_services/olsrd.lua
+++ /dev/null
@@ -1,89 +0,0 @@
--- ToDo: Autodetect things, Translate, Add descriptions
-require("ffluci.fs")
-
-m = Map("olsr", "OLSR", [[OLSR ist ein flexibles Routingprotokoll, 
-dass den Aufbau von mobilen Ad-Hoc Netzen unterstützt.]])
-
-s = m:section(NamedSection, "general", "olsr", "Allgemeine Einstellungen")
-
-debug = s:option(ListValue, "DebugLevel", "Debugmodus")
-for i=0, 9 do
-	debug:value(i)
-end
-
-ipv = s:option(ListValue, "IpVersion", "Internet Protokoll")
-ipv:value("4", "IPv4")
-ipv:value("6", "IPv6")
-
-noint = s:option(Flag, "AllowNoInt", "Start ohne Netzwerk")
-noint.enabled = "yes"
-noint.disabled = "no"
-
-s:option(Value, "Pollrate", "Abfragerate (Pollrate)", "s")
-
-tcr = s:option(ListValue, "TcRedundancy", "TC-Redundanz")
-tcr:value("0", "MPR-Selektoren")
-tcr:value("1", "MPR-Selektoren und MPR")
-tcr:value("2", "Alle Nachbarn")
-
-s:option(Value, "MprCoverage", "MPR-Erfassung")
-
-lql = s:option(ListValue, "LinkQualityLevel", "VQ-Level")
-lql:value("0", "deaktiviert")
-lql:value("1", "MPR-Auswahl")
-lql:value("2", "MPR-Auswahl und Routing")
-
-lqfish = s:option(Flag, "LinkQualityFishEye", "VQ-Fisheye")
-
-s:option(Value, "LinkQualityWinSize", "VQ-Fenstergröße")
-
-s:option(Value, "LinkQualityDijkstraLimit", "VQ-Dijkstralimit")
-
-hyst = s:option(Flag, "UseHysteresis", "Hysterese aktivieren")
-hyst.enabled = "yes"
-hyst.disabled = "no"
-
-
-i = m:section(TypedSection, "Interface", "Schnittstellen")
-i.anonymous = true
-i.addremove = true
-i.dynamic = true
-
-network = i:option(ListValue, "Interface", "Netzwerkschnittstellen")
-network:value("")
-for k, v in pairs(ffluci.model.uci.sections("network")) do
-	if v[".type"] == "interface" and k ~= "loopback" then
-		network:value(k)
-	end
-end
-
-i:option(Value, "HelloInterval", "Hello-Intervall")
-
-i:option(Value, "HelloValidityTime", "Hello-Gültigkeit")
-
-i:option(Value, "TcInterval", "TC-Intervall")
-
-i:option(Value, "TcValidityTime", "TC-Gültigkeit")
-
-i:option(Value, "MidInterval", "MID-Intervall")
-
-i:option(Value, "MidValidityTime", "MID-Gültigkeit")
-
-i:option(Value, "HnaInterval", "HNA-Intervall")
-
-i:option(Value, "HnaValidityTime", "HNA-Gültigkeit")
-
-
-p = m:section(TypedSection, "LoadPlugin", "Plugins")
-p.addremove = true
-p.dynamic = true
-
-lib = p:option(ListValue, "Library", "Bibliothek")
-lib:value("")
-for k, v in pairs(ffluci.fs.dir("/usr/lib")) do
-	if v:sub(1, 6) == "olsrd_" then
-		lib:value(v)
-	end
-end
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_services/splash.lua b/module/admin-core/src/model/cbi/admin_services/splash.lua
deleted file mode 100644
index fe4d2c3ee..000000000
--- a/module/admin-core/src/model/cbi/admin_services/splash.lua
+++ /dev/null
@@ -1,30 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-require("ffluci.model.uci")
-
-m = Map("luci_splash", "Client-Splash", [[Client-Splash ist das Freifunk Hotspot-Authentifizierungs-System.]])
-
-s = m:section(NamedSection, "general", "core", "Allgemein")
-s:option(Value, "leasetime", "Freigabezeit", "h")
-
-s = m:section(TypedSection, "iface", "Schnittstellen")
-s.addremove = true
-s.anonymous = true
-
-iface = s:option(ListValue, "network", "Schnittstelle")
-for k, v in pairs(ffluci.model.uci.sections("network")) do
-	if v[".type"] == "interface" and k ~= "loopback" then
-		iface:value(k)
-	end
-end
-
-s = m:section(TypedSection, "whitelist", "Automatische Freigabe")
-s.addremove = true
-s.anonymous = true
-s:option(Value, "mac", "MAC-Adresse")
-
-s = m:section(TypedSection, "blacklist", "Automatische Sperrung")
-s.addremove = true
-s.anonymous = true
-s:option(Value, "mac", "MAC-Adresse")
-	
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_system/fstab.lua b/module/admin-core/src/model/cbi/admin_system/fstab.lua
deleted file mode 100644
index d705743a0..000000000
--- a/module/admin-core/src/model/cbi/admin_system/fstab.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-m = Map("fstab", "Einhängepunkte")
-
-mount = m:section(TypedSection, "mount", "Einhängepunkte", [[Einhängepunkte bestimmen, an welcher Stelle des Dateisystems
-bestimmte Laufwerke und Speicher zur Verwendung eingebunden werden.]])
-mount.anonymous = true
-mount.addremove = true
-
-mount:option(Flag, "enabled", "aktivieren")
-mount:option(Value, "device", "Gerät", "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)")
-mount:option(Value, "target", "Einhängepunkt", "Die Stelle an der der Speicher in das Dateisystem eingehängt wird.")
-mount:option(Value, "fstype", "Dateisystem", "Das Dateisystem mit dem der Speicher formatiert ist (z.B.: ext3)")
-mount:option(Value, "options", "Optionen", "Weitere Optionen (siehe das Handbuch des Befehls 'mount')")
-
-
-swap = m:section(TypedSection, "swap", "SWAP", [[Falls der Arbeitsspeicher des Routers nicht ausreicht,
-kann dieser nicht benutzte Daten zeitweise auf einem SWAP-Laufwerk auslagern um so die
-effektive Größe des Arbeitsspeichers zu erhöhen. Die Auslagerung der Daten ist natürlich bedeutend langsamer
-als direkte Arbeitsspeicherzugriffe.]])
-swap.anonymous = true
-swap.addremove = true
-
-swap:option(Flag, "enabled", "aktivieren")
-swap:option(Value, "device", "Gerät", "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)")
-
-return m
diff --git a/module/admin-core/src/model/cbi/admin_system/hostname.lua b/module/admin-core/src/model/cbi/admin_system/hostname.lua
deleted file mode 100644
index c9e159d05..000000000
--- a/module/admin-core/src/model/cbi/admin_system/hostname.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-m = Map("system", "Hostname", [[Definiert den Hostnamen des Routers.
-Der Hostname ist eine im Netzwerk eindeutige Kennung, die dieses Gerät identifiziert.]])
-
-s = m:section(TypedSection, "system")
-s.anonymous = true
-
-s:option(Value, "hostname", "Hostname")
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_wifi/devices.lua b/module/admin-core/src/model/cbi/admin_wifi/devices.lua
deleted file mode 100644
index b612dd676..000000000
--- a/module/admin-core/src/model/cbi/admin_wifi/devices.lua
+++ /dev/null
@@ -1,52 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-
-m = Map("wireless", "Geräte", [[An dieser Stelle können eingebaute WLAN-Geräte konfiguriert werden.]])
-
-s = m:section(TypedSection, "wifi-device")
---s.addremove = true
-
-en = s:option(Flag, "disabled", "Aktivieren")
-en.enabled = "0"
-en.disabled = "1"
-
-t = s:option(ListValue, "type", "Typ")
-t:value("broadcom")
-t:value("atheros")
-t:value("mac80211")
-t:value("prism2")
---[[
-require("ffluci.sys")
-local c = ". /etc/functions.sh;for i in /lib/wifi/*;do . $i;done;echo $DRIVERS"
-for driver in ffluci.sys.execl(c)[1]:gmatch("[^ ]+") do
-	t:value(driver)
-end
-]]--
-
-mode = s:option(ListValue, "mode", "Modus")
-mode:value("", "standard")
-mode:value("11b", "802.11b")
-mode:value("11g", "802.11g")
-mode:value("11a", "802.11a")
-mode:value("11bg", "802.11b+g")
-mode.rmempty = true
-
-s:option(Value, "channel", "Funkkanal")
-
-s:option(Value, "txantenna", "Sendeantenne").rmempty = true
-
-s:option(Value, "rxantenna", "Empfangsantenne").rmempty = true
-
-s:option(Value, "distance", "Distanz",
-	"Distanz zum am weitesten entfernten Funkpartner (m)").rmempty = true
-
-s:option(Value, "diversity", "Diversität"):depends("type", "atheros")
-	
-country = s:option(Value, "country", "Ländercode")
-country.optional = true
-country:depends("type", "broadcom")
-
-maxassoc = s:option(Value, "maxassoc", "Verbindungslimit")
-maxassoc:depends("type", "broadcom")
-maxassoc.optional = true
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/cbi/admin_wifi/networks.lua b/module/admin-core/src/model/cbi/admin_wifi/networks.lua
deleted file mode 100644
index 4a7ad12f6..000000000
--- a/module/admin-core/src/model/cbi/admin_wifi/networks.lua
+++ /dev/null
@@ -1,77 +0,0 @@
--- ToDo: Translate, Add descriptions and help texts
-m = Map("wireless", "Netze", [[Pro WLAN-Gerät können mehrere Netze bereitgestellt werden.
-Es sollte beachtet werden, dass es hardware- / treiberspezifische Einschränkungen gibt.
-So kann pro WLAN-Gerät in der Regel entweder 1 Ad-Hoc-Zugang ODER bis zu 3 Access-Point und 1 Client-Zugang
-gleichzeitig erstellt werden.]])
-
-s = m:section(TypedSection, "wifi-iface")
-s.addremove = true
-s.anonymous = true
-
-s:option(Value, "ssid", "Netzkennung (ESSID)").maxlength = 32
-
-device = s:option(ListValue, "device", "Gerät")
-local d = ffluci.model.uci.sections("wireless")
-if d then
-	for k, v in pairs(d) do
-		if v[".type"] == "wifi-device" then
-			device:value(k)
-		end
-	end
-end
-
-network = s:option(ListValue, "network", "Netzwerk", "WLAN-Netz zu Netzwerk hinzufügen")
-network:value("")
-for k, v in pairs(ffluci.model.uci.sections("network")) do
-	if v[".type"] == "interface" and k ~= "loopback" then
-		network:value(k)
-	end
-end
-
-mode = s:option(ListValue, "mode", "Modus")
-mode:value("ap", "Access Point")
-mode:value("adhoc", "Ad-Hoc")
-mode:value("sta", "Client")
-mode:value("wds", "WDS")
-
-s:option(Value, "bssid", "BSSID").optional = true
-
-s:option(Value, "txpower", "Sendeleistung", "dbm").rmempty = true
-
-s:option(Flag, "frameburst", "Broadcom-Frameburst").optional = true
-s:option(Flag, "bursting", "Atheros-Frameburst").optional = true
-
-
-encr = s:option(ListValue, "encryption", "Verschlüsselung")
-encr:value("none", "keine")
-encr:value("wep", "WEP")
-encr:value("psk", "WPA-PSK")
-encr:value("wpa", "WPA-Radius")
-encr:value("psk2", "WPA2-PSK")
-encr:value("wpa2", "WPA2-Radius")
-
-key = s:option(Value, "key", "Schlüssel")
-key:depends("encryption", "wep")
-key:depends("encryption", "psk")
-key:depends("encryption", "wpa")
-key:depends("encryption", "psk2")
-key:depends("encryption", "wpa2")
-key.rmempty = true
-
-server = s:option(Value, "server", "Radius-Server")
-server:depends("encryption", "wpa")
-server:depends("encryption", "wpa2")
-server.rmempty = true
-
-port = s:option(Value, "port", "Radius-Port")
-port:depends("encryption", "wpa")
-port:depends("encryption", "wpa2")
-port.rmempty = true
-
-s:option(Flag, "isolate", "AP-Isolation", "Unterbindet Client-Client-Verkehr").optional = true
-
-s:option(Flag, "hidden", "ESSID verstecken").optional = true
-
-
-
-return m
\ No newline at end of file
diff --git a/module/admin-core/src/model/menu/00admin.lua b/module/admin-core/src/model/menu/00admin.lua
deleted file mode 100644
index 8f87792ca..000000000
--- a/module/admin-core/src/model/menu/00admin.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-add("admin", "index", "Übersicht", 10)
-act("wizard", "Freifunkassistent")
-act("contact", "Kontakt")
-act("luci", "Oberfläche")
-act("freifunk", "Freifunk")
-
-add("admin", "system", "System", 30)
-act("packages", "Paketverwaltung")
-act("passwd", "Passwort ändern")
-act("sshkeys", "SSH-Schlüssel")
-act("hostname", "Hostname")
-act("fstab", "Einhängepunkte")
-act("upgrade", "Firmwareupgrade")
-act("reboot", "Neu starten")
-
-add("admin", "services", "Dienste", 40)
-if isfile("/etc/config/olsr") then
-	act("olsrd", "OLSR")
-end
-act("httpd", "HTTP-Server")
-act("dropbear", "SSH-Server")
-act("dnsmasq", "Dnsmasq")
-if isfile("/etc/config/luci_splash") then
-	act("splash", "Client-Splash")
-end
-
-add("admin", "network", "Netzwerk", 50)
-act("vlan", "Switch")
-act("ifaces", "Schnittstellen")
-act("dhcp", "DHCP-Server")
-act("ptp", "PPPoE / PPTP")
-act("routes", "Statische Routen")
-act("portfw", "Portweiterleitung")
-act("firewall", "Firewall")
-if isfile("/etc/config/qos") then
-	act("qos", "Quality of Service")
-end
-
-add("admin", "wifi", "Drahtlos", 60)
-act("devices", "Geräte")
-act("networks", "Netze")
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_index/index.htm b/module/admin-core/src/view/admin_index/index.htm
deleted file mode 100644
index 27cdade52..000000000
--- a/module/admin-core/src/view/admin_index/index.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<%+header%>
-<h1><%:hello Hallo!%></h1>
-<p><%:admin1 Dies ist der Administrationsbereich von FFLuCI.%></p>
-<p><%:admin2 FFLuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche zur Konfiguration von OpenWRT Kamikaze.%><br />
-<%:admin3 Auf den folgenden Seiten können alle wichtigen Einstellungen des Routers vorgenommen werden.%></p>
-<p><%:admin4 Auf der linken Seite befindet sich eine Navigation, die zu den einzelnen Konfigurationsseiten führt.%></p>
-<p><%:admin5 Wir sind natürlich stets darum bemüht, diese Oberfläche 
-noch besser und intuitiver zu Gestalten und freuen uns über jegliche Art von Feedback oder Verbesserungsvorschlägen.%></p>
-<p><%:admin6 Und nun wünschen wir viel Spaß mit dem Router!%></p>
-<p><em><strong><a href="http://luci.freifunk-halle.net"><%:team Das FFLuCI-Team%></a></strong></em></p> 
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_index/wizard.htm b/module/admin-core/src/view/admin_index/wizard.htm
deleted file mode 100644
index 8c1a0952b..000000000
--- a/module/admin-core/src/view/admin_index/wizard.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<%+header%>
-<h1><%:ffwizard Freifunkassistent%></h1>
-<p><%:ffwizard1 Dieser Assistent konfiguriert den Router für die Benutzung im Freifunknetz%></p>
-<br />
-<form method="post" action="<%=controller%>/admin/index/wizard">
-	<div class="cbi-section-node">
-		<div class="cbi-value">
-			<div class="cbi-value-title"><%:ip IP-Adresse%>:&nbsp;
-			<input type="text" size="20" name="ip" /></div>
-		</div>
-		<% for i, k in ipairs(ifaces) do %>
-		<div class="cbi-value">
-			<div class="cbi-value-title"><%:wificfg Drahtlosgerät einrichten%>: <%=k%></div>
-			<div class="cbi-value-field"><input type="checkbox" name="wifi.<%=k%>" value="1" checked="checked" /></div>
-		</div>
-		<% end %>
-		<div class="cbi-value">
-			<div class="cbi-value-title"><%:cfgolsr OLSR konfigurieren%></div>
-			<div class="cbi-value-field"><input type="checkbox" name="olsr" value="1" checked="checked" /></div>
-		</div>
-		<div class="cbi-value">
-			<div class="cbi-value-title"><%:cfgdhcp Drahtlos DHCP konfigurieren%></div>
-			<div class="cbi-value-field"><input type="checkbox" name="dhcp" value="1" checked="checked" /></div>
-		</div>
-		<div class="cbi-value">
-			<div class="cbi-value-title"><%:shareinet Internet teilen%></div>
-			<div class="cbi-value-field"><input type="checkbox" name="shareinet" value="1" checked="checked" /></div>
-		</div>
-	</div>
-	<br />
-	<div>
-		<input type="submit" value="<%:configure Konfigurieren%>" />
-		<input type="reset" value="<%:reset Zurücksetzen%>" />
-	</div>
-</form> 
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_network/index.htm b/module/admin-core/src/view/admin_network/index.htm
deleted file mode 100644
index 7fa4f5565..000000000
--- a/module/admin-core/src/view/admin_network/index.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<%+header%>
-<h1><%:network Netzwerk%></h1>
-<p><%:network1 In diesem Bereich finden sich alle netzwerkbezogenen Einstellungen.%></p>
-<p><%:network2 Der Netzwerkswitch kann bei den meisten Routern frei konfiguriert
-und in mehrere VLANs aufgeteilt werden. %></p>
-<p><%:network3 Schnittstellen und PPPoE/PPTP-Einstellungen ermöglichen
-die freie Organisation des Netzwerks und die Anbindung an ein WAN.%></p>
-<p><%:network4 DHCP ermöglichst die automatische Netzwerkkonfiguration von Rechnern im (W)LAN.%></p>
-<p><%:network5 Portweiterleitung und Firewall erlauben eine effektive Absicherung des Netzes, bei gleichzeitiger
-Bereitstellung von externen Diensten.%></p>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_services/index.htm b/module/admin-core/src/view/admin_services/index.htm
deleted file mode 100644
index a06fe1056..000000000
--- a/module/admin-core/src/view/admin_services/index.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<%+header%>
-<h1><%:services Dienste%></h1>
-<p><%:services1 Dienste und Dämonen stellen bestimmte Funktionalitäten auf dem Router zur Verfügung.%></p>
-<p><%:services2 Es handelt sich hierbei meist um Netzwerkserver, die verschiedene Aufgaben auf dem Router erfüllen,
-beispielsweise Shell-Zugang ermöglichen oder diese Weboberfläche per HTTP anbieten.%></p>
-<p><%:servcies3 In diesen Bereich fallen auch die Meshnetzwerkdienste wie OLSR und BATMAN, die dabei helfen,
-ein autarkes Ad-Hoc Netzwerk aufzubauen.%></p>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/editor.htm b/module/admin-core/src/view/admin_system/editor.htm
deleted file mode 100644
index ef3e0d8ab..000000000
--- a/module/admin-core/src/view/admin_system/editor.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<%+header%>
-<h1><%:texteditor Texteditor%></h1>
-<form method="post" action="<%=controller%>/admin/system/editor">
-<div><%:file Datei%>: <input type="text" name="file" size="30" value="<%=fn%>" />
-<% if msg then %><span class="error"><%:error Fehler%>: <%=msg%></span><% end %></div>
-<br />
-<div><textarea style="width: 100%" rows="20" name="data"><%=cnt%></textarea></div>
-<br />
-<div>
-	<input type="submit" value="<%:save Speichern%>" />
-	<input type="reset" value="<%:reset Zurücksetzen%>" />
-</div>
-</form>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/index.htm b/module/admin-core/src/view/admin_system/index.htm
deleted file mode 100644
index 3e9a28221..000000000
--- a/module/admin-core/src/view/admin_system/index.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<%+header%>
-<h1><%:system System%></h1>
-<p><%:system1 Hier finden sich Einstellungen, die das System selbst, dessen Kennung,
-installierte Software und Hardware, Authentifizierung oder eingehängte Speicher betreffen.%></p>
-<p><%:system2 Diese Einstellungen definieren die Grundlage des Systems, auf dem die
-installierte Software aufbaut.%></p> 
-<p><%:system3 Beachte bitte, dass eine fehlerhafte Konfiguration den Start
-des Routers verhindern oder dich vom Zugriff auf diesen ausschließen kann.%></p> 
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/ipkg.htm b/module/admin-core/src/view/admin_system/ipkg.htm
deleted file mode 100644
index 9a88ee57b..000000000
--- a/module/admin-core/src/view/admin_system/ipkg.htm
+++ /dev/null
@@ -1,26 +0,0 @@
-<%+header%>
-<h1><%:system System%></h1>
-<h2><%:ipkg IPKG-Konfiguration%></h2>
-
-<br />
-
-<div><strong><%:ipkg_pkglists Paketlisten%>:</strong><code>src <em>Name</em> <em>URL</em></code></div>
-<div><strong><%:ipkg_targets Installationsziele%>:</strong><code>dest <em>Name</em> <em>Pfad</em></code></div>
-
-<br />
-
-<form method="post" action="<%=controller%>/admin/system/ipkg">
-	<div class="cbi-section-node" style="width: 100%">
-		<div class="cbi-value">
-			<div class="cbi-value-field">
-				<textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea>
-			</div>
-		</div>
-	</div>
-	<div>
-		<input type="submit" value="<%:save Speichern%>" />
-		<input type="reset" value="<%:reset Zurücksetzen%>" />
-	</div>
-	<% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %>
-</form>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/packages.htm b/module/admin-core/src/view/admin_system/packages.htm
deleted file mode 100644
index 52da37040..000000000
--- a/module/admin-core/src/view/admin_system/packages.htm
+++ /dev/null
@@ -1,77 +0,0 @@
-<%+header%>
-<h1><%:system System%></h1>
-<h2><%:packages Paketverwaltung%></h2>
-
-<br />
-
-<% if install or remove or update or upgrade then %>
-<div class="code"><strong><%:status Status%>:</strong><br />
-<% if update then %>
-	<%:packages_update Paketlisten aktualisieren%>: <% if update == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=update%>)</span><% end %><br />
-<% end %>
-<% if upgrade then%>
-	<%:packages_upgrade Installierte Pakete aktualisieren%>: <% if upgrade == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=upgrade%>)</span><% end %><br />
-<% end %>
-<% if install then for k,v in pairs(install) do %>
-	<%:packages_install Installation von%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=v%>)</span><% end %><br />
-<% end end %>
-<% if remove then for k,v in pairs(remove) do %>
-	<%:packages_remove Deinstallation von%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok OK%></span><% else %><span class="error"><%:error Fehler%> (<%:code Code%> <%=v%>)</span><% end %><br />
-<% end end %>
-</div>
-<br />
-<% end %>
-
-<div>
-<a href="<%=controller%>/admin/system/ipkg"><%:packages_ipkg Paketlisten und Installationsziele bearbeiten%></a><br />
-<a href="<%=controller%>/admin/system/packages?update=1"><%:packages_updatelist Paketlisten aktualisieren%></a><br />
-<a href="<%=controller%>/admin/system/packages?upgrade=1"><%:packages_upgrade Installierte Pakete aktualisieren%></a>
-</div>
-
-<br />
-<br />
-
-<form method="post" action="<%=controller%>/admin/system/packages">
-	<div>
-		<span class="bold"><%:packages_installurl Paket herunterladen und installieren%>:</span><br />
-		<input type="text" name="url" size="30" value="" />
-		<input type="submit" name="submit" value="<%:ok OK%>" />
-	</div>
-	
-	<br />
-	<br />
-
-	<div>
-		<span class="bold"><%:filter Filter%>:</span>
-		<input type="text" name="query" size="20" value="<%=query%>" />
-		<input type="submit" name="search" value="<%:packages_search Paket suchen%>" />
-		<input type="submit" name="submit" value="<%:packages_do Aktionen ausführen%>" />
-	</div>
-	
-	<br />
-	<br />
-	
-	<div>
-	<table style="font-size: 0.8em">
-		<tr>
-			<th><%:packages_name Paketname%></th>
-			<th><%:version Version%></th>
-			<th><%:install Installieren%></th>
-			<th><%:delete Löschen%></th>
-			<th><%:descr Beschreibung%></th>
-		</tr>
-		<% for k, pkg in pairs(pkgs) do %>	
-		<tr>
-			<td><%=pkg.Package%></td>
-			<td><%=pkg.Version%></td>
-			<td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed installiert%><% end %></td>
-			<td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled nicht installiert%><% end %></td>
-			<td><%=pkg.Description%></td>
-		</tr>
-		<% end %>
-	</table>
-	</div>
-	<br />
-	<input type="submit" name="submit" value="<%:packages_do Aktionen ausführen%>" />
-</form>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/passwd.htm b/module/admin-core/src/view/admin_system/passwd.htm
deleted file mode 100644
index 87b253368..000000000
--- a/module/admin-core/src/view/admin_system/passwd.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<%+header%>
-<h1><%:system System%></h1>
-<h2><%:passwd Passwort ändern%></h2>
-<p><%:passwd1 Ändert das Passwort des Systemverwalters (Benutzer "root")%></p>
-<div><br />
-<% if stat then %>
-	<% if stat == 0 then %>
-		<code><%:password_changed Passwort erfolgreich geändert!%></code>
-	<% elseif stat == 10 then %>
-		<code class="error"><%:password_nomatch Passwörter stimmen nicht überein! %></code>
-	<% else %>
-		<code class="error"><%:unknown_error Unbekannter Fehler!%></code>
-	<% end %>
-<% end %>
-<% if not stat or stat == 10 then %>
-	<form method="post" action="<%=controller%>/admin/system/passwd">
-		<div class="cbi-section-node">
-			<div class="cbi-value">
-				<div class="cbi-value-title"><%:password Passwort%></div>
-				<div class="cbi-value-field"><input type="password" name="pwd1" /></div>
-			</div>
-			<div class="cbi-value">
-				<div class="cbi-value-title"><%:confirmation Bestätigung%></div>
-				<div class="cbi-value-field"><input type="password" name="pwd2" /></div>
-			</div>
-			<br />
-			<div>
-				<input type="submit" value="<%:save Speichern%>" />
-				<input type="reset" value="<%:reset Zurücksetzen%>" />
-			</div>
-		</div>
-	</form>
-<% end %>
-</div>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/reboot.htm b/module/admin-core/src/view/admin_system/reboot.htm
deleted file mode 100644
index e81be408c..000000000
--- a/module/admin-core/src/view/admin_system/reboot.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<%+header%>
-<h1><%:system System%></h1>
-<h2><%:reboot Neu starten%></h2>
-<p><%:reboot1 Startet das Betriebssystem des Routers neu.%></p>
-<% if not reboot then %>
-<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:reboot_do Neustart durchführen%></a></p>
-<% else %>
-<p><%:reboot_running Bitte warten: Neustart wird durchgeführt...%></p>
-<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
-<% end %>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/sshkeys.htm b/module/admin-core/src/view/admin_system/sshkeys.htm
deleted file mode 100644
index 3765e1eea..000000000
--- a/module/admin-core/src/view/admin_system/sshkeys.htm
+++ /dev/null
@@ -1,26 +0,0 @@
-<%+header%>
-<h1><%:system System%></h1>
-<h2><%:sshkeys SSH-Schlüssel%></h2>
-
-<br />
-
-<div><%:sshkeys_descr Hier können öffentliche SSH-Schlüssel (einer pro Zeile)
- zur Authentifizierung abgelegt werden.%></div>
-
-<br />
-
-<form method="post" action="<%=controller%>/admin/system/sshkeys">
-	<div class="cbi-section-node" style="width: 100%">
-		<div class="cbi-value">
-			<div class="cbi-value-field">
-				<textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea>
-			</div>
-		</div>
-	</div>
-	<div>
-		<input type="submit" value="<%:save Speichern%>" />
-		<input type="reset" value="<%:reset Zurücksetzen%>" />
-	</div>
-	<% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %>
-</form>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_system/upgrade.htm b/module/admin-core/src/view/admin_system/upgrade.htm
deleted file mode 100644
index 598002890..000000000
--- a/module/admin-core/src/view/admin_system/upgrade.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-<%+header%>
-<h1><%:system System%></h1>
-<h2><%:upgrade Upgrade%></h2>
-<p><%:upgrade1 Ersetzt die installierte Firmware (das Betriebssystem des Routers) durch ein neues.
-Das Format der Firmware ist plattformabhängig.%></p>
-<br />
-<% if sysupgrade and not ret then %>
-<form method="post" action="<%=controller%>-upload/admin/system/upgrade" enctype="multipart/form-data">
-	<div class="cbi-section-node">
-		<div class="cbi-value clear">
-			<div class="cbi-value-title left"><%:fwimage Firmwareimage%></div>
-			<div class="cbi-value-field"><input type="file" size="30" name="image" /></div>
-		</div>
-		<br />
-		<div class="cbi-value clear">
-			<input type="checkbox" name="keepcfg" value="1" checked="checked" />
-			<span class="bold"><%:keepcfg Konfigurationsdateien übernehmen%></span>
-		</div>
-		<br />
-		<div>
-			<input type="submit" value="<%:fwupgrade Firmware aktualisieren%>" />
-		</div>
-	</div>
-</form>
-<% elseif ret then %>
-	<% if ret == 0 then %>
-<div class="ok"><%:flashed Flashvorgang erfolgreich. Router startet neu...%></div>
-	<% else %>
-<div class="error"><%:flasherr Flashvorgang fehlgeschlagen!%> (<%:code Code%> <%=ret%>)</div>	
-	<% end %>
-<% else %>
-<div class="error"><%:notimplemented Diese Funktion steht leider (noch) nicht zur Verfügung.%></div>
-<% end %>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_uci/apply.htm b/module/admin-core/src/view/admin_uci/apply.htm
deleted file mode 100644
index 090967a2d..000000000
--- a/module/admin-core/src/view/admin_uci/apply.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<%+header%>
-<h1><%:config Konfiguration%></h1>
-<p><%:uci_applied Die folgenden Änderungen wurden übernommen%>:</p>
-<code><%=(changes or "-")%>
-<%=output%></code>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_uci/changes.htm b/module/admin-core/src/view/admin_uci/changes.htm
deleted file mode 100644
index 3bbcd0e5f..000000000
--- a/module/admin-core/src/view/admin_uci/changes.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<%+header%>
-<h1><%:config Konfiguration%></h1>
-<h2><%:changes Änderungen%></h2>
-<code><%=(ffluci.model.uci.changes() or "-")%></code>
-<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
-	<input type="submit" value="<%:apply Anwenden%>" />
-</form>
-<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
-	<input type="submit" value="<%:revert Verwerfen%>" />
-</form>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_uci/revert.htm b/module/admin-core/src/view/admin_uci/revert.htm
deleted file mode 100644
index 39aaabcd8..000000000
--- a/module/admin-core/src/view/admin_uci/revert.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<%+header%>
-<h1><%:config Konfiguration%></h1>
-<p><%:uci_reverted Die folgenden Änderungen wurden verworfen%>:</p>
-<code><%=(changes or "-")%></code>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/admin_wifi/index.htm b/module/admin-core/src/view/admin_wifi/index.htm
deleted file mode 100644
index 6a6059835..000000000
--- a/module/admin-core/src/view/admin_wifi/index.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<%+header%>
-<h1><%:wifi Drahtlos%></h1>
-<p><%:wifi1 Hier finden sich Konfiugrationsmöglichkeiten für Drahtlos-Netzwerke nach dem WLAN-Standard.%></p>
-<p><%:wifi2 802.11b/g/a/n-Geräte können so einfach in das bestehende physische Netzwerk integriert werden.
-Die Unterstützung von virtuellen Adaptern ermöglicht auch den Einsatz als Wireless-Repeater oder von
-mehreren Netzwerken gleichzeitig auf einem Gerät.%></p>
-<p><%:wifi3 Es werden Managed, Client, Ad-Hoc und WDS-Modus unterstützt sowie WPA und WPA2-Verschlüsselung zur gesicherten
-Kommunikation.%></p>  
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/splash/splash.htm b/module/admin-core/src/view/splash/splash.htm
deleted file mode 100644
index db4bd0f78..000000000
--- a/module/admin-core/src/view/splash/splash.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1><%:welcome Willkommen%>!</h1>
-<p>
-Du bist jetzt mit dem freien Funknetz 
-<a href="<%~freifunk.community.homepage%>"><%~freifunk.community.name%></a> verbunden.<br />
-Wir sind ein experimentelles Gemeinschaftsnetzwerk, aber kein Internetanbieter.
-</p>
-
-<p>
-Ein Zugang <strong>ins Internet</strong> ist trotzdem möglich,
-da einige Freifunker ihre privaten Internetzugänge zur Verfügung stellen.
-Diese Zugänge müssen sich hier alle teilen.
-Bitte sei Dir dessen bewusst und verhalte Dich dementsprechend:
-<ul>
-<li>bitte <strong>keine Filesharing-Programme</strong> betreiben!</li>
-<li>bitte <strong>keine unnötigen Downloads oder Streams</strong> starten!</li>
-<li>bitte <strong>keine illegalen Aktivitäten</strong>!</li>
-</ul>
-</p>
-
-<p>
-Wenn Du unsere Idee gut findest, kannst Du uns unterstützen:
-<ul>
-<li><a href="<%~freifunk.community.homepage%>">Werde selbst Freifunker oder teile deinen Internetzugang!</a></li>
-<li>Betreibe deine anderen WLAN-Geräte <em>NICHT</em> auf den Kanälen 1-5, diese stören oft unser Netz.</li>
-</ul>
-</p>
-
-<p>
-Mit einem Klick auf <em><%:accept Annehmen%></em> kannst du für <%~luci_splash.general.leasetime%> Stunden
-über unser Netz das Internet verwenden. Dann wirst du erneut aufgefordet, diese Bedingungen zu akzeptieren.
-</p>
\ No newline at end of file
diff --git a/module/admin-core/src/view/splash_splash/index.htm b/module/admin-core/src/view/splash_splash/index.htm
deleted file mode 100644
index 75aa02658..000000000
--- a/module/admin-core/src/view/splash_splash/index.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<%+header%>
-<%+footer%>
\ No newline at end of file
diff --git a/module/admin-core/src/view/splash_splash/splash.htm b/module/admin-core/src/view/splash_splash/splash.htm
deleted file mode 100644
index 9c165802f..000000000
--- a/module/admin-core/src/view/splash_splash/splash.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<%+header%>
-<%+splash/splash%>
-<form method="get" action="<%=controller%>/splash/splash/activate">
-	<input type="submit" value="<%:decline Ablehnen%>" />
-	<input type="submit" name="accept" value="<%:accept Annehmen%>" />
-</form>
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/Makefile b/module/public-core/Makefile
deleted file mode 100644
index 113799af6..000000000
--- a/module/public-core/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-LUAC = luac
-LUAC_OPTIONS = -s
-
-FILES = i18n/* view/*/*.htm
-
-CFILES = controller/*/*.lua model/cbi/*/*.lua model/menu/*.lua 
-
-DIRECTORIES = model/cbi model/menu controller i18n view
-
-
-INFILES = $(CFILES:%=src/%)
-OUTDIRS = $(DIRECTORIES:%=dist/%)
-CPFILES = $(FILES:%=src/%)
-
-.PHONY: all compile source clean depends
-
-all: compile
-
-
-depends:
-	mkdir -p $(OUTDIRS)
-	for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done
-
-compile: depends
-	for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done
-	
-source: depends
-	for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done
-	
-	
-clean:
-	rm dist -rf
diff --git a/module/public-core/src/controller/public/index.lua b/module/public-core/src/controller/public/index.lua
deleted file mode 100644
index f65478c05..000000000
--- a/module/public-core/src/controller/public/index.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.public.index", package.seeall)
\ No newline at end of file
diff --git a/module/public-core/src/controller/public/olsr.lua b/module/public-core/src/controller/public/olsr.lua
deleted file mode 100644
index d41f5ed41..000000000
--- a/module/public-core/src/controller/public/olsr.lua
+++ /dev/null
@@ -1,137 +0,0 @@
-module("ffluci.controller.public.olsr", package.seeall)
-require("ffluci.sys")
-
-function action_index()
-	local data = fetch_txtinfo("links")
-	
-	if not data or not data.Links then
-		ffluci.template.render("public_olsr/error_olsr")
-		return nil
-	end
-	
-	local function compare(a, b)
-		if tonumber(a.ETX) == 0 then
-			return false
-		end
-		
-		if tonumber(b.ETX) == 0 then
-			return true
-		end
-		
-		return tonumber(a.ETX) < tonumber(b.ETX)
-	end
-	
-	table.sort(data.Links, compare)
-	
-	ffluci.template.render("public_olsr/index", {links=data.Links})
-end
-
-function action_routes()
-	local data = fetch_txtinfo("routes")
-	
-	if not data or not data.Routes then
-		ffluci.template.render("public_olsr/error_olsr")
-		return nil
-	end
-	
-	local function compare(a, b)
-		if tonumber(a.ETX) == 0 then
-			return false
-		end
-		
-		if tonumber(b.ETX) == 0 then
-			return true
-		end
-		
-		return tonumber(a.ETX) < tonumber(b.ETX)
-	end
-	
-	table.sort(data.Routes, compare)
-	
-	ffluci.template.render("public_olsr/routes", {routes=data.Routes})
-end
-
-function action_topology()
-	local data = fetch_txtinfo("topology")
-	
-	if not data or not data.Topology then
-		ffluci.template.render("public_olsr/error_olsr")
-		return nil
-	end
-	
-	local function compare(a, b)
-		return a["Destination IP"] < b["Destination IP"]
-	end
-	
-	table.sort(data.Topology, compare)
-	
-	ffluci.template.render("public_olsr/topology", {routes=data.Topology})
-end
-
-function action_hna()
-	local data = fetch_txtinfo("hna")
-	
-	if not data or not data.HNA then
-		ffluci.template.render("public_olsr/error_olsr")
-		return nil
-	end
-	
-	local function compare(a, b)
-		return a.Network < b.Network
-	end
-	
-	table.sort(data.HNA, compare)
-	
-	ffluci.template.render("public_olsr/hna", {routes=data.HNA})
-end
-
-function action_mid()
-	local data = fetch_txtinfo("mid")
-	
-	if not data or not data.MID then
-		ffluci.template.render("public_olsr/error_olsr")
-		return nil
-	end
-	
-	local function compare(a, b)
-		return a.IP < b.IP
-	end
-	
-	table.sort(data.MID, compare)
-	
-	ffluci.template.render("public_olsr/mid", {mids=data.MID})
-end
-
-
--- Internal
-function fetch_txtinfo(otable)
-	otable = otable or ""
-	local rawdata = ffluci.sys.httpget("http://127.0.0.1:2006/"..otable)
-	
-	if #rawdata == 0 then
-		return nil
-	end
-	
-	local data = {}
-	
-	local tables = ffluci.util.split(ffluci.util.trim(rawdata), "\n\n")
-	
-
-	for i, tbl in ipairs(tables) do
-		local lines = ffluci.util.split(tbl, "\n")
-		local name  = table.remove(lines, 1):sub(8)
-		local keys  = ffluci.util.split(table.remove(lines, 1), "\t")
-		
-		data[name] = {}
-		
-		for j, line in ipairs(lines) do
-			local fields = ffluci.util.split(line, "\t")
-			data[name][j] = {}
-			for k, key in pairs(keys) do
-				data[name][j][key] = fields[k] 
-			end
-		end
-	end
-	
-	return data
-end
\ No newline at end of file
diff --git a/module/public-core/src/controller/public/status.lua b/module/public-core/src/controller/public/status.lua
deleted file mode 100644
index 8d2f7a303..000000000
--- a/module/public-core/src/controller/public/status.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-module("ffluci.controller.public.status", package.seeall)
-
-function action_index()
-	local data = {}
-	
-	data.s, data.m, data.r = ffluci.sys.sysinfo()
-	
-	data.wifi = ffluci.sys.wifi.getiwconfig()
-	
-	data.routes = {}
-	for i, r in pairs(ffluci.sys.net.routes()) do
-		if r.Destination == "00000000" then
-			table.insert(data.routes, r)
-		end
-	end
-
-	
-	ffluci.template.render("public_status/index", data)
-end
-
-
diff --git a/module/public-core/src/controller/sudo/status.lua b/module/public-core/src/controller/sudo/status.lua
deleted file mode 100644
index fd5127d2c..000000000
--- a/module/public-core/src/controller/sudo/status.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.sudo.status", package.seeall)
\ No newline at end of file
diff --git a/module/public-core/src/model/menu/00public.lua b/module/public-core/src/model/menu/00public.lua
deleted file mode 100644
index 644aa44f7..000000000
--- a/module/public-core/src/model/menu/00public.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-add("public", "index", "Übersicht", 10)
-act("contact", "Kontakt")
-
-add("public", "status", "Status", 20)
-act("routes", "Routingtabelle")
-act("iwscan", "WLAN-Scan")
-
-add("public", "olsr", "OLSR", 30)
-act("routes", "Routen")
-act("topology", "Topologie")
-act("hna", "HNA")
-act("mid", "MID")
diff --git a/module/public-core/src/view/public_index/contact.htm b/module/public-core/src/view/public_index/contact.htm
deleted file mode 100644
index 221dc89cc..000000000
--- a/module/public-core/src/view/public_index/contact.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<%+header%>
-<% local contact = ffluci.model.uci.sections("freifunk").contact %>
-<h1><%:contact Kontakt%></h1>
-<table cellspacing="0" cellpadding="6">
-	<tr><th><%:nickname Pseudonym%>:</th><td><%=contact.nickname%></td></tr>
-	<tr><th><%:name Name%>:</th><td><%=contact.name%></td></tr>
-	<tr><th><%:mail E-Mail%>:</th><td><%=contact.mail%></td></tr>
-	<tr><th><%:phone Telefon%>:</th><td><%=contact.phone%></td></tr>
-	<tr><th><%:location Standort%>:</th><td><%=contact.location%></td></tr>
-	<tr><th><%:geocoord Geokoordinaten%>:</th><td><%=contact.geo%></td></tr>
-	<tr><th><%:note Notiz%>:</th><td><%=contact.note%></td></tr>
-</table>
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_index/index.htm b/module/public-core/src/view/public_index/index.htm
deleted file mode 100644
index 6c7fe8588..000000000
--- a/module/public-core/src/view/public_index/index.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<%+header%>
-<% local ff = ffluci.model.uci.sections("freifunk") %>
-<h1><%:hellonet Hallo und willkommen im Netz von%> <%=ff.community.name%>!</h1>
-<p><%:public1 Wir sind eine Initiative zur Schaffung eines freien, offenen und unabhängigen Funknetzwerks auf WLAN-Basis.%><br />
-<%:public2 Dies ist der Zugangspunkt %><%=ffluci.sys.hostname()%>. <%:public3 Er wird betrieben von %>
-<a href="<%=controller%>/public/index/contact"><%=ff.contact.nickname%></a>.</p>
-<p><%:public4 Weitere Informationen zur globalen Freifunkinitiative findest du unter%> <a href="http://freifunk.net">Freifunk.net</a>.<br />
-<%:public5 Hast du Interesse an diesem Projekt, dann wende dich an deine lokale Gemeinschaft%> <a href="<%=ff.community.homepage%>"><%=ff.community.name%></a>.</p>
-<p><strong><%:note Hinweis%></strong>: <%:public6 Der Internetzugang über das experimentelle Freifunknetz ist an technische und organisatorische Bedingungen geknüpft und deshalb möglicherweise
-nicht (immer) gewährleistet.%></p>
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_olsr/error_olsr.htm b/module/public-core/src/view/public_olsr/error_olsr.htm
deleted file mode 100644
index 25426f50d..000000000
--- a/module/public-core/src/view/public_olsr/error_olsr.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<%+header%>
-<h1><%:olsr OLSR%></h1>
-<p class="error"><%:olsrerror1 Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!%></p>
-<p><%:olsrerror2 Um die Statusinformationen abfragen zu können muss der OLSR-Daemon gestartet
-und das Plugin "txtinfo" geladen sein.%></p>
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_olsr/hna.htm b/module/public-core/src/view/public_olsr/hna.htm
deleted file mode 100644
index c13369f42..000000000
--- a/module/public-core/src/view/public_olsr/hna.htm
+++ /dev/null
@@ -1,17 +0,0 @@
-<%+header%>
-<h1><%:olsrhna OLSR-HNA%></h1>
-<br />
-<table cellspacing="0" cellpadding="6">
-<tr>
-<th><%:destination Ziel%></th>
-<th><%:gateway Gateway%></th>
-</tr>
-<% for k, route in ipairs(routes) do %>
-<tr>
-<td><%=route.Network%>/<%=route.Netmask%></td>
-<td><a href="http://<%=route.Gateway%>"><%=route.Gateway%></a></td>
-</tr>
-<% end %>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_olsr/index.htm b/module/public-core/src/view/public_olsr/index.htm
deleted file mode 100644
index 0633d1f45..000000000
--- a/module/public-core/src/view/public_olsr/index.htm
+++ /dev/null
@@ -1,43 +0,0 @@
-<%+header%>
-<h1><%:olsrlinks OLSR-Verbindungen%></h1>
-<p><%:olsrlinks1 Übersicht über aktuell bestehende OLSR-Verbindungen%></p>
-<br />
-<table cellspacing="0" cellpadding="6">
-<tr>
-<th><%:destination Ziel%></th>
-<th><%:local Lokal%></th>
-<th>LQ</th>
-<th>NLQ</th>
-<th>ETX</th>
-</tr>
-<% for k, link in ipairs(links) do 
-	local color = "#bb3333"
-	
-	link.ETX = tonumber(link.ETX)
-	if link.ETX == 0 then
-		color = "#bb3333"
-	elseif link.ETX < 4 then
-		color = "#00cc00"
-	elseif link.ETX < 10 then
-		color = "#ffcb05"
-	elseif link.ETX < 100 then
-		color = "#ff6600"
-	end
-%>
-<tr>
-<td><a href="http://<%=link["remote IP"]%>"><%=link["remote IP"]%></a></td>
-<td><%=link["Local IP"]%></td>
-<td><%=link.LinkQuality%></td>
-<td><%=link.NLQ%></td>
-<td style="background-color:<%=color%>"><%=link.ETX%></td>
-</tr>
-<% end %>
-</table>
-<br />
-<h3><%:legend Legende%>:</h3>
-<ul>
-<li><strong>LQ: </strong><%:lq1 Erfolgsquote gesendeter Pakete%></li>
-<li><strong>NLQ: </strong><%:nlq1 Erfolgsquote empfangener Pakete%></li>
-<li><strong>ETX: </strong><%:etx1 Zu erwartende Sendeversuche pro Paket%></li>
-</ul>
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_olsr/mid.htm b/module/public-core/src/view/public_olsr/mid.htm
deleted file mode 100644
index 6553237ea..000000000
--- a/module/public-core/src/view/public_olsr/mid.htm
+++ /dev/null
@@ -1,17 +0,0 @@
-<%+header%>
-<h1><%:olsrmid OLSR-MID%></h1>
-<br />
-<table cellspacing="0" cellpadding="6">
-<tr>
-<th><%:node Knoten%></th>
-<th><%:aliases Aliasse%></th>
-</tr>
-<% for k, mid in ipairs(mids) do %>
-<tr>
-<td><a href="http://<%=mid.IP%>"><%=mid.IP%></a></td>
-<td><%=mid.Aliases%></td>
-</tr>
-<% end %>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_olsr/routes.htm b/module/public-core/src/view/public_olsr/routes.htm
deleted file mode 100644
index f3a0fd336..000000000
--- a/module/public-core/src/view/public_olsr/routes.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<%+header%>
-<h1><%:olsrlinks OLSR-Routen%></h1>
-<br />
-<table cellspacing="0" cellpadding="6">
-<tr>
-<th><%:destination Ziel%></th>
-<th><%:gateway Gateway%></th>
-<th><%:interface Schnittstelle%></th>
-<th><%:metric Metrik%></th>
-<th>ETX</th>
-</tr>
-<% for k, route in ipairs(routes) do 
-	local color = "#bb3333"
-	
-	route.ETX = tonumber(route.ETX)
-	if route.ETX == 0 then
-		color = "#bb3333"
-	elseif route.ETX < 4 then
-		color = "#00cc00"
-	elseif route.ETX < 10 then
-		color = "#ffcb05"
-	elseif route.ETX < 100 then
-		color = "#ff6600"
-	end
-%>
-<tr>
-<td><%=route.Destination%></td>
-<td><%=route.Gateway%></td>
-<td><%=route.Interface%></td>
-<td><%=route.Metric%></td>
-<td style="background-color:<%=color%>"><%=route.ETX%></td>
-</tr>
-<% end %>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_olsr/topology.htm b/module/public-core/src/view/public_olsr/topology.htm
deleted file mode 100644
index c622026d4..000000000
--- a/module/public-core/src/view/public_olsr/topology.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-<%+header%>
-<h1><%:olsrtopo OLSR-Topologie%></h1>
-<br />
-<table cellspacing="0" cellpadding="6">
-<tr>
-<th><%:destination Ziel%></th>
-<th><%:lasthop Letzter Router%></th>
-<th>LQ</th>
-<th>ILQ</th>
-<th>ETX</th>
-</tr>
-<% for k, route in ipairs(routes) do %>
-<tr>
-<td><a href="http://<%=route["Destination IP"]%>"><%=route["Destination IP"]%></a></td>
-<td><a href="http://<%=route["Last hop IP"]%>"><%=route["Last hop IP"]%></a></td>
-<td><%=route.LQ%></td>
-<td><%=route.ILQ%></td>
-<td><%=route.ETX%></td>
-</tr>
-<% end %>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_status/index.htm b/module/public-core/src/view/public_status/index.htm
deleted file mode 100644
index be0b96888..000000000
--- a/module/public-core/src/view/public_status/index.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<%+header%>
-<h1><%:status Status%></h1>
-<h2><%:system System%></h2>
-
-<br />
-<table cellspacing="0" cellpadding="6" class="smalltext">
-<tr>
-<th><%:system_type Systemtyp%>:</th>
-<td><%=s%></td>
-</tr>
-<tr>
-<th><%:cpu Prozessor%>:</th>
-<td><%=m%></td>
-</tr>
-<tr>
-<th><%:ram Hauptspeicher%>:</th>
-<td><%=r%></td>
-</tr>
-</table>
-<br /><br />
-
-<h2><%:wifi Drahtlos%></h2>
-<br />
-<table cellspacing="0" cellpadding="6" class="smalltext">
-<tr>
-<th><%:name Name%></th>
-<th><%:protocol Protokoll%></th>
-<th><%:frequency Frequenz%></th>
-<th><%:power Leistung%></th>
-<th><%:bitrate Bitrate%></th>
-<th><%:rts RTS%></th>
-<th><%:frag Frag.%></th>
-<th><%:link Verb.%></th>
-<th><%:signal Signal%></th>
-<th><%:noise Rausch%></th>
-</tr>
-<%=ffluci.sys.httpget("http://127.0.0.1" .. controller .. "/sudo/status/iwconfig")%>
-</table>
-<br />
-<br />
-<h2><%:defroutes Standardrouten%></h2>
-<br />
-<table cellspacing="0" cellpadding="6" class="smalltext">
-<tr>
-<th><%:gateway Gateway%></th>
-<th><%:metric Metrik%></th>
-<th><%:iface Schnittstelle%></th>
-</tr>
-<%
-for i, rt in pairs(routes) do
-%>
-<tr>
-<td><%=ffluci.sys.net.hexip4(rt.Gateway)%></th>
-<td><%=rt.Metric%></th>
-<td><%=rt.Iface%></th>
-</tr>
-<% end %>
-</table>
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_status/iwscan.htm b/module/public-core/src/view/public_status/iwscan.htm
deleted file mode 100644
index a8924c892..000000000
--- a/module/public-core/src/view/public_status/iwscan.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<%+header%>
-<h1><%:iwscan WLAN-Scan%></h1>
-<p><%:iwscan1 Drahtlosnetzwerke in der lokalen Umgebung des Routers:%></p>
-
-<br />
-<table cellspacing="0" cellpadding="6" class="smalltext">
-<tr>
-<th><%:interface Schnittstelle%></th>
-<th><%:essid ESSID%></th>
-<th><%:bssid BSSID%></th>
-<th><%:mode Modus%></th>
-<th><%:channel Kanal%></th>
-<th><%:encr Vers.%></th>
-<th><%:link Verb.%></th>
-<th><%:signal Signal%></th>
-<th><%:noise Rausch%></th>
-</tr>
-<%=ffluci.sys.httpget("http://127.0.0.1" .. controller .. "/sudo/status/iwscan")%>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/public_status/routes.htm b/module/public-core/src/view/public_status/routes.htm
deleted file mode 100644
index 85b02212d..000000000
--- a/module/public-core/src/view/public_status/routes.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<%+header%>
-<h1><%:routes Routen%></h1>
-
-<br />
-<table cellspacing="0" cellpadding="6" class="smalltext">
-<tr>
-<th><%:target Ziel%></th>
-<th><%:netmask Netzmaske%></th>
-<th><%:gateway Gateway%></th>
-<th><%:metric Metrik%></th>
-<th><%:iface Schnittstelle%></th>
-</tr>
-<%
-local routes = ffluci.sys.net.routes()
-
-for i, r in pairs(routes) do
-%>
-<tr>
-<td><%=ffluci.sys.net.hexip4(r.Destination)%></td>
-<td><%=ffluci.sys.net.hexip4(r.Mask)%></td>
-<td><%=ffluci.sys.net.hexip4(r.Gateway)%></td>
-<td><%=r.Metric%></td>
-<td><%=r.Iface%></td>
-</tr>
-<% end %>
-</table>
-<br />
-<%+footer%>
\ No newline at end of file
diff --git a/module/public-core/src/view/sudo_status/iwconfig.htm b/module/public-core/src/view/sudo_status/iwconfig.htm
deleted file mode 100644
index 6f5dede70..000000000
--- a/module/public-core/src/view/sudo_status/iwconfig.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-ffluci.http.prepare_content("text/plain")
-for k, v in pairs(ffluci.sys.wifi.getiwconfig()) do
-%>
-<tr>
-<td rowspan="2"><%=k%></td>
-<td><%=v[1]%></td>
-<td><%=v.Frequency%></td>
-<td><%=v["Tx-Power"]%></td>
-<td><%=v["Bit Rate"]%></td>
-<td><%=v["RTS thr"]%></td>
-<td><%=v["Fragment thr"]%></td>
-<td><%=v["Link Quality"]%></td>
-<td><%=v["Signal level"]%></td>
-<td><%=v["Noise level"]%></td>
-</tr>
-<tr>
-<td colspan="4"><strong>ESSID: </strong><%=v.ESSID%></td>
-<td colspan="5"><strong>BSSID: </strong><%=(v.Cell or v["Access Point"])%></td>
-</tr>
-<%end%>
diff --git a/module/public-core/src/view/sudo_status/iwscan.htm b/module/public-core/src/view/sudo_status/iwscan.htm
deleted file mode 100644
index 6f321ae9e..000000000
--- a/module/public-core/src/view/sudo_status/iwscan.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-ffluci.http.prepare_content("text/plain")
-for iface, cells in pairs(ffluci.sys.wifi.iwscan()) do
-	for i, cell in ipairs(cells) do 
-%>
-<tr>
-<td><%=iface%></td>
-<td><%=cell.ESSID%></td>
-<td><%=cell.Address%></td>
-<td><%=cell.Mode%></td>
-<td><%=(cell.Channel or cell.Frequency or "")%></td>
-<td><%=cell["Encryption key"]%></td>
-<td><%=cell.Quality%></td>
-<td><%=cell["Signal level"]%></td>
-<td><%=cell["Noise level"]%></td>
-</tr>
-<%
-	end
-end
-%>
-
-
diff --git a/module/rpc-core/Makefile b/module/rpc-core/Makefile
deleted file mode 100644
index 113799af6..000000000
--- a/module/rpc-core/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-LUAC = luac
-LUAC_OPTIONS = -s
-
-FILES = i18n/* view/*/*.htm
-
-CFILES = controller/*/*.lua model/cbi/*/*.lua model/menu/*.lua 
-
-DIRECTORIES = model/cbi model/menu controller i18n view
-
-
-INFILES = $(CFILES:%=src/%)
-OUTDIRS = $(DIRECTORIES:%=dist/%)
-CPFILES = $(FILES:%=src/%)
-
-.PHONY: all compile source clean depends
-
-all: compile
-
-
-depends:
-	mkdir -p $(OUTDIRS)
-	for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done
-
-compile: depends
-	for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done
-	
-source: depends
-	for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \
-		mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done
-	
-	
-clean:
-	rm dist -rf
diff --git a/module/rpc-core/src/controller/rpc/luciinfo.lua b/module/rpc-core/src/controller/rpc/luciinfo.lua
deleted file mode 100644
index 611423fbb..000000000
--- a/module/rpc-core/src/controller/rpc/luciinfo.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-module("ffluci.controller.rpc.luciinfo", package.seeall)
-
-function action_index()
-	local uci = ffluci.model.uci.StateSession()
-
-	ffluci.http.prepare_content("text/plain")
-	
-	-- General
-	print("luciinfo.api=1")
-	print("luciinfo.version=" .. tostring(ffluci.__version__))
-	
-	-- Sysinfo
-	local s, m, r = ffluci.sys.sysinfo()
-	local dr = ffluci.sys.net.defaultroute()
-	dr = dr and ffluci.sys.net.hexip4(dr.Gateway) or ""
-	local l1, l5, l15 = ffluci.sys.loadavg()
-	
-	print("sysinfo.system=" .. sanitize(s))
-	print("sysinfo.cpu=" .. sanitize(m))
-	print("sysinfo.ram=" .. sanitize(r))
-	print("sysinfo.hostname=" .. sanitize(ffluci.sys.hostname()))
-	print("sysinfo.load1=" .. tostring(l1))
-	print("sysinfo.load5=" .. tostring(l5))
-	print("sysinfo.load15=" .. tostring(l15))
-	print("sysinfo.defaultgw=" .. dr)
-
-	
-	-- Freifunk
-	local ff = uci:sections("freifunk") or {}
-	for k, v in pairs(ff) do
-		if k:sub(1, 1) ~= "." then
-			for i, j in pairs(v) do
-				print("freifunk." .. k .. "." .. i .. "=" .. j)
-			end
-		end
-	end
-end
-
-function sanitize(val)
-	return val:gsub("\n", "\t")
-end
\ No newline at end of file