diff --git a/ar71xx.configdiff b/ar71xx.configdiff
new file mode 100644
index 0000000..6056aef
--- /dev/null
+++ b/ar71xx.configdiff
@@ -0,0 +1,73 @@
+CONFIG_TARGET_ar71xx=y
+CONFIG_TARGET_ar71xx_generic=y
+CONFIG_TARGET_ar71xx_generic_Default=y
+CONFIG_ALL_KMODS=y
+CONFIG_BWMNG_EXTENDEDSTATS=y
+CONFIG_BWMNG_TIME=y
+CONFIG_DROPBEAR_ECC=y
+CONFIG_ETHTOOL_PRETTY_DUMP=y
+CONFIG_PACKAGE_ATH_DEBUG=y
+CONFIG_PACKAGE_bmon=y
+CONFIG_PACKAGE_bwm-ng=y
+CONFIG_PACKAGE_collectd=y
+CONFIG_PACKAGE_collectd-mod-cpu=y
+CONFIG_PACKAGE_collectd-mod-exec=y
+CONFIG_PACKAGE_collectd-mod-interface=y
+CONFIG_PACKAGE_collectd-mod-irq=y
+CONFIG_PACKAGE_collectd-mod-iwinfo=y
+CONFIG_PACKAGE_collectd-mod-load=y
+CONFIG_PACKAGE_collectd-mod-memory=y
+CONFIG_PACKAGE_collectd-mod-netlink=y
+CONFIG_PACKAGE_collectd-mod-network=y
+CONFIG_PACKAGE_collectd-mod-wireless=y
+CONFIG_PACKAGE_confuse=y
+# CONFIG_PACKAGE_dnsmasq is not set
+CONFIG_PACKAGE_ebtables=y
+CONFIG_PACKAGE_ebtables-utils=y
+CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_firewall=m
+CONFIG_PACKAGE_horst=y
+CONFIG_PACKAGE_hostapd-utils=y
+CONFIG_PACKAGE_ip6tables=m
+CONFIG_PACKAGE_iptables=m
+CONFIG_PACKAGE_kmod-br-netfilter=y
+CONFIG_PACKAGE_kmod-bridge=y
+CONFIG_PACKAGE_kmod-ebtables=y
+CONFIG_PACKAGE_kmod-ip6tables=m
+CONFIG_PACKAGE_kmod-ipt-conntrack=m
+CONFIG_PACKAGE_kmod-ipt-nat=m
+CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
+CONFIG_PACKAGE_kmod-llc=y
+CONFIG_PACKAGE_kmod-nf-conntrack=m
+CONFIG_PACKAGE_kmod-nf-conntrack6=m
+CONFIG_PACKAGE_kmod-nf-ipt6=m
+CONFIG_PACKAGE_kmod-nf-nat=m
+CONFIG_PACKAGE_kmod-stp=y
+CONFIG_PACKAGE_libgmp=y
+CONFIG_PACKAGE_libip6tc=m
+CONFIG_PACKAGE_libltdl=y
+CONFIG_PACKAGE_liblua=y
+CONFIG_PACKAGE_libmnl=y
+CONFIG_PACKAGE_libncursesw=y
+CONFIG_PACKAGE_libnetsnmp=y
+CONFIG_PACKAGE_libnettle=y
+CONFIG_PACKAGE_libnfnetlink=y
+CONFIG_PACKAGE_libnl-core=y
+CONFIG_PACKAGE_libnl-genl=y
+CONFIG_PACKAGE_libnl-route=y
+CONFIG_PACKAGE_libpcap=y
+CONFIG_PACKAGE_libpthread=y
+CONFIG_PACKAGE_libubus-lua=y
+CONFIG_PACKAGE_libuci-lua=y
+# CONFIG_PACKAGE_odhcpd is not set
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_snmpd=y
+CONFIG_PACKAGE_tcpdump=y
+CONFIG_PACKAGE_terminfo=y
+CONFIG_PACKAGE_wavemon=y
+CONFIG_PACKAGE_wifi-sentinel=y
+CONFIG_PACKAGE_wpa-cli=y
+CONFIG_PACKAGE_wpad=y
+# CONFIG_PACKAGE_wpad-mini is not set
+CONFIG_PACKAGE_zlib=y
+CONFIG_WPA_SUPPLICANT_INTERNAL=y
diff --git a/archer-c5.configdiff b/archer-c5.configdiff
deleted file mode 100644
index 8557207..0000000
--- a/archer-c5.configdiff
+++ /dev/null
@@ -1,112 +0,0 @@
-CONFIG_TARGET_ar71xx=y
-CONFIG_TARGET_ar71xx_generic=y
-CONFIG_TARGET_ar71xx_generic_ARCHERC7=y
-CONFIG_DEVEL=y
-CONFIG_ATH_USER_REGD=y
-CONFIG_BWMNG_EXTENDEDSTATS=y
-CONFIG_BWMNG_TIME=y
-CONFIG_COLLECT_KERNEL_DEBUG=y
-CONFIG_DROPBEAR_ECC=y
-CONFIG_IB=y
-CONFIG_IMAGEOPT=y
-# CONFIG_KERNEL_KALLSYMS is not set
-CONFIG_LUCI_SRCDIET=y
-CONFIG_MAKE_TOOLCHAIN=y
-CONFIG_PACKAGE_ATH_DEBUG=y
-CONFIG_PACKAGE_bmon=y
-CONFIG_PACKAGE_bwm-ng=y
-CONFIG_PACKAGE_collectd=y
-CONFIG_PACKAGE_collectd-mod-contextswitch=y
-CONFIG_PACKAGE_collectd-mod-cpu=y
-CONFIG_PACKAGE_collectd-mod-exec=y
-CONFIG_PACKAGE_collectd-mod-interface=y
-CONFIG_PACKAGE_collectd-mod-irq=y
-CONFIG_PACKAGE_collectd-mod-iwinfo=y
-CONFIG_PACKAGE_collectd-mod-load=y
-CONFIG_PACKAGE_collectd-mod-network=y
-CONFIG_PACKAGE_collectd-mod-wireless=y
-CONFIG_PACKAGE_confuse=y
-# CONFIG_PACKAGE_dnsmasq is not set
-CONFIG_PACKAGE_ebtables=y
-CONFIG_PACKAGE_ebtables-utils=y
-# CONFIG_PACKAGE_firewall is not set
-CONFIG_PACKAGE_horst=y
-CONFIG_PACKAGE_hostapd-utils=y
-CONFIG_PACKAGE_htop=y
-# CONFIG_PACKAGE_ip6tables is not set
-# CONFIG_PACKAGE_iptables is not set
-CONFIG_PACKAGE_kismet-drone=y
-CONFIG_PACKAGE_kmod-8021q=y
-CONFIG_PACKAGE_kmod-bridge=y
-CONFIG_PACKAGE_kmod-ebtables=y
-CONFIG_PACKAGE_kmod-ebtables-ipv4=y
-CONFIG_PACKAGE_kmod-ebtables-ipv6=y
-# CONFIG_PACKAGE_kmod-ip6tables is not set
-# CONFIG_PACKAGE_kmod-ipt-conntrack is not set
-# CONFIG_PACKAGE_kmod-ipt-nat is not set
-CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
-CONFIG_PACKAGE_kmod-ledtrig-usbdev=m
-# CONFIG_PACKAGE_kmod-lib-crc-ccitt is not set
-CONFIG_PACKAGE_kmod-llc=y
-# CONFIG_PACKAGE_kmod-nf-conntrack is not set
-# CONFIG_PACKAGE_kmod-nf-conntrack6 is not set
-# CONFIG_PACKAGE_kmod-nf-ipt6 is not set
-# CONFIG_PACKAGE_kmod-nf-nat is not set
-# CONFIG_PACKAGE_kmod-nf-nathelper is not set
-CONFIG_PACKAGE_kmod-nls-base=m
-# CONFIG_PACKAGE_kmod-ppp is not set
-CONFIG_PACKAGE_kmod-stp=y
-CONFIG_PACKAGE_kmod-usb-core=m
-CONFIG_PACKAGE_kmod-usb-ohci=m
-CONFIG_PACKAGE_kmod-usb2=m
-CONFIG_PACKAGE_kmod-zd1211rw=m
-CONFIG_PACKAGE_libcap=y
-# CONFIG_PACKAGE_libip6tc is not set
-CONFIG_PACKAGE_libiwinfo-lua=y
-CONFIG_PACKAGE_libltdl=y
-CONFIG_PACKAGE_liblua=y
-CONFIG_PACKAGE_libncurses=y
-CONFIG_PACKAGE_libnl=y
-CONFIG_PACKAGE_libpcap=y
-CONFIG_PACKAGE_libpcre=y
-CONFIG_PACKAGE_libpthread=y
-CONFIG_PACKAGE_libubus-lua=y
-CONFIG_PACKAGE_libuci-lua=y
-CONFIG_PACKAGE_lua=y
-CONFIG_PACKAGE_luci-base=y
-CONFIG_PACKAGE_luci-lib-ip=y
-CONFIG_PACKAGE_luci-lib-nixio=y
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-CONFIG_PACKAGE_luci-theme-bootstrap=y
-# CONFIG_PACKAGE_odhcpd is not set
-# CONFIG_PACKAGE_ppp is not set
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_sudo=y
-CONFIG_PACKAGE_tcpdump=m
-CONFIG_PACKAGE_tcpdump-mini=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh=y
-CONFIG_PACKAGE_uclibcxx=y
-CONFIG_PACKAGE_uhttpd=y
-CONFIG_PACKAGE_uhttpd-mod-ubus=y
-CONFIG_PACKAGE_wavemon=y
-CONFIG_PACKAGE_wifi-sentinel=y
-CONFIG_PACKAGE_wireless-tools=y
-CONFIG_PACKAGE_wpad=y
-# CONFIG_PACKAGE_wpad-mini is not set
-CONFIG_PACKAGE_zlib=y
-# CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
-CONFIG_SDK=y
-CONFIG_VERSIONOPT=y
-CONFIG_VERSION_DIST="OpenFestWrt"
-CONFIG_VERSION_FILENAMES=y
-CONFIG_VERSION_HWREV=""
-CONFIG_VERSION_MANUFACTURER=""
-CONFIG_VERSION_NICK="Chaos Calmer"
-CONFIG_VERSION_NUMBER="15.05"
-CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="http://downloads.openwrt.org/%n/%v/%S/packages"
-CONFIG_WPA_SUPPLICANT_INTERNAL=y
-# CONFIG_IB_STANDALONE is not set