diff --git a/gluon-config-mode-tunneldigger/Makefile b/gluon-config-mode-tunneldigger/Makefile
index 03d97dd..179d2ec 100644
--- a/gluon-config-mode-tunneldigger/Makefile
+++ b/gluon-config-mode-tunneldigger/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(INCLUDE_DIR)/package.mk
+include ../gluon.mk
 
 PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
 
@@ -26,10 +26,11 @@ endef
 
 define Build/Compile
 	$(call GluonBuildI18N,gluon-config-mode-tunneldigger,i18n)
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-config-mode-tunneldigger/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 	$(call GluonInstallI18N,gluon-config-mode-tunneldigger,$(1))
 endef
 
diff --git a/gluon-config-mode-tunneldigger/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua b/gluon-config-mode-tunneldigger/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
deleted file mode 100755
index a8d63f7..0000000
--- a/gluon-config-mode-tunneldigger/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-local cbi = require "luci.cbi"
-local i18n = require "luci.i18n"
-local uci = luci.model.uci.cursor()
-
-local M = {}
-
-function M.section(form)
-  local msg = i18n.translate('Your internet connection can be used to establish a ' ..
-                             'L2TP VPN connection with other nodes. ' ..
-                             'Enable this option if there are no other nodes reachable ' ..
-                             'over WLAN in your vicinity or you want to make a part of ' ..
-                             'your connection\'s bandwidth available for the network. You can limit how ' ..
-                             'much bandwidth the node will use at most.')
-  local s = form:section(cbi.SimpleSection, nil, msg)
-  
-  local o
-
-  o = s:option(cbi.Flag, "_meshvpn", i18n.translate("Use internet connection (mesh VPN via L2TP)"))
-  o.default = uci:get_bool("tunneldigger", uci:get_first("tunneldigger", "broker"), "enabled") and o.enabled or o.disabled
-  o.rmempty = false
-
-  o = s:option(cbi.Flag, "_limit_enabled", i18n.translate("Limit bandwidth"))
-  o:depends("_meshvpn", "1")
-  o.default = uci:get_bool("simple-tc", "mesh_vpn", "enabled") and o.enabled or o.disabled
-  o.rmempty = false
-
-  o = s:option(cbi.Value, "_limit_ingress", i18n.translate("Downstream (kbit/s)"))
-  o:depends("_limit_enabled", "1")
-  o.value = uci:get("simple-tc", "mesh_vpn", "limit_ingress")
-  o.rmempty = false
-  o.datatype = "integer"
-
-  o = s:option(cbi.Value, "_limit_egress", i18n.translate("Upstream (kbit/s)"))
-  o:depends("_limit_enabled", "1")
-  o.value = uci:get("simple-tc", "mesh_vpn", "limit_egress")
-  o.rmempty = false
-  o.datatype = "integer"
-end
-
-function M.handle(data)
-  uci:set("tunneldigger", uci:get_first("tunneldigger", "broker"), "enabled", data._meshvpn)
-  uci:save("tunneldigger")
-  uci:commit("tunneldigger")
-
-  -- checks for nil needed due to o:depends(...)
-  if data._limit_enabled ~= nil then
-    uci:set("simple-tc", "mesh_vpn", "interface")
-    uci:set("simple-tc", "mesh_vpn", "enabled", data._limit_enabled)
-    uci:set("simple-tc", "mesh_vpn", "ifname", "mesh-vpn")
-
-    if data._limit_ingress ~= nil then
-      uci:set("simple-tc", "mesh_vpn", "limit_ingress", data._limit_ingress)
-    end
-
-    if data._limit_egress ~= nil then
-      uci:set("simple-tc", "mesh_vpn", "limit_egress", data._limit_egress)
-    end
-
-    uci:save("simple-tc")
-    uci:commit("simple-tc")
-  end
-end
-
-return M
diff --git a/gluon-config-mode-tunneldigger/i18n/de.po b/gluon-config-mode-tunneldigger/i18n/de.po
index 7ae434c..7641c76 100644
--- a/gluon-config-mode-tunneldigger/i18n/de.po
+++ b/gluon-config-mode-tunneldigger/i18n/de.po
@@ -19,18 +19,18 @@ msgstr "Bandbreite begrenzen"
 msgid "Upstream (kbit/s)"
 msgstr "Upstream (kbit/s)"
 
-msgid "Use internet connection (mesh VPN via L2TP)"
-msgstr "Internetverbindung nutzen (Mesh-VPN via L2TP)"
+msgid "Use internet connection (mesh VPN)"
+msgstr "Internetverbindung nutzen (Mesh-VPN)"
 
 msgid ""
-"Your internet connection can be used to establish a L2TP VPN connection "
+"Your internet connection can be used to establish a VPN connection "
 "with other nodes. Enable this option if there are no other nodes reachable "
 "over WLAN in your vicinity or you want to make a part of your connection's "
 "bandwidth available for the network. You can limit how much bandwidth the "
 "node will use at most."
 msgstr ""
 "Dein Knoten kann deine Internetverbindung nutzen um darüber eine "
-"L2TP-VPN Verbindung zu anderen Knoten aufzubauen. Die dafür "
+"VPN Verbindung zu anderen Knoten aufzubauen. Die dafür "
 "genutzte Bandbreite kannst du beschränken. Aktiviere die Option, falls keine "
 "per WLAN erreichbaren Nachbarknoten in deiner Nähe sind oder du deine "
 "Internetverbindung für das Mesh-Netzwerk zur Verfügung stellen möchtest."
diff --git a/gluon-config-mode-tunneldigger/i18n/gluon-config-mode-tunneldigger.pot b/gluon-config-mode-tunneldigger/i18n/gluon-config-mode-tunneldigger.pot
index de18498..b672291 100644
--- a/gluon-config-mode-tunneldigger/i18n/gluon-config-mode-tunneldigger.pot
+++ b/gluon-config-mode-tunneldigger/i18n/gluon-config-mode-tunneldigger.pot
@@ -10,11 +10,11 @@ msgstr ""
 msgid "Upstream (kbit/s)"
 msgstr ""
 
-msgid "Use internet connection (mesh VPN via L2TP)"
+msgid "Use internet connection (mesh VPN)"
 msgstr ""
 
 msgid ""
-"Your internet connection can be used to establish a L2TP VPN connection "
+"Your internet connection can be used to establish a VPN connection "
 "with other nodes. Enable this option if there are no other nodes reachable "
 "over WLAN in your vicinity or you want to make a part of your connection's "
 "bandwidth available for the network. You can limit how much bandwidth the "
diff --git a/gluon-config-mode-tunneldigger/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua b/gluon-config-mode-tunneldigger/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
new file mode 100755
index 0000000..50edeb6
--- /dev/null
+++ b/gluon-config-mode-tunneldigger/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
@@ -0,0 +1,47 @@
+return function(form, uci)
+	local msg = translate(
+		'Your internet connection can be used to establish a ' ..
+	        'VPN connection with other nodes. ' ..
+	        'Enable this option if there are no other nodes reachable ' ..
+	        'over WLAN in your vicinity or you want to make a part of ' ..
+	        'your connection\'s bandwidth available for the network. You can limit how ' ..
+	        'much bandwidth the node will use at most.'
+	)
+
+	local s = form:section(Section, nil, msg)
+
+	local o
+
+	local meshvpn = s:option(Flag, "meshvpn", translate("Use internet connection (mesh VPN)"))
+	meshvpn.default = uci:get_bool("tunneldigger", "mesh_vpn", "enabled")
+	function meshvpn:write(data)
+		uci:set("tunneldigger", "mesh_vpn", "enabled", data)
+	end
+
+	local limit = s:option(Flag, "limit_enabled", translate("Limit bandwidth"))
+	limit:depends(meshvpn, true)
+	limit.default = uci:get_bool("simple-tc", "mesh_vpn", "enabled")
+	function limit:write(data)
+		uci:set("simple-tc", "mesh_vpn", "interface")
+		uci:set("simple-tc", "mesh_vpn", "enabled", data)
+		uci:set("simple-tc", "mesh_vpn", "ifname", "mesh-vpn")
+	end
+
+	o = s:option(Value, "limit_ingress", translate("Downstream (kbit/s)"))
+	o:depends(limit, true)
+	o.default = uci:get("simple-tc", "mesh_vpn", "limit_ingress")
+	o.datatype = "uinteger"
+	function o:write(data)
+		uci:set("simple-tc", "mesh_vpn", "limit_ingress", data)
+	end
+
+	o = s:option(Value, "limit_egress", translate("Upstream (kbit/s)"))
+	o:depends(limit, true)
+	o.default = uci:get("simple-tc", "mesh_vpn", "limit_egress")
+	o.datatype = "uinteger"
+	function o:write(data)
+		uci:set("simple-tc", "mesh_vpn", "limit_egress", data)
+	end
+
+	return {'tunneldigger', 'simple-tc'}
+end
diff --git a/gluon-mesh-vpn-tunneldigger/Makefile b/gluon-mesh-vpn-tunneldigger/Makefile
index aeccf35..b8323cb 100644
--- a/gluon-mesh-vpn-tunneldigger/Makefile
+++ b/gluon-mesh-vpn-tunneldigger/Makefile
@@ -5,13 +5,13 @@ PKG_VERSION:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(INCLUDE_DIR)/package.mk
+include ../gluon.mk
 
 define Package/gluon-mesh-vpn-tunneldigger
   SECTION:=gluon
   CATEGORY:=Gluon
-  TITLE:=Support for connecting batman-adv meshes via tunneltigger/l2tpv3 pseudowire
-  DEPENDS:=+gluon-core gluon-mesh-batman-adv +gluon-wan-dnsmasq +tunneldigger +iptables-mod-extra +simple-tc
+  TITLE:=Support for connecting meshes via tunneltigger/l2tpv3 pseudowire
+  DEPENDS:=+gluon-core +gluon-wan-dnsmasq +tunneldigger +iptables +iptables-mod-extra +simple-tc
 endef
 
 define Package/gluon-mesh-vpn-tunneldigger/description
@@ -26,10 +26,12 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-mesh-vpn-tunneldigger/install
 	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/	
 endef
 
 define Package/gluon-mesh-vpn-tunneldigger/postinst
diff --git a/gluon-mesh-vpn-tunneldigger/check_site.lua b/gluon-mesh-vpn-tunneldigger/check_site.lua
index b0d2abd..39470a1 100644
--- a/gluon-mesh-vpn-tunneldigger/check_site.lua
+++ b/gluon-mesh-vpn-tunneldigger/check_site.lua
@@ -3,7 +3,7 @@ need_boolean('tunneldigger_mesh_vpn.enabled', false)
 need_string_array('tunneldigger_mesh_vpn.brokers')
 
 if need_table('tunneldigger_mesh_vpn.bandwidth_limit', nil, false) then
-  need_boolean('tunneldigger_mesh_vpn.bandwidth_limit.enabled', false)
-  need_number('tunneldigger_mesh_vpn.bandwidth_limit.ingress', false)
-  need_number('tunneldigger_mesh_vpn.bandwidth_limit.egress', false)
+	need_boolean('tunneldigger_mesh_vpn.bandwidth_limit.enabled', false)
+	need_number('tunneldigger_mesh_vpn.bandwidth_limit.ingress', false)
+	need_number('tunneldigger_mesh_vpn.bandwidth_limit.egress', false)
 end
diff --git a/gluon-mesh-vpn-tunneldigger/files/lib/gluon/upgrade/400-mesh-vpn-tunneldigger b/gluon-mesh-vpn-tunneldigger/files/lib/gluon/upgrade/400-mesh-vpn-tunneldigger
deleted file mode 100755
index 626a1da..0000000
--- a/gluon-mesh-vpn-tunneldigger/files/lib/gluon/upgrade/400-mesh-vpn-tunneldigger
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/lua
-
-local site = require 'gluon.site_config'
-local users = require 'gluon.users'
-local util = require 'gluon.util'
-
-local uci = require('luci.model.uci').cursor()
-local lutil = require 'luci.util'
-
--- Group for iptables rule
-users.add_group('gluon-tunneldigger', 900)
-
-local enabled = uci:get_first('tunneldigger', 'broker', 'enabled')
-if (tonumber(enabled) == 0) then
-  enabled = site.tunneldigger_mesh_vpn.enabled and 1 or 0
-end
-
--- Delete old broker config section       
-uci:delete_all('tunneldigger', 'broker')
-
-section = uci:add('tunneldigger', 'broker')
-
-uci:section('tunneldigger', 'broker', section,
-	  {
-		  enabled = enabled,
-		  uuid = util.node_id(),
-		  interface = 'mesh-vpn',
-		  bind_interface = 'br-wan',
-		  group = 'gluon-tunneldigger',
-		  broker_selection = 'usage',
-		  address = site.tunneldigger_mesh_vpn.brokers,
-	  }
-)
-
-uci:save('tunneldigger')
-uci:commit('tunneldigger')
-
-uci:section('network', 'interface', 'mesh_vpn',
-	  {
-		  ifname = 'mesh-vpn',
-		  proto = 'batadv',
-		  mesh = 'bat0',
-		  mesh_no_rebroadcast = 1,
-		  mtu = site.tunneldigger_mesh_vpn.mtu,
-	  }
-)
-
-uci:save('network')
-uci:commit('network')
-
-
-uci:section('firewall', 'include', 'mesh_vpn_dns_tunneldigger',
-	  {
-	    type = 'restore',
-	    path = '/lib/gluon/mesh-vpn-tunneldigger/iptables.rules',
-	    family = 'ipv4',
-	  }
-)
-
-uci:save('firewall')
-uci:commit('firewall')
diff --git a/gluon-mesh-vpn-tunneldigger/files/lib/gluon/upgrade/420-mesh-vpn-tunneldigger-simple-tc b/gluon-mesh-vpn-tunneldigger/files/lib/gluon/upgrade/420-mesh-vpn-tunneldigger-simple-tc
deleted file mode 100755
index 35c43e2..0000000
--- a/gluon-mesh-vpn-tunneldigger/files/lib/gluon/upgrade/420-mesh-vpn-tunneldigger-simple-tc
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/lua
-
-local site = require 'gluon.site_config'
-local uci = require('luci.model.uci').cursor()
-local fs = require 'nixio.fs'
-
-
-if fs.access('/etc/config/gluon-simple-tc') then
-  os.rename('/etc/config/gluon-simple-tc', '/etc/config/simple-tc')
-end
-
-
-if not uci:get('simple-tc', 'mesh_vpn') then
-  local config = {
-    ifname = 'mesh-vpn',
-    enabled = 0,
-  }
-
-
-  if site.tunneldigger_mesh_vpn.bandwidth_limit then
-    if site.tunneldigger_mesh_vpn.bandwidth_limit.enabled then
-      config.enabled = 1
-    end
-
-    config.limit_ingress = site.tunneldigger_mesh_vpn.bandwidth_limit.ingress
-    config.limit_egress = site.tunneldigger_mesh_vpn.bandwidth_limit.egress
-  end
-
-  uci:section('simple-tc', 'interface', 'mesh_vpn', config)
-  uci:save('simple-tc')
-  uci:commit('simple-tc')
-end
diff --git a/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/400-mesh-vpn-tunneldigger b/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/400-mesh-vpn-tunneldigger
new file mode 100755
index 0000000..68ea88a
--- /dev/null
+++ b/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/400-mesh-vpn-tunneldigger
@@ -0,0 +1,61 @@
+#!/usr/bin/lua
+
+local site = require 'gluon.site_config'
+local users = require 'gluon.users'
+local util = require 'gluon.util'
+
+local uci = require('simple-uci').cursor()
+
+
+-- Group for iptables rule
+users.add_group('gluon-tunneldigger', 900)
+
+local enabled = uci:get('tunneldigger', 'mesh_vpn', 'enabled')
+if enabled == nil then
+	enabled = uci:get_first('tunneldigger', 'broker', 'enabled')
+end
+if enabled == nil then
+	enabled = site.tunneldigger_mesh_vpn.enabled or false
+end
+
+-- Delete old broker config section       
+if not uci:get('tunneldigger', 'mesh_vpn') then
+	uci:delete_all('tunneldigger', 'broker')
+end
+
+uci:section('tunneldigger', 'broker', 'mesh_vpn',
+	{
+		enabled = enabled,
+		uuid = util.node_id(),
+		interface = 'mesh-vpn',
+		bind_interface = 'br-wan',
+		group = 'gluon-tunneldigger',
+		broker_selection = 'usage',
+		address = site.tunneldigger_mesh_vpn.brokers,
+	}
+)
+
+uci:save('tunneldigger')
+
+uci:section('network', 'interface', 'mesh_vpn',
+	{
+		ifname = 'mesh-vpn',
+		proto = 'gluon_mesh',
+		fixed_mtu = '1',
+		transitive = '1',
+		mtu = site.tunneldigger_mesh_vpn.mtu,
+	}
+)
+
+uci:save('network')
+
+
+uci:section('firewall', 'include', 'mesh_vpn_dns',
+	{
+		type = 'restore',
+		path = '/lib/gluon/mesh-vpn-tunneldigger/iptables.rules',
+		family = 'ipv4',
+	}
+)
+
+uci:save('firewall')
diff --git a/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/420-mesh-vpn-tunneldigger-simple-tc b/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/420-mesh-vpn-tunneldigger-simple-tc
new file mode 100755
index 0000000..a8464ca
--- /dev/null
+++ b/gluon-mesh-vpn-tunneldigger/luasrc/lib/gluon/upgrade/420-mesh-vpn-tunneldigger-simple-tc
@@ -0,0 +1,31 @@
+#!/usr/bin/lua
+
+local site = require 'gluon.site_config'
+local uci = require('simple-uci').cursor()
+local fs = require 'nixio.fs'
+
+
+if fs.access('/etc/config/gluon-simple-tc') then
+	os.rename('/etc/config/gluon-simple-tc', '/etc/config/simple-tc')
+end
+
+
+if not uci:get('simple-tc', 'mesh_vpn') then
+	local config = {
+		ifname = 'mesh-vpn',
+		enabled = false,
+	}
+
+
+	if site.tunneldigger_mesh_vpn.bandwidth_limit then
+		if site.tunneldigger_mesh_vpn.bandwidth_limit.enabled then
+			config.enabled = true
+		end
+
+		config.limit_ingress = site.tunneldigger_mesh_vpn.bandwidth_limit.ingress
+		config.limit_egress = site.tunneldigger_mesh_vpn.bandwidth_limit.egress
+	end
+
+	uci:section('simple-tc', 'interface', 'mesh_vpn', config)
+	uci:save('simple-tc')
+end
diff --git a/gluon-migrate-vpn/Makefile b/gluon-migrate-vpn/Makefile
index e85088f..79d0163 100644
--- a/gluon-migrate-vpn/Makefile
+++ b/gluon-migrate-vpn/Makefile
@@ -5,7 +5,7 @@ PKG_VERSION:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-include $(INCLUDE_DIR)/package.mk
+include ../gluon.mk
 
 define Package/gluon-migrate-vpn
   SECTION:=gluon
@@ -26,10 +26,11 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
 endef
 
 define Package/gluon-migrate-vpn/install
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
 endef
 
 define Package/gluon-migrate-vpn/postinst
diff --git a/gluon-migrate-vpn/files/lib/gluon/upgrade/499-migrate-vpn b/gluon-migrate-vpn/files/lib/gluon/upgrade/499-migrate-vpn
deleted file mode 100755
index 24e8e31..0000000
--- a/gluon-migrate-vpn/files/lib/gluon/upgrade/499-migrate-vpn
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/lua
-
-local site = require 'gluon.site_config'
-local users = require 'gluon.users'
-local util = require 'gluon.util'
-
-local uci = require('luci.model.uci').cursor()
-local lutil = require 'luci.util'
-
-local tunneldigger_enabled = uci:get_first('tunneldigger', 'broker', 'enabled')
-local fastd_enabled = uci:get('fastd', 'mesh_vpn', 'enabled')
-
-local tunneldigger_installed = util.exec('sh' , '-c', 'opkg list-installed | grep -e \'^tunneldigger\'')
-local fastd_installed = util.exec('sh' , '-c', 'opkg list-installed | grep -e \'^fastd\'')
-
-local enabled = 0
-
-if (tonumber(tunneldigger_enabled) == 1 or tonumber(fastd_enabled) == 1) then
-  enabled = 1
-end
-
-if (enabled == 1 and tunneldigger_installed == 0 and fastd_installed == 256) then
-  uci:set("tunneldigger", uci:get_first("tunneldigger", "broker"), "enabled", enabled)
-  uci:save("tunneldigger")
-  uci:commit("tunneldigger")
-elseif (enabled == 1 and tunneldigger_installed == 256 and fastd_installed == 0) then
-  uci:set("fastd", "mesh_vpn", "enabled", enabled)
-  uci:save("fastd")
-  uci:commit("fastd")
-end
-
diff --git a/gluon-migrate-vpn/luasrc/lib/gluon/upgrade/499-migrate-vpn b/gluon-migrate-vpn/luasrc/lib/gluon/upgrade/499-migrate-vpn
new file mode 100755
index 0000000..fd7e0a5
--- /dev/null
+++ b/gluon-migrate-vpn/luasrc/lib/gluon/upgrade/499-migrate-vpn
@@ -0,0 +1,21 @@
+#!/usr/bin/lua
+
+local fs = require 'nixio.fs'
+local uci = require("simple-uci").cursor()
+
+local tunneldigger_enabled = uci:get_bool("tunneldigger", "mesh_vpn", "enabled")
+local fastd_enabled = uci:get_bool("fastd", "mesh_vpn", "enabled")
+
+local enabled = false
+
+if (tunneldigger_enabled or fastd_enabled) then
+	enabled = true
+end
+
+if (enabled and fs.access("/usr/bin/tunneldigger") and not fs.access("/usr/bin/fastd")) then
+	uci:set("tunneldigger", "mesh_vpn", "enabled", enabled)
+	uci:save("tunneldigger")
+elseif (enabled and not fs.access("/usr/bin/tunneldigger") and fs.access("/usr/bin/fastd")) then
+	uci:set("fastd", "mesh_vpn", "enabled", enabled)
+	uci:save("fastd")
+end
diff --git a/gluon-tunneldigger-watchdog/Makefile b/gluon-tunneldigger-watchdog/Makefile
deleted file mode 100644
index 22bb60e..0000000
--- a/gluon-tunneldigger-watchdog/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-tunneldigger-watchdog
-PKG_VERSION:=3
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gluon-tunneldigger-watchdog
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=Automatically restarts tunneldigger if the client crashed
-  DEPENDS:=+gluon-mesh-vpn-tunneldigger
-endef
-
-define Package/gluon-tunneldigger-watchdog/description
-	Gluon community wifi mesh firmware framework: tunneldigger watchdog
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/gluon-tunneldigger-watchdog/install
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/gluon-tunneldigger-watchdog/postinst
-endef
-
-$(eval $(call BuildPackage,gluon-tunneldigger-watchdog))
diff --git a/gluon-tunneldigger-watchdog/files/usr/bin/tunneldigger-watchdog b/gluon-tunneldigger-watchdog/files/usr/bin/tunneldigger-watchdog
deleted file mode 100755
index 8b26212..0000000
--- a/gluon-tunneldigger-watchdog/files/usr/bin/tunneldigger-watchdog
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-PIDFILE=/var/run/tunneldigger.mesh-vpn.pid
-
-if [ "$(uci get tunneldigger.@broker[0].enabled)" == "1" ]; then
-    if [ "$(pgrep tunneldigger | head -n 1)" != "$(cat $PIDFILE)" ]; then
-        /etc/init.d/tunneldigger restart
-        logger -t tunneldiger-watchdog "Daemon not running, restarted tunneldigger."
-    elif [ "$(batctl o |grep mesh-vpn |wc -l)" == "0" ]; then
-        /etc/init.d/tunneldigger restart
-        logger -t tunneldiger-watchdog "No neighbours on mesh-vpn interface, restarted tunneldigger."
-    fi
-fi
diff --git a/gluon-tunneldigger-watchdog/files/usr/lib/micron.d/tunneldigger-watchdog b/gluon-tunneldigger-watchdog/files/usr/lib/micron.d/tunneldigger-watchdog
deleted file mode 100644
index c4ae3bc..0000000
--- a/gluon-tunneldigger-watchdog/files/usr/lib/micron.d/tunneldigger-watchdog
+++ /dev/null
@@ -1 +0,0 @@
-*/5 * * * * /usr/bin/tunneldigger-watchdog