diff --git a/extra-network/6tunnel/autobuild/beyond b/app-network/6tunnel/autobuild/beyond
similarity index 100%
rename from extra-network/6tunnel/autobuild/beyond
rename to app-network/6tunnel/autobuild/beyond
diff --git a/extra-network/6tunnel/autobuild/defines b/app-network/6tunnel/autobuild/defines
similarity index 100%
rename from extra-network/6tunnel/autobuild/defines
rename to app-network/6tunnel/autobuild/defines
diff --git a/extra-network/6tunnel/spec b/app-network/6tunnel/spec
similarity index 100%
rename from extra-network/6tunnel/spec
rename to app-network/6tunnel/spec
diff --git a/extra-network/ahcpd/autobuild/build b/app-network/ahcpd/autobuild/build
similarity index 100%
rename from extra-network/ahcpd/autobuild/build
rename to app-network/ahcpd/autobuild/build
diff --git a/extra-network/ahcpd/autobuild/defines b/app-network/ahcpd/autobuild/defines
similarity index 100%
rename from extra-network/ahcpd/autobuild/defines
rename to app-network/ahcpd/autobuild/defines
diff --git a/extra-network/ahcpd/spec b/app-network/ahcpd/spec
similarity index 100%
rename from extra-network/ahcpd/spec
rename to app-network/ahcpd/spec
diff --git a/extra-network/aircrack-ng/autobuild/defines b/app-network/aircrack-ng/autobuild/defines
similarity index 100%
rename from extra-network/aircrack-ng/autobuild/defines
rename to app-network/aircrack-ng/autobuild/defines
diff --git a/extra-network/aircrack-ng/autobuild/patches/0001-Hack-disable-altivec.patch.powerpc b/app-network/aircrack-ng/autobuild/patches/0001-Hack-disable-altivec.patch.powerpc
similarity index 100%
rename from extra-network/aircrack-ng/autobuild/patches/0001-Hack-disable-altivec.patch.powerpc
rename to app-network/aircrack-ng/autobuild/patches/0001-Hack-disable-altivec.patch.powerpc
diff --git a/extra-network/aircrack-ng/autobuild/prepare b/app-network/aircrack-ng/autobuild/prepare
similarity index 100%
rename from extra-network/aircrack-ng/autobuild/prepare
rename to app-network/aircrack-ng/autobuild/prepare
diff --git a/extra-network/aircrack-ng/spec b/app-network/aircrack-ng/spec
similarity index 100%
rename from extra-network/aircrack-ng/spec
rename to app-network/aircrack-ng/spec
diff --git a/extra-network/alpine/autobuild/build b/app-network/alpine/autobuild/build
similarity index 100%
rename from extra-network/alpine/autobuild/build
rename to app-network/alpine/autobuild/build
diff --git a/extra-network/alpine/autobuild/defines b/app-network/alpine/autobuild/defines
similarity index 100%
rename from extra-network/alpine/autobuild/defines
rename to app-network/alpine/autobuild/defines
diff --git a/extra-network/alpine/spec b/app-network/alpine/spec
similarity index 100%
rename from extra-network/alpine/spec
rename to app-network/alpine/spec
diff --git a/extra-network/arp-scan/autobuild/defines b/app-network/arp-scan/autobuild/defines
similarity index 100%
rename from extra-network/arp-scan/autobuild/defines
rename to app-network/arp-scan/autobuild/defines
diff --git a/extra-network/arp-scan/spec b/app-network/arp-scan/spec
similarity index 100%
rename from extra-network/arp-scan/spec
rename to app-network/arp-scan/spec
diff --git a/extra-network/arping/autobuild/beyond b/app-network/arping/autobuild/beyond
similarity index 100%
rename from extra-network/arping/autobuild/beyond
rename to app-network/arping/autobuild/beyond
diff --git a/extra-network/arping/autobuild/defines b/app-network/arping/autobuild/defines
similarity index 100%
rename from extra-network/arping/autobuild/defines
rename to app-network/arping/autobuild/defines
diff --git a/extra-network/arping/spec b/app-network/arping/spec
similarity index 100%
rename from extra-network/arping/spec
rename to app-network/arping/spec
diff --git a/extra-network/arptables/autobuild/build b/app-network/arptables/autobuild/build
similarity index 100%
rename from extra-network/arptables/autobuild/build
rename to app-network/arptables/autobuild/build
diff --git a/extra-network/arptables/autobuild/defines b/app-network/arptables/autobuild/defines
similarity index 100%
rename from extra-network/arptables/autobuild/defines
rename to app-network/arptables/autobuild/defines
diff --git a/extra-network/arptables/autobuild/overrides/usr/lib/systemd/scripts/arptables b/app-network/arptables/autobuild/overrides/usr/lib/systemd/scripts/arptables
similarity index 100%
rename from extra-network/arptables/autobuild/overrides/usr/lib/systemd/scripts/arptables
rename to app-network/arptables/autobuild/overrides/usr/lib/systemd/scripts/arptables
diff --git a/extra-network/arptables/autobuild/overrides/usr/lib/systemd/system/arptables.service b/app-network/arptables/autobuild/overrides/usr/lib/systemd/system/arptables.service
similarity index 100%
rename from extra-network/arptables/autobuild/overrides/usr/lib/systemd/system/arptables.service
rename to app-network/arptables/autobuild/overrides/usr/lib/systemd/system/arptables.service
diff --git a/extra-network/arptables/spec b/app-network/arptables/spec
similarity index 100%
rename from extra-network/arptables/spec
rename to app-network/arptables/spec
diff --git a/extra-network/arpwatch/autobuild/build b/app-network/arpwatch/autobuild/build
similarity index 100%
rename from extra-network/arpwatch/autobuild/build
rename to app-network/arpwatch/autobuild/build
diff --git a/extra-network/arpwatch/autobuild/defines b/app-network/arpwatch/autobuild/defines
similarity index 100%
rename from extra-network/arpwatch/autobuild/defines
rename to app-network/arpwatch/autobuild/defines
diff --git a/extra-network/arpwatch/autobuild/ethercodes.dat b/app-network/arpwatch/autobuild/ethercodes.dat
similarity index 100%
rename from extra-network/arpwatch/autobuild/ethercodes.dat
rename to app-network/arpwatch/autobuild/ethercodes.dat
diff --git a/extra-network/arpwatch/autobuild/overrides/usr/lib/systemd/system/arpwatch@.service b/app-network/arpwatch/autobuild/overrides/usr/lib/systemd/system/arpwatch@.service
similarity index 100%
rename from extra-network/arpwatch/autobuild/overrides/usr/lib/systemd/system/arpwatch@.service
rename to app-network/arpwatch/autobuild/overrides/usr/lib/systemd/system/arpwatch@.service
diff --git a/extra-network/arpwatch/autobuild/patch b/app-network/arpwatch/autobuild/patch
similarity index 100%
rename from extra-network/arpwatch/autobuild/patch
rename to app-network/arpwatch/autobuild/patch
diff --git a/extra-network/arpwatch/autobuild/prepare b/app-network/arpwatch/autobuild/prepare
similarity index 100%
rename from extra-network/arpwatch/autobuild/prepare
rename to app-network/arpwatch/autobuild/prepare
diff --git a/extra-network/arpwatch/spec b/app-network/arpwatch/spec
similarity index 100%
rename from extra-network/arpwatch/spec
rename to app-network/arpwatch/spec
diff --git a/extra-network/atinout/autobuild/build b/app-network/atinout/autobuild/build
similarity index 100%
rename from extra-network/atinout/autobuild/build
rename to app-network/atinout/autobuild/build
diff --git a/extra-network/atinout/autobuild/defines b/app-network/atinout/autobuild/defines
similarity index 100%
rename from extra-network/atinout/autobuild/defines
rename to app-network/atinout/autobuild/defines
diff --git a/extra-network/atinout/autobuild/prepare b/app-network/atinout/autobuild/prepare
similarity index 100%
rename from extra-network/atinout/autobuild/prepare
rename to app-network/atinout/autobuild/prepare
diff --git a/extra-network/atinout/spec b/app-network/atinout/spec
similarity index 100%
rename from extra-network/atinout/spec
rename to app-network/atinout/spec
diff --git a/extra-network/autossh/autobuild/beyond b/app-network/autossh/autobuild/beyond
similarity index 100%
rename from extra-network/autossh/autobuild/beyond
rename to app-network/autossh/autobuild/beyond
diff --git a/extra-network/autossh/autobuild/defines b/app-network/autossh/autobuild/defines
similarity index 100%
rename from extra-network/autossh/autobuild/defines
rename to app-network/autossh/autobuild/defines
diff --git a/extra-network/autossh/spec b/app-network/autossh/spec
similarity index 100%
rename from extra-network/autossh/spec
rename to app-network/autossh/spec
diff --git a/extra-network/avahi/autobuild/beyond b/app-network/avahi/autobuild/beyond
similarity index 100%
rename from extra-network/avahi/autobuild/beyond
rename to app-network/avahi/autobuild/beyond
diff --git a/extra-network/avahi/autobuild/conffiles b/app-network/avahi/autobuild/conffiles
similarity index 100%
rename from extra-network/avahi/autobuild/conffiles
rename to app-network/avahi/autobuild/conffiles
diff --git a/extra-network/avahi/autobuild/defines b/app-network/avahi/autobuild/defines
similarity index 100%
rename from extra-network/avahi/autobuild/defines
rename to app-network/avahi/autobuild/defines
diff --git a/extra-network/avahi/autobuild/patches/0001-build-Include-build-db-in-tarball-releases.patch b/app-network/avahi/autobuild/patches/0001-build-Include-build-db-in-tarball-releases.patch
similarity index 100%
rename from extra-network/avahi/autobuild/patches/0001-build-Include-build-db-in-tarball-releases.patch
rename to app-network/avahi/autobuild/patches/0001-build-Include-build-db-in-tarball-releases.patch
diff --git a/extra-network/avahi/autobuild/patches/0006-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch b/app-network/avahi/autobuild/patches/0006-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch
similarity index 100%
rename from extra-network/avahi/autobuild/patches/0006-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch
rename to app-network/avahi/autobuild/patches/0006-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch
diff --git a/extra-network/avahi/autobuild/patches/0007-man-add-missing-bshell.1-symlink.patch b/app-network/avahi/autobuild/patches/0007-man-add-missing-bshell.1-symlink.patch
similarity index 100%
rename from extra-network/avahi/autobuild/patches/0007-man-add-missing-bshell.1-symlink.patch
rename to app-network/avahi/autobuild/patches/0007-man-add-missing-bshell.1-symlink.patch
diff --git a/extra-network/avahi/autobuild/patches/0008-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patch b/app-network/avahi/autobuild/patches/0008-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patch
similarity index 100%
rename from extra-network/avahi/autobuild/patches/0008-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patch
rename to app-network/avahi/autobuild/patches/0008-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patch
diff --git a/extra-network/avahi/autobuild/patches/0009-fix-requires-in-pc-file.patch b/app-network/avahi/autobuild/patches/0009-fix-requires-in-pc-file.patch
similarity index 100%
rename from extra-network/avahi/autobuild/patches/0009-fix-requires-in-pc-file.patch
rename to app-network/avahi/autobuild/patches/0009-fix-requires-in-pc-file.patch
diff --git a/extra-network/avahi/autobuild/patches/0010-fix-bytestring-decoding-for-proper-display.patch b/app-network/avahi/autobuild/patches/0010-fix-bytestring-decoding-for-proper-display.patch
similarity index 100%
rename from extra-network/avahi/autobuild/patches/0010-fix-bytestring-decoding-for-proper-display.patch
rename to app-network/avahi/autobuild/patches/0010-fix-bytestring-decoding-for-proper-display.patch
diff --git a/extra-network/avahi/autobuild/patches/0011-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch b/app-network/avahi/autobuild/patches/0011-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch
similarity index 100%
rename from extra-network/avahi/autobuild/patches/0011-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch
rename to app-network/avahi/autobuild/patches/0011-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch
diff --git a/extra-network/avahi/autobuild/prepare b/app-network/avahi/autobuild/prepare
similarity index 100%
rename from extra-network/avahi/autobuild/prepare
rename to app-network/avahi/autobuild/prepare
diff --git a/extra-network/avahi/autobuild/usergroup b/app-network/avahi/autobuild/usergroup
similarity index 100%
rename from extra-network/avahi/autobuild/usergroup
rename to app-network/avahi/autobuild/usergroup
diff --git a/extra-network/avahi/spec b/app-network/avahi/spec
similarity index 100%
rename from extra-network/avahi/spec
rename to app-network/avahi/spec
diff --git a/extra-network/babeld/autobuild/build b/app-network/babeld/autobuild/build
similarity index 100%
rename from extra-network/babeld/autobuild/build
rename to app-network/babeld/autobuild/build
diff --git a/extra-network/babeld/autobuild/conffiles b/app-network/babeld/autobuild/conffiles
similarity index 100%
rename from extra-network/babeld/autobuild/conffiles
rename to app-network/babeld/autobuild/conffiles
diff --git a/extra-network/babeld/autobuild/defines b/app-network/babeld/autobuild/defines
similarity index 100%
rename from extra-network/babeld/autobuild/defines
rename to app-network/babeld/autobuild/defines
diff --git a/extra-network/babeld/autobuild/overrides/etc/babeld.conf b/app-network/babeld/autobuild/overrides/etc/babeld.conf
similarity index 100%
rename from extra-network/babeld/autobuild/overrides/etc/babeld.conf
rename to app-network/babeld/autobuild/overrides/etc/babeld.conf
diff --git a/extra-network/babeld/autobuild/overrides/usr/lib/systemd/system/babeld.service b/app-network/babeld/autobuild/overrides/usr/lib/systemd/system/babeld.service
similarity index 100%
rename from extra-network/babeld/autobuild/overrides/usr/lib/systemd/system/babeld.service
rename to app-network/babeld/autobuild/overrides/usr/lib/systemd/system/babeld.service
diff --git a/extra-network/babeld/spec b/app-network/babeld/spec
similarity index 100%
rename from extra-network/babeld/spec
rename to app-network/babeld/spec
diff --git a/extra-network/badvpn/autobuild/beyond b/app-network/badvpn/autobuild/beyond
similarity index 100%
rename from extra-network/badvpn/autobuild/beyond
rename to app-network/badvpn/autobuild/beyond
diff --git a/extra-network/badvpn/autobuild/defines b/app-network/badvpn/autobuild/defines
similarity index 100%
rename from extra-network/badvpn/autobuild/defines
rename to app-network/badvpn/autobuild/defines
diff --git a/extra-network/badvpn/autobuild/overrides/etc/conf.d/badvpn-ncd b/app-network/badvpn/autobuild/overrides/etc/conf.d/badvpn-ncd
similarity index 100%
rename from extra-network/badvpn/autobuild/overrides/etc/conf.d/badvpn-ncd
rename to app-network/badvpn/autobuild/overrides/etc/conf.d/badvpn-ncd
diff --git a/extra-network/badvpn/autobuild/overrides/usr/lib/systemd/system/badvpn-ncd.service b/app-network/badvpn/autobuild/overrides/usr/lib/systemd/system/badvpn-ncd.service
similarity index 100%
rename from extra-network/badvpn/autobuild/overrides/usr/lib/systemd/system/badvpn-ncd.service
rename to app-network/badvpn/autobuild/overrides/usr/lib/systemd/system/badvpn-ncd.service
diff --git a/extra-network/badvpn/spec b/app-network/badvpn/spec
similarity index 100%
rename from extra-network/badvpn/spec
rename to app-network/badvpn/spec
diff --git a/extra-network/bind/autobuild/127.0.0.zone b/app-network/bind/autobuild/127.0.0.zone
similarity index 100%
rename from extra-network/bind/autobuild/127.0.0.zone
rename to app-network/bind/autobuild/127.0.0.zone
diff --git a/extra-network/bind/autobuild/beyond b/app-network/bind/autobuild/beyond
similarity index 100%
rename from extra-network/bind/autobuild/beyond
rename to app-network/bind/autobuild/beyond
diff --git a/extra-network/bind/autobuild/conffiles b/app-network/bind/autobuild/conffiles
similarity index 100%
rename from extra-network/bind/autobuild/conffiles
rename to app-network/bind/autobuild/conffiles
diff --git a/extra-network/bind/autobuild/defines b/app-network/bind/autobuild/defines
similarity index 100%
rename from extra-network/bind/autobuild/defines
rename to app-network/bind/autobuild/defines
diff --git a/extra-network/bind/autobuild/empty.zone b/app-network/bind/autobuild/empty.zone
similarity index 100%
rename from extra-network/bind/autobuild/empty.zone
rename to app-network/bind/autobuild/empty.zone
diff --git a/extra-network/bind/autobuild/localhost.ip6.zone b/app-network/bind/autobuild/localhost.ip6.zone
similarity index 100%
rename from extra-network/bind/autobuild/localhost.ip6.zone
rename to app-network/bind/autobuild/localhost.ip6.zone
diff --git a/extra-network/bind/autobuild/localhost.zone b/app-network/bind/autobuild/localhost.zone
similarity index 100%
rename from extra-network/bind/autobuild/localhost.zone
rename to app-network/bind/autobuild/localhost.zone
diff --git a/extra-network/bind/autobuild/named.conf b/app-network/bind/autobuild/named.conf
similarity index 100%
rename from extra-network/bind/autobuild/named.conf
rename to app-network/bind/autobuild/named.conf
diff --git a/extra-network/bind/autobuild/overrides/usr/lib/systemd/system/bind.service b/app-network/bind/autobuild/overrides/usr/lib/systemd/system/bind.service
similarity index 100%
rename from extra-network/bind/autobuild/overrides/usr/lib/systemd/system/bind.service
rename to app-network/bind/autobuild/overrides/usr/lib/systemd/system/bind.service
diff --git a/extra-network/bind/autobuild/overrides/usr/lib/sysusers.d/bind.conf b/app-network/bind/autobuild/overrides/usr/lib/sysusers.d/bind.conf
similarity index 100%
rename from extra-network/bind/autobuild/overrides/usr/lib/sysusers.d/bind.conf
rename to app-network/bind/autobuild/overrides/usr/lib/sysusers.d/bind.conf
diff --git a/extra-network/bind/autobuild/overrides/usr/lib/tmpfiles.d/bind.conf b/app-network/bind/autobuild/overrides/usr/lib/tmpfiles.d/bind.conf
similarity index 100%
rename from extra-network/bind/autobuild/overrides/usr/lib/tmpfiles.d/bind.conf
rename to app-network/bind/autobuild/overrides/usr/lib/tmpfiles.d/bind.conf
diff --git a/extra-network/bind/autobuild/postinst b/app-network/bind/autobuild/postinst
similarity index 100%
rename from extra-network/bind/autobuild/postinst
rename to app-network/bind/autobuild/postinst
diff --git a/extra-network/bind/autobuild/prepare b/app-network/bind/autobuild/prepare
similarity index 100%
rename from extra-network/bind/autobuild/prepare
rename to app-network/bind/autobuild/prepare
diff --git a/extra-network/bind/spec b/app-network/bind/spec
similarity index 100%
rename from extra-network/bind/spec
rename to app-network/bind/spec
diff --git a/extra-network/bird/autobuild/beyond b/app-network/bird/autobuild/beyond
similarity index 100%
rename from extra-network/bird/autobuild/beyond
rename to app-network/bird/autobuild/beyond
diff --git a/extra-network/bird/autobuild/conffiles b/app-network/bird/autobuild/conffiles
similarity index 100%
rename from extra-network/bird/autobuild/conffiles
rename to app-network/bird/autobuild/conffiles
diff --git a/extra-network/bird/autobuild/defines b/app-network/bird/autobuild/defines
similarity index 100%
rename from extra-network/bird/autobuild/defines
rename to app-network/bird/autobuild/defines
diff --git a/extra-network/bird/autobuild/overrides/usr/lib/systemd/system/bird.service b/app-network/bird/autobuild/overrides/usr/lib/systemd/system/bird.service
similarity index 100%
rename from extra-network/bird/autobuild/overrides/usr/lib/systemd/system/bird.service
rename to app-network/bird/autobuild/overrides/usr/lib/systemd/system/bird.service
diff --git a/extra-network/bird/spec b/app-network/bird/spec
similarity index 100%
rename from extra-network/bird/spec
rename to app-network/bird/spec
diff --git a/extra-network/bmon/autobuild/defines b/app-network/bmon/autobuild/defines
similarity index 100%
rename from extra-network/bmon/autobuild/defines
rename to app-network/bmon/autobuild/defines
diff --git a/extra-network/bmon/autobuild/prepare b/app-network/bmon/autobuild/prepare
similarity index 100%
rename from extra-network/bmon/autobuild/prepare
rename to app-network/bmon/autobuild/prepare
diff --git a/extra-network/bmon/spec b/app-network/bmon/spec
similarity index 100%
rename from extra-network/bmon/spec
rename to app-network/bmon/spec
diff --git a/extra-network/bogofilter/autobuild/beyond b/app-network/bogofilter/autobuild/beyond
similarity index 100%
rename from extra-network/bogofilter/autobuild/beyond
rename to app-network/bogofilter/autobuild/beyond
diff --git a/extra-network/bogofilter/autobuild/defines b/app-network/bogofilter/autobuild/defines
similarity index 100%
rename from extra-network/bogofilter/autobuild/defines
rename to app-network/bogofilter/autobuild/defines
diff --git a/extra-network/bogofilter/spec b/app-network/bogofilter/spec
similarity index 100%
rename from extra-network/bogofilter/spec
rename to app-network/bogofilter/spec
diff --git a/extra-network/bridge-utils/autobuild/defines b/app-network/bridge-utils/autobuild/defines
similarity index 100%
rename from extra-network/bridge-utils/autobuild/defines
rename to app-network/bridge-utils/autobuild/defines
diff --git a/extra-network/bridge-utils/spec b/app-network/bridge-utils/spec
similarity index 100%
rename from extra-network/bridge-utils/spec
rename to app-network/bridge-utils/spec
diff --git a/extra-network/bwm-ng/autobuild/defines b/app-network/bwm-ng/autobuild/defines
similarity index 100%
rename from extra-network/bwm-ng/autobuild/defines
rename to app-network/bwm-ng/autobuild/defines
diff --git a/extra-network/bwm-ng/spec b/app-network/bwm-ng/spec
similarity index 100%
rename from extra-network/bwm-ng/spec
rename to app-network/bwm-ng/spec
diff --git a/extra-network/cbm/autobuild/defines b/app-network/cbm/autobuild/defines
similarity index 100%
rename from extra-network/cbm/autobuild/defines
rename to app-network/cbm/autobuild/defines
diff --git a/extra-network/cbm/spec b/app-network/cbm/spec
similarity index 100%
rename from extra-network/cbm/spec
rename to app-network/cbm/spec
diff --git a/extra-network/certbot-apache/autobuild/defines b/app-network/certbot-apache/autobuild/defines
similarity index 100%
rename from extra-network/certbot-apache/autobuild/defines
rename to app-network/certbot-apache/autobuild/defines
diff --git a/extra-network/certbot-apache/autobuild/prepare b/app-network/certbot-apache/autobuild/prepare
similarity index 100%
rename from extra-network/certbot-apache/autobuild/prepare
rename to app-network/certbot-apache/autobuild/prepare
diff --git a/extra-network/certbot-apache/spec b/app-network/certbot-apache/spec
similarity index 100%
rename from extra-network/certbot-apache/spec
rename to app-network/certbot-apache/spec
diff --git a/extra-network/certbot-dns-cloudflare/autobuild/defines b/app-network/certbot-dns-cloudflare/autobuild/defines
similarity index 100%
rename from extra-network/certbot-dns-cloudflare/autobuild/defines
rename to app-network/certbot-dns-cloudflare/autobuild/defines
diff --git a/extra-network/certbot-dns-cloudflare/autobuild/prepare b/app-network/certbot-dns-cloudflare/autobuild/prepare
similarity index 100%
rename from extra-network/certbot-dns-cloudflare/autobuild/prepare
rename to app-network/certbot-dns-cloudflare/autobuild/prepare
diff --git a/extra-network/certbot-dns-cloudflare/spec b/app-network/certbot-dns-cloudflare/spec
similarity index 100%
rename from extra-network/certbot-dns-cloudflare/spec
rename to app-network/certbot-dns-cloudflare/spec
diff --git a/extra-network/certbot-nginx/autobuild/defines b/app-network/certbot-nginx/autobuild/defines
similarity index 100%
rename from extra-network/certbot-nginx/autobuild/defines
rename to app-network/certbot-nginx/autobuild/defines
diff --git a/extra-network/certbot-nginx/autobuild/prepare b/app-network/certbot-nginx/autobuild/prepare
similarity index 100%
rename from extra-network/certbot-nginx/autobuild/prepare
rename to app-network/certbot-nginx/autobuild/prepare
diff --git a/extra-network/certbot-nginx/spec b/app-network/certbot-nginx/spec
similarity index 100%
rename from extra-network/certbot-nginx/spec
rename to app-network/certbot-nginx/spec
diff --git a/extra-network/certbot/autobuild/defines b/app-network/certbot/autobuild/defines
similarity index 100%
rename from extra-network/certbot/autobuild/defines
rename to app-network/certbot/autobuild/defines
diff --git a/extra-network/certbot/autobuild/prepare b/app-network/certbot/autobuild/prepare
similarity index 100%
rename from extra-network/certbot/autobuild/prepare
rename to app-network/certbot/autobuild/prepare
diff --git a/extra-network/certbot/spec b/app-network/certbot/spec
similarity index 100%
rename from extra-network/certbot/spec
rename to app-network/certbot/spec
diff --git a/extra-network/chinadns-ng/autobuild/build b/app-network/chinadns-ng/autobuild/build
similarity index 100%
rename from extra-network/chinadns-ng/autobuild/build
rename to app-network/chinadns-ng/autobuild/build
diff --git a/extra-network/chinadns-ng/autobuild/defines b/app-network/chinadns-ng/autobuild/defines
similarity index 100%
rename from extra-network/chinadns-ng/autobuild/defines
rename to app-network/chinadns-ng/autobuild/defines
diff --git a/extra-network/chinadns-ng/spec b/app-network/chinadns-ng/spec
similarity index 100%
rename from extra-network/chinadns-ng/spec
rename to app-network/chinadns-ng/spec
diff --git a/extra-network/cifs-utils/autobuild/beyond b/app-network/cifs-utils/autobuild/beyond
similarity index 100%
rename from extra-network/cifs-utils/autobuild/beyond
rename to app-network/cifs-utils/autobuild/beyond
diff --git a/extra-network/cifs-utils/autobuild/conffiles b/app-network/cifs-utils/autobuild/conffiles
similarity index 100%
rename from extra-network/cifs-utils/autobuild/conffiles
rename to app-network/cifs-utils/autobuild/conffiles
diff --git a/extra-network/cifs-utils/autobuild/defines b/app-network/cifs-utils/autobuild/defines
similarity index 100%
rename from extra-network/cifs-utils/autobuild/defines
rename to app-network/cifs-utils/autobuild/defines
diff --git a/extra-network/cifs-utils/spec b/app-network/cifs-utils/spec
similarity index 100%
rename from extra-network/cifs-utils/spec
rename to app-network/cifs-utils/spec
diff --git a/extra-network/clash/autobuild/build b/app-network/clash/autobuild/build
similarity index 100%
rename from extra-network/clash/autobuild/build
rename to app-network/clash/autobuild/build
diff --git a/extra-network/clash/autobuild/defines b/app-network/clash/autobuild/defines
similarity index 100%
rename from extra-network/clash/autobuild/defines
rename to app-network/clash/autobuild/defines
diff --git a/extra-network/clash/autobuild/overrides/usr/lib/systemd/system/clash@.service b/app-network/clash/autobuild/overrides/usr/lib/systemd/system/clash@.service
similarity index 100%
rename from extra-network/clash/autobuild/overrides/usr/lib/systemd/system/clash@.service
rename to app-network/clash/autobuild/overrides/usr/lib/systemd/system/clash@.service
diff --git a/extra-network/clash/autobuild/overrides/usr/lib/systemd/user/clash.service b/app-network/clash/autobuild/overrides/usr/lib/systemd/user/clash.service
similarity index 100%
rename from extra-network/clash/autobuild/overrides/usr/lib/systemd/user/clash.service
rename to app-network/clash/autobuild/overrides/usr/lib/systemd/user/clash.service
diff --git a/extra-network/clash/spec b/app-network/clash/spec
similarity index 100%
rename from extra-network/clash/spec
rename to app-network/clash/spec
diff --git a/extra-network/cmst/autobuild/beyond b/app-network/cmst/autobuild/beyond
similarity index 100%
rename from extra-network/cmst/autobuild/beyond
rename to app-network/cmst/autobuild/beyond
diff --git a/extra-network/cmst/autobuild/defines b/app-network/cmst/autobuild/defines
similarity index 100%
rename from extra-network/cmst/autobuild/defines
rename to app-network/cmst/autobuild/defines
diff --git a/extra-network/cmst/spec b/app-network/cmst/spec
similarity index 100%
rename from extra-network/cmst/spec
rename to app-network/cmst/spec
diff --git a/extra-network/connman-gtk/autobuild/defines b/app-network/connman-gtk/autobuild/defines
similarity index 100%
rename from extra-network/connman-gtk/autobuild/defines
rename to app-network/connman-gtk/autobuild/defines
diff --git a/extra-network/connman-gtk/spec b/app-network/connman-gtk/spec
similarity index 100%
rename from extra-network/connman-gtk/spec
rename to app-network/connman-gtk/spec
diff --git a/extra-network/connman-json-client/autobuild/beyond b/app-network/connman-json-client/autobuild/beyond
similarity index 100%
rename from extra-network/connman-json-client/autobuild/beyond
rename to app-network/connman-json-client/autobuild/beyond
diff --git a/extra-network/connman-json-client/autobuild/defines b/app-network/connman-json-client/autobuild/defines
similarity index 100%
rename from extra-network/connman-json-client/autobuild/defines
rename to app-network/connman-json-client/autobuild/defines
diff --git a/extra-network/connman-json-client/autobuild/prepare b/app-network/connman-json-client/autobuild/prepare
similarity index 100%
rename from extra-network/connman-json-client/autobuild/prepare
rename to app-network/connman-json-client/autobuild/prepare
diff --git a/extra-network/connman-json-client/spec b/app-network/connman-json-client/spec
similarity index 100%
rename from extra-network/connman-json-client/spec
rename to app-network/connman-json-client/spec
diff --git a/extra-network/connman/autobuild/beyond b/app-network/connman/autobuild/beyond
similarity index 100%
rename from extra-network/connman/autobuild/beyond
rename to app-network/connman/autobuild/beyond
diff --git a/extra-network/connman/autobuild/defines b/app-network/connman/autobuild/defines
similarity index 100%
rename from extra-network/connman/autobuild/defines
rename to app-network/connman/autobuild/defines
diff --git a/extra-network/connman/autobuild/patches/0001-Hack-to-comply-with-systemd-run-dir-standard.patch b/app-network/connman/autobuild/patches/0001-Hack-to-comply-with-systemd-run-dir-standard.patch
similarity index 100%
rename from extra-network/connman/autobuild/patches/0001-Hack-to-comply-with-systemd-run-dir-standard.patch
rename to app-network/connman/autobuild/patches/0001-Hack-to-comply-with-systemd-run-dir-standard.patch
diff --git a/extra-network/connman/spec b/app-network/connman/spec
similarity index 100%
rename from extra-network/connman/spec
rename to app-network/connman/spec
diff --git a/extra-network/corkscrew/autobuild/defines b/app-network/corkscrew/autobuild/defines
similarity index 100%
rename from extra-network/corkscrew/autobuild/defines
rename to app-network/corkscrew/autobuild/defines
diff --git a/extra-network/corkscrew/spec b/app-network/corkscrew/spec
similarity index 100%
rename from extra-network/corkscrew/spec
rename to app-network/corkscrew/spec
diff --git a/extra-network/cowpatty/autobuild/build b/app-network/cowpatty/autobuild/build
similarity index 100%
rename from extra-network/cowpatty/autobuild/build
rename to app-network/cowpatty/autobuild/build
diff --git a/extra-network/cowpatty/autobuild/defines b/app-network/cowpatty/autobuild/defines
similarity index 100%
rename from extra-network/cowpatty/autobuild/defines
rename to app-network/cowpatty/autobuild/defines
diff --git a/extra-network/cowpatty/autobuild/patches/cowpatty-4.6-fixup16.patch b/app-network/cowpatty/autobuild/patches/cowpatty-4.6-fixup16.patch
similarity index 100%
rename from extra-network/cowpatty/autobuild/patches/cowpatty-4.6-fixup16.patch
rename to app-network/cowpatty/autobuild/patches/cowpatty-4.6-fixup16.patch
diff --git a/extra-network/cowpatty/spec b/app-network/cowpatty/spec
similarity index 100%
rename from extra-network/cowpatty/spec
rename to app-network/cowpatty/spec
diff --git a/extra-network/cpyrit-opencl/autobuild/defines b/app-network/cpyrit-opencl/autobuild/defines
similarity index 100%
rename from extra-network/cpyrit-opencl/autobuild/defines
rename to app-network/cpyrit-opencl/autobuild/defines
diff --git a/extra-network/cpyrit-opencl/spec b/app-network/cpyrit-opencl/spec
similarity index 100%
rename from extra-network/cpyrit-opencl/spec
rename to app-network/cpyrit-opencl/spec
diff --git a/extra-network/crda/autobuild/beyond b/app-network/crda/autobuild/beyond
similarity index 100%
rename from extra-network/crda/autobuild/beyond
rename to app-network/crda/autobuild/beyond
diff --git a/extra-network/crda/autobuild/defines b/app-network/crda/autobuild/defines
similarity index 100%
rename from extra-network/crda/autobuild/defines
rename to app-network/crda/autobuild/defines
diff --git a/extra-network/crda/autobuild/overrides/usr/bin/set-wireless-regdom b/app-network/crda/autobuild/overrides/usr/bin/set-wireless-regdom
similarity index 100%
rename from extra-network/crda/autobuild/overrides/usr/bin/set-wireless-regdom
rename to app-network/crda/autobuild/overrides/usr/bin/set-wireless-regdom
diff --git a/extra-network/crda/autobuild/patches/do-not-run-ldconfig.patch b/app-network/crda/autobuild/patches/do-not-run-ldconfig.patch
similarity index 100%
rename from extra-network/crda/autobuild/patches/do-not-run-ldconfig.patch
rename to app-network/crda/autobuild/patches/do-not-run-ldconfig.patch
diff --git a/extra-network/crda/autobuild/patches/link-against-crypto.patch b/app-network/crda/autobuild/patches/link-against-crypto.patch
similarity index 100%
rename from extra-network/crda/autobuild/patches/link-against-crypto.patch
rename to app-network/crda/autobuild/patches/link-against-crypto.patch
diff --git a/extra-network/crda/autobuild/prepare b/app-network/crda/autobuild/prepare
similarity index 100%
rename from extra-network/crda/autobuild/prepare
rename to app-network/crda/autobuild/prepare
diff --git a/extra-network/crda/spec b/app-network/crda/spec
similarity index 100%
rename from extra-network/crda/spec
rename to app-network/crda/spec
diff --git a/extra-network/cymruwhois/autobuild/defines b/app-network/cymruwhois/autobuild/defines
similarity index 100%
rename from extra-network/cymruwhois/autobuild/defines
rename to app-network/cymruwhois/autobuild/defines
diff --git a/extra-network/cymruwhois/spec b/app-network/cymruwhois/spec
similarity index 100%
rename from extra-network/cymruwhois/spec
rename to app-network/cymruwhois/spec
diff --git a/extra-network/dante/autobuild/beyond b/app-network/dante/autobuild/beyond
similarity index 100%
rename from extra-network/dante/autobuild/beyond
rename to app-network/dante/autobuild/beyond
diff --git a/extra-network/dante/autobuild/conffiles b/app-network/dante/autobuild/conffiles
similarity index 100%
rename from extra-network/dante/autobuild/conffiles
rename to app-network/dante/autobuild/conffiles
diff --git a/extra-network/dante/autobuild/defines b/app-network/dante/autobuild/defines
similarity index 100%
rename from extra-network/dante/autobuild/defines
rename to app-network/dante/autobuild/defines
diff --git a/extra-network/dante/autobuild/overrides/usr/lib/systemd/system/sockd.service b/app-network/dante/autobuild/overrides/usr/lib/systemd/system/sockd.service
similarity index 100%
rename from extra-network/dante/autobuild/overrides/usr/lib/systemd/system/sockd.service
rename to app-network/dante/autobuild/overrides/usr/lib/systemd/system/sockd.service
diff --git a/extra-network/dante/autobuild/overrides/usr/lib/tmpfiles.d/sockd.conf b/app-network/dante/autobuild/overrides/usr/lib/tmpfiles.d/sockd.conf
similarity index 100%
rename from extra-network/dante/autobuild/overrides/usr/lib/tmpfiles.d/sockd.conf
rename to app-network/dante/autobuild/overrides/usr/lib/tmpfiles.d/sockd.conf
diff --git a/extra-network/dante/autobuild/patches/sendbuf-ioctl.patch b/app-network/dante/autobuild/patches/sendbuf-ioctl.patch
similarity index 100%
rename from extra-network/dante/autobuild/patches/sendbuf-ioctl.patch
rename to app-network/dante/autobuild/patches/sendbuf-ioctl.patch
diff --git a/extra-network/dante/autobuild/patches/typos.patch b/app-network/dante/autobuild/patches/typos.patch
similarity index 100%
rename from extra-network/dante/autobuild/patches/typos.patch
rename to app-network/dante/autobuild/patches/typos.patch
diff --git a/extra-network/dante/autobuild/postinst b/app-network/dante/autobuild/postinst
similarity index 100%
rename from extra-network/dante/autobuild/postinst
rename to app-network/dante/autobuild/postinst
diff --git a/extra-network/dante/spec b/app-network/dante/spec
similarity index 100%
rename from extra-network/dante/spec
rename to app-network/dante/spec
diff --git a/extra-network/dhcp/autobuild/beyond b/app-network/dhcp/autobuild/beyond
similarity index 100%
rename from extra-network/dhcp/autobuild/beyond
rename to app-network/dhcp/autobuild/beyond
diff --git a/extra-network/dhcp/autobuild/conffiles b/app-network/dhcp/autobuild/conffiles
similarity index 100%
rename from extra-network/dhcp/autobuild/conffiles
rename to app-network/dhcp/autobuild/conffiles
diff --git a/extra-network/dhcp/autobuild/defines b/app-network/dhcp/autobuild/defines
similarity index 100%
rename from extra-network/dhcp/autobuild/defines
rename to app-network/dhcp/autobuild/defines
diff --git a/extra-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhclient@.service b/app-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhclient@.service
similarity index 100%
rename from extra-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhclient@.service
rename to app-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhclient@.service
diff --git a/extra-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv4.service b/app-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv4.service
similarity index 100%
rename from extra-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv4.service
rename to app-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv4.service
diff --git a/extra-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv6.service b/app-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv6.service
similarity index 100%
rename from extra-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv6.service
rename to app-network/dhcp/autobuild/overrides/usr/lib/systemd/system/dhcpd-ipv6.service
diff --git a/extra-network/dhcp/autobuild/patches/0002-iproute2.patch b/app-network/dhcp/autobuild/patches/0002-iproute2.patch
similarity index 100%
rename from extra-network/dhcp/autobuild/patches/0002-iproute2.patch
rename to app-network/dhcp/autobuild/patches/0002-iproute2.patch
diff --git a/extra-network/dhcp/autobuild/patches/0003-dhcp-add-config-replacement-to-bundled-bind.patch b/app-network/dhcp/autobuild/patches/0003-dhcp-add-config-replacement-to-bundled-bind.patch
similarity index 100%
rename from extra-network/dhcp/autobuild/patches/0003-dhcp-add-config-replacement-to-bundled-bind.patch
rename to app-network/dhcp/autobuild/patches/0003-dhcp-add-config-replacement-to-bundled-bind.patch
diff --git a/extra-network/dhcp/autobuild/postinst b/app-network/dhcp/autobuild/postinst
similarity index 100%
rename from extra-network/dhcp/autobuild/postinst
rename to app-network/dhcp/autobuild/postinst
diff --git a/extra-network/dhcp/autobuild/prepare b/app-network/dhcp/autobuild/prepare
similarity index 100%
rename from extra-network/dhcp/autobuild/prepare
rename to app-network/dhcp/autobuild/prepare
diff --git a/extra-network/dhcp/spec b/app-network/dhcp/spec
similarity index 100%
rename from extra-network/dhcp/spec
rename to app-network/dhcp/spec
diff --git a/extra-network/dhcpcd/autobuild/build b/app-network/dhcpcd/autobuild/build
similarity index 100%
rename from extra-network/dhcpcd/autobuild/build
rename to app-network/dhcpcd/autobuild/build
diff --git a/extra-network/dhcpcd/autobuild/defines b/app-network/dhcpcd/autobuild/defines
similarity index 100%
rename from extra-network/dhcpcd/autobuild/defines
rename to app-network/dhcpcd/autobuild/defines
diff --git a/extra-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd.service b/app-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd.service
similarity index 100%
rename from extra-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd.service
rename to app-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd.service
diff --git a/extra-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd@.service b/app-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd@.service
similarity index 100%
rename from extra-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd@.service
rename to app-network/dhcpcd/autobuild/overrides/usr/lib/systemd/system/dhcpcd@.service
diff --git a/extra-network/dhcpcd/spec b/app-network/dhcpcd/spec
similarity index 100%
rename from extra-network/dhcpcd/spec
rename to app-network/dhcpcd/spec
diff --git a/extra-network/ding-libs/autobuild/defines b/app-network/ding-libs/autobuild/defines
similarity index 100%
rename from extra-network/ding-libs/autobuild/defines
rename to app-network/ding-libs/autobuild/defines
diff --git a/extra-network/ding-libs/spec b/app-network/ding-libs/spec
similarity index 100%
rename from extra-network/ding-libs/spec
rename to app-network/ding-libs/spec
diff --git a/extra-network/dleyna-connector-dbus/autobuild/defines b/app-network/dleyna-connector-dbus/autobuild/defines
similarity index 100%
rename from extra-network/dleyna-connector-dbus/autobuild/defines
rename to app-network/dleyna-connector-dbus/autobuild/defines
diff --git a/extra-network/dleyna-connector-dbus/spec b/app-network/dleyna-connector-dbus/spec
similarity index 100%
rename from extra-network/dleyna-connector-dbus/spec
rename to app-network/dleyna-connector-dbus/spec
diff --git a/extra-network/dleyna-core/autobuild/defines b/app-network/dleyna-core/autobuild/defines
similarity index 100%
rename from extra-network/dleyna-core/autobuild/defines
rename to app-network/dleyna-core/autobuild/defines
diff --git a/extra-network/dleyna-core/autobuild/patches/0001-Port-to-gupnp-1.2.patch b/app-network/dleyna-core/autobuild/patches/0001-Port-to-gupnp-1.2.patch
similarity index 100%
rename from extra-network/dleyna-core/autobuild/patches/0001-Port-to-gupnp-1.2.patch
rename to app-network/dleyna-core/autobuild/patches/0001-Port-to-gupnp-1.2.patch
diff --git a/extra-network/dleyna-core/spec b/app-network/dleyna-core/spec
similarity index 100%
rename from extra-network/dleyna-core/spec
rename to app-network/dleyna-core/spec
diff --git a/extra-network/dleyna-renderer/autobuild/defines b/app-network/dleyna-renderer/autobuild/defines
similarity index 100%
rename from extra-network/dleyna-renderer/autobuild/defines
rename to app-network/dleyna-renderer/autobuild/defines
diff --git a/extra-network/dleyna-renderer/autobuild/patches/gupnp-1.2.diff b/app-network/dleyna-renderer/autobuild/patches/gupnp-1.2.diff
similarity index 100%
rename from extra-network/dleyna-renderer/autobuild/patches/gupnp-1.2.diff
rename to app-network/dleyna-renderer/autobuild/patches/gupnp-1.2.diff
diff --git a/extra-network/dleyna-renderer/spec b/app-network/dleyna-renderer/spec
similarity index 100%
rename from extra-network/dleyna-renderer/spec
rename to app-network/dleyna-renderer/spec
diff --git a/extra-network/dleyna-server/autobuild/defines b/app-network/dleyna-server/autobuild/defines
similarity index 100%
rename from extra-network/dleyna-server/autobuild/defines
rename to app-network/dleyna-server/autobuild/defines
diff --git a/extra-network/dleyna-server/autobuild/patches/0001-Port-to-gupnp-1.2.patch b/app-network/dleyna-server/autobuild/patches/0001-Port-to-gupnp-1.2.patch
similarity index 100%
rename from extra-network/dleyna-server/autobuild/patches/0001-Port-to-gupnp-1.2.patch
rename to app-network/dleyna-server/autobuild/patches/0001-Port-to-gupnp-1.2.patch
diff --git a/extra-network/dleyna-server/spec b/app-network/dleyna-server/spec
similarity index 100%
rename from extra-network/dleyna-server/spec
rename to app-network/dleyna-server/spec
diff --git a/extra-network/dnscrypt/autobuild/build b/app-network/dnscrypt/autobuild/build
similarity index 100%
rename from extra-network/dnscrypt/autobuild/build
rename to app-network/dnscrypt/autobuild/build
diff --git a/extra-network/dnscrypt/autobuild/conffiles b/app-network/dnscrypt/autobuild/conffiles
similarity index 100%
rename from extra-network/dnscrypt/autobuild/conffiles
rename to app-network/dnscrypt/autobuild/conffiles
diff --git a/extra-network/dnscrypt/autobuild/defines b/app-network/dnscrypt/autobuild/defines
similarity index 100%
rename from extra-network/dnscrypt/autobuild/defines
rename to app-network/dnscrypt/autobuild/defines
diff --git a/extra-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.service b/app-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.service
similarity index 100%
rename from extra-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.service
rename to app-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.service
diff --git a/extra-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.socket b/app-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.socket
similarity index 100%
rename from extra-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.socket
rename to app-network/dnscrypt/autobuild/overrides/usr/lib/systemd/system/dnscrypt.socket
diff --git a/extra-network/dnscrypt/autobuild/patches/configuration.diff b/app-network/dnscrypt/autobuild/patches/configuration.diff
similarity index 100%
rename from extra-network/dnscrypt/autobuild/patches/configuration.diff
rename to app-network/dnscrypt/autobuild/patches/configuration.diff
diff --git a/extra-network/dnscrypt/autobuild/prepare b/app-network/dnscrypt/autobuild/prepare
similarity index 100%
rename from extra-network/dnscrypt/autobuild/prepare
rename to app-network/dnscrypt/autobuild/prepare
diff --git a/extra-network/dnscrypt/spec b/app-network/dnscrypt/spec
similarity index 100%
rename from extra-network/dnscrypt/spec
rename to app-network/dnscrypt/spec
diff --git a/extra-network/dnsdiag/autobuild/defines b/app-network/dnsdiag/autobuild/defines
similarity index 100%
rename from extra-network/dnsdiag/autobuild/defines
rename to app-network/dnsdiag/autobuild/defines
diff --git a/extra-network/dnsdiag/spec b/app-network/dnsdiag/spec
similarity index 100%
rename from extra-network/dnsdiag/spec
rename to app-network/dnsdiag/spec
diff --git a/extra-network/dnsmasq/autobuild/build b/app-network/dnsmasq/autobuild/build
similarity index 100%
rename from extra-network/dnsmasq/autobuild/build
rename to app-network/dnsmasq/autobuild/build
diff --git a/extra-network/dnsmasq/autobuild/conffiles b/app-network/dnsmasq/autobuild/conffiles
similarity index 100%
rename from extra-network/dnsmasq/autobuild/conffiles
rename to app-network/dnsmasq/autobuild/conffiles
diff --git a/extra-network/dnsmasq/autobuild/defines b/app-network/dnsmasq/autobuild/defines
similarity index 100%
rename from extra-network/dnsmasq/autobuild/defines
rename to app-network/dnsmasq/autobuild/defines
diff --git a/extra-network/dnsmasq/autobuild/overrides/usr/lib/systemd/system/dnsmasq.service b/app-network/dnsmasq/autobuild/overrides/usr/lib/systemd/system/dnsmasq.service
similarity index 100%
rename from extra-network/dnsmasq/autobuild/overrides/usr/lib/systemd/system/dnsmasq.service
rename to app-network/dnsmasq/autobuild/overrides/usr/lib/systemd/system/dnsmasq.service
diff --git a/extra-network/dnsmasq/autobuild/patches/0001-dnsmasq-2.80-SIOCGSTAMP.patch b/app-network/dnsmasq/autobuild/patches/0001-dnsmasq-2.80-SIOCGSTAMP.patch
similarity index 100%
rename from extra-network/dnsmasq/autobuild/patches/0001-dnsmasq-2.80-SIOCGSTAMP.patch
rename to app-network/dnsmasq/autobuild/patches/0001-dnsmasq-2.80-SIOCGSTAMP.patch
diff --git a/extra-network/dnsmasq/autobuild/usergroup b/app-network/dnsmasq/autobuild/usergroup
similarity index 100%
rename from extra-network/dnsmasq/autobuild/usergroup
rename to app-network/dnsmasq/autobuild/usergroup
diff --git a/extra-network/dnsmasq/spec b/app-network/dnsmasq/spec
similarity index 100%
rename from extra-network/dnsmasq/spec
rename to app-network/dnsmasq/spec
diff --git a/extra-network/dovecot/autobuild/beyond b/app-network/dovecot/autobuild/beyond
similarity index 100%
rename from extra-network/dovecot/autobuild/beyond
rename to app-network/dovecot/autobuild/beyond
diff --git a/extra-network/dovecot/autobuild/defines b/app-network/dovecot/autobuild/defines
similarity index 100%
rename from extra-network/dovecot/autobuild/defines
rename to app-network/dovecot/autobuild/defines
diff --git a/extra-network/dovecot/autobuild/overrides/usr/lib/tmpfiles.d/dovecot.conf b/app-network/dovecot/autobuild/overrides/usr/lib/tmpfiles.d/dovecot.conf
similarity index 100%
rename from extra-network/dovecot/autobuild/overrides/usr/lib/tmpfiles.d/dovecot.conf
rename to app-network/dovecot/autobuild/overrides/usr/lib/tmpfiles.d/dovecot.conf
diff --git a/extra-network/dovecot/autobuild/postinst b/app-network/dovecot/autobuild/postinst
similarity index 100%
rename from extra-network/dovecot/autobuild/postinst
rename to app-network/dovecot/autobuild/postinst
diff --git a/extra-network/dovecot/autobuild/prepare b/app-network/dovecot/autobuild/prepare
similarity index 100%
rename from extra-network/dovecot/autobuild/prepare
rename to app-network/dovecot/autobuild/prepare
diff --git a/extra-network/dovecot/spec b/app-network/dovecot/spec
similarity index 100%
rename from extra-network/dovecot/spec
rename to app-network/dovecot/spec
diff --git a/extra-network/dropbear/autobuild/beyond b/app-network/dropbear/autobuild/beyond
similarity index 100%
rename from extra-network/dropbear/autobuild/beyond
rename to app-network/dropbear/autobuild/beyond
diff --git a/extra-network/dropbear/autobuild/defines b/app-network/dropbear/autobuild/defines
similarity index 100%
rename from extra-network/dropbear/autobuild/defines
rename to app-network/dropbear/autobuild/defines
diff --git a/extra-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear-keygen.service b/app-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear-keygen.service
similarity index 100%
rename from extra-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear-keygen.service
rename to app-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear-keygen.service
diff --git a/extra-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear.service b/app-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear.service
similarity index 100%
rename from extra-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear.service
rename to app-network/dropbear/autobuild/overrides/usr/lib/systemd/system/dropbear.service
diff --git a/extra-network/dropbear/spec b/app-network/dropbear/spec
similarity index 100%
rename from extra-network/dropbear/spec
rename to app-network/dropbear/spec
diff --git a/extra-network/dstat/autobuild/build b/app-network/dstat/autobuild/build
similarity index 100%
rename from extra-network/dstat/autobuild/build
rename to app-network/dstat/autobuild/build
diff --git a/extra-network/dstat/autobuild/defines b/app-network/dstat/autobuild/defines
similarity index 100%
rename from extra-network/dstat/autobuild/defines
rename to app-network/dstat/autobuild/defines
diff --git a/extra-network/dstat/spec b/app-network/dstat/spec
similarity index 100%
rename from extra-network/dstat/spec
rename to app-network/dstat/spec
diff --git a/extra-network/ebtables/autobuild/beyond b/app-network/ebtables/autobuild/beyond
similarity index 100%
rename from extra-network/ebtables/autobuild/beyond
rename to app-network/ebtables/autobuild/beyond
diff --git a/extra-network/ebtables/autobuild/conffiles b/app-network/ebtables/autobuild/conffiles
similarity index 100%
rename from extra-network/ebtables/autobuild/conffiles
rename to app-network/ebtables/autobuild/conffiles
diff --git a/extra-network/ebtables/autobuild/defines b/app-network/ebtables/autobuild/defines
similarity index 100%
rename from extra-network/ebtables/autobuild/defines
rename to app-network/ebtables/autobuild/defines
diff --git a/extra-network/ebtables/autobuild/overrides/usr/lib/systemd/scripts/ebtables b/app-network/ebtables/autobuild/overrides/usr/lib/systemd/scripts/ebtables
similarity index 100%
rename from extra-network/ebtables/autobuild/overrides/usr/lib/systemd/scripts/ebtables
rename to app-network/ebtables/autobuild/overrides/usr/lib/systemd/scripts/ebtables
diff --git a/extra-network/ebtables/autobuild/overrides/usr/lib/systemd/system/ebtables.service b/app-network/ebtables/autobuild/overrides/usr/lib/systemd/system/ebtables.service
similarity index 100%
rename from extra-network/ebtables/autobuild/overrides/usr/lib/systemd/system/ebtables.service
rename to app-network/ebtables/autobuild/overrides/usr/lib/systemd/system/ebtables.service
diff --git a/extra-network/ebtables/spec b/app-network/ebtables/spec
similarity index 100%
rename from extra-network/ebtables/spec
rename to app-network/ebtables/spec
diff --git a/extra-network/ethtool/autobuild/defines b/app-network/ethtool/autobuild/defines
similarity index 100%
rename from extra-network/ethtool/autobuild/defines
rename to app-network/ethtool/autobuild/defines
diff --git a/extra-network/ethtool/spec b/app-network/ethtool/spec
similarity index 100%
rename from extra-network/ethtool/spec
rename to app-network/ethtool/spec
diff --git a/extra-network/ettercap/autobuild/defines b/app-network/ettercap/autobuild/defines
similarity index 100%
rename from extra-network/ettercap/autobuild/defines
rename to app-network/ettercap/autobuild/defines
diff --git a/extra-network/ettercap/spec b/app-network/ettercap/spec
similarity index 100%
rename from extra-network/ettercap/spec
rename to app-network/ettercap/spec
diff --git a/extra-network/exim/autobuild/Makefile b/app-network/exim/autobuild/Makefile
similarity index 100%
rename from extra-network/exim/autobuild/Makefile
rename to app-network/exim/autobuild/Makefile
diff --git a/extra-network/exim/autobuild/alternatives b/app-network/exim/autobuild/alternatives
similarity index 100%
rename from extra-network/exim/autobuild/alternatives
rename to app-network/exim/autobuild/alternatives
diff --git a/extra-network/exim/autobuild/beyond b/app-network/exim/autobuild/beyond
similarity index 100%
rename from extra-network/exim/autobuild/beyond
rename to app-network/exim/autobuild/beyond
diff --git a/extra-network/exim/autobuild/build b/app-network/exim/autobuild/build
similarity index 100%
rename from extra-network/exim/autobuild/build
rename to app-network/exim/autobuild/build
diff --git a/extra-network/exim/autobuild/conffiles b/app-network/exim/autobuild/conffiles
similarity index 100%
rename from extra-network/exim/autobuild/conffiles
rename to app-network/exim/autobuild/conffiles
diff --git a/extra-network/exim/autobuild/defines b/app-network/exim/autobuild/defines
similarity index 100%
rename from extra-network/exim/autobuild/defines
rename to app-network/exim/autobuild/defines
diff --git a/extra-network/exim/autobuild/overrides/etc/logrotate.d/exim b/app-network/exim/autobuild/overrides/etc/logrotate.d/exim
similarity index 100%
rename from extra-network/exim/autobuild/overrides/etc/logrotate.d/exim
rename to app-network/exim/autobuild/overrides/etc/logrotate.d/exim
diff --git a/extra-network/exim/autobuild/overrides/etc/mail/aliases b/app-network/exim/autobuild/overrides/etc/mail/aliases
similarity index 100%
rename from extra-network/exim/autobuild/overrides/etc/mail/aliases
rename to app-network/exim/autobuild/overrides/etc/mail/aliases
diff --git a/extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission.socket b/app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission.socket
similarity index 100%
rename from extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission.socket
rename to app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission.socket
diff --git a/extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission@.service b/app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission@.service
similarity index 100%
rename from extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission@.service
rename to app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim-submission@.service
diff --git a/extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.service b/app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.service
similarity index 100%
rename from extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.service
rename to app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.service
diff --git a/extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.socket b/app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.socket
similarity index 100%
rename from extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.socket
rename to app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim.socket
diff --git a/extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim@.service b/app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim@.service
similarity index 100%
rename from extra-network/exim/autobuild/overrides/usr/lib/systemd/system/exim@.service
rename to app-network/exim/autobuild/overrides/usr/lib/systemd/system/exim@.service
diff --git a/extra-network/exim/autobuild/patches/31_eximmanpage.dpatch b/app-network/exim/autobuild/patches/31_eximmanpage.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/31_eximmanpage.dpatch
rename to app-network/exim/autobuild/patches/31_eximmanpage.dpatch
diff --git a/extra-network/exim/autobuild/patches/32_exim4.dpatch b/app-network/exim/autobuild/patches/32_exim4.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/32_exim4.dpatch
rename to app-network/exim/autobuild/patches/32_exim4.dpatch
diff --git a/extra-network/exim/autobuild/patches/33_eximon.binary.dpatch b/app-network/exim/autobuild/patches/33_eximon.binary.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/33_eximon.binary.dpatch
rename to app-network/exim/autobuild/patches/33_eximon.binary.dpatch
diff --git a/extra-network/exim/autobuild/patches/34_eximstatsmanpage.dpatch b/app-network/exim/autobuild/patches/34_eximstatsmanpage.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/34_eximstatsmanpage.dpatch
rename to app-network/exim/autobuild/patches/34_eximstatsmanpage.dpatch
diff --git a/extra-network/exim/autobuild/patches/35_install.dpatch b/app-network/exim/autobuild/patches/35_install.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/35_install.dpatch
rename to app-network/exim/autobuild/patches/35_install.dpatch
diff --git a/extra-network/exim/autobuild/patches/60_convert4r4.dpatch b/app-network/exim/autobuild/patches/60_convert4r4.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/60_convert4r4.dpatch
rename to app-network/exim/autobuild/patches/60_convert4r4.dpatch
diff --git a/extra-network/exim/autobuild/patches/67_unnecessaryCopt.diff b/app-network/exim/autobuild/patches/67_unnecessaryCopt.diff
similarity index 100%
rename from extra-network/exim/autobuild/patches/67_unnecessaryCopt.diff
rename to app-network/exim/autobuild/patches/67_unnecessaryCopt.diff
diff --git a/extra-network/exim/autobuild/patches/70_remove_exim-users_references.dpatch b/app-network/exim/autobuild/patches/70_remove_exim-users_references.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/70_remove_exim-users_references.dpatch
rename to app-network/exim/autobuild/patches/70_remove_exim-users_references.dpatch
diff --git a/extra-network/exim/autobuild/patches/75_01-Fix-json-extract-operator-for-unfound-case.patch b/app-network/exim/autobuild/patches/75_01-Fix-json-extract-operator-for-unfound-case.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_01-Fix-json-extract-operator-for-unfound-case.patch
rename to app-network/exim/autobuild/patches/75_01-Fix-json-extract-operator-for-unfound-case.patch
diff --git a/extra-network/exim/autobuild/patches/75_03-Fix-transport-buffer-size-handling.patch b/app-network/exim/autobuild/patches/75_03-Fix-transport-buffer-size-handling.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_03-Fix-transport-buffer-size-handling.patch
rename to app-network/exim/autobuild/patches/75_03-Fix-transport-buffer-size-handling.patch
diff --git a/extra-network/exim/autobuild/patches/75_05-Fix-info-on-using-local_scan-in-the-default-Makefile.patch b/app-network/exim/autobuild/patches/75_05-Fix-info-on-using-local_scan-in-the-default-Makefile.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_05-Fix-info-on-using-local_scan-in-the-default-Makefile.patch
rename to app-network/exim/autobuild/patches/75_05-Fix-info-on-using-local_scan-in-the-default-Makefile.patch
diff --git a/extra-network/exim/autobuild/patches/75_07-GnuTLS-Fix-client-detection-of-server-reject-of-clie.patch b/app-network/exim/autobuild/patches/75_07-GnuTLS-Fix-client-detection-of-server-reject-of-clie.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_07-GnuTLS-Fix-client-detection-of-server-reject-of-clie.patch
rename to app-network/exim/autobuild/patches/75_07-GnuTLS-Fix-client-detection-of-server-reject-of-clie.patch
diff --git a/extra-network/exim/autobuild/patches/75_08-Fix-expansions-for-RFC-822-addresses-having-comments.patch b/app-network/exim/autobuild/patches/75_08-Fix-expansions-for-RFC-822-addresses-having-comments.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_08-Fix-expansions-for-RFC-822-addresses-having-comments.patch
rename to app-network/exim/autobuild/patches/75_08-Fix-expansions-for-RFC-822-addresses-having-comments.patch
diff --git a/extra-network/exim/autobuild/patches/75_09-Docs-Add-note-on-lsearch-for-IPv4-mapped-IPv6-addres.patch b/app-network/exim/autobuild/patches/75_09-Docs-Add-note-on-lsearch-for-IPv4-mapped-IPv6-addres.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_09-Docs-Add-note-on-lsearch-for-IPv4-mapped-IPv6-addres.patch
rename to app-network/exim/autobuild/patches/75_09-Docs-Add-note-on-lsearch-for-IPv4-mapped-IPv6-addres.patch
diff --git a/extra-network/exim/autobuild/patches/75_10-Fix-crash-from-SRV-lookup-hitting-a-CNAME.patch b/app-network/exim/autobuild/patches/75_10-Fix-crash-from-SRV-lookup-hitting-a-CNAME.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_10-Fix-crash-from-SRV-lookup-hitting-a-CNAME.patch
rename to app-network/exim/autobuild/patches/75_10-Fix-crash-from-SRV-lookup-hitting-a-CNAME.patch
diff --git a/extra-network/exim/autobuild/patches/75_11-Logging-fix-initial-listening-on-log-line.patch b/app-network/exim/autobuild/patches/75_11-Logging-fix-initial-listening-on-log-line.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_11-Logging-fix-initial-listening-on-log-line.patch
rename to app-network/exim/autobuild/patches/75_11-Logging-fix-initial-listening-on-log-line.patch
diff --git a/extra-network/exim/autobuild/patches/75_12-OpenSSL-Fix-aggregation-of-messages.patch b/app-network/exim/autobuild/patches/75_12-OpenSSL-Fix-aggregation-of-messages.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_12-OpenSSL-Fix-aggregation-of-messages.patch
rename to app-network/exim/autobuild/patches/75_12-OpenSSL-Fix-aggregation-of-messages.patch
diff --git a/extra-network/exim/autobuild/patches/75_13-Harden-plaintext-authenticator.patch b/app-network/exim/autobuild/patches/75_13-Harden-plaintext-authenticator.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_13-Harden-plaintext-authenticator.patch
rename to app-network/exim/autobuild/patches/75_13-Harden-plaintext-authenticator.patch
diff --git a/extra-network/exim/autobuild/patches/75_14-Fix-bP-smtp_receive_timeout-.-Bug-2384.patch b/app-network/exim/autobuild/patches/75_14-Fix-bP-smtp_receive_timeout-.-Bug-2384.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_14-Fix-bP-smtp_receive_timeout-.-Bug-2384.patch
rename to app-network/exim/autobuild/patches/75_14-Fix-bP-smtp_receive_timeout-.-Bug-2384.patch
diff --git a/extra-network/exim/autobuild/patches/75_15-Fix-build-with-recent-LibreSSL-when-including-DANE.-.patch b/app-network/exim/autobuild/patches/75_15-Fix-build-with-recent-LibreSSL-when-including-DANE.-.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_15-Fix-build-with-recent-LibreSSL-when-including-DANE.-.patch
rename to app-network/exim/autobuild/patches/75_15-Fix-build-with-recent-LibreSSL-when-including-DANE.-.patch
diff --git a/extra-network/exim/autobuild/patches/75_16-SPF-better-buld-compatibility-with-OpenBSD.patch b/app-network/exim/autobuild/patches/75_16-SPF-better-buld-compatibility-with-OpenBSD.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_16-SPF-better-buld-compatibility-with-OpenBSD.patch
rename to app-network/exim/autobuild/patches/75_16-SPF-better-buld-compatibility-with-OpenBSD.patch
diff --git a/extra-network/exim/autobuild/patches/75_19-GnuTLS-3.6.7-cipher-strings.patch b/app-network/exim/autobuild/patches/75_19-GnuTLS-3.6.7-cipher-strings.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_19-GnuTLS-3.6.7-cipher-strings.patch
rename to app-network/exim/autobuild/patches/75_19-GnuTLS-3.6.7-cipher-strings.patch
diff --git a/extra-network/exim/autobuild/patches/75_22-GnuTLS-fix-tls_out_ocsp-under-hosts_request_ocsp.patch b/app-network/exim/autobuild/patches/75_22-GnuTLS-fix-tls_out_ocsp-under-hosts_request_ocsp.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_22-GnuTLS-fix-tls_out_ocsp-under-hosts_request_ocsp.patch
rename to app-network/exim/autobuild/patches/75_22-GnuTLS-fix-tls_out_ocsp-under-hosts_request_ocsp.patch
diff --git a/extra-network/exim/autobuild/patches/75_23-Fix-listing-a-named-queue-by-a-non-admin-user.-Bug-2.patch b/app-network/exim/autobuild/patches/75_23-Fix-listing-a-named-queue-by-a-non-admin-user.-Bug-2.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_23-Fix-listing-a-named-queue-by-a-non-admin-user.-Bug-2.patch
rename to app-network/exim/autobuild/patches/75_23-Fix-listing-a-named-queue-by-a-non-admin-user.-Bug-2.patch
diff --git a/extra-network/exim/autobuild/patches/75_24-GnuTLS-fix-the-advertising-of-acceptable-certs-by-th.patch b/app-network/exim/autobuild/patches/75_24-GnuTLS-fix-the-advertising-of-acceptable-certs-by-th.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_24-GnuTLS-fix-the-advertising-of-acceptable-certs-by-th.patch
rename to app-network/exim/autobuild/patches/75_24-GnuTLS-fix-the-advertising-of-acceptable-certs-by-th.patch
diff --git a/extra-network/exim/autobuild/patches/75_25-Use-dsn_from-for-success-DSN-messages.-Bug-2404.patch b/app-network/exim/autobuild/patches/75_25-Use-dsn_from-for-success-DSN-messages.-Bug-2404.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_25-Use-dsn_from-for-success-DSN-messages.-Bug-2404.patch
rename to app-network/exim/autobuild/patches/75_25-Use-dsn_from-for-success-DSN-messages.-Bug-2404.patch
diff --git a/extra-network/exim/autobuild/patches/75_26-Fix-detection-of-32b-platform-at-build-time.-Bug-240.patch b/app-network/exim/autobuild/patches/75_26-Fix-detection-of-32b-platform-at-build-time.-Bug-240.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_26-Fix-detection-of-32b-platform-at-build-time.-Bug-240.patch
rename to app-network/exim/autobuild/patches/75_26-Fix-detection-of-32b-platform-at-build-time.-Bug-240.patch
diff --git a/extra-network/exim/autobuild/patches/75_27-Unbreak-heimdal_gssapi-auth-driver.patch b/app-network/exim/autobuild/patches/75_27-Unbreak-heimdal_gssapi-auth-driver.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_27-Unbreak-heimdal_gssapi-auth-driver.patch
rename to app-network/exim/autobuild/patches/75_27-Unbreak-heimdal_gssapi-auth-driver.patch
diff --git a/extra-network/exim/autobuild/patches/75_28-Fix-DSN-Final-Recipient-field.patch b/app-network/exim/autobuild/patches/75_28-Fix-DSN-Final-Recipient-field.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_28-Fix-DSN-Final-Recipient-field.patch
rename to app-network/exim/autobuild/patches/75_28-Fix-DSN-Final-Recipient-field.patch
diff --git a/extra-network/exim/autobuild/patches/75_29-Fix-bounce-generation-under-RFC-3461-request.-Bug-24.patch b/app-network/exim/autobuild/patches/75_29-Fix-bounce-generation-under-RFC-3461-request.-Bug-24.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/75_29-Fix-bounce-generation-under-RFC-3461-request.-Bug-24.patch
rename to app-network/exim/autobuild/patches/75_29-Fix-bounce-generation-under-RFC-3461-request.-Bug-24.patch
diff --git a/extra-network/exim/autobuild/patches/76_01-Fix-smtp-response-timeout.patch b/app-network/exim/autobuild/patches/76_01-Fix-smtp-response-timeout.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/76_01-Fix-smtp-response-timeout.patch
rename to app-network/exim/autobuild/patches/76_01-Fix-smtp-response-timeout.patch
diff --git a/extra-network/exim/autobuild/patches/90_localscan_dlopen.dpatch b/app-network/exim/autobuild/patches/90_localscan_dlopen.dpatch
similarity index 100%
rename from extra-network/exim/autobuild/patches/90_localscan_dlopen.dpatch
rename to app-network/exim/autobuild/patches/90_localscan_dlopen.dpatch
diff --git a/extra-network/exim/autobuild/patches/CVE-2020-12783-1.patch b/app-network/exim/autobuild/patches/CVE-2020-12783-1.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/CVE-2020-12783-1.patch
rename to app-network/exim/autobuild/patches/CVE-2020-12783-1.patch
diff --git a/extra-network/exim/autobuild/patches/CVE-2020-12783-2.patch b/app-network/exim/autobuild/patches/CVE-2020-12783-2.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/CVE-2020-12783-2.patch
rename to app-network/exim/autobuild/patches/CVE-2020-12783-2.patch
diff --git a/extra-network/exim/autobuild/patches/fix_smtp_banner.patch b/app-network/exim/autobuild/patches/fix_smtp_banner.patch
similarity index 100%
rename from extra-network/exim/autobuild/patches/fix_smtp_banner.patch
rename to app-network/exim/autobuild/patches/fix_smtp_banner.patch
diff --git a/extra-network/exim/autobuild/patches/series b/app-network/exim/autobuild/patches/series
similarity index 100%
rename from extra-network/exim/autobuild/patches/series
rename to app-network/exim/autobuild/patches/series
diff --git a/extra-network/exim/autobuild/postinst b/app-network/exim/autobuild/postinst
similarity index 100%
rename from extra-network/exim/autobuild/postinst
rename to app-network/exim/autobuild/postinst
diff --git a/extra-network/exim/autobuild/prepare b/app-network/exim/autobuild/prepare
similarity index 100%
rename from extra-network/exim/autobuild/prepare
rename to app-network/exim/autobuild/prepare
diff --git a/extra-network/exim/spec b/app-network/exim/spec
similarity index 100%
rename from extra-network/exim/spec
rename to app-network/exim/spec
diff --git a/extra-network/farstream-0.1/autobuild/beyond b/app-network/farstream-0.1/autobuild/beyond
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/beyond
rename to app-network/farstream-0.1/autobuild/beyond
diff --git a/extra-network/farstream-0.1/autobuild/defines b/app-network/farstream-0.1/autobuild/defines
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/defines
rename to app-network/farstream-0.1/autobuild/defines
diff --git a/extra-network/farstream-0.1/autobuild/patch b/app-network/farstream-0.1/autobuild/patch
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/patch
rename to app-network/farstream-0.1/autobuild/patch
diff --git a/extra-network/farstream-0.1/autobuild/patches/discovery-intersect.patch b/app-network/farstream-0.1/autobuild/patches/discovery-intersect.patch
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/patches/discovery-intersect.patch
rename to app-network/farstream-0.1/autobuild/patches/discovery-intersect.patch
diff --git a/extra-network/farstream-0.1/autobuild/patches/fix-crash.patch b/app-network/farstream-0.1/autobuild/patches/fix-crash.patch
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/patches/fix-crash.patch
rename to app-network/farstream-0.1/autobuild/patches/fix-crash.patch
diff --git a/extra-network/farstream-0.1/autobuild/patches/intersect-not-merget.patch b/app-network/farstream-0.1/autobuild/patches/intersect-not-merget.patch
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/patches/intersect-not-merget.patch
rename to app-network/farstream-0.1/autobuild/patches/intersect-not-merget.patch
diff --git a/extra-network/farstream-0.1/autobuild/patches/prefer-vp8.patch b/app-network/farstream-0.1/autobuild/patches/prefer-vp8.patch
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/patches/prefer-vp8.patch
rename to app-network/farstream-0.1/autobuild/patches/prefer-vp8.patch
diff --git a/extra-network/farstream-0.1/autobuild/patches/rtp-memleak.patch b/app-network/farstream-0.1/autobuild/patches/rtp-memleak.patch
similarity index 100%
rename from extra-network/farstream-0.1/autobuild/patches/rtp-memleak.patch
rename to app-network/farstream-0.1/autobuild/patches/rtp-memleak.patch
diff --git a/extra-network/farstream-0.1/spec b/app-network/farstream-0.1/spec
similarity index 100%
rename from extra-network/farstream-0.1/spec
rename to app-network/farstream-0.1/spec
diff --git a/extra-network/farstream/autobuild/defines b/app-network/farstream/autobuild/defines
similarity index 100%
rename from extra-network/farstream/autobuild/defines
rename to app-network/farstream/autobuild/defines
diff --git a/extra-network/farstream/autobuild/patches/0001-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch b/app-network/farstream/autobuild/patches/0001-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch
similarity index 100%
rename from extra-network/farstream/autobuild/patches/0001-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch
rename to app-network/farstream/autobuild/patches/0001-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch
diff --git a/extra-network/farstream/spec b/app-network/farstream/spec
similarity index 100%
rename from extra-network/farstream/spec
rename to app-network/farstream/spec
diff --git a/extra-network/filezilla/autobuild/beyond b/app-network/filezilla/autobuild/beyond
similarity index 100%
rename from extra-network/filezilla/autobuild/beyond
rename to app-network/filezilla/autobuild/beyond
diff --git a/extra-network/filezilla/autobuild/defines b/app-network/filezilla/autobuild/defines
similarity index 100%
rename from extra-network/filezilla/autobuild/defines
rename to app-network/filezilla/autobuild/defines
diff --git a/extra-network/filezilla/autobuild/prepare b/app-network/filezilla/autobuild/prepare
similarity index 100%
rename from extra-network/filezilla/autobuild/prepare
rename to app-network/filezilla/autobuild/prepare
diff --git a/extra-network/filezilla/spec b/app-network/filezilla/spec
similarity index 100%
rename from extra-network/filezilla/spec
rename to app-network/filezilla/spec
diff --git a/extra-network/firehol/autobuild/beyond b/app-network/firehol/autobuild/beyond
similarity index 100%
rename from extra-network/firehol/autobuild/beyond
rename to app-network/firehol/autobuild/beyond
diff --git a/extra-network/firehol/autobuild/conffiles b/app-network/firehol/autobuild/conffiles
similarity index 100%
rename from extra-network/firehol/autobuild/conffiles
rename to app-network/firehol/autobuild/conffiles
diff --git a/extra-network/firehol/autobuild/defines b/app-network/firehol/autobuild/defines
similarity index 100%
rename from extra-network/firehol/autobuild/defines
rename to app-network/firehol/autobuild/defines
diff --git a/extra-network/firehol/autobuild/overrides/usr/lib/systemd/system/firehol.service b/app-network/firehol/autobuild/overrides/usr/lib/systemd/system/firehol.service
similarity index 100%
rename from extra-network/firehol/autobuild/overrides/usr/lib/systemd/system/firehol.service
rename to app-network/firehol/autobuild/overrides/usr/lib/systemd/system/firehol.service
diff --git a/extra-network/firehol/autobuild/overrides/usr/lib/systemd/system/fireqos.service b/app-network/firehol/autobuild/overrides/usr/lib/systemd/system/fireqos.service
similarity index 100%
rename from extra-network/firehol/autobuild/overrides/usr/lib/systemd/system/fireqos.service
rename to app-network/firehol/autobuild/overrides/usr/lib/systemd/system/fireqos.service
diff --git a/extra-network/firehol/spec b/app-network/firehol/spec
similarity index 100%
rename from extra-network/firehol/spec
rename to app-network/firehol/spec
diff --git a/extra-network/firewalld/autobuild/beyond b/app-network/firewalld/autobuild/beyond
similarity index 100%
rename from extra-network/firewalld/autobuild/beyond
rename to app-network/firewalld/autobuild/beyond
diff --git a/extra-network/firewalld/autobuild/conffiles b/app-network/firewalld/autobuild/conffiles
similarity index 100%
rename from extra-network/firewalld/autobuild/conffiles
rename to app-network/firewalld/autobuild/conffiles
diff --git a/extra-network/firewalld/autobuild/defines b/app-network/firewalld/autobuild/defines
similarity index 100%
rename from extra-network/firewalld/autobuild/defines
rename to app-network/firewalld/autobuild/defines
diff --git a/extra-network/firewalld/autobuild/overrides/usr/lib/systemd/system-preset/40-firewalld.preset b/app-network/firewalld/autobuild/overrides/usr/lib/systemd/system-preset/40-firewalld.preset
similarity index 100%
rename from extra-network/firewalld/autobuild/overrides/usr/lib/systemd/system-preset/40-firewalld.preset
rename to app-network/firewalld/autobuild/overrides/usr/lib/systemd/system-preset/40-firewalld.preset
diff --git a/extra-network/firewalld/autobuild/postinst b/app-network/firewalld/autobuild/postinst
similarity index 100%
rename from extra-network/firewalld/autobuild/postinst
rename to app-network/firewalld/autobuild/postinst
diff --git a/extra-network/firewalld/autobuild/prepare b/app-network/firewalld/autobuild/prepare
similarity index 100%
rename from extra-network/firewalld/autobuild/prepare
rename to app-network/firewalld/autobuild/prepare
diff --git a/extra-network/firewalld/spec b/app-network/firewalld/spec
similarity index 100%
rename from extra-network/firewalld/spec
rename to app-network/firewalld/spec
diff --git a/extra-network/flent/autobuild/defines b/app-network/flent/autobuild/defines
similarity index 100%
rename from extra-network/flent/autobuild/defines
rename to app-network/flent/autobuild/defines
diff --git a/extra-network/flent/spec b/app-network/flent/spec
similarity index 100%
rename from extra-network/flent/spec
rename to app-network/flent/spec
diff --git a/extra-network/fping/autobuild/beyond b/app-network/fping/autobuild/beyond
similarity index 100%
rename from extra-network/fping/autobuild/beyond
rename to app-network/fping/autobuild/beyond
diff --git a/extra-network/fping/autobuild/defines b/app-network/fping/autobuild/defines
similarity index 100%
rename from extra-network/fping/autobuild/defines
rename to app-network/fping/autobuild/defines
diff --git a/extra-network/fping/spec b/app-network/fping/spec
similarity index 100%
rename from extra-network/fping/spec
rename to app-network/fping/spec
diff --git a/extra-network/freeradius-client/autobuild/defines b/app-network/freeradius-client/autobuild/defines
similarity index 100%
rename from extra-network/freeradius-client/autobuild/defines
rename to app-network/freeradius-client/autobuild/defines
diff --git a/extra-network/freeradius-client/conffiles b/app-network/freeradius-client/conffiles
similarity index 100%
rename from extra-network/freeradius-client/conffiles
rename to app-network/freeradius-client/conffiles
diff --git a/extra-network/freeradius-client/spec b/app-network/freeradius-client/spec
similarity index 100%
rename from extra-network/freeradius-client/spec
rename to app-network/freeradius-client/spec
diff --git a/extra-network/freeradius/autobuild/beyond b/app-network/freeradius/autobuild/beyond
similarity index 100%
rename from extra-network/freeradius/autobuild/beyond
rename to app-network/freeradius/autobuild/beyond
diff --git a/extra-network/freeradius/autobuild/defines b/app-network/freeradius/autobuild/defines
similarity index 100%
rename from extra-network/freeradius/autobuild/defines
rename to app-network/freeradius/autobuild/defines
diff --git a/extra-network/freeradius/autobuild/overrides/usr/lib/systemd/system/freeradius.service b/app-network/freeradius/autobuild/overrides/usr/lib/systemd/system/freeradius.service
similarity index 100%
rename from extra-network/freeradius/autobuild/overrides/usr/lib/systemd/system/freeradius.service
rename to app-network/freeradius/autobuild/overrides/usr/lib/systemd/system/freeradius.service
diff --git a/extra-network/freeradius/autobuild/overrides/usr/lib/tmpfiles.d/freeradius.conf b/app-network/freeradius/autobuild/overrides/usr/lib/tmpfiles.d/freeradius.conf
similarity index 100%
rename from extra-network/freeradius/autobuild/overrides/usr/lib/tmpfiles.d/freeradius.conf
rename to app-network/freeradius/autobuild/overrides/usr/lib/tmpfiles.d/freeradius.conf
diff --git a/extra-network/freeradius/autobuild/postinst b/app-network/freeradius/autobuild/postinst
similarity index 100%
rename from extra-network/freeradius/autobuild/postinst
rename to app-network/freeradius/autobuild/postinst
diff --git a/extra-network/freeradius/autobuild/prepare b/app-network/freeradius/autobuild/prepare
similarity index 100%
rename from extra-network/freeradius/autobuild/prepare
rename to app-network/freeradius/autobuild/prepare
diff --git a/extra-network/freeradius/spec b/app-network/freeradius/spec
similarity index 100%
rename from extra-network/freeradius/spec
rename to app-network/freeradius/spec
diff --git a/extra-network/freerdp/autobuild/defines b/app-network/freerdp/autobuild/defines
similarity index 100%
rename from extra-network/freerdp/autobuild/defines
rename to app-network/freerdp/autobuild/defines
diff --git a/extra-network/freerdp/spec b/app-network/freerdp/spec
similarity index 100%
rename from extra-network/freerdp/spec
rename to app-network/freerdp/spec
diff --git a/extra-network/frp/autobuild/beyond b/app-network/frp/autobuild/beyond
similarity index 100%
rename from extra-network/frp/autobuild/beyond
rename to app-network/frp/autobuild/beyond
diff --git a/extra-network/frp/autobuild/build b/app-network/frp/autobuild/build
similarity index 100%
rename from extra-network/frp/autobuild/build
rename to app-network/frp/autobuild/build
diff --git a/extra-network/frp/autobuild/defines b/app-network/frp/autobuild/defines
similarity index 100%
rename from extra-network/frp/autobuild/defines
rename to app-network/frp/autobuild/defines
diff --git a/extra-network/frp/spec b/app-network/frp/spec
similarity index 100%
rename from extra-network/frp/spec
rename to app-network/frp/spec
diff --git a/extra-network/genpac/autobuild/defines b/app-network/genpac/autobuild/defines
similarity index 100%
rename from extra-network/genpac/autobuild/defines
rename to app-network/genpac/autobuild/defines
diff --git a/extra-network/genpac/spec b/app-network/genpac/spec
similarity index 100%
rename from extra-network/genpac/spec
rename to app-network/genpac/spec
diff --git a/extra-network/geoipupdate/autobuild/beyond b/app-network/geoipupdate/autobuild/beyond
similarity index 100%
rename from extra-network/geoipupdate/autobuild/beyond
rename to app-network/geoipupdate/autobuild/beyond
diff --git a/extra-network/geoipupdate/autobuild/build b/app-network/geoipupdate/autobuild/build
similarity index 100%
rename from extra-network/geoipupdate/autobuild/build
rename to app-network/geoipupdate/autobuild/build
diff --git a/extra-network/geoipupdate/autobuild/conffiles b/app-network/geoipupdate/autobuild/conffiles
similarity index 100%
rename from extra-network/geoipupdate/autobuild/conffiles
rename to app-network/geoipupdate/autobuild/conffiles
diff --git a/extra-network/geoipupdate/autobuild/defines b/app-network/geoipupdate/autobuild/defines
similarity index 100%
rename from extra-network/geoipupdate/autobuild/defines
rename to app-network/geoipupdate/autobuild/defines
diff --git a/extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.arm64 b/app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.arm64
similarity index 100%
rename from extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.arm64
rename to app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.arm64
diff --git a/extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.loongson3 b/app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.loongson3
similarity index 100%
rename from extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.loongson3
rename to app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.loongson3
diff --git a/extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.nonghc b/app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.nonghc
similarity index 100%
rename from extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.nonghc
rename to app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.nonghc
diff --git a/extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.ppc64el b/app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.ppc64el
similarity index 100%
rename from extra-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.ppc64el
rename to app-network/geoipupdate/autobuild/patches/0001-Disable-man-page-generation-on-non-ghc-arch.patch.ppc64el
diff --git a/extra-network/geoipupdate/autobuild/postinst b/app-network/geoipupdate/autobuild/postinst
similarity index 100%
rename from extra-network/geoipupdate/autobuild/postinst
rename to app-network/geoipupdate/autobuild/postinst
diff --git a/extra-network/geoipupdate/spec b/app-network/geoipupdate/spec
similarity index 100%
rename from extra-network/geoipupdate/spec
rename to app-network/geoipupdate/spec
diff --git a/extra-network/getdns/autobuild/defines b/app-network/getdns/autobuild/defines
similarity index 100%
rename from extra-network/getdns/autobuild/defines
rename to app-network/getdns/autobuild/defines
diff --git a/extra-network/getdns/spec b/app-network/getdns/spec
similarity index 100%
rename from extra-network/getdns/spec
rename to app-network/getdns/spec
diff --git a/extra-network/gost/autobuild/build b/app-network/gost/autobuild/build
similarity index 100%
rename from extra-network/gost/autobuild/build
rename to app-network/gost/autobuild/build
diff --git a/extra-network/gost/autobuild/defines b/app-network/gost/autobuild/defines
similarity index 100%
rename from extra-network/gost/autobuild/defines
rename to app-network/gost/autobuild/defines
diff --git a/extra-network/gost/spec b/app-network/gost/spec
similarity index 100%
rename from extra-network/gost/spec
rename to app-network/gost/spec
diff --git a/extra-network/graftcp/autobuild/build b/app-network/graftcp/autobuild/build
similarity index 100%
rename from extra-network/graftcp/autobuild/build
rename to app-network/graftcp/autobuild/build
diff --git a/extra-network/graftcp/autobuild/conffiles b/app-network/graftcp/autobuild/conffiles
similarity index 100%
rename from extra-network/graftcp/autobuild/conffiles
rename to app-network/graftcp/autobuild/conffiles
diff --git a/extra-network/graftcp/autobuild/defines b/app-network/graftcp/autobuild/defines
similarity index 100%
rename from extra-network/graftcp/autobuild/defines
rename to app-network/graftcp/autobuild/defines
diff --git a/extra-network/graftcp/autobuild/overrides/usr/lib/systemd/system/graftcp-local.service b/app-network/graftcp/autobuild/overrides/usr/lib/systemd/system/graftcp-local.service
similarity index 100%
rename from extra-network/graftcp/autobuild/overrides/usr/lib/systemd/system/graftcp-local.service
rename to app-network/graftcp/autobuild/overrides/usr/lib/systemd/system/graftcp-local.service
diff --git a/extra-network/graftcp/spec b/app-network/graftcp/spec
similarity index 100%
rename from extra-network/graftcp/spec
rename to app-network/graftcp/spec
diff --git a/extra-network/grpc/autobuild/defines b/app-network/grpc/autobuild/defines
similarity index 100%
rename from extra-network/grpc/autobuild/defines
rename to app-network/grpc/autobuild/defines
diff --git a/extra-network/grpc/autobuild/patches/0001-Hack-use-gnu++11.patch.ppc64el b/app-network/grpc/autobuild/patches/0001-Hack-use-gnu++11.patch.ppc64el
similarity index 100%
rename from extra-network/grpc/autobuild/patches/0001-Hack-use-gnu++11.patch.ppc64el
rename to app-network/grpc/autobuild/patches/0001-Hack-use-gnu++11.patch.ppc64el
diff --git a/extra-network/grpc/autobuild/prepare b/app-network/grpc/autobuild/prepare
similarity index 100%
rename from extra-network/grpc/autobuild/prepare
rename to app-network/grpc/autobuild/prepare
diff --git a/extra-network/grpc/spec b/app-network/grpc/spec
similarity index 100%
rename from extra-network/grpc/spec
rename to app-network/grpc/spec
diff --git a/extra-network/grsync/autobuild/defines b/app-network/grsync/autobuild/defines
similarity index 100%
rename from extra-network/grsync/autobuild/defines
rename to app-network/grsync/autobuild/defines
diff --git a/extra-network/grsync/spec b/app-network/grsync/spec
similarity index 100%
rename from extra-network/grsync/spec
rename to app-network/grsync/spec
diff --git a/extra-network/gssproxy/autobuild/beyond b/app-network/gssproxy/autobuild/beyond
similarity index 100%
rename from extra-network/gssproxy/autobuild/beyond
rename to app-network/gssproxy/autobuild/beyond
diff --git a/extra-network/gssproxy/autobuild/conffiles b/app-network/gssproxy/autobuild/conffiles
similarity index 100%
rename from extra-network/gssproxy/autobuild/conffiles
rename to app-network/gssproxy/autobuild/conffiles
diff --git a/extra-network/gssproxy/autobuild/defines b/app-network/gssproxy/autobuild/defines
similarity index 100%
rename from extra-network/gssproxy/autobuild/defines
rename to app-network/gssproxy/autobuild/defines
diff --git a/extra-network/gssproxy/autobuild/patch b/app-network/gssproxy/autobuild/patch
similarity index 100%
rename from extra-network/gssproxy/autobuild/patch
rename to app-network/gssproxy/autobuild/patch
diff --git a/extra-network/gssproxy/autobuild/prepare b/app-network/gssproxy/autobuild/prepare
similarity index 100%
rename from extra-network/gssproxy/autobuild/prepare
rename to app-network/gssproxy/autobuild/prepare
diff --git a/extra-network/gssproxy/spec b/app-network/gssproxy/spec
similarity index 100%
rename from extra-network/gssproxy/spec
rename to app-network/gssproxy/spec
diff --git a/extra-network/gtk-vnc/autobuild/defines b/app-network/gtk-vnc/autobuild/defines
similarity index 100%
rename from extra-network/gtk-vnc/autobuild/defines
rename to app-network/gtk-vnc/autobuild/defines
diff --git a/extra-network/gtk-vnc/spec b/app-network/gtk-vnc/spec
similarity index 100%
rename from extra-network/gtk-vnc/spec
rename to app-network/gtk-vnc/spec
diff --git a/extra-network/haproxy/autobuild/beyond b/app-network/haproxy/autobuild/beyond
similarity index 100%
rename from extra-network/haproxy/autobuild/beyond
rename to app-network/haproxy/autobuild/beyond
diff --git a/extra-network/haproxy/autobuild/defines b/app-network/haproxy/autobuild/defines
similarity index 100%
rename from extra-network/haproxy/autobuild/defines
rename to app-network/haproxy/autobuild/defines
diff --git a/extra-network/haproxy/autobuild/overrides/etc/default/haproxy b/app-network/haproxy/autobuild/overrides/etc/default/haproxy
similarity index 100%
rename from extra-network/haproxy/autobuild/overrides/etc/default/haproxy
rename to app-network/haproxy/autobuild/overrides/etc/default/haproxy
diff --git a/extra-network/haproxy/autobuild/overrides/etc/haproxy/haproxy.cfg b/app-network/haproxy/autobuild/overrides/etc/haproxy/haproxy.cfg
similarity index 100%
rename from extra-network/haproxy/autobuild/overrides/etc/haproxy/haproxy.cfg
rename to app-network/haproxy/autobuild/overrides/etc/haproxy/haproxy.cfg
diff --git a/extra-network/haproxy/autobuild/postinst b/app-network/haproxy/autobuild/postinst
similarity index 100%
rename from extra-network/haproxy/autobuild/postinst
rename to app-network/haproxy/autobuild/postinst
diff --git a/extra-network/haproxy/spec b/app-network/haproxy/spec
similarity index 100%
rename from extra-network/haproxy/spec
rename to app-network/haproxy/spec
diff --git a/extra-network/hostapd/autobuild/build b/app-network/hostapd/autobuild/build
similarity index 100%
rename from extra-network/hostapd/autobuild/build
rename to app-network/hostapd/autobuild/build
diff --git a/extra-network/hostapd/autobuild/config b/app-network/hostapd/autobuild/config
similarity index 100%
rename from extra-network/hostapd/autobuild/config
rename to app-network/hostapd/autobuild/config
diff --git a/extra-network/hostapd/autobuild/defines b/app-network/hostapd/autobuild/defines
similarity index 100%
rename from extra-network/hostapd/autobuild/defines
rename to app-network/hostapd/autobuild/defines
diff --git a/extra-network/hostapd/autobuild/overrides/usr/lib/systemd/system/hostapd.service b/app-network/hostapd/autobuild/overrides/usr/lib/systemd/system/hostapd.service
similarity index 100%
rename from extra-network/hostapd/autobuild/overrides/usr/lib/systemd/system/hostapd.service
rename to app-network/hostapd/autobuild/overrides/usr/lib/systemd/system/hostapd.service
diff --git a/extra-network/hostapd/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/app-network/hostapd/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
similarity index 100%
rename from extra-network/hostapd/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
rename to app-network/hostapd/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
diff --git a/extra-network/hostapd/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/app-network/hostapd/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
similarity index 100%
rename from extra-network/hostapd/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
rename to app-network/hostapd/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
diff --git a/extra-network/hostapd/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/app-network/hostapd/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
similarity index 100%
rename from extra-network/hostapd/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
rename to app-network/hostapd/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
diff --git a/extra-network/hostapd/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/app-network/hostapd/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
similarity index 100%
rename from extra-network/hostapd/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
rename to app-network/hostapd/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
diff --git a/extra-network/hostapd/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/app-network/hostapd/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
similarity index 100%
rename from extra-network/hostapd/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
rename to app-network/hostapd/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
diff --git a/extra-network/hostapd/autobuild/prepare b/app-network/hostapd/autobuild/prepare
similarity index 100%
rename from extra-network/hostapd/autobuild/prepare
rename to app-network/hostapd/autobuild/prepare
diff --git a/extra-network/hostapd/spec b/app-network/hostapd/spec
similarity index 100%
rename from extra-network/hostapd/spec
rename to app-network/hostapd/spec
diff --git a/extra-network/httping/autobuild/defines b/app-network/httping/autobuild/defines
similarity index 100%
rename from extra-network/httping/autobuild/defines
rename to app-network/httping/autobuild/defines
diff --git a/extra-network/httping/prepare b/app-network/httping/prepare
similarity index 100%
rename from extra-network/httping/prepare
rename to app-network/httping/prepare
diff --git a/extra-network/httping/spec b/app-network/httping/spec
similarity index 100%
rename from extra-network/httping/spec
rename to app-network/httping/spec
diff --git a/extra-network/idnkit/autobuild/conffiles b/app-network/idnkit/autobuild/conffiles
similarity index 100%
rename from extra-network/idnkit/autobuild/conffiles
rename to app-network/idnkit/autobuild/conffiles
diff --git a/extra-network/idnkit/autobuild/defines b/app-network/idnkit/autobuild/defines
similarity index 100%
rename from extra-network/idnkit/autobuild/defines
rename to app-network/idnkit/autobuild/defines
diff --git a/extra-network/idnkit/autobuild/prepare b/app-network/idnkit/autobuild/prepare
similarity index 100%
rename from extra-network/idnkit/autobuild/prepare
rename to app-network/idnkit/autobuild/prepare
diff --git a/extra-network/idnkit/spec b/app-network/idnkit/spec
similarity index 100%
rename from extra-network/idnkit/spec
rename to app-network/idnkit/spec
diff --git a/extra-network/ifplugd/autobuild/beyond b/app-network/ifplugd/autobuild/beyond
similarity index 100%
rename from extra-network/ifplugd/autobuild/beyond
rename to app-network/ifplugd/autobuild/beyond
diff --git a/extra-network/ifplugd/autobuild/defines b/app-network/ifplugd/autobuild/defines
similarity index 100%
rename from extra-network/ifplugd/autobuild/defines
rename to app-network/ifplugd/autobuild/defines
diff --git a/extra-network/ifplugd/autobuild/overrides/usr/bin/ifplugd-daemon b/app-network/ifplugd/autobuild/overrides/usr/bin/ifplugd-daemon
similarity index 100%
rename from extra-network/ifplugd/autobuild/overrides/usr/bin/ifplugd-daemon
rename to app-network/ifplugd/autobuild/overrides/usr/bin/ifplugd-daemon
diff --git a/extra-network/ifplugd/autobuild/overrides/usr/lib/systemd/system/ifplugd.service b/app-network/ifplugd/autobuild/overrides/usr/lib/systemd/system/ifplugd.service
similarity index 100%
rename from extra-network/ifplugd/autobuild/overrides/usr/lib/systemd/system/ifplugd.service
rename to app-network/ifplugd/autobuild/overrides/usr/lib/systemd/system/ifplugd.service
diff --git a/extra-network/ifplugd/autobuild/patches/interface.patch b/app-network/ifplugd/autobuild/patches/interface.patch
similarity index 100%
rename from extra-network/ifplugd/autobuild/patches/interface.patch
rename to app-network/ifplugd/autobuild/patches/interface.patch
diff --git a/extra-network/ifplugd/autobuild/patches/return-value.patch b/app-network/ifplugd/autobuild/patches/return-value.patch
similarity index 100%
rename from extra-network/ifplugd/autobuild/patches/return-value.patch
rename to app-network/ifplugd/autobuild/patches/return-value.patch
diff --git a/extra-network/ifplugd/spec b/app-network/ifplugd/spec
similarity index 100%
rename from extra-network/ifplugd/spec
rename to app-network/ifplugd/spec
diff --git a/extra-network/iftop/autobuild/defines b/app-network/iftop/autobuild/defines
similarity index 100%
rename from extra-network/iftop/autobuild/defines
rename to app-network/iftop/autobuild/defines
diff --git a/extra-network/iftop/spec b/app-network/iftop/spec
similarity index 100%
rename from extra-network/iftop/spec
rename to app-network/iftop/spec
diff --git a/extra-network/imapsync/autobuild/build b/app-network/imapsync/autobuild/build
similarity index 100%
rename from extra-network/imapsync/autobuild/build
rename to app-network/imapsync/autobuild/build
diff --git a/extra-network/imapsync/autobuild/defines b/app-network/imapsync/autobuild/defines
similarity index 100%
rename from extra-network/imapsync/autobuild/defines
rename to app-network/imapsync/autobuild/defines
diff --git a/extra-network/imapsync/spec b/app-network/imapsync/spec
similarity index 100%
rename from extra-network/imapsync/spec
rename to app-network/imapsync/spec
diff --git a/extra-network/ipcalc/autobuild/build b/app-network/ipcalc/autobuild/build
similarity index 100%
rename from extra-network/ipcalc/autobuild/build
rename to app-network/ipcalc/autobuild/build
diff --git a/extra-network/ipcalc/autobuild/defines b/app-network/ipcalc/autobuild/defines
similarity index 100%
rename from extra-network/ipcalc/autobuild/defines
rename to app-network/ipcalc/autobuild/defines
diff --git a/extra-network/ipcalc/autobuild/patches/01-paths.patch b/app-network/ipcalc/autobuild/patches/01-paths.patch
similarity index 100%
rename from extra-network/ipcalc/autobuild/patches/01-paths.patch
rename to app-network/ipcalc/autobuild/patches/01-paths.patch
diff --git a/extra-network/ipcalc/autobuild/patches/02-emacs.patch b/app-network/ipcalc/autobuild/patches/02-emacs.patch
similarity index 100%
rename from extra-network/ipcalc/autobuild/patches/02-emacs.patch
rename to app-network/ipcalc/autobuild/patches/02-emacs.patch
diff --git a/extra-network/ipcalc/autobuild/patches/03-width.patch b/app-network/ipcalc/autobuild/patches/03-width.patch
similarity index 100%
rename from extra-network/ipcalc/autobuild/patches/03-width.patch
rename to app-network/ipcalc/autobuild/patches/03-width.patch
diff --git a/extra-network/ipcalc/autobuild/patches/04-supernet.patch b/app-network/ipcalc/autobuild/patches/04-supernet.patch
similarity index 100%
rename from extra-network/ipcalc/autobuild/patches/04-supernet.patch
rename to app-network/ipcalc/autobuild/patches/04-supernet.patch
diff --git a/extra-network/ipcalc/autobuild/patches/input-checking b/app-network/ipcalc/autobuild/patches/input-checking
similarity index 100%
rename from extra-network/ipcalc/autobuild/patches/input-checking
rename to app-network/ipcalc/autobuild/patches/input-checking
diff --git a/extra-network/ipcalc/autobuild/patches/series b/app-network/ipcalc/autobuild/patches/series
similarity index 100%
rename from extra-network/ipcalc/autobuild/patches/series
rename to app-network/ipcalc/autobuild/patches/series
diff --git a/extra-network/ipcalc/spec b/app-network/ipcalc/spec
similarity index 100%
rename from extra-network/ipcalc/spec
rename to app-network/ipcalc/spec
diff --git a/extra-network/iperf3/autobuild/defines b/app-network/iperf3/autobuild/defines
similarity index 100%
rename from extra-network/iperf3/autobuild/defines
rename to app-network/iperf3/autobuild/defines
diff --git a/extra-network/iperf3/autobuild/prepare b/app-network/iperf3/autobuild/prepare
similarity index 100%
rename from extra-network/iperf3/autobuild/prepare
rename to app-network/iperf3/autobuild/prepare
diff --git a/extra-network/iperf3/spec b/app-network/iperf3/spec
similarity index 100%
rename from extra-network/iperf3/spec
rename to app-network/iperf3/spec
diff --git a/extra-network/iprange/autobuild/defines b/app-network/iprange/autobuild/defines
similarity index 100%
rename from extra-network/iprange/autobuild/defines
rename to app-network/iprange/autobuild/defines
diff --git a/extra-network/iprange/spec b/app-network/iprange/spec
similarity index 100%
rename from extra-network/iprange/spec
rename to app-network/iprange/spec
diff --git a/base-network/iproute2/autobuild/conffiles b/app-network/iproute2/autobuild/conffiles
similarity index 100%
rename from base-network/iproute2/autobuild/conffiles
rename to app-network/iproute2/autobuild/conffiles
diff --git a/base-network/iproute2/autobuild/defines b/app-network/iproute2/autobuild/defines
similarity index 100%
rename from base-network/iproute2/autobuild/defines
rename to app-network/iproute2/autobuild/defines
diff --git a/base-network/iproute2/autobuild/patches/0001-build-fix-build-failure-with-fno-common.patch b/app-network/iproute2/autobuild/patches/0001-build-fix-build-failure-with-fno-common.patch
similarity index 100%
rename from base-network/iproute2/autobuild/patches/0001-build-fix-build-failure-with-fno-common.patch
rename to app-network/iproute2/autobuild/patches/0001-build-fix-build-failure-with-fno-common.patch
diff --git a/base-network/iproute2/autobuild/prepare b/app-network/iproute2/autobuild/prepare
similarity index 100%
rename from base-network/iproute2/autobuild/prepare
rename to app-network/iproute2/autobuild/prepare
diff --git a/base-network/iproute2/spec b/app-network/iproute2/spec
similarity index 100%
rename from base-network/iproute2/spec
rename to app-network/iproute2/spec
diff --git a/extra-network/ipset/autobuild/beyond b/app-network/ipset/autobuild/beyond
similarity index 100%
rename from extra-network/ipset/autobuild/beyond
rename to app-network/ipset/autobuild/beyond
diff --git a/extra-network/ipset/autobuild/conffiles b/app-network/ipset/autobuild/conffiles
similarity index 100%
rename from extra-network/ipset/autobuild/conffiles
rename to app-network/ipset/autobuild/conffiles
diff --git a/extra-network/ipset/autobuild/defines b/app-network/ipset/autobuild/defines
similarity index 100%
rename from extra-network/ipset/autobuild/defines
rename to app-network/ipset/autobuild/defines
diff --git a/extra-network/ipset/autobuild/overrides/usr/lib/systemd/system/ipset.service b/app-network/ipset/autobuild/overrides/usr/lib/systemd/system/ipset.service
similarity index 100%
rename from extra-network/ipset/autobuild/overrides/usr/lib/systemd/system/ipset.service
rename to app-network/ipset/autobuild/overrides/usr/lib/systemd/system/ipset.service
diff --git a/extra-network/ipset/spec b/app-network/ipset/spec
similarity index 100%
rename from extra-network/ipset/spec
rename to app-network/ipset/spec
diff --git a/extra-network/ipt2socks/autobuild/defines b/app-network/ipt2socks/autobuild/defines
similarity index 100%
rename from extra-network/ipt2socks/autobuild/defines
rename to app-network/ipt2socks/autobuild/defines
diff --git a/extra-network/ipt2socks/autobuild/patches/0001-ipt2socks-use-system-libev.patch b/app-network/ipt2socks/autobuild/patches/0001-ipt2socks-use-system-libev.patch
similarity index 100%
rename from extra-network/ipt2socks/autobuild/patches/0001-ipt2socks-use-system-libev.patch
rename to app-network/ipt2socks/autobuild/patches/0001-ipt2socks-use-system-libev.patch
diff --git a/extra-network/ipt2socks/autobuild/patches/0002-ipt2socks-no-strip.patch b/app-network/ipt2socks/autobuild/patches/0002-ipt2socks-no-strip.patch
similarity index 100%
rename from extra-network/ipt2socks/autobuild/patches/0002-ipt2socks-no-strip.patch
rename to app-network/ipt2socks/autobuild/patches/0002-ipt2socks-no-strip.patch
diff --git a/extra-network/ipt2socks/spec b/app-network/ipt2socks/spec
similarity index 100%
rename from extra-network/ipt2socks/spec
rename to app-network/ipt2socks/spec
diff --git a/base-network/iptables/autobuild/defines b/app-network/iptables/autobuild/defines
similarity index 100%
rename from base-network/iptables/autobuild/defines
rename to app-network/iptables/autobuild/defines
diff --git a/base-network/iptables/autobuild/overrides/etc/iptables/empty.rules b/app-network/iptables/autobuild/overrides/etc/iptables/empty.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/etc/iptables/empty.rules
rename to app-network/iptables/autobuild/overrides/etc/iptables/empty.rules
diff --git a/base-network/iptables/autobuild/overrides/etc/iptables/simple_firewall.rules b/app-network/iptables/autobuild/overrides/etc/iptables/simple_firewall.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/etc/iptables/simple_firewall.rules
rename to app-network/iptables/autobuild/overrides/etc/iptables/simple_firewall.rules
diff --git a/base-network/iptables/autobuild/overrides/usr/lib/systemd/scripts/iptables-flush b/app-network/iptables/autobuild/overrides/usr/lib/systemd/scripts/iptables-flush
similarity index 100%
rename from base-network/iptables/autobuild/overrides/usr/lib/systemd/scripts/iptables-flush
rename to app-network/iptables/autobuild/overrides/usr/lib/systemd/scripts/iptables-flush
diff --git a/base-network/iptables/autobuild/overrides/usr/lib/systemd/system/ip6tables.service b/app-network/iptables/autobuild/overrides/usr/lib/systemd/system/ip6tables.service
similarity index 100%
rename from base-network/iptables/autobuild/overrides/usr/lib/systemd/system/ip6tables.service
rename to app-network/iptables/autobuild/overrides/usr/lib/systemd/system/ip6tables.service
diff --git a/base-network/iptables/autobuild/overrides/usr/lib/systemd/system/iptables.service b/app-network/iptables/autobuild/overrides/usr/lib/systemd/system/iptables.service
similarity index 100%
rename from base-network/iptables/autobuild/overrides/usr/lib/systemd/system/iptables.service
rename to app-network/iptables/autobuild/overrides/usr/lib/systemd/system/iptables.service
diff --git a/base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-filter.rules b/app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-filter.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-filter.rules
rename to app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-filter.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-mangle.rules b/app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-mangle.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-mangle.rules
rename to app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-mangle.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-nat.rules b/app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-nat.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-nat.rules
rename to app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-nat.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-raw.rules b/app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-raw.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-raw.rules
rename to app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-raw.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-security.rules b/app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-security.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-security.rules
rename to app-network/iptables/autobuild/overrides/var/lib/ip6tables/empty-security.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/iptables/empty-filter.rules b/app-network/iptables/autobuild/overrides/var/lib/iptables/empty-filter.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/iptables/empty-filter.rules
rename to app-network/iptables/autobuild/overrides/var/lib/iptables/empty-filter.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/iptables/empty-mangle.rules b/app-network/iptables/autobuild/overrides/var/lib/iptables/empty-mangle.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/iptables/empty-mangle.rules
rename to app-network/iptables/autobuild/overrides/var/lib/iptables/empty-mangle.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/iptables/empty-nat.rules b/app-network/iptables/autobuild/overrides/var/lib/iptables/empty-nat.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/iptables/empty-nat.rules
rename to app-network/iptables/autobuild/overrides/var/lib/iptables/empty-nat.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/iptables/empty-raw.rules b/app-network/iptables/autobuild/overrides/var/lib/iptables/empty-raw.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/iptables/empty-raw.rules
rename to app-network/iptables/autobuild/overrides/var/lib/iptables/empty-raw.rules
diff --git a/base-network/iptables/autobuild/overrides/var/lib/iptables/empty-security.rules b/app-network/iptables/autobuild/overrides/var/lib/iptables/empty-security.rules
similarity index 100%
rename from base-network/iptables/autobuild/overrides/var/lib/iptables/empty-security.rules
rename to app-network/iptables/autobuild/overrides/var/lib/iptables/empty-security.rules
diff --git a/base-network/iptables/spec b/app-network/iptables/spec
similarity index 100%
rename from base-network/iptables/spec
rename to app-network/iptables/spec
diff --git a/extra-network/iptraf-ng/autobuild/alternatives b/app-network/iptraf-ng/autobuild/alternatives
similarity index 100%
rename from extra-network/iptraf-ng/autobuild/alternatives
rename to app-network/iptraf-ng/autobuild/alternatives
diff --git a/extra-network/iptraf-ng/autobuild/defines b/app-network/iptraf-ng/autobuild/defines
similarity index 100%
rename from extra-network/iptraf-ng/autobuild/defines
rename to app-network/iptraf-ng/autobuild/defines
diff --git a/extra-network/iptraf-ng/spec b/app-network/iptraf-ng/spec
similarity index 100%
rename from extra-network/iptraf-ng/spec
rename to app-network/iptraf-ng/spec
diff --git a/extra-network/iw/autobuild/build b/app-network/iw/autobuild/build
similarity index 100%
rename from extra-network/iw/autobuild/build
rename to app-network/iw/autobuild/build
diff --git a/extra-network/iw/autobuild/defines b/app-network/iw/autobuild/defines
similarity index 100%
rename from extra-network/iw/autobuild/defines
rename to app-network/iw/autobuild/defines
diff --git a/extra-network/iw/spec b/app-network/iw/spec
similarity index 100%
rename from extra-network/iw/spec
rename to app-network/iw/spec
diff --git a/extra-network/iwd/autobuild/defines b/app-network/iwd/autobuild/defines
similarity index 100%
rename from extra-network/iwd/autobuild/defines
rename to app-network/iwd/autobuild/defines
diff --git a/extra-network/iwd/spec b/app-network/iwd/spec
similarity index 100%
rename from extra-network/iwd/spec
rename to app-network/iwd/spec
diff --git a/extra-network/kcptun/autobuild/build b/app-network/kcptun/autobuild/build
similarity index 100%
rename from extra-network/kcptun/autobuild/build
rename to app-network/kcptun/autobuild/build
diff --git a/extra-network/kcptun/autobuild/defines b/app-network/kcptun/autobuild/defines
similarity index 100%
rename from extra-network/kcptun/autobuild/defines
rename to app-network/kcptun/autobuild/defines
diff --git a/extra-network/kcptun/spec b/app-network/kcptun/spec
similarity index 100%
rename from extra-network/kcptun/spec
rename to app-network/kcptun/spec
diff --git a/extra-network/landrop/autobuild/beyond b/app-network/landrop/autobuild/beyond
similarity index 100%
rename from extra-network/landrop/autobuild/beyond
rename to app-network/landrop/autobuild/beyond
diff --git a/extra-network/landrop/autobuild/defines b/app-network/landrop/autobuild/defines
similarity index 100%
rename from extra-network/landrop/autobuild/defines
rename to app-network/landrop/autobuild/defines
diff --git a/extra-network/landrop/autobuild/patches/0001-qmake-fix-bad-include-and-libs-path-prefix.patch b/app-network/landrop/autobuild/patches/0001-qmake-fix-bad-include-and-libs-path-prefix.patch
similarity index 100%
rename from extra-network/landrop/autobuild/patches/0001-qmake-fix-bad-include-and-libs-path-prefix.patch
rename to app-network/landrop/autobuild/patches/0001-qmake-fix-bad-include-and-libs-path-prefix.patch
diff --git a/extra-network/landrop/spec b/app-network/landrop/spec
similarity index 100%
rename from extra-network/landrop/spec
rename to app-network/landrop/spec
diff --git a/extra-network/lftp/autobuild/defines b/app-network/lftp/autobuild/defines
similarity index 100%
rename from extra-network/lftp/autobuild/defines
rename to app-network/lftp/autobuild/defines
diff --git a/extra-network/lftp/spec b/app-network/lftp/spec
similarity index 100%
rename from extra-network/lftp/spec
rename to app-network/lftp/spec
diff --git a/extra-network/libteam/autobuild/beyond b/app-network/libteam/autobuild/beyond
similarity index 100%
rename from extra-network/libteam/autobuild/beyond
rename to app-network/libteam/autobuild/beyond
diff --git a/extra-network/libteam/autobuild/defines b/app-network/libteam/autobuild/defines
similarity index 100%
rename from extra-network/libteam/autobuild/defines
rename to app-network/libteam/autobuild/defines
diff --git a/extra-network/libteam/spec b/app-network/libteam/spec
similarity index 100%
rename from extra-network/libteam/spec
rename to app-network/libteam/spec
diff --git a/extra-network/lighttpd/autobuild/beyond b/app-network/lighttpd/autobuild/beyond
similarity index 100%
rename from extra-network/lighttpd/autobuild/beyond
rename to app-network/lighttpd/autobuild/beyond
diff --git a/extra-network/lighttpd/autobuild/conffiles b/app-network/lighttpd/autobuild/conffiles
similarity index 100%
rename from extra-network/lighttpd/autobuild/conffiles
rename to app-network/lighttpd/autobuild/conffiles
diff --git a/extra-network/lighttpd/autobuild/defines b/app-network/lighttpd/autobuild/defines
similarity index 100%
rename from extra-network/lighttpd/autobuild/defines
rename to app-network/lighttpd/autobuild/defines
diff --git a/extra-network/lighttpd/autobuild/overrides/etc/lighttpd/lighttpd.conf b/app-network/lighttpd/autobuild/overrides/etc/lighttpd/lighttpd.conf
similarity index 100%
rename from extra-network/lighttpd/autobuild/overrides/etc/lighttpd/lighttpd.conf
rename to app-network/lighttpd/autobuild/overrides/etc/lighttpd/lighttpd.conf
diff --git a/extra-network/lighttpd/autobuild/overrides/etc/logrotate.d/lighttpd b/app-network/lighttpd/autobuild/overrides/etc/logrotate.d/lighttpd
similarity index 100%
rename from extra-network/lighttpd/autobuild/overrides/etc/logrotate.d/lighttpd
rename to app-network/lighttpd/autobuild/overrides/etc/logrotate.d/lighttpd
diff --git a/extra-network/lighttpd/autobuild/overrides/usr/lib/systemd/system/lighttpd.service b/app-network/lighttpd/autobuild/overrides/usr/lib/systemd/system/lighttpd.service
similarity index 100%
rename from extra-network/lighttpd/autobuild/overrides/usr/lib/systemd/system/lighttpd.service
rename to app-network/lighttpd/autobuild/overrides/usr/lib/systemd/system/lighttpd.service
diff --git a/extra-network/lighttpd/autobuild/overrides/usr/lib/tmpfiles.d/lighttpd.conf b/app-network/lighttpd/autobuild/overrides/usr/lib/tmpfiles.d/lighttpd.conf
similarity index 100%
rename from extra-network/lighttpd/autobuild/overrides/usr/lib/tmpfiles.d/lighttpd.conf
rename to app-network/lighttpd/autobuild/overrides/usr/lib/tmpfiles.d/lighttpd.conf
diff --git a/extra-network/lighttpd/autobuild/postinst b/app-network/lighttpd/autobuild/postinst
similarity index 100%
rename from extra-network/lighttpd/autobuild/postinst
rename to app-network/lighttpd/autobuild/postinst
diff --git a/extra-network/lighttpd/spec b/app-network/lighttpd/spec
similarity index 100%
rename from extra-network/lighttpd/spec
rename to app-network/lighttpd/spec
diff --git a/extra-network/lksctp-tools/autobuild/defines b/app-network/lksctp-tools/autobuild/defines
similarity index 100%
rename from extra-network/lksctp-tools/autobuild/defines
rename to app-network/lksctp-tools/autobuild/defines
diff --git a/extra-network/lksctp-tools/spec b/app-network/lksctp-tools/spec
similarity index 100%
rename from extra-network/lksctp-tools/spec
rename to app-network/lksctp-tools/spec
diff --git a/extra-network/lrzsz/autobuild/defines b/app-network/lrzsz/autobuild/defines
similarity index 100%
rename from extra-network/lrzsz/autobuild/defines
rename to app-network/lrzsz/autobuild/defines
diff --git a/extra-network/lrzsz/autobuild/patches/206499_ymodemg.diff.unchecked b/app-network/lrzsz/autobuild/patches/206499_ymodemg.diff.unchecked
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/206499_ymodemg.diff.unchecked
rename to app-network/lrzsz/autobuild/patches/206499_ymodemg.diff.unchecked
diff --git a/extra-network/lrzsz/autobuild/patches/206648_dszlog.diff.unchecked b/app-network/lrzsz/autobuild/patches/206648_dszlog.diff.unchecked
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/206648_dszlog.diff.unchecked
rename to app-network/lrzsz/autobuild/patches/206648_dszlog.diff.unchecked
diff --git a/extra-network/lrzsz/autobuild/patches/313992_de_po.diff b/app-network/lrzsz/autobuild/patches/313992_de_po.diff
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/313992_de_po.diff
rename to app-network/lrzsz/autobuild/patches/313992_de_po.diff
diff --git a/extra-network/lrzsz/autobuild/patches/897010_zsdata.diff b/app-network/lrzsz/autobuild/patches/897010_zsdata.diff
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/897010_zsdata.diff
rename to app-network/lrzsz/autobuild/patches/897010_zsdata.diff
diff --git a/extra-network/lrzsz/autobuild/patches/build.diff b/app-network/lrzsz/autobuild/patches/build.diff
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/build.diff
rename to app-network/lrzsz/autobuild/patches/build.diff
diff --git a/extra-network/lrzsz/autobuild/patches/cat-id-tbl.diff b/app-network/lrzsz/autobuild/patches/cat-id-tbl.diff
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/cat-id-tbl.diff
rename to app-network/lrzsz/autobuild/patches/cat-id-tbl.diff
diff --git a/extra-network/lrzsz/autobuild/patches/include.diff b/app-network/lrzsz/autobuild/patches/include.diff
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/include.diff
rename to app-network/lrzsz/autobuild/patches/include.diff
diff --git a/extra-network/lrzsz/autobuild/patches/mantypos.diff b/app-network/lrzsz/autobuild/patches/mantypos.diff
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/mantypos.diff
rename to app-network/lrzsz/autobuild/patches/mantypos.diff
diff --git a/extra-network/lrzsz/autobuild/patches/series b/app-network/lrzsz/autobuild/patches/series
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/series
rename to app-network/lrzsz/autobuild/patches/series
diff --git a/extra-network/lrzsz/autobuild/patches/strstr.diff b/app-network/lrzsz/autobuild/patches/strstr.diff
similarity index 100%
rename from extra-network/lrzsz/autobuild/patches/strstr.diff
rename to app-network/lrzsz/autobuild/patches/strstr.diff
diff --git a/extra-network/lrzsz/autobuild/prepare b/app-network/lrzsz/autobuild/prepare
similarity index 100%
rename from extra-network/lrzsz/autobuild/prepare
rename to app-network/lrzsz/autobuild/prepare
diff --git a/extra-network/lrzsz/spec b/app-network/lrzsz/spec
similarity index 100%
rename from extra-network/lrzsz/spec
rename to app-network/lrzsz/spec
diff --git a/extra-network/macchanger/autobuild/defines b/app-network/macchanger/autobuild/defines
similarity index 100%
rename from extra-network/macchanger/autobuild/defines
rename to app-network/macchanger/autobuild/defines
diff --git a/extra-network/macchanger/spec b/app-network/macchanger/spec
similarity index 100%
rename from extra-network/macchanger/spec
rename to app-network/macchanger/spec
diff --git a/extra-network/magic-wormhole/autobuild/defines b/app-network/magic-wormhole/autobuild/defines
similarity index 100%
rename from extra-network/magic-wormhole/autobuild/defines
rename to app-network/magic-wormhole/autobuild/defines
diff --git a/extra-network/magic-wormhole/spec b/app-network/magic-wormhole/spec
similarity index 100%
rename from extra-network/magic-wormhole/spec
rename to app-network/magic-wormhole/spec
diff --git a/extra-network/mdk3/autobuild/build b/app-network/mdk3/autobuild/build
similarity index 100%
rename from extra-network/mdk3/autobuild/build
rename to app-network/mdk3/autobuild/build
diff --git a/extra-network/mdk3/autobuild/defines b/app-network/mdk3/autobuild/defines
similarity index 100%
rename from extra-network/mdk3/autobuild/defines
rename to app-network/mdk3/autobuild/defines
diff --git a/extra-network/mdk3/spec b/app-network/mdk3/spec
similarity index 100%
rename from extra-network/mdk3/spec
rename to app-network/mdk3/spec
diff --git a/extra-network/megasync/autobuild/build b/app-network/megasync/autobuild/build
similarity index 100%
rename from extra-network/megasync/autobuild/build
rename to app-network/megasync/autobuild/build
diff --git a/extra-network/megasync/autobuild/defines b/app-network/megasync/autobuild/defines
similarity index 100%
rename from extra-network/megasync/autobuild/defines
rename to app-network/megasync/autobuild/defines
diff --git a/extra-network/megasync/autobuild/patches/0001-MegaSpeedGraph-include-QPainterPath.patch b/app-network/megasync/autobuild/patches/0001-MegaSpeedGraph-include-QPainterPath.patch
similarity index 100%
rename from extra-network/megasync/autobuild/patches/0001-MegaSpeedGraph-include-QPainterPath.patch
rename to app-network/megasync/autobuild/patches/0001-MegaSpeedGraph-include-QPainterPath.patch
diff --git a/extra-network/megasync/autobuild/prepare b/app-network/megasync/autobuild/prepare
similarity index 100%
rename from extra-network/megasync/autobuild/prepare
rename to app-network/megasync/autobuild/prepare
diff --git a/extra-network/megasync/spec b/app-network/megasync/spec
similarity index 100%
rename from extra-network/megasync/spec
rename to app-network/megasync/spec
diff --git a/extra-network/megatools/autobuild/defines b/app-network/megatools/autobuild/defines
similarity index 100%
rename from extra-network/megatools/autobuild/defines
rename to app-network/megatools/autobuild/defines
diff --git a/extra-network/megatools/spec b/app-network/megatools/spec
similarity index 100%
rename from extra-network/megatools/spec
rename to app-network/megatools/spec
diff --git a/extra-network/miniupnpc/autobuild/defines b/app-network/miniupnpc/autobuild/defines
similarity index 100%
rename from extra-network/miniupnpc/autobuild/defines
rename to app-network/miniupnpc/autobuild/defines
diff --git a/extra-network/miniupnpc/spec b/app-network/miniupnpc/spec
similarity index 100%
rename from extra-network/miniupnpc/spec
rename to app-network/miniupnpc/spec
diff --git a/extra-network/miniupnpd/autobuild/build b/app-network/miniupnpd/autobuild/build
similarity index 100%
rename from extra-network/miniupnpd/autobuild/build
rename to app-network/miniupnpd/autobuild/build
diff --git a/extra-network/miniupnpd/autobuild/conffiles b/app-network/miniupnpd/autobuild/conffiles
similarity index 100%
rename from extra-network/miniupnpd/autobuild/conffiles
rename to app-network/miniupnpd/autobuild/conffiles
diff --git a/extra-network/miniupnpd/autobuild/defines b/app-network/miniupnpd/autobuild/defines
similarity index 100%
rename from extra-network/miniupnpd/autobuild/defines
rename to app-network/miniupnpd/autobuild/defines
diff --git a/extra-network/miniupnpd/autobuild/overrides/usr/lib/systemd/system/miniupnpd.service b/app-network/miniupnpd/autobuild/overrides/usr/lib/systemd/system/miniupnpd.service
similarity index 100%
rename from extra-network/miniupnpd/autobuild/overrides/usr/lib/systemd/system/miniupnpd.service
rename to app-network/miniupnpd/autobuild/overrides/usr/lib/systemd/system/miniupnpd.service
diff --git a/extra-network/miniupnpd/autobuild/patches/0001-hack-fix-linux-api-4.5.1-bug.patch b/app-network/miniupnpd/autobuild/patches/0001-hack-fix-linux-api-4.5.1-bug.patch
similarity index 100%
rename from extra-network/miniupnpd/autobuild/patches/0001-hack-fix-linux-api-4.5.1-bug.patch
rename to app-network/miniupnpd/autobuild/patches/0001-hack-fix-linux-api-4.5.1-bug.patch
diff --git a/extra-network/miniupnpd/autobuild/patches/0002-miniupnpd_netfilter-build-with-linux-kernel-5.0.patch b/app-network/miniupnpd/autobuild/patches/0002-miniupnpd_netfilter-build-with-linux-kernel-5.0.patch
similarity index 100%
rename from extra-network/miniupnpd/autobuild/patches/0002-miniupnpd_netfilter-build-with-linux-kernel-5.0.patch
rename to app-network/miniupnpd/autobuild/patches/0002-miniupnpd_netfilter-build-with-linux-kernel-5.0.patch
diff --git a/extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12107.patch b/app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12107.patch
similarity index 100%
rename from extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12107.patch
rename to app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12107.patch
diff --git a/extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-1.patch b/app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-1.patch
similarity index 100%
rename from extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-1.patch
rename to app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-1.patch
diff --git a/extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-2.patch b/app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-2.patch
similarity index 100%
rename from extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-2.patch
rename to app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12108-12109-2.patch
diff --git a/extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12111.patch b/app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12111.patch
similarity index 100%
rename from extra-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12111.patch
rename to app-network/miniupnpd/autobuild/patches/miniupnpd-cve-2019-12111.patch
diff --git a/extra-network/miniupnpd/spec b/app-network/miniupnpd/spec
similarity index 100%
rename from extra-network/miniupnpd/spec
rename to app-network/miniupnpd/spec
diff --git a/extra-network/mitmproxy/autobuild/defines b/app-network/mitmproxy/autobuild/defines
similarity index 100%
rename from extra-network/mitmproxy/autobuild/defines
rename to app-network/mitmproxy/autobuild/defines
diff --git a/extra-network/mitmproxy/autobuild/prepare b/app-network/mitmproxy/autobuild/prepare
similarity index 100%
rename from extra-network/mitmproxy/autobuild/prepare
rename to app-network/mitmproxy/autobuild/prepare
diff --git a/extra-network/mitmproxy/spec b/app-network/mitmproxy/spec
similarity index 100%
rename from extra-network/mitmproxy/spec
rename to app-network/mitmproxy/spec
diff --git a/extra-network/modem-manager-gui/autobuild/build b/app-network/modem-manager-gui/autobuild/build
similarity index 100%
rename from extra-network/modem-manager-gui/autobuild/build
rename to app-network/modem-manager-gui/autobuild/build
diff --git a/extra-network/modem-manager-gui/autobuild/defines b/app-network/modem-manager-gui/autobuild/defines
similarity index 100%
rename from extra-network/modem-manager-gui/autobuild/defines
rename to app-network/modem-manager-gui/autobuild/defines
diff --git a/extra-network/modem-manager-gui/autobuild/patches/fix-strftime-segfaults.patch b/app-network/modem-manager-gui/autobuild/patches/fix-strftime-segfaults.patch
similarity index 100%
rename from extra-network/modem-manager-gui/autobuild/patches/fix-strftime-segfaults.patch
rename to app-network/modem-manager-gui/autobuild/patches/fix-strftime-segfaults.patch
diff --git a/extra-network/modem-manager-gui/autobuild/patches/fix-wrong-strsep-usage.patch b/app-network/modem-manager-gui/autobuild/patches/fix-wrong-strsep-usage.patch
similarity index 100%
rename from extra-network/modem-manager-gui/autobuild/patches/fix-wrong-strsep-usage.patch
rename to app-network/modem-manager-gui/autobuild/patches/fix-wrong-strsep-usage.patch
diff --git a/extra-network/modem-manager-gui/autobuild/patches/series b/app-network/modem-manager-gui/autobuild/patches/series
similarity index 100%
rename from extra-network/modem-manager-gui/autobuild/patches/series
rename to app-network/modem-manager-gui/autobuild/patches/series
diff --git a/extra-network/modem-manager-gui/spec b/app-network/modem-manager-gui/spec
similarity index 100%
rename from extra-network/modem-manager-gui/spec
rename to app-network/modem-manager-gui/spec
diff --git a/extra-network/modemmanager/autobuild/beyond b/app-network/modemmanager/autobuild/beyond
similarity index 100%
rename from extra-network/modemmanager/autobuild/beyond
rename to app-network/modemmanager/autobuild/beyond
diff --git a/extra-network/modemmanager/autobuild/defines b/app-network/modemmanager/autobuild/defines
similarity index 100%
rename from extra-network/modemmanager/autobuild/defines
rename to app-network/modemmanager/autobuild/defines
diff --git a/extra-network/modemmanager/spec b/app-network/modemmanager/spec
similarity index 100%
rename from extra-network/modemmanager/spec
rename to app-network/modemmanager/spec
diff --git a/extra-network/mosh/autobuild/beyond b/app-network/mosh/autobuild/beyond
similarity index 100%
rename from extra-network/mosh/autobuild/beyond
rename to app-network/mosh/autobuild/beyond
diff --git a/extra-network/mosh/autobuild/defines b/app-network/mosh/autobuild/defines
similarity index 100%
rename from extra-network/mosh/autobuild/defines
rename to app-network/mosh/autobuild/defines
diff --git a/extra-network/mosh/spec b/app-network/mosh/spec
similarity index 100%
rename from extra-network/mosh/spec
rename to app-network/mosh/spec
diff --git a/extra-network/msmtp/autobuild/defines b/app-network/msmtp/autobuild/defines
similarity index 100%
rename from extra-network/msmtp/autobuild/defines
rename to app-network/msmtp/autobuild/defines
diff --git a/extra-network/msmtp/spec b/app-network/msmtp/spec
similarity index 100%
rename from extra-network/msmtp/spec
rename to app-network/msmtp/spec
diff --git a/extra-network/mtr/autobuild/defines b/app-network/mtr/autobuild/defines
similarity index 100%
rename from extra-network/mtr/autobuild/defines
rename to app-network/mtr/autobuild/defines
diff --git a/extra-network/mtr/autobuild/postinst b/app-network/mtr/autobuild/postinst
similarity index 100%
rename from extra-network/mtr/autobuild/postinst
rename to app-network/mtr/autobuild/postinst
diff --git a/extra-network/mtr/spec b/app-network/mtr/spec
similarity index 100%
rename from extra-network/mtr/spec
rename to app-network/mtr/spec
diff --git a/extra-network/mutt/autobuild/beyond b/app-network/mutt/autobuild/beyond
similarity index 100%
rename from extra-network/mutt/autobuild/beyond
rename to app-network/mutt/autobuild/beyond
diff --git a/extra-network/mutt/autobuild/conffiles b/app-network/mutt/autobuild/conffiles
similarity index 100%
rename from extra-network/mutt/autobuild/conffiles
rename to app-network/mutt/autobuild/conffiles
diff --git a/extra-network/mutt/autobuild/defines b/app-network/mutt/autobuild/defines
similarity index 100%
rename from extra-network/mutt/autobuild/defines
rename to app-network/mutt/autobuild/defines
diff --git a/extra-network/mutt/spec b/app-network/mutt/spec
similarity index 100%
rename from extra-network/mutt/spec
rename to app-network/mutt/spec
diff --git a/extra-network/n2n/autobuild/beyond b/app-network/n2n/autobuild/beyond
similarity index 100%
rename from extra-network/n2n/autobuild/beyond
rename to app-network/n2n/autobuild/beyond
diff --git a/extra-network/n2n/autobuild/defines b/app-network/n2n/autobuild/defines
similarity index 100%
rename from extra-network/n2n/autobuild/defines
rename to app-network/n2n/autobuild/defines
diff --git a/extra-network/n2n/autobuild/prepare b/app-network/n2n/autobuild/prepare
similarity index 100%
rename from extra-network/n2n/autobuild/prepare
rename to app-network/n2n/autobuild/prepare
diff --git a/extra-network/n2n/spec b/app-network/n2n/spec
similarity index 100%
rename from extra-network/n2n/spec
rename to app-network/n2n/spec
diff --git a/extra-network/nanomsg/autobuild/defines b/app-network/nanomsg/autobuild/defines
similarity index 100%
rename from extra-network/nanomsg/autobuild/defines
rename to app-network/nanomsg/autobuild/defines
diff --git a/extra-network/nanomsg/spec b/app-network/nanomsg/spec
similarity index 100%
rename from extra-network/nanomsg/spec
rename to app-network/nanomsg/spec
diff --git a/extra-network/nbd/autobuild/defines b/app-network/nbd/autobuild/defines
similarity index 100%
rename from extra-network/nbd/autobuild/defines
rename to app-network/nbd/autobuild/defines
diff --git a/extra-network/nbd/autobuild/overrides/etc/conf.d/nbd-server b/app-network/nbd/autobuild/overrides/etc/conf.d/nbd-server
similarity index 100%
rename from extra-network/nbd/autobuild/overrides/etc/conf.d/nbd-server
rename to app-network/nbd/autobuild/overrides/etc/conf.d/nbd-server
diff --git a/extra-network/nbd/autobuild/overrides/usr/lib/modules-load.d/nbd.conf b/app-network/nbd/autobuild/overrides/usr/lib/modules-load.d/nbd.conf
similarity index 100%
rename from extra-network/nbd/autobuild/overrides/usr/lib/modules-load.d/nbd.conf
rename to app-network/nbd/autobuild/overrides/usr/lib/modules-load.d/nbd.conf
diff --git a/extra-network/nbd/autobuild/overrides/usr/lib/systemd/system/nbd-server.service b/app-network/nbd/autobuild/overrides/usr/lib/systemd/system/nbd-server.service
similarity index 100%
rename from extra-network/nbd/autobuild/overrides/usr/lib/systemd/system/nbd-server.service
rename to app-network/nbd/autobuild/overrides/usr/lib/systemd/system/nbd-server.service
diff --git a/extra-network/nbd/spec b/app-network/nbd/spec
similarity index 100%
rename from extra-network/nbd/spec
rename to app-network/nbd/spec
diff --git a/extra-network/neomutt/autobuild/conffiles b/app-network/neomutt/autobuild/conffiles
similarity index 100%
rename from extra-network/neomutt/autobuild/conffiles
rename to app-network/neomutt/autobuild/conffiles
diff --git a/extra-network/neomutt/autobuild/defines b/app-network/neomutt/autobuild/defines
similarity index 100%
rename from extra-network/neomutt/autobuild/defines
rename to app-network/neomutt/autobuild/defines
diff --git a/extra-network/neomutt/spec b/app-network/neomutt/spec
similarity index 100%
rename from extra-network/neomutt/spec
rename to app-network/neomutt/spec
diff --git a/extra-network/net-snmp/autobuild/beyond b/app-network/net-snmp/autobuild/beyond
similarity index 100%
rename from extra-network/net-snmp/autobuild/beyond
rename to app-network/net-snmp/autobuild/beyond
diff --git a/extra-network/net-snmp/autobuild/defines b/app-network/net-snmp/autobuild/defines
similarity index 100%
rename from extra-network/net-snmp/autobuild/defines
rename to app-network/net-snmp/autobuild/defines
diff --git a/extra-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmpd.service b/app-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmpd.service
similarity index 100%
rename from extra-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmpd.service
rename to app-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmpd.service
diff --git a/extra-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmptrapd.service b/app-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmptrapd.service
similarity index 100%
rename from extra-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmptrapd.service
rename to app-network/net-snmp/autobuild/overrides/usr/lib/systemd/system/snmptrapd.service
diff --git a/extra-network/net-snmp/autobuild/patches/CVE-2018-1000116.patch b/app-network/net-snmp/autobuild/patches/CVE-2018-1000116.patch
similarity index 100%
rename from extra-network/net-snmp/autobuild/patches/CVE-2018-1000116.patch
rename to app-network/net-snmp/autobuild/patches/CVE-2018-1000116.patch
diff --git a/extra-network/net-snmp/autobuild/patches/CVE-2018-18065.patch b/app-network/net-snmp/autobuild/patches/CVE-2018-18065.patch
similarity index 100%
rename from extra-network/net-snmp/autobuild/patches/CVE-2018-18065.patch
rename to app-network/net-snmp/autobuild/patches/CVE-2018-18065.patch
diff --git a/extra-network/net-snmp/autobuild/patches/net-snmp-5.7.3-openssl.patch b/app-network/net-snmp/autobuild/patches/net-snmp-5.7.3-openssl.patch
similarity index 100%
rename from extra-network/net-snmp/autobuild/patches/net-snmp-5.7.3-openssl.patch
rename to app-network/net-snmp/autobuild/patches/net-snmp-5.7.3-openssl.patch
diff --git a/extra-network/net-snmp/autobuild/patches/net-snmp-5.7.3-perl-5.24.patch b/app-network/net-snmp/autobuild/patches/net-snmp-5.7.3-perl-5.24.patch
similarity index 100%
rename from extra-network/net-snmp/autobuild/patches/net-snmp-5.7.3-perl-5.24.patch
rename to app-network/net-snmp/autobuild/patches/net-snmp-5.7.3-perl-5.24.patch
diff --git a/extra-network/net-snmp/autobuild/prepare b/app-network/net-snmp/autobuild/prepare
similarity index 100%
rename from extra-network/net-snmp/autobuild/prepare
rename to app-network/net-snmp/autobuild/prepare
diff --git a/extra-network/net-snmp/spec b/app-network/net-snmp/spec
similarity index 100%
rename from extra-network/net-snmp/spec
rename to app-network/net-snmp/spec
diff --git a/extra-network/net-tools/autobuild/build b/app-network/net-tools/autobuild/build
similarity index 100%
rename from extra-network/net-tools/autobuild/build
rename to app-network/net-tools/autobuild/build
diff --git a/extra-network/net-tools/autobuild/defines b/app-network/net-tools/autobuild/defines
similarity index 100%
rename from extra-network/net-tools/autobuild/defines
rename to app-network/net-tools/autobuild/defines
diff --git a/extra-network/net-tools/autobuild/prepare b/app-network/net-tools/autobuild/prepare
similarity index 100%
rename from extra-network/net-tools/autobuild/prepare
rename to app-network/net-tools/autobuild/prepare
diff --git a/extra-network/net-tools/spec b/app-network/net-tools/spec
similarity index 100%
rename from extra-network/net-tools/spec
rename to app-network/net-tools/spec
diff --git a/extra-network/netcat/autobuild/build b/app-network/netcat/autobuild/build
similarity index 100%
rename from extra-network/netcat/autobuild/build
rename to app-network/netcat/autobuild/build
diff --git a/extra-network/netcat/autobuild/defines b/app-network/netcat/autobuild/defines
similarity index 100%
rename from extra-network/netcat/autobuild/defines
rename to app-network/netcat/autobuild/defines
diff --git a/extra-network/netcat/autobuild/patches/broadcast-support.patch b/app-network/netcat/autobuild/patches/broadcast-support.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/broadcast-support.patch
rename to app-network/netcat/autobuild/patches/broadcast-support.patch
diff --git a/extra-network/netcat/autobuild/patches/build-without-TLS-support.patch b/app-network/netcat/autobuild/patches/build-without-TLS-support.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/build-without-TLS-support.patch
rename to app-network/netcat/autobuild/patches/build-without-TLS-support.patch
diff --git a/extra-network/netcat/autobuild/patches/connect-timeout.patch b/app-network/netcat/autobuild/patches/connect-timeout.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/connect-timeout.patch
rename to app-network/netcat/autobuild/patches/connect-timeout.patch
diff --git a/extra-network/netcat/autobuild/patches/dccp-support.patch b/app-network/netcat/autobuild/patches/dccp-support.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/dccp-support.patch
rename to app-network/netcat/autobuild/patches/dccp-support.patch
diff --git a/extra-network/netcat/autobuild/patches/destination-port-list.patch b/app-network/netcat/autobuild/patches/destination-port-list.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/destination-port-list.patch
rename to app-network/netcat/autobuild/patches/destination-port-list.patch
diff --git a/extra-network/netcat/autobuild/patches/get-sev-by-name.patch b/app-network/netcat/autobuild/patches/get-sev-by-name.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/get-sev-by-name.patch
rename to app-network/netcat/autobuild/patches/get-sev-by-name.patch
diff --git a/extra-network/netcat/autobuild/patches/misc-failures-and-features.patch b/app-network/netcat/autobuild/patches/misc-failures-and-features.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/misc-failures-and-features.patch
rename to app-network/netcat/autobuild/patches/misc-failures-and-features.patch
diff --git a/extra-network/netcat/autobuild/patches/port-to-linux-with-libsd.patch b/app-network/netcat/autobuild/patches/port-to-linux-with-libsd.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/port-to-linux-with-libsd.patch
rename to app-network/netcat/autobuild/patches/port-to-linux-with-libsd.patch
diff --git a/extra-network/netcat/autobuild/patches/quit-timer.patch b/app-network/netcat/autobuild/patches/quit-timer.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/quit-timer.patch
rename to app-network/netcat/autobuild/patches/quit-timer.patch
diff --git a/extra-network/netcat/autobuild/patches/send-crlf.patch b/app-network/netcat/autobuild/patches/send-crlf.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/send-crlf.patch
rename to app-network/netcat/autobuild/patches/send-crlf.patch
diff --git a/extra-network/netcat/autobuild/patches/serialized-handling-multiple-clients.patch b/app-network/netcat/autobuild/patches/serialized-handling-multiple-clients.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/serialized-handling-multiple-clients.patch
rename to app-network/netcat/autobuild/patches/serialized-handling-multiple-clients.patch
diff --git a/extra-network/netcat/autobuild/patches/series b/app-network/netcat/autobuild/patches/series
similarity index 100%
rename from extra-network/netcat/autobuild/patches/series
rename to app-network/netcat/autobuild/patches/series
diff --git a/extra-network/netcat/autobuild/patches/set-TCP-MD5SIG-correctly-for-client-connections.patch b/app-network/netcat/autobuild/patches/set-TCP-MD5SIG-correctly-for-client-connections.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/set-TCP-MD5SIG-correctly-for-client-connections.patch
rename to app-network/netcat/autobuild/patches/set-TCP-MD5SIG-correctly-for-client-connections.patch
diff --git a/extra-network/netcat/autobuild/patches/udp-scan-timeout.patch b/app-network/netcat/autobuild/patches/udp-scan-timeout.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/udp-scan-timeout.patch
rename to app-network/netcat/autobuild/patches/udp-scan-timeout.patch
diff --git a/extra-network/netcat/autobuild/patches/use-flags-to-specify-listen-address.patch b/app-network/netcat/autobuild/patches/use-flags-to-specify-listen-address.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/use-flags-to-specify-listen-address.patch
rename to app-network/netcat/autobuild/patches/use-flags-to-specify-listen-address.patch
diff --git a/extra-network/netcat/autobuild/patches/verbose-numeric-port.patch b/app-network/netcat/autobuild/patches/verbose-numeric-port.patch
similarity index 100%
rename from extra-network/netcat/autobuild/patches/verbose-numeric-port.patch
rename to app-network/netcat/autobuild/patches/verbose-numeric-port.patch
diff --git a/extra-network/netcat/spec b/app-network/netcat/spec
similarity index 100%
rename from extra-network/netcat/spec
rename to app-network/netcat/spec
diff --git a/extra-network/netctl/autobuild/beyond b/app-network/netctl/autobuild/beyond
similarity index 100%
rename from extra-network/netctl/autobuild/beyond
rename to app-network/netctl/autobuild/beyond
diff --git a/extra-network/netctl/autobuild/defines b/app-network/netctl/autobuild/defines
similarity index 100%
rename from extra-network/netctl/autobuild/defines
rename to app-network/netctl/autobuild/defines
diff --git a/extra-network/netctl/spec b/app-network/netctl/spec
similarity index 100%
rename from extra-network/netctl/spec
rename to app-network/netctl/spec
diff --git a/extra-network/netdiag/autobuild/build b/app-network/netdiag/autobuild/build
similarity index 100%
rename from extra-network/netdiag/autobuild/build
rename to app-network/netdiag/autobuild/build
diff --git a/extra-network/netdiag/autobuild/defines b/app-network/netdiag/autobuild/defines
similarity index 100%
rename from extra-network/netdiag/autobuild/defines
rename to app-network/netdiag/autobuild/defines
diff --git a/extra-network/netdiag/autobuild/patches/adapt_netload_to_bsd.diff b/app-network/netdiag/autobuild/patches/adapt_netload_to_bsd.diff
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/adapt_netload_to_bsd.diff
rename to app-network/netdiag/autobuild/patches/adapt_netload_to_bsd.diff
diff --git a/extra-network/netdiag/autobuild/patches/adaption_to_kfreebsd.diff b/app-network/netdiag/autobuild/patches/adaption_to_kfreebsd.diff
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/adaption_to_kfreebsd.diff
rename to app-network/netdiag/autobuild/patches/adaption_to_kfreebsd.diff
diff --git a/extra-network/netdiag/autobuild/patches/clang-ftbfs.diff b/app-network/netdiag/autobuild/patches/clang-ftbfs.diff
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/clang-ftbfs.diff
rename to app-network/netdiag/autobuild/patches/clang-ftbfs.diff
diff --git a/extra-network/netdiag/autobuild/patches/series b/app-network/netdiag/autobuild/patches/series
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/series
rename to app-network/netdiag/autobuild/patches/series
diff --git a/extra-network/netdiag/autobuild/patches/statnet.diff b/app-network/netdiag/autobuild/patches/statnet.diff
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/statnet.diff
rename to app-network/netdiag/autobuild/patches/statnet.diff
diff --git a/extra-network/netdiag/autobuild/patches/tcpblast.diff b/app-network/netdiag/autobuild/patches/tcpblast.diff
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/tcpblast.diff
rename to app-network/netdiag/autobuild/patches/tcpblast.diff
diff --git a/extra-network/netdiag/autobuild/patches/tcpspray.diff b/app-network/netdiag/autobuild/patches/tcpspray.diff
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/tcpspray.diff
rename to app-network/netdiag/autobuild/patches/tcpspray.diff
diff --git a/extra-network/netdiag/autobuild/patches/trafshow.diff b/app-network/netdiag/autobuild/patches/trafshow.diff
similarity index 100%
rename from extra-network/netdiag/autobuild/patches/trafshow.diff
rename to app-network/netdiag/autobuild/patches/trafshow.diff
diff --git a/extra-network/netdiag/autobuild/prepare b/app-network/netdiag/autobuild/prepare
similarity index 100%
rename from extra-network/netdiag/autobuild/prepare
rename to app-network/netdiag/autobuild/prepare
diff --git a/extra-network/netdiag/spec b/app-network/netdiag/spec
similarity index 100%
rename from extra-network/netdiag/spec
rename to app-network/netdiag/spec
diff --git a/extra-network/nethogs/autobuild/build b/app-network/nethogs/autobuild/build
similarity index 100%
rename from extra-network/nethogs/autobuild/build
rename to app-network/nethogs/autobuild/build
diff --git a/extra-network/nethogs/autobuild/defines b/app-network/nethogs/autobuild/defines
similarity index 100%
rename from extra-network/nethogs/autobuild/defines
rename to app-network/nethogs/autobuild/defines
diff --git a/extra-network/nethogs/autobuild/prepare b/app-network/nethogs/autobuild/prepare
similarity index 100%
rename from extra-network/nethogs/autobuild/prepare
rename to app-network/nethogs/autobuild/prepare
diff --git a/extra-network/nethogs/spec b/app-network/nethogs/spec
similarity index 100%
rename from extra-network/nethogs/spec
rename to app-network/nethogs/spec
diff --git a/extra-network/netperf/autobuild/defines b/app-network/netperf/autobuild/defines
similarity index 100%
rename from extra-network/netperf/autobuild/defines
rename to app-network/netperf/autobuild/defines
diff --git a/extra-network/netperf/autobuild/overrides/usr/lib/systemd/system/netperf-server.service b/app-network/netperf/autobuild/overrides/usr/lib/systemd/system/netperf-server.service
similarity index 100%
rename from extra-network/netperf/autobuild/overrides/usr/lib/systemd/system/netperf-server.service
rename to app-network/netperf/autobuild/overrides/usr/lib/systemd/system/netperf-server.service
diff --git a/extra-network/netperf/autobuild/patches/001-fix-inlining.patch b/app-network/netperf/autobuild/patches/001-fix-inlining.patch
similarity index 100%
rename from extra-network/netperf/autobuild/patches/001-fix-inlining.patch
rename to app-network/netperf/autobuild/patches/001-fix-inlining.patch
diff --git a/extra-network/netperf/autobuild/postinst b/app-network/netperf/autobuild/postinst
similarity index 100%
rename from extra-network/netperf/autobuild/postinst
rename to app-network/netperf/autobuild/postinst
diff --git a/extra-network/netperf/autobuild/prepare b/app-network/netperf/autobuild/prepare
similarity index 100%
rename from extra-network/netperf/autobuild/prepare
rename to app-network/netperf/autobuild/prepare
diff --git a/extra-network/netperf/spec b/app-network/netperf/spec
similarity index 100%
rename from extra-network/netperf/spec
rename to app-network/netperf/spec
diff --git a/extra-network/netselect/autobuild/build b/app-network/netselect/autobuild/build
similarity index 100%
rename from extra-network/netselect/autobuild/build
rename to app-network/netselect/autobuild/build
diff --git a/extra-network/netselect/autobuild/defines b/app-network/netselect/autobuild/defines
similarity index 100%
rename from extra-network/netselect/autobuild/defines
rename to app-network/netselect/autobuild/defines
diff --git a/extra-network/netselect/autobuild/patch b/app-network/netselect/autobuild/patch
similarity index 100%
rename from extra-network/netselect/autobuild/patch
rename to app-network/netselect/autobuild/patch
diff --git a/extra-network/netselect/spec b/app-network/netselect/spec
similarity index 100%
rename from extra-network/netselect/spec
rename to app-network/netselect/spec
diff --git a/extra-network/networkmanager-l2tp/autobuild/defines b/app-network/networkmanager-l2tp/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager-l2tp/autobuild/defines
rename to app-network/networkmanager-l2tp/autobuild/defines
diff --git a/extra-network/networkmanager-l2tp/spec b/app-network/networkmanager-l2tp/spec
similarity index 100%
rename from extra-network/networkmanager-l2tp/spec
rename to app-network/networkmanager-l2tp/spec
diff --git a/extra-network/networkmanager-openconnect/autobuild/beyond b/app-network/networkmanager-openconnect/autobuild/beyond
similarity index 100%
rename from extra-network/networkmanager-openconnect/autobuild/beyond
rename to app-network/networkmanager-openconnect/autobuild/beyond
diff --git a/extra-network/networkmanager-openconnect/autobuild/defines b/app-network/networkmanager-openconnect/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager-openconnect/autobuild/defines
rename to app-network/networkmanager-openconnect/autobuild/defines
diff --git a/extra-network/networkmanager-openconnect/autobuild/postinst b/app-network/networkmanager-openconnect/autobuild/postinst
similarity index 100%
rename from extra-network/networkmanager-openconnect/autobuild/postinst
rename to app-network/networkmanager-openconnect/autobuild/postinst
diff --git a/extra-network/networkmanager-openconnect/spec b/app-network/networkmanager-openconnect/spec
similarity index 100%
rename from extra-network/networkmanager-openconnect/spec
rename to app-network/networkmanager-openconnect/spec
diff --git a/extra-network/networkmanager-openswan/autobuild/defines b/app-network/networkmanager-openswan/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager-openswan/autobuild/defines
rename to app-network/networkmanager-openswan/autobuild/defines
diff --git a/extra-network/networkmanager-openswan/spec b/app-network/networkmanager-openswan/spec
similarity index 100%
rename from extra-network/networkmanager-openswan/spec
rename to app-network/networkmanager-openswan/spec
diff --git a/extra-network/networkmanager-openvpn/autobuild/beyond b/app-network/networkmanager-openvpn/autobuild/beyond
similarity index 100%
rename from extra-network/networkmanager-openvpn/autobuild/beyond
rename to app-network/networkmanager-openvpn/autobuild/beyond
diff --git a/extra-network/networkmanager-openvpn/autobuild/defines b/app-network/networkmanager-openvpn/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager-openvpn/autobuild/defines
rename to app-network/networkmanager-openvpn/autobuild/defines
diff --git a/extra-network/networkmanager-openvpn/autobuild/postinst b/app-network/networkmanager-openvpn/autobuild/postinst
similarity index 100%
rename from extra-network/networkmanager-openvpn/autobuild/postinst
rename to app-network/networkmanager-openvpn/autobuild/postinst
diff --git a/extra-network/networkmanager-openvpn/spec b/app-network/networkmanager-openvpn/spec
similarity index 100%
rename from extra-network/networkmanager-openvpn/spec
rename to app-network/networkmanager-openvpn/spec
diff --git a/extra-network/networkmanager-pptp/autobuild/defines b/app-network/networkmanager-pptp/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager-pptp/autobuild/defines
rename to app-network/networkmanager-pptp/autobuild/defines
diff --git a/extra-network/networkmanager-pptp/spec b/app-network/networkmanager-pptp/spec
similarity index 100%
rename from extra-network/networkmanager-pptp/spec
rename to app-network/networkmanager-pptp/spec
diff --git a/extra-network/networkmanager-strongswan/autobuild/defines b/app-network/networkmanager-strongswan/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager-strongswan/autobuild/defines
rename to app-network/networkmanager-strongswan/autobuild/defines
diff --git a/extra-network/networkmanager-strongswan/spec b/app-network/networkmanager-strongswan/spec
similarity index 100%
rename from extra-network/networkmanager-strongswan/spec
rename to app-network/networkmanager-strongswan/spec
diff --git a/extra-network/networkmanager-vpnc/autobuild/defines b/app-network/networkmanager-vpnc/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager-vpnc/autobuild/defines
rename to app-network/networkmanager-vpnc/autobuild/defines
diff --git a/extra-network/networkmanager-vpnc/spec b/app-network/networkmanager-vpnc/spec
similarity index 100%
rename from extra-network/networkmanager-vpnc/spec
rename to app-network/networkmanager-vpnc/spec
diff --git a/extra-network/networkmanager/autobuild/armel b/app-network/networkmanager/autobuild/armel
similarity index 100%
rename from extra-network/networkmanager/autobuild/armel
rename to app-network/networkmanager/autobuild/armel
diff --git a/extra-network/networkmanager/autobuild/armhf b/app-network/networkmanager/autobuild/armhf
similarity index 100%
rename from extra-network/networkmanager/autobuild/armhf
rename to app-network/networkmanager/autobuild/armhf
diff --git a/extra-network/networkmanager/autobuild/beyond b/app-network/networkmanager/autobuild/beyond
similarity index 100%
rename from extra-network/networkmanager/autobuild/beyond
rename to app-network/networkmanager/autobuild/beyond
diff --git a/extra-network/networkmanager/autobuild/conffiles b/app-network/networkmanager/autobuild/conffiles
similarity index 100%
rename from extra-network/networkmanager/autobuild/conffiles
rename to app-network/networkmanager/autobuild/conffiles
diff --git a/extra-network/networkmanager/autobuild/defines b/app-network/networkmanager/autobuild/defines
similarity index 100%
rename from extra-network/networkmanager/autobuild/defines
rename to app-network/networkmanager/autobuild/defines
diff --git a/extra-network/networkmanager/autobuild/i486 b/app-network/networkmanager/autobuild/i486
similarity index 100%
rename from extra-network/networkmanager/autobuild/i486
rename to app-network/networkmanager/autobuild/i486
diff --git a/extra-network/networkmanager/autobuild/loongson2f b/app-network/networkmanager/autobuild/loongson2f
similarity index 100%
rename from extra-network/networkmanager/autobuild/loongson2f
rename to app-network/networkmanager/autobuild/loongson2f
diff --git a/extra-network/networkmanager/autobuild/overrides/etc/NetworkManager/NetworkManager.conf b/app-network/networkmanager/autobuild/overrides/etc/NetworkManager/NetworkManager.conf
similarity index 100%
rename from extra-network/networkmanager/autobuild/overrides/etc/NetworkManager/NetworkManager.conf
rename to app-network/networkmanager/autobuild/overrides/etc/NetworkManager/NetworkManager.conf
diff --git a/extra-network/networkmanager/autobuild/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf b/app-network/networkmanager/autobuild/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf
similarity index 100%
rename from extra-network/networkmanager/autobuild/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf
rename to app-network/networkmanager/autobuild/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf
diff --git a/extra-network/networkmanager/autobuild/patches/0001-Add-condition-declaration-to-systemd-unit.patch b/app-network/networkmanager/autobuild/patches/0001-Add-condition-declaration-to-systemd-unit.patch
similarity index 100%
rename from extra-network/networkmanager/autobuild/patches/0001-Add-condition-declaration-to-systemd-unit.patch
rename to app-network/networkmanager/autobuild/patches/0001-Add-condition-declaration-to-systemd-unit.patch
diff --git a/extra-network/networkmanager/autobuild/powerpc b/app-network/networkmanager/autobuild/powerpc
similarity index 100%
rename from extra-network/networkmanager/autobuild/powerpc
rename to app-network/networkmanager/autobuild/powerpc
diff --git a/extra-network/networkmanager/autobuild/ppc64 b/app-network/networkmanager/autobuild/ppc64
similarity index 100%
rename from extra-network/networkmanager/autobuild/ppc64
rename to app-network/networkmanager/autobuild/ppc64
diff --git a/extra-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/NetworkManager.conf b/app-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/NetworkManager.conf
similarity index 100%
rename from extra-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/NetworkManager.conf
rename to app-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/NetworkManager.conf
diff --git a/extra-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf b/app-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf
similarity index 100%
rename from extra-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf
rename to app-network/networkmanager/autobuild/retro/overrides/etc/NetworkManager/conf.d/31-mac-addr-change.conf
diff --git a/extra-network/networkmanager/autobuild/retro/overrides/usr/share/pixmaps/networkmanager.png b/app-network/networkmanager/autobuild/retro/overrides/usr/share/pixmaps/networkmanager.png
similarity index 100%
rename from extra-network/networkmanager/autobuild/retro/overrides/usr/share/pixmaps/networkmanager.png
rename to app-network/networkmanager/autobuild/retro/overrides/usr/share/pixmaps/networkmanager.png
diff --git a/extra-network/networkmanager/spec b/app-network/networkmanager/spec
similarity index 100%
rename from extra-network/networkmanager/spec
rename to app-network/networkmanager/spec
diff --git a/extra-network/nftables/autobuild/conffiles b/app-network/nftables/autobuild/conffiles
similarity index 100%
rename from extra-network/nftables/autobuild/conffiles
rename to app-network/nftables/autobuild/conffiles
diff --git a/extra-network/nftables/autobuild/defines b/app-network/nftables/autobuild/defines
similarity index 100%
rename from extra-network/nftables/autobuild/defines
rename to app-network/nftables/autobuild/defines
diff --git a/extra-network/nftables/autobuild/overrides/etc/nftables.conf b/app-network/nftables/autobuild/overrides/etc/nftables.conf
similarity index 100%
rename from extra-network/nftables/autobuild/overrides/etc/nftables.conf
rename to app-network/nftables/autobuild/overrides/etc/nftables.conf
diff --git a/extra-network/nftables/autobuild/overrides/usr/lib/systemd/scripts/nftables-reload b/app-network/nftables/autobuild/overrides/usr/lib/systemd/scripts/nftables-reload
similarity index 100%
rename from extra-network/nftables/autobuild/overrides/usr/lib/systemd/scripts/nftables-reload
rename to app-network/nftables/autobuild/overrides/usr/lib/systemd/scripts/nftables-reload
diff --git a/extra-network/nftables/autobuild/overrides/usr/lib/systemd/system/nftables.service b/app-network/nftables/autobuild/overrides/usr/lib/systemd/system/nftables.service
similarity index 100%
rename from extra-network/nftables/autobuild/overrides/usr/lib/systemd/system/nftables.service
rename to app-network/nftables/autobuild/overrides/usr/lib/systemd/system/nftables.service
diff --git a/extra-network/nftables/spec b/app-network/nftables/spec
similarity index 100%
rename from extra-network/nftables/spec
rename to app-network/nftables/spec
diff --git a/extra-network/nload/autobuild/defines b/app-network/nload/autobuild/defines
similarity index 100%
rename from extra-network/nload/autobuild/defines
rename to app-network/nload/autobuild/defines
diff --git a/extra-network/nload/spec b/app-network/nload/spec
similarity index 100%
rename from extra-network/nload/spec
rename to app-network/nload/spec
diff --git a/extra-network/nmap/autobuild/beyond b/app-network/nmap/autobuild/beyond
similarity index 100%
rename from extra-network/nmap/autobuild/beyond
rename to app-network/nmap/autobuild/beyond
diff --git a/extra-network/nmap/autobuild/defines b/app-network/nmap/autobuild/defines
similarity index 100%
rename from extra-network/nmap/autobuild/defines
rename to app-network/nmap/autobuild/defines
diff --git a/extra-network/nmap/spec b/app-network/nmap/spec
similarity index 100%
rename from extra-network/nmap/spec
rename to app-network/nmap/spec
diff --git a/extra-network/noip/autobuild/build b/app-network/noip/autobuild/build
similarity index 100%
rename from extra-network/noip/autobuild/build
rename to app-network/noip/autobuild/build
diff --git a/extra-network/noip/autobuild/defines b/app-network/noip/autobuild/defines
similarity index 100%
rename from extra-network/noip/autobuild/defines
rename to app-network/noip/autobuild/defines
diff --git a/extra-network/noip/autobuild/overrides/usr/lib/systemd/system/noip.service b/app-network/noip/autobuild/overrides/usr/lib/systemd/system/noip.service
similarity index 100%
rename from extra-network/noip/autobuild/overrides/usr/lib/systemd/system/noip.service
rename to app-network/noip/autobuild/overrides/usr/lib/systemd/system/noip.service
diff --git a/extra-network/noip/spec b/app-network/noip/spec
similarity index 100%
rename from extra-network/noip/spec
rename to app-network/noip/spec
diff --git a/extra-network/noip/spect b/app-network/noip/spect
similarity index 100%
rename from extra-network/noip/spect
rename to app-network/noip/spect
diff --git a/extra-network/notmuch/autobuild/beyond b/app-network/notmuch/autobuild/beyond
similarity index 100%
rename from extra-network/notmuch/autobuild/beyond
rename to app-network/notmuch/autobuild/beyond
diff --git a/extra-network/notmuch/autobuild/defines b/app-network/notmuch/autobuild/defines
similarity index 100%
rename from extra-network/notmuch/autobuild/defines
rename to app-network/notmuch/autobuild/defines
diff --git a/extra-network/notmuch/autobuild/prepare b/app-network/notmuch/autobuild/prepare
similarity index 100%
rename from extra-network/notmuch/autobuild/prepare
rename to app-network/notmuch/autobuild/prepare
diff --git a/extra-network/notmuch/spec b/app-network/notmuch/spec
similarity index 100%
rename from extra-network/notmuch/spec
rename to app-network/notmuch/spec
diff --git a/extra-network/nsd/autobuild/beyond b/app-network/nsd/autobuild/beyond
similarity index 100%
rename from extra-network/nsd/autobuild/beyond
rename to app-network/nsd/autobuild/beyond
diff --git a/extra-network/nsd/autobuild/defines b/app-network/nsd/autobuild/defines
similarity index 100%
rename from extra-network/nsd/autobuild/defines
rename to app-network/nsd/autobuild/defines
diff --git a/extra-network/nsd/autobuild/overrides/etc/nsd/nsd.conf b/app-network/nsd/autobuild/overrides/etc/nsd/nsd.conf
similarity index 100%
rename from extra-network/nsd/autobuild/overrides/etc/nsd/nsd.conf
rename to app-network/nsd/autobuild/overrides/etc/nsd/nsd.conf
diff --git a/extra-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd-keygen.service b/app-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd-keygen.service
similarity index 100%
rename from extra-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd-keygen.service
rename to app-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd-keygen.service
diff --git a/extra-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd.service b/app-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd.service
similarity index 100%
rename from extra-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd.service
rename to app-network/nsd/autobuild/overrides/usr/lib/systemd/system/nsd.service
diff --git a/extra-network/nsd/autobuild/overrides/usr/lib/tmpfiles.d/nsd.conf b/app-network/nsd/autobuild/overrides/usr/lib/tmpfiles.d/nsd.conf
similarity index 100%
rename from extra-network/nsd/autobuild/overrides/usr/lib/tmpfiles.d/nsd.conf
rename to app-network/nsd/autobuild/overrides/usr/lib/tmpfiles.d/nsd.conf
diff --git a/extra-network/nsd/autobuild/postinst b/app-network/nsd/autobuild/postinst
similarity index 100%
rename from extra-network/nsd/autobuild/postinst
rename to app-network/nsd/autobuild/postinst
diff --git a/extra-network/nsd/spec b/app-network/nsd/spec
similarity index 100%
rename from extra-network/nsd/spec
rename to app-network/nsd/spec
diff --git a/extra-network/obfs4proxy/autobuild/build b/app-network/obfs4proxy/autobuild/build
similarity index 100%
rename from extra-network/obfs4proxy/autobuild/build
rename to app-network/obfs4proxy/autobuild/build
diff --git a/extra-network/obfs4proxy/autobuild/defines b/app-network/obfs4proxy/autobuild/defines
similarity index 100%
rename from extra-network/obfs4proxy/autobuild/defines
rename to app-network/obfs4proxy/autobuild/defines
diff --git a/extra-network/obfs4proxy/spec b/app-network/obfs4proxy/spec
similarity index 100%
rename from extra-network/obfs4proxy/spec
rename to app-network/obfs4proxy/spec
diff --git a/extra-network/obfsproxy/autobuild/defines b/app-network/obfsproxy/autobuild/defines
similarity index 100%
rename from extra-network/obfsproxy/autobuild/defines
rename to app-network/obfsproxy/autobuild/defines
diff --git a/extra-network/obfsproxy/autobuild/prepare b/app-network/obfsproxy/autobuild/prepare
similarity index 100%
rename from extra-network/obfsproxy/autobuild/prepare
rename to app-network/obfsproxy/autobuild/prepare
diff --git a/extra-network/obfsproxy/spec b/app-network/obfsproxy/spec
similarity index 100%
rename from extra-network/obfsproxy/spec
rename to app-network/obfsproxy/spec
diff --git a/extra-network/ocserv/autobuild/beyond b/app-network/ocserv/autobuild/beyond
similarity index 100%
rename from extra-network/ocserv/autobuild/beyond
rename to app-network/ocserv/autobuild/beyond
diff --git a/extra-network/ocserv/autobuild/defines b/app-network/ocserv/autobuild/defines
similarity index 100%
rename from extra-network/ocserv/autobuild/defines
rename to app-network/ocserv/autobuild/defines
diff --git a/extra-network/ocserv/autobuild/overrides/etc/ocserv/ocserv.conf b/app-network/ocserv/autobuild/overrides/etc/ocserv/ocserv.conf
similarity index 100%
rename from extra-network/ocserv/autobuild/overrides/etc/ocserv/ocserv.conf
rename to app-network/ocserv/autobuild/overrides/etc/ocserv/ocserv.conf
diff --git a/extra-network/ocserv/autobuild/overrides/etc/pam.d/ocserv b/app-network/ocserv/autobuild/overrides/etc/pam.d/ocserv
similarity index 100%
rename from extra-network/ocserv/autobuild/overrides/etc/pam.d/ocserv
rename to app-network/ocserv/autobuild/overrides/etc/pam.d/ocserv
diff --git a/extra-network/ocserv/autobuild/overrides/usr/bin/ocserv-genkey b/app-network/ocserv/autobuild/overrides/usr/bin/ocserv-genkey
similarity index 100%
rename from extra-network/ocserv/autobuild/overrides/usr/bin/ocserv-genkey
rename to app-network/ocserv/autobuild/overrides/usr/bin/ocserv-genkey
diff --git a/extra-network/ocserv/autobuild/overrides/usr/lib/systemd/system/ocserv.service b/app-network/ocserv/autobuild/overrides/usr/lib/systemd/system/ocserv.service
similarity index 100%
rename from extra-network/ocserv/autobuild/overrides/usr/lib/systemd/system/ocserv.service
rename to app-network/ocserv/autobuild/overrides/usr/lib/systemd/system/ocserv.service
diff --git a/extra-network/ocserv/autobuild/overrides/usr/lib/sysusers.d/ocserv.conf b/app-network/ocserv/autobuild/overrides/usr/lib/sysusers.d/ocserv.conf
similarity index 100%
rename from extra-network/ocserv/autobuild/overrides/usr/lib/sysusers.d/ocserv.conf
rename to app-network/ocserv/autobuild/overrides/usr/lib/sysusers.d/ocserv.conf
diff --git a/extra-network/ocserv/autobuild/overrides/usr/lib/tmpfiles.d/ocserv.conf b/app-network/ocserv/autobuild/overrides/usr/lib/tmpfiles.d/ocserv.conf
similarity index 100%
rename from extra-network/ocserv/autobuild/overrides/usr/lib/tmpfiles.d/ocserv.conf
rename to app-network/ocserv/autobuild/overrides/usr/lib/tmpfiles.d/ocserv.conf
diff --git a/extra-network/ocserv/autobuild/postinst b/app-network/ocserv/autobuild/postinst
similarity index 100%
rename from extra-network/ocserv/autobuild/postinst
rename to app-network/ocserv/autobuild/postinst
diff --git a/extra-network/ocserv/autobuild/prepare b/app-network/ocserv/autobuild/prepare
similarity index 100%
rename from extra-network/ocserv/autobuild/prepare
rename to app-network/ocserv/autobuild/prepare
diff --git a/extra-network/ocserv/spec b/app-network/ocserv/spec
similarity index 100%
rename from extra-network/ocserv/spec
rename to app-network/ocserv/spec
diff --git a/extra-network/ofono/autobuild/beyond b/app-network/ofono/autobuild/beyond
similarity index 100%
rename from extra-network/ofono/autobuild/beyond
rename to app-network/ofono/autobuild/beyond
diff --git a/extra-network/ofono/autobuild/defines b/app-network/ofono/autobuild/defines
similarity index 100%
rename from extra-network/ofono/autobuild/defines
rename to app-network/ofono/autobuild/defines
diff --git a/extra-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono-auto-enable.service b/app-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono-auto-enable.service
similarity index 100%
rename from extra-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono-auto-enable.service
rename to app-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono-auto-enable.service
diff --git a/extra-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono.service b/app-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono.service
similarity index 100%
rename from extra-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono.service
rename to app-network/ofono/autobuild/overrides/usr/lib/systemd/system/ofono.service
diff --git a/extra-network/ofono/autobuild/patches/0001-common-create-GList-helper-ofono_call_compare.patch b/app-network/ofono/autobuild/patches/0001-common-create-GList-helper-ofono_call_compare.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/0001-common-create-GList-helper-ofono_call_compare.patch
rename to app-network/ofono/autobuild/patches/0001-common-create-GList-helper-ofono_call_compare.patch
diff --git a/extra-network/ofono/autobuild/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch b/app-network/ofono/autobuild/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
rename to app-network/ofono/autobuild/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
diff --git a/extra-network/ofono/autobuild/patches/0003-common-atmodem-move-at_util_call_compare_by_id-to-dr.patch b/app-network/ofono/autobuild/patches/0003-common-atmodem-move-at_util_call_compare_by_id-to-dr.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/0003-common-atmodem-move-at_util_call_compare_by_id-to-dr.patch
rename to app-network/ofono/autobuild/patches/0003-common-atmodem-move-at_util_call_compare_by_id-to-dr.patch
diff --git a/extra-network/ofono/autobuild/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch b/app-network/ofono/autobuild/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch
rename to app-network/ofono/autobuild/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch
diff --git a/extra-network/ofono/autobuild/patches/0005-qmimodem-implement-voice-calls.patch b/app-network/ofono/autobuild/patches/0005-qmimodem-implement-voice-calls.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/0005-qmimodem-implement-voice-calls.patch
rename to app-network/ofono/autobuild/patches/0005-qmimodem-implement-voice-calls.patch
diff --git a/extra-network/ofono/autobuild/patches/network-manager-compatiblity.patch b/app-network/ofono/autobuild/patches/network-manager-compatiblity.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/network-manager-compatiblity.patch
rename to app-network/ofono/autobuild/patches/network-manager-compatiblity.patch
diff --git a/extra-network/ofono/autobuild/patches/skip-broken-test.patch b/app-network/ofono/autobuild/patches/skip-broken-test.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/skip-broken-test.patch
rename to app-network/ofono/autobuild/patches/skip-broken-test.patch
diff --git a/extra-network/ofono/autobuild/patches/support-smdpkt.patch b/app-network/ofono/autobuild/patches/support-smdpkt.patch
similarity index 100%
rename from extra-network/ofono/autobuild/patches/support-smdpkt.patch
rename to app-network/ofono/autobuild/patches/support-smdpkt.patch
diff --git a/extra-network/ofono/spec b/app-network/ofono/spec
similarity index 100%
rename from extra-network/ofono/spec
rename to app-network/ofono/spec
diff --git a/extra-network/openconnect/autobuild/defines b/app-network/openconnect/autobuild/defines
similarity index 100%
rename from extra-network/openconnect/autobuild/defines
rename to app-network/openconnect/autobuild/defines
diff --git a/extra-network/openconnect/spec b/app-network/openconnect/spec
similarity index 100%
rename from extra-network/openconnect/spec
rename to app-network/openconnect/spec
diff --git a/base-network/openldap/autobuild/beyond b/app-network/openldap/autobuild/beyond
similarity index 100%
rename from base-network/openldap/autobuild/beyond
rename to app-network/openldap/autobuild/beyond
diff --git a/base-network/openldap/autobuild/defines b/app-network/openldap/autobuild/defines
similarity index 100%
rename from base-network/openldap/autobuild/defines
rename to app-network/openldap/autobuild/defines
diff --git a/base-network/openldap/autobuild/overrides/usr/lib/systemd/system/slapd.service b/app-network/openldap/autobuild/overrides/usr/lib/systemd/system/slapd.service
similarity index 100%
rename from base-network/openldap/autobuild/overrides/usr/lib/systemd/system/slapd.service
rename to app-network/openldap/autobuild/overrides/usr/lib/systemd/system/slapd.service
diff --git a/base-network/openldap/autobuild/overrides/usr/lib/sysusers.d/openldap.conf b/app-network/openldap/autobuild/overrides/usr/lib/sysusers.d/openldap.conf
similarity index 100%
rename from base-network/openldap/autobuild/overrides/usr/lib/sysusers.d/openldap.conf
rename to app-network/openldap/autobuild/overrides/usr/lib/sysusers.d/openldap.conf
diff --git a/base-network/openldap/autobuild/overrides/usr/lib/tmpfiles.d/slapd.conf b/app-network/openldap/autobuild/overrides/usr/lib/tmpfiles.d/slapd.conf
similarity index 100%
rename from base-network/openldap/autobuild/overrides/usr/lib/tmpfiles.d/slapd.conf
rename to app-network/openldap/autobuild/overrides/usr/lib/tmpfiles.d/slapd.conf
diff --git a/base-network/openldap/autobuild/postinst b/app-network/openldap/autobuild/postinst
similarity index 100%
rename from base-network/openldap/autobuild/postinst
rename to app-network/openldap/autobuild/postinst
diff --git a/base-network/openldap/autobuild/prepare b/app-network/openldap/autobuild/prepare
similarity index 100%
rename from base-network/openldap/autobuild/prepare
rename to app-network/openldap/autobuild/prepare
diff --git a/base-network/openldap/spec b/app-network/openldap/spec
similarity index 100%
rename from base-network/openldap/spec
rename to app-network/openldap/spec
diff --git a/extra-network/openresolv/autobuild/defines b/app-network/openresolv/autobuild/defines
similarity index 100%
rename from extra-network/openresolv/autobuild/defines
rename to app-network/openresolv/autobuild/defines
diff --git a/extra-network/openresolv/spec b/app-network/openresolv/spec
similarity index 100%
rename from extra-network/openresolv/spec
rename to app-network/openresolv/spec
diff --git a/extra-network/opensmtpd/autobuild/alternatives b/app-network/opensmtpd/autobuild/alternatives
similarity index 100%
rename from extra-network/opensmtpd/autobuild/alternatives
rename to app-network/opensmtpd/autobuild/alternatives
diff --git a/extra-network/opensmtpd/autobuild/beyond b/app-network/opensmtpd/autobuild/beyond
similarity index 100%
rename from extra-network/opensmtpd/autobuild/beyond
rename to app-network/opensmtpd/autobuild/beyond
diff --git a/extra-network/opensmtpd/autobuild/defines b/app-network/opensmtpd/autobuild/defines
similarity index 100%
rename from extra-network/opensmtpd/autobuild/defines
rename to app-network/opensmtpd/autobuild/defines
diff --git a/extra-network/opensmtpd/autobuild/overrides/usr/lib/systemd/system/opensmtpd.service b/app-network/opensmtpd/autobuild/overrides/usr/lib/systemd/system/opensmtpd.service
similarity index 100%
rename from extra-network/opensmtpd/autobuild/overrides/usr/lib/systemd/system/opensmtpd.service
rename to app-network/opensmtpd/autobuild/overrides/usr/lib/systemd/system/opensmtpd.service
diff --git a/extra-network/opensmtpd/autobuild/postinst b/app-network/opensmtpd/autobuild/postinst
similarity index 100%
rename from extra-network/opensmtpd/autobuild/postinst
rename to app-network/opensmtpd/autobuild/postinst
diff --git a/extra-network/opensmtpd/autobuild/prepare b/app-network/opensmtpd/autobuild/prepare
similarity index 100%
rename from extra-network/opensmtpd/autobuild/prepare
rename to app-network/opensmtpd/autobuild/prepare
diff --git a/extra-network/opensmtpd/spec b/app-network/opensmtpd/spec
similarity index 100%
rename from extra-network/opensmtpd/spec
rename to app-network/opensmtpd/spec
diff --git a/extra-network/openssh/autobuild/beyond b/app-network/openssh/autobuild/beyond
similarity index 100%
rename from extra-network/openssh/autobuild/beyond
rename to app-network/openssh/autobuild/beyond
diff --git a/extra-network/openssh/autobuild/conffiles b/app-network/openssh/autobuild/conffiles
similarity index 100%
rename from extra-network/openssh/autobuild/conffiles
rename to app-network/openssh/autobuild/conffiles
diff --git a/extra-network/openssh/autobuild/defines b/app-network/openssh/autobuild/defines
similarity index 100%
rename from extra-network/openssh/autobuild/defines
rename to app-network/openssh/autobuild/defines
diff --git a/extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.service b/app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.service
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.service
rename to app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.service
diff --git a/extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.socket b/app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.socket
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.socket
rename to app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd.socket
diff --git a/extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd@.service b/app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd@.service
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd@.service
rename to app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshd@.service
diff --git a/extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshdgenkeys.service b/app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshdgenkeys.service
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshdgenkeys.service
rename to app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshdgenkeys.service
diff --git a/extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshkeygen.service b/app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshkeygen.service
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshkeygen.service
rename to app-network/openssh/autobuild/overrides/usr/lib/systemd/system/sshkeygen.service
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key.pub b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key.pub
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key.pub
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_dsa_key.pub
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key.pub b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key.pub
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key.pub
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ecdsa_key.pub
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key.pub b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key.pub
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key.pub
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_ed25519_key.pub
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key
diff --git a/extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key.pub b/app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key.pub
similarity index 100%
rename from extra-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key.pub
rename to app-network/openssh/autobuild/overrides/usr/share/doc/openssh/aosc-revoked-keys/ssh_host_rsa_key.pub
diff --git a/extra-network/openssh/autobuild/postinst b/app-network/openssh/autobuild/postinst
similarity index 100%
rename from extra-network/openssh/autobuild/postinst
rename to app-network/openssh/autobuild/postinst
diff --git a/extra-network/openssh/spec b/app-network/openssh/spec
similarity index 100%
rename from extra-network/openssh/spec
rename to app-network/openssh/spec
diff --git a/extra-network/openswan/autobuild/build b/app-network/openswan/autobuild/build
similarity index 100%
rename from extra-network/openswan/autobuild/build
rename to app-network/openswan/autobuild/build
diff --git a/extra-network/openswan/autobuild/conffiles b/app-network/openswan/autobuild/conffiles
similarity index 100%
rename from extra-network/openswan/autobuild/conffiles
rename to app-network/openswan/autobuild/conffiles
diff --git a/extra-network/openswan/autobuild/defines b/app-network/openswan/autobuild/defines
similarity index 100%
rename from extra-network/openswan/autobuild/defines
rename to app-network/openswan/autobuild/defines
diff --git a/extra-network/openswan/autobuild/overrides/usr/lib/systemd/system/openswan.service b/app-network/openswan/autobuild/overrides/usr/lib/systemd/system/openswan.service
similarity index 100%
rename from extra-network/openswan/autobuild/overrides/usr/lib/systemd/system/openswan.service
rename to app-network/openswan/autobuild/overrides/usr/lib/systemd/system/openswan.service
diff --git a/extra-network/openswan/autobuild/prepare b/app-network/openswan/autobuild/prepare
similarity index 100%
rename from extra-network/openswan/autobuild/prepare
rename to app-network/openswan/autobuild/prepare
diff --git a/extra-network/openswan/spec b/app-network/openswan/spec
similarity index 100%
rename from extra-network/openswan/spec
rename to app-network/openswan/spec
diff --git a/extra-network/openvpn/autobuild/beyond b/app-network/openvpn/autobuild/beyond
similarity index 100%
rename from extra-network/openvpn/autobuild/beyond
rename to app-network/openvpn/autobuild/beyond
diff --git a/extra-network/openvpn/autobuild/defines b/app-network/openvpn/autobuild/defines
similarity index 100%
rename from extra-network/openvpn/autobuild/defines
rename to app-network/openvpn/autobuild/defines
diff --git a/extra-network/openvpn/autobuild/overrides/usr/lib/systemd/system/openvpn@.service b/app-network/openvpn/autobuild/overrides/usr/lib/systemd/system/openvpn@.service
similarity index 100%
rename from extra-network/openvpn/autobuild/overrides/usr/lib/systemd/system/openvpn@.service
rename to app-network/openvpn/autobuild/overrides/usr/lib/systemd/system/openvpn@.service
diff --git a/extra-network/openvpn/autobuild/prepare b/app-network/openvpn/autobuild/prepare
similarity index 100%
rename from extra-network/openvpn/autobuild/prepare
rename to app-network/openvpn/autobuild/prepare
diff --git a/extra-network/openvpn/spec b/app-network/openvpn/spec
similarity index 100%
rename from extra-network/openvpn/spec
rename to app-network/openvpn/spec
diff --git a/extra-network/openvswitch/autobuild/defines b/app-network/openvswitch/autobuild/defines
similarity index 100%
rename from extra-network/openvswitch/autobuild/defines
rename to app-network/openvswitch/autobuild/defines
diff --git a/extra-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovs-vswitchd.sesrvice b/app-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovs-vswitchd.sesrvice
similarity index 100%
rename from extra-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovs-vswitchd.sesrvice
rename to app-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovs-vswitchd.sesrvice
diff --git a/extra-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovsdb-server.service b/app-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovsdb-server.service
similarity index 100%
rename from extra-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovsdb-server.service
rename to app-network/openvswitch/autobuild/overrides/usr/lib/systemd/system/ovsdb-server.service
diff --git a/extra-network/openvswitch/autobuild/overrides/usr/lib/tmpfiles.d/openvswitch.conf b/app-network/openvswitch/autobuild/overrides/usr/lib/tmpfiles.d/openvswitch.conf
similarity index 100%
rename from extra-network/openvswitch/autobuild/overrides/usr/lib/tmpfiles.d/openvswitch.conf
rename to app-network/openvswitch/autobuild/overrides/usr/lib/tmpfiles.d/openvswitch.conf
diff --git a/extra-network/openvswitch/autobuild/postinst b/app-network/openvswitch/autobuild/postinst
similarity index 100%
rename from extra-network/openvswitch/autobuild/postinst
rename to app-network/openvswitch/autobuild/postinst
diff --git a/extra-network/openvswitch/autobuild/prepare b/app-network/openvswitch/autobuild/prepare
similarity index 100%
rename from extra-network/openvswitch/autobuild/prepare
rename to app-network/openvswitch/autobuild/prepare
diff --git a/extra-network/openvswitch/spec b/app-network/openvswitch/spec
similarity index 100%
rename from extra-network/openvswitch/spec
rename to app-network/openvswitch/spec
diff --git a/extra-network/pen/autobuild/beyond b/app-network/pen/autobuild/beyond
similarity index 100%
rename from extra-network/pen/autobuild/beyond
rename to app-network/pen/autobuild/beyond
diff --git a/extra-network/pen/autobuild/defines b/app-network/pen/autobuild/defines
similarity index 100%
rename from extra-network/pen/autobuild/defines
rename to app-network/pen/autobuild/defines
diff --git a/extra-network/pen/autobuild/overrides/etc/httpd/conf.d/pen.conf b/app-network/pen/autobuild/overrides/etc/httpd/conf.d/pen.conf
similarity index 100%
rename from extra-network/pen/autobuild/overrides/etc/httpd/conf.d/pen.conf
rename to app-network/pen/autobuild/overrides/etc/httpd/conf.d/pen.conf
diff --git a/extra-network/pen/spec b/app-network/pen/spec
similarity index 100%
rename from extra-network/pen/spec
rename to app-network/pen/spec
diff --git a/extra-network/phodav/autobuild/defines b/app-network/phodav/autobuild/defines
similarity index 100%
rename from extra-network/phodav/autobuild/defines
rename to app-network/phodav/autobuild/defines
diff --git a/extra-network/phodav/spec b/app-network/phodav/spec
similarity index 100%
rename from extra-network/phodav/spec
rename to app-network/phodav/spec
diff --git a/extra-network/pixiewps/autobuild/build b/app-network/pixiewps/autobuild/build
similarity index 100%
rename from extra-network/pixiewps/autobuild/build
rename to app-network/pixiewps/autobuild/build
diff --git a/extra-network/pixiewps/autobuild/defines b/app-network/pixiewps/autobuild/defines
similarity index 100%
rename from extra-network/pixiewps/autobuild/defines
rename to app-network/pixiewps/autobuild/defines
diff --git a/extra-network/pixiewps/spec b/app-network/pixiewps/spec
similarity index 100%
rename from extra-network/pixiewps/spec
rename to app-network/pixiewps/spec
diff --git a/extra-network/pktstat/autobuild/defines b/app-network/pktstat/autobuild/defines
similarity index 100%
rename from extra-network/pktstat/autobuild/defines
rename to app-network/pktstat/autobuild/defines
diff --git a/extra-network/pktstat/spec b/app-network/pktstat/spec
similarity index 100%
rename from extra-network/pktstat/spec
rename to app-network/pktstat/spec
diff --git a/extra-network/popub/autobuild/defines b/app-network/popub/autobuild/defines
similarity index 100%
rename from extra-network/popub/autobuild/defines
rename to app-network/popub/autobuild/defines
diff --git a/extra-network/popub/autobuild/patches/0001-Replace-the-compiler-with-GCC.patch.ppc64 b/app-network/popub/autobuild/patches/0001-Replace-the-compiler-with-GCC.patch.ppc64
similarity index 100%
rename from extra-network/popub/autobuild/patches/0001-Replace-the-compiler-with-GCC.patch.ppc64
rename to app-network/popub/autobuild/patches/0001-Replace-the-compiler-with-GCC.patch.ppc64
diff --git a/extra-network/popub/autobuild/prepare b/app-network/popub/autobuild/prepare
similarity index 100%
rename from extra-network/popub/autobuild/prepare
rename to app-network/popub/autobuild/prepare
diff --git a/extra-network/popub/spec b/app-network/popub/spec
similarity index 100%
rename from extra-network/popub/spec
rename to app-network/popub/spec
diff --git a/extra-network/postfix/autobuild/alternatives b/app-network/postfix/autobuild/alternatives
similarity index 100%
rename from extra-network/postfix/autobuild/alternatives
rename to app-network/postfix/autobuild/alternatives
diff --git a/extra-network/postfix/autobuild/build b/app-network/postfix/autobuild/build
similarity index 100%
rename from extra-network/postfix/autobuild/build
rename to app-network/postfix/autobuild/build
diff --git a/extra-network/postfix/autobuild/conffiles b/app-network/postfix/autobuild/conffiles
similarity index 100%
rename from extra-network/postfix/autobuild/conffiles
rename to app-network/postfix/autobuild/conffiles
diff --git a/extra-network/postfix/autobuild/defines b/app-network/postfix/autobuild/defines
similarity index 100%
rename from extra-network/postfix/autobuild/defines
rename to app-network/postfix/autobuild/defines
diff --git a/extra-network/postfix/autobuild/overrides/usr/lib/systemd/system/postfix.service b/app-network/postfix/autobuild/overrides/usr/lib/systemd/system/postfix.service
similarity index 100%
rename from extra-network/postfix/autobuild/overrides/usr/lib/systemd/system/postfix.service
rename to app-network/postfix/autobuild/overrides/usr/lib/systemd/system/postfix.service
diff --git a/extra-network/postfix/autobuild/overrides/usr/lib/tmpfiles.d/postfix.conf b/app-network/postfix/autobuild/overrides/usr/lib/tmpfiles.d/postfix.conf
similarity index 100%
rename from extra-network/postfix/autobuild/overrides/usr/lib/tmpfiles.d/postfix.conf
rename to app-network/postfix/autobuild/overrides/usr/lib/tmpfiles.d/postfix.conf
diff --git a/extra-network/postfix/autobuild/patches/0001-set-default-aliases-directory.patch.beyond b/app-network/postfix/autobuild/patches/0001-set-default-aliases-directory.patch.beyond
similarity index 100%
rename from extra-network/postfix/autobuild/patches/0001-set-default-aliases-directory.patch.beyond
rename to app-network/postfix/autobuild/patches/0001-set-default-aliases-directory.patch.beyond
diff --git a/extra-network/postfix/autobuild/patches/0002-fix-build-with-glibc-2.30.patch b/app-network/postfix/autobuild/patches/0002-fix-build-with-glibc-2.30.patch
similarity index 100%
rename from extra-network/postfix/autobuild/patches/0002-fix-build-with-glibc-2.30.patch
rename to app-network/postfix/autobuild/patches/0002-fix-build-with-glibc-2.30.patch
diff --git a/extra-network/postfix/autobuild/patches/0003-fix-build-with-gcc-10.patch b/app-network/postfix/autobuild/patches/0003-fix-build-with-gcc-10.patch
similarity index 100%
rename from extra-network/postfix/autobuild/patches/0003-fix-build-with-gcc-10.patch
rename to app-network/postfix/autobuild/patches/0003-fix-build-with-gcc-10.patch
diff --git a/extra-network/postfix/autobuild/postinst b/app-network/postfix/autobuild/postinst
similarity index 100%
rename from extra-network/postfix/autobuild/postinst
rename to app-network/postfix/autobuild/postinst
diff --git a/extra-network/postfix/spec b/app-network/postfix/spec
similarity index 100%
rename from extra-network/postfix/spec
rename to app-network/postfix/spec
diff --git a/extra-network/ppp/autobuild/build b/app-network/ppp/autobuild/build
similarity index 100%
rename from extra-network/ppp/autobuild/build
rename to app-network/ppp/autobuild/build
diff --git a/extra-network/ppp/autobuild/defines b/app-network/ppp/autobuild/defines
similarity index 100%
rename from extra-network/ppp/autobuild/defines
rename to app-network/ppp/autobuild/defines
diff --git a/extra-network/ppp/autobuild/overrides/etc/ppp/ip-down b/app-network/ppp/autobuild/overrides/etc/ppp/ip-down
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/etc/ppp/ip-down
rename to app-network/ppp/autobuild/overrides/etc/ppp/ip-down
diff --git a/extra-network/ppp/autobuild/overrides/etc/ppp/ip-down.d/00-dns.sh b/app-network/ppp/autobuild/overrides/etc/ppp/ip-down.d/00-dns.sh
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/etc/ppp/ip-down.d/00-dns.sh
rename to app-network/ppp/autobuild/overrides/etc/ppp/ip-down.d/00-dns.sh
diff --git a/extra-network/ppp/autobuild/overrides/etc/ppp/ip-up b/app-network/ppp/autobuild/overrides/etc/ppp/ip-up
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/etc/ppp/ip-up
rename to app-network/ppp/autobuild/overrides/etc/ppp/ip-up
diff --git a/extra-network/ppp/autobuild/overrides/etc/ppp/ip-up.d/00-dns.sh b/app-network/ppp/autobuild/overrides/etc/ppp/ip-up.d/00-dns.sh
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/etc/ppp/ip-up.d/00-dns.sh
rename to app-network/ppp/autobuild/overrides/etc/ppp/ip-up.d/00-dns.sh
diff --git a/extra-network/ppp/autobuild/overrides/etc/ppp/ipv6-down b/app-network/ppp/autobuild/overrides/etc/ppp/ipv6-down
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/etc/ppp/ipv6-down
rename to app-network/ppp/autobuild/overrides/etc/ppp/ipv6-down
diff --git a/extra-network/ppp/autobuild/overrides/etc/ppp/ipv6-up b/app-network/ppp/autobuild/overrides/etc/ppp/ipv6-up
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/etc/ppp/ipv6-up
rename to app-network/ppp/autobuild/overrides/etc/ppp/ipv6-up
diff --git a/extra-network/ppp/autobuild/overrides/etc/ppp/options b/app-network/ppp/autobuild/overrides/etc/ppp/options
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/etc/ppp/options
rename to app-network/ppp/autobuild/overrides/etc/ppp/options
diff --git a/extra-network/ppp/autobuild/overrides/usr/lib/systemd/system/ppp@.service b/app-network/ppp/autobuild/overrides/usr/lib/systemd/system/ppp@.service
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/usr/lib/systemd/system/ppp@.service
rename to app-network/ppp/autobuild/overrides/usr/lib/systemd/system/ppp@.service
diff --git a/extra-network/ppp/autobuild/overrides/usr/lib/tmpfiles.d/ppp.conf b/app-network/ppp/autobuild/overrides/usr/lib/tmpfiles.d/ppp.conf
similarity index 100%
rename from extra-network/ppp/autobuild/overrides/usr/lib/tmpfiles.d/ppp.conf
rename to app-network/ppp/autobuild/overrides/usr/lib/tmpfiles.d/ppp.conf
diff --git a/extra-network/ppp/autobuild/patches/0004-doc-add-configuration-samples.patch b/app-network/ppp/autobuild/patches/0004-doc-add-configuration-samples.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0004-doc-add-configuration-samples.patch
rename to app-network/ppp/autobuild/patches/0004-doc-add-configuration-samples.patch
diff --git a/extra-network/ppp/autobuild/patches/0006-scritps-use-change_resolv_conf-function.patch b/app-network/ppp/autobuild/patches/0006-scritps-use-change_resolv_conf-function.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0006-scritps-use-change_resolv_conf-function.patch
rename to app-network/ppp/autobuild/patches/0006-scritps-use-change_resolv_conf-function.patch
diff --git a/extra-network/ppp/autobuild/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch b/app-network/ppp/autobuild/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
rename to app-network/ppp/autobuild/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
diff --git a/extra-network/ppp/autobuild/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch b/app-network/ppp/autobuild/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
rename to app-network/ppp/autobuild/patches/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
diff --git a/extra-network/ppp/autobuild/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch b/app-network/ppp/autobuild/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch
rename to app-network/ppp/autobuild/patches/0015-pppd-move-pppd-database-to-var-run-ppp.patch
diff --git a/extra-network/ppp/autobuild/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch b/app-network/ppp/autobuild/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
rename to app-network/ppp/autobuild/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
diff --git a/extra-network/ppp/autobuild/patches/0018-scritps-fix-ip-up.local-sample.patch b/app-network/ppp/autobuild/patches/0018-scritps-fix-ip-up.local-sample.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0018-scritps-fix-ip-up.local-sample.patch
rename to app-network/ppp/autobuild/patches/0018-scritps-fix-ip-up.local-sample.patch
diff --git a/extra-network/ppp/autobuild/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch b/app-network/ppp/autobuild/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch
rename to app-network/ppp/autobuild/patches/0020-pppd-put-lock-files-in-var-lock-ppp.patch
diff --git a/extra-network/ppp/autobuild/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch b/app-network/ppp/autobuild/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
rename to app-network/ppp/autobuild/patches/0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
diff --git a/extra-network/ppp/autobuild/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch b/app-network/ppp/autobuild/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
rename to app-network/ppp/autobuild/patches/0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
diff --git a/extra-network/ppp/autobuild/patches/ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch b/app-network/ppp/autobuild/patches/ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
rename to app-network/ppp/autobuild/patches/ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
diff --git a/extra-network/ppp/autobuild/patches/ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch b/app-network/ppp/autobuild/patches/ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
rename to app-network/ppp/autobuild/patches/ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
diff --git a/extra-network/ppp/autobuild/patches/ppp-2.4.9-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch b/app-network/ppp/autobuild/patches/ppp-2.4.9-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/ppp-2.4.9-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
rename to app-network/ppp/autobuild/patches/ppp-2.4.9-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
diff --git a/extra-network/ppp/autobuild/patches/ppp-2.4.9-config.patch b/app-network/ppp/autobuild/patches/ppp-2.4.9-config.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/ppp-2.4.9-config.patch
rename to app-network/ppp/autobuild/patches/ppp-2.4.9-config.patch
diff --git a/extra-network/ppp/autobuild/patches/ppp-2.4.9-configure-cflags-allow-commas.patch b/app-network/ppp/autobuild/patches/ppp-2.4.9-configure-cflags-allow-commas.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/ppp-2.4.9-configure-cflags-allow-commas.patch
rename to app-network/ppp/autobuild/patches/ppp-2.4.9-configure-cflags-allow-commas.patch
diff --git a/extra-network/ppp/autobuild/patches/ppp-2.4.9-everywhere-O_CLOEXEC-harder.patch b/app-network/ppp/autobuild/patches/ppp-2.4.9-everywhere-O_CLOEXEC-harder.patch
similarity index 100%
rename from extra-network/ppp/autobuild/patches/ppp-2.4.9-everywhere-O_CLOEXEC-harder.patch
rename to app-network/ppp/autobuild/patches/ppp-2.4.9-everywhere-O_CLOEXEC-harder.patch
diff --git a/extra-network/ppp/autobuild/patches/series b/app-network/ppp/autobuild/patches/series
similarity index 100%
rename from extra-network/ppp/autobuild/patches/series
rename to app-network/ppp/autobuild/patches/series
diff --git a/extra-network/ppp/autobuild/postinst b/app-network/ppp/autobuild/postinst
similarity index 100%
rename from extra-network/ppp/autobuild/postinst
rename to app-network/ppp/autobuild/postinst
diff --git a/extra-network/ppp/autobuild/prepare b/app-network/ppp/autobuild/prepare
similarity index 100%
rename from extra-network/ppp/autobuild/prepare
rename to app-network/ppp/autobuild/prepare
diff --git a/extra-network/ppp/spec b/app-network/ppp/spec
similarity index 100%
rename from extra-network/ppp/spec
rename to app-network/ppp/spec
diff --git a/extra-network/pptp/autobuild/build b/app-network/pptp/autobuild/build
similarity index 100%
rename from extra-network/pptp/autobuild/build
rename to app-network/pptp/autobuild/build
diff --git a/extra-network/pptp/autobuild/defines b/app-network/pptp/autobuild/defines
similarity index 100%
rename from extra-network/pptp/autobuild/defines
rename to app-network/pptp/autobuild/defines
diff --git a/extra-network/pptp/autobuild/prepare b/app-network/pptp/autobuild/prepare
similarity index 100%
rename from extra-network/pptp/autobuild/prepare
rename to app-network/pptp/autobuild/prepare
diff --git a/extra-network/pptp/spec b/app-network/pptp/spec
similarity index 100%
rename from extra-network/pptp/spec
rename to app-network/pptp/spec
diff --git a/extra-network/privoxy/autobuild/build b/app-network/privoxy/autobuild/build
similarity index 100%
rename from extra-network/privoxy/autobuild/build
rename to app-network/privoxy/autobuild/build
diff --git a/extra-network/privoxy/autobuild/conffiles b/app-network/privoxy/autobuild/conffiles
similarity index 100%
rename from extra-network/privoxy/autobuild/conffiles
rename to app-network/privoxy/autobuild/conffiles
diff --git a/extra-network/privoxy/autobuild/defines b/app-network/privoxy/autobuild/defines
similarity index 100%
rename from extra-network/privoxy/autobuild/defines
rename to app-network/privoxy/autobuild/defines
diff --git a/extra-network/privoxy/autobuild/overrides/etc/logrotate.d/privoxy b/app-network/privoxy/autobuild/overrides/etc/logrotate.d/privoxy
similarity index 100%
rename from extra-network/privoxy/autobuild/overrides/etc/logrotate.d/privoxy
rename to app-network/privoxy/autobuild/overrides/etc/logrotate.d/privoxy
diff --git a/extra-network/privoxy/autobuild/overrides/usr/lib/systemd/system/privoxy.service b/app-network/privoxy/autobuild/overrides/usr/lib/systemd/system/privoxy.service
similarity index 100%
rename from extra-network/privoxy/autobuild/overrides/usr/lib/systemd/system/privoxy.service
rename to app-network/privoxy/autobuild/overrides/usr/lib/systemd/system/privoxy.service
diff --git a/extra-network/privoxy/autobuild/overrides/usr/lib/sysusers.d/privoxy.conf b/app-network/privoxy/autobuild/overrides/usr/lib/sysusers.d/privoxy.conf
similarity index 100%
rename from extra-network/privoxy/autobuild/overrides/usr/lib/sysusers.d/privoxy.conf
rename to app-network/privoxy/autobuild/overrides/usr/lib/sysusers.d/privoxy.conf
diff --git a/extra-network/privoxy/autobuild/postinst b/app-network/privoxy/autobuild/postinst
similarity index 100%
rename from extra-network/privoxy/autobuild/postinst
rename to app-network/privoxy/autobuild/postinst
diff --git a/extra-network/privoxy/autobuild/prepare b/app-network/privoxy/autobuild/prepare
similarity index 100%
rename from extra-network/privoxy/autobuild/prepare
rename to app-network/privoxy/autobuild/prepare
diff --git a/extra-network/privoxy/spec b/app-network/privoxy/spec
similarity index 100%
rename from extra-network/privoxy/spec
rename to app-network/privoxy/spec
diff --git a/extra-network/proxychains-ng/autobuild/build b/app-network/proxychains-ng/autobuild/build
similarity index 100%
rename from extra-network/proxychains-ng/autobuild/build
rename to app-network/proxychains-ng/autobuild/build
diff --git a/extra-network/proxychains-ng/autobuild/conffiles b/app-network/proxychains-ng/autobuild/conffiles
similarity index 100%
rename from extra-network/proxychains-ng/autobuild/conffiles
rename to app-network/proxychains-ng/autobuild/conffiles
diff --git a/extra-network/proxychains-ng/autobuild/defines b/app-network/proxychains-ng/autobuild/defines
similarity index 100%
rename from extra-network/proxychains-ng/autobuild/defines
rename to app-network/proxychains-ng/autobuild/defines
diff --git a/extra-network/proxychains-ng/autobuild/patches/0001-Set-default-proxy-as-shadowsocks-or-v2ray-socks5.patch b/app-network/proxychains-ng/autobuild/patches/0001-Set-default-proxy-as-shadowsocks-or-v2ray-socks5.patch
similarity index 100%
rename from extra-network/proxychains-ng/autobuild/patches/0001-Set-default-proxy-as-shadowsocks-or-v2ray-socks5.patch
rename to app-network/proxychains-ng/autobuild/patches/0001-Set-default-proxy-as-shadowsocks-or-v2ray-socks5.patch
diff --git a/extra-network/proxychains-ng/spec b/app-network/proxychains-ng/spec
similarity index 100%
rename from extra-network/proxychains-ng/spec
rename to app-network/proxychains-ng/spec
diff --git a/extra-network/proxyman/autobuild/build b/app-network/proxyman/autobuild/build
similarity index 100%
rename from extra-network/proxyman/autobuild/build
rename to app-network/proxyman/autobuild/build
diff --git a/extra-network/proxyman/autobuild/defines b/app-network/proxyman/autobuild/defines
similarity index 100%
rename from extra-network/proxyman/autobuild/defines
rename to app-network/proxyman/autobuild/defines
diff --git a/extra-network/proxyman/autobuild/overrides/usr/bin/proxyman b/app-network/proxyman/autobuild/overrides/usr/bin/proxyman
similarity index 100%
rename from extra-network/proxyman/autobuild/overrides/usr/bin/proxyman
rename to app-network/proxyman/autobuild/overrides/usr/bin/proxyman
diff --git a/extra-network/proxyman/autobuild/patch b/app-network/proxyman/autobuild/patch
similarity index 100%
rename from extra-network/proxyman/autobuild/patch
rename to app-network/proxyman/autobuild/patch
diff --git a/extra-network/proxyman/autobuild/patches/0001-variables.sh-omit-errors-from-commands-not-found.patch b/app-network/proxyman/autobuild/patches/0001-variables.sh-omit-errors-from-commands-not-found.patch
similarity index 100%
rename from extra-network/proxyman/autobuild/patches/0001-variables.sh-omit-errors-from-commands-not-found.patch
rename to app-network/proxyman/autobuild/patches/0001-variables.sh-omit-errors-from-commands-not-found.patch
diff --git a/extra-network/proxyman/autobuild/postinst b/app-network/proxyman/autobuild/postinst
similarity index 100%
rename from extra-network/proxyman/autobuild/postinst
rename to app-network/proxyman/autobuild/postinst
diff --git a/extra-network/proxyman/spec b/app-network/proxyman/spec
similarity index 100%
rename from extra-network/proxyman/spec
rename to app-network/proxyman/spec
diff --git a/extra-network/ptunnel/autobuild/build b/app-network/ptunnel/autobuild/build
similarity index 100%
rename from extra-network/ptunnel/autobuild/build
rename to app-network/ptunnel/autobuild/build
diff --git a/extra-network/ptunnel/autobuild/defines b/app-network/ptunnel/autobuild/defines
similarity index 100%
rename from extra-network/ptunnel/autobuild/defines
rename to app-network/ptunnel/autobuild/defines
diff --git a/extra-network/ptunnel/autobuild/overrides/usr/lib/systemd/system/ptunnel.service b/app-network/ptunnel/autobuild/overrides/usr/lib/systemd/system/ptunnel.service
similarity index 100%
rename from extra-network/ptunnel/autobuild/overrides/usr/lib/systemd/system/ptunnel.service
rename to app-network/ptunnel/autobuild/overrides/usr/lib/systemd/system/ptunnel.service
diff --git a/extra-network/ptunnel/spec b/app-network/ptunnel/spec
similarity index 100%
rename from extra-network/ptunnel/spec
rename to app-network/ptunnel/spec
diff --git a/extra-network/putty/autobuild/defines b/app-network/putty/autobuild/defines
similarity index 100%
rename from extra-network/putty/autobuild/defines
rename to app-network/putty/autobuild/defines
diff --git a/extra-network/putty/spec b/app-network/putty/spec
similarity index 100%
rename from extra-network/putty/spec
rename to app-network/putty/spec
diff --git a/extra-network/pwnat/autobuild/build b/app-network/pwnat/autobuild/build
similarity index 100%
rename from extra-network/pwnat/autobuild/build
rename to app-network/pwnat/autobuild/build
diff --git a/extra-network/pwnat/autobuild/defines b/app-network/pwnat/autobuild/defines
similarity index 100%
rename from extra-network/pwnat/autobuild/defines
rename to app-network/pwnat/autobuild/defines
diff --git a/extra-network/pwnat/spec b/app-network/pwnat/spec
similarity index 100%
rename from extra-network/pwnat/spec
rename to app-network/pwnat/spec
diff --git a/extra-network/pyrit/autobuild/defines b/app-network/pyrit/autobuild/defines
similarity index 100%
rename from extra-network/pyrit/autobuild/defines
rename to app-network/pyrit/autobuild/defines
diff --git a/extra-network/pyrit/spec b/app-network/pyrit/spec
similarity index 100%
rename from extra-network/pyrit/spec
rename to app-network/pyrit/spec
diff --git a/extra-network/quagga/autobuild/beyond b/app-network/quagga/autobuild/beyond
similarity index 100%
rename from extra-network/quagga/autobuild/beyond
rename to app-network/quagga/autobuild/beyond
diff --git a/extra-network/quagga/autobuild/defines b/app-network/quagga/autobuild/defines
similarity index 100%
rename from extra-network/quagga/autobuild/defines
rename to app-network/quagga/autobuild/defines
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/bgpd.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/bgpd.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/bgpd.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/bgpd.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/isisd.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/isisd.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/isisd.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/isisd.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospf6d.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospf6d.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospf6d.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospf6d.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospfd.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospfd.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospfd.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ospfd.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/pimd.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/pimd.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/pimd.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/pimd.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripd.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripd.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripd.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripd.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripngd.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripngd.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripngd.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/ripngd.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/zebra.service b/app-network/quagga/autobuild/overrides/usr/lib/systemd/system/zebra.service
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/systemd/system/zebra.service
rename to app-network/quagga/autobuild/overrides/usr/lib/systemd/system/zebra.service
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/sysusers.d/quagga.conf b/app-network/quagga/autobuild/overrides/usr/lib/sysusers.d/quagga.conf
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/sysusers.d/quagga.conf
rename to app-network/quagga/autobuild/overrides/usr/lib/sysusers.d/quagga.conf
diff --git a/extra-network/quagga/autobuild/overrides/usr/lib/tmpfiles.d/quagga.conf b/app-network/quagga/autobuild/overrides/usr/lib/tmpfiles.d/quagga.conf
similarity index 100%
rename from extra-network/quagga/autobuild/overrides/usr/lib/tmpfiles.d/quagga.conf
rename to app-network/quagga/autobuild/overrides/usr/lib/tmpfiles.d/quagga.conf
diff --git a/extra-network/quagga/autobuild/postinst b/app-network/quagga/autobuild/postinst
similarity index 100%
rename from extra-network/quagga/autobuild/postinst
rename to app-network/quagga/autobuild/postinst
diff --git a/extra-network/quagga/autobuild/prepare b/app-network/quagga/autobuild/prepare
similarity index 100%
rename from extra-network/quagga/autobuild/prepare
rename to app-network/quagga/autobuild/prepare
diff --git a/extra-network/quagga/spec b/app-network/quagga/spec
similarity index 100%
rename from extra-network/quagga/spec
rename to app-network/quagga/spec
diff --git a/extra-network/quicktun/autobuild/build b/app-network/quicktun/autobuild/build
similarity index 100%
rename from extra-network/quicktun/autobuild/build
rename to app-network/quicktun/autobuild/build
diff --git a/extra-network/quicktun/autobuild/defines b/app-network/quicktun/autobuild/defines
similarity index 100%
rename from extra-network/quicktun/autobuild/defines
rename to app-network/quicktun/autobuild/defines
diff --git a/extra-network/quicktun/spec b/app-network/quicktun/spec
similarity index 100%
rename from extra-network/quicktun/spec
rename to app-network/quicktun/spec
diff --git a/extra-network/radvd/autobuild/beyond b/app-network/radvd/autobuild/beyond
similarity index 100%
rename from extra-network/radvd/autobuild/beyond
rename to app-network/radvd/autobuild/beyond
diff --git a/extra-network/radvd/autobuild/conffiles b/app-network/radvd/autobuild/conffiles
similarity index 100%
rename from extra-network/radvd/autobuild/conffiles
rename to app-network/radvd/autobuild/conffiles
diff --git a/extra-network/radvd/autobuild/defines b/app-network/radvd/autobuild/defines
similarity index 100%
rename from extra-network/radvd/autobuild/defines
rename to app-network/radvd/autobuild/defines
diff --git a/extra-network/radvd/autobuild/overrides/usr/lib/systemd/system/radvd.service b/app-network/radvd/autobuild/overrides/usr/lib/systemd/system/radvd.service
similarity index 100%
rename from extra-network/radvd/autobuild/overrides/usr/lib/systemd/system/radvd.service
rename to app-network/radvd/autobuild/overrides/usr/lib/systemd/system/radvd.service
diff --git a/extra-network/radvd/spec b/app-network/radvd/spec
similarity index 100%
rename from extra-network/radvd/spec
rename to app-network/radvd/spec
diff --git a/extra-network/razor-agents/autobuild/build b/app-network/razor-agents/autobuild/build
similarity index 100%
rename from extra-network/razor-agents/autobuild/build
rename to app-network/razor-agents/autobuild/build
diff --git a/extra-network/razor-agents/autobuild/defines b/app-network/razor-agents/autobuild/defines
similarity index 100%
rename from extra-network/razor-agents/autobuild/defines
rename to app-network/razor-agents/autobuild/defines
diff --git a/extra-network/razor-agents/autobuild/patches/perl-Razor-Agent-2.85-mandir.patch b/app-network/razor-agents/autobuild/patches/perl-Razor-Agent-2.85-mandir.patch
similarity index 100%
rename from extra-network/razor-agents/autobuild/patches/perl-Razor-Agent-2.85-mandir.patch
rename to app-network/razor-agents/autobuild/patches/perl-Razor-Agent-2.85-mandir.patch
diff --git a/extra-network/razor-agents/autobuild/patches/razor-agents-2.85-use-sha-not-sha1.patch b/app-network/razor-agents/autobuild/patches/razor-agents-2.85-use-sha-not-sha1.patch
similarity index 100%
rename from extra-network/razor-agents/autobuild/patches/razor-agents-2.85-use-sha-not-sha1.patch
rename to app-network/razor-agents/autobuild/patches/razor-agents-2.85-use-sha-not-sha1.patch
diff --git a/extra-network/razor-agents/autobuild/patches/version-fix.patch b/app-network/razor-agents/autobuild/patches/version-fix.patch
similarity index 100%
rename from extra-network/razor-agents/autobuild/patches/version-fix.patch
rename to app-network/razor-agents/autobuild/patches/version-fix.patch
diff --git a/extra-network/razor-agents/spec b/app-network/razor-agents/spec
similarity index 100%
rename from extra-network/razor-agents/spec
rename to app-network/razor-agents/spec
diff --git a/extra-network/rdesktop/autobuild/defines b/app-network/rdesktop/autobuild/defines
similarity index 100%
rename from extra-network/rdesktop/autobuild/defines
rename to app-network/rdesktop/autobuild/defines
diff --git a/extra-network/rdesktop/spec b/app-network/rdesktop/spec
similarity index 100%
rename from extra-network/rdesktop/spec
rename to app-network/rdesktop/spec
diff --git a/extra-network/reaver/autobuild/build b/app-network/reaver/autobuild/build
similarity index 100%
rename from extra-network/reaver/autobuild/build
rename to app-network/reaver/autobuild/build
diff --git a/extra-network/reaver/autobuild/defines b/app-network/reaver/autobuild/defines
similarity index 100%
rename from extra-network/reaver/autobuild/defines
rename to app-network/reaver/autobuild/defines
diff --git a/extra-network/reaver/spec b/app-network/reaver/spec
similarity index 100%
rename from extra-network/reaver/spec
rename to app-network/reaver/spec
diff --git a/extra-network/redsocks2/autobuild/build b/app-network/redsocks2/autobuild/build
similarity index 100%
rename from extra-network/redsocks2/autobuild/build
rename to app-network/redsocks2/autobuild/build
diff --git a/extra-network/redsocks2/autobuild/defines b/app-network/redsocks2/autobuild/defines
similarity index 100%
rename from extra-network/redsocks2/autobuild/defines
rename to app-network/redsocks2/autobuild/defines
diff --git a/extra-network/redsocks2/autobuild/overrides/usr/lib/systemd/system/redsocks2.service b/app-network/redsocks2/autobuild/overrides/usr/lib/systemd/system/redsocks2.service
similarity index 100%
rename from extra-network/redsocks2/autobuild/overrides/usr/lib/systemd/system/redsocks2.service
rename to app-network/redsocks2/autobuild/overrides/usr/lib/systemd/system/redsocks2.service
diff --git a/extra-network/redsocks2/spec b/app-network/redsocks2/spec
similarity index 100%
rename from extra-network/redsocks2/spec
rename to app-network/redsocks2/spec
diff --git a/extra-network/remmina/autobuild/defines b/app-network/remmina/autobuild/defines
similarity index 100%
rename from extra-network/remmina/autobuild/defines
rename to app-network/remmina/autobuild/defines
diff --git a/extra-network/remmina/spec b/app-network/remmina/spec
similarity index 100%
rename from extra-network/remmina/spec
rename to app-network/remmina/spec
diff --git a/extra-network/rp-pppoe/autobuild/build b/app-network/rp-pppoe/autobuild/build
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/build
rename to app-network/rp-pppoe/autobuild/build
diff --git a/extra-network/rp-pppoe/autobuild/defines b/app-network/rp-pppoe/autobuild/defines
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/defines
rename to app-network/rp-pppoe/autobuild/defines
diff --git a/extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-connect b/app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-connect
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-connect
rename to app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-connect
diff --git a/extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-setup b/app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-setup
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-setup
rename to app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-setup
diff --git a/extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-start b/app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-start
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-start
rename to app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-start
diff --git a/extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-status b/app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-status
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-status
rename to app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-status
diff --git a/extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-stop b/app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-stop
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-stop
rename to app-network/rp-pppoe/autobuild/overrides/usr/bin/pppoe-stop
diff --git a/extra-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/adsl.service b/app-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/adsl.service
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/adsl.service
rename to app-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/adsl.service
diff --git a/extra-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/pppoe-server.service b/app-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/pppoe-server.service
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/pppoe-server.service
rename to app-network/rp-pppoe/autobuild/overrides/usr/lib/systemd/system/pppoe-server.service
diff --git a/extra-network/rp-pppoe/autobuild/patches/0001-Move-netinet-in.h-above-linux-header-includes.patch b/app-network/rp-pppoe/autobuild/patches/0001-Move-netinet-in.h-above-linux-header-includes.patch
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/0001-Move-netinet-in.h-above-linux-header-includes.patch
rename to app-network/rp-pppoe/autobuild/patches/0001-Move-netinet-in.h-above-linux-header-includes.patch
diff --git a/extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-doc.patch b/app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-doc.patch
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-doc.patch
rename to app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-doc.patch
diff --git a/extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-ip-allocation.patch b/app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-ip-allocation.patch
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-ip-allocation.patch
rename to app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-ip-allocation.patch
diff --git a/extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-man.patch b/app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-man.patch
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-man.patch
rename to app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-man.patch
diff --git a/extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-plugin.patch b/app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-plugin.patch
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-plugin.patch
rename to app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-plugin.patch
diff --git a/extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-pluginpath.patch b/app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-pluginpath.patch
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-pluginpath.patch
rename to app-network/rp-pppoe/autobuild/patches/rp-pppoe-3.12-pluginpath.patch
diff --git a/extra-network/rp-pppoe/autobuild/patches/rp-pppoe-manpages.patch b/app-network/rp-pppoe/autobuild/patches/rp-pppoe-manpages.patch
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/rp-pppoe-manpages.patch
rename to app-network/rp-pppoe/autobuild/patches/rp-pppoe-manpages.patch
diff --git a/extra-network/rp-pppoe/autobuild/patches/series b/app-network/rp-pppoe/autobuild/patches/series
similarity index 100%
rename from extra-network/rp-pppoe/autobuild/patches/series
rename to app-network/rp-pppoe/autobuild/patches/series
diff --git a/extra-network/rp-pppoe/spec b/app-network/rp-pppoe/spec
similarity index 100%
rename from extra-network/rp-pppoe/spec
rename to app-network/rp-pppoe/spec
diff --git a/extra-network/rpcbind/autobuild/beyond b/app-network/rpcbind/autobuild/beyond
similarity index 100%
rename from extra-network/rpcbind/autobuild/beyond
rename to app-network/rpcbind/autobuild/beyond
diff --git a/extra-network/rpcbind/autobuild/conffiles b/app-network/rpcbind/autobuild/conffiles
similarity index 100%
rename from extra-network/rpcbind/autobuild/conffiles
rename to app-network/rpcbind/autobuild/conffiles
diff --git a/extra-network/rpcbind/autobuild/defines b/app-network/rpcbind/autobuild/defines
similarity index 100%
rename from extra-network/rpcbind/autobuild/defines
rename to app-network/rpcbind/autobuild/defines
diff --git a/extra-network/rpcbind/autobuild/overrides/etc/conf.d/rpcbind b/app-network/rpcbind/autobuild/overrides/etc/conf.d/rpcbind
similarity index 100%
rename from extra-network/rpcbind/autobuild/overrides/etc/conf.d/rpcbind
rename to app-network/rpcbind/autobuild/overrides/etc/conf.d/rpcbind
diff --git a/extra-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.service b/app-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.service
similarity index 100%
rename from extra-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.service
rename to app-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.service
diff --git a/extra-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.socket b/app-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.socket
similarity index 100%
rename from extra-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.socket
rename to app-network/rpcbind/autobuild/overrides/usr/lib/systemd/system/rpcbind.socket
diff --git a/extra-network/rpcbind/autobuild/patches/rpcbind-sunrpc.patch b/app-network/rpcbind/autobuild/patches/rpcbind-sunrpc.patch
similarity index 100%
rename from extra-network/rpcbind/autobuild/patches/rpcbind-sunrpc.patch
rename to app-network/rpcbind/autobuild/patches/rpcbind-sunrpc.patch
diff --git a/extra-network/rpcbind/autobuild/postinst b/app-network/rpcbind/autobuild/postinst
similarity index 100%
rename from extra-network/rpcbind/autobuild/postinst
rename to app-network/rpcbind/autobuild/postinst
diff --git a/extra-network/rpcbind/spec b/app-network/rpcbind/spec
similarity index 100%
rename from extra-network/rpcbind/spec
rename to app-network/rpcbind/spec
diff --git a/extra-network/rspamd/autobuild/beyond b/app-network/rspamd/autobuild/beyond
similarity index 100%
rename from extra-network/rspamd/autobuild/beyond
rename to app-network/rspamd/autobuild/beyond
diff --git a/extra-network/rspamd/autobuild/conffiles b/app-network/rspamd/autobuild/conffiles
similarity index 100%
rename from extra-network/rspamd/autobuild/conffiles
rename to app-network/rspamd/autobuild/conffiles
diff --git a/extra-network/rspamd/autobuild/defines b/app-network/rspamd/autobuild/defines
similarity index 100%
rename from extra-network/rspamd/autobuild/defines
rename to app-network/rspamd/autobuild/defines
diff --git a/extra-network/rspamd/autobuild/overrides/usr/lib/sysusers.d/rspamd.conf b/app-network/rspamd/autobuild/overrides/usr/lib/sysusers.d/rspamd.conf
similarity index 100%
rename from extra-network/rspamd/autobuild/overrides/usr/lib/sysusers.d/rspamd.conf
rename to app-network/rspamd/autobuild/overrides/usr/lib/sysusers.d/rspamd.conf
diff --git a/extra-network/rspamd/autobuild/overrides/usr/lib/tmpfiles.d/rspamd.conf b/app-network/rspamd/autobuild/overrides/usr/lib/tmpfiles.d/rspamd.conf
similarity index 100%
rename from extra-network/rspamd/autobuild/overrides/usr/lib/tmpfiles.d/rspamd.conf
rename to app-network/rspamd/autobuild/overrides/usr/lib/tmpfiles.d/rspamd.conf
diff --git a/extra-network/rspamd/autobuild/postinst b/app-network/rspamd/autobuild/postinst
similarity index 100%
rename from extra-network/rspamd/autobuild/postinst
rename to app-network/rspamd/autobuild/postinst
diff --git a/extra-network/rspamd/spec b/app-network/rspamd/spec
similarity index 100%
rename from extra-network/rspamd/spec
rename to app-network/rspamd/spec
diff --git a/extra-network/rsync/autobuild/conffiles b/app-network/rsync/autobuild/conffiles
similarity index 100%
rename from extra-network/rsync/autobuild/conffiles
rename to app-network/rsync/autobuild/conffiles
diff --git a/extra-network/rsync/autobuild/defines b/app-network/rsync/autobuild/defines
similarity index 100%
rename from extra-network/rsync/autobuild/defines
rename to app-network/rsync/autobuild/defines
diff --git a/extra-network/rsync/autobuild/overrides/etc/rsyncd.conf b/app-network/rsync/autobuild/overrides/etc/rsyncd.conf
similarity index 100%
rename from extra-network/rsync/autobuild/overrides/etc/rsyncd.conf
rename to app-network/rsync/autobuild/overrides/etc/rsyncd.conf
diff --git a/extra-network/rsync/autobuild/overrides/etc/xinetd.d/rsync b/app-network/rsync/autobuild/overrides/etc/xinetd.d/rsync
similarity index 100%
rename from extra-network/rsync/autobuild/overrides/etc/xinetd.d/rsync
rename to app-network/rsync/autobuild/overrides/etc/xinetd.d/rsync
diff --git a/extra-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.service b/app-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.service
similarity index 100%
rename from extra-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.service
rename to app-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.service
diff --git a/extra-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.socket b/app-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.socket
similarity index 100%
rename from extra-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.socket
rename to app-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd.socket
diff --git a/extra-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd@.service b/app-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd@.service
similarity index 100%
rename from extra-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd@.service
rename to app-network/rsync/autobuild/overrides/usr/lib/systemd/system/rsyncd@.service
diff --git a/extra-network/rsync/autobuild/prepare b/app-network/rsync/autobuild/prepare
similarity index 100%
rename from extra-network/rsync/autobuild/prepare
rename to app-network/rsync/autobuild/prepare
diff --git a/extra-network/rsync/spec b/app-network/rsync/spec
similarity index 100%
rename from extra-network/rsync/spec
rename to app-network/rsync/spec
diff --git a/extra-network/rtmpdump/autobuild/build b/app-network/rtmpdump/autobuild/build
similarity index 100%
rename from extra-network/rtmpdump/autobuild/build
rename to app-network/rtmpdump/autobuild/build
diff --git a/extra-network/rtmpdump/autobuild/defines b/app-network/rtmpdump/autobuild/defines
similarity index 100%
rename from extra-network/rtmpdump/autobuild/defines
rename to app-network/rtmpdump/autobuild/defines
diff --git a/extra-network/rtmpdump/autobuild/patches/0001-openssl-1.1.patch b/app-network/rtmpdump/autobuild/patches/0001-openssl-1.1.patch
similarity index 100%
rename from extra-network/rtmpdump/autobuild/patches/0001-openssl-1.1.patch
rename to app-network/rtmpdump/autobuild/patches/0001-openssl-1.1.patch
diff --git a/extra-network/rtmpdump/spec b/app-network/rtmpdump/spec
similarity index 100%
rename from extra-network/rtmpdump/spec
rename to app-network/rtmpdump/spec
diff --git a/extra-network/samba/autobuild/beyond b/app-network/samba/autobuild/beyond
similarity index 100%
rename from extra-network/samba/autobuild/beyond
rename to app-network/samba/autobuild/beyond
diff --git a/extra-network/samba/autobuild/build b/app-network/samba/autobuild/build
similarity index 100%
rename from extra-network/samba/autobuild/build
rename to app-network/samba/autobuild/build
diff --git a/extra-network/samba/autobuild/conffiles b/app-network/samba/autobuild/conffiles
similarity index 100%
rename from extra-network/samba/autobuild/conffiles
rename to app-network/samba/autobuild/conffiles
diff --git a/extra-network/samba/autobuild/defines b/app-network/samba/autobuild/defines
similarity index 100%
rename from extra-network/samba/autobuild/defines
rename to app-network/samba/autobuild/defines
diff --git a/extra-network/samba/autobuild/overrides/etc/conf.d/samba b/app-network/samba/autobuild/overrides/etc/conf.d/samba
similarity index 100%
rename from extra-network/samba/autobuild/overrides/etc/conf.d/samba
rename to app-network/samba/autobuild/overrides/etc/conf.d/samba
diff --git a/extra-network/samba/autobuild/overrides/etc/ld.so.conf.d/samba.conf b/app-network/samba/autobuild/overrides/etc/ld.so.conf.d/samba.conf
similarity index 100%
rename from extra-network/samba/autobuild/overrides/etc/ld.so.conf.d/samba.conf
rename to app-network/samba/autobuild/overrides/etc/ld.so.conf.d/samba.conf
diff --git a/extra-network/samba/autobuild/overrides/etc/logrotate.d/samba b/app-network/samba/autobuild/overrides/etc/logrotate.d/samba
similarity index 100%
rename from extra-network/samba/autobuild/overrides/etc/logrotate.d/samba
rename to app-network/samba/autobuild/overrides/etc/logrotate.d/samba
diff --git a/extra-network/samba/autobuild/overrides/etc/pam.d/samba b/app-network/samba/autobuild/overrides/etc/pam.d/samba
similarity index 100%
rename from extra-network/samba/autobuild/overrides/etc/pam.d/samba
rename to app-network/samba/autobuild/overrides/etc/pam.d/samba
diff --git a/extra-network/samba/autobuild/overrides/etc/samba/smb.conf b/app-network/samba/autobuild/overrides/etc/samba/smb.conf
similarity index 100%
rename from extra-network/samba/autobuild/overrides/etc/samba/smb.conf
rename to app-network/samba/autobuild/overrides/etc/samba/smb.conf
diff --git a/extra-network/samba/autobuild/overrides/usr/lib/systemd/system/nmbd.service b/app-network/samba/autobuild/overrides/usr/lib/systemd/system/nmbd.service
similarity index 100%
rename from extra-network/samba/autobuild/overrides/usr/lib/systemd/system/nmbd.service
rename to app-network/samba/autobuild/overrides/usr/lib/systemd/system/nmbd.service
diff --git a/extra-network/samba/autobuild/overrides/usr/lib/systemd/system/samba.service b/app-network/samba/autobuild/overrides/usr/lib/systemd/system/samba.service
similarity index 100%
rename from extra-network/samba/autobuild/overrides/usr/lib/systemd/system/samba.service
rename to app-network/samba/autobuild/overrides/usr/lib/systemd/system/samba.service
diff --git a/extra-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.service b/app-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.service
similarity index 100%
rename from extra-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.service
rename to app-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.service
diff --git a/extra-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.socket b/app-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.socket
similarity index 100%
rename from extra-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.socket
rename to app-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd.socket
diff --git a/extra-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd@.service b/app-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd@.service
similarity index 100%
rename from extra-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd@.service
rename to app-network/samba/autobuild/overrides/usr/lib/systemd/system/smbd@.service
diff --git a/extra-network/samba/autobuild/overrides/usr/lib/systemd/system/winbindd.service b/app-network/samba/autobuild/overrides/usr/lib/systemd/system/winbindd.service
similarity index 100%
rename from extra-network/samba/autobuild/overrides/usr/lib/systemd/system/winbindd.service
rename to app-network/samba/autobuild/overrides/usr/lib/systemd/system/winbindd.service
diff --git a/extra-network/samba/autobuild/overrides/usr/lib/tmpfiles.d/samba.conf b/app-network/samba/autobuild/overrides/usr/lib/tmpfiles.d/samba.conf
similarity index 100%
rename from extra-network/samba/autobuild/overrides/usr/lib/tmpfiles.d/samba.conf
rename to app-network/samba/autobuild/overrides/usr/lib/tmpfiles.d/samba.conf
diff --git a/extra-network/samba/autobuild/patches/0001-Remove-stropts_h-from-network_h.patch b/app-network/samba/autobuild/patches/0001-Remove-stropts_h-from-network_h.patch
similarity index 100%
rename from extra-network/samba/autobuild/patches/0001-Remove-stropts_h-from-network_h.patch
rename to app-network/samba/autobuild/patches/0001-Remove-stropts_h-from-network_h.patch
diff --git a/extra-network/samba/autobuild/postinst b/app-network/samba/autobuild/postinst
similarity index 100%
rename from extra-network/samba/autobuild/postinst
rename to app-network/samba/autobuild/postinst
diff --git a/extra-network/samba/autobuild/prepare b/app-network/samba/autobuild/prepare
similarity index 100%
rename from extra-network/samba/autobuild/prepare
rename to app-network/samba/autobuild/prepare
diff --git a/extra-network/samba/spec b/app-network/samba/spec
similarity index 100%
rename from extra-network/samba/spec
rename to app-network/samba/spec
diff --git a/extra-network/scapy/autobuild/defines b/app-network/scapy/autobuild/defines
similarity index 100%
rename from extra-network/scapy/autobuild/defines
rename to app-network/scapy/autobuild/defines
diff --git a/extra-network/scapy/spec b/app-network/scapy/spec
similarity index 100%
rename from extra-network/scapy/spec
rename to app-network/scapy/spec
diff --git a/extra-network/ser2net/autobuild/beyond b/app-network/ser2net/autobuild/beyond
similarity index 100%
rename from extra-network/ser2net/autobuild/beyond
rename to app-network/ser2net/autobuild/beyond
diff --git a/extra-network/ser2net/autobuild/conffiles b/app-network/ser2net/autobuild/conffiles
similarity index 100%
rename from extra-network/ser2net/autobuild/conffiles
rename to app-network/ser2net/autobuild/conffiles
diff --git a/extra-network/ser2net/autobuild/defines b/app-network/ser2net/autobuild/defines
similarity index 100%
rename from extra-network/ser2net/autobuild/defines
rename to app-network/ser2net/autobuild/defines
diff --git a/extra-network/ser2net/spec b/app-network/ser2net/spec
similarity index 100%
rename from extra-network/ser2net/spec
rename to app-network/ser2net/spec
diff --git a/extra-network/shadowsocks-libev/autobuild/beyond b/app-network/shadowsocks-libev/autobuild/beyond
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/beyond
rename to app-network/shadowsocks-libev/autobuild/beyond
diff --git a/extra-network/shadowsocks-libev/autobuild/defines b/app-network/shadowsocks-libev/autobuild/defines
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/defines
rename to app-network/shadowsocks-libev/autobuild/defines
diff --git a/extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-redir@.service b/app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-redir@.service
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-redir@.service
rename to app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-redir@.service
diff --git a/extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-server@.service b/app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-server@.service
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-server@.service
rename to app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-server@.service
diff --git a/extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-tunnel@.service b/app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-tunnel@.service
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-tunnel@.service
rename to app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev-tunnel@.service
diff --git a/extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev@.service b/app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev@.service
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev@.service
rename to app-network/shadowsocks-libev/autobuild/overrides/usr/lib/systemd/system/shadowsocks-libev@.service
diff --git a/extra-network/shadowsocks-libev/autobuild/postinst b/app-network/shadowsocks-libev/autobuild/postinst
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/postinst
rename to app-network/shadowsocks-libev/autobuild/postinst
diff --git a/extra-network/shadowsocks-libev/autobuild/prepare b/app-network/shadowsocks-libev/autobuild/prepare
similarity index 100%
rename from extra-network/shadowsocks-libev/autobuild/prepare
rename to app-network/shadowsocks-libev/autobuild/prepare
diff --git a/extra-network/shadowsocks-libev/spec b/app-network/shadowsocks-libev/spec
similarity index 100%
rename from extra-network/shadowsocks-libev/spec
rename to app-network/shadowsocks-libev/spec
diff --git a/extra-network/shadowsocks-qt5/autobuild/defines b/app-network/shadowsocks-qt5/autobuild/defines
similarity index 100%
rename from extra-network/shadowsocks-qt5/autobuild/defines
rename to app-network/shadowsocks-qt5/autobuild/defines
diff --git a/extra-network/shadowsocks-qt5/spec b/app-network/shadowsocks-qt5/spec
similarity index 100%
rename from extra-network/shadowsocks-qt5/spec
rename to app-network/shadowsocks-qt5/spec
diff --git a/extra-network/shadowsocks-rust/autobuild/beyond b/app-network/shadowsocks-rust/autobuild/beyond
similarity index 100%
rename from extra-network/shadowsocks-rust/autobuild/beyond
rename to app-network/shadowsocks-rust/autobuild/beyond
diff --git a/extra-network/shadowsocks-rust/autobuild/defines b/app-network/shadowsocks-rust/autobuild/defines
similarity index 100%
rename from extra-network/shadowsocks-rust/autobuild/defines
rename to app-network/shadowsocks-rust/autobuild/defines
diff --git a/extra-network/shadowsocks-rust/autobuild/prepare b/app-network/shadowsocks-rust/autobuild/prepare
similarity index 100%
rename from extra-network/shadowsocks-rust/autobuild/prepare
rename to app-network/shadowsocks-rust/autobuild/prepare
diff --git a/extra-network/shadowsocks-rust/spec b/app-network/shadowsocks-rust/spec
similarity index 100%
rename from extra-network/shadowsocks-rust/spec
rename to app-network/shadowsocks-rust/spec
diff --git a/extra-network/shairplay/autobuild/beyond b/app-network/shairplay/autobuild/beyond
similarity index 100%
rename from extra-network/shairplay/autobuild/beyond
rename to app-network/shairplay/autobuild/beyond
diff --git a/extra-network/shairplay/autobuild/defines b/app-network/shairplay/autobuild/defines
similarity index 100%
rename from extra-network/shairplay/autobuild/defines
rename to app-network/shairplay/autobuild/defines
diff --git a/extra-network/shairplay/autobuild/overrides/usr/lib/systemd/system/shairplay.service b/app-network/shairplay/autobuild/overrides/usr/lib/systemd/system/shairplay.service
similarity index 100%
rename from extra-network/shairplay/autobuild/overrides/usr/lib/systemd/system/shairplay.service
rename to app-network/shairplay/autobuild/overrides/usr/lib/systemd/system/shairplay.service
diff --git a/extra-network/shairplay/autobuild/patch b/app-network/shairplay/autobuild/patch
similarity index 100%
rename from extra-network/shairplay/autobuild/patch
rename to app-network/shairplay/autobuild/patch
diff --git a/extra-network/shairplay/spec b/app-network/shairplay/spec
similarity index 100%
rename from extra-network/shairplay/spec
rename to app-network/shairplay/spec
diff --git a/extra-network/siege/autobuild/beyond b/app-network/siege/autobuild/beyond
similarity index 100%
rename from extra-network/siege/autobuild/beyond
rename to app-network/siege/autobuild/beyond
diff --git a/extra-network/siege/autobuild/conffiles b/app-network/siege/autobuild/conffiles
similarity index 100%
rename from extra-network/siege/autobuild/conffiles
rename to app-network/siege/autobuild/conffiles
diff --git a/extra-network/siege/autobuild/defines b/app-network/siege/autobuild/defines
similarity index 100%
rename from extra-network/siege/autobuild/defines
rename to app-network/siege/autobuild/defines
diff --git a/extra-network/siege/spec b/app-network/siege/spec
similarity index 100%
rename from extra-network/siege/spec
rename to app-network/siege/spec
diff --git a/extra-network/simple-obfs/autobuild/defines b/app-network/simple-obfs/autobuild/defines
similarity index 100%
rename from extra-network/simple-obfs/autobuild/defines
rename to app-network/simple-obfs/autobuild/defines
diff --git a/extra-network/simple-obfs/autobuild/patch b/app-network/simple-obfs/autobuild/patch
similarity index 100%
rename from extra-network/simple-obfs/autobuild/patch
rename to app-network/simple-obfs/autobuild/patch
diff --git a/extra-network/simple-obfs/autobuild/prepare b/app-network/simple-obfs/autobuild/prepare
similarity index 100%
rename from extra-network/simple-obfs/autobuild/prepare
rename to app-network/simple-obfs/autobuild/prepare
diff --git a/extra-network/simple-obfs/spec b/app-network/simple-obfs/spec
similarity index 100%
rename from extra-network/simple-obfs/spec
rename to app-network/simple-obfs/spec
diff --git a/extra-network/slurm/autobuild/beyond b/app-network/slurm/autobuild/beyond
similarity index 100%
rename from extra-network/slurm/autobuild/beyond
rename to app-network/slurm/autobuild/beyond
diff --git a/extra-network/slurm/autobuild/defines b/app-network/slurm/autobuild/defines
similarity index 100%
rename from extra-network/slurm/autobuild/defines
rename to app-network/slurm/autobuild/defines
diff --git a/extra-network/slurm/spec b/app-network/slurm/spec
similarity index 100%
rename from extra-network/slurm/spec
rename to app-network/slurm/spec
diff --git a/extra-network/smartdns/autobuild/beyond b/app-network/smartdns/autobuild/beyond
similarity index 100%
rename from extra-network/smartdns/autobuild/beyond
rename to app-network/smartdns/autobuild/beyond
diff --git a/extra-network/smartdns/autobuild/conffiles b/app-network/smartdns/autobuild/conffiles
similarity index 100%
rename from extra-network/smartdns/autobuild/conffiles
rename to app-network/smartdns/autobuild/conffiles
diff --git a/extra-network/smartdns/autobuild/defines b/app-network/smartdns/autobuild/defines
similarity index 100%
rename from extra-network/smartdns/autobuild/defines
rename to app-network/smartdns/autobuild/defines
diff --git a/extra-network/smartdns/spec b/app-network/smartdns/spec
similarity index 100%
rename from extra-network/smartdns/spec
rename to app-network/smartdns/spec
diff --git a/extra-network/socat/autobuild/defines b/app-network/socat/autobuild/defines
similarity index 100%
rename from extra-network/socat/autobuild/defines
rename to app-network/socat/autobuild/defines
diff --git a/extra-network/socat/spec b/app-network/socat/spec
similarity index 100%
rename from extra-network/socat/spec
rename to app-network/socat/spec
diff --git a/extra-network/spamassassin/autobuild/build b/app-network/spamassassin/autobuild/build
similarity index 100%
rename from extra-network/spamassassin/autobuild/build
rename to app-network/spamassassin/autobuild/build
diff --git a/extra-network/spamassassin/autobuild/defines b/app-network/spamassassin/autobuild/defines
similarity index 100%
rename from extra-network/spamassassin/autobuild/defines
rename to app-network/spamassassin/autobuild/defines
diff --git a/extra-network/spamassassin/autobuild/overrides/usr/lib/systemd/system/spamassassin.service b/app-network/spamassassin/autobuild/overrides/usr/lib/systemd/system/spamassassin.service
similarity index 100%
rename from extra-network/spamassassin/autobuild/overrides/usr/lib/systemd/system/spamassassin.service
rename to app-network/spamassassin/autobuild/overrides/usr/lib/systemd/system/spamassassin.service
diff --git a/extra-network/spamassassin/autobuild/postinst b/app-network/spamassassin/autobuild/postinst
similarity index 100%
rename from extra-network/spamassassin/autobuild/postinst
rename to app-network/spamassassin/autobuild/postinst
diff --git a/extra-network/spamassassin/autobuild/usergroup b/app-network/spamassassin/autobuild/usergroup
similarity index 100%
rename from extra-network/spamassassin/autobuild/usergroup
rename to app-network/spamassassin/autobuild/usergroup
diff --git a/extra-network/spamassassin/spec b/app-network/spamassassin/spec
similarity index 100%
rename from extra-network/spamassassin/spec
rename to app-network/spamassassin/spec
diff --git a/extra-network/speedometer/autobuild/defines b/app-network/speedometer/autobuild/defines
similarity index 100%
rename from extra-network/speedometer/autobuild/defines
rename to app-network/speedometer/autobuild/defines
diff --git a/extra-network/speedometer/spec b/app-network/speedometer/spec
similarity index 100%
rename from extra-network/speedometer/spec
rename to app-network/speedometer/spec
diff --git a/extra-network/spice-protocol/autobuild/defines b/app-network/spice-protocol/autobuild/defines
similarity index 100%
rename from extra-network/spice-protocol/autobuild/defines
rename to app-network/spice-protocol/autobuild/defines
diff --git a/extra-network/spice-protocol/spec b/app-network/spice-protocol/spec
similarity index 100%
rename from extra-network/spice-protocol/spec
rename to app-network/spice-protocol/spec
diff --git a/extra-network/spice-vdagent/autobuild/beyond b/app-network/spice-vdagent/autobuild/beyond
similarity index 100%
rename from extra-network/spice-vdagent/autobuild/beyond
rename to app-network/spice-vdagent/autobuild/beyond
diff --git a/extra-network/spice-vdagent/autobuild/conffiles b/app-network/spice-vdagent/autobuild/conffiles
similarity index 100%
rename from extra-network/spice-vdagent/autobuild/conffiles
rename to app-network/spice-vdagent/autobuild/conffiles
diff --git a/extra-network/spice-vdagent/autobuild/defines b/app-network/spice-vdagent/autobuild/defines
similarity index 100%
rename from extra-network/spice-vdagent/autobuild/defines
rename to app-network/spice-vdagent/autobuild/defines
diff --git a/extra-network/spice-vdagent/autobuild/overrides/etc/conf.d/spice-vdagentd b/app-network/spice-vdagent/autobuild/overrides/etc/conf.d/spice-vdagentd
similarity index 100%
rename from extra-network/spice-vdagent/autobuild/overrides/etc/conf.d/spice-vdagentd
rename to app-network/spice-vdagent/autobuild/overrides/etc/conf.d/spice-vdagentd
diff --git a/extra-network/spice-vdagent/autobuild/prepare b/app-network/spice-vdagent/autobuild/prepare
similarity index 100%
rename from extra-network/spice-vdagent/autobuild/prepare
rename to app-network/spice-vdagent/autobuild/prepare
diff --git a/extra-network/spice-vdagent/spec b/app-network/spice-vdagent/spec
similarity index 100%
rename from extra-network/spice-vdagent/spec
rename to app-network/spice-vdagent/spec
diff --git a/extra-network/spice/autobuild/defines b/app-network/spice/autobuild/defines
similarity index 100%
rename from extra-network/spice/autobuild/defines
rename to app-network/spice/autobuild/defines
diff --git a/extra-network/spice/autobuild/patches/0001-Make-disable-server-tests.patch b/app-network/spice/autobuild/patches/0001-Make-disable-server-tests.patch
similarity index 100%
rename from extra-network/spice/autobuild/patches/0001-Make-disable-server-tests.patch
rename to app-network/spice/autobuild/patches/0001-Make-disable-server-tests.patch
diff --git a/extra-network/spice/spec b/app-network/spice/spec
similarity index 100%
rename from extra-network/spice/spec
rename to app-network/spice/spec
diff --git a/extra-network/ss-tproxy/autobuild/build b/app-network/ss-tproxy/autobuild/build
similarity index 100%
rename from extra-network/ss-tproxy/autobuild/build
rename to app-network/ss-tproxy/autobuild/build
diff --git a/extra-network/ss-tproxy/autobuild/defines b/app-network/ss-tproxy/autobuild/defines
similarity index 100%
rename from extra-network/ss-tproxy/autobuild/defines
rename to app-network/ss-tproxy/autobuild/defines
diff --git a/extra-network/ss-tproxy/autobuild/postinst b/app-network/ss-tproxy/autobuild/postinst
similarity index 100%
rename from extra-network/ss-tproxy/autobuild/postinst
rename to app-network/ss-tproxy/autobuild/postinst
diff --git a/extra-network/ss-tproxy/autobuild/prerm b/app-network/ss-tproxy/autobuild/prerm
similarity index 100%
rename from extra-network/ss-tproxy/autobuild/prerm
rename to app-network/ss-tproxy/autobuild/prerm
diff --git a/extra-network/ss-tproxy/spec b/app-network/ss-tproxy/spec
similarity index 100%
rename from extra-network/ss-tproxy/spec
rename to app-network/ss-tproxy/spec
diff --git a/extra-network/sshfs/autobuild/defines b/app-network/sshfs/autobuild/defines
similarity index 100%
rename from extra-network/sshfs/autobuild/defines
rename to app-network/sshfs/autobuild/defines
diff --git a/extra-network/sshfs/spec b/app-network/sshfs/spec
similarity index 100%
rename from extra-network/sshfs/spec
rename to app-network/sshfs/spec
diff --git a/extra-network/sshpass/autobuild/defines b/app-network/sshpass/autobuild/defines
similarity index 100%
rename from extra-network/sshpass/autobuild/defines
rename to app-network/sshpass/autobuild/defines
diff --git a/extra-network/sshpass/autobuild/prepare b/app-network/sshpass/autobuild/prepare
similarity index 100%
rename from extra-network/sshpass/autobuild/prepare
rename to app-network/sshpass/autobuild/prepare
diff --git a/extra-network/sshpass/spec b/app-network/sshpass/spec
similarity index 100%
rename from extra-network/sshpass/spec
rename to app-network/sshpass/spec
diff --git a/extra-network/sslh/autobuild/defines b/app-network/sslh/autobuild/defines
similarity index 100%
rename from extra-network/sslh/autobuild/defines
rename to app-network/sslh/autobuild/defines
diff --git a/extra-network/sslh/spec b/app-network/sslh/spec
similarity index 100%
rename from extra-network/sslh/spec
rename to app-network/sslh/spec
diff --git a/extra-network/strongswan/autobuild/amd64/conffiles b/app-network/strongswan/autobuild/amd64/conffiles
similarity index 100%
rename from extra-network/strongswan/autobuild/amd64/conffiles
rename to app-network/strongswan/autobuild/amd64/conffiles
diff --git a/extra-network/strongswan/autobuild/conffiles b/app-network/strongswan/autobuild/conffiles
similarity index 100%
rename from extra-network/strongswan/autobuild/conffiles
rename to app-network/strongswan/autobuild/conffiles
diff --git a/extra-network/strongswan/autobuild/defines b/app-network/strongswan/autobuild/defines
similarity index 100%
rename from extra-network/strongswan/autobuild/defines
rename to app-network/strongswan/autobuild/defines
diff --git a/extra-network/strongswan/spec b/app-network/strongswan/spec
similarity index 100%
rename from extra-network/strongswan/spec
rename to app-network/strongswan/spec
diff --git a/extra-network/stubby/autobuild/defines b/app-network/stubby/autobuild/defines
similarity index 100%
rename from extra-network/stubby/autobuild/defines
rename to app-network/stubby/autobuild/defines
diff --git a/extra-network/stubby/spec b/app-network/stubby/spec
similarity index 100%
rename from extra-network/stubby/spec
rename to app-network/stubby/spec
diff --git a/extra-network/stunnel/autobuild/beyond b/app-network/stunnel/autobuild/beyond
similarity index 100%
rename from extra-network/stunnel/autobuild/beyond
rename to app-network/stunnel/autobuild/beyond
diff --git a/extra-network/stunnel/autobuild/defines b/app-network/stunnel/autobuild/defines
similarity index 100%
rename from extra-network/stunnel/autobuild/defines
rename to app-network/stunnel/autobuild/defines
diff --git a/extra-network/stunnel/autobuild/overrides/usr/lib/sysusers.d/stunnel.conf b/app-network/stunnel/autobuild/overrides/usr/lib/sysusers.d/stunnel.conf
similarity index 100%
rename from extra-network/stunnel/autobuild/overrides/usr/lib/sysusers.d/stunnel.conf
rename to app-network/stunnel/autobuild/overrides/usr/lib/sysusers.d/stunnel.conf
diff --git a/extra-network/stunnel/autobuild/overrides/usr/lib/tmpfiles.d/stunnel.conf b/app-network/stunnel/autobuild/overrides/usr/lib/tmpfiles.d/stunnel.conf
similarity index 100%
rename from extra-network/stunnel/autobuild/overrides/usr/lib/tmpfiles.d/stunnel.conf
rename to app-network/stunnel/autobuild/overrides/usr/lib/tmpfiles.d/stunnel.conf
diff --git a/extra-network/stunnel/autobuild/postinst b/app-network/stunnel/autobuild/postinst
similarity index 100%
rename from extra-network/stunnel/autobuild/postinst
rename to app-network/stunnel/autobuild/postinst
diff --git a/extra-network/stunnel/spec b/app-network/stunnel/spec
similarity index 100%
rename from extra-network/stunnel/spec
rename to app-network/stunnel/spec
diff --git a/extra-network/syncthing-gtk/autobuild/defines b/app-network/syncthing-gtk/autobuild/defines
similarity index 100%
rename from extra-network/syncthing-gtk/autobuild/defines
rename to app-network/syncthing-gtk/autobuild/defines
diff --git a/extra-network/syncthing-gtk/spec b/app-network/syncthing-gtk/spec
similarity index 100%
rename from extra-network/syncthing-gtk/spec
rename to app-network/syncthing-gtk/spec
diff --git a/extra-network/syncthing/autobuild/build b/app-network/syncthing/autobuild/build
similarity index 100%
rename from extra-network/syncthing/autobuild/build
rename to app-network/syncthing/autobuild/build
diff --git a/extra-network/syncthing/autobuild/defines b/app-network/syncthing/autobuild/defines
similarity index 100%
rename from extra-network/syncthing/autobuild/defines
rename to app-network/syncthing/autobuild/defines
diff --git a/extra-network/syncthing/autobuild/overrides/usr/lib/systemd/system/syncthing-relaysrv.service b/app-network/syncthing/autobuild/overrides/usr/lib/systemd/system/syncthing-relaysrv.service
similarity index 100%
rename from extra-network/syncthing/autobuild/overrides/usr/lib/systemd/system/syncthing-relaysrv.service
rename to app-network/syncthing/autobuild/overrides/usr/lib/systemd/system/syncthing-relaysrv.service
diff --git a/extra-network/syncthing/autobuild/overrides/usr/lib/sysusers.d/syncthing-relaysrv.conf b/app-network/syncthing/autobuild/overrides/usr/lib/sysusers.d/syncthing-relaysrv.conf
similarity index 100%
rename from extra-network/syncthing/autobuild/overrides/usr/lib/sysusers.d/syncthing-relaysrv.conf
rename to app-network/syncthing/autobuild/overrides/usr/lib/sysusers.d/syncthing-relaysrv.conf
diff --git a/extra-network/syncthing/autobuild/overrides/usr/lib/tmpfiles.d/syncthing-relaysrv.conf b/app-network/syncthing/autobuild/overrides/usr/lib/tmpfiles.d/syncthing-relaysrv.conf
similarity index 100%
rename from extra-network/syncthing/autobuild/overrides/usr/lib/tmpfiles.d/syncthing-relaysrv.conf
rename to app-network/syncthing/autobuild/overrides/usr/lib/tmpfiles.d/syncthing-relaysrv.conf
diff --git a/extra-network/syncthing/autobuild/postinst b/app-network/syncthing/autobuild/postinst
similarity index 100%
rename from extra-network/syncthing/autobuild/postinst
rename to app-network/syncthing/autobuild/postinst
diff --git a/extra-network/syncthing/spec b/app-network/syncthing/spec
similarity index 100%
rename from extra-network/syncthing/spec
rename to app-network/syncthing/spec
diff --git a/extra-network/synergy/autobuild/build b/app-network/synergy/autobuild/build
similarity index 100%
rename from extra-network/synergy/autobuild/build
rename to app-network/synergy/autobuild/build
diff --git a/extra-network/synergy/autobuild/conffiles b/app-network/synergy/autobuild/conffiles
similarity index 100%
rename from extra-network/synergy/autobuild/conffiles
rename to app-network/synergy/autobuild/conffiles
diff --git a/extra-network/synergy/autobuild/defines b/app-network/synergy/autobuild/defines
similarity index 100%
rename from extra-network/synergy/autobuild/defines
rename to app-network/synergy/autobuild/defines
diff --git a/extra-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.service b/app-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.service
similarity index 100%
rename from extra-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.service
rename to app-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.service
diff --git a/extra-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.socket b/app-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.socket
similarity index 100%
rename from extra-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.socket
rename to app-network/synergy/autobuild/overrides/usr/lib/systemd/system/synergys.socket
diff --git a/extra-network/synergy/spec b/app-network/synergy/spec
similarity index 100%
rename from extra-network/synergy/spec
rename to app-network/synergy/spec
diff --git a/extra-network/tailscale/autobuild/beyond b/app-network/tailscale/autobuild/beyond
similarity index 100%
rename from extra-network/tailscale/autobuild/beyond
rename to app-network/tailscale/autobuild/beyond
diff --git a/extra-network/tailscale/autobuild/build b/app-network/tailscale/autobuild/build
similarity index 100%
rename from extra-network/tailscale/autobuild/build
rename to app-network/tailscale/autobuild/build
diff --git a/extra-network/tailscale/autobuild/conffiles b/app-network/tailscale/autobuild/conffiles
similarity index 100%
rename from extra-network/tailscale/autobuild/conffiles
rename to app-network/tailscale/autobuild/conffiles
diff --git a/extra-network/tailscale/autobuild/defines b/app-network/tailscale/autobuild/defines
similarity index 100%
rename from extra-network/tailscale/autobuild/defines
rename to app-network/tailscale/autobuild/defines
diff --git a/extra-network/tailscale/autobuild/prepare b/app-network/tailscale/autobuild/prepare
similarity index 100%
rename from extra-network/tailscale/autobuild/prepare
rename to app-network/tailscale/autobuild/prepare
diff --git a/extra-network/tailscale/spec b/app-network/tailscale/spec
similarity index 100%
rename from extra-network/tailscale/spec
rename to app-network/tailscale/spec
diff --git a/extra-network/tcp-wrappers/autobuild/build b/app-network/tcp-wrappers/autobuild/build
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/build
rename to app-network/tcp-wrappers/autobuild/build
diff --git a/extra-network/tcp-wrappers/autobuild/conffiles b/app-network/tcp-wrappers/autobuild/conffiles
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/conffiles
rename to app-network/tcp-wrappers/autobuild/conffiles
diff --git a/extra-network/tcp-wrappers/autobuild/defines b/app-network/tcp-wrappers/autobuild/defines
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/defines
rename to app-network/tcp-wrappers/autobuild/defines
diff --git a/extra-network/tcp-wrappers/autobuild/overrides/etc/hosts.allow b/app-network/tcp-wrappers/autobuild/overrides/etc/hosts.allow
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/overrides/etc/hosts.allow
rename to app-network/tcp-wrappers/autobuild/overrides/etc/hosts.allow
diff --git a/extra-network/tcp-wrappers/autobuild/overrides/etc/hosts.deny b/app-network/tcp-wrappers/autobuild/overrides/etc/hosts.deny
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/overrides/etc/hosts.deny
rename to app-network/tcp-wrappers/autobuild/overrides/etc/hosts.deny
diff --git a/extra-network/tcp-wrappers/autobuild/patches/00_man_quoting.diff b/app-network/tcp-wrappers/autobuild/patches/00_man_quoting.diff
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/00_man_quoting.diff
rename to app-network/tcp-wrappers/autobuild/patches/00_man_quoting.diff
diff --git a/extra-network/tcp-wrappers/autobuild/patches/00_man_typos b/app-network/tcp-wrappers/autobuild/patches/00_man_typos
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/00_man_typos
rename to app-network/tcp-wrappers/autobuild/patches/00_man_typos
diff --git a/extra-network/tcp-wrappers/autobuild/patches/01_man_portability b/app-network/tcp-wrappers/autobuild/patches/01_man_portability
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/01_man_portability
rename to app-network/tcp-wrappers/autobuild/patches/01_man_portability
diff --git a/extra-network/tcp-wrappers/autobuild/patches/05_wildcard_matching b/app-network/tcp-wrappers/autobuild/patches/05_wildcard_matching
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/05_wildcard_matching
rename to app-network/tcp-wrappers/autobuild/patches/05_wildcard_matching
diff --git a/extra-network/tcp-wrappers/autobuild/patches/06_fix_gethostbyname b/app-network/tcp-wrappers/autobuild/patches/06_fix_gethostbyname
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/06_fix_gethostbyname
rename to app-network/tcp-wrappers/autobuild/patches/06_fix_gethostbyname
diff --git a/extra-network/tcp-wrappers/autobuild/patches/10_usagi-ipv6 b/app-network/tcp-wrappers/autobuild/patches/10_usagi-ipv6
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/10_usagi-ipv6
rename to app-network/tcp-wrappers/autobuild/patches/10_usagi-ipv6
diff --git a/extra-network/tcp-wrappers/autobuild/patches/11_tcpd_blacklist b/app-network/tcp-wrappers/autobuild/patches/11_tcpd_blacklist
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/11_tcpd_blacklist
rename to app-network/tcp-wrappers/autobuild/patches/11_tcpd_blacklist
diff --git a/extra-network/tcp-wrappers/autobuild/patches/11_usagi_fix b/app-network/tcp-wrappers/autobuild/patches/11_usagi_fix
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/11_usagi_fix
rename to app-network/tcp-wrappers/autobuild/patches/11_usagi_fix
diff --git a/extra-network/tcp-wrappers/autobuild/patches/12_makefile_config b/app-network/tcp-wrappers/autobuild/patches/12_makefile_config
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/12_makefile_config
rename to app-network/tcp-wrappers/autobuild/patches/12_makefile_config
diff --git a/extra-network/tcp-wrappers/autobuild/patches/13_shlib_weaksym b/app-network/tcp-wrappers/autobuild/patches/13_shlib_weaksym
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/13_shlib_weaksym
rename to app-network/tcp-wrappers/autobuild/patches/13_shlib_weaksym
diff --git a/extra-network/tcp-wrappers/autobuild/patches/14_cidr_support b/app-network/tcp-wrappers/autobuild/patches/14_cidr_support
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/14_cidr_support
rename to app-network/tcp-wrappers/autobuild/patches/14_cidr_support
diff --git a/extra-network/tcp-wrappers/autobuild/patches/15_match_clarify b/app-network/tcp-wrappers/autobuild/patches/15_match_clarify
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/15_match_clarify
rename to app-network/tcp-wrappers/autobuild/patches/15_match_clarify
diff --git a/extra-network/tcp-wrappers/autobuild/patches/aclexec b/app-network/tcp-wrappers/autobuild/patches/aclexec
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/aclexec
rename to app-network/tcp-wrappers/autobuild/patches/aclexec
diff --git a/extra-network/tcp-wrappers/autobuild/patches/catch-sigchld b/app-network/tcp-wrappers/autobuild/patches/catch-sigchld
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/catch-sigchld
rename to app-network/tcp-wrappers/autobuild/patches/catch-sigchld
diff --git a/extra-network/tcp-wrappers/autobuild/patches/expand_remote_port b/app-network/tcp-wrappers/autobuild/patches/expand_remote_port
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/expand_remote_port
rename to app-network/tcp-wrappers/autobuild/patches/expand_remote_port
diff --git a/extra-network/tcp-wrappers/autobuild/patches/fix_parsing_long_lines b/app-network/tcp-wrappers/autobuild/patches/fix_parsing_long_lines
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/fix_parsing_long_lines
rename to app-network/tcp-wrappers/autobuild/patches/fix_parsing_long_lines
diff --git a/extra-network/tcp-wrappers/autobuild/patches/fix_static b/app-network/tcp-wrappers/autobuild/patches/fix_static
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/fix_static
rename to app-network/tcp-wrappers/autobuild/patches/fix_static
diff --git a/extra-network/tcp-wrappers/autobuild/patches/fix_warnings b/app-network/tcp-wrappers/autobuild/patches/fix_warnings
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/fix_warnings
rename to app-network/tcp-wrappers/autobuild/patches/fix_warnings
diff --git a/extra-network/tcp-wrappers/autobuild/patches/fix_warnings2 b/app-network/tcp-wrappers/autobuild/patches/fix_warnings2
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/fix_warnings2
rename to app-network/tcp-wrappers/autobuild/patches/fix_warnings2
diff --git a/extra-network/tcp-wrappers/autobuild/patches/have_strerror b/app-network/tcp-wrappers/autobuild/patches/have_strerror
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/have_strerror
rename to app-network/tcp-wrappers/autobuild/patches/have_strerror
diff --git a/extra-network/tcp-wrappers/autobuild/patches/ignore_missing_inetdconf b/app-network/tcp-wrappers/autobuild/patches/ignore_missing_inetdconf
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/ignore_missing_inetdconf
rename to app-network/tcp-wrappers/autobuild/patches/ignore_missing_inetdconf
diff --git a/extra-network/tcp-wrappers/autobuild/patches/initgroups b/app-network/tcp-wrappers/autobuild/patches/initgroups
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/initgroups
rename to app-network/tcp-wrappers/autobuild/patches/initgroups
diff --git a/extra-network/tcp-wrappers/autobuild/patches/man_fromhost b/app-network/tcp-wrappers/autobuild/patches/man_fromhost
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/man_fromhost
rename to app-network/tcp-wrappers/autobuild/patches/man_fromhost
diff --git a/extra-network/tcp-wrappers/autobuild/patches/match_port b/app-network/tcp-wrappers/autobuild/patches/match_port
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/match_port
rename to app-network/tcp-wrappers/autobuild/patches/match_port
diff --git a/extra-network/tcp-wrappers/autobuild/patches/more_man_pages b/app-network/tcp-wrappers/autobuild/patches/more_man_pages
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/more_man_pages
rename to app-network/tcp-wrappers/autobuild/patches/more_man_pages
diff --git a/extra-network/tcp-wrappers/autobuild/patches/musl_support b/app-network/tcp-wrappers/autobuild/patches/musl_support
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/musl_support
rename to app-network/tcp-wrappers/autobuild/patches/musl_support
diff --git a/extra-network/tcp-wrappers/autobuild/patches/restore_sigalarm b/app-network/tcp-wrappers/autobuild/patches/restore_sigalarm
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/restore_sigalarm
rename to app-network/tcp-wrappers/autobuild/patches/restore_sigalarm
diff --git a/extra-network/tcp-wrappers/autobuild/patches/rfc931.diff b/app-network/tcp-wrappers/autobuild/patches/rfc931.diff
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/rfc931.diff
rename to app-network/tcp-wrappers/autobuild/patches/rfc931.diff
diff --git a/extra-network/tcp-wrappers/autobuild/patches/safe_finger b/app-network/tcp-wrappers/autobuild/patches/safe_finger
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/safe_finger
rename to app-network/tcp-wrappers/autobuild/patches/safe_finger
diff --git a/extra-network/tcp-wrappers/autobuild/patches/series b/app-network/tcp-wrappers/autobuild/patches/series
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/series
rename to app-network/tcp-wrappers/autobuild/patches/series
diff --git a/extra-network/tcp-wrappers/autobuild/patches/sig_fix b/app-network/tcp-wrappers/autobuild/patches/sig_fix
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/sig_fix
rename to app-network/tcp-wrappers/autobuild/patches/sig_fix
diff --git a/extra-network/tcp-wrappers/autobuild/patches/siglongjmp b/app-network/tcp-wrappers/autobuild/patches/siglongjmp
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/siglongjmp
rename to app-network/tcp-wrappers/autobuild/patches/siglongjmp
diff --git a/extra-network/tcp-wrappers/autobuild/patches/size_t b/app-network/tcp-wrappers/autobuild/patches/size_t
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/size_t
rename to app-network/tcp-wrappers/autobuild/patches/size_t
diff --git a/extra-network/tcp-wrappers/autobuild/patches/tcpdchk_libwrapped b/app-network/tcp-wrappers/autobuild/patches/tcpdchk_libwrapped
similarity index 100%
rename from extra-network/tcp-wrappers/autobuild/patches/tcpdchk_libwrapped
rename to app-network/tcp-wrappers/autobuild/patches/tcpdchk_libwrapped
diff --git a/extra-network/tcp-wrappers/spec b/app-network/tcp-wrappers/spec
similarity index 100%
rename from extra-network/tcp-wrappers/spec
rename to app-network/tcp-wrappers/spec
diff --git a/extra-network/tcpdump/autobuild/beyond b/app-network/tcpdump/autobuild/beyond
similarity index 100%
rename from extra-network/tcpdump/autobuild/beyond
rename to app-network/tcpdump/autobuild/beyond
diff --git a/extra-network/tcpdump/autobuild/defines b/app-network/tcpdump/autobuild/defines
similarity index 100%
rename from extra-network/tcpdump/autobuild/defines
rename to app-network/tcpdump/autobuild/defines
diff --git a/extra-network/tcpdump/autobuild/patches/tcpdump-CVE-2018-19519.patch b/app-network/tcpdump/autobuild/patches/tcpdump-CVE-2018-19519.patch
similarity index 100%
rename from extra-network/tcpdump/autobuild/patches/tcpdump-CVE-2018-19519.patch
rename to app-network/tcpdump/autobuild/patches/tcpdump-CVE-2018-19519.patch
diff --git a/extra-network/tcpdump/spec b/app-network/tcpdump/spec
similarity index 100%
rename from extra-network/tcpdump/spec
rename to app-network/tcpdump/spec
diff --git a/extra-network/tcping/autobuild/build b/app-network/tcping/autobuild/build
similarity index 100%
rename from extra-network/tcping/autobuild/build
rename to app-network/tcping/autobuild/build
diff --git a/extra-network/tcping/autobuild/defines b/app-network/tcping/autobuild/defines
similarity index 100%
rename from extra-network/tcping/autobuild/defines
rename to app-network/tcping/autobuild/defines
diff --git a/extra-network/tcping/spec b/app-network/tcping/spec
similarity index 100%
rename from extra-network/tcping/spec
rename to app-network/tcping/spec
diff --git a/extra-network/tcptrack/autobuild/defines b/app-network/tcptrack/autobuild/defines
similarity index 100%
rename from extra-network/tcptrack/autobuild/defines
rename to app-network/tcptrack/autobuild/defines
diff --git a/extra-network/tcptrack/spec b/app-network/tcptrack/spec
similarity index 100%
rename from extra-network/tcptrack/spec
rename to app-network/tcptrack/spec
diff --git a/extra-network/teamviewer/autobuild/build b/app-network/teamviewer/autobuild/build
similarity index 100%
rename from extra-network/teamviewer/autobuild/build
rename to app-network/teamviewer/autobuild/build
diff --git a/extra-network/teamviewer/autobuild/defines b/app-network/teamviewer/autobuild/defines
similarity index 100%
rename from extra-network/teamviewer/autobuild/defines
rename to app-network/teamviewer/autobuild/defines
diff --git a/extra-network/teamviewer/spec b/app-network/teamviewer/spec
similarity index 100%
rename from extra-network/teamviewer/spec
rename to app-network/teamviewer/spec
diff --git a/extra-network/tigervnc/autobuild/build b/app-network/tigervnc/autobuild/build
similarity index 100%
rename from extra-network/tigervnc/autobuild/build
rename to app-network/tigervnc/autobuild/build
diff --git a/extra-network/tigervnc/autobuild/defines b/app-network/tigervnc/autobuild/defines
similarity index 100%
rename from extra-network/tigervnc/autobuild/defines
rename to app-network/tigervnc/autobuild/defines
diff --git a/extra-network/tigervnc/autobuild/overrides/usr/lib/systemd/system/vncserver.service b/app-network/tigervnc/autobuild/overrides/usr/lib/systemd/system/vncserver.service
similarity index 100%
rename from extra-network/tigervnc/autobuild/overrides/usr/lib/systemd/system/vncserver.service
rename to app-network/tigervnc/autobuild/overrides/usr/lib/systemd/system/vncserver.service
diff --git a/extra-network/tigervnc/autobuild/overrides/usr/share/applications/vncviewer.desktop b/app-network/tigervnc/autobuild/overrides/usr/share/applications/vncviewer.desktop
similarity index 100%
rename from extra-network/tigervnc/autobuild/overrides/usr/share/applications/vncviewer.desktop
rename to app-network/tigervnc/autobuild/overrides/usr/share/applications/vncviewer.desktop
diff --git a/extra-network/tigervnc/autobuild/prepare b/app-network/tigervnc/autobuild/prepare
similarity index 100%
rename from extra-network/tigervnc/autobuild/prepare
rename to app-network/tigervnc/autobuild/prepare
diff --git a/extra-network/tigervnc/spec b/app-network/tigervnc/spec
similarity index 100%
rename from extra-network/tigervnc/spec
rename to app-network/tigervnc/spec
diff --git a/extra-network/tinc/autobuild/beyond b/app-network/tinc/autobuild/beyond
similarity index 100%
rename from extra-network/tinc/autobuild/beyond
rename to app-network/tinc/autobuild/beyond
diff --git a/extra-network/tinc/autobuild/defines b/app-network/tinc/autobuild/defines
similarity index 100%
rename from extra-network/tinc/autobuild/defines
rename to app-network/tinc/autobuild/defines
diff --git a/extra-network/tinc/autobuild/overrides/usr/lib/systemd/system/tinc@.service b/app-network/tinc/autobuild/overrides/usr/lib/systemd/system/tinc@.service
similarity index 100%
rename from extra-network/tinc/autobuild/overrides/usr/lib/systemd/system/tinc@.service
rename to app-network/tinc/autobuild/overrides/usr/lib/systemd/system/tinc@.service
diff --git a/extra-network/tinc/spec b/app-network/tinc/spec
similarity index 100%
rename from extra-network/tinc/spec
rename to app-network/tinc/spec
diff --git a/extra-network/tinyproxy/autobuild/conffiles b/app-network/tinyproxy/autobuild/conffiles
similarity index 100%
rename from extra-network/tinyproxy/autobuild/conffiles
rename to app-network/tinyproxy/autobuild/conffiles
diff --git a/extra-network/tinyproxy/autobuild/defines b/app-network/tinyproxy/autobuild/defines
similarity index 100%
rename from extra-network/tinyproxy/autobuild/defines
rename to app-network/tinyproxy/autobuild/defines
diff --git a/extra-network/tinyproxy/autobuild/overrides/usr/lib/systemd/system/tinyproxy.service b/app-network/tinyproxy/autobuild/overrides/usr/lib/systemd/system/tinyproxy.service
similarity index 100%
rename from extra-network/tinyproxy/autobuild/overrides/usr/lib/systemd/system/tinyproxy.service
rename to app-network/tinyproxy/autobuild/overrides/usr/lib/systemd/system/tinyproxy.service
diff --git a/extra-network/tinyproxy/autobuild/overrides/usr/lib/tmpfiles.d/tinyproxy.conf b/app-network/tinyproxy/autobuild/overrides/usr/lib/tmpfiles.d/tinyproxy.conf
similarity index 100%
rename from extra-network/tinyproxy/autobuild/overrides/usr/lib/tmpfiles.d/tinyproxy.conf
rename to app-network/tinyproxy/autobuild/overrides/usr/lib/tmpfiles.d/tinyproxy.conf
diff --git a/extra-network/tinyproxy/autobuild/patches/default-config.patch b/app-network/tinyproxy/autobuild/patches/default-config.patch
similarity index 100%
rename from extra-network/tinyproxy/autobuild/patches/default-config.patch
rename to app-network/tinyproxy/autobuild/patches/default-config.patch
diff --git a/extra-network/tinyproxy/autobuild/postinst b/app-network/tinyproxy/autobuild/postinst
similarity index 100%
rename from extra-network/tinyproxy/autobuild/postinst
rename to app-network/tinyproxy/autobuild/postinst
diff --git a/extra-network/tinyproxy/spec b/app-network/tinyproxy/spec
similarity index 100%
rename from extra-network/tinyproxy/spec
rename to app-network/tinyproxy/spec
diff --git a/extra-network/tor/autobuild/beyond b/app-network/tor/autobuild/beyond
similarity index 100%
rename from extra-network/tor/autobuild/beyond
rename to app-network/tor/autobuild/beyond
diff --git a/extra-network/tor/autobuild/conffiles b/app-network/tor/autobuild/conffiles
similarity index 100%
rename from extra-network/tor/autobuild/conffiles
rename to app-network/tor/autobuild/conffiles
diff --git a/extra-network/tor/autobuild/defines b/app-network/tor/autobuild/defines
similarity index 100%
rename from extra-network/tor/autobuild/defines
rename to app-network/tor/autobuild/defines
diff --git a/extra-network/tor/autobuild/overrides/etc/tor/torrc b/app-network/tor/autobuild/overrides/etc/tor/torrc
similarity index 100%
rename from extra-network/tor/autobuild/overrides/etc/tor/torrc
rename to app-network/tor/autobuild/overrides/etc/tor/torrc
diff --git a/extra-network/tor/autobuild/overrides/usr/lib/systemd/system/tor.service b/app-network/tor/autobuild/overrides/usr/lib/systemd/system/tor.service
similarity index 100%
rename from extra-network/tor/autobuild/overrides/usr/lib/systemd/system/tor.service
rename to app-network/tor/autobuild/overrides/usr/lib/systemd/system/tor.service
diff --git a/extra-network/tor/autobuild/usergroup b/app-network/tor/autobuild/usergroup
similarity index 100%
rename from extra-network/tor/autobuild/usergroup
rename to app-network/tor/autobuild/usergroup
diff --git a/extra-network/tor/spec b/app-network/tor/spec
similarity index 100%
rename from extra-network/tor/spec
rename to app-network/tor/spec
diff --git a/extra-network/torsocks/autobuild/beyond b/app-network/torsocks/autobuild/beyond
similarity index 100%
rename from extra-network/torsocks/autobuild/beyond
rename to app-network/torsocks/autobuild/beyond
diff --git a/extra-network/torsocks/autobuild/conffiles b/app-network/torsocks/autobuild/conffiles
similarity index 100%
rename from extra-network/torsocks/autobuild/conffiles
rename to app-network/torsocks/autobuild/conffiles
diff --git a/extra-network/torsocks/autobuild/defines b/app-network/torsocks/autobuild/defines
similarity index 100%
rename from extra-network/torsocks/autobuild/defines
rename to app-network/torsocks/autobuild/defines
diff --git a/extra-network/torsocks/spec b/app-network/torsocks/spec
similarity index 100%
rename from extra-network/torsocks/spec
rename to app-network/torsocks/spec
diff --git a/extra-network/trojan/autobuild/conffiles b/app-network/trojan/autobuild/conffiles
similarity index 100%
rename from extra-network/trojan/autobuild/conffiles
rename to app-network/trojan/autobuild/conffiles
diff --git a/extra-network/trojan/autobuild/defines b/app-network/trojan/autobuild/defines
similarity index 100%
rename from extra-network/trojan/autobuild/defines
rename to app-network/trojan/autobuild/defines
diff --git a/extra-network/trojan/spec b/app-network/trojan/spec
similarity index 100%
rename from extra-network/trojan/spec
rename to app-network/trojan/spec
diff --git a/extra-network/udns/autobuild/build b/app-network/udns/autobuild/build
similarity index 100%
rename from extra-network/udns/autobuild/build
rename to app-network/udns/autobuild/build
diff --git a/extra-network/udns/autobuild/defines b/app-network/udns/autobuild/defines
similarity index 100%
rename from extra-network/udns/autobuild/defines
rename to app-network/udns/autobuild/defines
diff --git a/extra-network/udns/spec b/app-network/udns/spec
similarity index 100%
rename from extra-network/udns/spec
rename to app-network/udns/spec
diff --git a/extra-network/ufw/autobuild/build b/app-network/ufw/autobuild/build
similarity index 100%
rename from extra-network/ufw/autobuild/build
rename to app-network/ufw/autobuild/build
diff --git a/extra-network/ufw/autobuild/defines b/app-network/ufw/autobuild/defines
similarity index 100%
rename from extra-network/ufw/autobuild/defines
rename to app-network/ufw/autobuild/defines
diff --git a/extra-network/ufw/autobuild/overrides/usr/lib/systemd/system/ufw.service b/app-network/ufw/autobuild/overrides/usr/lib/systemd/system/ufw.service
similarity index 100%
rename from extra-network/ufw/autobuild/overrides/usr/lib/systemd/system/ufw.service
rename to app-network/ufw/autobuild/overrides/usr/lib/systemd/system/ufw.service
diff --git a/extra-network/ufw/spec b/app-network/ufw/spec
similarity index 100%
rename from extra-network/ufw/spec
rename to app-network/ufw/spec
diff --git a/extra-network/unbound/autobuild/beyond b/app-network/unbound/autobuild/beyond
similarity index 100%
rename from extra-network/unbound/autobuild/beyond
rename to app-network/unbound/autobuild/beyond
diff --git a/extra-network/unbound/autobuild/conffiles b/app-network/unbound/autobuild/conffiles
similarity index 100%
rename from extra-network/unbound/autobuild/conffiles
rename to app-network/unbound/autobuild/conffiles
diff --git a/extra-network/unbound/autobuild/defines b/app-network/unbound/autobuild/defines
similarity index 100%
rename from extra-network/unbound/autobuild/defines
rename to app-network/unbound/autobuild/defines
diff --git a/extra-network/unbound/autobuild/overrides/etc/unbound/unbound.conf b/app-network/unbound/autobuild/overrides/etc/unbound/unbound.conf
similarity index 100%
rename from extra-network/unbound/autobuild/overrides/etc/unbound/unbound.conf
rename to app-network/unbound/autobuild/overrides/etc/unbound/unbound.conf
diff --git a/extra-network/unbound/autobuild/overrides/usr/lib/systemd/system/unbound.service b/app-network/unbound/autobuild/overrides/usr/lib/systemd/system/unbound.service
similarity index 100%
rename from extra-network/unbound/autobuild/overrides/usr/lib/systemd/system/unbound.service
rename to app-network/unbound/autobuild/overrides/usr/lib/systemd/system/unbound.service
diff --git a/extra-network/unbound/autobuild/patches/CVE-2020-1226x.patch b/app-network/unbound/autobuild/patches/CVE-2020-1226x.patch
similarity index 100%
rename from extra-network/unbound/autobuild/patches/CVE-2020-1226x.patch
rename to app-network/unbound/autobuild/patches/CVE-2020-1226x.patch
diff --git a/extra-network/unbound/autobuild/postinst b/app-network/unbound/autobuild/postinst
similarity index 100%
rename from extra-network/unbound/autobuild/postinst
rename to app-network/unbound/autobuild/postinst
diff --git a/extra-network/unbound/spec b/app-network/unbound/spec
similarity index 100%
rename from extra-network/unbound/spec
rename to app-network/unbound/spec
diff --git a/extra-network/uw-imap/autobuild/beyond b/app-network/uw-imap/autobuild/beyond
similarity index 100%
rename from extra-network/uw-imap/autobuild/beyond
rename to app-network/uw-imap/autobuild/beyond
diff --git a/extra-network/uw-imap/autobuild/build b/app-network/uw-imap/autobuild/build
similarity index 100%
rename from extra-network/uw-imap/autobuild/build
rename to app-network/uw-imap/autobuild/build
diff --git a/extra-network/uw-imap/autobuild/defines b/app-network/uw-imap/autobuild/defines
similarity index 100%
rename from extra-network/uw-imap/autobuild/defines
rename to app-network/uw-imap/autobuild/defines
diff --git a/extra-network/uw-imap/autobuild/patches/1006_openssl1.1_autoverify.patch b/app-network/uw-imap/autobuild/patches/1006_openssl1.1_autoverify.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/1006_openssl1.1_autoverify.patch
rename to app-network/uw-imap/autobuild/patches/1006_openssl1.1_autoverify.patch
diff --git a/extra-network/uw-imap/autobuild/patches/imap-2007-paths.patch b/app-network/uw-imap/autobuild/patches/imap-2007-paths.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/imap-2007-paths.patch
rename to app-network/uw-imap/autobuild/patches/imap-2007-paths.patch
diff --git a/extra-network/uw-imap/autobuild/patches/imap-2007e-authmd5.patch b/app-network/uw-imap/autobuild/patches/imap-2007e-authmd5.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/imap-2007e-authmd5.patch
rename to app-network/uw-imap/autobuild/patches/imap-2007e-authmd5.patch
diff --git a/extra-network/uw-imap/autobuild/patches/imap-2007e-overflow.patch b/app-network/uw-imap/autobuild/patches/imap-2007e-overflow.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/imap-2007e-overflow.patch
rename to app-network/uw-imap/autobuild/patches/imap-2007e-overflow.patch
diff --git a/extra-network/uw-imap/autobuild/patches/imap-2007e-poll.patch b/app-network/uw-imap/autobuild/patches/imap-2007e-poll.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/imap-2007e-poll.patch
rename to app-network/uw-imap/autobuild/patches/imap-2007e-poll.patch
diff --git a/extra-network/uw-imap/autobuild/patches/imap-2007e-shared.patch b/app-network/uw-imap/autobuild/patches/imap-2007e-shared.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/imap-2007e-shared.patch
rename to app-network/uw-imap/autobuild/patches/imap-2007e-shared.patch
diff --git a/extra-network/uw-imap/autobuild/patches/imap-2007f-format-security.patch b/app-network/uw-imap/autobuild/patches/imap-2007f-format-security.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/imap-2007f-format-security.patch
rename to app-network/uw-imap/autobuild/patches/imap-2007f-format-security.patch
diff --git a/extra-network/uw-imap/autobuild/patches/imap-2007f-ldflags.patch b/app-network/uw-imap/autobuild/patches/imap-2007f-ldflags.patch
similarity index 100%
rename from extra-network/uw-imap/autobuild/patches/imap-2007f-ldflags.patch
rename to app-network/uw-imap/autobuild/patches/imap-2007f-ldflags.patch
diff --git a/extra-network/uw-imap/autobuild/prepare b/app-network/uw-imap/autobuild/prepare
similarity index 100%
rename from extra-network/uw-imap/autobuild/prepare
rename to app-network/uw-imap/autobuild/prepare
diff --git a/extra-network/uw-imap/spec b/app-network/uw-imap/spec
similarity index 100%
rename from extra-network/uw-imap/spec
rename to app-network/uw-imap/spec
diff --git a/extra-network/v2ray-plugin/autobuild/build b/app-network/v2ray-plugin/autobuild/build
similarity index 100%
rename from extra-network/v2ray-plugin/autobuild/build
rename to app-network/v2ray-plugin/autobuild/build
diff --git a/extra-network/v2ray-plugin/autobuild/defines b/app-network/v2ray-plugin/autobuild/defines
similarity index 100%
rename from extra-network/v2ray-plugin/autobuild/defines
rename to app-network/v2ray-plugin/autobuild/defines
diff --git a/extra-network/v2ray-plugin/spec b/app-network/v2ray-plugin/spec
similarity index 100%
rename from extra-network/v2ray-plugin/spec
rename to app-network/v2ray-plugin/spec
diff --git a/extra-network/v2ray/autobuild/build b/app-network/v2ray/autobuild/build
similarity index 100%
rename from extra-network/v2ray/autobuild/build
rename to app-network/v2ray/autobuild/build
diff --git a/extra-network/v2ray/autobuild/conffiles b/app-network/v2ray/autobuild/conffiles
similarity index 100%
rename from extra-network/v2ray/autobuild/conffiles
rename to app-network/v2ray/autobuild/conffiles
diff --git a/extra-network/v2ray/autobuild/defines b/app-network/v2ray/autobuild/defines
similarity index 100%
rename from extra-network/v2ray/autobuild/defines
rename to app-network/v2ray/autobuild/defines
diff --git a/extra-network/v2ray/autobuild/postinst b/app-network/v2ray/autobuild/postinst
similarity index 100%
rename from extra-network/v2ray/autobuild/postinst
rename to app-network/v2ray/autobuild/postinst
diff --git a/extra-network/v2ray/autobuild/prepare b/app-network/v2ray/autobuild/prepare
similarity index 100%
rename from extra-network/v2ray/autobuild/prepare
rename to app-network/v2ray/autobuild/prepare
diff --git a/extra-network/v2ray/spec b/app-network/v2ray/spec
similarity index 100%
rename from extra-network/v2ray/spec
rename to app-network/v2ray/spec
diff --git a/extra-network/varnish/autobuild/beyond b/app-network/varnish/autobuild/beyond
similarity index 100%
rename from extra-network/varnish/autobuild/beyond
rename to app-network/varnish/autobuild/beyond
diff --git a/extra-network/varnish/autobuild/conffiles b/app-network/varnish/autobuild/conffiles
similarity index 100%
rename from extra-network/varnish/autobuild/conffiles
rename to app-network/varnish/autobuild/conffiles
diff --git a/extra-network/varnish/autobuild/defines b/app-network/varnish/autobuild/defines
similarity index 100%
rename from extra-network/varnish/autobuild/defines
rename to app-network/varnish/autobuild/defines
diff --git a/extra-network/varnish/autobuild/overrides/usr/bin/varnish-vcl-reload b/app-network/varnish/autobuild/overrides/usr/bin/varnish-vcl-reload
similarity index 100%
rename from extra-network/varnish/autobuild/overrides/usr/bin/varnish-vcl-reload
rename to app-network/varnish/autobuild/overrides/usr/bin/varnish-vcl-reload
diff --git a/extra-network/varnish/autobuild/overrides/usr/lib/systemd/system/varnish.service b/app-network/varnish/autobuild/overrides/usr/lib/systemd/system/varnish.service
similarity index 100%
rename from extra-network/varnish/autobuild/overrides/usr/lib/systemd/system/varnish.service
rename to app-network/varnish/autobuild/overrides/usr/lib/systemd/system/varnish.service
diff --git a/extra-network/varnish/autobuild/overrides/usr/lib/sysusers.d/varnish.conf b/app-network/varnish/autobuild/overrides/usr/lib/sysusers.d/varnish.conf
similarity index 100%
rename from extra-network/varnish/autobuild/overrides/usr/lib/sysusers.d/varnish.conf
rename to app-network/varnish/autobuild/overrides/usr/lib/sysusers.d/varnish.conf
diff --git a/extra-network/varnish/autobuild/postinst b/app-network/varnish/autobuild/postinst
similarity index 100%
rename from extra-network/varnish/autobuild/postinst
rename to app-network/varnish/autobuild/postinst
diff --git a/extra-network/varnish/spec b/app-network/varnish/spec
similarity index 100%
rename from extra-network/varnish/spec
rename to app-network/varnish/spec
diff --git a/extra-network/vde2/autobuild/defines b/app-network/vde2/autobuild/defines
similarity index 100%
rename from extra-network/vde2/autobuild/defines
rename to app-network/vde2/autobuild/defines
diff --git a/extra-network/vde2/autobuild/patches/compile_with_hurd.patch b/app-network/vde2/autobuild/patches/compile_with_hurd.patch
similarity index 100%
rename from extra-network/vde2/autobuild/patches/compile_with_hurd.patch
rename to app-network/vde2/autobuild/patches/compile_with_hurd.patch
diff --git a/extra-network/vde2/autobuild/patches/compile_with_kfreebsd.patch b/app-network/vde2/autobuild/patches/compile_with_kfreebsd.patch
similarity index 100%
rename from extra-network/vde2/autobuild/patches/compile_with_kfreebsd.patch
rename to app-network/vde2/autobuild/patches/compile_with_kfreebsd.patch
diff --git a/extra-network/vde2/autobuild/patches/fix_qtime_hash_gc_race_condition.patch b/app-network/vde2/autobuild/patches/fix_qtime_hash_gc_race_condition.patch
similarity index 100%
rename from extra-network/vde2/autobuild/patches/fix_qtime_hash_gc_race_condition.patch
rename to app-network/vde2/autobuild/patches/fix_qtime_hash_gc_race_condition.patch
diff --git a/extra-network/vde2/autobuild/patches/fix_soname_version_info.patch b/app-network/vde2/autobuild/patches/fix_soname_version_info.patch
similarity index 100%
rename from extra-network/vde2/autobuild/patches/fix_soname_version_info.patch
rename to app-network/vde2/autobuild/patches/fix_soname_version_info.patch
diff --git a/extra-network/vde2/autobuild/patches/libvdeplug_dyn_versioned_dlopen.patch b/app-network/vde2/autobuild/patches/libvdeplug_dyn_versioned_dlopen.patch
similarity index 100%
rename from extra-network/vde2/autobuild/patches/libvdeplug_dyn_versioned_dlopen.patch
rename to app-network/vde2/autobuild/patches/libvdeplug_dyn_versioned_dlopen.patch
diff --git a/extra-network/vde2/autobuild/patches/series b/app-network/vde2/autobuild/patches/series
similarity index 100%
rename from extra-network/vde2/autobuild/patches/series
rename to app-network/vde2/autobuild/patches/series
diff --git a/extra-network/vde2/autobuild/patches/vde2-openssl_1.1_compatibility.patch b/app-network/vde2/autobuild/patches/vde2-openssl_1.1_compatibility.patch
similarity index 100%
rename from extra-network/vde2/autobuild/patches/vde2-openssl_1.1_compatibility.patch
rename to app-network/vde2/autobuild/patches/vde2-openssl_1.1_compatibility.patch
diff --git a/extra-network/vde2/autobuild/patches/vdeterm_terminal_reset.patch b/app-network/vde2/autobuild/patches/vdeterm_terminal_reset.patch
similarity index 100%
rename from extra-network/vde2/autobuild/patches/vdeterm_terminal_reset.patch
rename to app-network/vde2/autobuild/patches/vdeterm_terminal_reset.patch
diff --git a/extra-network/vde2/spec b/app-network/vde2/spec
similarity index 100%
rename from extra-network/vde2/spec
rename to app-network/vde2/spec
diff --git a/extra-network/vnstat/autobuild/beyond b/app-network/vnstat/autobuild/beyond
similarity index 100%
rename from extra-network/vnstat/autobuild/beyond
rename to app-network/vnstat/autobuild/beyond
diff --git a/extra-network/vnstat/autobuild/defines b/app-network/vnstat/autobuild/defines
similarity index 100%
rename from extra-network/vnstat/autobuild/defines
rename to app-network/vnstat/autobuild/defines
diff --git a/extra-network/vnstat/spec b/app-network/vnstat/spec
similarity index 100%
rename from extra-network/vnstat/spec
rename to app-network/vnstat/spec
diff --git a/extra-network/vpnc/autobuild/beyond b/app-network/vpnc/autobuild/beyond
similarity index 100%
rename from extra-network/vpnc/autobuild/beyond
rename to app-network/vpnc/autobuild/beyond
diff --git a/extra-network/vpnc/autobuild/conffiles b/app-network/vpnc/autobuild/conffiles
similarity index 100%
rename from extra-network/vpnc/autobuild/conffiles
rename to app-network/vpnc/autobuild/conffiles
diff --git a/extra-network/vpnc/autobuild/defines b/app-network/vpnc/autobuild/defines
similarity index 100%
rename from extra-network/vpnc/autobuild/defines
rename to app-network/vpnc/autobuild/defines
diff --git a/extra-network/vpnc/autobuild/overrides/etc/vpnc/default.conf b/app-network/vpnc/autobuild/overrides/etc/vpnc/default.conf
similarity index 100%
rename from extra-network/vpnc/autobuild/overrides/etc/vpnc/default.conf
rename to app-network/vpnc/autobuild/overrides/etc/vpnc/default.conf
diff --git a/extra-network/vpnc/autobuild/overrides/usr/lib/systemd/system/vpnc@.service b/app-network/vpnc/autobuild/overrides/usr/lib/systemd/system/vpnc@.service
similarity index 100%
rename from extra-network/vpnc/autobuild/overrides/usr/lib/systemd/system/vpnc@.service
rename to app-network/vpnc/autobuild/overrides/usr/lib/systemd/system/vpnc@.service
diff --git a/extra-network/vpnc/autobuild/patches/dpd_big-endian.patch b/app-network/vpnc/autobuild/patches/dpd_big-endian.patch
similarity index 100%
rename from extra-network/vpnc/autobuild/patches/dpd_big-endian.patch
rename to app-network/vpnc/autobuild/patches/dpd_big-endian.patch
diff --git a/extra-network/vpnc/spec b/app-network/vpnc/spec
similarity index 100%
rename from extra-network/vpnc/spec
rename to app-network/vpnc/spec
diff --git a/extra-network/vsftpd/autobuild/build b/app-network/vsftpd/autobuild/build
similarity index 100%
rename from extra-network/vsftpd/autobuild/build
rename to app-network/vsftpd/autobuild/build
diff --git a/extra-network/vsftpd/autobuild/conffiles b/app-network/vsftpd/autobuild/conffiles
similarity index 100%
rename from extra-network/vsftpd/autobuild/conffiles
rename to app-network/vsftpd/autobuild/conffiles
diff --git a/extra-network/vsftpd/autobuild/defines b/app-network/vsftpd/autobuild/defines
similarity index 100%
rename from extra-network/vsftpd/autobuild/defines
rename to app-network/vsftpd/autobuild/defines
diff --git a/extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.service b/app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.service
similarity index 100%
rename from extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.service
rename to app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.service
diff --git a/extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.socket b/app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.socket
similarity index 100%
rename from extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.socket
rename to app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl.socket
diff --git a/extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl@.service b/app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl@.service
similarity index 100%
rename from extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl@.service
rename to app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd-ssl@.service
diff --git a/extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.service b/app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.service
similarity index 100%
rename from extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.service
rename to app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.service
diff --git a/extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.socket b/app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.socket
similarity index 100%
rename from extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.socket
rename to app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd.socket
diff --git a/extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd@.service b/app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd@.service
similarity index 100%
rename from extra-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd@.service
rename to app-network/vsftpd/autobuild/overrides/usr/lib/systemd/system/vsftpd@.service
diff --git a/extra-network/vsftpd/autobuild/patches/0001-builddefs.patch b/app-network/vsftpd/autobuild/patches/0001-builddefs.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0001-builddefs.patch
rename to app-network/vsftpd/autobuild/patches/0001-builddefs.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0002-config.patch b/app-network/vsftpd/autobuild/patches/0002-config.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0002-config.patch
rename to app-network/vsftpd/autobuild/patches/0002-config.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0003-db-doc.patch b/app-network/vsftpd/autobuild/patches/0003-db-doc.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0003-db-doc.patch
rename to app-network/vsftpd/autobuild/patches/0003-db-doc.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0004-link-local.patch b/app-network/vsftpd/autobuild/patches/0004-link-local.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0004-link-local.patch
rename to app-network/vsftpd/autobuild/patches/0004-link-local.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0005-whitespaces.patch b/app-network/vsftpd/autobuild/patches/0005-whitespaces.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0005-whitespaces.patch
rename to app-network/vsftpd/autobuild/patches/0005-whitespaces.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0006-greedy.patch b/app-network/vsftpd/autobuild/patches/0006-greedy.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0006-greedy.patch
rename to app-network/vsftpd/autobuild/patches/0006-greedy.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0007-utf8.patch b/app-network/vsftpd/autobuild/patches/0007-utf8.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0007-utf8.patch
rename to app-network/vsftpd/autobuild/patches/0007-utf8.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0008-manpage.patch b/app-network/vsftpd/autobuild/patches/0008-manpage.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0008-manpage.patch
rename to app-network/vsftpd/autobuild/patches/0008-manpage.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0009-s390.patch b/app-network/vsftpd/autobuild/patches/0009-s390.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0009-s390.patch
rename to app-network/vsftpd/autobuild/patches/0009-s390.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0010-remote-dos.patch b/app-network/vsftpd/autobuild/patches/0010-remote-dos.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0010-remote-dos.patch
rename to app-network/vsftpd/autobuild/patches/0010-remote-dos.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0011-alpha.patch b/app-network/vsftpd/autobuild/patches/0011-alpha.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0011-alpha.patch
rename to app-network/vsftpd/autobuild/patches/0011-alpha.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0012-buildflags.patch b/app-network/vsftpd/autobuild/patches/0012-buildflags.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0012-buildflags.patch
rename to app-network/vsftpd/autobuild/patches/0012-buildflags.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0013-listen.patch b/app-network/vsftpd/autobuild/patches/0013-listen.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0013-listen.patch
rename to app-network/vsftpd/autobuild/patches/0013-listen.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0014-ssl-cert.patch b/app-network/vsftpd/autobuild/patches/0014-ssl-cert.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0014-ssl-cert.patch
rename to app-network/vsftpd/autobuild/patches/0014-ssl-cert.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0015-disable-clone-newpid.patch b/app-network/vsftpd/autobuild/patches/0015-disable-clone-newpid.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0015-disable-clone-newpid.patch
rename to app-network/vsftpd/autobuild/patches/0015-disable-clone-newpid.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0020-manpage-hyphen.patch b/app-network/vsftpd/autobuild/patches/0020-manpage-hyphen.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0020-manpage-hyphen.patch
rename to app-network/vsftpd/autobuild/patches/0020-manpage-hyphen.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0025-unconditional_utf8_report.patch b/app-network/vsftpd/autobuild/patches/0025-unconditional_utf8_report.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0025-unconditional_utf8_report.patch
rename to app-network/vsftpd/autobuild/patches/0025-unconditional_utf8_report.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0030-kfreebsd.patch b/app-network/vsftpd/autobuild/patches/0030-kfreebsd.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0030-kfreebsd.patch
rename to app-network/vsftpd/autobuild/patches/0030-kfreebsd.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0035-address_space_limit.patch b/app-network/vsftpd/autobuild/patches/0035-address_space_limit.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0035-address_space_limit.patch
rename to app-network/vsftpd/autobuild/patches/0035-address_space_limit.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0040-disable-anonymous.patch b/app-network/vsftpd/autobuild/patches/0040-disable-anonymous.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0040-disable-anonymous.patch
rename to app-network/vsftpd/autobuild/patches/0040-disable-anonymous.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0045-seccomp-gettimeofday.patch b/app-network/vsftpd/autobuild/patches/0045-seccomp-gettimeofday.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0045-seccomp-gettimeofday.patch
rename to app-network/vsftpd/autobuild/patches/0045-seccomp-gettimeofday.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0050-CVE-2015-1419.patch b/app-network/vsftpd/autobuild/patches/0050-CVE-2015-1419.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0050-CVE-2015-1419.patch
rename to app-network/vsftpd/autobuild/patches/0050-CVE-2015-1419.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0055-set_default_listen.patch b/app-network/vsftpd/autobuild/patches/0055-set_default_listen.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0055-set_default_listen.patch
rename to app-network/vsftpd/autobuild/patches/0055-set_default_listen.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0060-seccomp_sandbox.patch b/app-network/vsftpd/autobuild/patches/0060-seccomp_sandbox.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0060-seccomp_sandbox.patch
rename to app-network/vsftpd/autobuild/patches/0060-seccomp_sandbox.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0065-upload_download_filename_pattern.patch b/app-network/vsftpd/autobuild/patches/0065-upload_download_filename_pattern.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0065-upload_download_filename_pattern.patch
rename to app-network/vsftpd/autobuild/patches/0065-upload_download_filename_pattern.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0070-realpath_wrapper.patch b/app-network/vsftpd/autobuild/patches/0070-realpath_wrapper.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0070-realpath_wrapper.patch
rename to app-network/vsftpd/autobuild/patches/0070-realpath_wrapper.patch
diff --git a/extra-network/vsftpd/autobuild/patches/0075-logfile.patch b/app-network/vsftpd/autobuild/patches/0075-logfile.patch
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/0075-logfile.patch
rename to app-network/vsftpd/autobuild/patches/0075-logfile.patch
diff --git a/extra-network/vsftpd/autobuild/patches/series b/app-network/vsftpd/autobuild/patches/series
similarity index 100%
rename from extra-network/vsftpd/autobuild/patches/series
rename to app-network/vsftpd/autobuild/patches/series
diff --git a/extra-network/vsftpd/autobuild/prepare b/app-network/vsftpd/autobuild/prepare
similarity index 100%
rename from extra-network/vsftpd/autobuild/prepare
rename to app-network/vsftpd/autobuild/prepare
diff --git a/extra-network/vsftpd/spec b/app-network/vsftpd/spec
similarity index 100%
rename from extra-network/vsftpd/spec
rename to app-network/vsftpd/spec
diff --git a/extra-network/wavemon/autobuild/defines b/app-network/wavemon/autobuild/defines
similarity index 100%
rename from extra-network/wavemon/autobuild/defines
rename to app-network/wavemon/autobuild/defines
diff --git a/extra-network/wavemon/autobuild/prepare b/app-network/wavemon/autobuild/prepare
similarity index 100%
rename from extra-network/wavemon/autobuild/prepare
rename to app-network/wavemon/autobuild/prepare
diff --git a/extra-network/wavemon/spec b/app-network/wavemon/spec
similarity index 100%
rename from extra-network/wavemon/spec
rename to app-network/wavemon/spec
diff --git a/extra-network/wicd/autobuild/build b/app-network/wicd/autobuild/build
similarity index 100%
rename from extra-network/wicd/autobuild/build
rename to app-network/wicd/autobuild/build
diff --git a/extra-network/wicd/autobuild/defines b/app-network/wicd/autobuild/defines
similarity index 100%
rename from extra-network/wicd/autobuild/defines
rename to app-network/wicd/autobuild/defines
diff --git a/extra-network/wicd/autobuild/patch b/app-network/wicd/autobuild/patch
similarity index 100%
rename from extra-network/wicd/autobuild/patch
rename to app-network/wicd/autobuild/patch
diff --git a/extra-network/wicd/autobuild/patches/wicd-1.7.3-urwid-1.3.0.patch b/app-network/wicd/autobuild/patches/wicd-1.7.3-urwid-1.3.0.patch
similarity index 100%
rename from extra-network/wicd/autobuild/patches/wicd-1.7.3-urwid-1.3.0.patch
rename to app-network/wicd/autobuild/patches/wicd-1.7.3-urwid-1.3.0.patch
diff --git a/extra-network/wicd/spec b/app-network/wicd/spec
similarity index 100%
rename from extra-network/wicd/spec
rename to app-network/wicd/spec
diff --git a/extra-network/wifi-radar/autobuild/defines b/app-network/wifi-radar/autobuild/defines
similarity index 100%
rename from extra-network/wifi-radar/autobuild/defines
rename to app-network/wifi-radar/autobuild/defines
diff --git a/extra-network/wifi-radar/spec b/app-network/wifi-radar/spec
similarity index 100%
rename from extra-network/wifi-radar/spec
rename to app-network/wifi-radar/spec
diff --git a/extra-network/wifite/autobuild/build b/app-network/wifite/autobuild/build
similarity index 100%
rename from extra-network/wifite/autobuild/build
rename to app-network/wifite/autobuild/build
diff --git a/extra-network/wifite/autobuild/defines b/app-network/wifite/autobuild/defines
similarity index 100%
rename from extra-network/wifite/autobuild/defines
rename to app-network/wifite/autobuild/defines
diff --git a/extra-network/wifite/spec b/app-network/wifite/spec
similarity index 100%
rename from extra-network/wifite/spec
rename to app-network/wifite/spec
diff --git a/extra-network/wireguard-dkms/autobuild/build b/app-network/wireguard-dkms/autobuild/build
similarity index 100%
rename from extra-network/wireguard-dkms/autobuild/build
rename to app-network/wireguard-dkms/autobuild/build
diff --git a/extra-network/wireguard-dkms/autobuild/defines b/app-network/wireguard-dkms/autobuild/defines
similarity index 100%
rename from extra-network/wireguard-dkms/autobuild/defines
rename to app-network/wireguard-dkms/autobuild/defines
diff --git a/extra-network/wireguard-dkms/autobuild/postinst b/app-network/wireguard-dkms/autobuild/postinst
similarity index 100%
rename from extra-network/wireguard-dkms/autobuild/postinst
rename to app-network/wireguard-dkms/autobuild/postinst
diff --git a/extra-network/wireguard-dkms/autobuild/prerm b/app-network/wireguard-dkms/autobuild/prerm
similarity index 100%
rename from extra-network/wireguard-dkms/autobuild/prerm
rename to app-network/wireguard-dkms/autobuild/prerm
diff --git a/extra-network/wireguard-dkms/spec b/app-network/wireguard-dkms/spec
similarity index 100%
rename from extra-network/wireguard-dkms/spec
rename to app-network/wireguard-dkms/spec
diff --git a/extra-network/wireguard-tools/autobuild/build b/app-network/wireguard-tools/autobuild/build
similarity index 100%
rename from extra-network/wireguard-tools/autobuild/build
rename to app-network/wireguard-tools/autobuild/build
diff --git a/extra-network/wireguard-tools/autobuild/defines b/app-network/wireguard-tools/autobuild/defines
similarity index 100%
rename from extra-network/wireguard-tools/autobuild/defines
rename to app-network/wireguard-tools/autobuild/defines
diff --git a/extra-network/wireguard-tools/spec b/app-network/wireguard-tools/spec
similarity index 100%
rename from extra-network/wireguard-tools/spec
rename to app-network/wireguard-tools/spec
diff --git a/extra-network/wireguard/autobuild/build b/app-network/wireguard/autobuild/build
similarity index 100%
rename from extra-network/wireguard/autobuild/build
rename to app-network/wireguard/autobuild/build
diff --git a/extra-network/wireguard/autobuild/defines b/app-network/wireguard/autobuild/defines
similarity index 100%
rename from extra-network/wireguard/autobuild/defines
rename to app-network/wireguard/autobuild/defines
diff --git a/extra-network/wireguard/spec b/app-network/wireguard/spec
similarity index 100%
rename from extra-network/wireguard/spec
rename to app-network/wireguard/spec
diff --git a/extra-network/wireless-regdb/autobuild/build b/app-network/wireless-regdb/autobuild/build
similarity index 100%
rename from extra-network/wireless-regdb/autobuild/build
rename to app-network/wireless-regdb/autobuild/build
diff --git a/extra-network/wireless-regdb/autobuild/conffiles b/app-network/wireless-regdb/autobuild/conffiles
similarity index 100%
rename from extra-network/wireless-regdb/autobuild/conffiles
rename to app-network/wireless-regdb/autobuild/conffiles
diff --git a/extra-network/wireless-regdb/autobuild/defines b/app-network/wireless-regdb/autobuild/defines
similarity index 100%
rename from extra-network/wireless-regdb/autobuild/defines
rename to app-network/wireless-regdb/autobuild/defines
diff --git a/extra-network/wireless-regdb/autobuild/overrides/etc/conf.d/wireless-regdom b/app-network/wireless-regdb/autobuild/overrides/etc/conf.d/wireless-regdom
similarity index 100%
rename from extra-network/wireless-regdb/autobuild/overrides/etc/conf.d/wireless-regdom
rename to app-network/wireless-regdb/autobuild/overrides/etc/conf.d/wireless-regdom
diff --git a/extra-network/wireless-regdb/spec b/app-network/wireless-regdb/spec
similarity index 100%
rename from extra-network/wireless-regdb/spec
rename to app-network/wireless-regdb/spec
diff --git a/extra-network/wireless-tools/autobuild/build b/app-network/wireless-tools/autobuild/build
similarity index 100%
rename from extra-network/wireless-tools/autobuild/build
rename to app-network/wireless-tools/autobuild/build
diff --git a/extra-network/wireless-tools/autobuild/defines b/app-network/wireless-tools/autobuild/defines
similarity index 100%
rename from extra-network/wireless-tools/autobuild/defines
rename to app-network/wireless-tools/autobuild/defines
diff --git a/extra-network/wireless-tools/autobuild/patches/add-import-type-to-udev-rules b/app-network/wireless-tools/autobuild/patches/add-import-type-to-udev-rules
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/add-import-type-to-udev-rules
rename to app-network/wireless-tools/autobuild/patches/add-import-type-to-udev-rules
diff --git a/extra-network/wireless-tools/autobuild/patches/fix-makefile-for-debian.diff b/app-network/wireless-tools/autobuild/patches/fix-makefile-for-debian.diff
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/fix-makefile-for-debian.diff
rename to app-network/wireless-tools/autobuild/patches/fix-makefile-for-debian.diff
diff --git a/extra-network/wireless-tools/autobuild/patches/fix-typos b/app-network/wireless-tools/autobuild/patches/fix-typos
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/fix-typos
rename to app-network/wireless-tools/autobuild/patches/fix-typos
diff --git a/extra-network/wireless-tools/autobuild/patches/honour-cflags b/app-network/wireless-tools/autobuild/patches/honour-cflags
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/honour-cflags
rename to app-network/wireless-tools/autobuild/patches/honour-cflags
diff --git a/extra-network/wireless-tools/autobuild/patches/improve-make-install b/app-network/wireless-tools/autobuild/patches/improve-make-install
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/improve-make-install
rename to app-network/wireless-tools/autobuild/patches/improve-make-install
diff --git a/extra-network/wireless-tools/autobuild/patches/series b/app-network/wireless-tools/autobuild/patches/series
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/series
rename to app-network/wireless-tools/autobuild/patches/series
diff --git a/extra-network/wireless-tools/autobuild/patches/wireless-tools-docs.patch b/app-network/wireless-tools/autobuild/patches/wireless-tools-docs.patch
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/wireless-tools-docs.patch
rename to app-network/wireless-tools/autobuild/patches/wireless-tools-docs.patch
diff --git a/extra-network/wireless-tools/autobuild/patches/wireless-tools_30~pre9-13.debian.tar.xz b/app-network/wireless-tools/autobuild/patches/wireless-tools_30~pre9-13.debian.tar.xz
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/wireless-tools_30~pre9-13.debian.tar.xz
rename to app-network/wireless-tools/autobuild/patches/wireless-tools_30~pre9-13.debian.tar.xz
diff --git a/extra-network/wireless-tools/autobuild/patches/zero-struct-iwr.diff b/app-network/wireless-tools/autobuild/patches/zero-struct-iwr.diff
similarity index 100%
rename from extra-network/wireless-tools/autobuild/patches/zero-struct-iwr.diff
rename to app-network/wireless-tools/autobuild/patches/zero-struct-iwr.diff
diff --git a/extra-network/wireless-tools/spec b/app-network/wireless-tools/spec
similarity index 100%
rename from extra-network/wireless-tools/spec
rename to app-network/wireless-tools/spec
diff --git a/extra-network/wireshark/autobuild/beyond b/app-network/wireshark/autobuild/beyond
similarity index 100%
rename from extra-network/wireshark/autobuild/beyond
rename to app-network/wireshark/autobuild/beyond
diff --git a/extra-network/wireshark/autobuild/defines b/app-network/wireshark/autobuild/defines
similarity index 100%
rename from extra-network/wireshark/autobuild/defines
rename to app-network/wireshark/autobuild/defines
diff --git a/extra-network/wireshark/autobuild/postinst b/app-network/wireshark/autobuild/postinst
similarity index 100%
rename from extra-network/wireshark/autobuild/postinst
rename to app-network/wireshark/autobuild/postinst
diff --git a/extra-network/wireshark/autobuild/prepare b/app-network/wireshark/autobuild/prepare
similarity index 100%
rename from extra-network/wireshark/autobuild/prepare
rename to app-network/wireshark/autobuild/prepare
diff --git a/extra-network/wireshark/autobuild/usergroup b/app-network/wireshark/autobuild/usergroup
similarity index 100%
rename from extra-network/wireshark/autobuild/usergroup
rename to app-network/wireshark/autobuild/usergroup
diff --git a/extra-network/wireshark/spec b/app-network/wireshark/spec
similarity index 100%
rename from extra-network/wireshark/spec
rename to app-network/wireshark/spec
diff --git a/extra-network/wondershaper/autobuild/build b/app-network/wondershaper/autobuild/build
similarity index 100%
rename from extra-network/wondershaper/autobuild/build
rename to app-network/wondershaper/autobuild/build
diff --git a/extra-network/wondershaper/autobuild/defines b/app-network/wondershaper/autobuild/defines
similarity index 100%
rename from extra-network/wondershaper/autobuild/defines
rename to app-network/wondershaper/autobuild/defines
diff --git a/extra-network/wondershaper/spec b/app-network/wondershaper/spec
similarity index 100%
rename from extra-network/wondershaper/spec
rename to app-network/wondershaper/spec
diff --git a/extra-network/wpa-supplicant/autobuild/build b/app-network/wpa-supplicant/autobuild/build
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/build
rename to app-network/wpa-supplicant/autobuild/build
diff --git a/extra-network/wpa-supplicant/autobuild/config b/app-network/wpa-supplicant/autobuild/config
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/config
rename to app-network/wpa-supplicant/autobuild/config
diff --git a/extra-network/wpa-supplicant/autobuild/defines b/app-network/wpa-supplicant/autobuild/defines
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/defines
rename to app-network/wpa-supplicant/autobuild/defines
diff --git a/extra-network/wpa-supplicant/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/app-network/wpa-supplicant/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
rename to app-network/wpa-supplicant/autobuild/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
diff --git a/extra-network/wpa-supplicant/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/app-network/wpa-supplicant/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
rename to app-network/wpa-supplicant/autobuild/patches/0002-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
diff --git a/extra-network/wpa-supplicant/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/app-network/wpa-supplicant/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
rename to app-network/wpa-supplicant/autobuild/patches/0003-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
diff --git a/extra-network/wpa-supplicant/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/app-network/wpa-supplicant/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
rename to app-network/wpa-supplicant/autobuild/patches/0004-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
diff --git a/extra-network/wpa-supplicant/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/app-network/wpa-supplicant/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
rename to app-network/wpa-supplicant/autobuild/patches/0005-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
diff --git a/extra-network/wpa-supplicant/autobuild/prepare b/app-network/wpa-supplicant/autobuild/prepare
similarity index 100%
rename from extra-network/wpa-supplicant/autobuild/prepare
rename to app-network/wpa-supplicant/autobuild/prepare
diff --git a/extra-network/wpa-supplicant/spec b/app-network/wpa-supplicant/spec
similarity index 100%
rename from extra-network/wpa-supplicant/spec
rename to app-network/wpa-supplicant/spec
diff --git a/extra-network/wrk/autobuild/build b/app-network/wrk/autobuild/build
similarity index 100%
rename from extra-network/wrk/autobuild/build
rename to app-network/wrk/autobuild/build
diff --git a/extra-network/wrk/autobuild/defines b/app-network/wrk/autobuild/defines
similarity index 100%
rename from extra-network/wrk/autobuild/defines
rename to app-network/wrk/autobuild/defines
diff --git a/extra-network/wrk/spec b/app-network/wrk/spec
similarity index 100%
rename from extra-network/wrk/spec
rename to app-network/wrk/spec
diff --git a/extra-network/x11vnc/autobuild/defines b/app-network/x11vnc/autobuild/defines
similarity index 100%
rename from extra-network/x11vnc/autobuild/defines
rename to app-network/x11vnc/autobuild/defines
diff --git a/extra-network/x11vnc/spec b/app-network/x11vnc/spec
similarity index 100%
rename from extra-network/x11vnc/spec
rename to app-network/x11vnc/spec
diff --git a/extra-network/xinetd/autobuild/conffiles b/app-network/xinetd/autobuild/conffiles
similarity index 100%
rename from extra-network/xinetd/autobuild/conffiles
rename to app-network/xinetd/autobuild/conffiles
diff --git a/extra-network/xinetd/autobuild/defines b/app-network/xinetd/autobuild/defines
similarity index 100%
rename from extra-network/xinetd/autobuild/defines
rename to app-network/xinetd/autobuild/defines
diff --git a/extra-network/xinetd/autobuild/overrides/etc/xinetd.conf b/app-network/xinetd/autobuild/overrides/etc/xinetd.conf
similarity index 100%
rename from extra-network/xinetd/autobuild/overrides/etc/xinetd.conf
rename to app-network/xinetd/autobuild/overrides/etc/xinetd.conf
diff --git a/extra-network/xinetd/autobuild/overrides/etc/xinetd.d/servers b/app-network/xinetd/autobuild/overrides/etc/xinetd.d/servers
similarity index 100%
rename from extra-network/xinetd/autobuild/overrides/etc/xinetd.d/servers
rename to app-network/xinetd/autobuild/overrides/etc/xinetd.d/servers
diff --git a/extra-network/xinetd/autobuild/overrides/etc/xinetd.d/services b/app-network/xinetd/autobuild/overrides/etc/xinetd.d/services
similarity index 100%
rename from extra-network/xinetd/autobuild/overrides/etc/xinetd.d/services
rename to app-network/xinetd/autobuild/overrides/etc/xinetd.d/services
diff --git a/extra-network/xinetd/autobuild/overrides/usr/lib/systemd/system/xinetd.service b/app-network/xinetd/autobuild/overrides/usr/lib/systemd/system/xinetd.service
similarity index 100%
rename from extra-network/xinetd/autobuild/overrides/usr/lib/systemd/system/xinetd.service
rename to app-network/xinetd/autobuild/overrides/usr/lib/systemd/system/xinetd.service
diff --git a/extra-network/xinetd/autobuild/patches/000001-documentation_fixes b/app-network/xinetd/autobuild/patches/000001-documentation_fixes
similarity index 100%
rename from extra-network/xinetd/autobuild/patches/000001-documentation_fixes
rename to app-network/xinetd/autobuild/patches/000001-documentation_fixes
diff --git a/extra-network/xinetd/autobuild/patches/000004-Fix-xinetd.log.man-installation-path b/app-network/xinetd/autobuild/patches/000004-Fix-xinetd.log.man-installation-path
similarity index 100%
rename from extra-network/xinetd/autobuild/patches/000004-Fix-xinetd.log.man-installation-path
rename to app-network/xinetd/autobuild/patches/000004-Fix-xinetd.log.man-installation-path
diff --git a/extra-network/xinetd/autobuild/patches/000008-fix-manpages b/app-network/xinetd/autobuild/patches/000008-fix-manpages
similarity index 100%
rename from extra-network/xinetd/autobuild/patches/000008-fix-manpages
rename to app-network/xinetd/autobuild/patches/000008-fix-manpages
diff --git a/extra-network/xinetd/autobuild/patches/000009-TCPMUX b/app-network/xinetd/autobuild/patches/000009-TCPMUX
similarity index 100%
rename from extra-network/xinetd/autobuild/patches/000009-TCPMUX
rename to app-network/xinetd/autobuild/patches/000009-TCPMUX
diff --git a/extra-network/xinetd/autobuild/patches/series b/app-network/xinetd/autobuild/patches/series
similarity index 100%
rename from extra-network/xinetd/autobuild/patches/series
rename to app-network/xinetd/autobuild/patches/series
diff --git a/extra-network/xinetd/spec b/app-network/xinetd/spec
similarity index 100%
rename from extra-network/xinetd/spec
rename to app-network/xinetd/spec
diff --git a/extra-network/xl2tpd/autobuild/build b/app-network/xl2tpd/autobuild/build
similarity index 100%
rename from extra-network/xl2tpd/autobuild/build
rename to app-network/xl2tpd/autobuild/build
diff --git a/extra-network/xl2tpd/autobuild/conffiles b/app-network/xl2tpd/autobuild/conffiles
similarity index 100%
rename from extra-network/xl2tpd/autobuild/conffiles
rename to app-network/xl2tpd/autobuild/conffiles
diff --git a/extra-network/xl2tpd/autobuild/defines b/app-network/xl2tpd/autobuild/defines
similarity index 100%
rename from extra-network/xl2tpd/autobuild/defines
rename to app-network/xl2tpd/autobuild/defines
diff --git a/extra-network/xl2tpd/autobuild/overrides/etc/ppp/options.l2tpd b/app-network/xl2tpd/autobuild/overrides/etc/ppp/options.l2tpd
similarity index 100%
rename from extra-network/xl2tpd/autobuild/overrides/etc/ppp/options.l2tpd
rename to app-network/xl2tpd/autobuild/overrides/etc/ppp/options.l2tpd
diff --git a/extra-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf b/app-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf
similarity index 100%
rename from extra-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf
rename to app-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf
diff --git a/extra-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.client-example b/app-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.client-example
similarity index 100%
rename from extra-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.client-example
rename to app-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.client-example
diff --git a/extra-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.server-example b/app-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.server-example
similarity index 100%
rename from extra-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.server-example
rename to app-network/xl2tpd/autobuild/overrides/etc/xl2tpd/xl2tpd.conf.server-example
diff --git a/extra-network/xl2tpd/autobuild/overrides/usr/lib/systemd/system/xl2tpd.service b/app-network/xl2tpd/autobuild/overrides/usr/lib/systemd/system/xl2tpd.service
similarity index 100%
rename from extra-network/xl2tpd/autobuild/overrides/usr/lib/systemd/system/xl2tpd.service
rename to app-network/xl2tpd/autobuild/overrides/usr/lib/systemd/system/xl2tpd.service
diff --git a/extra-network/xl2tpd/autobuild/overrides/usr/lib/tmpfiles.d/xl2tpd.conf b/app-network/xl2tpd/autobuild/overrides/usr/lib/tmpfiles.d/xl2tpd.conf
similarity index 100%
rename from extra-network/xl2tpd/autobuild/overrides/usr/lib/tmpfiles.d/xl2tpd.conf
rename to app-network/xl2tpd/autobuild/overrides/usr/lib/tmpfiles.d/xl2tpd.conf
diff --git a/extra-network/xl2tpd/autobuild/postinst b/app-network/xl2tpd/autobuild/postinst
similarity index 100%
rename from extra-network/xl2tpd/autobuild/postinst
rename to app-network/xl2tpd/autobuild/postinst
diff --git a/extra-network/xl2tpd/spec b/app-network/xl2tpd/spec
similarity index 100%
rename from extra-network/xl2tpd/spec
rename to app-network/xl2tpd/spec
diff --git a/extra-network/xray/autobuild/build b/app-network/xray/autobuild/build
similarity index 100%
rename from extra-network/xray/autobuild/build
rename to app-network/xray/autobuild/build
diff --git a/extra-network/xray/autobuild/defines b/app-network/xray/autobuild/defines
similarity index 100%
rename from extra-network/xray/autobuild/defines
rename to app-network/xray/autobuild/defines
diff --git a/extra-network/xray/autobuild/overrides/usr/lib/systemd/system/xray.service b/app-network/xray/autobuild/overrides/usr/lib/systemd/system/xray.service
similarity index 100%
rename from extra-network/xray/autobuild/overrides/usr/lib/systemd/system/xray.service
rename to app-network/xray/autobuild/overrides/usr/lib/systemd/system/xray.service
diff --git a/extra-network/xray/autobuild/overrides/usr/lib/systemd/system/xray@.service b/app-network/xray/autobuild/overrides/usr/lib/systemd/system/xray@.service
similarity index 100%
rename from extra-network/xray/autobuild/overrides/usr/lib/systemd/system/xray@.service
rename to app-network/xray/autobuild/overrides/usr/lib/systemd/system/xray@.service
diff --git a/extra-network/xray/spec b/app-network/xray/spec
similarity index 100%
rename from extra-network/xray/spec
rename to app-network/xray/spec
diff --git a/extra-network/xrdp/autobuild/beyond b/app-network/xrdp/autobuild/beyond
similarity index 100%
rename from extra-network/xrdp/autobuild/beyond
rename to app-network/xrdp/autobuild/beyond
diff --git a/extra-network/xrdp/autobuild/defines b/app-network/xrdp/autobuild/defines
similarity index 100%
rename from extra-network/xrdp/autobuild/defines
rename to app-network/xrdp/autobuild/defines
diff --git a/extra-network/xrdp/autobuild/overrides/etc/logrotate.d/xrdp b/app-network/xrdp/autobuild/overrides/etc/logrotate.d/xrdp
similarity index 100%
rename from extra-network/xrdp/autobuild/overrides/etc/logrotate.d/xrdp
rename to app-network/xrdp/autobuild/overrides/etc/logrotate.d/xrdp
diff --git a/extra-network/xrdp/autobuild/overrides/etc/pam.d/xrdp-sesman b/app-network/xrdp/autobuild/overrides/etc/pam.d/xrdp-sesman
similarity index 100%
rename from extra-network/xrdp/autobuild/overrides/etc/pam.d/xrdp-sesman
rename to app-network/xrdp/autobuild/overrides/etc/pam.d/xrdp-sesman
diff --git a/extra-network/xrdp/autobuild/overrides/etc/sysconfig/xrdp b/app-network/xrdp/autobuild/overrides/etc/sysconfig/xrdp
similarity index 100%
rename from extra-network/xrdp/autobuild/overrides/etc/sysconfig/xrdp
rename to app-network/xrdp/autobuild/overrides/etc/sysconfig/xrdp
diff --git a/extra-network/xrdp/autobuild/overrides/etc/xrdp/cert.pem b/app-network/xrdp/autobuild/overrides/etc/xrdp/cert.pem
similarity index 100%
rename from extra-network/xrdp/autobuild/overrides/etc/xrdp/cert.pem
rename to app-network/xrdp/autobuild/overrides/etc/xrdp/cert.pem
diff --git a/extra-network/xrdp/autobuild/overrides/etc/xrdp/key.pem b/app-network/xrdp/autobuild/overrides/etc/xrdp/key.pem
similarity index 100%
rename from extra-network/xrdp/autobuild/overrides/etc/xrdp/key.pem
rename to app-network/xrdp/autobuild/overrides/etc/xrdp/key.pem
diff --git a/extra-network/xrdp/autobuild/overrides/etc/xrdp/openssl.conf b/app-network/xrdp/autobuild/overrides/etc/xrdp/openssl.conf
similarity index 100%
rename from extra-network/xrdp/autobuild/overrides/etc/xrdp/openssl.conf
rename to app-network/xrdp/autobuild/overrides/etc/xrdp/openssl.conf
diff --git a/extra-network/xrdp/autobuild/overrides/etc/xrdp/rsakeys.ini b/app-network/xrdp/autobuild/overrides/etc/xrdp/rsakeys.ini
similarity index 100%
rename from extra-network/xrdp/autobuild/overrides/etc/xrdp/rsakeys.ini
rename to app-network/xrdp/autobuild/overrides/etc/xrdp/rsakeys.ini
diff --git a/extra-network/xrdp/autobuild/patches/0001-xrdp-0.9.2-setpriv.patch b/app-network/xrdp/autobuild/patches/0001-xrdp-0.9.2-setpriv.patch
similarity index 100%
rename from extra-network/xrdp/autobuild/patches/0001-xrdp-0.9.2-setpriv.patch
rename to app-network/xrdp/autobuild/patches/0001-xrdp-0.9.2-setpriv.patch
diff --git a/extra-network/xrdp/autobuild/patches/0002-xrdp-0.9.4-service.patch b/app-network/xrdp/autobuild/patches/0002-xrdp-0.9.4-service.patch
similarity index 100%
rename from extra-network/xrdp/autobuild/patches/0002-xrdp-0.9.4-service.patch
rename to app-network/xrdp/autobuild/patches/0002-xrdp-0.9.4-service.patch
diff --git a/extra-network/xrdp/autobuild/patches/0003-add-arch-for-ppc64.patch b/app-network/xrdp/autobuild/patches/0003-add-arch-for-ppc64.patch
similarity index 100%
rename from extra-network/xrdp/autobuild/patches/0003-add-arch-for-ppc64.patch
rename to app-network/xrdp/autobuild/patches/0003-add-arch-for-ppc64.patch
diff --git a/extra-network/xrdp/autobuild/postinst b/app-network/xrdp/autobuild/postinst
similarity index 100%
rename from extra-network/xrdp/autobuild/postinst
rename to app-network/xrdp/autobuild/postinst
diff --git a/extra-network/xrdp/autobuild/prepare b/app-network/xrdp/autobuild/prepare
similarity index 100%
rename from extra-network/xrdp/autobuild/prepare
rename to app-network/xrdp/autobuild/prepare
diff --git a/extra-network/xrdp/spec b/app-network/xrdp/spec
similarity index 100%
rename from extra-network/xrdp/spec
rename to app-network/xrdp/spec
diff --git a/extra-network/yah3c/autobuild/defines b/app-network/yah3c/autobuild/defines
similarity index 100%
rename from extra-network/yah3c/autobuild/defines
rename to app-network/yah3c/autobuild/defines
diff --git a/extra-network/yah3c/spec b/app-network/yah3c/spec
similarity index 100%
rename from extra-network/yah3c/spec
rename to app-network/yah3c/spec
diff --git a/extra-network/zerotier-one/autobuild/build b/app-network/zerotier-one/autobuild/build
similarity index 100%
rename from extra-network/zerotier-one/autobuild/build
rename to app-network/zerotier-one/autobuild/build
diff --git a/extra-network/zerotier-one/autobuild/defines b/app-network/zerotier-one/autobuild/defines
similarity index 100%
rename from extra-network/zerotier-one/autobuild/defines
rename to app-network/zerotier-one/autobuild/defines
diff --git a/extra-network/zerotier-one/spec b/app-network/zerotier-one/spec
similarity index 100%
rename from extra-network/zerotier-one/spec
rename to app-network/zerotier-one/spec
diff --git a/extra-network/zssh/autobuild/build b/app-network/zssh/autobuild/build
similarity index 100%
rename from extra-network/zssh/autobuild/build
rename to app-network/zssh/autobuild/build
diff --git a/extra-network/zssh/autobuild/defines b/app-network/zssh/autobuild/defines
similarity index 100%
rename from extra-network/zssh/autobuild/defines
rename to app-network/zssh/autobuild/defines
diff --git a/extra-network/zssh/autobuild/patches/01_pre_cdbs.diff b/app-network/zssh/autobuild/patches/01_pre_cdbs.diff
similarity index 100%
rename from extra-network/zssh/autobuild/patches/01_pre_cdbs.diff
rename to app-network/zssh/autobuild/patches/01_pre_cdbs.diff
diff --git a/extra-network/zssh/autobuild/patches/02_destdir.diff b/app-network/zssh/autobuild/patches/02_destdir.diff
similarity index 100%
rename from extra-network/zssh/autobuild/patches/02_destdir.diff
rename to app-network/zssh/autobuild/patches/02_destdir.diff
diff --git a/extra-network/zssh/autobuild/patches/03_symlink.diff b/app-network/zssh/autobuild/patches/03_symlink.diff
similarity index 100%
rename from extra-network/zssh/autobuild/patches/03_symlink.diff
rename to app-network/zssh/autobuild/patches/03_symlink.diff
diff --git a/extra-network/zssh/autobuild/patches/04_GNU_openpty.patch b/app-network/zssh/autobuild/patches/04_GNU_openpty.patch
similarity index 100%
rename from extra-network/zssh/autobuild/patches/04_GNU_openpty.patch
rename to app-network/zssh/autobuild/patches/04_GNU_openpty.patch
diff --git a/extra-network/zssh/autobuild/patches/05_strip.patch b/app-network/zssh/autobuild/patches/05_strip.patch
similarity index 100%
rename from extra-network/zssh/autobuild/patches/05_strip.patch
rename to app-network/zssh/autobuild/patches/05_strip.patch
diff --git a/extra-network/zssh/autobuild/patches/fix_CPPFunction.diff b/app-network/zssh/autobuild/patches/fix_CPPFunction.diff
similarity index 100%
rename from extra-network/zssh/autobuild/patches/fix_CPPFunction.diff
rename to app-network/zssh/autobuild/patches/fix_CPPFunction.diff
diff --git a/extra-network/zssh/autobuild/patches/series b/app-network/zssh/autobuild/patches/series
similarity index 100%
rename from extra-network/zssh/autobuild/patches/series
rename to app-network/zssh/autobuild/patches/series
diff --git a/extra-network/zssh/autobuild/prepare b/app-network/zssh/autobuild/prepare
similarity index 100%
rename from extra-network/zssh/autobuild/prepare
rename to app-network/zssh/autobuild/prepare
diff --git a/extra-network/zssh/spec b/app-network/zssh/spec
similarity index 100%
rename from extra-network/zssh/spec
rename to app-network/zssh/spec
diff --git a/extra-network/zsync/autobuild/defines b/app-network/zsync/autobuild/defines
similarity index 100%
rename from extra-network/zsync/autobuild/defines
rename to app-network/zsync/autobuild/defines
diff --git a/extra-network/zsync/spec b/app-network/zsync/spec
similarity index 100%
rename from extra-network/zsync/spec
rename to app-network/zsync/spec