diff --git a/package/firewall/Makefile b/package/network/config/firewall/Makefile
similarity index 100%
rename from package/firewall/Makefile
rename to package/network/config/firewall/Makefile
diff --git a/package/firewall/files/bin/fw b/package/network/config/firewall/files/bin/fw
similarity index 100%
rename from package/firewall/files/bin/fw
rename to package/network/config/firewall/files/bin/fw
diff --git a/package/firewall/files/firewall.config b/package/network/config/firewall/files/firewall.config
similarity index 100%
rename from package/firewall/files/firewall.config
rename to package/network/config/firewall/files/firewall.config
diff --git a/package/firewall/files/firewall.hotplug b/package/network/config/firewall/files/firewall.hotplug
similarity index 100%
rename from package/firewall/files/firewall.hotplug
rename to package/network/config/firewall/files/firewall.hotplug
diff --git a/package/firewall/files/firewall.init b/package/network/config/firewall/files/firewall.init
similarity index 100%
rename from package/firewall/files/firewall.init
rename to package/network/config/firewall/files/firewall.init
diff --git a/package/firewall/files/firewall.upgrade b/package/network/config/firewall/files/firewall.upgrade
similarity index 100%
rename from package/firewall/files/firewall.upgrade
rename to package/network/config/firewall/files/firewall.upgrade
diff --git a/package/firewall/files/firewall.user b/package/network/config/firewall/files/firewall.user
similarity index 100%
rename from package/firewall/files/firewall.user
rename to package/network/config/firewall/files/firewall.user
diff --git a/package/firewall/files/lib/config.sh b/package/network/config/firewall/files/lib/config.sh
similarity index 100%
rename from package/firewall/files/lib/config.sh
rename to package/network/config/firewall/files/lib/config.sh
diff --git a/package/firewall/files/lib/core.sh b/package/network/config/firewall/files/lib/core.sh
similarity index 100%
rename from package/firewall/files/lib/core.sh
rename to package/network/config/firewall/files/lib/core.sh
diff --git a/package/firewall/files/lib/core_forwarding.sh b/package/network/config/firewall/files/lib/core_forwarding.sh
similarity index 100%
rename from package/firewall/files/lib/core_forwarding.sh
rename to package/network/config/firewall/files/lib/core_forwarding.sh
diff --git a/package/firewall/files/lib/core_init.sh b/package/network/config/firewall/files/lib/core_init.sh
similarity index 100%
rename from package/firewall/files/lib/core_init.sh
rename to package/network/config/firewall/files/lib/core_init.sh
diff --git a/package/firewall/files/lib/core_interface.sh b/package/network/config/firewall/files/lib/core_interface.sh
similarity index 100%
rename from package/firewall/files/lib/core_interface.sh
rename to package/network/config/firewall/files/lib/core_interface.sh
diff --git a/package/firewall/files/lib/core_redirect.sh b/package/network/config/firewall/files/lib/core_redirect.sh
similarity index 100%
rename from package/firewall/files/lib/core_redirect.sh
rename to package/network/config/firewall/files/lib/core_redirect.sh
diff --git a/package/firewall/files/lib/core_rule.sh b/package/network/config/firewall/files/lib/core_rule.sh
similarity index 100%
rename from package/firewall/files/lib/core_rule.sh
rename to package/network/config/firewall/files/lib/core_rule.sh
diff --git a/package/firewall/files/lib/fw.sh b/package/network/config/firewall/files/lib/fw.sh
similarity index 100%
rename from package/firewall/files/lib/fw.sh
rename to package/network/config/firewall/files/lib/fw.sh
diff --git a/package/firewall/files/lib/uci_firewall.sh b/package/network/config/firewall/files/lib/uci_firewall.sh
similarity index 100%
rename from package/firewall/files/lib/uci_firewall.sh
rename to package/network/config/firewall/files/lib/uci_firewall.sh
diff --git a/package/firewall/files/reflection.hotplug b/package/network/config/firewall/files/reflection.hotplug
similarity index 100%
rename from package/firewall/files/reflection.hotplug
rename to package/network/config/firewall/files/reflection.hotplug
diff --git a/package/netifd/Makefile b/package/network/config/netifd/Makefile
similarity index 100%
rename from package/netifd/Makefile
rename to package/network/config/netifd/Makefile
diff --git a/package/netifd/files/etc/hotplug.d/iface/00-netstate b/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
similarity index 100%
rename from package/netifd/files/etc/hotplug.d/iface/00-netstate
rename to package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
diff --git a/package/netifd/files/etc/hotplug.d/iface/10-sysctl b/package/network/config/netifd/files/etc/hotplug.d/iface/10-sysctl
similarity index 100%
rename from package/netifd/files/etc/hotplug.d/iface/10-sysctl
rename to package/network/config/netifd/files/etc/hotplug.d/iface/10-sysctl
diff --git a/package/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
similarity index 100%
rename from package/netifd/files/etc/init.d/network
rename to package/network/config/netifd/files/etc/init.d/network
diff --git a/package/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
similarity index 100%
rename from package/netifd/files/lib/netifd/dhcp.script
rename to package/network/config/netifd/files/lib/netifd/dhcp.script
diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
similarity index 100%
rename from package/netifd/files/lib/netifd/proto/dhcp.sh
rename to package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
diff --git a/package/netifd/files/lib/network/config.sh b/package/network/config/netifd/files/lib/network/config.sh
similarity index 100%
rename from package/netifd/files/lib/network/config.sh
rename to package/network/config/netifd/files/lib/network/config.sh
diff --git a/package/netifd/files/sbin/devstatus b/package/network/config/netifd/files/sbin/devstatus
similarity index 100%
rename from package/netifd/files/sbin/devstatus
rename to package/network/config/netifd/files/sbin/devstatus
diff --git a/package/netifd/files/sbin/ifdown b/package/network/config/netifd/files/sbin/ifdown
similarity index 100%
rename from package/netifd/files/sbin/ifdown
rename to package/network/config/netifd/files/sbin/ifdown
diff --git a/package/netifd/files/sbin/ifstatus b/package/network/config/netifd/files/sbin/ifstatus
similarity index 100%
rename from package/netifd/files/sbin/ifstatus
rename to package/network/config/netifd/files/sbin/ifstatus
diff --git a/package/netifd/files/sbin/ifup b/package/network/config/netifd/files/sbin/ifup
similarity index 100%
rename from package/netifd/files/sbin/ifup
rename to package/network/config/netifd/files/sbin/ifup
diff --git a/package/netifd/files/usr/share/udhcpc/default.script b/package/network/config/netifd/files/usr/share/udhcpc/default.script
similarity index 100%
rename from package/netifd/files/usr/share/udhcpc/default.script
rename to package/network/config/netifd/files/usr/share/udhcpc/default.script
diff --git a/package/qos-scripts/Makefile b/package/network/config/qos-scripts/Makefile
similarity index 100%
rename from package/qos-scripts/Makefile
rename to package/network/config/qos-scripts/Makefile
diff --git a/package/qos-scripts/files/etc/config/qos b/package/network/config/qos-scripts/files/etc/config/qos
similarity index 100%
rename from package/qos-scripts/files/etc/config/qos
rename to package/network/config/qos-scripts/files/etc/config/qos
diff --git a/package/qos-scripts/files/etc/hotplug.d/iface/10-qos b/package/network/config/qos-scripts/files/etc/hotplug.d/iface/10-qos
similarity index 100%
rename from package/qos-scripts/files/etc/hotplug.d/iface/10-qos
rename to package/network/config/qos-scripts/files/etc/hotplug.d/iface/10-qos
diff --git a/package/qos-scripts/files/etc/init.d/qos b/package/network/config/qos-scripts/files/etc/init.d/qos
similarity index 100%
rename from package/qos-scripts/files/etc/init.d/qos
rename to package/network/config/qos-scripts/files/etc/init.d/qos
diff --git a/package/qos-scripts/files/usr/bin/qos-start b/package/network/config/qos-scripts/files/usr/bin/qos-start
similarity index 100%
rename from package/qos-scripts/files/usr/bin/qos-start
rename to package/network/config/qos-scripts/files/usr/bin/qos-start
diff --git a/package/qos-scripts/files/usr/bin/qos-stat b/package/network/config/qos-scripts/files/usr/bin/qos-stat
similarity index 100%
rename from package/qos-scripts/files/usr/bin/qos-stat
rename to package/network/config/qos-scripts/files/usr/bin/qos-stat
diff --git a/package/qos-scripts/files/usr/bin/qos-stop b/package/network/config/qos-scripts/files/usr/bin/qos-stop
similarity index 100%
rename from package/qos-scripts/files/usr/bin/qos-stop
rename to package/network/config/qos-scripts/files/usr/bin/qos-stop
diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
similarity index 100%
rename from package/qos-scripts/files/usr/lib/qos/generate.sh
rename to package/network/config/qos-scripts/files/usr/lib/qos/generate.sh
diff --git a/package/qos-scripts/files/usr/lib/qos/tcrules.awk b/package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
similarity index 100%
rename from package/qos-scripts/files/usr/lib/qos/tcrules.awk
rename to package/network/config/qos-scripts/files/usr/lib/qos/tcrules.awk
diff --git a/package/6in4/Makefile b/package/network/ipv6/6in4/Makefile
similarity index 100%
rename from package/6in4/Makefile
rename to package/network/ipv6/6in4/Makefile
diff --git a/package/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh
similarity index 100%
rename from package/6in4/files/6in4.sh
rename to package/network/ipv6/6in4/files/6in4.sh
diff --git a/package/6rd/Makefile b/package/network/ipv6/6rd/Makefile
similarity index 100%
rename from package/6rd/Makefile
rename to package/network/ipv6/6rd/Makefile
diff --git a/package/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh
similarity index 100%
rename from package/6rd/files/6rd.sh
rename to package/network/ipv6/6rd/files/6rd.sh
diff --git a/package/6rd/src/6rdcalc.c b/package/network/ipv6/6rd/src/6rdcalc.c
similarity index 100%
rename from package/6rd/src/6rdcalc.c
rename to package/network/ipv6/6rd/src/6rdcalc.c
diff --git a/package/6rd/src/Makefile b/package/network/ipv6/6rd/src/Makefile
similarity index 100%
rename from package/6rd/src/Makefile
rename to package/network/ipv6/6rd/src/Makefile
diff --git a/package/6to4/Makefile b/package/network/ipv6/6to4/Makefile
similarity index 100%
rename from package/6to4/Makefile
rename to package/network/ipv6/6to4/Makefile
diff --git a/package/6to4/files/6to4.sh b/package/network/ipv6/6to4/files/6to4.sh
similarity index 100%
rename from package/6to4/files/6to4.sh
rename to package/network/ipv6/6to4/files/6to4.sh
diff --git a/package/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
similarity index 100%
rename from package/dnsmasq/Makefile
rename to package/network/services/dnsmasq/Makefile
diff --git a/package/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf
similarity index 100%
rename from package/dnsmasq/files/dhcp.conf
rename to package/network/services/dnsmasq/files/dhcp.conf
diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/network/services/dnsmasq/files/dnsmasq.conf
similarity index 100%
rename from package/dnsmasq/files/dnsmasq.conf
rename to package/network/services/dnsmasq/files/dnsmasq.conf
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
similarity index 100%
rename from package/dnsmasq/files/dnsmasq.init
rename to package/network/services/dnsmasq/files/dnsmasq.init
diff --git a/package/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch b/package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
similarity index 100%
rename from package/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
rename to package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
diff --git a/package/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
similarity index 100%
rename from package/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
rename to package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
diff --git a/package/dropbear/Makefile b/package/network/services/dropbear/Makefile
similarity index 100%
rename from package/dropbear/Makefile
rename to package/network/services/dropbear/Makefile
diff --git a/package/dropbear/files/dropbear.config b/package/network/services/dropbear/files/dropbear.config
similarity index 100%
rename from package/dropbear/files/dropbear.config
rename to package/network/services/dropbear/files/dropbear.config
diff --git a/package/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
similarity index 100%
rename from package/dropbear/files/dropbear.init
rename to package/network/services/dropbear/files/dropbear.init
diff --git a/package/dropbear/patches/100-pubkey_path.patch b/package/network/services/dropbear/patches/100-pubkey_path.patch
similarity index 100%
rename from package/dropbear/patches/100-pubkey_path.patch
rename to package/network/services/dropbear/patches/100-pubkey_path.patch
diff --git a/package/dropbear/patches/110-change_user.patch b/package/network/services/dropbear/patches/110-change_user.patch
similarity index 100%
rename from package/dropbear/patches/110-change_user.patch
rename to package/network/services/dropbear/patches/110-change_user.patch
diff --git a/package/dropbear/patches/120-openwrt_options.patch b/package/network/services/dropbear/patches/120-openwrt_options.patch
similarity index 100%
rename from package/dropbear/patches/120-openwrt_options.patch
rename to package/network/services/dropbear/patches/120-openwrt_options.patch
diff --git a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
similarity index 100%
rename from package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
rename to package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
diff --git a/package/dropbear/patches/140-disable_assert.patch b/package/network/services/dropbear/patches/140-disable_assert.patch
similarity index 100%
rename from package/dropbear/patches/140-disable_assert.patch
rename to package/network/services/dropbear/patches/140-disable_assert.patch
diff --git a/package/dropbear/patches/150-dbconvert_standalone.patch b/package/network/services/dropbear/patches/150-dbconvert_standalone.patch
similarity index 100%
rename from package/dropbear/patches/150-dbconvert_standalone.patch
rename to package/network/services/dropbear/patches/150-dbconvert_standalone.patch
diff --git a/package/dropbear/patches/200-lcrypt_bsdfix.patch b/package/network/services/dropbear/patches/200-lcrypt_bsdfix.patch
similarity index 100%
rename from package/dropbear/patches/200-lcrypt_bsdfix.patch
rename to package/network/services/dropbear/patches/200-lcrypt_bsdfix.patch
diff --git a/package/dropbear/patches/300-ipv6_addr_port_split.patch b/package/network/services/dropbear/patches/300-ipv6_addr_port_split.patch
similarity index 100%
rename from package/dropbear/patches/300-ipv6_addr_port_split.patch
rename to package/network/services/dropbear/patches/300-ipv6_addr_port_split.patch
diff --git a/package/dropbear/patches/400-CVE-2012-0920.patch b/package/network/services/dropbear/patches/400-CVE-2012-0920.patch
similarity index 100%
rename from package/dropbear/patches/400-CVE-2012-0920.patch
rename to package/network/services/dropbear/patches/400-CVE-2012-0920.patch
diff --git a/package/dropbear/patches/500-set-default-path.patch b/package/network/services/dropbear/patches/500-set-default-path.patch
similarity index 100%
rename from package/dropbear/patches/500-set-default-path.patch
rename to package/network/services/dropbear/patches/500-set-default-path.patch
diff --git a/package/ead/Makefile b/package/network/services/ead/Makefile
similarity index 100%
rename from package/ead/Makefile
rename to package/network/services/ead/Makefile
diff --git a/package/ead/src/Makefile b/package/network/services/ead/src/Makefile
similarity index 100%
rename from package/ead/src/Makefile
rename to package/network/services/ead/src/Makefile
diff --git a/package/ead/src/aes.c b/package/network/services/ead/src/aes.c
similarity index 100%
rename from package/ead/src/aes.c
rename to package/network/services/ead/src/aes.c
diff --git a/package/ead/src/ead-client.c b/package/network/services/ead/src/ead-client.c
similarity index 100%
rename from package/ead/src/ead-client.c
rename to package/network/services/ead/src/ead-client.c
diff --git a/package/ead/src/ead-crypt.c b/package/network/services/ead/src/ead-crypt.c
similarity index 100%
rename from package/ead/src/ead-crypt.c
rename to package/network/services/ead/src/ead-crypt.c
diff --git a/package/ead/src/ead-crypt.h b/package/network/services/ead/src/ead-crypt.h
similarity index 100%
rename from package/ead/src/ead-crypt.h
rename to package/network/services/ead/src/ead-crypt.h
diff --git a/package/ead/src/ead-pcap.h b/package/network/services/ead/src/ead-pcap.h
similarity index 100%
rename from package/ead/src/ead-pcap.h
rename to package/network/services/ead/src/ead-pcap.h
diff --git a/package/ead/src/ead.c b/package/network/services/ead/src/ead.c
similarity index 100%
rename from package/ead/src/ead.c
rename to package/network/services/ead/src/ead.c
diff --git a/package/ead/src/ead.h b/package/network/services/ead/src/ead.h
similarity index 100%
rename from package/ead/src/ead.h
rename to package/network/services/ead/src/ead.h
diff --git a/package/ead/src/filter.c b/package/network/services/ead/src/filter.c
similarity index 100%
rename from package/ead/src/filter.c
rename to package/network/services/ead/src/filter.c
diff --git a/package/ead/src/libbridge.h b/package/network/services/ead/src/libbridge.h
similarity index 100%
rename from package/ead/src/libbridge.h
rename to package/network/services/ead/src/libbridge.h
diff --git a/package/ead/src/libbridge_init.c b/package/network/services/ead/src/libbridge_init.c
similarity index 100%
rename from package/ead/src/libbridge_init.c
rename to package/network/services/ead/src/libbridge_init.c
diff --git a/package/ead/src/libbridge_private.h b/package/network/services/ead/src/libbridge_private.h
similarity index 100%
rename from package/ead/src/libbridge_private.h
rename to package/network/services/ead/src/libbridge_private.h
diff --git a/package/ead/src/list.h b/package/network/services/ead/src/list.h
similarity index 100%
rename from package/ead/src/list.h
rename to package/network/services/ead/src/list.h
diff --git a/package/ead/src/passwd b/package/network/services/ead/src/passwd
similarity index 100%
rename from package/ead/src/passwd
rename to package/network/services/ead/src/passwd
diff --git a/package/ead/src/pfc.c b/package/network/services/ead/src/pfc.c
similarity index 100%
rename from package/ead/src/pfc.c
rename to package/network/services/ead/src/pfc.c
diff --git a/package/ead/src/pw_encrypt_md5.c b/package/network/services/ead/src/pw_encrypt_md5.c
similarity index 100%
rename from package/ead/src/pw_encrypt_md5.c
rename to package/network/services/ead/src/pw_encrypt_md5.c
diff --git a/package/ead/src/sha1.c b/package/network/services/ead/src/sha1.c
similarity index 100%
rename from package/ead/src/sha1.c
rename to package/network/services/ead/src/sha1.c
diff --git a/package/ead/src/tinysrp/Makefile.am b/package/network/services/ead/src/tinysrp/Makefile.am
similarity index 100%
rename from package/ead/src/tinysrp/Makefile.am
rename to package/network/services/ead/src/tinysrp/Makefile.am
diff --git a/package/ead/src/tinysrp/Makefile.in b/package/network/services/ead/src/tinysrp/Makefile.in
similarity index 100%
rename from package/ead/src/tinysrp/Makefile.in
rename to package/network/services/ead/src/tinysrp/Makefile.in
diff --git a/package/ead/src/tinysrp/Notes b/package/network/services/ead/src/tinysrp/Notes
similarity index 100%
rename from package/ead/src/tinysrp/Notes
rename to package/network/services/ead/src/tinysrp/Notes
diff --git a/package/ead/src/tinysrp/acconfig.h b/package/network/services/ead/src/tinysrp/acconfig.h
similarity index 100%
rename from package/ead/src/tinysrp/acconfig.h
rename to package/network/services/ead/src/tinysrp/acconfig.h
diff --git a/package/ead/src/tinysrp/acinclude.m4 b/package/network/services/ead/src/tinysrp/acinclude.m4
similarity index 100%
rename from package/ead/src/tinysrp/acinclude.m4
rename to package/network/services/ead/src/tinysrp/acinclude.m4
diff --git a/package/ead/src/tinysrp/aclocal.m4 b/package/network/services/ead/src/tinysrp/aclocal.m4
similarity index 100%
rename from package/ead/src/tinysrp/aclocal.m4
rename to package/network/services/ead/src/tinysrp/aclocal.m4
diff --git a/package/ead/src/tinysrp/bn.h b/package/network/services/ead/src/tinysrp/bn.h
similarity index 100%
rename from package/ead/src/tinysrp/bn.h
rename to package/network/services/ead/src/tinysrp/bn.h
diff --git a/package/ead/src/tinysrp/bn_add.c b/package/network/services/ead/src/tinysrp/bn_add.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_add.c
rename to package/network/services/ead/src/tinysrp/bn_add.c
diff --git a/package/ead/src/tinysrp/bn_asm.c b/package/network/services/ead/src/tinysrp/bn_asm.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_asm.c
rename to package/network/services/ead/src/tinysrp/bn_asm.c
diff --git a/package/ead/src/tinysrp/bn_ctx.c b/package/network/services/ead/src/tinysrp/bn_ctx.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_ctx.c
rename to package/network/services/ead/src/tinysrp/bn_ctx.c
diff --git a/package/ead/src/tinysrp/bn_div.c b/package/network/services/ead/src/tinysrp/bn_div.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_div.c
rename to package/network/services/ead/src/tinysrp/bn_div.c
diff --git a/package/ead/src/tinysrp/bn_exp.c b/package/network/services/ead/src/tinysrp/bn_exp.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_exp.c
rename to package/network/services/ead/src/tinysrp/bn_exp.c
diff --git a/package/ead/src/tinysrp/bn_lcl.h b/package/network/services/ead/src/tinysrp/bn_lcl.h
similarity index 100%
rename from package/ead/src/tinysrp/bn_lcl.h
rename to package/network/services/ead/src/tinysrp/bn_lcl.h
diff --git a/package/ead/src/tinysrp/bn_lib.c b/package/network/services/ead/src/tinysrp/bn_lib.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_lib.c
rename to package/network/services/ead/src/tinysrp/bn_lib.c
diff --git a/package/ead/src/tinysrp/bn_mul.c b/package/network/services/ead/src/tinysrp/bn_mul.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_mul.c
rename to package/network/services/ead/src/tinysrp/bn_mul.c
diff --git a/package/ead/src/tinysrp/bn_prime.h b/package/network/services/ead/src/tinysrp/bn_prime.h
similarity index 100%
rename from package/ead/src/tinysrp/bn_prime.h
rename to package/network/services/ead/src/tinysrp/bn_prime.h
diff --git a/package/ead/src/tinysrp/bn_shift.c b/package/network/services/ead/src/tinysrp/bn_shift.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_shift.c
rename to package/network/services/ead/src/tinysrp/bn_shift.c
diff --git a/package/ead/src/tinysrp/bn_sqr.c b/package/network/services/ead/src/tinysrp/bn_sqr.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_sqr.c
rename to package/network/services/ead/src/tinysrp/bn_sqr.c
diff --git a/package/ead/src/tinysrp/bn_word.c b/package/network/services/ead/src/tinysrp/bn_word.c
similarity index 100%
rename from package/ead/src/tinysrp/bn_word.c
rename to package/network/services/ead/src/tinysrp/bn_word.c
diff --git a/package/ead/src/tinysrp/clitest.c b/package/network/services/ead/src/tinysrp/clitest.c
similarity index 100%
rename from package/ead/src/tinysrp/clitest.c
rename to package/network/services/ead/src/tinysrp/clitest.c
diff --git a/package/ead/src/tinysrp/config.h.in b/package/network/services/ead/src/tinysrp/config.h.in
similarity index 100%
rename from package/ead/src/tinysrp/config.h.in
rename to package/network/services/ead/src/tinysrp/config.h.in
diff --git a/package/ead/src/tinysrp/configure b/package/network/services/ead/src/tinysrp/configure
similarity index 100%
rename from package/ead/src/tinysrp/configure
rename to package/network/services/ead/src/tinysrp/configure
diff --git a/package/ead/src/tinysrp/configure.in b/package/network/services/ead/src/tinysrp/configure.in
similarity index 100%
rename from package/ead/src/tinysrp/configure.in
rename to package/network/services/ead/src/tinysrp/configure.in
diff --git a/package/ead/src/tinysrp/install-sh b/package/network/services/ead/src/tinysrp/install-sh
similarity index 100%
rename from package/ead/src/tinysrp/install-sh
rename to package/network/services/ead/src/tinysrp/install-sh
diff --git a/package/ead/src/tinysrp/missing b/package/network/services/ead/src/tinysrp/missing
similarity index 100%
rename from package/ead/src/tinysrp/missing
rename to package/network/services/ead/src/tinysrp/missing
diff --git a/package/ead/src/tinysrp/mkinstalldirs b/package/network/services/ead/src/tinysrp/mkinstalldirs
similarity index 100%
rename from package/ead/src/tinysrp/mkinstalldirs
rename to package/network/services/ead/src/tinysrp/mkinstalldirs
diff --git a/package/ead/src/tinysrp/srvtest.c b/package/network/services/ead/src/tinysrp/srvtest.c
similarity index 100%
rename from package/ead/src/tinysrp/srvtest.c
rename to package/network/services/ead/src/tinysrp/srvtest.c
diff --git a/package/ead/src/tinysrp/stamp-h.in b/package/network/services/ead/src/tinysrp/stamp-h.in
similarity index 100%
rename from package/ead/src/tinysrp/stamp-h.in
rename to package/network/services/ead/src/tinysrp/stamp-h.in
diff --git a/package/ead/src/tinysrp/t_client.c b/package/network/services/ead/src/tinysrp/t_client.c
similarity index 100%
rename from package/ead/src/tinysrp/t_client.c
rename to package/network/services/ead/src/tinysrp/t_client.c
diff --git a/package/ead/src/tinysrp/t_client.h b/package/network/services/ead/src/tinysrp/t_client.h
similarity index 100%
rename from package/ead/src/tinysrp/t_client.h
rename to package/network/services/ead/src/tinysrp/t_client.h
diff --git a/package/ead/src/tinysrp/t_conf.c b/package/network/services/ead/src/tinysrp/t_conf.c
similarity index 100%
rename from package/ead/src/tinysrp/t_conf.c
rename to package/network/services/ead/src/tinysrp/t_conf.c
diff --git a/package/ead/src/tinysrp/t_conv.c b/package/network/services/ead/src/tinysrp/t_conv.c
similarity index 100%
rename from package/ead/src/tinysrp/t_conv.c
rename to package/network/services/ead/src/tinysrp/t_conv.c
diff --git a/package/ead/src/tinysrp/t_defines.h b/package/network/services/ead/src/tinysrp/t_defines.h
similarity index 100%
rename from package/ead/src/tinysrp/t_defines.h
rename to package/network/services/ead/src/tinysrp/t_defines.h
diff --git a/package/ead/src/tinysrp/t_getconf.c b/package/network/services/ead/src/tinysrp/t_getconf.c
similarity index 100%
rename from package/ead/src/tinysrp/t_getconf.c
rename to package/network/services/ead/src/tinysrp/t_getconf.c
diff --git a/package/ead/src/tinysrp/t_getpass.c b/package/network/services/ead/src/tinysrp/t_getpass.c
similarity index 100%
rename from package/ead/src/tinysrp/t_getpass.c
rename to package/network/services/ead/src/tinysrp/t_getpass.c
diff --git a/package/ead/src/tinysrp/t_math.c b/package/network/services/ead/src/tinysrp/t_math.c
similarity index 100%
rename from package/ead/src/tinysrp/t_math.c
rename to package/network/services/ead/src/tinysrp/t_math.c
diff --git a/package/ead/src/tinysrp/t_misc.c b/package/network/services/ead/src/tinysrp/t_misc.c
similarity index 100%
rename from package/ead/src/tinysrp/t_misc.c
rename to package/network/services/ead/src/tinysrp/t_misc.c
diff --git a/package/ead/src/tinysrp/t_pw.c b/package/network/services/ead/src/tinysrp/t_pw.c
similarity index 100%
rename from package/ead/src/tinysrp/t_pw.c
rename to package/network/services/ead/src/tinysrp/t_pw.c
diff --git a/package/ead/src/tinysrp/t_pwd.h b/package/network/services/ead/src/tinysrp/t_pwd.h
similarity index 100%
rename from package/ead/src/tinysrp/t_pwd.h
rename to package/network/services/ead/src/tinysrp/t_pwd.h
diff --git a/package/ead/src/tinysrp/t_read.c b/package/network/services/ead/src/tinysrp/t_read.c
similarity index 100%
rename from package/ead/src/tinysrp/t_read.c
rename to package/network/services/ead/src/tinysrp/t_read.c
diff --git a/package/ead/src/tinysrp/t_read.h b/package/network/services/ead/src/tinysrp/t_read.h
similarity index 100%
rename from package/ead/src/tinysrp/t_read.h
rename to package/network/services/ead/src/tinysrp/t_read.h
diff --git a/package/ead/src/tinysrp/t_server.c b/package/network/services/ead/src/tinysrp/t_server.c
similarity index 100%
rename from package/ead/src/tinysrp/t_server.c
rename to package/network/services/ead/src/tinysrp/t_server.c
diff --git a/package/ead/src/tinysrp/t_server.h b/package/network/services/ead/src/tinysrp/t_server.h
similarity index 100%
rename from package/ead/src/tinysrp/t_server.h
rename to package/network/services/ead/src/tinysrp/t_server.h
diff --git a/package/ead/src/tinysrp/t_sha.c b/package/network/services/ead/src/tinysrp/t_sha.c
similarity index 100%
rename from package/ead/src/tinysrp/t_sha.c
rename to package/network/services/ead/src/tinysrp/t_sha.c
diff --git a/package/ead/src/tinysrp/t_sha.h b/package/network/services/ead/src/tinysrp/t_sha.h
similarity index 100%
rename from package/ead/src/tinysrp/t_sha.h
rename to package/network/services/ead/src/tinysrp/t_sha.h
diff --git a/package/ead/src/tinysrp/t_truerand.c b/package/network/services/ead/src/tinysrp/t_truerand.c
similarity index 100%
rename from package/ead/src/tinysrp/t_truerand.c
rename to package/network/services/ead/src/tinysrp/t_truerand.c
diff --git a/package/ead/src/tinysrp/tconf.c b/package/network/services/ead/src/tinysrp/tconf.c
similarity index 100%
rename from package/ead/src/tinysrp/tconf.c
rename to package/network/services/ead/src/tinysrp/tconf.c
diff --git a/package/ead/src/tinysrp/tinysrp.c b/package/network/services/ead/src/tinysrp/tinysrp.c
similarity index 100%
rename from package/ead/src/tinysrp/tinysrp.c
rename to package/network/services/ead/src/tinysrp/tinysrp.c
diff --git a/package/ead/src/tinysrp/tinysrp.h b/package/network/services/ead/src/tinysrp/tinysrp.h
similarity index 100%
rename from package/ead/src/tinysrp/tinysrp.h
rename to package/network/services/ead/src/tinysrp/tinysrp.h
diff --git a/package/ead/src/tinysrp/tpasswd b/package/network/services/ead/src/tinysrp/tpasswd
similarity index 100%
rename from package/ead/src/tinysrp/tpasswd
rename to package/network/services/ead/src/tinysrp/tpasswd
diff --git a/package/ead/src/tinysrp/tphrase.c b/package/network/services/ead/src/tinysrp/tphrase.c
similarity index 100%
rename from package/ead/src/tinysrp/tphrase.c
rename to package/network/services/ead/src/tinysrp/tphrase.c
diff --git a/package/hostapd/Config.in b/package/network/services/hostapd/Config.in
similarity index 100%
rename from package/hostapd/Config.in
rename to package/network/services/hostapd/Config.in
diff --git a/package/hostapd/Makefile b/package/network/services/hostapd/Makefile
similarity index 100%
rename from package/hostapd/Makefile
rename to package/network/services/hostapd/Makefile
diff --git a/package/hostapd/files/hostapd-full.config b/package/network/services/hostapd/files/hostapd-full.config
similarity index 100%
rename from package/hostapd/files/hostapd-full.config
rename to package/network/services/hostapd/files/hostapd-full.config
diff --git a/package/hostapd/files/hostapd-mini.config b/package/network/services/hostapd/files/hostapd-mini.config
similarity index 100%
rename from package/hostapd/files/hostapd-mini.config
rename to package/network/services/hostapd/files/hostapd-mini.config
diff --git a/package/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
similarity index 100%
rename from package/hostapd/files/hostapd.sh
rename to package/network/services/hostapd/files/hostapd.sh
diff --git a/package/hostapd/files/multicall.c b/package/network/services/hostapd/files/multicall.c
similarity index 100%
rename from package/hostapd/files/multicall.c
rename to package/network/services/hostapd/files/multicall.c
diff --git a/package/hostapd/files/wpa_supplicant-full.config b/package/network/services/hostapd/files/wpa_supplicant-full.config
similarity index 100%
rename from package/hostapd/files/wpa_supplicant-full.config
rename to package/network/services/hostapd/files/wpa_supplicant-full.config
diff --git a/package/hostapd/files/wpa_supplicant-mini.config b/package/network/services/hostapd/files/wpa_supplicant-mini.config
similarity index 100%
rename from package/hostapd/files/wpa_supplicant-mini.config
rename to package/network/services/hostapd/files/wpa_supplicant-mini.config
diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/network/services/hostapd/files/wpa_supplicant.sh
similarity index 100%
rename from package/hostapd/files/wpa_supplicant.sh
rename to package/network/services/hostapd/files/wpa_supplicant.sh
diff --git a/package/hostapd/files/wps-hotplug.sh b/package/network/services/hostapd/files/wps-hotplug.sh
similarity index 100%
rename from package/hostapd/files/wps-hotplug.sh
rename to package/network/services/hostapd/files/wps-hotplug.sh
diff --git a/package/hostapd/patches/100-pending_work.patch b/package/network/services/hostapd/patches/100-pending_work.patch
similarity index 100%
rename from package/hostapd/patches/100-pending_work.patch
rename to package/network/services/hostapd/patches/100-pending_work.patch
diff --git a/package/hostapd/patches/300-nl80211_multicall_fixes.patch b/package/network/services/hostapd/patches/300-nl80211_multicall_fixes.patch
similarity index 100%
rename from package/hostapd/patches/300-nl80211_multicall_fixes.patch
rename to package/network/services/hostapd/patches/300-nl80211_multicall_fixes.patch
diff --git a/package/hostapd/patches/310-multicall_bridge_fix.patch b/package/network/services/hostapd/patches/310-multicall_bridge_fix.patch
similarity index 100%
rename from package/hostapd/patches/310-multicall_bridge_fix.patch
rename to package/network/services/hostapd/patches/310-multicall_bridge_fix.patch
diff --git a/package/hostapd/patches/320-madwifi_key_fixes.patch b/package/network/services/hostapd/patches/320-madwifi_key_fixes.patch
similarity index 100%
rename from package/hostapd/patches/320-madwifi_key_fixes.patch
rename to package/network/services/hostapd/patches/320-madwifi_key_fixes.patch
diff --git a/package/hostapd/patches/400-noscan.patch b/package/network/services/hostapd/patches/400-noscan.patch
similarity index 100%
rename from package/hostapd/patches/400-noscan.patch
rename to package/network/services/hostapd/patches/400-noscan.patch
diff --git a/package/hostapd/patches/410-multicall.patch b/package/network/services/hostapd/patches/410-multicall.patch
similarity index 100%
rename from package/hostapd/patches/410-multicall.patch
rename to package/network/services/hostapd/patches/410-multicall.patch
diff --git a/package/hostapd/patches/420-timestamp_check.patch b/package/network/services/hostapd/patches/420-timestamp_check.patch
similarity index 100%
rename from package/hostapd/patches/420-timestamp_check.patch
rename to package/network/services/hostapd/patches/420-timestamp_check.patch
diff --git a/package/hostapd/patches/430-rescan_immediately.patch b/package/network/services/hostapd/patches/430-rescan_immediately.patch
similarity index 100%
rename from package/hostapd/patches/430-rescan_immediately.patch
rename to package/network/services/hostapd/patches/430-rescan_immediately.patch
diff --git a/package/hostapd/patches/440-optional_rfkill.patch b/package/network/services/hostapd/patches/440-optional_rfkill.patch
similarity index 100%
rename from package/hostapd/patches/440-optional_rfkill.patch
rename to package/network/services/hostapd/patches/440-optional_rfkill.patch
diff --git a/package/hostapd/patches/450-reload_freq_change.patch b/package/network/services/hostapd/patches/450-reload_freq_change.patch
similarity index 100%
rename from package/hostapd/patches/450-reload_freq_change.patch
rename to package/network/services/hostapd/patches/450-reload_freq_change.patch
diff --git a/package/hostapd/patches/451-nl80211_del_beacon_bss.patch b/package/network/services/hostapd/patches/451-nl80211_del_beacon_bss.patch
similarity index 100%
rename from package/hostapd/patches/451-nl80211_del_beacon_bss.patch
rename to package/network/services/hostapd/patches/451-nl80211_del_beacon_bss.patch
diff --git a/package/hostapd/patches/452-ctrl_iface_reload.patch b/package/network/services/hostapd/patches/452-ctrl_iface_reload.patch
similarity index 100%
rename from package/hostapd/patches/452-ctrl_iface_reload.patch
rename to package/network/services/hostapd/patches/452-ctrl_iface_reload.patch
diff --git a/package/hostapd/patches/453-ap_sta_support.patch b/package/network/services/hostapd/patches/453-ap_sta_support.patch
similarity index 100%
rename from package/hostapd/patches/453-ap_sta_support.patch
rename to package/network/services/hostapd/patches/453-ap_sta_support.patch
diff --git a/package/hostapd/patches/460-disable_ctrl_iface_mib.patch b/package/network/services/hostapd/patches/460-disable_ctrl_iface_mib.patch
similarity index 100%
rename from package/hostapd/patches/460-disable_ctrl_iface_mib.patch
rename to package/network/services/hostapd/patches/460-disable_ctrl_iface_mib.patch
diff --git a/package/hostapd/patches/470-wpa_ie_cap_workaround.patch b/package/network/services/hostapd/patches/470-wpa_ie_cap_workaround.patch
similarity index 100%
rename from package/hostapd/patches/470-wpa_ie_cap_workaround.patch
rename to package/network/services/hostapd/patches/470-wpa_ie_cap_workaround.patch
diff --git a/package/hostapd/patches/480-terminate_on_setup_failure.patch b/package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch
similarity index 100%
rename from package/hostapd/patches/480-terminate_on_setup_failure.patch
rename to package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch
diff --git a/package/hostapd/patches/500-random_pool_add_kernel.patch b/package/network/services/hostapd/patches/500-random_pool_add_kernel.patch
similarity index 100%
rename from package/hostapd/patches/500-random_pool_add_kernel.patch
rename to package/network/services/hostapd/patches/500-random_pool_add_kernel.patch
diff --git a/package/hostapd/patches/510-bring_down_interface.patch b/package/network/services/hostapd/patches/510-bring_down_interface.patch
similarity index 100%
rename from package/hostapd/patches/510-bring_down_interface.patch
rename to package/network/services/hostapd/patches/510-bring_down_interface.patch
diff --git a/package/hostapd/patches/520-fix_wps_pin_crash.patch b/package/network/services/hostapd/patches/520-fix_wps_pin_crash.patch
similarity index 100%
rename from package/hostapd/patches/520-fix_wps_pin_crash.patch
rename to package/network/services/hostapd/patches/520-fix_wps_pin_crash.patch
diff --git a/package/hostapd/patches/530-wps_single_auth_enc_type.patch b/package/network/services/hostapd/patches/530-wps_single_auth_enc_type.patch
similarity index 100%
rename from package/hostapd/patches/530-wps_single_auth_enc_type.patch
rename to package/network/services/hostapd/patches/530-wps_single_auth_enc_type.patch
diff --git a/package/hostapd/patches/540-dynamic_20_40_mhz.patch b/package/network/services/hostapd/patches/540-dynamic_20_40_mhz.patch
similarity index 100%
rename from package/hostapd/patches/540-dynamic_20_40_mhz.patch
rename to package/network/services/hostapd/patches/540-dynamic_20_40_mhz.patch
diff --git a/package/hostapd/patches/550-limit_debug_messages.patch b/package/network/services/hostapd/patches/550-limit_debug_messages.patch
similarity index 100%
rename from package/hostapd/patches/550-limit_debug_messages.patch
rename to package/network/services/hostapd/patches/550-limit_debug_messages.patch
diff --git a/package/hostapd/patches/560-indicate-features.patch b/package/network/services/hostapd/patches/560-indicate-features.patch
similarity index 100%
rename from package/hostapd/patches/560-indicate-features.patch
rename to package/network/services/hostapd/patches/560-indicate-features.patch
diff --git a/package/hostapd/patches/570-genl_connect_debug.patch b/package/network/services/hostapd/patches/570-genl_connect_debug.patch
similarity index 100%
rename from package/hostapd/patches/570-genl_connect_debug.patch
rename to package/network/services/hostapd/patches/570-genl_connect_debug.patch
diff --git a/package/hostapd/patches/580-fix_bss_addr.patch b/package/network/services/hostapd/patches/580-fix_bss_addr.patch
similarity index 100%
rename from package/hostapd/patches/580-fix_bss_addr.patch
rename to package/network/services/hostapd/patches/580-fix_bss_addr.patch
diff --git a/package/hostapd/patches/590-hostapd_cli_ifdef.patch b/package/network/services/hostapd/patches/590-hostapd_cli_ifdef.patch
similarity index 100%
rename from package/hostapd/patches/590-hostapd_cli_ifdef.patch
rename to package/network/services/hostapd/patches/590-hostapd_cli_ifdef.patch
diff --git a/package/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/network/services/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch
similarity index 100%
rename from package/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch
rename to package/network/services/hostapd/patches/601-wpa_supplicant-add-new-config-params-to-be-used-with.patch
diff --git a/package/hostapd/patches/602-driver_nl80211-use-new-parameters-during-ibss-join.patch b/package/network/services/hostapd/patches/602-driver_nl80211-use-new-parameters-during-ibss-join.patch
similarity index 100%
rename from package/hostapd/patches/602-driver_nl80211-use-new-parameters-during-ibss-join.patch
rename to package/network/services/hostapd/patches/602-driver_nl80211-use-new-parameters-during-ibss-join.patch
diff --git a/package/hostapd/patches/604-wpa_s-support-htmode-param.patch b/package/network/services/hostapd/patches/604-wpa_s-support-htmode-param.patch
similarity index 100%
rename from package/hostapd/patches/604-wpa_s-support-htmode-param.patch
rename to package/network/services/hostapd/patches/604-wpa_s-support-htmode-param.patch
diff --git a/package/hostapd/patches/610-max_num_sta_probe.patch b/package/network/services/hostapd/patches/610-max_num_sta_probe.patch
similarity index 100%
rename from package/hostapd/patches/610-max_num_sta_probe.patch
rename to package/network/services/hostapd/patches/610-max_num_sta_probe.patch
diff --git a/package/ppp/Makefile b/package/network/services/ppp/Makefile
similarity index 100%
rename from package/ppp/Makefile
rename to package/network/services/ppp/Makefile
diff --git a/package/ppp/files/etc/ppp/chap-secrets b/package/network/services/ppp/files/etc/ppp/chap-secrets
similarity index 100%
rename from package/ppp/files/etc/ppp/chap-secrets
rename to package/network/services/ppp/files/etc/ppp/chap-secrets
diff --git a/package/ppp/files/etc/ppp/filter b/package/network/services/ppp/files/etc/ppp/filter
similarity index 100%
rename from package/ppp/files/etc/ppp/filter
rename to package/network/services/ppp/files/etc/ppp/filter
diff --git a/package/ppp/files/etc/ppp/options b/package/network/services/ppp/files/etc/ppp/options
similarity index 100%
rename from package/ppp/files/etc/ppp/options
rename to package/network/services/ppp/files/etc/ppp/options
diff --git a/package/ppp/files/etc/ppp/options.pptp b/package/network/services/ppp/files/etc/ppp/options.pptp
similarity index 100%
rename from package/ppp/files/etc/ppp/options.pptp
rename to package/network/services/ppp/files/etc/ppp/options.pptp
diff --git a/package/ppp/files/etc/ppp/radius.conf b/package/network/services/ppp/files/etc/ppp/radius.conf
similarity index 100%
rename from package/ppp/files/etc/ppp/radius.conf
rename to package/network/services/ppp/files/etc/ppp/radius.conf
diff --git a/package/ppp/files/etc/ppp/radius/dictionary b/package/network/services/ppp/files/etc/ppp/radius/dictionary
similarity index 100%
rename from package/ppp/files/etc/ppp/radius/dictionary
rename to package/network/services/ppp/files/etc/ppp/radius/dictionary
diff --git a/package/ppp/files/etc/ppp/radius/dictionary.asnet b/package/network/services/ppp/files/etc/ppp/radius/dictionary.asnet
similarity index 100%
rename from package/ppp/files/etc/ppp/radius/dictionary.asnet
rename to package/network/services/ppp/files/etc/ppp/radius/dictionary.asnet
diff --git a/package/ppp/files/etc/ppp/radius/dictionary.microsoft b/package/network/services/ppp/files/etc/ppp/radius/dictionary.microsoft
similarity index 100%
rename from package/ppp/files/etc/ppp/radius/dictionary.microsoft
rename to package/network/services/ppp/files/etc/ppp/radius/dictionary.microsoft
diff --git a/package/ppp/files/etc/ppp/radius/servers b/package/network/services/ppp/files/etc/ppp/radius/servers
similarity index 100%
rename from package/ppp/files/etc/ppp/radius/servers
rename to package/network/services/ppp/files/etc/ppp/radius/servers
diff --git a/package/ppp/files/lib/netifd/ppp-down b/package/network/services/ppp/files/lib/netifd/ppp-down
similarity index 100%
rename from package/ppp/files/lib/netifd/ppp-down
rename to package/network/services/ppp/files/lib/netifd/ppp-down
diff --git a/package/ppp/files/lib/netifd/ppp-up b/package/network/services/ppp/files/lib/netifd/ppp-up
similarity index 100%
rename from package/ppp/files/lib/netifd/ppp-up
rename to package/network/services/ppp/files/lib/netifd/ppp-up
diff --git a/package/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
similarity index 100%
rename from package/ppp/files/ppp.sh
rename to package/network/services/ppp/files/ppp.sh
diff --git a/package/ppp/patches/010-use_target_for_configure.patch b/package/network/services/ppp/patches/010-use_target_for_configure.patch
similarity index 100%
rename from package/ppp/patches/010-use_target_for_configure.patch
rename to package/network/services/ppp/patches/010-use_target_for_configure.patch
diff --git a/package/ppp/patches/100-debian_ip-ip_option.patch b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch
similarity index 100%
rename from package/ppp/patches/100-debian_ip-ip_option.patch
rename to package/network/services/ppp/patches/100-debian_ip-ip_option.patch
diff --git a/package/ppp/patches/101-debian_close_dev_ppp.patch b/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
similarity index 100%
rename from package/ppp/patches/101-debian_close_dev_ppp.patch
rename to package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
diff --git a/package/ppp/patches/103-debian_fix_link_pidfile.patch b/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
similarity index 100%
rename from package/ppp/patches/103-debian_fix_link_pidfile.patch
rename to package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
diff --git a/package/ppp/patches/105-debian_demand.patch b/package/network/services/ppp/patches/105-debian_demand.patch
similarity index 100%
rename from package/ppp/patches/105-debian_demand.patch
rename to package/network/services/ppp/patches/105-debian_demand.patch
diff --git a/package/ppp/patches/106-debian_stripMSdomain.patch b/package/network/services/ppp/patches/106-debian_stripMSdomain.patch
similarity index 100%
rename from package/ppp/patches/106-debian_stripMSdomain.patch
rename to package/network/services/ppp/patches/106-debian_stripMSdomain.patch
diff --git a/package/ppp/patches/107-debian_pppoatm_wildcard.patch b/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
similarity index 100%
rename from package/ppp/patches/107-debian_pppoatm_wildcard.patch
rename to package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
diff --git a/package/ppp/patches/110-debian_defaultroute.patch b/package/network/services/ppp/patches/110-debian_defaultroute.patch
similarity index 100%
rename from package/ppp/patches/110-debian_defaultroute.patch
rename to package/network/services/ppp/patches/110-debian_defaultroute.patch
diff --git a/package/ppp/patches/120-debian_ipv6_updown_option.patch b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
similarity index 100%
rename from package/ppp/patches/120-debian_ipv6_updown_option.patch
rename to package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch
diff --git a/package/ppp/patches/200-makefile.patch b/package/network/services/ppp/patches/200-makefile.patch
similarity index 100%
rename from package/ppp/patches/200-makefile.patch
rename to package/network/services/ppp/patches/200-makefile.patch
diff --git a/package/ppp/patches/201-mppe_mppc_1.1.patch b/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
similarity index 100%
rename from package/ppp/patches/201-mppe_mppc_1.1.patch
rename to package/network/services/ppp/patches/201-mppe_mppc_1.1.patch
diff --git a/package/ppp/patches/202-no_strip.patch b/package/network/services/ppp/patches/202-no_strip.patch
similarity index 100%
rename from package/ppp/patches/202-no_strip.patch
rename to package/network/services/ppp/patches/202-no_strip.patch
diff --git a/package/ppp/patches/203-opt_flags.patch b/package/network/services/ppp/patches/203-opt_flags.patch
similarity index 100%
rename from package/ppp/patches/203-opt_flags.patch
rename to package/network/services/ppp/patches/203-opt_flags.patch
diff --git a/package/ppp/patches/204-radius_config.patch b/package/network/services/ppp/patches/204-radius_config.patch
similarity index 100%
rename from package/ppp/patches/204-radius_config.patch
rename to package/network/services/ppp/patches/204-radius_config.patch
diff --git a/package/ppp/patches/205-no_exponential_timeout.patch b/package/network/services/ppp/patches/205-no_exponential_timeout.patch
similarity index 100%
rename from package/ppp/patches/205-no_exponential_timeout.patch
rename to package/network/services/ppp/patches/205-no_exponential_timeout.patch
diff --git a/package/ppp/patches/206-compensate_time_change.patch b/package/network/services/ppp/patches/206-compensate_time_change.patch
similarity index 100%
rename from package/ppp/patches/206-compensate_time_change.patch
rename to package/network/services/ppp/patches/206-compensate_time_change.patch
diff --git a/package/ppp/patches/207-lcp_mtu_max.patch b/package/network/services/ppp/patches/207-lcp_mtu_max.patch
similarity index 100%
rename from package/ppp/patches/207-lcp_mtu_max.patch
rename to package/network/services/ppp/patches/207-lcp_mtu_max.patch
diff --git a/package/ppp/patches/208-fix_status_code.patch b/package/network/services/ppp/patches/208-fix_status_code.patch
similarity index 100%
rename from package/ppp/patches/208-fix_status_code.patch
rename to package/network/services/ppp/patches/208-fix_status_code.patch
diff --git a/package/ppp/patches/300-filter-pcap-includes-lib.patch b/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch
similarity index 100%
rename from package/ppp/patches/300-filter-pcap-includes-lib.patch
rename to package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch
diff --git a/package/ppp/patches/310-precompile_filter.patch b/package/network/services/ppp/patches/310-precompile_filter.patch
similarity index 100%
rename from package/ppp/patches/310-precompile_filter.patch
rename to package/network/services/ppp/patches/310-precompile_filter.patch
diff --git a/package/ppp/patches/320-custom_iface_names.patch b/package/network/services/ppp/patches/320-custom_iface_names.patch
similarity index 100%
rename from package/ppp/patches/320-custom_iface_names.patch
rename to package/network/services/ppp/patches/320-custom_iface_names.patch
diff --git a/package/ppp/patches/330-retain_foreign_default_routes.patch b/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch
similarity index 100%
rename from package/ppp/patches/330-retain_foreign_default_routes.patch
rename to package/network/services/ppp/patches/330-retain_foreign_default_routes.patch
diff --git a/package/ppp/patches/340-populate_default_gateway.patch b/package/network/services/ppp/patches/340-populate_default_gateway.patch
similarity index 100%
rename from package/ppp/patches/340-populate_default_gateway.patch
rename to package/network/services/ppp/patches/340-populate_default_gateway.patch
diff --git a/package/ppp/patches/400-simplify_kernel_checks.patch b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
similarity index 100%
rename from package/ppp/patches/400-simplify_kernel_checks.patch
rename to package/network/services/ppp/patches/400-simplify_kernel_checks.patch
diff --git a/package/ppp/patches/401-no_record_file.patch b/package/network/services/ppp/patches/401-no_record_file.patch
similarity index 100%
rename from package/ppp/patches/401-no_record_file.patch
rename to package/network/services/ppp/patches/401-no_record_file.patch
diff --git a/package/ppp/patches/403-no_wtmp.patch b/package/network/services/ppp/patches/403-no_wtmp.patch
similarity index 100%
rename from package/ppp/patches/403-no_wtmp.patch
rename to package/network/services/ppp/patches/403-no_wtmp.patch
diff --git a/package/ppp/patches/404-remove_obsolete_protocol_names.patch b/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch
similarity index 100%
rename from package/ppp/patches/404-remove_obsolete_protocol_names.patch
rename to package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch
diff --git a/package/ppp/patches/405-no_multilink_option.patch b/package/network/services/ppp/patches/405-no_multilink_option.patch
similarity index 100%
rename from package/ppp/patches/405-no_multilink_option.patch
rename to package/network/services/ppp/patches/405-no_multilink_option.patch
diff --git a/package/ppp/patches/430-pppol2tpv3-struct.patch b/package/network/services/ppp/patches/430-pppol2tpv3-struct.patch
similarity index 100%
rename from package/ppp/patches/430-pppol2tpv3-struct.patch
rename to package/network/services/ppp/patches/430-pppol2tpv3-struct.patch
diff --git a/package/ppp/patches/500-add-pptp-plugin.patch b/package/network/services/ppp/patches/500-add-pptp-plugin.patch
similarity index 100%
rename from package/ppp/patches/500-add-pptp-plugin.patch
rename to package/network/services/ppp/patches/500-add-pptp-plugin.patch
diff --git a/package/ppp/utils/pfc.c b/package/network/services/ppp/utils/pfc.c
similarity index 100%
rename from package/ppp/utils/pfc.c
rename to package/network/services/ppp/utils/pfc.c
diff --git a/package/relayd/Makefile b/package/network/services/relayd/Makefile
similarity index 100%
rename from package/relayd/Makefile
rename to package/network/services/relayd/Makefile
diff --git a/package/relayd/files/relay.hotplug b/package/network/services/relayd/files/relay.hotplug
similarity index 100%
rename from package/relayd/files/relay.hotplug
rename to package/network/services/relayd/files/relay.hotplug
diff --git a/package/relayd/files/relay.init b/package/network/services/relayd/files/relay.init
similarity index 100%
rename from package/relayd/files/relay.init
rename to package/network/services/relayd/files/relay.init
diff --git a/package/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
similarity index 100%
rename from package/uhttpd/Makefile
rename to package/network/services/uhttpd/Makefile
diff --git a/package/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config
similarity index 100%
rename from package/uhttpd/files/uhttpd.config
rename to package/network/services/uhttpd/files/uhttpd.config
diff --git a/package/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
similarity index 100%
rename from package/uhttpd/files/uhttpd.init
rename to package/network/services/uhttpd/files/uhttpd.init
diff --git a/package/uhttpd/src/Makefile b/package/network/services/uhttpd/src/Makefile
similarity index 100%
rename from package/uhttpd/src/Makefile
rename to package/network/services/uhttpd/src/Makefile
diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/network/services/uhttpd/src/uhttpd-cgi.c
similarity index 100%
rename from package/uhttpd/src/uhttpd-cgi.c
rename to package/network/services/uhttpd/src/uhttpd-cgi.c
diff --git a/package/uhttpd/src/uhttpd-cgi.h b/package/network/services/uhttpd/src/uhttpd-cgi.h
similarity index 100%
rename from package/uhttpd/src/uhttpd-cgi.h
rename to package/network/services/uhttpd/src/uhttpd-cgi.h
diff --git a/package/uhttpd/src/uhttpd-file.c b/package/network/services/uhttpd/src/uhttpd-file.c
similarity index 100%
rename from package/uhttpd/src/uhttpd-file.c
rename to package/network/services/uhttpd/src/uhttpd-file.c
diff --git a/package/uhttpd/src/uhttpd-file.h b/package/network/services/uhttpd/src/uhttpd-file.h
similarity index 100%
rename from package/uhttpd/src/uhttpd-file.h
rename to package/network/services/uhttpd/src/uhttpd-file.h
diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/network/services/uhttpd/src/uhttpd-lua.c
similarity index 100%
rename from package/uhttpd/src/uhttpd-lua.c
rename to package/network/services/uhttpd/src/uhttpd-lua.c
diff --git a/package/uhttpd/src/uhttpd-lua.h b/package/network/services/uhttpd/src/uhttpd-lua.h
similarity index 100%
rename from package/uhttpd/src/uhttpd-lua.h
rename to package/network/services/uhttpd/src/uhttpd-lua.h
diff --git a/package/uhttpd/src/uhttpd-mimetypes.h b/package/network/services/uhttpd/src/uhttpd-mimetypes.h
similarity index 100%
rename from package/uhttpd/src/uhttpd-mimetypes.h
rename to package/network/services/uhttpd/src/uhttpd-mimetypes.h
diff --git a/package/uhttpd/src/uhttpd-tls.c b/package/network/services/uhttpd/src/uhttpd-tls.c
similarity index 100%
rename from package/uhttpd/src/uhttpd-tls.c
rename to package/network/services/uhttpd/src/uhttpd-tls.c
diff --git a/package/uhttpd/src/uhttpd-tls.h b/package/network/services/uhttpd/src/uhttpd-tls.h
similarity index 100%
rename from package/uhttpd/src/uhttpd-tls.h
rename to package/network/services/uhttpd/src/uhttpd-tls.h
diff --git a/package/uhttpd/src/uhttpd-ubus.c b/package/network/services/uhttpd/src/uhttpd-ubus.c
similarity index 100%
rename from package/uhttpd/src/uhttpd-ubus.c
rename to package/network/services/uhttpd/src/uhttpd-ubus.c
diff --git a/package/uhttpd/src/uhttpd-ubus.h b/package/network/services/uhttpd/src/uhttpd-ubus.h
similarity index 100%
rename from package/uhttpd/src/uhttpd-ubus.h
rename to package/network/services/uhttpd/src/uhttpd-ubus.h
diff --git a/package/uhttpd/src/uhttpd-utils.c b/package/network/services/uhttpd/src/uhttpd-utils.c
similarity index 100%
rename from package/uhttpd/src/uhttpd-utils.c
rename to package/network/services/uhttpd/src/uhttpd-utils.c
diff --git a/package/uhttpd/src/uhttpd-utils.h b/package/network/services/uhttpd/src/uhttpd-utils.h
similarity index 100%
rename from package/uhttpd/src/uhttpd-utils.h
rename to package/network/services/uhttpd/src/uhttpd-utils.h
diff --git a/package/uhttpd/src/uhttpd.c b/package/network/services/uhttpd/src/uhttpd.c
similarity index 100%
rename from package/uhttpd/src/uhttpd.c
rename to package/network/services/uhttpd/src/uhttpd.c
diff --git a/package/uhttpd/src/uhttpd.h b/package/network/services/uhttpd/src/uhttpd.h
similarity index 100%
rename from package/uhttpd/src/uhttpd.h
rename to package/network/services/uhttpd/src/uhttpd.h
diff --git a/package/arptables/Makefile b/package/network/utils/arptables/Makefile
similarity index 100%
rename from package/arptables/Makefile
rename to package/network/utils/arptables/Makefile
diff --git a/package/arptables/patches/100-always_optimize.patch b/package/network/utils/arptables/patches/100-always_optimize.patch
similarity index 100%
rename from package/arptables/patches/100-always_optimize.patch
rename to package/network/utils/arptables/patches/100-always_optimize.patch
diff --git a/package/comgt/Makefile b/package/network/utils/comgt/Makefile
similarity index 100%
rename from package/comgt/Makefile
rename to package/network/utils/comgt/Makefile
diff --git a/package/comgt/files/3g.chat b/package/network/utils/comgt/files/3g.chat
similarity index 100%
rename from package/comgt/files/3g.chat
rename to package/network/utils/comgt/files/3g.chat
diff --git a/package/comgt/files/3g.sh b/package/network/utils/comgt/files/3g.sh
similarity index 100%
rename from package/comgt/files/3g.sh
rename to package/network/utils/comgt/files/3g.sh
diff --git a/package/comgt/files/3g.usb b/package/network/utils/comgt/files/3g.usb
similarity index 100%
rename from package/comgt/files/3g.usb
rename to package/network/utils/comgt/files/3g.usb
diff --git a/package/comgt/files/evdo.chat b/package/network/utils/comgt/files/evdo.chat
similarity index 100%
rename from package/comgt/files/evdo.chat
rename to package/network/utils/comgt/files/evdo.chat
diff --git a/package/comgt/files/getcardinfo.gcom b/package/network/utils/comgt/files/getcardinfo.gcom
similarity index 100%
rename from package/comgt/files/getcardinfo.gcom
rename to package/network/utils/comgt/files/getcardinfo.gcom
diff --git a/package/comgt/files/getcarrier.gcom b/package/network/utils/comgt/files/getcarrier.gcom
similarity index 100%
rename from package/comgt/files/getcarrier.gcom
rename to package/network/utils/comgt/files/getcarrier.gcom
diff --git a/package/comgt/files/getcnum.gcom b/package/network/utils/comgt/files/getcnum.gcom
similarity index 100%
rename from package/comgt/files/getcnum.gcom
rename to package/network/utils/comgt/files/getcnum.gcom
diff --git a/package/comgt/files/getimsi.gcom b/package/network/utils/comgt/files/getimsi.gcom
similarity index 100%
rename from package/comgt/files/getimsi.gcom
rename to package/network/utils/comgt/files/getimsi.gcom
diff --git a/package/comgt/files/getstrength.gcom b/package/network/utils/comgt/files/getstrength.gcom
similarity index 100%
rename from package/comgt/files/getstrength.gcom
rename to package/network/utils/comgt/files/getstrength.gcom
diff --git a/package/comgt/files/setmode.gcom b/package/network/utils/comgt/files/setmode.gcom
similarity index 100%
rename from package/comgt/files/setmode.gcom
rename to package/network/utils/comgt/files/setmode.gcom
diff --git a/package/comgt/files/setpin.gcom b/package/network/utils/comgt/files/setpin.gcom
similarity index 100%
rename from package/comgt/files/setpin.gcom
rename to package/network/utils/comgt/files/setpin.gcom
diff --git a/package/comgt/patches/001-compile_fix.patch b/package/network/utils/comgt/patches/001-compile_fix.patch
similarity index 100%
rename from package/comgt/patches/001-compile_fix.patch
rename to package/network/utils/comgt/patches/001-compile_fix.patch
diff --git a/package/ebtables/Makefile b/package/network/utils/ebtables/Makefile
similarity index 100%
rename from package/ebtables/Makefile
rename to package/network/utils/ebtables/Makefile
diff --git a/package/ifenslave/Makefile b/package/network/utils/ifenslave/Makefile
similarity index 100%
rename from package/ifenslave/Makefile
rename to package/network/utils/ifenslave/Makefile
diff --git a/package/iproute2/Makefile b/package/network/utils/iproute2/Makefile
similarity index 100%
rename from package/iproute2/Makefile
rename to package/network/utils/iproute2/Makefile
diff --git a/package/iproute2/files/30-teql b/package/network/utils/iproute2/files/30-teql
similarity index 100%
rename from package/iproute2/files/30-teql
rename to package/network/utils/iproute2/files/30-teql
diff --git a/package/iproute2/patches/000-sync_pkt_sched_h.patch b/package/network/utils/iproute2/patches/000-sync_pkt_sched_h.patch
similarity index 100%
rename from package/iproute2/patches/000-sync_pkt_sched_h.patch
rename to package/network/utils/iproute2/patches/000-sync_pkt_sched_h.patch
diff --git a/package/iproute2/patches/001-iproute2-2.6.11_Config.patch b/package/network/utils/iproute2/patches/001-iproute2-2.6.11_Config.patch
similarity index 100%
rename from package/iproute2/patches/001-iproute2-2.6.11_Config.patch
rename to package/network/utils/iproute2/patches/001-iproute2-2.6.11_Config.patch
diff --git a/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch b/package/network/utils/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
similarity index 100%
rename from package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
rename to package/network/utils/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
diff --git a/package/iproute2/patches/004-darwin_fixes.patch b/package/network/utils/iproute2/patches/004-darwin_fixes.patch
similarity index 100%
rename from package/iproute2/patches/004-darwin_fixes.patch
rename to package/network/utils/iproute2/patches/004-darwin_fixes.patch
diff --git a/package/iproute2/patches/006-iproute2-tc_esfq.patch b/package/network/utils/iproute2/patches/006-iproute2-tc_esfq.patch
similarity index 100%
rename from package/iproute2/patches/006-iproute2-tc_esfq.patch
rename to package/network/utils/iproute2/patches/006-iproute2-tc_esfq.patch
diff --git a/package/iproute2/patches/007-no_arpd.patch b/package/network/utils/iproute2/patches/007-no_arpd.patch
similarity index 100%
rename from package/iproute2/patches/007-no_arpd.patch
rename to package/network/utils/iproute2/patches/007-no_arpd.patch
diff --git a/package/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch
similarity index 100%
rename from package/iproute2/patches/008-no_netem.patch
rename to package/network/utils/iproute2/patches/008-no_netem.patch
diff --git a/package/iproute2/patches/100-allow_pfifo_fast.patch b/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch
similarity index 100%
rename from package/iproute2/patches/100-allow_pfifo_fast.patch
rename to package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch
diff --git a/package/iproute2/patches/110-extra-ccopts.patch b/package/network/utils/iproute2/patches/110-extra-ccopts.patch
similarity index 100%
rename from package/iproute2/patches/110-extra-ccopts.patch
rename to package/network/utils/iproute2/patches/110-extra-ccopts.patch
diff --git a/package/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
similarity index 100%
rename from package/iproute2/patches/120-libnetlink-pic.patch
rename to package/network/utils/iproute2/patches/120-libnetlink-pic.patch
diff --git a/package/iproute2/patches/200-act_connmark.patch b/package/network/utils/iproute2/patches/200-act_connmark.patch
similarity index 100%
rename from package/iproute2/patches/200-act_connmark.patch
rename to package/network/utils/iproute2/patches/200-act_connmark.patch
diff --git a/package/iproute2/patches/210-add_codel.patch b/package/network/utils/iproute2/patches/210-add_codel.patch
similarity index 100%
rename from package/iproute2/patches/210-add_codel.patch
rename to package/network/utils/iproute2/patches/210-add_codel.patch
diff --git a/package/iptables/Makefile b/package/network/utils/iptables/Makefile
similarity index 100%
rename from package/iptables/Makefile
rename to package/network/utils/iptables/Makefile
diff --git a/package/iptables/files/l7/aim.pat b/package/network/utils/iptables/files/l7/aim.pat
similarity index 100%
rename from package/iptables/files/l7/aim.pat
rename to package/network/utils/iptables/files/l7/aim.pat
diff --git a/package/iptables/files/l7/bittorrent.pat b/package/network/utils/iptables/files/l7/bittorrent.pat
similarity index 100%
rename from package/iptables/files/l7/bittorrent.pat
rename to package/network/utils/iptables/files/l7/bittorrent.pat
diff --git a/package/iptables/files/l7/edonkey.pat b/package/network/utils/iptables/files/l7/edonkey.pat
similarity index 100%
rename from package/iptables/files/l7/edonkey.pat
rename to package/network/utils/iptables/files/l7/edonkey.pat
diff --git a/package/iptables/files/l7/fasttrack.pat b/package/network/utils/iptables/files/l7/fasttrack.pat
similarity index 100%
rename from package/iptables/files/l7/fasttrack.pat
rename to package/network/utils/iptables/files/l7/fasttrack.pat
diff --git a/package/iptables/files/l7/ftp.pat b/package/network/utils/iptables/files/l7/ftp.pat
similarity index 100%
rename from package/iptables/files/l7/ftp.pat
rename to package/network/utils/iptables/files/l7/ftp.pat
diff --git a/package/iptables/files/l7/gnutella.pat b/package/network/utils/iptables/files/l7/gnutella.pat
similarity index 100%
rename from package/iptables/files/l7/gnutella.pat
rename to package/network/utils/iptables/files/l7/gnutella.pat
diff --git a/package/iptables/files/l7/http.pat b/package/network/utils/iptables/files/l7/http.pat
similarity index 100%
rename from package/iptables/files/l7/http.pat
rename to package/network/utils/iptables/files/l7/http.pat
diff --git a/package/iptables/files/l7/ident.pat b/package/network/utils/iptables/files/l7/ident.pat
similarity index 100%
rename from package/iptables/files/l7/ident.pat
rename to package/network/utils/iptables/files/l7/ident.pat
diff --git a/package/iptables/files/l7/irc.pat b/package/network/utils/iptables/files/l7/irc.pat
similarity index 100%
rename from package/iptables/files/l7/irc.pat
rename to package/network/utils/iptables/files/l7/irc.pat
diff --git a/package/iptables/files/l7/jabber.pat b/package/network/utils/iptables/files/l7/jabber.pat
similarity index 100%
rename from package/iptables/files/l7/jabber.pat
rename to package/network/utils/iptables/files/l7/jabber.pat
diff --git a/package/iptables/files/l7/msnmessenger.pat b/package/network/utils/iptables/files/l7/msnmessenger.pat
similarity index 100%
rename from package/iptables/files/l7/msnmessenger.pat
rename to package/network/utils/iptables/files/l7/msnmessenger.pat
diff --git a/package/iptables/files/l7/ntp.pat b/package/network/utils/iptables/files/l7/ntp.pat
similarity index 100%
rename from package/iptables/files/l7/ntp.pat
rename to package/network/utils/iptables/files/l7/ntp.pat
diff --git a/package/iptables/files/l7/pop3.pat b/package/network/utils/iptables/files/l7/pop3.pat
similarity index 100%
rename from package/iptables/files/l7/pop3.pat
rename to package/network/utils/iptables/files/l7/pop3.pat
diff --git a/package/iptables/files/l7/smtp.pat b/package/network/utils/iptables/files/l7/smtp.pat
similarity index 100%
rename from package/iptables/files/l7/smtp.pat
rename to package/network/utils/iptables/files/l7/smtp.pat
diff --git a/package/iptables/files/l7/ssl.pat b/package/network/utils/iptables/files/l7/ssl.pat
similarity index 100%
rename from package/iptables/files/l7/ssl.pat
rename to package/network/utils/iptables/files/l7/ssl.pat
diff --git a/package/iptables/files/l7/vnc.pat b/package/network/utils/iptables/files/l7/vnc.pat
similarity index 100%
rename from package/iptables/files/l7/vnc.pat
rename to package/network/utils/iptables/files/l7/vnc.pat
diff --git a/package/iptables/patches/002-layer7_2.22.patch b/package/network/utils/iptables/patches/002-layer7_2.22.patch
similarity index 100%
rename from package/iptables/patches/002-layer7_2.22.patch
rename to package/network/utils/iptables/patches/002-layer7_2.22.patch
diff --git a/package/iptables/patches/009-table-alignment.patch b/package/network/utils/iptables/patches/009-table-alignment.patch
similarity index 100%
rename from package/iptables/patches/009-table-alignment.patch
rename to package/network/utils/iptables/patches/009-table-alignment.patch
diff --git a/package/iptables/patches/010-multiport-linux-2.4-compat.patch b/package/network/utils/iptables/patches/010-multiport-linux-2.4-compat.patch
similarity index 100%
rename from package/iptables/patches/010-multiport-linux-2.4-compat.patch
rename to package/network/utils/iptables/patches/010-multiport-linux-2.4-compat.patch
diff --git a/package/iptables/patches/011-recent-add-reap.patch b/package/network/utils/iptables/patches/011-recent-add-reap.patch
similarity index 100%
rename from package/iptables/patches/011-recent-add-reap.patch
rename to package/network/utils/iptables/patches/011-recent-add-reap.patch
diff --git a/package/iptables/patches/020-iptables-disable-modprobe.patch b/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
similarity index 100%
rename from package/iptables/patches/020-iptables-disable-modprobe.patch
rename to package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
diff --git a/package/iptables/patches/030-no-libnfnetlink.patch b/package/network/utils/iptables/patches/030-no-libnfnetlink.patch
similarity index 100%
rename from package/iptables/patches/030-no-libnfnetlink.patch
rename to package/network/utils/iptables/patches/030-no-libnfnetlink.patch
diff --git a/package/iptables/patches/100-bash-location.patch b/package/network/utils/iptables/patches/100-bash-location.patch
similarity index 100%
rename from package/iptables/patches/100-bash-location.patch
rename to package/network/utils/iptables/patches/100-bash-location.patch
diff --git a/package/iptables/patches/110-linux_3.2_compat.patch b/package/network/utils/iptables/patches/110-linux_3.2_compat.patch
similarity index 100%
rename from package/iptables/patches/110-linux_3.2_compat.patch
rename to package/network/utils/iptables/patches/110-linux_3.2_compat.patch
diff --git a/package/iptables/patches/200-configurable_builtin.patch b/package/network/utils/iptables/patches/200-configurable_builtin.patch
similarity index 100%
rename from package/iptables/patches/200-configurable_builtin.patch
rename to package/network/utils/iptables/patches/200-configurable_builtin.patch
diff --git a/package/iw/Makefile b/package/network/utils/iw/Makefile
similarity index 100%
rename from package/iw/Makefile
rename to package/network/utils/iw/Makefile
diff --git a/package/iw/patches/001-nl80211_h_sync.patch b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
similarity index 100%
rename from package/iw/patches/001-nl80211_h_sync.patch
rename to package/network/utils/iw/patches/001-nl80211_h_sync.patch
diff --git a/package/iw/patches/100-rx_rate.patch b/package/network/utils/iw/patches/100-rx_rate.patch
similarity index 100%
rename from package/iw/patches/100-rx_rate.patch
rename to package/network/utils/iw/patches/100-rx_rate.patch
diff --git a/package/iw/patches/110-per_chain_signal_strength.patch b/package/network/utils/iw/patches/110-per_chain_signal_strength.patch
similarity index 100%
rename from package/iw/patches/110-per_chain_signal_strength.patch
rename to package/network/utils/iw/patches/110-per_chain_signal_strength.patch
diff --git a/package/iw/patches/120-tdls_peer_indentation.patch b/package/network/utils/iw/patches/120-tdls_peer_indentation.patch
similarity index 100%
rename from package/iw/patches/120-tdls_peer_indentation.patch
rename to package/network/utils/iw/patches/120-tdls_peer_indentation.patch
diff --git a/package/iw/patches/130-antenna_gain.patch b/package/network/utils/iw/patches/130-antenna_gain.patch
similarity index 100%
rename from package/iw/patches/130-antenna_gain.patch
rename to package/network/utils/iw/patches/130-antenna_gain.patch
diff --git a/package/iwcap/Makefile b/package/network/utils/iwcap/Makefile
similarity index 100%
rename from package/iwcap/Makefile
rename to package/network/utils/iwcap/Makefile
diff --git a/package/iwcap/src/iwcap.c b/package/network/utils/iwcap/src/iwcap.c
similarity index 100%
rename from package/iwcap/src/iwcap.c
rename to package/network/utils/iwcap/src/iwcap.c
diff --git a/package/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
similarity index 100%
rename from package/iwinfo/Makefile
rename to package/network/utils/iwinfo/Makefile
diff --git a/package/iwinfo/src/COPYING b/package/network/utils/iwinfo/src/COPYING
similarity index 100%
rename from package/iwinfo/src/COPYING
rename to package/network/utils/iwinfo/src/COPYING
diff --git a/package/iwinfo/src/Makefile b/package/network/utils/iwinfo/src/Makefile
similarity index 100%
rename from package/iwinfo/src/Makefile
rename to package/network/utils/iwinfo/src/Makefile
diff --git a/package/iwinfo/src/include/iwinfo.h b/package/network/utils/iwinfo/src/include/iwinfo.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo.h
rename to package/network/utils/iwinfo/src/include/iwinfo.h
diff --git a/package/iwinfo/src/include/iwinfo/api/broadcom.h b/package/network/utils/iwinfo/src/include/iwinfo/api/broadcom.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/api/broadcom.h
rename to package/network/utils/iwinfo/src/include/iwinfo/api/broadcom.h
diff --git a/package/iwinfo/src/include/iwinfo/api/madwifi.h b/package/network/utils/iwinfo/src/include/iwinfo/api/madwifi.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/api/madwifi.h
rename to package/network/utils/iwinfo/src/include/iwinfo/api/madwifi.h
diff --git a/package/iwinfo/src/include/iwinfo/api/nl80211.h b/package/network/utils/iwinfo/src/include/iwinfo/api/nl80211.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/api/nl80211.h
rename to package/network/utils/iwinfo/src/include/iwinfo/api/nl80211.h
diff --git a/package/iwinfo/src/include/iwinfo/api/wext.h b/package/network/utils/iwinfo/src/include/iwinfo/api/wext.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/api/wext.h
rename to package/network/utils/iwinfo/src/include/iwinfo/api/wext.h
diff --git a/package/iwinfo/src/include/iwinfo/lua.h b/package/network/utils/iwinfo/src/include/iwinfo/lua.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/lua.h
rename to package/network/utils/iwinfo/src/include/iwinfo/lua.h
diff --git a/package/iwinfo/src/include/iwinfo/madwifi.h b/package/network/utils/iwinfo/src/include/iwinfo/madwifi.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/madwifi.h
rename to package/network/utils/iwinfo/src/include/iwinfo/madwifi.h
diff --git a/package/iwinfo/src/include/iwinfo/nl80211.h b/package/network/utils/iwinfo/src/include/iwinfo/nl80211.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/nl80211.h
rename to package/network/utils/iwinfo/src/include/iwinfo/nl80211.h
diff --git a/package/iwinfo/src/include/iwinfo/utils.h b/package/network/utils/iwinfo/src/include/iwinfo/utils.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/utils.h
rename to package/network/utils/iwinfo/src/include/iwinfo/utils.h
diff --git a/package/iwinfo/src/include/iwinfo/wext.h b/package/network/utils/iwinfo/src/include/iwinfo/wext.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/wext.h
rename to package/network/utils/iwinfo/src/include/iwinfo/wext.h
diff --git a/package/iwinfo/src/include/iwinfo/wext_scan.h b/package/network/utils/iwinfo/src/include/iwinfo/wext_scan.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/wext_scan.h
rename to package/network/utils/iwinfo/src/include/iwinfo/wext_scan.h
diff --git a/package/iwinfo/src/include/iwinfo/wl.h b/package/network/utils/iwinfo/src/include/iwinfo/wl.h
similarity index 100%
rename from package/iwinfo/src/include/iwinfo/wl.h
rename to package/network/utils/iwinfo/src/include/iwinfo/wl.h
diff --git a/package/iwinfo/src/iwinfo_cli.c b/package/network/utils/iwinfo/src/iwinfo_cli.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_cli.c
rename to package/network/utils/iwinfo/src/iwinfo_cli.c
diff --git a/package/iwinfo/src/iwinfo_lib.c b/package/network/utils/iwinfo/src/iwinfo_lib.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_lib.c
rename to package/network/utils/iwinfo/src/iwinfo_lib.c
diff --git a/package/iwinfo/src/iwinfo_lua.c b/package/network/utils/iwinfo/src/iwinfo_lua.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_lua.c
rename to package/network/utils/iwinfo/src/iwinfo_lua.c
diff --git a/package/iwinfo/src/iwinfo_madwifi.c b/package/network/utils/iwinfo/src/iwinfo_madwifi.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_madwifi.c
rename to package/network/utils/iwinfo/src/iwinfo_madwifi.c
diff --git a/package/iwinfo/src/iwinfo_nl80211.c b/package/network/utils/iwinfo/src/iwinfo_nl80211.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_nl80211.c
rename to package/network/utils/iwinfo/src/iwinfo_nl80211.c
diff --git a/package/iwinfo/src/iwinfo_utils.c b/package/network/utils/iwinfo/src/iwinfo_utils.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_utils.c
rename to package/network/utils/iwinfo/src/iwinfo_utils.c
diff --git a/package/iwinfo/src/iwinfo_wext.c b/package/network/utils/iwinfo/src/iwinfo_wext.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_wext.c
rename to package/network/utils/iwinfo/src/iwinfo_wext.c
diff --git a/package/iwinfo/src/iwinfo_wext_scan.c b/package/network/utils/iwinfo/src/iwinfo_wext_scan.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_wext_scan.c
rename to package/network/utils/iwinfo/src/iwinfo_wext_scan.c
diff --git a/package/iwinfo/src/iwinfo_wl.c b/package/network/utils/iwinfo/src/iwinfo_wl.c
similarity index 100%
rename from package/iwinfo/src/iwinfo_wl.c
rename to package/network/utils/iwinfo/src/iwinfo_wl.c
diff --git a/package/maccalc/Makefile b/package/network/utils/maccalc/Makefile
similarity index 100%
rename from package/maccalc/Makefile
rename to package/network/utils/maccalc/Makefile
diff --git a/package/maccalc/src/Makefile b/package/network/utils/maccalc/src/Makefile
similarity index 100%
rename from package/maccalc/src/Makefile
rename to package/network/utils/maccalc/src/Makefile
diff --git a/package/maccalc/src/main.c b/package/network/utils/maccalc/src/main.c
similarity index 100%
rename from package/maccalc/src/main.c
rename to package/network/utils/maccalc/src/main.c
diff --git a/package/owipcalc/Makefile b/package/network/utils/owipcalc/Makefile
similarity index 100%
rename from package/owipcalc/Makefile
rename to package/network/utils/owipcalc/Makefile
diff --git a/package/owipcalc/src/owipcalc.c b/package/network/utils/owipcalc/src/owipcalc.c
similarity index 100%
rename from package/owipcalc/src/owipcalc.c
rename to package/network/utils/owipcalc/src/owipcalc.c
diff --git a/package/resolveip/Makefile b/package/network/utils/resolveip/Makefile
similarity index 100%
rename from package/resolveip/Makefile
rename to package/network/utils/resolveip/Makefile
diff --git a/package/resolveip/src/resolveip.c b/package/network/utils/resolveip/src/resolveip.c
similarity index 100%
rename from package/resolveip/src/resolveip.c
rename to package/network/utils/resolveip/src/resolveip.c
diff --git a/package/rssileds/Makefile b/package/network/utils/rssileds/Makefile
similarity index 100%
rename from package/rssileds/Makefile
rename to package/network/utils/rssileds/Makefile
diff --git a/package/rssileds/files/rssileds.init b/package/network/utils/rssileds/files/rssileds.init
similarity index 100%
rename from package/rssileds/files/rssileds.init
rename to package/network/utils/rssileds/files/rssileds.init
diff --git a/package/rssileds/src/rssileds.c b/package/network/utils/rssileds/src/rssileds.c
similarity index 100%
rename from package/rssileds/src/rssileds.c
rename to package/network/utils/rssileds/src/rssileds.c
diff --git a/package/wireless-tools/Makefile b/package/network/utils/wireless-tools/Makefile
similarity index 100%
rename from package/wireless-tools/Makefile
rename to package/network/utils/wireless-tools/Makefile
diff --git a/package/wireless-tools/patches/001-debian.patch b/package/network/utils/wireless-tools/patches/001-debian.patch
similarity index 100%
rename from package/wireless-tools/patches/001-debian.patch
rename to package/network/utils/wireless-tools/patches/001-debian.patch
diff --git a/package/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch b/package/network/utils/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch
similarity index 100%
rename from package/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch
rename to package/network/utils/wireless-tools/patches/002-fix-iwconfig-power-argument-parsing.patch
diff --git a/package/wireless-tools/patches/003-we_essential_def.patch b/package/network/utils/wireless-tools/patches/003-we_essential_def.patch
similarity index 100%
rename from package/wireless-tools/patches/003-we_essential_def.patch
rename to package/network/utils/wireless-tools/patches/003-we_essential_def.patch
diff --git a/package/wireless-tools/patches/004-increase_iwlist_buffer.patch b/package/network/utils/wireless-tools/patches/004-increase_iwlist_buffer.patch
similarity index 100%
rename from package/wireless-tools/patches/004-increase_iwlist_buffer.patch
rename to package/network/utils/wireless-tools/patches/004-increase_iwlist_buffer.patch