From e84b24e82329d16ca18bff7966d4f02d997bc965 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 25 Sep 2011 11:45:54 +0200
Subject: [PATCH] Move all packages to root.

---
 {doc => Documentation}/COPYING                |   0
 {pkgs/X11vnc => X11vnc}/X11vnc.nm             |   0
 .../x11vnc-0.9.8-XShm-explicit-include.patch  |   0
 .../patches/x11vnc-0.9.8-disableRpath.patch   |   0
 {pkgs/acl => acl}/acl.nm                      |   0
 .../patches/acl-2.2.47-build-1.patch          |   0
 .../patches/acl-2.2.47-exitcode.patch         |   0
 .../acl => acl}/patches/acl-2.2.47-nfs4.patch |   0
 .../patches/acl-2.2.47-params.patch           |   0
 .../patches/acl-2.2.47-path_max.patch         |   0
 .../patches/acl-2.2.47-segfault.patch         |   0
 .../patches/acl-2.2.47-walk.patch.broken      |   0
 {pkgs/acpid => acpid}/acpid.nm                |   0
 {pkgs/acpid => acpid}/acpid.sysconfig         |   0
 .../patches/acpid-2.0.2-makefile.patch        |   0
 {pkgs/acpid => acpid}/power                   |   0
 {pkgs/acpid => acpid}/power.sh                |   0
 {pkgs/acpid => acpid}/systemd/acpid.service   |   0
 {pkgs/aiccu => aiccu}/aiccu.nm                |   0
 {pkgs/attr => attr}/attr.nm                   |   0
 {pkgs/audit => audit}/audit.nm                |   0
 {pkgs/authconfig => authconfig}/authconfig.nm |   0
 {pkgs/autoconf => autoconf}/autoconf.nm       |   0
 {pkgs/autogen => autogen}/autogen.nm          |   0
 .../autogen-5.9.4-autoopts-config.patch       |   0
 .../patches/autogen-5.9.4-pkgconfig.patch     |   0
 {pkgs/automake => automake}/automake.nm       |   0
 {pkgs/avahi => avahi}/avahi.nm                |   0
 {pkgs/basesystem => basesystem}/basesystem.nm |   0
 {pkgs/basesystem => basesystem}/resolv.conf   |   0
 {pkgs/bash => bash}/bash.nm                   |   0
 {pkgs/bash => bash}/dot_bash_logout           |   0
 {pkgs/bash => bash}/dot_bash_profile          |   0
 {pkgs/bash => bash}/dot_bashrc                |   0
 .../patches/bash-4.0-paths-1.patch            |   0
 .../patches/bash-4.0-profile-1.patch          |   0
 {pkgs/bash => bash}/profile.d/i18n.sh         |   0
 {pkgs/bash => bash}/profile.d/lang.sh         |   0
 {pkgs/bc => bc}/bc.nm                         |   0
 {pkgs/beep => beep}/beep.nm                   |   0
 {pkgs/bind => bind}/bind.nm                   |   0
 {pkgs/binutils => binutils}/binutils.nm       |   0
 .../binutils-2.19.1-asprintf_fix.patch        |   0
 .../patches/binutils-2.19.1-ld_makefile.patch |   0
 .../patches/binutils-2.20-objcopy.patch       |   0
 ...20.1-all_dobumen-new-dtags-behaviour.patch |   0
 ...ils-2.20.1-gentoo-rpath_envvar-smack.patch |   0
 ...utils-2.20.1-gentoo-use-new-ld-dtags.patch |   0
 .../binutils-2.20.1-gentoo-use-relro.patch    |   0
 .../binutils-2.20.1-gentoo-warn-textrel.patch |   0
 .../binutils-2.20.51.0.2-build-id.patch0      |   0
 ...ls-2.20.51.0.2-pt-pax-flags-20091010.patch |   0
 .../binutils-2.20.51.0.2-version.patch        |   0
 {pkgs/bird => bird}/bird.nm                   |   0
 {pkgs/bird => bird}/systemd/bird.service      |   0
 {pkgs/bird => bird}/systemd/bird6.service     |   0
 {pkgs/bison => bison}/bison.nm                |   0
 {pkgs/boost => boost}/boost.nm                |   0
 .../patches/boost-1.41.0-iostreams-zlib.patch |   0
 .../patches/boost-1.41.0-mapnik.patch         |   0
 ...oost-1.41.0-shared_ptr_serialization.patch |   0
 .../patches/boost-graph-compile.patch         |   0
 {pkgs/br2684ctl => br2684ctl}/br2684ctl.nm    |   0
 .../bridge-utils.nm                           |   0
 .../btrfs-progs.nm                            |   0
 .../btrfs-progs-build-everything.patch        |   0
 .../patches/btrfs-progs-build-fixes.patch     |   0
 .../patches/btrfs-progs-fix-labels.patch      |   0
 .../patches/btrfs-progs-upstream.patch        |   0
 .../patches/btrfs-progs-valgrind.patch        |   0
 {pkgs/bwm-ng => bwm-ng}/bwm-ng.nm             |   0
 {pkgs/bzip2 => bzip2}/bzip2.nm                |   0
 .../patches/bzip2-1.0.5-install_docs-1.patch  |   0
 {pkgs/c_icap => c_icap}/c_icap.nm             |   0
 .../c_icap_modules.nm                         |   0
 {pkgs/cairo => cairo}/cairo.nm                |   0
 {pkgs/ccache => ccache}/ccache.nm             |   0
 {pkgs/ccache => ccache}/ccache.sh             |   0
 {pkgs/chrony => chrony}/chrony-helper         |   0
 {pkgs/chrony => chrony}/chrony.conf           |   0
 {pkgs/chrony => chrony}/chrony.dhclient       |   0
 {pkgs/chrony => chrony}/chrony.keys           |   0
 {pkgs/chrony => chrony}/chrony.logrotate      |   0
 {pkgs/chrony => chrony}/chrony.nm             |   0
 .../systemd/chrony-wait.service               |   0
 .../chrony => chrony}/systemd/chronyd.service |   0
 {pkgs/chrpath => chrpath}/chrpath.nm          |   0
 .../patches/chrpath-0.13-NULL-entry.patch     |   0
 {pkgs/clamav => clamav}/clamav.nm             |   0
 {pkgs/cloog-ppl => cloog-ppl}/cloog-ppl.nm    |   0
 {pkgs/cmake => cmake}/cmake.nm                |   0
 config/default.conf                           |   1 -
 config/ipfire-3-i686.conf                     |  19 ------------------
 config/pakfire.conf                           |   5 -----
 {pkgs/coreutils => coreutils}/coreutils.nm    |   0
 {pkgs/coreutils => coreutils}/pam.d/su        |   0
 {pkgs/coreutils => coreutils}/pam.d/su-l      |   0
 .../coreutils-7.6-uname_PIC-1.patch.off       |   0
 .../patches/coreutils-8.5-pam.patch           |   0
 .../patches/coreutils-i18n.patch              |   0
 .../patches/coreutils-selinux.patch           |   0
 .../patches/coreutils-selinuxmanpages.patch   |   0
 .../profile.d/colorls.sh                      |   0
 {pkgs/cpio => cpio}/cpio.nm                   |   0
 .../cpufrequtils.nm                           |   0
 .../cpufrequtils-008-aperf-32bit.patch        |   0
 .../cpufrequtils-008-no-aperf-on-ppc.patch    |   0
 .../patches/cpufrequtils-multilib.patch       |   0
 .../patches/disable-gsic.patch                |   0
 {pkgs/cracklib => cracklib}/cracklib.nm       |   0
 {pkgs/crda => crda}/crda.nm                   |   0
 {pkgs/cronie => cronie}/cronie.nm             |   0
 .../cryptsetup-luks.nm                        |   0
 {pkgs/cups => cups}/cups.logrotate            |   0
 {pkgs/cups => cups}/cups.nm                   |   0
 {pkgs/cups => cups}/patches/cups-0755.patch   |   0
 .../patches/cups-1.1.16-system-auth.patch     |   0
 .../patches/cups-EAI_AGAIN.patch              |   0
 .../patches/cups-autotype-crash.patch         |   0
 {pkgs/cups => cups}/patches/cups-avahi.patch  |   0
 .../cups => cups}/patches/cups-banners.patch  |   0
 {pkgs/cups => cups}/patches/cups-build.patch  |   0
 .../patches/cups-cups-get-classes.patch       |   0
 .../patches/cups-direct-usb.patch             |   0
 .../patches/cups-dnssd-deviceid.patch         |   0
 .../patches/cups-driverd-timeout.patch        |   0
 .../cups => cups}/patches/cups-eggcups.patch  |   0
 .../patches/cups-filter-debug.patch           |   0
 .../patches/cups-force-gnutls.patch           |   0
 .../cups => cups}/patches/cups-getpass.patch  |   0
 .../patches/cups-hostnamelookups.patch        |   0
 .../patches/cups-hp-deviceid-oid.patch        |   0
 .../patches/cups-logrotate.patch              |   0
 .../cups => cups}/patches/cups-lpr-help.patch |   0
 .../cups => cups}/patches/cups-multilib.patch |   0
 .../patches/cups-no-export-ssllibs.patch      |   0
 .../patches/cups-no-gzip-man.patch            |   0
 .../patches/cups-page-label.patch             |   0
 .../cups => cups}/patches/cups-peercred.patch |   0
 {pkgs/cups => cups}/patches/cups-pid.patch    |   0
 .../cups => cups}/patches/cups-res_init.patch |   0
 .../patches/cups-ricoh-deviceid-oid.patch     |   0
 {pkgs/cups => cups}/patches/cups-serial.patch |   0
 .../patches/cups-serialize-gnutls.patch       |   0
 .../patches/cups-serverbin-compat.patch       |   0
 .../patches/cups-snmp-quirks.patch            |   0
 .../cups => cups}/patches/cups-str3382.patch  |   0
 .../cups => cups}/patches/cups-str3754.patch  |   0
 .../patches/cups-strict-ppd-line-length.patch |   0
 .../patches/cups-texttops-rotate-page.patch   |   0
 .../patches/cups-uri-compat.patch             |   0
 .../patches/cups-usb-paperout.patch           |   0
 {pkgs/cups => cups}/patches/cups-x-lspp.patch |   0
 {pkgs/cups => cups}/systemd/cups.service      |   0
 {pkgs/curl => curl}/curl.nm                   |   0
 .../patches/0101-curl-7.21.1-multilib.patch   |   0
 {pkgs/cyrus-sasl => cyrus-sasl}/cyrus-sasl.nm |   0
 .../patches/cyrus-sasl-2.1.23-bad-elif.patch  |   0
 {pkgs/cyrus-sasl => cyrus-sasl}/smtpd.conf    |   0
 .../dansguardian.nm                           |   0
 .../patches/dansguardian-gcc44.patch          |   0
 {pkgs/db4 => db4}/db4.nm                      |   0
 .../patches/db-4.7.25-upstream_fixes-1.patch  |   0
 {pkgs/dbus-glib => dbus-glib}/dbus-glib.nm    |   0
 {pkgs/dbus => dbus}/dbus.nm                   |   0
 {pkgs/dejagnu => dejagnu}/dejagnu.nm          |   0
 .../patches/dejagnu-1.4.4-runtest.patch       |   0
 .../patches/dejagnu-1.4.4-smp-1.patch         |   0
 .../patches/dejagnu-1.4.4-testsuite.patch     |   0
 .../patches/dejagnu-1.4.4-utils-speedup.patch |   0
 {pkgs/dhcp => dhcp}/dhclient-script           |   0
 {pkgs/dhcp => dhcp}/dhcp.nm                   |   0
 {pkgs/dhcping => dhcping}/dhcping.nm          |   0
 {pkgs/diffutils => diffutils}/diffutils.nm    |   0
 .../diffutils-2.8.1-hardened_tmp-1.patch      |   0
 .../patches/diffutils-2.9-i18n-1.patch        |   0
 {pkgs/directfb => directfb}/directfb.nm       |   0
 {pkgs/dmidecode => dmidecode}/dmidecode.nm    |   0
 ...e-2.10-add-hewlett-packard-to-dmioem.patch |   0
 .../dmidecode-2.10-add-socket-lga1366.patch   |   0
 ...dmidecode-2.10-recognize-more-memory.patch |   0
 .../dmidecode-2.10-smbios-updates.patch       |   0
 ...0-warn-on-unsupported-smbios-version.patch |   0
 {pkgs/dmraid => dmraid}/dmraid.nm             |   0
 {pkgs/dos2unix => dos2unix}/dos2unix.nm       |   0
 {pkgs/dosfstools => dosfstools}/dosfstools.nm |   0
 {pkgs/dracut => dracut}/dracut.nm             |   0
 {pkgs/dracut => dracut}/ipfire.conf           |   0
 {pkgs/dvdrtools => dvdrtools}/dvdrtools.nm    |   0
 {pkgs/e2fsprogs => e2fsprogs}/e2fsprogs.nm    |   0
 {pkgs/ebtables => ebtables}/ebtables.nm       |   0
 .../patches/ebtables-2.0.8-cflags.patch       |   0
 .../patches/ebtables-2.0.8-norootinst.patch   |   0
 .../patches/ebtables-2.0.9-lsb.patch          |   0
 {pkgs/ed => ed}/ed.nm                         |   0
 {pkgs/eggdbus => eggdbus}/eggdbus.nm          |   0
 {pkgs/eject => eject}/eject.nm                |   0
 .../patches/eject-2.1.1-verbose.patch         |   0
 .../patches/eject-2.1.5-lock.patch            |   0
 .../patches/eject-2.1.5-opendevice.patch      |   0
 .../patches/eject-2.1.5-spaces.patch          |   0
 .../patches/eject-2.1.5-umount.patch          |   0
 .../patches/eject-timeout.patch               |   0
 {pkgs/elfutils => elfutils}/elfutils.nm       |   0
 .../patches/elfutils-portability.patch        |   0
 .../patches/elfutils-robustify.patch          |   0
 {pkgs/elinks => elinks}/elinks.nm             |   0
 {pkgs/etherwake => etherwake}/etherwake.nm    |   0
 .../patches/etherwake-1.09-install.patch      |   0
 {pkgs/ethtool => ethtool}/ethtool.nm          |   0
 {pkgs/expat => expat}/expat.nm                |   0
 {pkgs/expect => expect}/expect.nm             |   0
 .../patches/expect-5.32.2-random.patch        |   0
 .../patches/expect-5.38.0-lib-spec.patch      |   0
 .../patches/expect-5.39.0-libdir.patch        |   0
 ...xpect-5.43.0-override_default_prefix.patch |   0
 .../patches/expect-5.43.0-spawn-1.patch       |   0
 .../expect-5.43.0-tcl_8.5.8_fix-1.patch       |   0
 .../ez-ipupdate.nm                            |   0
 .../patches/ez-ipupdate-3.0.11b8-10.patch     |   0
 .../ez-ipupdate-3.0.11b8-pidfile.patch        |   0
 .../fail2ban => fail2ban}/fail2ban.logrotate  |   0
 {pkgs/fail2ban => fail2ban}/fail2ban.nm       |   0
 .../patches/fail2ban-0.8.1-sshd.patch         |   0
 .../patches/fail2ban-0.8.2-fd_cloexec.patch   |   0
 .../patches/fail2ban-0.8.3-init.patch         |   0
 .../patches/fail2ban-0.8.3-log2syslog.patch   |   0
 {pkgs/file => file}/file.nm                   |   0
 {pkgs/filesystem => filesystem}/filesystem.nm |   0
 {pkgs/findutils => findutils}/findutils.nm    |   0
 {pkgs/firewall => firewall}/firewall.nm       |   0
 {pkgs/firewall => firewall}/src/firewall      |   0
 {pkgs/firewall => firewall}/src/functions     |   0
 .../src/functions.commands                    |   0
 .../src/functions.config                      |   0
 .../src/functions.firewall                    |   0
 {pkgs/firewall => firewall}/src/functions.ip  |   0
 .../src/functions.iptables                    |   0
 .../src/functions.macros                      |   0
 .../firewall => firewall}/src/functions.zones |   0
 {pkgs/firewall => firewall}/src/macros/DHCP   |   0
 {pkgs/firewall => firewall}/src/macros/HTTP   |   0
 {pkgs/firewall => firewall}/src/macros/HTTPS  |   0
 {pkgs/firewall => firewall}/src/macros/WWW    |   0
 {pkgs/firewall => firewall}/src/zones.green   |   0
 {pkgs/firewall => firewall}/src/zones.orange  |   0
 {pkgs/firewall => firewall}/src/zones.red     |   0
 .../systemd/firewall.service                  |   0
 {pkgs/flex => flex}/flex.nm                   |   0
 .../patches/flex-2.5.35-gcc44-1.patch         |   0
 {pkgs/fontconfig => fontconfig}/fontconfig.nm |   0
 {pkgs/freeradius => freeradius}/freeradius.nm |   0
 .../freeradius => freeradius}/freeradius.pam  |   0
 .../freeradius.tmpfiles                       |   0
 .../logrotate/freeradius                      |   0
 .../freeradius-2.1.6-cert-config.patch        |   0
 .../systemd/freeradius.service                |   0
 {pkgs/freetype => freetype}/freetype.nm       |   0
 {pkgs/fuse-sshfs => fuse-sshfs}/fuse-sshfs.nm |   0
 {pkgs/fuse => fuse}/fuse.nm                   |   0
 .../patches/fuse-2.7.4-openfix.patch          |   0
 .../patches/fuse-2.7.4-udev_rules.patch       |   0
 {pkgs/gawk => gawk}/gawk.nm                   |   0
 {pkgs/gcc => gcc}/gcc.nm                      |   0
 .../gcc-4.6.0-piepatches-20110407.patch       |   0
 .../gcc46-Woverlength-string-asm.patch0       |   0
 .../patches/gcc46-Woverlength-string.patch0   |   0
 .../patches/gcc46-c++-builtin-redecl.patch0   |   0
 .../gcc => gcc}/patches/gcc46-cloog-dl.patch0 |   0
 {pkgs/gcc => gcc}/patches/gcc46-hack.patch0   |   0
 .../gcc46-libgomp-omp_h-multilib.patch0       |   0
 .../patches/gcc46-libtool-no-rpath.patch0     |   0
 .../patches/gcc46-no-add-needed.patch0        |   0
 .../gcc => gcc}/patches/gcc46-ppl-0.10.patch  |   0
 .../gcc => gcc}/patches/gcc46-pr33763.patch0  |   0
 .../gcc => gcc}/patches/gcc46-pr38757.patch0  |   0
 .../patches/gcc46-unwind-debughook-sdt.patch0 |   0
 {pkgs/gdb => gdb}/gdb.nm                      |   0
 {pkgs/gdbm => gdbm}/gdbm.nm                   |   0
 {pkgs/gettext => gettext}/gettext.nm          |   0
 .../ghostscript.nm                            |   0
 {pkgs/git => git}/git.nm                      |   0
 {pkgs/glib2 => glib2}/glib2-locale.sh         |   0
 {pkgs/glib2 => glib2}/glib2.nm                |   0
 {pkgs/glibc => glibc}/glibc-stack_chk_fail.c  |   0
 {pkgs/glibc => glibc}/glibc.nm                |   0
 {pkgs/glibc => glibc}/ld.so.conf              |   0
 {pkgs/glibc => glibc}/nsswitch.conf           |   0
 .../patches/glibc-2.10.1-arc4random.patch     |   0
 .../glibc-2.10.1-asprintf_reset2null-1.patch  |   0
 ...2.10.1-hardened-configure-picdefault.patch |   0
 ...c-2.10.1-hardened-inittls-nosysenter.patch |   0
 .../glibc-2.10.1-localedef_trampoline-1.patch |   0
 .../patches/glibc-2.10.1-pt_pax-1.patch       |   0
 .../glibc-2.10.1-sanitize_env.patch.off       |   0
 .../glibc-2.10.1-strlcpy_strlcat-1.patch      |   0
 .../patches/glibc-2.11.1-mktemp_urandom.patch |   0
 .../glibc-2.11.1-owl-alt-res_randomid.patch   |   0
 .../patches/glibc-2.12-hardened-pie.patch     |   0
 .../patches/glibc-fedora.patch                |   0
 {pkgs/gmp => gmp}/gmp.nm                      |   0
 {pkgs/gnupg2 => gnupg2}/gnupg2.nm             |   0
 {pkgs/gnutls => gnutls}/gnutls.nm             |   0
 .../gobject-introspection.nm                  |   0
 {pkgs/gperf => gperf}/gperf.nm                |   0
 {pkgs/grep => grep}/grep.nm                   |   0
 {pkgs/groff => groff}/groff.nm                |   0
 .../groff-1.18.1.4-debian_fixes-1.patch       |   0
 {pkgs/grub => grub}/05_theme                  |   0
 {pkgs/grub => grub}/grub.default              |   0
 {pkgs/grub => grub}/grub.nm                   |   0
 .../patches/grub-1.97.1-initramfs.patch       |   0
 ...-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 |   0
 {pkgs/grub => grub}/splash.png                | Bin
 {pkgs/gssdp => gssdp}/gssdp.nm                |   0
 .../patches/gssdp-fixdso.patch                |   0
 {pkgs/guile => guile}/guile.nm                |   0
 .../patches/guile-1.8.7-linemarkers.patch     |   0
 .../patches/guile-1.8.7-testsuite.patch       |   0
 {pkgs/gupnp-av => gupnp-av}/gupnp-av.nm       |   0
 {pkgs/gupnp-igd => gupnp-igd}/gupnp-igd.nm    |   0
 {pkgs/gupnp => gupnp}/gupnp.nm                |   0
 {pkgs/gzip => gzip}/gzip.nm                   |   0
 .../gzip-1.3.13-cve-2006-4337_len.patch       |   0
 .../patches/gzip-1.3.13-cve-2006-4338.patch   |   0
 .../patches/gzip-1.3.13-openbsd-owl-tmp.patch |   0
 {pkgs/hdparm => hdparm}/hdparm.nm             |   0
 {pkgs/help2man => help2man}/help2man.nm       |   0
 {pkgs/hostapd => hostapd}/config              |   0
 {pkgs/hostapd => hostapd}/hostapd.nm          |   0
 .../systemd/hostapd@.service                  |   0
 {pkgs/hplip => hplip}/hplip.nm                |   0
 .../patches/hplip-3.10.5-udev-rules.patch     |   0
 {pkgs/htop => htop}/htop.nm                   |   0
 {pkgs/hwdata => hwdata}/hwdata.nm             |   0
 {pkgs/iana-etc => iana-etc}/iana-etc.nm       |   0
 {pkgs/icecream => icecream}/icecream.nm       |   0
 {pkgs/icecream => icecream}/icecream.sh       |   0
 .../patches/icecream-cleanup-conffile.patch0  |   0
 .../patches/icecream-rename-scheduler.patch   |   0
 {pkgs/iftop => iftop}/iftop.nm                |   0
 {pkgs/igmpproxy => igmpproxy}/igmpproxy.nm    |   0
 {pkgs/initscripts => initscripts}/functions   |   0
 .../initscripts.nm                            |   0
 .../initscripts => initscripts}/src/Makefile  |   0
 .../src/console_check.c                       |   0
 .../src/console_init.c                        |   0
 .../src/ipcalc-tests                          |   0
 .../initscripts => initscripts}/src/ipcalc.1  |   0
 .../initscripts => initscripts}/src/ipcalc.c  |   0
 .../src/securetty.8                           |   0
 .../src/securetty.c                           |   0
 {pkgs/initscripts => initscripts}/src/shvar.c |   0
 {pkgs/initscripts => initscripts}/src/shvar.h |   0
 .../sysconfig/clock                           |   0
 .../sysconfig/createfiles                     |   0
 .../sysconfig/modules                         |   0
 .../sysconfig/network                         |   0
 .../initscripts => initscripts}/sysconfig/rc  |   0
 .../sysconfig/rc.local                        |   0
 .../sysconfig/rc.site                         |   0
 {pkgs/initscripts => initscripts}/sysctl.conf |   0
 .../udev/10-console.rules                     |   0
 .../udev/88-clock.rules                       |   0
 {pkgs/intltool => intltool}/intltool.nm       |   0
 {pkgs/iproute2 => iproute2}/iproute2.nm       |   0
 {pkgs/iptables => iptables}/iptables.nm       |   0
 {pkgs/iputils => iputils}/iputils.nm          |   0
 .../patches/iputils-s20071127-addrcache.patch |   0
 .../iputils-s20071127-arping-infiniband.patch |   0
 .../iputils-s20071127-arping_timeout.patch    |   0
 .../iputils-s20071127-countermeasures.patch   |   0
 .../patches/iputils-s20071127-idn.patch       |   0
 .../patches/iputils-s20071127-open-max.patch  |   0
 .../patches/iputils-s20071127-output.patch    |   0
 .../iputils-s20071127-ping-subint.patch       |   0
 .../iputils-s20071127-ping_cleanup.patch      |   0
 .../patches/iputils-s20071127-rh.patch        |   0
 .../iputils-s20071127-traffic_class.patch     |   0
 .../patches/iputils-s20071127-warnings.patch  |   0
 .../04-iscsi                                  |   0
 .../iscsi-initiator-utils.nm                  |   0
 .../iscsi-initiator-utils-add-libiscsi.patch  |   0
 ...initiator-utils-disable-isns-for-lib.patch |   0
 ...scsi-initiator-utils-dont-use-static.patch |   0
 ...i-initiator-utils-fix-lib-sysfs-init.patch |   0
 .../iscsi-initiator-utils-only-root-use.patch |   0
 .../iscsi-initiator-utils-uip-mgmt.patch      |   0
 ...or-utils-update-initscripts-and-docs.patch |   0
 ...initiator-utils-use-red-hat-for-name.patch |   0
 ...i-initiator-utils-use-var-for-config.patch |   0
 {pkgs/iw => iw}/iw.nm                         |   0
 {pkgs/joe => joe}/joe.nm                      |   0
 .../joe => joe}/patches/joe-3.4-selinux.patch |   0
 {pkgs/jwhois => jwhois}/jwhois.nm             |   0
 .../patches/jwhois-4.0-conf.patch             |   0
 .../patches/jwhois-4.0-conf_update.patch      |   0
 .../patches/jwhois-4.0-conf_update2.patch     |   0
 .../patches/jwhois-4.0-conf_update3.patch     |   0
 .../patches/jwhois-4.0-conf_update4.patch     |   0
 .../patches/jwhois-4.0-connect.patch          |   0
 .../patches/jwhois-4.0-dotster.patch          |   0
 .../patches/jwhois-4.0-enum.patch             |   0
 .../patches/jwhois-4.0-fclose.patch           |   0
 .../patches/jwhois-4.0-gi.patch               |   0
 .../patches/jwhois-4.0-ipv6match.patch        |   0
 {pkgs/kbd => kbd}/kbd.nm                      |   0
 .../patches/kbd-1.15-defkeymap.patch          |   0
 .../patches/kbd-1.15-keycodes-man.patch       |   0
 {pkgs/kbd => kbd}/patches/kbd-1.15-po.patch   |   0
 .../patches/kbd-1.15-quiet_doc.patch          |   0
 .../patches/kbd-1.15-resizecon-x86_64.patch   |   0
 .../kbd => kbd}/patches/kbd-1.15-sparc.patch  |   0
 .../patches/kbd-1.15-unicode_start.patch      |   0
 {pkgs/kernel => kernel}/config                |   0
 {pkgs/kernel => kernel}/ipfire_logo.ppm       |   0
 {pkgs/kernel => kernel}/kernel.nm             |   0
 ...grsecurity-2.2.2-2.6.39-201105231910.patch |   0
 .../linux-2.6.33-disable-compat-vdso.patch    |   0
 .../l7-protocols.nm                           |   0
 {pkgs/ldapvi => ldapvi}/ldapvi.nm             |   0
 {pkgs/less => less}/less.nm                   |   0
 {pkgs/less => less}/less.sh                   |   0
 {pkgs/less => less}/lesspipe.sh               |   0
 {pkgs/libICE => libICE}/libICE.nm             |   0
 {pkgs/libSM => libSM}/libSM.nm                |   0
 .../libVNCServer.nm                           |   0
 ...bvncserver-0.9.1-close_server_socket.patch |   0
 .../patches/libvncserver-0.9.1-multilib.patch |   0
 .../patches/libvncserver-0.9.7-Linux.patch    |   0
 {pkgs/libX11 => libX11}/libX11.nm             |   0
 {pkgs/libXau => libXau}/libXau.nm             |   0
 .../patches/xau-1.0.4-local.patch             |   0
 {pkgs/libXaw => libXaw}/libXaw.nm             |   0
 {pkgs/libXdamage => libXdamage}/libXdamage.nm |   0
 {pkgs/libXdmcp => libXdmcp}/libXdmcp.nm       |   0
 {pkgs/libXext => libXext}/libXext.nm          |   0
 {pkgs/libXfixes => libXfixes}/libXfixes.nm    |   0
 {pkgs/libXfont => libXfont}/libXfont.nm       |   0
 {pkgs/libXft => libXft}/libXft.nm             |   0
 {pkgs/libXi => libXi}/libXi.nm                |   0
 {pkgs/libXmu => libXmu}/libXmu.nm             |   0
 {pkgs/libXpm => libXpm}/libXpm.nm             |   0
 {pkgs/libXrandr => libXrandr}/libXrandr.nm    |   0
 .../patches/libXrandr-1.3.0-fixes.patch       |   0
 {pkgs/libXrender => libXrender}/libXrender.nm |   0
 {pkgs/libXres => libXres}/libXres.nm          |   0
 {pkgs/libXt => libXt}/libXt.nm                |   0
 .../patches/libXt-1.0.7-libsm-fix.patch       |   0
 {pkgs/libXtst => libXtst}/libXtst.nm          |   0
 {pkgs/libXv => libXv}/libXv.nm                |   0
 {pkgs/libXvMC => libXvMC}/libXvMC.nm          |   0
 {pkgs/libXxf86vm => libXxf86vm}/libXxf86vm.nm |   0
 {pkgs/libaal => libaal}/libaal.nm             |   0
 {pkgs/libaio => libaio}/libaio.nm             |   0
 .../libaio-0.3.109-install-to-slash.patch     |   0
 {pkgs/libarchive => libarchive}/libarchive.nm |   0
 {pkgs/libart => libart}/libart.nm             |   0
 .../libart_lgpl-2.3.19-upstream_fix-1.patch   |   0
 {pkgs/libassuan => libassuan}/libassuan.nm    |   0
 .../libatasmart.nm                            |   0
 {pkgs/libcap-ng => libcap-ng}/libcap-ng.nm    |   0
 {pkgs/libcap => libcap}/libcap.nm             |   0
 .../libcap-2.16-build-system-fixes.patch      |   0
 .../patches/libcap-2.16-headerfix.patch       |   0
 {pkgs/libcgroup => libcgroup}/libcgroup.nm    |   0
 {pkgs/libdaemon => libdaemon}/libdaemon.nm    |   0
 {pkgs/libdnet => libdnet}/libdnet.nm          |   0
 .../patches/libdnet-1.12-shrext.patch         |   0
 {pkgs/libdrm => libdrm}/91-drm-modeset.rules  |   0
 {pkgs/libdrm => libdrm}/libdrm.nm             |   0
 .../patches/libdrm-2.4.0-no-bc.patch          |   0
 .../patches/libdrm-2.4.21-b803918f3f.patch    |   0
 .../patches/libdrm-make-dri-perms-okay.patch  |   0
 {pkgs/libedit => libedit}/libedit.nm          |   0
 {pkgs/libevent => libevent}/libevent.nm       |   0
 {pkgs/libffi => libffi}/libffi.nm             |   0
 {pkgs/libfontenc => libfontenc}/libfontenc.nm |   0
 {pkgs/libgcrypt => libgcrypt}/libgcrypt.nm    |   0
 .../libgpg-error.nm                           |   0
 {pkgs/libgssglue => libgssglue}/libgssglue.nm |   0
 {pkgs/libidn => libidn}/libidn.nm             |   0
 {pkgs/libjpeg => libjpeg}/libjpeg.nm          |   0
 {pkgs/libksba => libksba}/libksba.nm          |   0
 {pkgs/libmng => libmng}/libmng.nm             |   0
 {pkgs/libmpc => libmpc}/libmpc.nm             |   0
 {pkgs/libnet => libnet}/libnet.nm             |   0
 .../patches/libnet-1.1.4-capability.patch     |   0
 .../libnetfilter_conntrack.nm                 |   0
 .../libnetfilter_log.nm                       |   0
 .../libnetfilter_queue.nm                     |   0
 .../libnfnetlink.nm                           |   0
 .../libnfsidmap.nm                            |   0
 {pkgs/libnl => libnl}/libnl.nm                |   0
 .../patches/libnl-1.1-include-limits-h.patch  |   0
 .../patches/libnl-1.1-no-extern-inline.patch  |   0
 .../patches/libnl-1.1-permissions.patch       |   0
 {pkgs/libpcap => libpcap}/libpcap.nm          |   0
 .../patches/libpcap-0.8.3-ppp.patch           |   0
 .../libpciaccess.nm                           |   0
 .../libpipeline.nm                            |   0
 {pkgs/libpng => libpng}/libpng.nm             |   0
 .../patches/libpng-1.4.2-pngconf.patch        |   0
 .../librpcsecgss.nm                           |   0
 {pkgs/libselinux => libselinux}/libselinux.nm |   0
 .../patches/libselinux-ipfire.patch           |   0
 .../libsemanage.nm                            |   0
 .../patches/libsemanage-rhat.patch            |   0
 .../libsemanage => libsemanage}/semanage.conf |   0
 {pkgs/libsepol => libsepol}/libsepol.nm       |   0
 {pkgs/libsigc++ => libsigc++}/libsigc++.nm    |   0
 {pkgs/libsolv => libsolv}/libsolv.nm          |   0
 {pkgs/libsoup => libsoup}/libsoup.nm          |   0
 {pkgs/libssh2 => libssh2}/libssh2.nm          |   0
 {pkgs/libtasn1 => libtasn1}/libtasn1.nm       |   0
 {pkgs/libtiff => libtiff}/libtiff.nm          |   0
 {pkgs/libtool => libtool}/libtool.nm          |   0
 {pkgs/libtorrent => libtorrent}/libtorrent.nm |   0
 .../libusb-compat.nm                          |   0
 {pkgs/libusb => libusb}/libusb.nm             |   0
 {pkgs/libuser => libuser}/libuser.nm          |   0
 {pkgs/libvirt => libvirt}/libvirt.nm          |   0
 {pkgs/libxcb => libxcb}/libxcb.nm             |   0
 {pkgs/libxkbfile => libxkbfile}/libxkbfile.nm |   0
 {pkgs/libxml2 => libxml2}/libxml2.nm          |   0
 {pkgs/libxslt => libxslt}/libxslt.nm          |   0
 {pkgs/libyaml => libyaml}/libyaml.nm          |   0
 {pkgs/lighttpd => lighttpd}/lighttpd.conf     |   0
 {pkgs/lighttpd => lighttpd}/lighttpd.nm       |   0
 {pkgs/lighttpd => lighttpd}/lighttpd.tmpfiles |   0
 .../systemd/lighttpd.service                  |   0
 {pkgs/linux-atm => linux-atm}/linux-atm.nm    |   0
 .../patches/linux-atm-2.4.1-gcc-4.patch       |   0
 .../patches/linux-atm-2.4.1-nmu.patch         |   0
 .../linux-firmware.nm                         |   0
 {pkgs/lldpd => lldpd}/lldpd.nm                |   0
 {pkgs/lldpd => lldpd}/lldpd.tmpfiles          |   0
 .../patches/lldpd-0.52.x-os-release.patch     |   0
 {pkgs/lldpd => lldpd}/systemd/lldpd.service   |   0
 {pkgs/lm-sensors => lm-sensors}/lm-sensors.nm |   0
 {pkgs/logrotate => logrotate}/logrotate.nm    |   0
 .../patches/logrotate-3.7.7-curdir.patch      |   0
 .../patches/logrotate-3.7.7-toolarge.patch    |   0
 .../systemd/logrotate.service                 |   0
 {pkgs/lsof => lsof}/lsof.nm                   |   0
 .../patches/lsof_4.81-threads.patch           |   0
 {pkgs/lua => lua}/lua.nm                      |   0
 .../patches/lua-5.1.4-autotoolize.patch       |   0
 {pkgs/lvm2 => lvm2}/lvm2.nm                   |   0
 {pkgs/lzo => lzo}/lzo.nm                      |   0
 {pkgs/m4 => m4}/m4.nm                         |   0
 {pkgs/mailcap => mailcap}/mailcap.nm          |   0
 {pkgs/make => make}/make.nm                   |   0
 .../patches/make-3.79.1-noclock_gettime.patch |   0
 .../patches/make-3.80-getcwd.patch            |   0
 .../make => make}/patches/make-3.80-j8k.patch |   0
 .../patches/make-3.81-err-reporting.patch     |   0
 .../patches/make-3.81-fdleak.patch            |   0
 .../patches/make-3.81-jobserver.patch         |   0
 .../patches/make-3.81-memory.patch            |   0
 .../patches/make-3.81-newlines.patch          |   0
 .../patches/make-3.81-rlimit.patch            |   0
 .../patches/make-3.81-strcpy-overlap.patch    |   0
 {pkgs/man-db => man-db}/man-db.nm             |   0
 {pkgs/man-pages => man-pages}/man-pages.nm    |   0
 {pkgs/mc => mc}/mc.nm                         |   0
 {pkgs/mdadm => mdadm}/mdadm.nm                |   0
 .../memtest86+ => memtest86+}/memtest86+.grub |   0
 {pkgs/memtest86+ => memtest86+}/memtest86+.nm |   0
 {pkgs/mesa => mesa}/mesa.nm                   |   0
 {pkgs/minicom => minicom}/minicom.nm          |   0
 .../modprobe.d/blacklist.conf                 |   0
 .../modprobe.d/modprobe.conf                  |   0
 .../module-init-tools.nm                      |   0
 {pkgs/mpfr => mpfr}/mpfr.nm                   |   0
 .../multipath-tools.nm                        |   0
 .../0001-RH-queue-without-daemon.patch        |   0
 ...or-upstream-add-tpg_pref-prioritizer.patch |   0
 .../patches/0002-RH-path-checker.patch        |   0
 ...-for-upstream-add-tmo-config-options.patch |   0
 .../patches/0003-RH-root-init-script.patch    |   0
 .../0003-for-upstream-default-configs.patch   |   0
 .../patches/0004-RH-fix-kpartx.patch          |   0
 .../patches/0005-RH-cciss_id.patch            |   0
 .../patches/0006-RH-move-bindings.patch       |   0
 .../patches/0007-RH-do-not-remove.patch       |   0
 ...Make-build-system-RH-Fedora-friendly.patch |   0
 ...-multipathd-blacklist-all-by-default.patch |   0
 ...0010-RH-multipath-rules-udev-changes.patch |   0
 .../0011-RH-fix-init-script-LSB-headers.patch |   0
 .../patches/0012-RH-udev-sync-support.patch   |   0
 ...013-RH-add-weighted_prio-prioritizer.patch |   0
 .../patches/0014-RH-add-hp_tur-checker.patch  |   0
 ...15-RH-add-multipathd-count-paths-cmd.patch |   0
 .../0016-RHBZ-554561-fix-init-error-msg.patch |   0
 .../0017-RHBZ-554592-man-page-note.patch      |   0
 .../0018-RHBZ-554596-SUN-6540-config.patch    |   0
 ...19-RHBZ-554598-fix-multipath-locking.patch |   0
 ...0020-RHBZ-554605-fix-manual-failover.patch |   0
 ...0021-RHBZ-548874-add-find-multipaths.patch |   0
 ...2-RHBZ-557845-RHEL5-style-partitions.patch |   0
 .../0023-RHBZ-557810-emc-invista-config.patch |   0
 .../0024-RHBZ-565933-checker-timeout.patch    |   0
 {pkgs/nano => nano}/nano.nm                   |   0
 {pkgs/nasm => nasm}/nasm.nm                   |   0
 {pkgs/ncurses => ncurses}/ncurses.nm          |   0
 {pkgs/net-snmp => net-snmp}/net-snmp.nm       |   0
 .../systemd/snmpd.service                     |   0
 {pkgs/net-tools => net-tools}/config.h        |   0
 {pkgs/net-tools => net-tools}/config.make     |   0
 {pkgs/net-tools => net-tools}/ether-wake.8    |   0
 {pkgs/net-tools => net-tools}/ether-wake.c    |   0
 {pkgs/net-tools => net-tools}/ipmaddr.8       |   0
 {pkgs/net-tools => net-tools}/iptunnel.8      |   0
 {pkgs/net-tools => net-tools}/mii-diag.8      |   0
 {pkgs/net-tools => net-tools}/mii-diag.c      |   0
 {pkgs/net-tools => net-tools}/net-tools.nm    |   0
 .../patches/net-tools-1.57-bug22040.patch     |   0
 .../patches/net-tools-1.60-IA64.patch         |   0
 .../patches/net-tools-1.60-a-option.patch     |   0
 .../net-tools-1.60-arp-unaligned-access.patch |   0
 .../patches/net-tools-1.60-arp_man.patch      |   0
 .../patches/net-tools-1.60-arp_overflow.patch |   0
 ...net-tools-1.60-avoid-name-resolution.patch |   0
 .../patches/net-tools-1.60-bcast.patch        |   0
 .../patches/net-tools-1.60-clear-flag.patch   |   0
 ...et-tools-1.60-continous-flush-stdout.patch |   0
 .../patches/net-tools-1.60-cycle.patch        |   0
 .../patches/net-tools-1.60-de.patch           |   0
 .../patches/net-tools-1.60-debug-fix.patch    |   0
 .../net-tools-1.60-duplicate-tcp.patch        |   0
 .../patches/net-tools-1.60-ec_hw_null.patch   |   0
 .../patches/net-tools-1.60-fgets.patch        |   0
 .../patches/net-tools-1.60-gcc33.patch        |   0
 .../patches/net-tools-1.60-gcc34.patch        |   0
 .../patches/net-tools-1.60-hfi.patch          |   0
 .../net-tools-1.60-hostname-short.patch       |   0
 .../patches/net-tools-1.60-hostname_man.patch |   0
 .../patches/net-tools-1.60-i-option.patch     |   0
 .../patches/net-tools-1.60-ib-warning.patch   |   0
 .../patches/net-tools-1.60-ifaceopt.patch     |   0
 ...ols-1.60-ifconfig-long-iface-crasher.patch |   0
 .../patches/net-tools-1.60-ifconfig.patch     |   0
 .../patches/net-tools-1.60-ifconfig_ib.patch  |   0
 .../patches/net-tools-1.60-ifconfig_man.patch |   0
 .../patches/net-tools-1.60-inet6-lookup.patch |   0
 .../patches/net-tools-1.60-interface.patch    |   0
 .../net-tools-1.60-interface_stack.patch      |   0
 .../patches/net-tools-1.60-ipx.patch          |   0
 .../patches/net-tools-1.60-isofix.patch       |   0
 .../net-tools-1.60-large-indexes.patch        |   0
 .../net-tools-1.60-makefile-berlios.patch     |   0
 .../net-tools-1.60-man-RHEL-bugs.patch        |   0
 .../patches/net-tools-1.60-man-obsolete.patch |   0
 .../patches/net-tools-1.60-man.patch          |   0
 .../patches/net-tools-1.60-manydevs.patch     |   0
 .../net-tools-1.60-masqinfo-raw-ip.patch      |   0
 .../net-tools-1.60-metric-tunnel-man.patch    |   0
 .../patches/net-tools-1.60-mii-gigabit.patch  |   0
 .../patches/net-tools-1.60-mii-refactor.patch |   0
 .../net-tools-1.60-mii-tool-obsolete.patch    |   0
 .../patches/net-tools-1.60-miiioctl.patch     |   0
 .../patches/net-tools-1.60-nameif.patch       |   0
 .../net-tools-1.60-nameif_strncpy.patch       |   0
 .../patches/net-tools-1.60-netdevice.patch    |   0
 .../patches/net-tools-1.60-netmask.patch      |   0
 .../net-tools-1.60-netstat-I-fix.patch        |   0
 ...-tools-1.60-netstat-interfaces-crash.patch |   0
 .../patches/net-tools-1.60-netstat-leak.patch |   0
 .../net-tools-1.60-netstat-probe.patch        |   0
 .../net-tools-1.60-netstat_inode.patch        |   0
 .../net-tools-1.60-netstat_stop_trim.patch    |   0
 .../net-tools-1.60-netstat_ulong.patch        |   0
 .../patches/net-tools-1.60-note.patch         |   0
 .../patches/net-tools-1.60-num-ports.patch    |   0
 .../patches/net-tools-1.60-overflow.patch     |   0
 .../patches/net-tools-1.60-parse.patch        |   0
 .../patches/net-tools-1.60-pie.patch          |   0
 .../patches/net-tools-1.60-remove_node.patch  |   0
 .../patches/net-tools-1.60-return.patch       |   0
 .../patches/net-tools-1.60-scanf-format.patch |   0
 .../patches/net-tools-1.60-sctp-addrs.patch   |   0
 .../patches/net-tools-1.60-sctp-quiet.patch   |   0
 .../patches/net-tools-1.60-sctp.patch         |   0
 .../patches/net-tools-1.60-selinux.patch      |   0
 .../patches/net-tools-1.60-siunits.patch      |   0
 .../patches/net-tools-1.60-skip.patch         |   0
 .../net-tools-1.60-slattach-fchown.patch      |   0
 .../patches/net-tools-1.60-statalias.patch    |   0
 ...net-tools-1.60-statistics-doubleword.patch |   0
 .../patches/net-tools-1.60-statistics.patch   |   0
 .../net-tools-1.60-statistics_buffer.patch    |   0
 .../patches/net-tools-1.60-stdo.patch         |   0
 .../net-tools-1.60-trailingblank.patch        |   0
 .../patches/net-tools-1.60-trim_iface.patch   |   0
 .../patches/net-tools-1.60-trunc.patch        |   0
 .../patches/net-tools-1.60-ulong.patch        |   0
 .../patches/net-tools-1.60-virtualname.patch  |   0
 .../patches/net-tools-1.60-x25-proc.patch     |   0
 {pkgs/netplug => netplug}/netplug.nm          |   0
 .../patches/netplug-1.2.9.1-execshield.patch  |   0
 .../systemd/netplug.service                   |   0
 {pkgs/nettle => nettle}/nettle.nm             |   0
 {pkgs/network => network}/network.nm          |   0
 .../systemd/network.service                   |   0
 {pkgs/newt => newt}/newt.nm                   |   0
 {pkgs/nfs-utils => nfs-utils}/nfs-utils.nm    |   0
 {pkgs/nmap => nmap}/nmap.nm                   |   0
 .../patches/nmap-5.00-mktemp.patch            |   0
 {pkgs/noip => noip}/noip.nm                   |   0
 {pkgs/nspr => nspr}/nspr-config-vars.in       |   0
 {pkgs/nspr => nspr}/nspr.nm                   |   0
 {pkgs/nspr => nspr}/nspr.pc.in                |   0
 .../patches/nspr-config-pc.patch              |   0
 .../nss-myhostname.nm                         |   0
 .../nss-softokn-config.in                     |   0
 .../nss-softokn.nm                            |   0
 .../nss-softokn.pc.in                         |   0
 .../nss-softokn.spec                          |   0
 .../patches/nss-softokn-3.12.4-fips-fix.patch |   0
 .../patches/nss-softokn-3.12.4-prelink.patch  |   0
 .../nss-util => nss-util}/nss-util-config.in  |   0
 {pkgs/nss-util => nss-util}/nss-util.nm       |   0
 {pkgs/nss-util => nss-util}/nss-util.pc.in    |   0
 {pkgs/nss-util => nss-util}/nss-util.spec     |   0
 {pkgs/nss => nss}/PayPalEE.cert               | Bin
 {pkgs/nss => nss}/cert8.db                    | Bin
 {pkgs/nss => nss}/cert9.db                    | Bin
 {pkgs/nss => nss}/key3.db                     | Bin
 {pkgs/nss => nss}/key4.db                     | Bin
 {pkgs/nss => nss}/nss-config.in               |   0
 {pkgs/nss => nss}/nss.nm                      |   0
 {pkgs/nss => nss}/nss.pc.in                   |   0
 ...port-for-PKCS-8-encoded-private-keys.patch |   0
 .../0001-Do-not-define-SEC_SkipTemplate.patch |   0
 .../nss => nss}/patches/nss-enable-pem.patch  |   0
 .../patches/nss-sysinit-userdb-first.patch    |   0
 {pkgs/nss => nss}/patches/nsspem-596674.patch |   0
 .../patches/renegotiate-transitional.patch    |   0
 {pkgs/nss => nss}/secmod.db                   | Bin
 {pkgs/nss => nss}/setup-nsssysinit.sh         |   0
 {pkgs/nss => nss}/system-pkcs11.txt           |   0
 {pkgs/nss_ldap => nss_ldap}/nss_ldap.nm       |   0
 .../patches/nss_ldap-254-soname.patch         |   0
 .../patches/nss_ldap-257-mozldap.patch        |   0
 .../patches/nss_ldap-259-res_init.patch       |   0
 .../patches/nss_ldap-264-checkcase.patch      |   0
 .../patches/nss_ldap-264-cloexec.patch        |   0
 .../patches/nss_ldap-265-depth.patch          |   0
 .../patches/nss_ldap-265-ent_internal.patch   |   0
 .../patches/nss_ldap-265-erange.patch         |   0
 .../patches/nss_ldap-265-fix-uninit.patch     |   0
 .../nss_ldap-265-initgroups-minimum_uid.patch |   0
 .../patches/nss_ldap-265-local_users.patch    |   0
 .../patches/nss_ldap-265-padl-bug-418.patch   |   0
 .../patches/nss_ldap-265-setnetgrent.patch    |   0
 {pkgs/openl2tp => openl2tp}/openl2tp.nm       |   0
 {pkgs/openldap => openldap}/openldap.nm       |   0
 .../openldap-2.4.17-disable_sys_err.patch     |   0
 {pkgs/openldap => openldap}/slapd.conf        |   0
 .../systemd/openldap.service                  |   0
 {pkgs/openssh => openssh}/openssh.nm          |   0
 .../openssh-4.3p2-askpass-grab-info.patch     |   0
 .../openssh-5.1p1-askpass-progress.patch      |   0
 .../patches/openssh-5.1p1-scp-manpage.patch   |   0
 .../patches/openssh-5.2p1-allow-ip-opts.patch |   0
 .../patches/openssh-5.2p1-edns.patch          |   0
 .../patches/openssh-5.5p1-x11.patch           |   0
 .../patches/openssh-5.6p1-exit-deadlock.patch |   0
 .../patches/openssh-5.6p1-keygen.patch        |   0
 .../patches/openssh-5.6p1-redhat.patch        |   0
 ...penssh-5.8p1-authorized-keys-command.patch |   0
 .../patches/openssh-5.8p1-fingerprint.patch   |   0
 .../patches/openssh-5.8p1-kuserok.patch       |   0
 .../patches/openssh-5.8p1-mls.patch           |   0
 .../patches/openssh-5.8p1-randclean.patch     |   0
 .../patches/openssh-5.8p1-selinux-role.patch  |   0
 .../patches/openssh-5.8p1-selinux.patch       |   0
 {pkgs/openssh => openssh}/ssh-keygen          |   0
 {pkgs/openssh => openssh}/sshd.pam            |   0
 {pkgs/openssh => openssh}/sshd_config         |   0
 .../systemd/openssh.service                   |   0
 {pkgs/openssl => openssl}/openssl.cnf         |   0
 {pkgs/openssl => openssl}/openssl.nm          |   0
 .../openssl-0.9.8b-test-use-localhost.patch   |   0
 .../patches/openssl-0.9.8j-env-nozlib.patch   |   0
 .../openssl-0.9.8j-version-add-engines.patch  |   0
 .../patches/openssl-0.9.8k-no-rpath.patch     |   0
 .../openssl-1.0.0-beta3-soversion.patch       |   0
 .../patches/openssl-1.0.0-beta4-redhat.patch  |   0
 .../openssl-1.0.0-beta5-enginesdir.patch      |   0
 .../patches/openssl-1.0.0d-version.patch      |   0
 {pkgs/openvpn => openvpn}/openvpn.nm          |   0
 {pkgs/os-prober => os-prober}/os-prober.nm    |   0
 {pkgs/p11-kit => p11-kit}/p11-kit.nm          |   0
 {pkgs/pakfire => pakfire}/pakfire.nm          |   0
 {pkgs/pam => pam}/login.defs                  |   0
 {pkgs/pam => pam}/pam.d/other                 |   0
 {pkgs/pam => pam}/pam.d/system-auth           |   0
 {pkgs/pam => pam}/pam.nm                      |   0
 {pkgs/pam => pam}/pam_env.conf                |   0
 .../patches/Linux-PAM-1.1.0-no-yywrap-1.patch |   0
 {pkgs/pam => pam}/securetty                   |   0
 {pkgs/pam_ldap => pam_ldap}/pam_ldap.nm       |   0
 ...6-authenticateOnChangeExpiredAuthtok.patch |   0
 .../patches/pam_ldap-176-exop-modify.patch    |   0
 .../patches/pam_ldap-180-install-perms.patch  |   0
 .../patches/pam_ldap-182-manpointer.patch     |   0
 .../patches/pam_ldap-183-releaseconfig.patch  |   0
 .../patches/pam_ldap-184-nsrole.patch         |   0
 .../patches/pam_ldap-185-dnsconfig.patch      |   0
 .../patches/pam_ldap-185-expiration4.patch    |   0
 {pkgs/pango => pango}/pango.nm                |   0
 {pkgs/parted => parted}/parted.nm             |   0
 ...id_topology_get_physical_sector_size.patch |   0
 ...d-2.1-dasd-NULL-dereference-rh563419.patch |   0
 .../parted-2.1-default-alignment.patch        |   0
 ...parted-2.1-gpt-clobber-pmbr-rh563211.patch |   0
 .../parted-2.1-mem-leak-fixes-rh556012.patch  |   0
 .../parted-2.1-needs_clobber-rh566181.patch   |   0
 {pkgs/passwd => passwd}/passwd.nm             |   0
 {pkgs/passwd => passwd}/passwd.pam            |   0
 {pkgs/patch => patch}/patch.nm                |   0
 .../patches/patch-2.5.4-sigsegv.patch         |   0
 .../patches/patch-2.6.1-CVE-2010-4651.patch   |   0
 .../patch-2.6.1-backup-if-mismatch.patch      |   0
 .../patches/patch-2.6.1-get-arg.patch         |   0
 .../patches/patch-selinux.patch               |   0
 {pkgs/pax-utils => pax-utils}/pax-utils.nm    |   0
 {pkgs/paxctl => paxctl}/paxctl.nm             |   0
 {pkgs/paxtest => paxtest}/paxtest.nm          |   0
 {pkgs/pcapy => pcapy}/pcapy.nm                |   0
 {pkgs/pciutils => pciutils}/pciutils.nm       |   0
 {pkgs/pcre => pcre}/pcre.nm                   |   0
 .../patches/pdns-recursor-fixmakefile.patch   |   0
 .../patches/pdns-recursor-fixsysconfdir.patch |   0
 .../pdns-recursor.nm                          |   0
 .../pdns-recursor.tmpfiles                    |   0
 .../recursor.conf                             |   0
 .../systemd/pdns-recursor.service             |   0
 .../patches/pdns-fix-lua-detection.patch      |   0
 {pkgs/pdns => pdns}/pdns.nm                   |   0
 {pkgs/pdns => pdns}/systemd/pdns.service      |   0
 .../perl-HTML-Parser.nm                       |   0
 .../perl-HTML-Tagset.nm                       |   0
 .../perl-Test-Simple.nm                       |   0
 {pkgs/perl-URI => perl-URI}/perl-URI.nm       |   0
 .../perl-XML-Parser.nm                        |   0
 .../perl-libwww-perl.nm                       |   0
 .../patches/perl-5.10.0-libresolv.patch       |   0
 .../patches/perl-5.8.0-libdir64.patch         |   0
 .../patches/perl-5.8.8-rpath-make.patch       |   0
 .../patches/perl-USE_MM_LD_RUN_PATH.patch     |   0
 .../patches/perl-disable_test_hosts.patch     |   0
 .../patches/perl-perlbug-tag.patch            |   0
 {pkgs/perl => perl}/perl.nm                   |   0
 {pkgs/pinentry => pinentry}/pinentry.nm       |   0
 {pkgs/pixman => pixman}/pixman.nm             |   0
 .../patches/pkg-config-0.25-autoconf-1.patch  |   0
 {pkgs/pkg-config => pkg-config}/pkg-config.nm |   0
 {pkgs/polkit => polkit}/polkit.nm             |   0
 {pkgs/popt => popt}/popt.nm                   |   0
 {pkgs/powertop => powertop}/powertop.nm       |   0
 {pkgs/ppl => ppl}/ppl.nm                      |   0
 .../patches/ppp-2.3.6-sample.patch            |   0
 .../patches/ppp-2.4.1-varargs.patch           |   0
 .../ppp-2.4.2-change_resolv_conf.patch        |   0
 .../patches/ppp-2.4.2-ifname.patch            |   0
 .../patches/ppp-2.4.2-pppoatm-make.patch      |   0
 {pkgs/ppp => ppp}/patches/ppp-2.4.3-fix.patch |   0
 .../ppp => ppp}/patches/ppp-2.4.3-fix64.patch |   0
 .../ppp => ppp}/patches/ppp-2.4.3-make.patch  |   0
 .../ppp => ppp}/patches/ppp-2.4.4-cbcp.patch  |   0
 .../patches/ppp-2.4.4-dontwriteetc.patch      |   0
 .../patches/ppp-2.4.4-fd_leak.patch           |   0
 .../ppp-2.4.4-ipv6-accept-remote.patch        |   0
 .../ppp => ppp}/patches/ppp-2.4.4-lib64.patch |   0
 .../patches/ppp-2.4.4-libutil.patch           |   0
 .../ppp => ppp}/patches/ppp-2.4.4-local.patch |   0
 {pkgs/ppp => ppp}/patches/ppp-2.4.4-pie.patch |   0
 .../patches/ppp-2.4.5-eaptls-mppe-0.99.patch  |   0
 {pkgs/ppp => ppp}/patches/ppp-2.4.5-eth.patch |   0
 .../ppp => ppp}/patches/ppp-2.4.5-lock.patch  |   0
 {pkgs/ppp => ppp}/patches/ppp-2.4.5-man.patch |   0
 .../patches/ppp-2.4.5-ppp_resolv.patch        |   0
 .../patches/ppp-2.4.5-var_run_ppp.patch       |   0
 {pkgs/ppp => ppp}/ppp.nm                      |   0
 {pkgs/ppp => ppp}/ppp.pam                     |   0
 .../patches/pptp-1.7.2-compat.patch           |   0
 .../patches/pptp-1.7.2-conn-free.patch        |   0
 .../patches/pptp-1.7.2-conn-free2.patch       |   0
 .../patches/pptp-1.7.2-ip-path.patch          |   0
 .../patches/pptp-1.7.2-makedeps.patch         |   0
 .../pptp-1.7.2-pptpsetup-encrypt.patch        |   0
 .../patches/pptp-1.7.2-pptpsetup-mppe.patch   |   0
 .../patches/pptp-1.7.2-pptpsetup.patch        |   0
 .../patches/pptp-1.7.2-waitpid.patch          |   0
 {pkgs/pptp => pptp}/pptp.nm                   |   0
 .../patches/procps-3.2.8-selinux.patch        |   0
 .../procps-3.2.8-watch_unicode-2.patch        |   0
 {pkgs/procps => procps}/procps.nm             |   0
 {pkgs/psmisc => psmisc}/psmisc.nm             |   0
 {pkgs/pth => pth}/pth.nm                      |   0
 .../patches/PyQt-x11-gpl-4.4.4-64bit.patch    |   0
 .../PyQt-x11-gpl-4.5.2-QT_SHARED.patch        |   0
 ...yQt-x11-gpl-4.6.2-timestamp-multilib.patch |   0
 ...t-x11-gpl-4.7.2-fix-implicit-linking.patch |   0
 {pkgs/pyQt => pyQt}/pyQt.nm                   |   0
 {pkgs/pychecker => pychecker}/pychecker.nm    |   0
 {pkgs/pyfire => pyfire}/pyfire.nm             |   0
 {pkgs/pyfire => pyfire}/src/Makefile          |   0
 {pkgs/pyfire => pyfire}/src/__init__.py       |   0
 {pkgs/pyfire => pyfire}/src/config.py         |   0
 {pkgs/pyfire => pyfire}/src/executil.py       |   0
 {pkgs/pyfire => pyfire}/src/hal.py            |   0
 {pkgs/pyfire => pyfire}/src/net.py            |   0
 {pkgs/pyfire => pyfire}/src/web.py            |   0
 {pkgs/pygobject2 => pygobject2}/pygobject2.nm |   0
 .../patches/no-script-liblzma.patch           |   0
 {pkgs/pyliblzma => pyliblzma}/pyliblzma.nm    |   0
 {pkgs/pyserial => pyserial}/pyserial.nm       |   0
 {pkgs/python-IPy => python-IPy}/python-IPy.nm |   0
 .../python-cairo.nm                           |   0
 .../python-cryptsetup.nm                      |   0
 .../python-dbus.nm                            |   0
 .../python-decorator.nm                       |   0
 .../python-distutils-extra.nm                 |   0
 .../python-gudev.nm                           |   0
 .../python-m2crypto.nm                        |   0
 .../python-netfilter_conntrack.nm             |   0
 .../python-parted.nm                          |   0
 .../python-piksemel.nm                        |   0
 .../python-progressbar.nm                     |   0
 .../python-pyaspects.nm                       |   0
 .../python-pyblock.nm                         |   0
 ...on-pycurl-fix-do_curl_reset-refcount.patch |   0
 .../python-pycurl-no-static-libs.patch0       |   0
 .../python-pycurl.nm                          |   0
 .../patches/addStartShell.patch               |   0
 .../python-qtermwidget.nm                     |   0
 .../python-setuptools.nm                      |   0
 .../python-tornado.nm                         |   0
 .../patches/urlgrabber-HEAD.patch             |   0
 .../python-urlgrabber.nm                      |   0
 .../patches/python-2.3.4-lib64-regex.patch    |   0
 .../patches/python-2.5-cflags.patch           |   0
 .../patches/python-2.6-rpath.patch            |   0
 .../python-2.6.4-distutils-rpath.patch        |   0
 {pkgs/python => python}/python.nm             |   0
 {pkgs/pyxattr => pyxattr}/pyxattr.nm          |   0
 {pkgs/qemu => qemu}/qemu.nm                   |   0
 ...-override-redirect-windows-popup-men.patch |   0
 ...support-for-using-isystem-to-allow-p.patch |   0
 ...are-inserted-or-removed-in-a-QTabBar.patch |   0
 ...Add-context-to-tr-calls-in-QShortcut.patch |   0
 .../qt-4.6.3-bn-rendering-bz562049.patch      |   0
 .../qt-4.6.3-bn-rendering-bz562058.patch      |   0
 .../qt-4.6.3-indic-rendering-bz631732.patch   |   0
 .../qt-4.6.3-indic-rendering-bz636399.patch   |   0
 ...everywhere-opensource-src-4.6.2-cups.patch |   0
 ...e-src-4.6.3-glib_eventloop_nullcheck.patch |   0
 ...-4.7.0-CVE-2010-1822-crash-svg-image.patch |   0
 ...urce-src-4.7.0-QTBUG-13567-QTreeView.patch |   0
 ...here-opensource-src-4.7.0-QTBUG-6185.patch |   0
 ...-src-4.7.0-beta1-qtwebkit_pluginpath.patch |   0
 ...ere-opensource-src-4.7.0-beta1-s390x.patch |   0
 ...nsource-src-4.7.0-beta1-uic_multilib.patch |   0
 ...nsource-src-4.7.0-beta2-kde4_plugins.patch |   0
 ...nsource-src-4.7.0-beta2-mysql_config.patch |   0
 ...-src-4.7.0-beta2-phonon_servicesfile.patch |   0
 ...verywhere-opensource-src-4.7.0-bpp24.patch |   0
 ...ensource-src-4.2.2-multilib-optflags.patch |   0
 ...rce-src-4.5.0-fix-qatomic-inline-asm.patch |   0
 ...source-src-4.5.1-enable_ft_lcdfilter.patch |   0
 {pkgs/qt => qt}/qt.nm                         |   0
 .../patches/shared.patch                      |   0
 .../qtermwidget.nm                            |   0
 {pkgs/quagga => quagga}/quagga.nm             |   0
 {pkgs/radvd => radvd}/radvd.nm                |   0
 {pkgs/radvd => radvd}/radvd.tmpfiles          |   0
 {pkgs/radvd => radvd}/systemd/radvd.service   |   0
 {pkgs/readline => readline}/inputrc           |   0
 .../patches/readline-6.1-audit.patch          |   0
 .../patches/readline-6.2-shlib.patch          |   0
 {pkgs/readline => readline}/readline.nm       |   0
 {pkgs/readline => readline}/readline.sh       |   0
 .../patches/reiser4progs-1.0.7-bad_elif.patch |   0
 .../patches/reiser4progs-libaal.patch         |   0
 .../patches/reiser4progs-makefile.patch       |   0
 .../patches/reiser4progs-opt.patch            |   0
 .../reiser4progs.nm                           |   0
 .../reiserfsprogs.nm                          |   0
 {pkgs/rrdtool => rrdtool}/rrdtool.nm          |   0
 {pkgs/rstp => rstp}/bridge-stp                |   0
 .../patches/rstp-0.21-dump-commands.patch     |   0
 .../patches/rstp-0.21-upstream-fixes.patch    |   0
 {pkgs/rstp => rstp}/rstp.nm                   |   0
 {pkgs/rstp => rstp}/systemd/rstp.service      |   0
 .../patches/rsync-3.0.7-buf-overflow.patch    |   0
 {pkgs/rsync => rsync}/rsync.nm                |   0
 {pkgs/rsync => rsync}/rsync.xinetd            |   0
 .../patches/rsyslog-5.7.9-systemd.patch       |   0
 {pkgs/rsyslog => rsyslog}/rsyslog.conf        |   0
 {pkgs/rsyslog => rsyslog}/rsyslog.log         |   0
 {pkgs/rsyslog => rsyslog}/rsyslog.nm          |   0
 {pkgs/rsyslog => rsyslog}/rsyslog.sysconfig   |   0
 {pkgs/rtorrent => rtorrent}/rtorrent.nm       |   0
 {pkgs/samba => samba}/samba.nm                |   0
 .../patches/sane-1.0.20-lockdir.patch         |   0
 .../sane-1.0.21-epson-expression800.patch     |   0
 .../patches/sane-1.0.21-i18n.patch            |   0
 .../patches/sane-1.0.21-pkgconfig.patch       |   0
 .../patches/sane-1.0.21-udev.patch            |   0
 {pkgs/sane => sane}/sane.nm                   |   0
 .../patches/screen-4.0.1-args.patch           |   0
 .../patches/screen-4.0.2-maxstr.patch         |   0
 .../patches/screen-4.0.3-configh.patch        |   0
 .../patches/screen-4.0.3-ipv6.patch           |   0
 .../patches/screen-4.0.3-libs.patch           |   0
 .../patches/screen-4.0.3-screenrc.patch       |   0
 .../patches/screen-4.0.3-stropts.patch        |   0
 {pkgs/screen => screen}/screen.nm             |   0
 {pkgs/screen => screen}/screen.pam            |   0
 {pkgs/screen => screen}/screenrc              |   0
 {pkgs/sdl => sdl}/sdl.nm                      |   0
 {pkgs/sed => sed}/sed.nm                      |   0
 {pkgs/setup => setup}/Makefile                |   0
 {pkgs/setup => setup}/aliases                 |   0
 {pkgs/setup => setup}/bashrc                  |   0
 {pkgs/setup => setup}/exports                 |   0
 {pkgs/setup => setup}/filesystems             |   0
 {pkgs/setup => setup}/group                   |   0
 {pkgs/setup => setup}/host.conf               |   0
 {pkgs/setup => setup}/hosts                   |   0
 {pkgs/setup => setup}/hosts.allow             |   0
 {pkgs/setup => setup}/hosts.deny              |   0
 {pkgs/setup => setup}/inputrc                 |   0
 {pkgs/setup => setup}/motd                    |   0
 {pkgs/setup => setup}/passwd                  |   0
 {pkgs/setup => setup}/printcap                |   0
 {pkgs/setup => setup}/profile                 |   0
 {pkgs/setup => setup}/securetty               |   0
 {pkgs/setup => setup}/setup.nm                |   0
 {pkgs/setup => setup}/shadowconvert.sh        |   0
 {pkgs/setup => setup}/shells                  |   0
 {pkgs/setup => setup}/uidgid                  |   0
 {pkgs/setup => setup}/uidgidlint              |   0
 {pkgs/sg3-utils => sg3-utils}/sg3-utils.nm    |   0
 .../shadow-utils => shadow-utils}/login.defs  |   0
 .../patches/shadow-4.1.4.2-ipfire.patch       |   0
 .../patches/shadow-4.1.4.3-goodname.patch     |   0
 .../shadow-utils.nm                           |   0
 .../useradd.default                           |   0
 .../sip => sip}/patches/disable-rpaths.patch  |   0
 {pkgs/sip => sip}/patches/fix-linking.patch   |   0
 {pkgs/sip => sip}/patches/no-strip.patch      |   0
 {pkgs/sip => sip}/sip.nm                      |   0
 .../patches/slang-2.1.4-makefile.patch        |   0
 {pkgs/slang => slang}/slang.nm                |   0
 .../smartmontools.nm                          |   0
 .../patches/sqlite-3.6.12-libdl.patch         |   0
 {pkgs/sqlite => sqlite}/sqlite.nm             |   0
 .../patches/squashfs-cflags.patch             |   0
 .../patches/squashfs-xz.patch                 |   0
 .../squashfs-tools.nm                         |   0
 .../patches/squid-3.0.STABLE1-perlpath.patch  |   0
 .../squid-3.0.STABLE7-from_manpg.patch        |   0
 .../patches/squid-3.1.0.9-config.patch        |   0
 .../patches/squid-3.1.0.9-location.patch      |   0
 {pkgs/squid => squid}/squid.nm                |   0
 {pkgs/squidGuard => squidGuard}/squidGuard.nm |   0
 .../strace-4.5.19-fix-kernel-headers.patch    |   0
 {pkgs/strace => strace}/strace.nm             |   0
 {pkgs/strongswan => strongswan}/strongswan.nm |   0
 {pkgs/sudo => sudo}/sudo.nm                   |   0
 {pkgs/sudo => sudo}/sudo.pam                  |   0
 {pkgs/sudo => sudo}/sudoers                   |   0
 .../suricata => suricata}/suricata.logrotate  |   0
 {pkgs/suricata => suricata}/suricata.nm       |   0
 .../patches/swig-1.3.23-pylib.patch           |   0
 .../patches/swig200-rh623854.patch            |   0
 {pkgs/swig => swig}/swig.nm                   |   0
 {pkgs/sysfsutils => sysfsutils}/sysfsutils.nm |   0
 {pkgs/syslinux => syslinux}/syslinux.nm       |   0
 .../system-release.nm                         |   0
 {pkgs/systemd => systemd}/locale.conf         |   0
 .../patches/systemd-33-no_manpages.patch      |   0
 {pkgs/systemd => systemd}/systemd.nm          |   0
 {pkgs/systemd => systemd}/vconsole.conf       |   0
 .../sysvinit-2.86-remove-utils-1.patch        |   0
 {pkgs/sysvinit => sysvinit}/sysvinit.nm       |   0
 .../patches/tar-1.14-loneZeroWarning.patch    |   0
 .../patches/tar-1.15.1-vfatTruncate.patch     |   0
 .../patches/tar-1.17-wildcards.patch          |   0
 .../patches/tar-1.22-atime-rofs.patch         |   0
 .../patches/tar-1.23-oldarchive.patch         |   0
 .../tar => tar}/patches/tar-1.24-xattrs.patch |   0
 {pkgs/tar => tar}/patches/tar-sigpipe.patch   |   0
 {pkgs/tar => tar}/tar.nm                      |   0
 .../patches/tcl-8.5.8-autopath.patch          |   0
 .../tcl => tcl}/patches/tcl-8.5.8-conf.patch  |   0
 {pkgs/tcl => tcl}/tcl.nm                      |   0
 {pkgs/tcpdump => tcpdump}/tcpdump.nm          |   0
 .../patches/netkit-telnet-0.17-ipv6.diff      |   0
 .../patches/netkit-telnet-0.17-nodns.patch    |   0
 .../netkit-telnet-0.17-reallynodns.patch      |   0
 .../patches/telnet-0.17-8bit.patch            |   0
 .../telnet-0.17-CAN-2005-468_469.patch        |   0
 .../patches/telnet-0.17-argv.patch            |   0
 .../patches/telnet-0.17-cleanup_race.patch    |   0
 .../patches/telnet-0.17-conf.patch            |   0
 .../patches/telnet-0.17-env.patch             |   0
 .../telnet-0.17-errno_test_sys_bsd.patch      |   0
 .../patches/telnet-0.17-issue.patch           |   0
 .../patches/telnet-0.17-pek.patch0            |   0
 .../patches/telnet-0.17-sa-01-49.patch        |   0
 .../patches/telnet-client-cvs.patch0          |   0
 .../patches/telnet-gethostbyname.patch        |   0
 .../patches/telnetd-0.17-pty_read.patch0      |   0
 .../patches/telnetd-0.17.patch0               |   0
 {pkgs/telnet => telnet}/telnet.nm             |   0
 .../patches/texinfo-4.12-zlib.patch           |   0
 .../patches/texinfo-4.13a-data_types.patch    |   0
 .../texinfo-4.13a-help-index-segfault.patch   |   0
 .../texinfo-4.13a-makeinfo-sectioning.patch   |   0
 .../patches/texinfo-4.13a-mosdo-crash.patch   |   0
 .../patches/texinfo-4.13a-powerpc.patch       |   0
 .../patches/texinfo-4.13a-testsuite_fix.patch |   0
 .../texinfo-4.13a-texi2dvi-regexp.patch       |   0
 {pkgs/texinfo => texinfo}/texinfo.nm          |   0
 {pkgs/tinc => tinc}/tinc.nm                   |   0
 {pkgs/traceroute => traceroute}/traceroute.nm |   0
 .../transmission.nm                           |   0
 {pkgs/tunctl => tunctl}/tunctl.nm             |   0
 {pkgs/udev => udev}/console_init              |   0
 {pkgs/udev => udev}/rules/10-console.rules    |   0
 {pkgs/udev => udev}/udev.nm                   |   0
 {pkgs/udisks => udisks}/udisks.nm             |   0
 {pkgs/ulogd2 => ulogd2}/sqlite3.table         |   0
 {pkgs/ulogd2 => ulogd2}/systemd/ulogd.service |   0
 {pkgs/ulogd2 => ulogd2}/ulogd.conf            |   0
 {pkgs/ulogd2 => ulogd2}/ulogd.logrotate       |   0
 {pkgs/ulogd2 => ulogd2}/ulogd2.nm             |   0
 .../patches/unzip-6.0-attribs-overflow.patch  |   0
 .../patches/unzip-6.0-bzip2-configure.patch   |   0
 .../patches/unzip-6.0-close.patch             |   0
 .../patches/unzip-6.0-exec-shield.patch       |   0
 .../patches/unzip-6.0-nostrip.patch           |   0
 {pkgs/unzip => unzip}/unzip.nm                |   0
 {pkgs/upower => upower}/upower.nm             |   0
 .../usb-modeswitch.nm                         |   0
 {pkgs/usbutils => usbutils}/usbutils.nm       |   0
 {pkgs/ustr => ustr}/ustr.nm                   |   0
 {pkgs/util-linux => util-linux}/nologin.8     |   0
 {pkgs/util-linux => util-linux}/nologin.c     |   0
 {pkgs/util-linux => util-linux}/pam.d/login   |   0
 {pkgs/util-linux => util-linux}/util-linux.nm |   0
 {pkgs/vala => vala}/vala.nm                   |   0
 {pkgs/vim => vim}/patches/vim-7.3.001.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.002.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.003.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.004.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.005.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.006.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.007.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.008.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.009.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.010.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.011.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.012.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.013.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.014.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.015.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.016.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.017.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.018.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.019.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.020.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.021.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.022.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.023.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.024.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.025.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.026.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.027.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.028.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.029.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.030.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.031.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.032.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.033.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.034.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.035.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.036.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.037.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.038.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.039.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.040.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.041.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.042.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.043.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.044.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.045.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.046.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.047.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.048.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.049.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.050.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.051.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.052.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.053.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.054.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.055.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.056.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.057.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.058.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.059.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.060.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.061.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.062.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.063.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.064.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.065.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.066.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.067.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.068.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.069.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.070.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.071.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.072.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.073.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.074.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.075.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.076.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.077.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.078.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.079.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.080.patch0  |   0
 {pkgs/vim => vim}/patches/vim-7.3.081.patch0  |   0
 {pkgs/vim => vim}/vim.nm                      |   0
 {pkgs/vim => vim}/vimrc                       |   0
 {pkgs/vlan => vlan}/vlan.nm                   |   0
 .../patches/1-vsftpd-build_ssl.patch          |   0
 .../patches/2-vsftpd-libs-3.patch             |   0
 .../patches/3-vsftpd-pam_hostname-1.patch     |   0
 .../patches/4-vsftpd-close-std-fds.patch      |   0
 .../patches/5-vsftpd-configuration-1.patch    |   0
 .../patches/vsftpd-2.2.0-openssl.patch        |   0
 .../vsftpd => vsftpd}/systemd/vsftpd.service  |   0
 {pkgs/vsftpd => vsftpd}/vsftpd.conf           |   0
 {pkgs/vsftpd => vsftpd}/vsftpd.nm             |   0
 {pkgs/vsftpd => vsftpd}/vsftpd.pam            |   0
 {pkgs/vsftpd => vsftpd}/vsftpd.user_list      |   0
 {pkgs/wavemon => wavemon}/wavemon.nm          |   0
 {pkgs/wget => wget}/wget.nm                   |   0
 {pkgs/which => which}/which.nm                |   0
 .../wireless-regdb.nm                         |   0
 .../patches/wireless_tools.29-makefile.patch  |   0
 .../wireless-tools.nm                         |   0
 .../wpa_supplicant.conf                       |   0
 .../wpa_supplicant.config                     |   0
 .../wpa_supplicant.logrotate                  |   0
 .../wpa_supplicant.nm                         |   0
 {pkgs/xcb-proto => xcb-proto}/xcb-proto.nm    |   0
 {pkgs/xcb-util => xcb-util}/xcb-util.nm       |   0
 {pkgs/xen => xen}/patches/00-xen-detect.patch |   0
 {pkgs/xen => xen}/patches/xen-gcc-4.6.0.patch |   0
 {pkgs/xen => xen}/xen.nm                      |   0
 {pkgs/xfsprogs => xfsprogs}/xfsprogs.nm       |   0
 .../xkeyboard-config.nm                       |   0
 .../xorg-x11-drv-ati.nm                       |   0
 .../xorg-x11-drv-evdev.nm                     |   0
 .../intel.xinf                                |   0
 .../intel-2.10.0-add-mbp-backlight.patch      |   0
 .../patches/intel-2.11-lvds-first.patch       |   0
 .../patches/intel-2.11-no-pageflipping.patch  |   0
 .../patches/intel-2.11.0-vga-clock-max.patch  |   0
 .../intel-2.12-fix-uxa-planemask.patch        |   0
 .../patches/intel-2.8.0-kms-get-crtc.patch    |   0
 .../patches/kill-svideo.patch                 |   0
 .../patches/uevent.patch                      |   0
 .../xorg-x11-drv-intel.nm                     |   0
 .../xorg-x11-drv-keyboard.nm                  |   0
 .../xorg-x11-drv-mouse.nm                     |   0
 .../patches/nv-2.1.6-panel-fix.patch          |   0
 .../patches/nv-2.1.6-starvation.patch         |   0
 .../patches/nv-2.1.8-g80-no-doublescan.patch  |   0
 .../patches/nv-reserve-fbarea.patch           |   0
 .../patches/nv-save-rom.patch                 |   0
 .../xorg-x11-drv-nv.nm                        |   0
 .../50-synaptics.conf                         |   0
 .../70-touchpad-quirks.rules                  |   0
 .../xorg-x11-drv-synaptics.nm                 |   0
 .../xorg-x11-drv-vesa.nm                      |   0
 .../xorg-x11-drv-vmware.nm                    |   0
 .../xorg-x11-font-utils.nm                    |   0
 .../xorg-x11-fonts.nm                         |   0
 .../xorg-x11-proto-devel.nm                   |   0
 .../10-quirks.conf                            |   0
 .../xserver-1.4.99-pic-libxf86config.patch    |   0
 .../xserver-1.4.99-ssh-isnt-local.patch       |   0
 .../patches/xserver-1.5.0-bg-none-root.patch  |   0
 .../xserver-1.5.0-projector-fb-size.patch     |   0
 .../patches/xserver-1.5.1-mode-debug.patch    |   0
 .../xserver-1.6.0-less-acpi-brokenness.patch  |   0
 .../xserver-1.6.99-default-modes.patch        |   0
 ...xserver-1.6.99-randr-error-debugging.patch |   0
 .../patches/xserver-1.6.99-right-of.patch     |   0
 .../xserver-1.7.0-randr-gamma-restore.patch   |   0
 .../patches/xserver-1.7.1-gamma-kdm-fix.patch |   0
 .../patches/xserver-1.7.1-multilib.patch      |   0
 .../xserver-1.8-disable-vboxvideo.patch       |   0
 .../xserver-1.8-no-connected-outputs.patch    |   0
 .../patches/xserver-1.8-randr-initial.patch   |   0
 .../patches/xserver-1.8-udev-warning.patch    |   0
 ...server-1.8.2-XTEST-PointerKeys-fixes.patch |   0
 .../xorg-x11-server.nm                        |   0
 .../xorg-x11-util-macros.nm                   |   0
 .../xorg-x11-xinit.nm                         |   0
 .../xorg-x11-xkb-utils.nm                     |   0
 .../xtrans-1.0.3-avoid-gethostname.patch      |   0
 .../xorg-x11-xtrans-devel.nm                  |   0
 {pkgs/xrandr => xrandr}/xrandr.nm             |   0
 .../patches/xterm-245-resources.patch         |   0
 .../patches/xterm-256-man-page_paths.patch    |   0
 .../patches/xterm-261-desk.patch              |   0
 {pkgs/xterm => xterm}/xterm.nm                |   0
 {pkgs/xz => xz}/xz.nm                         |   0
 {pkgs/zerofree => zerofree}/zerofree.nm       |   0
 {pkgs/zlib => zlib}/zlib.nm                   |   0
 1330 files changed, 25 deletions(-)
 rename {doc => Documentation}/COPYING (100%)
 rename {pkgs/X11vnc => X11vnc}/X11vnc.nm (100%)
 rename {pkgs/X11vnc => X11vnc}/patches/x11vnc-0.9.8-XShm-explicit-include.patch (100%)
 rename {pkgs/X11vnc => X11vnc}/patches/x11vnc-0.9.8-disableRpath.patch (100%)
 rename {pkgs/acl => acl}/acl.nm (100%)
 rename {pkgs/acl => acl}/patches/acl-2.2.47-build-1.patch (100%)
 rename {pkgs/acl => acl}/patches/acl-2.2.47-exitcode.patch (100%)
 rename {pkgs/acl => acl}/patches/acl-2.2.47-nfs4.patch (100%)
 rename {pkgs/acl => acl}/patches/acl-2.2.47-params.patch (100%)
 rename {pkgs/acl => acl}/patches/acl-2.2.47-path_max.patch (100%)
 rename {pkgs/acl => acl}/patches/acl-2.2.47-segfault.patch (100%)
 rename {pkgs/acl => acl}/patches/acl-2.2.47-walk.patch.broken (100%)
 rename {pkgs/acpid => acpid}/acpid.nm (100%)
 rename {pkgs/acpid => acpid}/acpid.sysconfig (100%)
 rename {pkgs/acpid => acpid}/patches/acpid-2.0.2-makefile.patch (100%)
 rename {pkgs/acpid => acpid}/power (100%)
 rename {pkgs/acpid => acpid}/power.sh (100%)
 rename {pkgs/acpid => acpid}/systemd/acpid.service (100%)
 rename {pkgs/aiccu => aiccu}/aiccu.nm (100%)
 rename {pkgs/attr => attr}/attr.nm (100%)
 rename {pkgs/audit => audit}/audit.nm (100%)
 rename {pkgs/authconfig => authconfig}/authconfig.nm (100%)
 rename {pkgs/autoconf => autoconf}/autoconf.nm (100%)
 rename {pkgs/autogen => autogen}/autogen.nm (100%)
 rename {pkgs/autogen => autogen}/patches/autogen-5.9.4-autoopts-config.patch (100%)
 rename {pkgs/autogen => autogen}/patches/autogen-5.9.4-pkgconfig.patch (100%)
 rename {pkgs/automake => automake}/automake.nm (100%)
 rename {pkgs/avahi => avahi}/avahi.nm (100%)
 rename {pkgs/basesystem => basesystem}/basesystem.nm (100%)
 rename {pkgs/basesystem => basesystem}/resolv.conf (100%)
 rename {pkgs/bash => bash}/bash.nm (100%)
 rename {pkgs/bash => bash}/dot_bash_logout (100%)
 rename {pkgs/bash => bash}/dot_bash_profile (100%)
 rename {pkgs/bash => bash}/dot_bashrc (100%)
 rename {pkgs/bash => bash}/patches/bash-4.0-paths-1.patch (100%)
 rename {pkgs/bash => bash}/patches/bash-4.0-profile-1.patch (100%)
 rename {pkgs/bash => bash}/profile.d/i18n.sh (100%)
 rename {pkgs/bash => bash}/profile.d/lang.sh (100%)
 rename {pkgs/bc => bc}/bc.nm (100%)
 rename {pkgs/beep => beep}/beep.nm (100%)
 rename {pkgs/bind => bind}/bind.nm (100%)
 rename {pkgs/binutils => binutils}/binutils.nm (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.19.1-asprintf_fix.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.19.1-ld_makefile.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20-objcopy.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.1-gentoo-use-relro.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.1-gentoo-warn-textrel.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.51.0.2-build-id.patch0 (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.51.0.2-pt-pax-flags-20091010.patch (100%)
 rename {pkgs/binutils => binutils}/patches/binutils-2.20.51.0.2-version.patch (100%)
 rename {pkgs/bird => bird}/bird.nm (100%)
 rename {pkgs/bird => bird}/systemd/bird.service (100%)
 rename {pkgs/bird => bird}/systemd/bird6.service (100%)
 rename {pkgs/bison => bison}/bison.nm (100%)
 rename {pkgs/boost => boost}/boost.nm (100%)
 rename {pkgs/boost => boost}/patches/boost-1.41.0-iostreams-zlib.patch (100%)
 rename {pkgs/boost => boost}/patches/boost-1.41.0-mapnik.patch (100%)
 rename {pkgs/boost => boost}/patches/boost-1.41.0-shared_ptr_serialization.patch (100%)
 rename {pkgs/boost => boost}/patches/boost-graph-compile.patch (100%)
 rename {pkgs/br2684ctl => br2684ctl}/br2684ctl.nm (100%)
 rename {pkgs/bridge-utils => bridge-utils}/bridge-utils.nm (100%)
 rename {pkgs/btrfs-progs => btrfs-progs}/btrfs-progs.nm (100%)
 rename {pkgs/btrfs-progs => btrfs-progs}/patches/btrfs-progs-build-everything.patch (100%)
 rename {pkgs/btrfs-progs => btrfs-progs}/patches/btrfs-progs-build-fixes.patch (100%)
 rename {pkgs/btrfs-progs => btrfs-progs}/patches/btrfs-progs-fix-labels.patch (100%)
 rename {pkgs/btrfs-progs => btrfs-progs}/patches/btrfs-progs-upstream.patch (100%)
 rename {pkgs/btrfs-progs => btrfs-progs}/patches/btrfs-progs-valgrind.patch (100%)
 rename {pkgs/bwm-ng => bwm-ng}/bwm-ng.nm (100%)
 rename {pkgs/bzip2 => bzip2}/bzip2.nm (100%)
 rename {pkgs/bzip2 => bzip2}/patches/bzip2-1.0.5-install_docs-1.patch (100%)
 rename {pkgs/c_icap => c_icap}/c_icap.nm (100%)
 rename {pkgs/c_icap_modules => c_icap_modules}/c_icap_modules.nm (100%)
 rename {pkgs/cairo => cairo}/cairo.nm (100%)
 rename {pkgs/ccache => ccache}/ccache.nm (100%)
 rename {pkgs/ccache => ccache}/ccache.sh (100%)
 rename {pkgs/chrony => chrony}/chrony-helper (100%)
 rename {pkgs/chrony => chrony}/chrony.conf (100%)
 rename {pkgs/chrony => chrony}/chrony.dhclient (100%)
 rename {pkgs/chrony => chrony}/chrony.keys (100%)
 rename {pkgs/chrony => chrony}/chrony.logrotate (100%)
 rename {pkgs/chrony => chrony}/chrony.nm (100%)
 rename {pkgs/chrony => chrony}/systemd/chrony-wait.service (100%)
 rename {pkgs/chrony => chrony}/systemd/chronyd.service (100%)
 rename {pkgs/chrpath => chrpath}/chrpath.nm (100%)
 rename {pkgs/chrpath => chrpath}/patches/chrpath-0.13-NULL-entry.patch (100%)
 rename {pkgs/clamav => clamav}/clamav.nm (100%)
 rename {pkgs/cloog-ppl => cloog-ppl}/cloog-ppl.nm (100%)
 rename {pkgs/cmake => cmake}/cmake.nm (100%)
 delete mode 120000 config/default.conf
 delete mode 100644 config/ipfire-3-i686.conf
 delete mode 100644 config/pakfire.conf
 rename {pkgs/coreutils => coreutils}/coreutils.nm (100%)
 rename {pkgs/coreutils => coreutils}/pam.d/su (100%)
 rename {pkgs/coreutils => coreutils}/pam.d/su-l (100%)
 rename {pkgs/coreutils => coreutils}/patches/coreutils-7.6-uname_PIC-1.patch.off (100%)
 rename {pkgs/coreutils => coreutils}/patches/coreutils-8.5-pam.patch (100%)
 rename {pkgs/coreutils => coreutils}/patches/coreutils-i18n.patch (100%)
 rename {pkgs/coreutils => coreutils}/patches/coreutils-selinux.patch (100%)
 rename {pkgs/coreutils => coreutils}/patches/coreutils-selinuxmanpages.patch (100%)
 rename {pkgs/coreutils => coreutils}/profile.d/colorls.sh (100%)
 rename {pkgs/cpio => cpio}/cpio.nm (100%)
 rename {pkgs/cpufrequtils => cpufrequtils}/cpufrequtils.nm (100%)
 rename {pkgs/cpufrequtils => cpufrequtils}/patches/cpufrequtils-008-aperf-32bit.patch (100%)
 rename {pkgs/cpufrequtils => cpufrequtils}/patches/cpufrequtils-008-no-aperf-on-ppc.patch (100%)
 rename {pkgs/cpufrequtils => cpufrequtils}/patches/cpufrequtils-multilib.patch (100%)
 rename {pkgs/cpufrequtils => cpufrequtils}/patches/disable-gsic.patch (100%)
 rename {pkgs/cracklib => cracklib}/cracklib.nm (100%)
 rename {pkgs/crda => crda}/crda.nm (100%)
 rename {pkgs/cronie => cronie}/cronie.nm (100%)
 rename {pkgs/cryptsetup-luks => cryptsetup-luks}/cryptsetup-luks.nm (100%)
 rename {pkgs/cups => cups}/cups.logrotate (100%)
 rename {pkgs/cups => cups}/cups.nm (100%)
 rename {pkgs/cups => cups}/patches/cups-0755.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-1.1.16-system-auth.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-EAI_AGAIN.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-autotype-crash.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-avahi.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-banners.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-build.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-cups-get-classes.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-direct-usb.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-dnssd-deviceid.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-driverd-timeout.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-eggcups.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-filter-debug.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-force-gnutls.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-getpass.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-hostnamelookups.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-hp-deviceid-oid.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-logrotate.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-lpr-help.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-multilib.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-no-export-ssllibs.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-no-gzip-man.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-page-label.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-peercred.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-pid.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-res_init.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-ricoh-deviceid-oid.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-serial.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-serialize-gnutls.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-serverbin-compat.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-snmp-quirks.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-str3382.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-str3754.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-strict-ppd-line-length.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-texttops-rotate-page.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-uri-compat.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-usb-paperout.patch (100%)
 rename {pkgs/cups => cups}/patches/cups-x-lspp.patch (100%)
 rename {pkgs/cups => cups}/systemd/cups.service (100%)
 rename {pkgs/curl => curl}/curl.nm (100%)
 rename {pkgs/curl => curl}/patches/0101-curl-7.21.1-multilib.patch (100%)
 rename {pkgs/cyrus-sasl => cyrus-sasl}/cyrus-sasl.nm (100%)
 rename {pkgs/cyrus-sasl => cyrus-sasl}/patches/cyrus-sasl-2.1.23-bad-elif.patch (100%)
 rename {pkgs/cyrus-sasl => cyrus-sasl}/smtpd.conf (100%)
 rename {pkgs/dansguardian => dansguardian}/dansguardian.nm (100%)
 rename {pkgs/dansguardian => dansguardian}/patches/dansguardian-gcc44.patch (100%)
 rename {pkgs/db4 => db4}/db4.nm (100%)
 rename {pkgs/db4 => db4}/patches/db-4.7.25-upstream_fixes-1.patch (100%)
 rename {pkgs/dbus-glib => dbus-glib}/dbus-glib.nm (100%)
 rename {pkgs/dbus => dbus}/dbus.nm (100%)
 rename {pkgs/dejagnu => dejagnu}/dejagnu.nm (100%)
 rename {pkgs/dejagnu => dejagnu}/patches/dejagnu-1.4.4-runtest.patch (100%)
 rename {pkgs/dejagnu => dejagnu}/patches/dejagnu-1.4.4-smp-1.patch (100%)
 rename {pkgs/dejagnu => dejagnu}/patches/dejagnu-1.4.4-testsuite.patch (100%)
 rename {pkgs/dejagnu => dejagnu}/patches/dejagnu-1.4.4-utils-speedup.patch (100%)
 rename {pkgs/dhcp => dhcp}/dhclient-script (100%)
 rename {pkgs/dhcp => dhcp}/dhcp.nm (100%)
 rename {pkgs/dhcping => dhcping}/dhcping.nm (100%)
 rename {pkgs/diffutils => diffutils}/diffutils.nm (100%)
 rename {pkgs/diffutils => diffutils}/patches/diffutils-2.8.1-hardened_tmp-1.patch (100%)
 rename {pkgs/diffutils => diffutils}/patches/diffutils-2.9-i18n-1.patch (100%)
 rename {pkgs/directfb => directfb}/directfb.nm (100%)
 rename {pkgs/dmidecode => dmidecode}/dmidecode.nm (100%)
 rename {pkgs/dmidecode => dmidecode}/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch (100%)
 rename {pkgs/dmidecode => dmidecode}/patches/dmidecode-2.10-add-socket-lga1366.patch (100%)
 rename {pkgs/dmidecode => dmidecode}/patches/dmidecode-2.10-recognize-more-memory.patch (100%)
 rename {pkgs/dmidecode => dmidecode}/patches/dmidecode-2.10-smbios-updates.patch (100%)
 rename {pkgs/dmidecode => dmidecode}/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch (100%)
 rename {pkgs/dmraid => dmraid}/dmraid.nm (100%)
 rename {pkgs/dos2unix => dos2unix}/dos2unix.nm (100%)
 rename {pkgs/dosfstools => dosfstools}/dosfstools.nm (100%)
 rename {pkgs/dracut => dracut}/dracut.nm (100%)
 rename {pkgs/dracut => dracut}/ipfire.conf (100%)
 rename {pkgs/dvdrtools => dvdrtools}/dvdrtools.nm (100%)
 rename {pkgs/e2fsprogs => e2fsprogs}/e2fsprogs.nm (100%)
 rename {pkgs/ebtables => ebtables}/ebtables.nm (100%)
 rename {pkgs/ebtables => ebtables}/patches/ebtables-2.0.8-cflags.patch (100%)
 rename {pkgs/ebtables => ebtables}/patches/ebtables-2.0.8-norootinst.patch (100%)
 rename {pkgs/ebtables => ebtables}/patches/ebtables-2.0.9-lsb.patch (100%)
 rename {pkgs/ed => ed}/ed.nm (100%)
 rename {pkgs/eggdbus => eggdbus}/eggdbus.nm (100%)
 rename {pkgs/eject => eject}/eject.nm (100%)
 rename {pkgs/eject => eject}/patches/eject-2.1.1-verbose.patch (100%)
 rename {pkgs/eject => eject}/patches/eject-2.1.5-lock.patch (100%)
 rename {pkgs/eject => eject}/patches/eject-2.1.5-opendevice.patch (100%)
 rename {pkgs/eject => eject}/patches/eject-2.1.5-spaces.patch (100%)
 rename {pkgs/eject => eject}/patches/eject-2.1.5-umount.patch (100%)
 rename {pkgs/eject => eject}/patches/eject-timeout.patch (100%)
 rename {pkgs/elfutils => elfutils}/elfutils.nm (100%)
 rename {pkgs/elfutils => elfutils}/patches/elfutils-portability.patch (100%)
 rename {pkgs/elfutils => elfutils}/patches/elfutils-robustify.patch (100%)
 rename {pkgs/elinks => elinks}/elinks.nm (100%)
 rename {pkgs/etherwake => etherwake}/etherwake.nm (100%)
 rename {pkgs/etherwake => etherwake}/patches/etherwake-1.09-install.patch (100%)
 rename {pkgs/ethtool => ethtool}/ethtool.nm (100%)
 rename {pkgs/expat => expat}/expat.nm (100%)
 rename {pkgs/expect => expect}/expect.nm (100%)
 rename {pkgs/expect => expect}/patches/expect-5.32.2-random.patch (100%)
 rename {pkgs/expect => expect}/patches/expect-5.38.0-lib-spec.patch (100%)
 rename {pkgs/expect => expect}/patches/expect-5.39.0-libdir.patch (100%)
 rename {pkgs/expect => expect}/patches/expect-5.43.0-override_default_prefix.patch (100%)
 rename {pkgs/expect => expect}/patches/expect-5.43.0-spawn-1.patch (100%)
 rename {pkgs/expect => expect}/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch (100%)
 rename {pkgs/ez-ipupdate => ez-ipupdate}/ez-ipupdate.nm (100%)
 rename {pkgs/ez-ipupdate => ez-ipupdate}/patches/ez-ipupdate-3.0.11b8-10.patch (100%)
 rename {pkgs/ez-ipupdate => ez-ipupdate}/patches/ez-ipupdate-3.0.11b8-pidfile.patch (100%)
 rename {pkgs/fail2ban => fail2ban}/fail2ban.logrotate (100%)
 rename {pkgs/fail2ban => fail2ban}/fail2ban.nm (100%)
 rename {pkgs/fail2ban => fail2ban}/patches/fail2ban-0.8.1-sshd.patch (100%)
 rename {pkgs/fail2ban => fail2ban}/patches/fail2ban-0.8.2-fd_cloexec.patch (100%)
 rename {pkgs/fail2ban => fail2ban}/patches/fail2ban-0.8.3-init.patch (100%)
 rename {pkgs/fail2ban => fail2ban}/patches/fail2ban-0.8.3-log2syslog.patch (100%)
 rename {pkgs/file => file}/file.nm (100%)
 rename {pkgs/filesystem => filesystem}/filesystem.nm (100%)
 rename {pkgs/findutils => findutils}/findutils.nm (100%)
 rename {pkgs/firewall => firewall}/firewall.nm (100%)
 rename {pkgs/firewall => firewall}/src/firewall (100%)
 rename {pkgs/firewall => firewall}/src/functions (100%)
 rename {pkgs/firewall => firewall}/src/functions.commands (100%)
 rename {pkgs/firewall => firewall}/src/functions.config (100%)
 rename {pkgs/firewall => firewall}/src/functions.firewall (100%)
 rename {pkgs/firewall => firewall}/src/functions.ip (100%)
 rename {pkgs/firewall => firewall}/src/functions.iptables (100%)
 rename {pkgs/firewall => firewall}/src/functions.macros (100%)
 rename {pkgs/firewall => firewall}/src/functions.zones (100%)
 rename {pkgs/firewall => firewall}/src/macros/DHCP (100%)
 rename {pkgs/firewall => firewall}/src/macros/HTTP (100%)
 rename {pkgs/firewall => firewall}/src/macros/HTTPS (100%)
 rename {pkgs/firewall => firewall}/src/macros/WWW (100%)
 rename {pkgs/firewall => firewall}/src/zones.green (100%)
 rename {pkgs/firewall => firewall}/src/zones.orange (100%)
 rename {pkgs/firewall => firewall}/src/zones.red (100%)
 rename {pkgs/firewall => firewall}/systemd/firewall.service (100%)
 rename {pkgs/flex => flex}/flex.nm (100%)
 rename {pkgs/flex => flex}/patches/flex-2.5.35-gcc44-1.patch (100%)
 rename {pkgs/fontconfig => fontconfig}/fontconfig.nm (100%)
 rename {pkgs/freeradius => freeradius}/freeradius.nm (100%)
 rename {pkgs/freeradius => freeradius}/freeradius.pam (100%)
 rename {pkgs/freeradius => freeradius}/freeradius.tmpfiles (100%)
 rename {pkgs/freeradius => freeradius}/logrotate/freeradius (100%)
 rename {pkgs/freeradius => freeradius}/patches/freeradius-2.1.6-cert-config.patch (100%)
 rename {pkgs/freeradius => freeradius}/systemd/freeradius.service (100%)
 rename {pkgs/freetype => freetype}/freetype.nm (100%)
 rename {pkgs/fuse-sshfs => fuse-sshfs}/fuse-sshfs.nm (100%)
 rename {pkgs/fuse => fuse}/fuse.nm (100%)
 rename {pkgs/fuse => fuse}/patches/fuse-2.7.4-openfix.patch (100%)
 rename {pkgs/fuse => fuse}/patches/fuse-2.7.4-udev_rules.patch (100%)
 rename {pkgs/gawk => gawk}/gawk.nm (100%)
 rename {pkgs/gcc => gcc}/gcc.nm (100%)
 rename {pkgs/gcc => gcc}/patches/gcc-4.6.0-piepatches-20110407.patch (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-Woverlength-string-asm.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-Woverlength-string.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-c++-builtin-redecl.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-cloog-dl.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-hack.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-libgomp-omp_h-multilib.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-libtool-no-rpath.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-no-add-needed.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-ppl-0.10.patch (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-pr33763.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-pr38757.patch0 (100%)
 rename {pkgs/gcc => gcc}/patches/gcc46-unwind-debughook-sdt.patch0 (100%)
 rename {pkgs/gdb => gdb}/gdb.nm (100%)
 rename {pkgs/gdbm => gdbm}/gdbm.nm (100%)
 rename {pkgs/gettext => gettext}/gettext.nm (100%)
 rename {pkgs/ghostscript => ghostscript}/ghostscript.nm (100%)
 rename {pkgs/git => git}/git.nm (100%)
 rename {pkgs/glib2 => glib2}/glib2-locale.sh (100%)
 rename {pkgs/glib2 => glib2}/glib2.nm (100%)
 rename {pkgs/glibc => glibc}/glibc-stack_chk_fail.c (100%)
 rename {pkgs/glibc => glibc}/glibc.nm (100%)
 rename {pkgs/glibc => glibc}/ld.so.conf (100%)
 rename {pkgs/glibc => glibc}/nsswitch.conf (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-arc4random.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-asprintf_reset2null-1.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-hardened-configure-picdefault.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-localedef_trampoline-1.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-pt_pax-1.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-sanitize_env.patch.off (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.10.1-strlcpy_strlcat-1.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.11.1-mktemp_urandom.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.11.1-owl-alt-res_randomid.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-2.12-hardened-pie.patch (100%)
 rename {pkgs/glibc => glibc}/patches/glibc-fedora.patch (100%)
 rename {pkgs/gmp => gmp}/gmp.nm (100%)
 rename {pkgs/gnupg2 => gnupg2}/gnupg2.nm (100%)
 rename {pkgs/gnutls => gnutls}/gnutls.nm (100%)
 rename {pkgs/gobject-introspection => gobject-introspection}/gobject-introspection.nm (100%)
 rename {pkgs/gperf => gperf}/gperf.nm (100%)
 rename {pkgs/grep => grep}/grep.nm (100%)
 rename {pkgs/groff => groff}/groff.nm (100%)
 rename {pkgs/groff => groff}/patches/groff-1.18.1.4-debian_fixes-1.patch (100%)
 rename {pkgs/grub => grub}/05_theme (100%)
 rename {pkgs/grub => grub}/grub.default (100%)
 rename {pkgs/grub => grub}/grub.nm (100%)
 rename {pkgs/grub => grub}/patches/grub-1.97.1-initramfs.patch (100%)
 rename {pkgs/grub => grub}/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 (100%)
 rename {pkgs/grub => grub}/splash.png (100%)
 rename {pkgs/gssdp => gssdp}/gssdp.nm (100%)
 rename {pkgs/gssdp => gssdp}/patches/gssdp-fixdso.patch (100%)
 rename {pkgs/guile => guile}/guile.nm (100%)
 rename {pkgs/guile => guile}/patches/guile-1.8.7-linemarkers.patch (100%)
 rename {pkgs/guile => guile}/patches/guile-1.8.7-testsuite.patch (100%)
 rename {pkgs/gupnp-av => gupnp-av}/gupnp-av.nm (100%)
 rename {pkgs/gupnp-igd => gupnp-igd}/gupnp-igd.nm (100%)
 rename {pkgs/gupnp => gupnp}/gupnp.nm (100%)
 rename {pkgs/gzip => gzip}/gzip.nm (100%)
 rename {pkgs/gzip => gzip}/patches/gzip-1.3.13-cve-2006-4337_len.patch (100%)
 rename {pkgs/gzip => gzip}/patches/gzip-1.3.13-cve-2006-4338.patch (100%)
 rename {pkgs/gzip => gzip}/patches/gzip-1.3.13-openbsd-owl-tmp.patch (100%)
 rename {pkgs/hdparm => hdparm}/hdparm.nm (100%)
 rename {pkgs/help2man => help2man}/help2man.nm (100%)
 rename {pkgs/hostapd => hostapd}/config (100%)
 rename {pkgs/hostapd => hostapd}/hostapd.nm (100%)
 rename {pkgs/hostapd => hostapd}/systemd/hostapd@.service (100%)
 rename {pkgs/hplip => hplip}/hplip.nm (100%)
 rename {pkgs/hplip => hplip}/patches/hplip-3.10.5-udev-rules.patch (100%)
 rename {pkgs/htop => htop}/htop.nm (100%)
 rename {pkgs/hwdata => hwdata}/hwdata.nm (100%)
 rename {pkgs/iana-etc => iana-etc}/iana-etc.nm (100%)
 rename {pkgs/icecream => icecream}/icecream.nm (100%)
 rename {pkgs/icecream => icecream}/icecream.sh (100%)
 rename {pkgs/icecream => icecream}/patches/icecream-cleanup-conffile.patch0 (100%)
 rename {pkgs/icecream => icecream}/patches/icecream-rename-scheduler.patch (100%)
 rename {pkgs/iftop => iftop}/iftop.nm (100%)
 rename {pkgs/igmpproxy => igmpproxy}/igmpproxy.nm (100%)
 rename {pkgs/initscripts => initscripts}/functions (100%)
 rename {pkgs/initscripts => initscripts}/initscripts.nm (100%)
 rename {pkgs/initscripts => initscripts}/src/Makefile (100%)
 rename {pkgs/initscripts => initscripts}/src/console_check.c (100%)
 rename {pkgs/initscripts => initscripts}/src/console_init.c (100%)
 rename {pkgs/initscripts => initscripts}/src/ipcalc-tests (100%)
 rename {pkgs/initscripts => initscripts}/src/ipcalc.1 (100%)
 rename {pkgs/initscripts => initscripts}/src/ipcalc.c (100%)
 rename {pkgs/initscripts => initscripts}/src/securetty.8 (100%)
 rename {pkgs/initscripts => initscripts}/src/securetty.c (100%)
 rename {pkgs/initscripts => initscripts}/src/shvar.c (100%)
 rename {pkgs/initscripts => initscripts}/src/shvar.h (100%)
 rename {pkgs/initscripts => initscripts}/sysconfig/clock (100%)
 rename {pkgs/initscripts => initscripts}/sysconfig/createfiles (100%)
 rename {pkgs/initscripts => initscripts}/sysconfig/modules (100%)
 rename {pkgs/initscripts => initscripts}/sysconfig/network (100%)
 rename {pkgs/initscripts => initscripts}/sysconfig/rc (100%)
 rename {pkgs/initscripts => initscripts}/sysconfig/rc.local (100%)
 rename {pkgs/initscripts => initscripts}/sysconfig/rc.site (100%)
 rename {pkgs/initscripts => initscripts}/sysctl.conf (100%)
 rename {pkgs/initscripts => initscripts}/udev/10-console.rules (100%)
 rename {pkgs/initscripts => initscripts}/udev/88-clock.rules (100%)
 rename {pkgs/intltool => intltool}/intltool.nm (100%)
 rename {pkgs/iproute2 => iproute2}/iproute2.nm (100%)
 rename {pkgs/iptables => iptables}/iptables.nm (100%)
 rename {pkgs/iputils => iputils}/iputils.nm (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-addrcache.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-arping-infiniband.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-arping_timeout.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-countermeasures.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-idn.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-open-max.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-output.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-ping-subint.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-ping_cleanup.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-rh.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-traffic_class.patch (100%)
 rename {pkgs/iputils => iputils}/patches/iputils-s20071127-warnings.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/04-iscsi (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/iscsi-initiator-utils.nm (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-add-libiscsi.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-disable-isns-for-lib.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-dont-use-static.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-only-root-use.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-uip-mgmt.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-use-red-hat-for-name.patch (100%)
 rename {pkgs/iscsi-initiator-utils => iscsi-initiator-utils}/patches/iscsi-initiator-utils-use-var-for-config.patch (100%)
 rename {pkgs/iw => iw}/iw.nm (100%)
 rename {pkgs/joe => joe}/joe.nm (100%)
 rename {pkgs/joe => joe}/patches/joe-3.4-selinux.patch (100%)
 rename {pkgs/jwhois => jwhois}/jwhois.nm (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-conf.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-conf_update.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-conf_update2.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-conf_update3.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-conf_update4.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-connect.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-dotster.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-enum.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-fclose.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-gi.patch (100%)
 rename {pkgs/jwhois => jwhois}/patches/jwhois-4.0-ipv6match.patch (100%)
 rename {pkgs/kbd => kbd}/kbd.nm (100%)
 rename {pkgs/kbd => kbd}/patches/kbd-1.15-defkeymap.patch (100%)
 rename {pkgs/kbd => kbd}/patches/kbd-1.15-keycodes-man.patch (100%)
 rename {pkgs/kbd => kbd}/patches/kbd-1.15-po.patch (100%)
 rename {pkgs/kbd => kbd}/patches/kbd-1.15-quiet_doc.patch (100%)
 rename {pkgs/kbd => kbd}/patches/kbd-1.15-resizecon-x86_64.patch (100%)
 rename {pkgs/kbd => kbd}/patches/kbd-1.15-sparc.patch (100%)
 rename {pkgs/kbd => kbd}/patches/kbd-1.15-unicode_start.patch (100%)
 rename {pkgs/kernel => kernel}/config (100%)
 rename {pkgs/kernel => kernel}/ipfire_logo.ppm (100%)
 rename {pkgs/kernel => kernel}/kernel.nm (100%)
 rename {pkgs/kernel => kernel}/patches/grsecurity-2.2.2-2.6.39-201105231910.patch (100%)
 rename {pkgs/kernel => kernel}/patches/linux-2.6.33-disable-compat-vdso.patch (100%)
 rename {pkgs/l7-protocols => l7-protocols}/l7-protocols.nm (100%)
 rename {pkgs/ldapvi => ldapvi}/ldapvi.nm (100%)
 rename {pkgs/less => less}/less.nm (100%)
 rename {pkgs/less => less}/less.sh (100%)
 rename {pkgs/less => less}/lesspipe.sh (100%)
 rename {pkgs/libICE => libICE}/libICE.nm (100%)
 rename {pkgs/libSM => libSM}/libSM.nm (100%)
 rename {pkgs/libVNCServer => libVNCServer}/libVNCServer.nm (100%)
 rename {pkgs/libVNCServer => libVNCServer}/patches/libvncserver-0.9.1-close_server_socket.patch (100%)
 rename {pkgs/libVNCServer => libVNCServer}/patches/libvncserver-0.9.1-multilib.patch (100%)
 rename {pkgs/libVNCServer => libVNCServer}/patches/libvncserver-0.9.7-Linux.patch (100%)
 rename {pkgs/libX11 => libX11}/libX11.nm (100%)
 rename {pkgs/libXau => libXau}/libXau.nm (100%)
 rename {pkgs/libXau => libXau}/patches/xau-1.0.4-local.patch (100%)
 rename {pkgs/libXaw => libXaw}/libXaw.nm (100%)
 rename {pkgs/libXdamage => libXdamage}/libXdamage.nm (100%)
 rename {pkgs/libXdmcp => libXdmcp}/libXdmcp.nm (100%)
 rename {pkgs/libXext => libXext}/libXext.nm (100%)
 rename {pkgs/libXfixes => libXfixes}/libXfixes.nm (100%)
 rename {pkgs/libXfont => libXfont}/libXfont.nm (100%)
 rename {pkgs/libXft => libXft}/libXft.nm (100%)
 rename {pkgs/libXi => libXi}/libXi.nm (100%)
 rename {pkgs/libXmu => libXmu}/libXmu.nm (100%)
 rename {pkgs/libXpm => libXpm}/libXpm.nm (100%)
 rename {pkgs/libXrandr => libXrandr}/libXrandr.nm (100%)
 rename {pkgs/libXrandr => libXrandr}/patches/libXrandr-1.3.0-fixes.patch (100%)
 rename {pkgs/libXrender => libXrender}/libXrender.nm (100%)
 rename {pkgs/libXres => libXres}/libXres.nm (100%)
 rename {pkgs/libXt => libXt}/libXt.nm (100%)
 rename {pkgs/libXt => libXt}/patches/libXt-1.0.7-libsm-fix.patch (100%)
 rename {pkgs/libXtst => libXtst}/libXtst.nm (100%)
 rename {pkgs/libXv => libXv}/libXv.nm (100%)
 rename {pkgs/libXvMC => libXvMC}/libXvMC.nm (100%)
 rename {pkgs/libXxf86vm => libXxf86vm}/libXxf86vm.nm (100%)
 rename {pkgs/libaal => libaal}/libaal.nm (100%)
 rename {pkgs/libaio => libaio}/libaio.nm (100%)
 rename {pkgs/libaio => libaio}/patches/libaio-0.3.109-install-to-slash.patch (100%)
 rename {pkgs/libarchive => libarchive}/libarchive.nm (100%)
 rename {pkgs/libart => libart}/libart.nm (100%)
 rename {pkgs/libart => libart}/patches/libart_lgpl-2.3.19-upstream_fix-1.patch (100%)
 rename {pkgs/libassuan => libassuan}/libassuan.nm (100%)
 rename {pkgs/libatasmart => libatasmart}/libatasmart.nm (100%)
 rename {pkgs/libcap-ng => libcap-ng}/libcap-ng.nm (100%)
 rename {pkgs/libcap => libcap}/libcap.nm (100%)
 rename {pkgs/libcap => libcap}/patches/libcap-2.16-build-system-fixes.patch (100%)
 rename {pkgs/libcap => libcap}/patches/libcap-2.16-headerfix.patch (100%)
 rename {pkgs/libcgroup => libcgroup}/libcgroup.nm (100%)
 rename {pkgs/libdaemon => libdaemon}/libdaemon.nm (100%)
 rename {pkgs/libdnet => libdnet}/libdnet.nm (100%)
 rename {pkgs/libdnet => libdnet}/patches/libdnet-1.12-shrext.patch (100%)
 rename {pkgs/libdrm => libdrm}/91-drm-modeset.rules (100%)
 rename {pkgs/libdrm => libdrm}/libdrm.nm (100%)
 rename {pkgs/libdrm => libdrm}/patches/libdrm-2.4.0-no-bc.patch (100%)
 rename {pkgs/libdrm => libdrm}/patches/libdrm-2.4.21-b803918f3f.patch (100%)
 rename {pkgs/libdrm => libdrm}/patches/libdrm-make-dri-perms-okay.patch (100%)
 rename {pkgs/libedit => libedit}/libedit.nm (100%)
 rename {pkgs/libevent => libevent}/libevent.nm (100%)
 rename {pkgs/libffi => libffi}/libffi.nm (100%)
 rename {pkgs/libfontenc => libfontenc}/libfontenc.nm (100%)
 rename {pkgs/libgcrypt => libgcrypt}/libgcrypt.nm (100%)
 rename {pkgs/libgpg-error => libgpg-error}/libgpg-error.nm (100%)
 rename {pkgs/libgssglue => libgssglue}/libgssglue.nm (100%)
 rename {pkgs/libidn => libidn}/libidn.nm (100%)
 rename {pkgs/libjpeg => libjpeg}/libjpeg.nm (100%)
 rename {pkgs/libksba => libksba}/libksba.nm (100%)
 rename {pkgs/libmng => libmng}/libmng.nm (100%)
 rename {pkgs/libmpc => libmpc}/libmpc.nm (100%)
 rename {pkgs/libnet => libnet}/libnet.nm (100%)
 rename {pkgs/libnet => libnet}/patches/libnet-1.1.4-capability.patch (100%)
 rename {pkgs/libnetfilter_conntrack => libnetfilter_conntrack}/libnetfilter_conntrack.nm (100%)
 rename {pkgs/libnetfilter_log => libnetfilter_log}/libnetfilter_log.nm (100%)
 rename {pkgs/libnetfilter_queue => libnetfilter_queue}/libnetfilter_queue.nm (100%)
 rename {pkgs/libnfnetlink => libnfnetlink}/libnfnetlink.nm (100%)
 rename {pkgs/libnfsidmap => libnfsidmap}/libnfsidmap.nm (100%)
 rename {pkgs/libnl => libnl}/libnl.nm (100%)
 rename {pkgs/libnl => libnl}/patches/libnl-1.1-include-limits-h.patch (100%)
 rename {pkgs/libnl => libnl}/patches/libnl-1.1-no-extern-inline.patch (100%)
 rename {pkgs/libnl => libnl}/patches/libnl-1.1-permissions.patch (100%)
 rename {pkgs/libpcap => libpcap}/libpcap.nm (100%)
 rename {pkgs/libpcap => libpcap}/patches/libpcap-0.8.3-ppp.patch (100%)
 rename {pkgs/libpciaccess => libpciaccess}/libpciaccess.nm (100%)
 rename {pkgs/libpipeline => libpipeline}/libpipeline.nm (100%)
 rename {pkgs/libpng => libpng}/libpng.nm (100%)
 rename {pkgs/libpng => libpng}/patches/libpng-1.4.2-pngconf.patch (100%)
 rename {pkgs/librpcsecgss => librpcsecgss}/librpcsecgss.nm (100%)
 rename {pkgs/libselinux => libselinux}/libselinux.nm (100%)
 rename {pkgs/libselinux => libselinux}/patches/libselinux-ipfire.patch (100%)
 rename {pkgs/libsemanage => libsemanage}/libsemanage.nm (100%)
 rename {pkgs/libsemanage => libsemanage}/patches/libsemanage-rhat.patch (100%)
 rename {pkgs/libsemanage => libsemanage}/semanage.conf (100%)
 rename {pkgs/libsepol => libsepol}/libsepol.nm (100%)
 rename {pkgs/libsigc++ => libsigc++}/libsigc++.nm (100%)
 rename {pkgs/libsolv => libsolv}/libsolv.nm (100%)
 rename {pkgs/libsoup => libsoup}/libsoup.nm (100%)
 rename {pkgs/libssh2 => libssh2}/libssh2.nm (100%)
 rename {pkgs/libtasn1 => libtasn1}/libtasn1.nm (100%)
 rename {pkgs/libtiff => libtiff}/libtiff.nm (100%)
 rename {pkgs/libtool => libtool}/libtool.nm (100%)
 rename {pkgs/libtorrent => libtorrent}/libtorrent.nm (100%)
 rename {pkgs/libusb-compat => libusb-compat}/libusb-compat.nm (100%)
 rename {pkgs/libusb => libusb}/libusb.nm (100%)
 rename {pkgs/libuser => libuser}/libuser.nm (100%)
 rename {pkgs/libvirt => libvirt}/libvirt.nm (100%)
 rename {pkgs/libxcb => libxcb}/libxcb.nm (100%)
 rename {pkgs/libxkbfile => libxkbfile}/libxkbfile.nm (100%)
 rename {pkgs/libxml2 => libxml2}/libxml2.nm (100%)
 rename {pkgs/libxslt => libxslt}/libxslt.nm (100%)
 rename {pkgs/libyaml => libyaml}/libyaml.nm (100%)
 rename {pkgs/lighttpd => lighttpd}/lighttpd.conf (100%)
 rename {pkgs/lighttpd => lighttpd}/lighttpd.nm (100%)
 rename {pkgs/lighttpd => lighttpd}/lighttpd.tmpfiles (100%)
 rename {pkgs/lighttpd => lighttpd}/systemd/lighttpd.service (100%)
 rename {pkgs/linux-atm => linux-atm}/linux-atm.nm (100%)
 rename {pkgs/linux-atm => linux-atm}/patches/linux-atm-2.4.1-gcc-4.patch (100%)
 rename {pkgs/linux-atm => linux-atm}/patches/linux-atm-2.4.1-nmu.patch (100%)
 rename {pkgs/linux-firmware => linux-firmware}/linux-firmware.nm (100%)
 rename {pkgs/lldpd => lldpd}/lldpd.nm (100%)
 rename {pkgs/lldpd => lldpd}/lldpd.tmpfiles (100%)
 rename {pkgs/lldpd => lldpd}/patches/lldpd-0.52.x-os-release.patch (100%)
 rename {pkgs/lldpd => lldpd}/systemd/lldpd.service (100%)
 rename {pkgs/lm-sensors => lm-sensors}/lm-sensors.nm (100%)
 rename {pkgs/logrotate => logrotate}/logrotate.nm (100%)
 rename {pkgs/logrotate => logrotate}/patches/logrotate-3.7.7-curdir.patch (100%)
 rename {pkgs/logrotate => logrotate}/patches/logrotate-3.7.7-toolarge.patch (100%)
 rename {pkgs/logrotate => logrotate}/systemd/logrotate.service (100%)
 rename {pkgs/lsof => lsof}/lsof.nm (100%)
 rename {pkgs/lsof => lsof}/patches/lsof_4.81-threads.patch (100%)
 rename {pkgs/lua => lua}/lua.nm (100%)
 rename {pkgs/lua => lua}/patches/lua-5.1.4-autotoolize.patch (100%)
 rename {pkgs/lvm2 => lvm2}/lvm2.nm (100%)
 rename {pkgs/lzo => lzo}/lzo.nm (100%)
 rename {pkgs/m4 => m4}/m4.nm (100%)
 rename {pkgs/mailcap => mailcap}/mailcap.nm (100%)
 rename {pkgs/make => make}/make.nm (100%)
 rename {pkgs/make => make}/patches/make-3.79.1-noclock_gettime.patch (100%)
 rename {pkgs/make => make}/patches/make-3.80-getcwd.patch (100%)
 rename {pkgs/make => make}/patches/make-3.80-j8k.patch (100%)
 rename {pkgs/make => make}/patches/make-3.81-err-reporting.patch (100%)
 rename {pkgs/make => make}/patches/make-3.81-fdleak.patch (100%)
 rename {pkgs/make => make}/patches/make-3.81-jobserver.patch (100%)
 rename {pkgs/make => make}/patches/make-3.81-memory.patch (100%)
 rename {pkgs/make => make}/patches/make-3.81-newlines.patch (100%)
 rename {pkgs/make => make}/patches/make-3.81-rlimit.patch (100%)
 rename {pkgs/make => make}/patches/make-3.81-strcpy-overlap.patch (100%)
 rename {pkgs/man-db => man-db}/man-db.nm (100%)
 rename {pkgs/man-pages => man-pages}/man-pages.nm (100%)
 rename {pkgs/mc => mc}/mc.nm (100%)
 rename {pkgs/mdadm => mdadm}/mdadm.nm (100%)
 rename {pkgs/memtest86+ => memtest86+}/memtest86+.grub (100%)
 rename {pkgs/memtest86+ => memtest86+}/memtest86+.nm (100%)
 rename {pkgs/mesa => mesa}/mesa.nm (100%)
 rename {pkgs/minicom => minicom}/minicom.nm (100%)
 rename {pkgs/module-init-tools => module-init-tools}/modprobe.d/blacklist.conf (100%)
 rename {pkgs/module-init-tools => module-init-tools}/modprobe.d/modprobe.conf (100%)
 rename {pkgs/module-init-tools => module-init-tools}/module-init-tools.nm (100%)
 rename {pkgs/mpfr => mpfr}/mpfr.nm (100%)
 rename {pkgs/multipath-tools => multipath-tools}/multipath-tools.nm (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0001-RH-queue-without-daemon.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0002-RH-path-checker.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0002-for-upstream-add-tmo-config-options.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0003-RH-root-init-script.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0003-for-upstream-default-configs.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0004-RH-fix-kpartx.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0005-RH-cciss_id.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0006-RH-move-bindings.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0007-RH-do-not-remove.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0009-RH-multipathd-blacklist-all-by-default.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0010-RH-multipath-rules-udev-changes.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0011-RH-fix-init-script-LSB-headers.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0012-RH-udev-sync-support.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0013-RH-add-weighted_prio-prioritizer.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0014-RH-add-hp_tur-checker.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0015-RH-add-multipathd-count-paths-cmd.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0016-RHBZ-554561-fix-init-error-msg.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0017-RHBZ-554592-man-page-note.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0018-RHBZ-554596-SUN-6540-config.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0019-RHBZ-554598-fix-multipath-locking.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0020-RHBZ-554605-fix-manual-failover.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0021-RHBZ-548874-add-find-multipaths.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0023-RHBZ-557810-emc-invista-config.patch (100%)
 rename {pkgs/multipath-tools => multipath-tools}/patches/0024-RHBZ-565933-checker-timeout.patch (100%)
 rename {pkgs/nano => nano}/nano.nm (100%)
 rename {pkgs/nasm => nasm}/nasm.nm (100%)
 rename {pkgs/ncurses => ncurses}/ncurses.nm (100%)
 rename {pkgs/net-snmp => net-snmp}/net-snmp.nm (100%)
 rename {pkgs/net-snmp => net-snmp}/systemd/snmpd.service (100%)
 rename {pkgs/net-tools => net-tools}/config.h (100%)
 rename {pkgs/net-tools => net-tools}/config.make (100%)
 rename {pkgs/net-tools => net-tools}/ether-wake.8 (100%)
 rename {pkgs/net-tools => net-tools}/ether-wake.c (100%)
 rename {pkgs/net-tools => net-tools}/ipmaddr.8 (100%)
 rename {pkgs/net-tools => net-tools}/iptunnel.8 (100%)
 rename {pkgs/net-tools => net-tools}/mii-diag.8 (100%)
 rename {pkgs/net-tools => net-tools}/mii-diag.c (100%)
 rename {pkgs/net-tools => net-tools}/net-tools.nm (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.57-bug22040.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-IA64.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-a-option.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-arp-unaligned-access.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-arp_man.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-arp_overflow.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-avoid-name-resolution.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-bcast.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-clear-flag.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-continous-flush-stdout.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-cycle.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-de.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-debug-fix.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-duplicate-tcp.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ec_hw_null.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-fgets.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-gcc33.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-gcc34.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-hfi.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-hostname-short.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-hostname_man.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-i-option.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ib-warning.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ifaceopt.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ifconfig.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ifconfig_ib.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ifconfig_man.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-inet6-lookup.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-interface.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-interface_stack.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ipx.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-isofix.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-large-indexes.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-makefile-berlios.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-man-RHEL-bugs.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-man-obsolete.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-man.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-manydevs.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-masqinfo-raw-ip.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-metric-tunnel-man.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-mii-gigabit.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-mii-refactor.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-mii-tool-obsolete.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-miiioctl.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-nameif.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-nameif_strncpy.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netdevice.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netmask.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netstat-I-fix.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netstat-interfaces-crash.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netstat-leak.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netstat-probe.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netstat_inode.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netstat_stop_trim.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-netstat_ulong.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-note.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-num-ports.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-overflow.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-parse.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-pie.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-remove_node.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-return.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-scanf-format.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-sctp-addrs.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-sctp-quiet.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-sctp.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-selinux.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-siunits.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-skip.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-slattach-fchown.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-statalias.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-statistics-doubleword.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-statistics.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-statistics_buffer.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-stdo.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-trailingblank.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-trim_iface.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-trunc.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-ulong.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-virtualname.patch (100%)
 rename {pkgs/net-tools => net-tools}/patches/net-tools-1.60-x25-proc.patch (100%)
 rename {pkgs/netplug => netplug}/netplug.nm (100%)
 rename {pkgs/netplug => netplug}/patches/netplug-1.2.9.1-execshield.patch (100%)
 rename {pkgs/netplug => netplug}/systemd/netplug.service (100%)
 rename {pkgs/nettle => nettle}/nettle.nm (100%)
 rename {pkgs/network => network}/network.nm (100%)
 rename {pkgs/network => network}/systemd/network.service (100%)
 rename {pkgs/newt => newt}/newt.nm (100%)
 rename {pkgs/nfs-utils => nfs-utils}/nfs-utils.nm (100%)
 rename {pkgs/nmap => nmap}/nmap.nm (100%)
 rename {pkgs/nmap => nmap}/patches/nmap-5.00-mktemp.patch (100%)
 rename {pkgs/noip => noip}/noip.nm (100%)
 rename {pkgs/nspr => nspr}/nspr-config-vars.in (100%)
 rename {pkgs/nspr => nspr}/nspr.nm (100%)
 rename {pkgs/nspr => nspr}/nspr.pc.in (100%)
 rename {pkgs/nspr => nspr}/patches/nspr-config-pc.patch (100%)
 rename {pkgs/nss-myhostname => nss-myhostname}/nss-myhostname.nm (100%)
 rename {pkgs/nss-softokn => nss-softokn}/nss-softokn-config.in (100%)
 rename {pkgs/nss-softokn => nss-softokn}/nss-softokn.nm (100%)
 rename {pkgs/nss-softokn => nss-softokn}/nss-softokn.pc.in (100%)
 rename {pkgs/nss-softokn => nss-softokn}/nss-softokn.spec (100%)
 rename {pkgs/nss-softokn => nss-softokn}/patches/nss-softokn-3.12.4-fips-fix.patch (100%)
 rename {pkgs/nss-softokn => nss-softokn}/patches/nss-softokn-3.12.4-prelink.patch (100%)
 rename {pkgs/nss-util => nss-util}/nss-util-config.in (100%)
 rename {pkgs/nss-util => nss-util}/nss-util.nm (100%)
 rename {pkgs/nss-util => nss-util}/nss-util.pc.in (100%)
 rename {pkgs/nss-util => nss-util}/nss-util.spec (100%)
 rename {pkgs/nss => nss}/PayPalEE.cert (100%)
 rename {pkgs/nss => nss}/cert8.db (100%)
 rename {pkgs/nss => nss}/cert9.db (100%)
 rename {pkgs/nss => nss}/key3.db (100%)
 rename {pkgs/nss => nss}/key4.db (100%)
 rename {pkgs/nss => nss}/nss-config.in (100%)
 rename {pkgs/nss => nss}/nss.nm (100%)
 rename {pkgs/nss => nss}/nss.pc.in (100%)
 rename {pkgs/nss => nss}/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch (100%)
 rename {pkgs/nss => nss}/patches/0001-Do-not-define-SEC_SkipTemplate.patch (100%)
 rename {pkgs/nss => nss}/patches/nss-enable-pem.patch (100%)
 rename {pkgs/nss => nss}/patches/nss-sysinit-userdb-first.patch (100%)
 rename {pkgs/nss => nss}/patches/nsspem-596674.patch (100%)
 rename {pkgs/nss => nss}/patches/renegotiate-transitional.patch (100%)
 rename {pkgs/nss => nss}/secmod.db (100%)
 rename {pkgs/nss => nss}/setup-nsssysinit.sh (100%)
 rename {pkgs/nss => nss}/system-pkcs11.txt (100%)
 rename {pkgs/nss_ldap => nss_ldap}/nss_ldap.nm (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-254-soname.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-257-mozldap.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-259-res_init.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-264-checkcase.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-264-cloexec.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-depth.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-ent_internal.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-erange.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-fix-uninit.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-initgroups-minimum_uid.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-local_users.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-padl-bug-418.patch (100%)
 rename {pkgs/nss_ldap => nss_ldap}/patches/nss_ldap-265-setnetgrent.patch (100%)
 rename {pkgs/openl2tp => openl2tp}/openl2tp.nm (100%)
 rename {pkgs/openldap => openldap}/openldap.nm (100%)
 rename {pkgs/openldap => openldap}/patches/openldap-2.4.17-disable_sys_err.patch (100%)
 rename {pkgs/openldap => openldap}/slapd.conf (100%)
 rename {pkgs/openldap => openldap}/systemd/openldap.service (100%)
 rename {pkgs/openssh => openssh}/openssh.nm (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-4.3p2-askpass-grab-info.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.1p1-askpass-progress.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.1p1-scp-manpage.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.2p1-allow-ip-opts.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.2p1-edns.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.5p1-x11.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.6p1-exit-deadlock.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.6p1-keygen.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.6p1-redhat.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.8p1-authorized-keys-command.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.8p1-fingerprint.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.8p1-kuserok.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.8p1-mls.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.8p1-randclean.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.8p1-selinux-role.patch (100%)
 rename {pkgs/openssh => openssh}/patches/openssh-5.8p1-selinux.patch (100%)
 rename {pkgs/openssh => openssh}/ssh-keygen (100%)
 rename {pkgs/openssh => openssh}/sshd.pam (100%)
 rename {pkgs/openssh => openssh}/sshd_config (100%)
 rename {pkgs/openssh => openssh}/systemd/openssh.service (100%)
 rename {pkgs/openssl => openssl}/openssl.cnf (100%)
 rename {pkgs/openssl => openssl}/openssl.nm (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-0.9.8b-test-use-localhost.patch (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-0.9.8j-env-nozlib.patch (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-0.9.8j-version-add-engines.patch (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-0.9.8k-no-rpath.patch (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-1.0.0-beta3-soversion.patch (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-1.0.0-beta4-redhat.patch (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-1.0.0-beta5-enginesdir.patch (100%)
 rename {pkgs/openssl => openssl}/patches/openssl-1.0.0d-version.patch (100%)
 rename {pkgs/openvpn => openvpn}/openvpn.nm (100%)
 rename {pkgs/os-prober => os-prober}/os-prober.nm (100%)
 rename {pkgs/p11-kit => p11-kit}/p11-kit.nm (100%)
 rename {pkgs/pakfire => pakfire}/pakfire.nm (100%)
 rename {pkgs/pam => pam}/login.defs (100%)
 rename {pkgs/pam => pam}/pam.d/other (100%)
 rename {pkgs/pam => pam}/pam.d/system-auth (100%)
 rename {pkgs/pam => pam}/pam.nm (100%)
 rename {pkgs/pam => pam}/pam_env.conf (100%)
 rename {pkgs/pam => pam}/patches/Linux-PAM-1.1.0-no-yywrap-1.patch (100%)
 rename {pkgs/pam => pam}/securetty (100%)
 rename {pkgs/pam_ldap => pam_ldap}/pam_ldap.nm (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-176-authenticateOnChangeExpiredAuthtok.patch (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-176-exop-modify.patch (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-180-install-perms.patch (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-182-manpointer.patch (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-183-releaseconfig.patch (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-184-nsrole.patch (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-185-dnsconfig.patch (100%)
 rename {pkgs/pam_ldap => pam_ldap}/patches/pam_ldap-185-expiration4.patch (100%)
 rename {pkgs/pango => pango}/pango.nm (100%)
 rename {pkgs/parted => parted}/parted.nm (100%)
 rename {pkgs/parted => parted}/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch (100%)
 rename {pkgs/parted => parted}/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch (100%)
 rename {pkgs/parted => parted}/patches/parted-2.1-default-alignment.patch (100%)
 rename {pkgs/parted => parted}/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch (100%)
 rename {pkgs/parted => parted}/patches/parted-2.1-mem-leak-fixes-rh556012.patch (100%)
 rename {pkgs/parted => parted}/patches/parted-2.1-needs_clobber-rh566181.patch (100%)
 rename {pkgs/passwd => passwd}/passwd.nm (100%)
 rename {pkgs/passwd => passwd}/passwd.pam (100%)
 rename {pkgs/patch => patch}/patch.nm (100%)
 rename {pkgs/patch => patch}/patches/patch-2.5.4-sigsegv.patch (100%)
 rename {pkgs/patch => patch}/patches/patch-2.6.1-CVE-2010-4651.patch (100%)
 rename {pkgs/patch => patch}/patches/patch-2.6.1-backup-if-mismatch.patch (100%)
 rename {pkgs/patch => patch}/patches/patch-2.6.1-get-arg.patch (100%)
 rename {pkgs/patch => patch}/patches/patch-selinux.patch (100%)
 rename {pkgs/pax-utils => pax-utils}/pax-utils.nm (100%)
 rename {pkgs/paxctl => paxctl}/paxctl.nm (100%)
 rename {pkgs/paxtest => paxtest}/paxtest.nm (100%)
 rename {pkgs/pcapy => pcapy}/pcapy.nm (100%)
 rename {pkgs/pciutils => pciutils}/pciutils.nm (100%)
 rename {pkgs/pcre => pcre}/pcre.nm (100%)
 rename {pkgs/pdns-recursor => pdns-recursor}/patches/pdns-recursor-fixmakefile.patch (100%)
 rename {pkgs/pdns-recursor => pdns-recursor}/patches/pdns-recursor-fixsysconfdir.patch (100%)
 rename {pkgs/pdns-recursor => pdns-recursor}/pdns-recursor.nm (100%)
 rename {pkgs/pdns-recursor => pdns-recursor}/pdns-recursor.tmpfiles (100%)
 rename {pkgs/pdns-recursor => pdns-recursor}/recursor.conf (100%)
 rename {pkgs/pdns-recursor => pdns-recursor}/systemd/pdns-recursor.service (100%)
 rename {pkgs/pdns => pdns}/patches/pdns-fix-lua-detection.patch (100%)
 rename {pkgs/pdns => pdns}/pdns.nm (100%)
 rename {pkgs/pdns => pdns}/systemd/pdns.service (100%)
 rename {pkgs/perl-HTML-Parser => perl-HTML-Parser}/perl-HTML-Parser.nm (100%)
 rename {pkgs/perl-HTML-Tagset => perl-HTML-Tagset}/perl-HTML-Tagset.nm (100%)
 rename {pkgs/perl-Test-Simple => perl-Test-Simple}/perl-Test-Simple.nm (100%)
 rename {pkgs/perl-URI => perl-URI}/perl-URI.nm (100%)
 rename {pkgs/perl-XML-Parser => perl-XML-Parser}/perl-XML-Parser.nm (100%)
 rename {pkgs/perl-libwww-perl => perl-libwww-perl}/perl-libwww-perl.nm (100%)
 rename {pkgs/perl => perl}/patches/perl-5.10.0-libresolv.patch (100%)
 rename {pkgs/perl => perl}/patches/perl-5.8.0-libdir64.patch (100%)
 rename {pkgs/perl => perl}/patches/perl-5.8.8-rpath-make.patch (100%)
 rename {pkgs/perl => perl}/patches/perl-USE_MM_LD_RUN_PATH.patch (100%)
 rename {pkgs/perl => perl}/patches/perl-disable_test_hosts.patch (100%)
 rename {pkgs/perl => perl}/patches/perl-perlbug-tag.patch (100%)
 rename {pkgs/perl => perl}/perl.nm (100%)
 rename {pkgs/pinentry => pinentry}/pinentry.nm (100%)
 rename {pkgs/pixman => pixman}/pixman.nm (100%)
 rename {pkgs/pkg-config => pkg-config}/patches/pkg-config-0.25-autoconf-1.patch (100%)
 rename {pkgs/pkg-config => pkg-config}/pkg-config.nm (100%)
 rename {pkgs/polkit => polkit}/polkit.nm (100%)
 rename {pkgs/popt => popt}/popt.nm (100%)
 rename {pkgs/powertop => powertop}/powertop.nm (100%)
 rename {pkgs/ppl => ppl}/ppl.nm (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.3.6-sample.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.1-varargs.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.2-change_resolv_conf.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.2-ifname.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.2-pppoatm-make.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.3-fix.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.3-fix64.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.3-make.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-cbcp.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-dontwriteetc.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-fd_leak.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-ipv6-accept-remote.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-lib64.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-libutil.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-local.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.4-pie.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.5-eaptls-mppe-0.99.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.5-eth.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.5-lock.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.5-man.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.5-ppp_resolv.patch (100%)
 rename {pkgs/ppp => ppp}/patches/ppp-2.4.5-var_run_ppp.patch (100%)
 rename {pkgs/ppp => ppp}/ppp.nm (100%)
 rename {pkgs/ppp => ppp}/ppp.pam (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-compat.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-conn-free.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-conn-free2.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-ip-path.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-makedeps.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-pptpsetup-encrypt.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-pptpsetup-mppe.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-pptpsetup.patch (100%)
 rename {pkgs/pptp => pptp}/patches/pptp-1.7.2-waitpid.patch (100%)
 rename {pkgs/pptp => pptp}/pptp.nm (100%)
 rename {pkgs/procps => procps}/patches/procps-3.2.8-selinux.patch (100%)
 rename {pkgs/procps => procps}/patches/procps-3.2.8-watch_unicode-2.patch (100%)
 rename {pkgs/procps => procps}/procps.nm (100%)
 rename {pkgs/psmisc => psmisc}/psmisc.nm (100%)
 rename {pkgs/pth => pth}/pth.nm (100%)
 rename {pkgs/pyQt => pyQt}/patches/PyQt-x11-gpl-4.4.4-64bit.patch (100%)
 rename {pkgs/pyQt => pyQt}/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch (100%)
 rename {pkgs/pyQt => pyQt}/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch (100%)
 rename {pkgs/pyQt => pyQt}/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch (100%)
 rename {pkgs/pyQt => pyQt}/pyQt.nm (100%)
 rename {pkgs/pychecker => pychecker}/pychecker.nm (100%)
 rename {pkgs/pyfire => pyfire}/pyfire.nm (100%)
 rename {pkgs/pyfire => pyfire}/src/Makefile (100%)
 rename {pkgs/pyfire => pyfire}/src/__init__.py (100%)
 rename {pkgs/pyfire => pyfire}/src/config.py (100%)
 rename {pkgs/pyfire => pyfire}/src/executil.py (100%)
 rename {pkgs/pyfire => pyfire}/src/hal.py (100%)
 rename {pkgs/pyfire => pyfire}/src/net.py (100%)
 rename {pkgs/pyfire => pyfire}/src/web.py (100%)
 rename {pkgs/pygobject2 => pygobject2}/pygobject2.nm (100%)
 rename {pkgs/pyliblzma => pyliblzma}/patches/no-script-liblzma.patch (100%)
 rename {pkgs/pyliblzma => pyliblzma}/pyliblzma.nm (100%)
 rename {pkgs/pyserial => pyserial}/pyserial.nm (100%)
 rename {pkgs/python-IPy => python-IPy}/python-IPy.nm (100%)
 rename {pkgs/python-cairo => python-cairo}/python-cairo.nm (100%)
 rename {pkgs/python-cryptsetup => python-cryptsetup}/python-cryptsetup.nm (100%)
 rename {pkgs/python-dbus => python-dbus}/python-dbus.nm (100%)
 rename {pkgs/python-decorator => python-decorator}/python-decorator.nm (100%)
 rename {pkgs/python-distutils-extra => python-distutils-extra}/python-distutils-extra.nm (100%)
 rename {pkgs/python-gudev => python-gudev}/python-gudev.nm (100%)
 rename {pkgs/python-m2crypto => python-m2crypto}/python-m2crypto.nm (100%)
 rename {pkgs/python-netfilter_conntrack => python-netfilter_conntrack}/python-netfilter_conntrack.nm (100%)
 rename {pkgs/python-parted => python-parted}/python-parted.nm (100%)
 rename {pkgs/python-piksemel => python-piksemel}/python-piksemel.nm (100%)
 rename {pkgs/python-progressbar => python-progressbar}/python-progressbar.nm (100%)
 rename {pkgs/python-pyaspects => python-pyaspects}/python-pyaspects.nm (100%)
 rename {pkgs/python-pyblock => python-pyblock}/python-pyblock.nm (100%)
 rename {pkgs/python-pycurl => python-pycurl}/patches/python-pycurl-fix-do_curl_reset-refcount.patch (100%)
 rename {pkgs/python-pycurl => python-pycurl}/patches/python-pycurl-no-static-libs.patch0 (100%)
 rename {pkgs/python-pycurl => python-pycurl}/python-pycurl.nm (100%)
 rename {pkgs/python-qtermwidget => python-qtermwidget}/patches/addStartShell.patch (100%)
 rename {pkgs/python-qtermwidget => python-qtermwidget}/python-qtermwidget.nm (100%)
 rename {pkgs/python-setuptools => python-setuptools}/python-setuptools.nm (100%)
 rename {pkgs/python-tornado => python-tornado}/python-tornado.nm (100%)
 rename {pkgs/python-urlgrabber => python-urlgrabber}/patches/urlgrabber-HEAD.patch (100%)
 rename {pkgs/python-urlgrabber => python-urlgrabber}/python-urlgrabber.nm (100%)
 rename {pkgs/python => python}/patches/python-2.3.4-lib64-regex.patch (100%)
 rename {pkgs/python => python}/patches/python-2.5-cflags.patch (100%)
 rename {pkgs/python => python}/patches/python-2.6-rpath.patch (100%)
 rename {pkgs/python => python}/patches/python-2.6.4-distutils-rpath.patch (100%)
 rename {pkgs/python => python}/python.nm (100%)
 rename {pkgs/pyxattr => pyxattr}/pyxattr.nm (100%)
 rename {pkgs/qemu => qemu}/qemu.nm (100%)
 rename {pkgs/qt => qt}/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch (100%)
 rename {pkgs/qt => qt}/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch (100%)
 rename {pkgs/qt => qt}/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch (100%)
 rename {pkgs/qt => qt}/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-4.6.3-bn-rendering-bz562049.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-4.6.3-bn-rendering-bz562058.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-4.6.3-indic-rendering-bz631732.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-4.6.3-indic-rendering-bz636399.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.6.2-cups.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch (100%)
 rename {pkgs/qt => qt}/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch (100%)
 rename {pkgs/qt => qt}/qt.nm (100%)
 rename {pkgs/qtermwidget => qtermwidget}/patches/shared.patch (100%)
 rename {pkgs/qtermwidget => qtermwidget}/qtermwidget.nm (100%)
 rename {pkgs/quagga => quagga}/quagga.nm (100%)
 rename {pkgs/radvd => radvd}/radvd.nm (100%)
 rename {pkgs/radvd => radvd}/radvd.tmpfiles (100%)
 rename {pkgs/radvd => radvd}/systemd/radvd.service (100%)
 rename {pkgs/readline => readline}/inputrc (100%)
 rename {pkgs/readline => readline}/patches/readline-6.1-audit.patch (100%)
 rename {pkgs/readline => readline}/patches/readline-6.2-shlib.patch (100%)
 rename {pkgs/readline => readline}/readline.nm (100%)
 rename {pkgs/readline => readline}/readline.sh (100%)
 rename {pkgs/reiser4progs => reiser4progs}/patches/reiser4progs-1.0.7-bad_elif.patch (100%)
 rename {pkgs/reiser4progs => reiser4progs}/patches/reiser4progs-libaal.patch (100%)
 rename {pkgs/reiser4progs => reiser4progs}/patches/reiser4progs-makefile.patch (100%)
 rename {pkgs/reiser4progs => reiser4progs}/patches/reiser4progs-opt.patch (100%)
 rename {pkgs/reiser4progs => reiser4progs}/reiser4progs.nm (100%)
 rename {pkgs/reiserfsprogs => reiserfsprogs}/reiserfsprogs.nm (100%)
 rename {pkgs/rrdtool => rrdtool}/rrdtool.nm (100%)
 rename {pkgs/rstp => rstp}/bridge-stp (100%)
 rename {pkgs/rstp => rstp}/patches/rstp-0.21-dump-commands.patch (100%)
 rename {pkgs/rstp => rstp}/patches/rstp-0.21-upstream-fixes.patch (100%)
 rename {pkgs/rstp => rstp}/rstp.nm (100%)
 rename {pkgs/rstp => rstp}/systemd/rstp.service (100%)
 rename {pkgs/rsync => rsync}/patches/rsync-3.0.7-buf-overflow.patch (100%)
 rename {pkgs/rsync => rsync}/rsync.nm (100%)
 rename {pkgs/rsync => rsync}/rsync.xinetd (100%)
 rename {pkgs/rsyslog => rsyslog}/patches/rsyslog-5.7.9-systemd.patch (100%)
 rename {pkgs/rsyslog => rsyslog}/rsyslog.conf (100%)
 rename {pkgs/rsyslog => rsyslog}/rsyslog.log (100%)
 rename {pkgs/rsyslog => rsyslog}/rsyslog.nm (100%)
 rename {pkgs/rsyslog => rsyslog}/rsyslog.sysconfig (100%)
 rename {pkgs/rtorrent => rtorrent}/rtorrent.nm (100%)
 rename {pkgs/samba => samba}/samba.nm (100%)
 rename {pkgs/sane => sane}/patches/sane-1.0.20-lockdir.patch (100%)
 rename {pkgs/sane => sane}/patches/sane-1.0.21-epson-expression800.patch (100%)
 rename {pkgs/sane => sane}/patches/sane-1.0.21-i18n.patch (100%)
 rename {pkgs/sane => sane}/patches/sane-1.0.21-pkgconfig.patch (100%)
 rename {pkgs/sane => sane}/patches/sane-1.0.21-udev.patch (100%)
 rename {pkgs/sane => sane}/sane.nm (100%)
 rename {pkgs/screen => screen}/patches/screen-4.0.1-args.patch (100%)
 rename {pkgs/screen => screen}/patches/screen-4.0.2-maxstr.patch (100%)
 rename {pkgs/screen => screen}/patches/screen-4.0.3-configh.patch (100%)
 rename {pkgs/screen => screen}/patches/screen-4.0.3-ipv6.patch (100%)
 rename {pkgs/screen => screen}/patches/screen-4.0.3-libs.patch (100%)
 rename {pkgs/screen => screen}/patches/screen-4.0.3-screenrc.patch (100%)
 rename {pkgs/screen => screen}/patches/screen-4.0.3-stropts.patch (100%)
 rename {pkgs/screen => screen}/screen.nm (100%)
 rename {pkgs/screen => screen}/screen.pam (100%)
 rename {pkgs/screen => screen}/screenrc (100%)
 rename {pkgs/sdl => sdl}/sdl.nm (100%)
 rename {pkgs/sed => sed}/sed.nm (100%)
 rename {pkgs/setup => setup}/Makefile (100%)
 rename {pkgs/setup => setup}/aliases (100%)
 rename {pkgs/setup => setup}/bashrc (100%)
 rename {pkgs/setup => setup}/exports (100%)
 rename {pkgs/setup => setup}/filesystems (100%)
 rename {pkgs/setup => setup}/group (100%)
 rename {pkgs/setup => setup}/host.conf (100%)
 rename {pkgs/setup => setup}/hosts (100%)
 rename {pkgs/setup => setup}/hosts.allow (100%)
 rename {pkgs/setup => setup}/hosts.deny (100%)
 rename {pkgs/setup => setup}/inputrc (100%)
 rename {pkgs/setup => setup}/motd (100%)
 rename {pkgs/setup => setup}/passwd (100%)
 rename {pkgs/setup => setup}/printcap (100%)
 rename {pkgs/setup => setup}/profile (100%)
 rename {pkgs/setup => setup}/securetty (100%)
 rename {pkgs/setup => setup}/setup.nm (100%)
 rename {pkgs/setup => setup}/shadowconvert.sh (100%)
 rename {pkgs/setup => setup}/shells (100%)
 rename {pkgs/setup => setup}/uidgid (100%)
 rename {pkgs/setup => setup}/uidgidlint (100%)
 rename {pkgs/sg3-utils => sg3-utils}/sg3-utils.nm (100%)
 rename {pkgs/shadow-utils => shadow-utils}/login.defs (100%)
 rename {pkgs/shadow-utils => shadow-utils}/patches/shadow-4.1.4.2-ipfire.patch (100%)
 rename {pkgs/shadow-utils => shadow-utils}/patches/shadow-4.1.4.3-goodname.patch (100%)
 rename {pkgs/shadow-utils => shadow-utils}/shadow-utils.nm (100%)
 rename {pkgs/shadow-utils => shadow-utils}/useradd.default (100%)
 rename {pkgs/sip => sip}/patches/disable-rpaths.patch (100%)
 rename {pkgs/sip => sip}/patches/fix-linking.patch (100%)
 rename {pkgs/sip => sip}/patches/no-strip.patch (100%)
 rename {pkgs/sip => sip}/sip.nm (100%)
 rename {pkgs/slang => slang}/patches/slang-2.1.4-makefile.patch (100%)
 rename {pkgs/slang => slang}/slang.nm (100%)
 rename {pkgs/smartmontools => smartmontools}/smartmontools.nm (100%)
 rename {pkgs/sqlite => sqlite}/patches/sqlite-3.6.12-libdl.patch (100%)
 rename {pkgs/sqlite => sqlite}/sqlite.nm (100%)
 rename {pkgs/squashfs-tools => squashfs-tools}/patches/squashfs-cflags.patch (100%)
 rename {pkgs/squashfs-tools => squashfs-tools}/patches/squashfs-xz.patch (100%)
 rename {pkgs/squashfs-tools => squashfs-tools}/squashfs-tools.nm (100%)
 rename {pkgs/squid => squid}/patches/squid-3.0.STABLE1-perlpath.patch (100%)
 rename {pkgs/squid => squid}/patches/squid-3.0.STABLE7-from_manpg.patch (100%)
 rename {pkgs/squid => squid}/patches/squid-3.1.0.9-config.patch (100%)
 rename {pkgs/squid => squid}/patches/squid-3.1.0.9-location.patch (100%)
 rename {pkgs/squid => squid}/squid.nm (100%)
 rename {pkgs/squidGuard => squidGuard}/squidGuard.nm (100%)
 rename {pkgs/strace => strace}/patches/strace-4.5.19-fix-kernel-headers.patch (100%)
 rename {pkgs/strace => strace}/strace.nm (100%)
 rename {pkgs/strongswan => strongswan}/strongswan.nm (100%)
 rename {pkgs/sudo => sudo}/sudo.nm (100%)
 rename {pkgs/sudo => sudo}/sudo.pam (100%)
 rename {pkgs/sudo => sudo}/sudoers (100%)
 rename {pkgs/suricata => suricata}/suricata.logrotate (100%)
 rename {pkgs/suricata => suricata}/suricata.nm (100%)
 rename {pkgs/swig => swig}/patches/swig-1.3.23-pylib.patch (100%)
 rename {pkgs/swig => swig}/patches/swig200-rh623854.patch (100%)
 rename {pkgs/swig => swig}/swig.nm (100%)
 rename {pkgs/sysfsutils => sysfsutils}/sysfsutils.nm (100%)
 rename {pkgs/syslinux => syslinux}/syslinux.nm (100%)
 rename {pkgs/system-release => system-release}/system-release.nm (100%)
 rename {pkgs/systemd => systemd}/locale.conf (100%)
 rename {pkgs/systemd => systemd}/patches/systemd-33-no_manpages.patch (100%)
 rename {pkgs/systemd => systemd}/systemd.nm (100%)
 rename {pkgs/systemd => systemd}/vconsole.conf (100%)
 rename {pkgs/sysvinit => sysvinit}/patches/sysvinit-2.86-remove-utils-1.patch (100%)
 rename {pkgs/sysvinit => sysvinit}/sysvinit.nm (100%)
 rename {pkgs/tar => tar}/patches/tar-1.14-loneZeroWarning.patch (100%)
 rename {pkgs/tar => tar}/patches/tar-1.15.1-vfatTruncate.patch (100%)
 rename {pkgs/tar => tar}/patches/tar-1.17-wildcards.patch (100%)
 rename {pkgs/tar => tar}/patches/tar-1.22-atime-rofs.patch (100%)
 rename {pkgs/tar => tar}/patches/tar-1.23-oldarchive.patch (100%)
 rename {pkgs/tar => tar}/patches/tar-1.24-xattrs.patch (100%)
 rename {pkgs/tar => tar}/patches/tar-sigpipe.patch (100%)
 rename {pkgs/tar => tar}/tar.nm (100%)
 rename {pkgs/tcl => tcl}/patches/tcl-8.5.8-autopath.patch (100%)
 rename {pkgs/tcl => tcl}/patches/tcl-8.5.8-conf.patch (100%)
 rename {pkgs/tcl => tcl}/tcl.nm (100%)
 rename {pkgs/tcpdump => tcpdump}/tcpdump.nm (100%)
 rename {pkgs/telnet => telnet}/patches/netkit-telnet-0.17-ipv6.diff (100%)
 rename {pkgs/telnet => telnet}/patches/netkit-telnet-0.17-nodns.patch (100%)
 rename {pkgs/telnet => telnet}/patches/netkit-telnet-0.17-reallynodns.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-8bit.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-CAN-2005-468_469.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-argv.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-cleanup_race.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-conf.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-env.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-errno_test_sys_bsd.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-issue.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-pek.patch0 (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-0.17-sa-01-49.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-client-cvs.patch0 (100%)
 rename {pkgs/telnet => telnet}/patches/telnet-gethostbyname.patch (100%)
 rename {pkgs/telnet => telnet}/patches/telnetd-0.17-pty_read.patch0 (100%)
 rename {pkgs/telnet => telnet}/patches/telnetd-0.17.patch0 (100%)
 rename {pkgs/telnet => telnet}/telnet.nm (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.12-zlib.patch (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.13a-data_types.patch (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.13a-help-index-segfault.patch (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.13a-makeinfo-sectioning.patch (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.13a-mosdo-crash.patch (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.13a-powerpc.patch (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.13a-testsuite_fix.patch (100%)
 rename {pkgs/texinfo => texinfo}/patches/texinfo-4.13a-texi2dvi-regexp.patch (100%)
 rename {pkgs/texinfo => texinfo}/texinfo.nm (100%)
 rename {pkgs/tinc => tinc}/tinc.nm (100%)
 rename {pkgs/traceroute => traceroute}/traceroute.nm (100%)
 rename {pkgs/transmission => transmission}/transmission.nm (100%)
 rename {pkgs/tunctl => tunctl}/tunctl.nm (100%)
 rename {pkgs/udev => udev}/console_init (100%)
 rename {pkgs/udev => udev}/rules/10-console.rules (100%)
 rename {pkgs/udev => udev}/udev.nm (100%)
 rename {pkgs/udisks => udisks}/udisks.nm (100%)
 rename {pkgs/ulogd2 => ulogd2}/sqlite3.table (100%)
 rename {pkgs/ulogd2 => ulogd2}/systemd/ulogd.service (100%)
 rename {pkgs/ulogd2 => ulogd2}/ulogd.conf (100%)
 rename {pkgs/ulogd2 => ulogd2}/ulogd.logrotate (100%)
 rename {pkgs/ulogd2 => ulogd2}/ulogd2.nm (100%)
 rename {pkgs/unzip => unzip}/patches/unzip-6.0-attribs-overflow.patch (100%)
 rename {pkgs/unzip => unzip}/patches/unzip-6.0-bzip2-configure.patch (100%)
 rename {pkgs/unzip => unzip}/patches/unzip-6.0-close.patch (100%)
 rename {pkgs/unzip => unzip}/patches/unzip-6.0-exec-shield.patch (100%)
 rename {pkgs/unzip => unzip}/patches/unzip-6.0-nostrip.patch (100%)
 rename {pkgs/unzip => unzip}/unzip.nm (100%)
 rename {pkgs/upower => upower}/upower.nm (100%)
 rename {pkgs/usb-modemswitch => usb-modemswitch}/usb-modeswitch.nm (100%)
 rename {pkgs/usbutils => usbutils}/usbutils.nm (100%)
 rename {pkgs/ustr => ustr}/ustr.nm (100%)
 rename {pkgs/util-linux => util-linux}/nologin.8 (100%)
 rename {pkgs/util-linux => util-linux}/nologin.c (100%)
 rename {pkgs/util-linux => util-linux}/pam.d/login (100%)
 rename {pkgs/util-linux => util-linux}/util-linux.nm (100%)
 rename {pkgs/vala => vala}/vala.nm (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.001.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.002.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.003.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.004.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.005.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.006.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.007.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.008.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.009.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.010.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.011.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.012.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.013.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.014.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.015.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.016.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.017.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.018.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.019.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.020.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.021.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.022.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.023.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.024.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.025.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.026.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.027.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.028.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.029.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.030.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.031.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.032.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.033.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.034.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.035.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.036.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.037.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.038.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.039.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.040.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.041.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.042.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.043.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.044.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.045.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.046.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.047.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.048.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.049.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.050.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.051.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.052.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.053.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.054.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.055.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.056.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.057.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.058.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.059.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.060.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.061.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.062.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.063.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.064.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.065.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.066.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.067.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.068.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.069.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.070.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.071.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.072.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.073.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.074.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.075.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.076.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.077.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.078.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.079.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.080.patch0 (100%)
 rename {pkgs/vim => vim}/patches/vim-7.3.081.patch0 (100%)
 rename {pkgs/vim => vim}/vim.nm (100%)
 rename {pkgs/vim => vim}/vimrc (100%)
 rename {pkgs/vlan => vlan}/vlan.nm (100%)
 rename {pkgs/vsftpd => vsftpd}/patches/1-vsftpd-build_ssl.patch (100%)
 rename {pkgs/vsftpd => vsftpd}/patches/2-vsftpd-libs-3.patch (100%)
 rename {pkgs/vsftpd => vsftpd}/patches/3-vsftpd-pam_hostname-1.patch (100%)
 rename {pkgs/vsftpd => vsftpd}/patches/4-vsftpd-close-std-fds.patch (100%)
 rename {pkgs/vsftpd => vsftpd}/patches/5-vsftpd-configuration-1.patch (100%)
 rename {pkgs/vsftpd => vsftpd}/patches/vsftpd-2.2.0-openssl.patch (100%)
 rename {pkgs/vsftpd => vsftpd}/systemd/vsftpd.service (100%)
 rename {pkgs/vsftpd => vsftpd}/vsftpd.conf (100%)
 rename {pkgs/vsftpd => vsftpd}/vsftpd.nm (100%)
 rename {pkgs/vsftpd => vsftpd}/vsftpd.pam (100%)
 rename {pkgs/vsftpd => vsftpd}/vsftpd.user_list (100%)
 rename {pkgs/wavemon => wavemon}/wavemon.nm (100%)
 rename {pkgs/wget => wget}/wget.nm (100%)
 rename {pkgs/which => which}/which.nm (100%)
 rename {pkgs/wireless-regdb => wireless-regdb}/wireless-regdb.nm (100%)
 rename {pkgs/wireless-tools => wireless-tools}/patches/wireless_tools.29-makefile.patch (100%)
 rename {pkgs/wireless-tools => wireless-tools}/wireless-tools.nm (100%)
 rename {pkgs/wpa_supplicant => wpa_supplicant}/wpa_supplicant.conf (100%)
 rename {pkgs/wpa_supplicant => wpa_supplicant}/wpa_supplicant.config (100%)
 rename {pkgs/wpa_supplicant => wpa_supplicant}/wpa_supplicant.logrotate (100%)
 rename {pkgs/wpa_supplicant => wpa_supplicant}/wpa_supplicant.nm (100%)
 rename {pkgs/xcb-proto => xcb-proto}/xcb-proto.nm (100%)
 rename {pkgs/xcb-util => xcb-util}/xcb-util.nm (100%)
 rename {pkgs/xen => xen}/patches/00-xen-detect.patch (100%)
 rename {pkgs/xen => xen}/patches/xen-gcc-4.6.0.patch (100%)
 rename {pkgs/xen => xen}/xen.nm (100%)
 rename {pkgs/xfsprogs => xfsprogs}/xfsprogs.nm (100%)
 rename {pkgs/xkeyboard-config => xkeyboard-config}/xkeyboard-config.nm (100%)
 rename {pkgs/xorg-x11-drv-ati => xorg-x11-drv-ati}/xorg-x11-drv-ati.nm (100%)
 rename {pkgs/xorg-x11-drv-evdev => xorg-x11-drv-evdev}/xorg-x11-drv-evdev.nm (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/intel.xinf (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/intel-2.10.0-add-mbp-backlight.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/intel-2.11-lvds-first.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/intel-2.11-no-pageflipping.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/intel-2.11.0-vga-clock-max.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/intel-2.12-fix-uxa-planemask.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/intel-2.8.0-kms-get-crtc.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/kill-svideo.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/patches/uevent.patch (100%)
 rename {pkgs/xorg-x11-drv-intel => xorg-x11-drv-intel}/xorg-x11-drv-intel.nm (100%)
 rename {pkgs/xorg-x11-drv-keyboard => xorg-x11-drv-keyboard}/xorg-x11-drv-keyboard.nm (100%)
 rename {pkgs/xorg-x11-drv-mouse => xorg-x11-drv-mouse}/xorg-x11-drv-mouse.nm (100%)
 rename {pkgs/xorg-x11-drv-nv => xorg-x11-drv-nv}/patches/nv-2.1.6-panel-fix.patch (100%)
 rename {pkgs/xorg-x11-drv-nv => xorg-x11-drv-nv}/patches/nv-2.1.6-starvation.patch (100%)
 rename {pkgs/xorg-x11-drv-nv => xorg-x11-drv-nv}/patches/nv-2.1.8-g80-no-doublescan.patch (100%)
 rename {pkgs/xorg-x11-drv-nv => xorg-x11-drv-nv}/patches/nv-reserve-fbarea.patch (100%)
 rename {pkgs/xorg-x11-drv-nv => xorg-x11-drv-nv}/patches/nv-save-rom.patch (100%)
 rename {pkgs/xorg-x11-drv-nv => xorg-x11-drv-nv}/xorg-x11-drv-nv.nm (100%)
 rename {pkgs/xorg-x11-drv-synaptics => xorg-x11-drv-synaptics}/50-synaptics.conf (100%)
 rename {pkgs/xorg-x11-drv-synaptics => xorg-x11-drv-synaptics}/70-touchpad-quirks.rules (100%)
 rename {pkgs/xorg-x11-drv-synaptics => xorg-x11-drv-synaptics}/xorg-x11-drv-synaptics.nm (100%)
 rename {pkgs/xorg-x11-drv-vesa => xorg-x11-drv-vesa}/xorg-x11-drv-vesa.nm (100%)
 rename {pkgs/xorg-x11-drv-vmware => xorg-x11-drv-vmware}/xorg-x11-drv-vmware.nm (100%)
 rename {pkgs/xorg-x11-font-utils => xorg-x11-font-utils}/xorg-x11-font-utils.nm (100%)
 rename {pkgs/xorg-x11-fonts => xorg-x11-fonts}/xorg-x11-fonts.nm (100%)
 rename {pkgs/xorg-x11-proto-devel => xorg-x11-proto-devel}/xorg-x11-proto-devel.nm (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/10-quirks.conf (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.4.99-pic-libxf86config.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.4.99-ssh-isnt-local.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.5.0-bg-none-root.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.5.0-projector-fb-size.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.5.1-mode-debug.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.6.0-less-acpi-brokenness.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.6.99-default-modes.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.6.99-randr-error-debugging.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.6.99-right-of.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.7.0-randr-gamma-restore.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.7.1-gamma-kdm-fix.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.7.1-multilib.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.8-disable-vboxvideo.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.8-no-connected-outputs.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.8-randr-initial.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.8-udev-warning.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch (100%)
 rename {pkgs/xorg-x11-server => xorg-x11-server}/xorg-x11-server.nm (100%)
 rename {pkgs/xorg-x11-util-macros => xorg-x11-util-macros}/xorg-x11-util-macros.nm (100%)
 rename {pkgs/xorg-x11-xinit => xorg-x11-xinit}/xorg-x11-xinit.nm (100%)
 rename {pkgs/xorg-x11-xkb-utils => xorg-x11-xkb-utils}/xorg-x11-xkb-utils.nm (100%)
 rename {pkgs/xorg-x11-xtrans-devel => xorg-x11-xtrans-devel}/patches/xtrans-1.0.3-avoid-gethostname.patch (100%)
 rename {pkgs/xorg-x11-xtrans-devel => xorg-x11-xtrans-devel}/xorg-x11-xtrans-devel.nm (100%)
 rename {pkgs/xrandr => xrandr}/xrandr.nm (100%)
 rename {pkgs/xterm => xterm}/patches/xterm-245-resources.patch (100%)
 rename {pkgs/xterm => xterm}/patches/xterm-256-man-page_paths.patch (100%)
 rename {pkgs/xterm => xterm}/patches/xterm-261-desk.patch (100%)
 rename {pkgs/xterm => xterm}/xterm.nm (100%)
 rename {pkgs/xz => xz}/xz.nm (100%)
 rename {pkgs/zerofree => zerofree}/zerofree.nm (100%)
 rename {pkgs/zlib => zlib}/zlib.nm (100%)

diff --git a/doc/COPYING b/Documentation/COPYING
similarity index 100%
rename from doc/COPYING
rename to Documentation/COPYING
diff --git a/pkgs/X11vnc/X11vnc.nm b/X11vnc/X11vnc.nm
similarity index 100%
rename from pkgs/X11vnc/X11vnc.nm
rename to X11vnc/X11vnc.nm
diff --git a/pkgs/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch b/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
similarity index 100%
rename from pkgs/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
rename to X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
diff --git a/pkgs/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch b/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
similarity index 100%
rename from pkgs/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
rename to X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
diff --git a/pkgs/acl/acl.nm b/acl/acl.nm
similarity index 100%
rename from pkgs/acl/acl.nm
rename to acl/acl.nm
diff --git a/pkgs/acl/patches/acl-2.2.47-build-1.patch b/acl/patches/acl-2.2.47-build-1.patch
similarity index 100%
rename from pkgs/acl/patches/acl-2.2.47-build-1.patch
rename to acl/patches/acl-2.2.47-build-1.patch
diff --git a/pkgs/acl/patches/acl-2.2.47-exitcode.patch b/acl/patches/acl-2.2.47-exitcode.patch
similarity index 100%
rename from pkgs/acl/patches/acl-2.2.47-exitcode.patch
rename to acl/patches/acl-2.2.47-exitcode.patch
diff --git a/pkgs/acl/patches/acl-2.2.47-nfs4.patch b/acl/patches/acl-2.2.47-nfs4.patch
similarity index 100%
rename from pkgs/acl/patches/acl-2.2.47-nfs4.patch
rename to acl/patches/acl-2.2.47-nfs4.patch
diff --git a/pkgs/acl/patches/acl-2.2.47-params.patch b/acl/patches/acl-2.2.47-params.patch
similarity index 100%
rename from pkgs/acl/patches/acl-2.2.47-params.patch
rename to acl/patches/acl-2.2.47-params.patch
diff --git a/pkgs/acl/patches/acl-2.2.47-path_max.patch b/acl/patches/acl-2.2.47-path_max.patch
similarity index 100%
rename from pkgs/acl/patches/acl-2.2.47-path_max.patch
rename to acl/patches/acl-2.2.47-path_max.patch
diff --git a/pkgs/acl/patches/acl-2.2.47-segfault.patch b/acl/patches/acl-2.2.47-segfault.patch
similarity index 100%
rename from pkgs/acl/patches/acl-2.2.47-segfault.patch
rename to acl/patches/acl-2.2.47-segfault.patch
diff --git a/pkgs/acl/patches/acl-2.2.47-walk.patch.broken b/acl/patches/acl-2.2.47-walk.patch.broken
similarity index 100%
rename from pkgs/acl/patches/acl-2.2.47-walk.patch.broken
rename to acl/patches/acl-2.2.47-walk.patch.broken
diff --git a/pkgs/acpid/acpid.nm b/acpid/acpid.nm
similarity index 100%
rename from pkgs/acpid/acpid.nm
rename to acpid/acpid.nm
diff --git a/pkgs/acpid/acpid.sysconfig b/acpid/acpid.sysconfig
similarity index 100%
rename from pkgs/acpid/acpid.sysconfig
rename to acpid/acpid.sysconfig
diff --git a/pkgs/acpid/patches/acpid-2.0.2-makefile.patch b/acpid/patches/acpid-2.0.2-makefile.patch
similarity index 100%
rename from pkgs/acpid/patches/acpid-2.0.2-makefile.patch
rename to acpid/patches/acpid-2.0.2-makefile.patch
diff --git a/pkgs/acpid/power b/acpid/power
similarity index 100%
rename from pkgs/acpid/power
rename to acpid/power
diff --git a/pkgs/acpid/power.sh b/acpid/power.sh
similarity index 100%
rename from pkgs/acpid/power.sh
rename to acpid/power.sh
diff --git a/pkgs/acpid/systemd/acpid.service b/acpid/systemd/acpid.service
similarity index 100%
rename from pkgs/acpid/systemd/acpid.service
rename to acpid/systemd/acpid.service
diff --git a/pkgs/aiccu/aiccu.nm b/aiccu/aiccu.nm
similarity index 100%
rename from pkgs/aiccu/aiccu.nm
rename to aiccu/aiccu.nm
diff --git a/pkgs/attr/attr.nm b/attr/attr.nm
similarity index 100%
rename from pkgs/attr/attr.nm
rename to attr/attr.nm
diff --git a/pkgs/audit/audit.nm b/audit/audit.nm
similarity index 100%
rename from pkgs/audit/audit.nm
rename to audit/audit.nm
diff --git a/pkgs/authconfig/authconfig.nm b/authconfig/authconfig.nm
similarity index 100%
rename from pkgs/authconfig/authconfig.nm
rename to authconfig/authconfig.nm
diff --git a/pkgs/autoconf/autoconf.nm b/autoconf/autoconf.nm
similarity index 100%
rename from pkgs/autoconf/autoconf.nm
rename to autoconf/autoconf.nm
diff --git a/pkgs/autogen/autogen.nm b/autogen/autogen.nm
similarity index 100%
rename from pkgs/autogen/autogen.nm
rename to autogen/autogen.nm
diff --git a/pkgs/autogen/patches/autogen-5.9.4-autoopts-config.patch b/autogen/patches/autogen-5.9.4-autoopts-config.patch
similarity index 100%
rename from pkgs/autogen/patches/autogen-5.9.4-autoopts-config.patch
rename to autogen/patches/autogen-5.9.4-autoopts-config.patch
diff --git a/pkgs/autogen/patches/autogen-5.9.4-pkgconfig.patch b/autogen/patches/autogen-5.9.4-pkgconfig.patch
similarity index 100%
rename from pkgs/autogen/patches/autogen-5.9.4-pkgconfig.patch
rename to autogen/patches/autogen-5.9.4-pkgconfig.patch
diff --git a/pkgs/automake/automake.nm b/automake/automake.nm
similarity index 100%
rename from pkgs/automake/automake.nm
rename to automake/automake.nm
diff --git a/pkgs/avahi/avahi.nm b/avahi/avahi.nm
similarity index 100%
rename from pkgs/avahi/avahi.nm
rename to avahi/avahi.nm
diff --git a/pkgs/basesystem/basesystem.nm b/basesystem/basesystem.nm
similarity index 100%
rename from pkgs/basesystem/basesystem.nm
rename to basesystem/basesystem.nm
diff --git a/pkgs/basesystem/resolv.conf b/basesystem/resolv.conf
similarity index 100%
rename from pkgs/basesystem/resolv.conf
rename to basesystem/resolv.conf
diff --git a/pkgs/bash/bash.nm b/bash/bash.nm
similarity index 100%
rename from pkgs/bash/bash.nm
rename to bash/bash.nm
diff --git a/pkgs/bash/dot_bash_logout b/bash/dot_bash_logout
similarity index 100%
rename from pkgs/bash/dot_bash_logout
rename to bash/dot_bash_logout
diff --git a/pkgs/bash/dot_bash_profile b/bash/dot_bash_profile
similarity index 100%
rename from pkgs/bash/dot_bash_profile
rename to bash/dot_bash_profile
diff --git a/pkgs/bash/dot_bashrc b/bash/dot_bashrc
similarity index 100%
rename from pkgs/bash/dot_bashrc
rename to bash/dot_bashrc
diff --git a/pkgs/bash/patches/bash-4.0-paths-1.patch b/bash/patches/bash-4.0-paths-1.patch
similarity index 100%
rename from pkgs/bash/patches/bash-4.0-paths-1.patch
rename to bash/patches/bash-4.0-paths-1.patch
diff --git a/pkgs/bash/patches/bash-4.0-profile-1.patch b/bash/patches/bash-4.0-profile-1.patch
similarity index 100%
rename from pkgs/bash/patches/bash-4.0-profile-1.patch
rename to bash/patches/bash-4.0-profile-1.patch
diff --git a/pkgs/bash/profile.d/i18n.sh b/bash/profile.d/i18n.sh
similarity index 100%
rename from pkgs/bash/profile.d/i18n.sh
rename to bash/profile.d/i18n.sh
diff --git a/pkgs/bash/profile.d/lang.sh b/bash/profile.d/lang.sh
similarity index 100%
rename from pkgs/bash/profile.d/lang.sh
rename to bash/profile.d/lang.sh
diff --git a/pkgs/bc/bc.nm b/bc/bc.nm
similarity index 100%
rename from pkgs/bc/bc.nm
rename to bc/bc.nm
diff --git a/pkgs/beep/beep.nm b/beep/beep.nm
similarity index 100%
rename from pkgs/beep/beep.nm
rename to beep/beep.nm
diff --git a/pkgs/bind/bind.nm b/bind/bind.nm
similarity index 100%
rename from pkgs/bind/bind.nm
rename to bind/bind.nm
diff --git a/pkgs/binutils/binutils.nm b/binutils/binutils.nm
similarity index 100%
rename from pkgs/binutils/binutils.nm
rename to binutils/binutils.nm
diff --git a/pkgs/binutils/patches/binutils-2.19.1-asprintf_fix.patch b/binutils/patches/binutils-2.19.1-asprintf_fix.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.19.1-asprintf_fix.patch
rename to binutils/patches/binutils-2.19.1-asprintf_fix.patch
diff --git a/pkgs/binutils/patches/binutils-2.19.1-ld_makefile.patch b/binutils/patches/binutils-2.19.1-ld_makefile.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.19.1-ld_makefile.patch
rename to binutils/patches/binutils-2.19.1-ld_makefile.patch
diff --git a/pkgs/binutils/patches/binutils-2.20-objcopy.patch b/binutils/patches/binutils-2.20-objcopy.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20-objcopy.patch
rename to binutils/patches/binutils-2.20-objcopy.patch
diff --git a/pkgs/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch b/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch
rename to binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch
diff --git a/pkgs/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch b/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch
rename to binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch
diff --git a/pkgs/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch b/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch
rename to binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch
diff --git a/pkgs/binutils/patches/binutils-2.20.1-gentoo-use-relro.patch b/binutils/patches/binutils-2.20.1-gentoo-use-relro.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.1-gentoo-use-relro.patch
rename to binutils/patches/binutils-2.20.1-gentoo-use-relro.patch
diff --git a/pkgs/binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch b/binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch
rename to binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch
diff --git a/pkgs/binutils/patches/binutils-2.20.51.0.2-build-id.patch0 b/binutils/patches/binutils-2.20.51.0.2-build-id.patch0
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.51.0.2-build-id.patch0
rename to binutils/patches/binutils-2.20.51.0.2-build-id.patch0
diff --git a/pkgs/binutils/patches/binutils-2.20.51.0.2-pt-pax-flags-20091010.patch b/binutils/patches/binutils-2.20.51.0.2-pt-pax-flags-20091010.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.51.0.2-pt-pax-flags-20091010.patch
rename to binutils/patches/binutils-2.20.51.0.2-pt-pax-flags-20091010.patch
diff --git a/pkgs/binutils/patches/binutils-2.20.51.0.2-version.patch b/binutils/patches/binutils-2.20.51.0.2-version.patch
similarity index 100%
rename from pkgs/binutils/patches/binutils-2.20.51.0.2-version.patch
rename to binutils/patches/binutils-2.20.51.0.2-version.patch
diff --git a/pkgs/bird/bird.nm b/bird/bird.nm
similarity index 100%
rename from pkgs/bird/bird.nm
rename to bird/bird.nm
diff --git a/pkgs/bird/systemd/bird.service b/bird/systemd/bird.service
similarity index 100%
rename from pkgs/bird/systemd/bird.service
rename to bird/systemd/bird.service
diff --git a/pkgs/bird/systemd/bird6.service b/bird/systemd/bird6.service
similarity index 100%
rename from pkgs/bird/systemd/bird6.service
rename to bird/systemd/bird6.service
diff --git a/pkgs/bison/bison.nm b/bison/bison.nm
similarity index 100%
rename from pkgs/bison/bison.nm
rename to bison/bison.nm
diff --git a/pkgs/boost/boost.nm b/boost/boost.nm
similarity index 100%
rename from pkgs/boost/boost.nm
rename to boost/boost.nm
diff --git a/pkgs/boost/patches/boost-1.41.0-iostreams-zlib.patch b/boost/patches/boost-1.41.0-iostreams-zlib.patch
similarity index 100%
rename from pkgs/boost/patches/boost-1.41.0-iostreams-zlib.patch
rename to boost/patches/boost-1.41.0-iostreams-zlib.patch
diff --git a/pkgs/boost/patches/boost-1.41.0-mapnik.patch b/boost/patches/boost-1.41.0-mapnik.patch
similarity index 100%
rename from pkgs/boost/patches/boost-1.41.0-mapnik.patch
rename to boost/patches/boost-1.41.0-mapnik.patch
diff --git a/pkgs/boost/patches/boost-1.41.0-shared_ptr_serialization.patch b/boost/patches/boost-1.41.0-shared_ptr_serialization.patch
similarity index 100%
rename from pkgs/boost/patches/boost-1.41.0-shared_ptr_serialization.patch
rename to boost/patches/boost-1.41.0-shared_ptr_serialization.patch
diff --git a/pkgs/boost/patches/boost-graph-compile.patch b/boost/patches/boost-graph-compile.patch
similarity index 100%
rename from pkgs/boost/patches/boost-graph-compile.patch
rename to boost/patches/boost-graph-compile.patch
diff --git a/pkgs/br2684ctl/br2684ctl.nm b/br2684ctl/br2684ctl.nm
similarity index 100%
rename from pkgs/br2684ctl/br2684ctl.nm
rename to br2684ctl/br2684ctl.nm
diff --git a/pkgs/bridge-utils/bridge-utils.nm b/bridge-utils/bridge-utils.nm
similarity index 100%
rename from pkgs/bridge-utils/bridge-utils.nm
rename to bridge-utils/bridge-utils.nm
diff --git a/pkgs/btrfs-progs/btrfs-progs.nm b/btrfs-progs/btrfs-progs.nm
similarity index 100%
rename from pkgs/btrfs-progs/btrfs-progs.nm
rename to btrfs-progs/btrfs-progs.nm
diff --git a/pkgs/btrfs-progs/patches/btrfs-progs-build-everything.patch b/btrfs-progs/patches/btrfs-progs-build-everything.patch
similarity index 100%
rename from pkgs/btrfs-progs/patches/btrfs-progs-build-everything.patch
rename to btrfs-progs/patches/btrfs-progs-build-everything.patch
diff --git a/pkgs/btrfs-progs/patches/btrfs-progs-build-fixes.patch b/btrfs-progs/patches/btrfs-progs-build-fixes.patch
similarity index 100%
rename from pkgs/btrfs-progs/patches/btrfs-progs-build-fixes.patch
rename to btrfs-progs/patches/btrfs-progs-build-fixes.patch
diff --git a/pkgs/btrfs-progs/patches/btrfs-progs-fix-labels.patch b/btrfs-progs/patches/btrfs-progs-fix-labels.patch
similarity index 100%
rename from pkgs/btrfs-progs/patches/btrfs-progs-fix-labels.patch
rename to btrfs-progs/patches/btrfs-progs-fix-labels.patch
diff --git a/pkgs/btrfs-progs/patches/btrfs-progs-upstream.patch b/btrfs-progs/patches/btrfs-progs-upstream.patch
similarity index 100%
rename from pkgs/btrfs-progs/patches/btrfs-progs-upstream.patch
rename to btrfs-progs/patches/btrfs-progs-upstream.patch
diff --git a/pkgs/btrfs-progs/patches/btrfs-progs-valgrind.patch b/btrfs-progs/patches/btrfs-progs-valgrind.patch
similarity index 100%
rename from pkgs/btrfs-progs/patches/btrfs-progs-valgrind.patch
rename to btrfs-progs/patches/btrfs-progs-valgrind.patch
diff --git a/pkgs/bwm-ng/bwm-ng.nm b/bwm-ng/bwm-ng.nm
similarity index 100%
rename from pkgs/bwm-ng/bwm-ng.nm
rename to bwm-ng/bwm-ng.nm
diff --git a/pkgs/bzip2/bzip2.nm b/bzip2/bzip2.nm
similarity index 100%
rename from pkgs/bzip2/bzip2.nm
rename to bzip2/bzip2.nm
diff --git a/pkgs/bzip2/patches/bzip2-1.0.5-install_docs-1.patch b/bzip2/patches/bzip2-1.0.5-install_docs-1.patch
similarity index 100%
rename from pkgs/bzip2/patches/bzip2-1.0.5-install_docs-1.patch
rename to bzip2/patches/bzip2-1.0.5-install_docs-1.patch
diff --git a/pkgs/c_icap/c_icap.nm b/c_icap/c_icap.nm
similarity index 100%
rename from pkgs/c_icap/c_icap.nm
rename to c_icap/c_icap.nm
diff --git a/pkgs/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm
similarity index 100%
rename from pkgs/c_icap_modules/c_icap_modules.nm
rename to c_icap_modules/c_icap_modules.nm
diff --git a/pkgs/cairo/cairo.nm b/cairo/cairo.nm
similarity index 100%
rename from pkgs/cairo/cairo.nm
rename to cairo/cairo.nm
diff --git a/pkgs/ccache/ccache.nm b/ccache/ccache.nm
similarity index 100%
rename from pkgs/ccache/ccache.nm
rename to ccache/ccache.nm
diff --git a/pkgs/ccache/ccache.sh b/ccache/ccache.sh
similarity index 100%
rename from pkgs/ccache/ccache.sh
rename to ccache/ccache.sh
diff --git a/pkgs/chrony/chrony-helper b/chrony/chrony-helper
similarity index 100%
rename from pkgs/chrony/chrony-helper
rename to chrony/chrony-helper
diff --git a/pkgs/chrony/chrony.conf b/chrony/chrony.conf
similarity index 100%
rename from pkgs/chrony/chrony.conf
rename to chrony/chrony.conf
diff --git a/pkgs/chrony/chrony.dhclient b/chrony/chrony.dhclient
similarity index 100%
rename from pkgs/chrony/chrony.dhclient
rename to chrony/chrony.dhclient
diff --git a/pkgs/chrony/chrony.keys b/chrony/chrony.keys
similarity index 100%
rename from pkgs/chrony/chrony.keys
rename to chrony/chrony.keys
diff --git a/pkgs/chrony/chrony.logrotate b/chrony/chrony.logrotate
similarity index 100%
rename from pkgs/chrony/chrony.logrotate
rename to chrony/chrony.logrotate
diff --git a/pkgs/chrony/chrony.nm b/chrony/chrony.nm
similarity index 100%
rename from pkgs/chrony/chrony.nm
rename to chrony/chrony.nm
diff --git a/pkgs/chrony/systemd/chrony-wait.service b/chrony/systemd/chrony-wait.service
similarity index 100%
rename from pkgs/chrony/systemd/chrony-wait.service
rename to chrony/systemd/chrony-wait.service
diff --git a/pkgs/chrony/systemd/chronyd.service b/chrony/systemd/chronyd.service
similarity index 100%
rename from pkgs/chrony/systemd/chronyd.service
rename to chrony/systemd/chronyd.service
diff --git a/pkgs/chrpath/chrpath.nm b/chrpath/chrpath.nm
similarity index 100%
rename from pkgs/chrpath/chrpath.nm
rename to chrpath/chrpath.nm
diff --git a/pkgs/chrpath/patches/chrpath-0.13-NULL-entry.patch b/chrpath/patches/chrpath-0.13-NULL-entry.patch
similarity index 100%
rename from pkgs/chrpath/patches/chrpath-0.13-NULL-entry.patch
rename to chrpath/patches/chrpath-0.13-NULL-entry.patch
diff --git a/pkgs/clamav/clamav.nm b/clamav/clamav.nm
similarity index 100%
rename from pkgs/clamav/clamav.nm
rename to clamav/clamav.nm
diff --git a/pkgs/cloog-ppl/cloog-ppl.nm b/cloog-ppl/cloog-ppl.nm
similarity index 100%
rename from pkgs/cloog-ppl/cloog-ppl.nm
rename to cloog-ppl/cloog-ppl.nm
diff --git a/pkgs/cmake/cmake.nm b/cmake/cmake.nm
similarity index 100%
rename from pkgs/cmake/cmake.nm
rename to cmake/cmake.nm
diff --git a/config/default.conf b/config/default.conf
deleted file mode 120000
index 30be3bd40..000000000
--- a/config/default.conf
+++ /dev/null
@@ -1 +0,0 @@
-ipfire-3-i686.conf
\ No newline at end of file
diff --git a/config/ipfire-3-i686.conf b/config/ipfire-3-i686.conf
deleted file mode 100644
index f8045d86b..000000000
--- a/config/ipfire-3-i686.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-
-[distro]
-name = IPFire
-version = 3.0-alpha2
-slogan = Gluttony
-
-maintainer = IPFire Development Team <developers@ipfire.org>
-vendor = ipfire
-arch = i686
-
-source_dl = http://source.ipfire.org/sources-3.x/
-
-[testingbay]
-description = IPFire Testing Repository
-
-mirrorlist = http://people.ipfire.org/~ms/testingbay/mirrors
-
-url = http://people.ipfire.org/~ms/testingbay
-
diff --git a/config/pakfire.conf b/config/pakfire.conf
deleted file mode 100644
index 70d54fec6..000000000
--- a/config/pakfire.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# This is the main configuration file for pakfire.
-
-[main]
-logfile = /var/log/pakfire.log
diff --git a/pkgs/coreutils/coreutils.nm b/coreutils/coreutils.nm
similarity index 100%
rename from pkgs/coreutils/coreutils.nm
rename to coreutils/coreutils.nm
diff --git a/pkgs/coreutils/pam.d/su b/coreutils/pam.d/su
similarity index 100%
rename from pkgs/coreutils/pam.d/su
rename to coreutils/pam.d/su
diff --git a/pkgs/coreutils/pam.d/su-l b/coreutils/pam.d/su-l
similarity index 100%
rename from pkgs/coreutils/pam.d/su-l
rename to coreutils/pam.d/su-l
diff --git a/pkgs/coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off b/coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off
similarity index 100%
rename from pkgs/coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off
rename to coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off
diff --git a/pkgs/coreutils/patches/coreutils-8.5-pam.patch b/coreutils/patches/coreutils-8.5-pam.patch
similarity index 100%
rename from pkgs/coreutils/patches/coreutils-8.5-pam.patch
rename to coreutils/patches/coreutils-8.5-pam.patch
diff --git a/pkgs/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch
similarity index 100%
rename from pkgs/coreutils/patches/coreutils-i18n.patch
rename to coreutils/patches/coreutils-i18n.patch
diff --git a/pkgs/coreutils/patches/coreutils-selinux.patch b/coreutils/patches/coreutils-selinux.patch
similarity index 100%
rename from pkgs/coreutils/patches/coreutils-selinux.patch
rename to coreutils/patches/coreutils-selinux.patch
diff --git a/pkgs/coreutils/patches/coreutils-selinuxmanpages.patch b/coreutils/patches/coreutils-selinuxmanpages.patch
similarity index 100%
rename from pkgs/coreutils/patches/coreutils-selinuxmanpages.patch
rename to coreutils/patches/coreutils-selinuxmanpages.patch
diff --git a/pkgs/coreutils/profile.d/colorls.sh b/coreutils/profile.d/colorls.sh
similarity index 100%
rename from pkgs/coreutils/profile.d/colorls.sh
rename to coreutils/profile.d/colorls.sh
diff --git a/pkgs/cpio/cpio.nm b/cpio/cpio.nm
similarity index 100%
rename from pkgs/cpio/cpio.nm
rename to cpio/cpio.nm
diff --git a/pkgs/cpufrequtils/cpufrequtils.nm b/cpufrequtils/cpufrequtils.nm
similarity index 100%
rename from pkgs/cpufrequtils/cpufrequtils.nm
rename to cpufrequtils/cpufrequtils.nm
diff --git a/pkgs/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch b/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch
similarity index 100%
rename from pkgs/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch
rename to cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch
diff --git a/pkgs/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch b/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch
similarity index 100%
rename from pkgs/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch
rename to cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch
diff --git a/pkgs/cpufrequtils/patches/cpufrequtils-multilib.patch b/cpufrequtils/patches/cpufrequtils-multilib.patch
similarity index 100%
rename from pkgs/cpufrequtils/patches/cpufrequtils-multilib.patch
rename to cpufrequtils/patches/cpufrequtils-multilib.patch
diff --git a/pkgs/cpufrequtils/patches/disable-gsic.patch b/cpufrequtils/patches/disable-gsic.patch
similarity index 100%
rename from pkgs/cpufrequtils/patches/disable-gsic.patch
rename to cpufrequtils/patches/disable-gsic.patch
diff --git a/pkgs/cracklib/cracklib.nm b/cracklib/cracklib.nm
similarity index 100%
rename from pkgs/cracklib/cracklib.nm
rename to cracklib/cracklib.nm
diff --git a/pkgs/crda/crda.nm b/crda/crda.nm
similarity index 100%
rename from pkgs/crda/crda.nm
rename to crda/crda.nm
diff --git a/pkgs/cronie/cronie.nm b/cronie/cronie.nm
similarity index 100%
rename from pkgs/cronie/cronie.nm
rename to cronie/cronie.nm
diff --git a/pkgs/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm
similarity index 100%
rename from pkgs/cryptsetup-luks/cryptsetup-luks.nm
rename to cryptsetup-luks/cryptsetup-luks.nm
diff --git a/pkgs/cups/cups.logrotate b/cups/cups.logrotate
similarity index 100%
rename from pkgs/cups/cups.logrotate
rename to cups/cups.logrotate
diff --git a/pkgs/cups/cups.nm b/cups/cups.nm
similarity index 100%
rename from pkgs/cups/cups.nm
rename to cups/cups.nm
diff --git a/pkgs/cups/patches/cups-0755.patch b/cups/patches/cups-0755.patch
similarity index 100%
rename from pkgs/cups/patches/cups-0755.patch
rename to cups/patches/cups-0755.patch
diff --git a/pkgs/cups/patches/cups-1.1.16-system-auth.patch b/cups/patches/cups-1.1.16-system-auth.patch
similarity index 100%
rename from pkgs/cups/patches/cups-1.1.16-system-auth.patch
rename to cups/patches/cups-1.1.16-system-auth.patch
diff --git a/pkgs/cups/patches/cups-EAI_AGAIN.patch b/cups/patches/cups-EAI_AGAIN.patch
similarity index 100%
rename from pkgs/cups/patches/cups-EAI_AGAIN.patch
rename to cups/patches/cups-EAI_AGAIN.patch
diff --git a/pkgs/cups/patches/cups-autotype-crash.patch b/cups/patches/cups-autotype-crash.patch
similarity index 100%
rename from pkgs/cups/patches/cups-autotype-crash.patch
rename to cups/patches/cups-autotype-crash.patch
diff --git a/pkgs/cups/patches/cups-avahi.patch b/cups/patches/cups-avahi.patch
similarity index 100%
rename from pkgs/cups/patches/cups-avahi.patch
rename to cups/patches/cups-avahi.patch
diff --git a/pkgs/cups/patches/cups-banners.patch b/cups/patches/cups-banners.patch
similarity index 100%
rename from pkgs/cups/patches/cups-banners.patch
rename to cups/patches/cups-banners.patch
diff --git a/pkgs/cups/patches/cups-build.patch b/cups/patches/cups-build.patch
similarity index 100%
rename from pkgs/cups/patches/cups-build.patch
rename to cups/patches/cups-build.patch
diff --git a/pkgs/cups/patches/cups-cups-get-classes.patch b/cups/patches/cups-cups-get-classes.patch
similarity index 100%
rename from pkgs/cups/patches/cups-cups-get-classes.patch
rename to cups/patches/cups-cups-get-classes.patch
diff --git a/pkgs/cups/patches/cups-direct-usb.patch b/cups/patches/cups-direct-usb.patch
similarity index 100%
rename from pkgs/cups/patches/cups-direct-usb.patch
rename to cups/patches/cups-direct-usb.patch
diff --git a/pkgs/cups/patches/cups-dnssd-deviceid.patch b/cups/patches/cups-dnssd-deviceid.patch
similarity index 100%
rename from pkgs/cups/patches/cups-dnssd-deviceid.patch
rename to cups/patches/cups-dnssd-deviceid.patch
diff --git a/pkgs/cups/patches/cups-driverd-timeout.patch b/cups/patches/cups-driverd-timeout.patch
similarity index 100%
rename from pkgs/cups/patches/cups-driverd-timeout.patch
rename to cups/patches/cups-driverd-timeout.patch
diff --git a/pkgs/cups/patches/cups-eggcups.patch b/cups/patches/cups-eggcups.patch
similarity index 100%
rename from pkgs/cups/patches/cups-eggcups.patch
rename to cups/patches/cups-eggcups.patch
diff --git a/pkgs/cups/patches/cups-filter-debug.patch b/cups/patches/cups-filter-debug.patch
similarity index 100%
rename from pkgs/cups/patches/cups-filter-debug.patch
rename to cups/patches/cups-filter-debug.patch
diff --git a/pkgs/cups/patches/cups-force-gnutls.patch b/cups/patches/cups-force-gnutls.patch
similarity index 100%
rename from pkgs/cups/patches/cups-force-gnutls.patch
rename to cups/patches/cups-force-gnutls.patch
diff --git a/pkgs/cups/patches/cups-getpass.patch b/cups/patches/cups-getpass.patch
similarity index 100%
rename from pkgs/cups/patches/cups-getpass.patch
rename to cups/patches/cups-getpass.patch
diff --git a/pkgs/cups/patches/cups-hostnamelookups.patch b/cups/patches/cups-hostnamelookups.patch
similarity index 100%
rename from pkgs/cups/patches/cups-hostnamelookups.patch
rename to cups/patches/cups-hostnamelookups.patch
diff --git a/pkgs/cups/patches/cups-hp-deviceid-oid.patch b/cups/patches/cups-hp-deviceid-oid.patch
similarity index 100%
rename from pkgs/cups/patches/cups-hp-deviceid-oid.patch
rename to cups/patches/cups-hp-deviceid-oid.patch
diff --git a/pkgs/cups/patches/cups-logrotate.patch b/cups/patches/cups-logrotate.patch
similarity index 100%
rename from pkgs/cups/patches/cups-logrotate.patch
rename to cups/patches/cups-logrotate.patch
diff --git a/pkgs/cups/patches/cups-lpr-help.patch b/cups/patches/cups-lpr-help.patch
similarity index 100%
rename from pkgs/cups/patches/cups-lpr-help.patch
rename to cups/patches/cups-lpr-help.patch
diff --git a/pkgs/cups/patches/cups-multilib.patch b/cups/patches/cups-multilib.patch
similarity index 100%
rename from pkgs/cups/patches/cups-multilib.patch
rename to cups/patches/cups-multilib.patch
diff --git a/pkgs/cups/patches/cups-no-export-ssllibs.patch b/cups/patches/cups-no-export-ssllibs.patch
similarity index 100%
rename from pkgs/cups/patches/cups-no-export-ssllibs.patch
rename to cups/patches/cups-no-export-ssllibs.patch
diff --git a/pkgs/cups/patches/cups-no-gzip-man.patch b/cups/patches/cups-no-gzip-man.patch
similarity index 100%
rename from pkgs/cups/patches/cups-no-gzip-man.patch
rename to cups/patches/cups-no-gzip-man.patch
diff --git a/pkgs/cups/patches/cups-page-label.patch b/cups/patches/cups-page-label.patch
similarity index 100%
rename from pkgs/cups/patches/cups-page-label.patch
rename to cups/patches/cups-page-label.patch
diff --git a/pkgs/cups/patches/cups-peercred.patch b/cups/patches/cups-peercred.patch
similarity index 100%
rename from pkgs/cups/patches/cups-peercred.patch
rename to cups/patches/cups-peercred.patch
diff --git a/pkgs/cups/patches/cups-pid.patch b/cups/patches/cups-pid.patch
similarity index 100%
rename from pkgs/cups/patches/cups-pid.patch
rename to cups/patches/cups-pid.patch
diff --git a/pkgs/cups/patches/cups-res_init.patch b/cups/patches/cups-res_init.patch
similarity index 100%
rename from pkgs/cups/patches/cups-res_init.patch
rename to cups/patches/cups-res_init.patch
diff --git a/pkgs/cups/patches/cups-ricoh-deviceid-oid.patch b/cups/patches/cups-ricoh-deviceid-oid.patch
similarity index 100%
rename from pkgs/cups/patches/cups-ricoh-deviceid-oid.patch
rename to cups/patches/cups-ricoh-deviceid-oid.patch
diff --git a/pkgs/cups/patches/cups-serial.patch b/cups/patches/cups-serial.patch
similarity index 100%
rename from pkgs/cups/patches/cups-serial.patch
rename to cups/patches/cups-serial.patch
diff --git a/pkgs/cups/patches/cups-serialize-gnutls.patch b/cups/patches/cups-serialize-gnutls.patch
similarity index 100%
rename from pkgs/cups/patches/cups-serialize-gnutls.patch
rename to cups/patches/cups-serialize-gnutls.patch
diff --git a/pkgs/cups/patches/cups-serverbin-compat.patch b/cups/patches/cups-serverbin-compat.patch
similarity index 100%
rename from pkgs/cups/patches/cups-serverbin-compat.patch
rename to cups/patches/cups-serverbin-compat.patch
diff --git a/pkgs/cups/patches/cups-snmp-quirks.patch b/cups/patches/cups-snmp-quirks.patch
similarity index 100%
rename from pkgs/cups/patches/cups-snmp-quirks.patch
rename to cups/patches/cups-snmp-quirks.patch
diff --git a/pkgs/cups/patches/cups-str3382.patch b/cups/patches/cups-str3382.patch
similarity index 100%
rename from pkgs/cups/patches/cups-str3382.patch
rename to cups/patches/cups-str3382.patch
diff --git a/pkgs/cups/patches/cups-str3754.patch b/cups/patches/cups-str3754.patch
similarity index 100%
rename from pkgs/cups/patches/cups-str3754.patch
rename to cups/patches/cups-str3754.patch
diff --git a/pkgs/cups/patches/cups-strict-ppd-line-length.patch b/cups/patches/cups-strict-ppd-line-length.patch
similarity index 100%
rename from pkgs/cups/patches/cups-strict-ppd-line-length.patch
rename to cups/patches/cups-strict-ppd-line-length.patch
diff --git a/pkgs/cups/patches/cups-texttops-rotate-page.patch b/cups/patches/cups-texttops-rotate-page.patch
similarity index 100%
rename from pkgs/cups/patches/cups-texttops-rotate-page.patch
rename to cups/patches/cups-texttops-rotate-page.patch
diff --git a/pkgs/cups/patches/cups-uri-compat.patch b/cups/patches/cups-uri-compat.patch
similarity index 100%
rename from pkgs/cups/patches/cups-uri-compat.patch
rename to cups/patches/cups-uri-compat.patch
diff --git a/pkgs/cups/patches/cups-usb-paperout.patch b/cups/patches/cups-usb-paperout.patch
similarity index 100%
rename from pkgs/cups/patches/cups-usb-paperout.patch
rename to cups/patches/cups-usb-paperout.patch
diff --git a/pkgs/cups/patches/cups-x-lspp.patch b/cups/patches/cups-x-lspp.patch
similarity index 100%
rename from pkgs/cups/patches/cups-x-lspp.patch
rename to cups/patches/cups-x-lspp.patch
diff --git a/pkgs/cups/systemd/cups.service b/cups/systemd/cups.service
similarity index 100%
rename from pkgs/cups/systemd/cups.service
rename to cups/systemd/cups.service
diff --git a/pkgs/curl/curl.nm b/curl/curl.nm
similarity index 100%
rename from pkgs/curl/curl.nm
rename to curl/curl.nm
diff --git a/pkgs/curl/patches/0101-curl-7.21.1-multilib.patch b/curl/patches/0101-curl-7.21.1-multilib.patch
similarity index 100%
rename from pkgs/curl/patches/0101-curl-7.21.1-multilib.patch
rename to curl/patches/0101-curl-7.21.1-multilib.patch
diff --git a/pkgs/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm
similarity index 100%
rename from pkgs/cyrus-sasl/cyrus-sasl.nm
rename to cyrus-sasl/cyrus-sasl.nm
diff --git a/pkgs/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch b/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
similarity index 100%
rename from pkgs/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
rename to cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
diff --git a/pkgs/cyrus-sasl/smtpd.conf b/cyrus-sasl/smtpd.conf
similarity index 100%
rename from pkgs/cyrus-sasl/smtpd.conf
rename to cyrus-sasl/smtpd.conf
diff --git a/pkgs/dansguardian/dansguardian.nm b/dansguardian/dansguardian.nm
similarity index 100%
rename from pkgs/dansguardian/dansguardian.nm
rename to dansguardian/dansguardian.nm
diff --git a/pkgs/dansguardian/patches/dansguardian-gcc44.patch b/dansguardian/patches/dansguardian-gcc44.patch
similarity index 100%
rename from pkgs/dansguardian/patches/dansguardian-gcc44.patch
rename to dansguardian/patches/dansguardian-gcc44.patch
diff --git a/pkgs/db4/db4.nm b/db4/db4.nm
similarity index 100%
rename from pkgs/db4/db4.nm
rename to db4/db4.nm
diff --git a/pkgs/db4/patches/db-4.7.25-upstream_fixes-1.patch b/db4/patches/db-4.7.25-upstream_fixes-1.patch
similarity index 100%
rename from pkgs/db4/patches/db-4.7.25-upstream_fixes-1.patch
rename to db4/patches/db-4.7.25-upstream_fixes-1.patch
diff --git a/pkgs/dbus-glib/dbus-glib.nm b/dbus-glib/dbus-glib.nm
similarity index 100%
rename from pkgs/dbus-glib/dbus-glib.nm
rename to dbus-glib/dbus-glib.nm
diff --git a/pkgs/dbus/dbus.nm b/dbus/dbus.nm
similarity index 100%
rename from pkgs/dbus/dbus.nm
rename to dbus/dbus.nm
diff --git a/pkgs/dejagnu/dejagnu.nm b/dejagnu/dejagnu.nm
similarity index 100%
rename from pkgs/dejagnu/dejagnu.nm
rename to dejagnu/dejagnu.nm
diff --git a/pkgs/dejagnu/patches/dejagnu-1.4.4-runtest.patch b/dejagnu/patches/dejagnu-1.4.4-runtest.patch
similarity index 100%
rename from pkgs/dejagnu/patches/dejagnu-1.4.4-runtest.patch
rename to dejagnu/patches/dejagnu-1.4.4-runtest.patch
diff --git a/pkgs/dejagnu/patches/dejagnu-1.4.4-smp-1.patch b/dejagnu/patches/dejagnu-1.4.4-smp-1.patch
similarity index 100%
rename from pkgs/dejagnu/patches/dejagnu-1.4.4-smp-1.patch
rename to dejagnu/patches/dejagnu-1.4.4-smp-1.patch
diff --git a/pkgs/dejagnu/patches/dejagnu-1.4.4-testsuite.patch b/dejagnu/patches/dejagnu-1.4.4-testsuite.patch
similarity index 100%
rename from pkgs/dejagnu/patches/dejagnu-1.4.4-testsuite.patch
rename to dejagnu/patches/dejagnu-1.4.4-testsuite.patch
diff --git a/pkgs/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch b/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
similarity index 100%
rename from pkgs/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
rename to dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
diff --git a/pkgs/dhcp/dhclient-script b/dhcp/dhclient-script
similarity index 100%
rename from pkgs/dhcp/dhclient-script
rename to dhcp/dhclient-script
diff --git a/pkgs/dhcp/dhcp.nm b/dhcp/dhcp.nm
similarity index 100%
rename from pkgs/dhcp/dhcp.nm
rename to dhcp/dhcp.nm
diff --git a/pkgs/dhcping/dhcping.nm b/dhcping/dhcping.nm
similarity index 100%
rename from pkgs/dhcping/dhcping.nm
rename to dhcping/dhcping.nm
diff --git a/pkgs/diffutils/diffutils.nm b/diffutils/diffutils.nm
similarity index 100%
rename from pkgs/diffutils/diffutils.nm
rename to diffutils/diffutils.nm
diff --git a/pkgs/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch b/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch
similarity index 100%
rename from pkgs/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch
rename to diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch
diff --git a/pkgs/diffutils/patches/diffutils-2.9-i18n-1.patch b/diffutils/patches/diffutils-2.9-i18n-1.patch
similarity index 100%
rename from pkgs/diffutils/patches/diffutils-2.9-i18n-1.patch
rename to diffutils/patches/diffutils-2.9-i18n-1.patch
diff --git a/pkgs/directfb/directfb.nm b/directfb/directfb.nm
similarity index 100%
rename from pkgs/directfb/directfb.nm
rename to directfb/directfb.nm
diff --git a/pkgs/dmidecode/dmidecode.nm b/dmidecode/dmidecode.nm
similarity index 100%
rename from pkgs/dmidecode/dmidecode.nm
rename to dmidecode/dmidecode.nm
diff --git a/pkgs/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch b/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
similarity index 100%
rename from pkgs/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
rename to dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
diff --git a/pkgs/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch b/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
similarity index 100%
rename from pkgs/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
rename to dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
diff --git a/pkgs/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch b/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
similarity index 100%
rename from pkgs/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
rename to dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
diff --git a/pkgs/dmidecode/patches/dmidecode-2.10-smbios-updates.patch b/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
similarity index 100%
rename from pkgs/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
rename to dmidecode/patches/dmidecode-2.10-smbios-updates.patch
diff --git a/pkgs/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch b/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
similarity index 100%
rename from pkgs/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
rename to dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
diff --git a/pkgs/dmraid/dmraid.nm b/dmraid/dmraid.nm
similarity index 100%
rename from pkgs/dmraid/dmraid.nm
rename to dmraid/dmraid.nm
diff --git a/pkgs/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm
similarity index 100%
rename from pkgs/dos2unix/dos2unix.nm
rename to dos2unix/dos2unix.nm
diff --git a/pkgs/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm
similarity index 100%
rename from pkgs/dosfstools/dosfstools.nm
rename to dosfstools/dosfstools.nm
diff --git a/pkgs/dracut/dracut.nm b/dracut/dracut.nm
similarity index 100%
rename from pkgs/dracut/dracut.nm
rename to dracut/dracut.nm
diff --git a/pkgs/dracut/ipfire.conf b/dracut/ipfire.conf
similarity index 100%
rename from pkgs/dracut/ipfire.conf
rename to dracut/ipfire.conf
diff --git a/pkgs/dvdrtools/dvdrtools.nm b/dvdrtools/dvdrtools.nm
similarity index 100%
rename from pkgs/dvdrtools/dvdrtools.nm
rename to dvdrtools/dvdrtools.nm
diff --git a/pkgs/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm
similarity index 100%
rename from pkgs/e2fsprogs/e2fsprogs.nm
rename to e2fsprogs/e2fsprogs.nm
diff --git a/pkgs/ebtables/ebtables.nm b/ebtables/ebtables.nm
similarity index 100%
rename from pkgs/ebtables/ebtables.nm
rename to ebtables/ebtables.nm
diff --git a/pkgs/ebtables/patches/ebtables-2.0.8-cflags.patch b/ebtables/patches/ebtables-2.0.8-cflags.patch
similarity index 100%
rename from pkgs/ebtables/patches/ebtables-2.0.8-cflags.patch
rename to ebtables/patches/ebtables-2.0.8-cflags.patch
diff --git a/pkgs/ebtables/patches/ebtables-2.0.8-norootinst.patch b/ebtables/patches/ebtables-2.0.8-norootinst.patch
similarity index 100%
rename from pkgs/ebtables/patches/ebtables-2.0.8-norootinst.patch
rename to ebtables/patches/ebtables-2.0.8-norootinst.patch
diff --git a/pkgs/ebtables/patches/ebtables-2.0.9-lsb.patch b/ebtables/patches/ebtables-2.0.9-lsb.patch
similarity index 100%
rename from pkgs/ebtables/patches/ebtables-2.0.9-lsb.patch
rename to ebtables/patches/ebtables-2.0.9-lsb.patch
diff --git a/pkgs/ed/ed.nm b/ed/ed.nm
similarity index 100%
rename from pkgs/ed/ed.nm
rename to ed/ed.nm
diff --git a/pkgs/eggdbus/eggdbus.nm b/eggdbus/eggdbus.nm
similarity index 100%
rename from pkgs/eggdbus/eggdbus.nm
rename to eggdbus/eggdbus.nm
diff --git a/pkgs/eject/eject.nm b/eject/eject.nm
similarity index 100%
rename from pkgs/eject/eject.nm
rename to eject/eject.nm
diff --git a/pkgs/eject/patches/eject-2.1.1-verbose.patch b/eject/patches/eject-2.1.1-verbose.patch
similarity index 100%
rename from pkgs/eject/patches/eject-2.1.1-verbose.patch
rename to eject/patches/eject-2.1.1-verbose.patch
diff --git a/pkgs/eject/patches/eject-2.1.5-lock.patch b/eject/patches/eject-2.1.5-lock.patch
similarity index 100%
rename from pkgs/eject/patches/eject-2.1.5-lock.patch
rename to eject/patches/eject-2.1.5-lock.patch
diff --git a/pkgs/eject/patches/eject-2.1.5-opendevice.patch b/eject/patches/eject-2.1.5-opendevice.patch
similarity index 100%
rename from pkgs/eject/patches/eject-2.1.5-opendevice.patch
rename to eject/patches/eject-2.1.5-opendevice.patch
diff --git a/pkgs/eject/patches/eject-2.1.5-spaces.patch b/eject/patches/eject-2.1.5-spaces.patch
similarity index 100%
rename from pkgs/eject/patches/eject-2.1.5-spaces.patch
rename to eject/patches/eject-2.1.5-spaces.patch
diff --git a/pkgs/eject/patches/eject-2.1.5-umount.patch b/eject/patches/eject-2.1.5-umount.patch
similarity index 100%
rename from pkgs/eject/patches/eject-2.1.5-umount.patch
rename to eject/patches/eject-2.1.5-umount.patch
diff --git a/pkgs/eject/patches/eject-timeout.patch b/eject/patches/eject-timeout.patch
similarity index 100%
rename from pkgs/eject/patches/eject-timeout.patch
rename to eject/patches/eject-timeout.patch
diff --git a/pkgs/elfutils/elfutils.nm b/elfutils/elfutils.nm
similarity index 100%
rename from pkgs/elfutils/elfutils.nm
rename to elfutils/elfutils.nm
diff --git a/pkgs/elfutils/patches/elfutils-portability.patch b/elfutils/patches/elfutils-portability.patch
similarity index 100%
rename from pkgs/elfutils/patches/elfutils-portability.patch
rename to elfutils/patches/elfutils-portability.patch
diff --git a/pkgs/elfutils/patches/elfutils-robustify.patch b/elfutils/patches/elfutils-robustify.patch
similarity index 100%
rename from pkgs/elfutils/patches/elfutils-robustify.patch
rename to elfutils/patches/elfutils-robustify.patch
diff --git a/pkgs/elinks/elinks.nm b/elinks/elinks.nm
similarity index 100%
rename from pkgs/elinks/elinks.nm
rename to elinks/elinks.nm
diff --git a/pkgs/etherwake/etherwake.nm b/etherwake/etherwake.nm
similarity index 100%
rename from pkgs/etherwake/etherwake.nm
rename to etherwake/etherwake.nm
diff --git a/pkgs/etherwake/patches/etherwake-1.09-install.patch b/etherwake/patches/etherwake-1.09-install.patch
similarity index 100%
rename from pkgs/etherwake/patches/etherwake-1.09-install.patch
rename to etherwake/patches/etherwake-1.09-install.patch
diff --git a/pkgs/ethtool/ethtool.nm b/ethtool/ethtool.nm
similarity index 100%
rename from pkgs/ethtool/ethtool.nm
rename to ethtool/ethtool.nm
diff --git a/pkgs/expat/expat.nm b/expat/expat.nm
similarity index 100%
rename from pkgs/expat/expat.nm
rename to expat/expat.nm
diff --git a/pkgs/expect/expect.nm b/expect/expect.nm
similarity index 100%
rename from pkgs/expect/expect.nm
rename to expect/expect.nm
diff --git a/pkgs/expect/patches/expect-5.32.2-random.patch b/expect/patches/expect-5.32.2-random.patch
similarity index 100%
rename from pkgs/expect/patches/expect-5.32.2-random.patch
rename to expect/patches/expect-5.32.2-random.patch
diff --git a/pkgs/expect/patches/expect-5.38.0-lib-spec.patch b/expect/patches/expect-5.38.0-lib-spec.patch
similarity index 100%
rename from pkgs/expect/patches/expect-5.38.0-lib-spec.patch
rename to expect/patches/expect-5.38.0-lib-spec.patch
diff --git a/pkgs/expect/patches/expect-5.39.0-libdir.patch b/expect/patches/expect-5.39.0-libdir.patch
similarity index 100%
rename from pkgs/expect/patches/expect-5.39.0-libdir.patch
rename to expect/patches/expect-5.39.0-libdir.patch
diff --git a/pkgs/expect/patches/expect-5.43.0-override_default_prefix.patch b/expect/patches/expect-5.43.0-override_default_prefix.patch
similarity index 100%
rename from pkgs/expect/patches/expect-5.43.0-override_default_prefix.patch
rename to expect/patches/expect-5.43.0-override_default_prefix.patch
diff --git a/pkgs/expect/patches/expect-5.43.0-spawn-1.patch b/expect/patches/expect-5.43.0-spawn-1.patch
similarity index 100%
rename from pkgs/expect/patches/expect-5.43.0-spawn-1.patch
rename to expect/patches/expect-5.43.0-spawn-1.patch
diff --git a/pkgs/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch b/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch
similarity index 100%
rename from pkgs/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch
rename to expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch
diff --git a/pkgs/ez-ipupdate/ez-ipupdate.nm b/ez-ipupdate/ez-ipupdate.nm
similarity index 100%
rename from pkgs/ez-ipupdate/ez-ipupdate.nm
rename to ez-ipupdate/ez-ipupdate.nm
diff --git a/pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch b/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
similarity index 100%
rename from pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
rename to ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
diff --git a/pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch b/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
similarity index 100%
rename from pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
rename to ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
diff --git a/pkgs/fail2ban/fail2ban.logrotate b/fail2ban/fail2ban.logrotate
similarity index 100%
rename from pkgs/fail2ban/fail2ban.logrotate
rename to fail2ban/fail2ban.logrotate
diff --git a/pkgs/fail2ban/fail2ban.nm b/fail2ban/fail2ban.nm
similarity index 100%
rename from pkgs/fail2ban/fail2ban.nm
rename to fail2ban/fail2ban.nm
diff --git a/pkgs/fail2ban/patches/fail2ban-0.8.1-sshd.patch b/fail2ban/patches/fail2ban-0.8.1-sshd.patch
similarity index 100%
rename from pkgs/fail2ban/patches/fail2ban-0.8.1-sshd.patch
rename to fail2ban/patches/fail2ban-0.8.1-sshd.patch
diff --git a/pkgs/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch b/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
similarity index 100%
rename from pkgs/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
rename to fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
diff --git a/pkgs/fail2ban/patches/fail2ban-0.8.3-init.patch b/fail2ban/patches/fail2ban-0.8.3-init.patch
similarity index 100%
rename from pkgs/fail2ban/patches/fail2ban-0.8.3-init.patch
rename to fail2ban/patches/fail2ban-0.8.3-init.patch
diff --git a/pkgs/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch b/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
similarity index 100%
rename from pkgs/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
rename to fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
diff --git a/pkgs/file/file.nm b/file/file.nm
similarity index 100%
rename from pkgs/file/file.nm
rename to file/file.nm
diff --git a/pkgs/filesystem/filesystem.nm b/filesystem/filesystem.nm
similarity index 100%
rename from pkgs/filesystem/filesystem.nm
rename to filesystem/filesystem.nm
diff --git a/pkgs/findutils/findutils.nm b/findutils/findutils.nm
similarity index 100%
rename from pkgs/findutils/findutils.nm
rename to findutils/findutils.nm
diff --git a/pkgs/firewall/firewall.nm b/firewall/firewall.nm
similarity index 100%
rename from pkgs/firewall/firewall.nm
rename to firewall/firewall.nm
diff --git a/pkgs/firewall/src/firewall b/firewall/src/firewall
similarity index 100%
rename from pkgs/firewall/src/firewall
rename to firewall/src/firewall
diff --git a/pkgs/firewall/src/functions b/firewall/src/functions
similarity index 100%
rename from pkgs/firewall/src/functions
rename to firewall/src/functions
diff --git a/pkgs/firewall/src/functions.commands b/firewall/src/functions.commands
similarity index 100%
rename from pkgs/firewall/src/functions.commands
rename to firewall/src/functions.commands
diff --git a/pkgs/firewall/src/functions.config b/firewall/src/functions.config
similarity index 100%
rename from pkgs/firewall/src/functions.config
rename to firewall/src/functions.config
diff --git a/pkgs/firewall/src/functions.firewall b/firewall/src/functions.firewall
similarity index 100%
rename from pkgs/firewall/src/functions.firewall
rename to firewall/src/functions.firewall
diff --git a/pkgs/firewall/src/functions.ip b/firewall/src/functions.ip
similarity index 100%
rename from pkgs/firewall/src/functions.ip
rename to firewall/src/functions.ip
diff --git a/pkgs/firewall/src/functions.iptables b/firewall/src/functions.iptables
similarity index 100%
rename from pkgs/firewall/src/functions.iptables
rename to firewall/src/functions.iptables
diff --git a/pkgs/firewall/src/functions.macros b/firewall/src/functions.macros
similarity index 100%
rename from pkgs/firewall/src/functions.macros
rename to firewall/src/functions.macros
diff --git a/pkgs/firewall/src/functions.zones b/firewall/src/functions.zones
similarity index 100%
rename from pkgs/firewall/src/functions.zones
rename to firewall/src/functions.zones
diff --git a/pkgs/firewall/src/macros/DHCP b/firewall/src/macros/DHCP
similarity index 100%
rename from pkgs/firewall/src/macros/DHCP
rename to firewall/src/macros/DHCP
diff --git a/pkgs/firewall/src/macros/HTTP b/firewall/src/macros/HTTP
similarity index 100%
rename from pkgs/firewall/src/macros/HTTP
rename to firewall/src/macros/HTTP
diff --git a/pkgs/firewall/src/macros/HTTPS b/firewall/src/macros/HTTPS
similarity index 100%
rename from pkgs/firewall/src/macros/HTTPS
rename to firewall/src/macros/HTTPS
diff --git a/pkgs/firewall/src/macros/WWW b/firewall/src/macros/WWW
similarity index 100%
rename from pkgs/firewall/src/macros/WWW
rename to firewall/src/macros/WWW
diff --git a/pkgs/firewall/src/zones.green b/firewall/src/zones.green
similarity index 100%
rename from pkgs/firewall/src/zones.green
rename to firewall/src/zones.green
diff --git a/pkgs/firewall/src/zones.orange b/firewall/src/zones.orange
similarity index 100%
rename from pkgs/firewall/src/zones.orange
rename to firewall/src/zones.orange
diff --git a/pkgs/firewall/src/zones.red b/firewall/src/zones.red
similarity index 100%
rename from pkgs/firewall/src/zones.red
rename to firewall/src/zones.red
diff --git a/pkgs/firewall/systemd/firewall.service b/firewall/systemd/firewall.service
similarity index 100%
rename from pkgs/firewall/systemd/firewall.service
rename to firewall/systemd/firewall.service
diff --git a/pkgs/flex/flex.nm b/flex/flex.nm
similarity index 100%
rename from pkgs/flex/flex.nm
rename to flex/flex.nm
diff --git a/pkgs/flex/patches/flex-2.5.35-gcc44-1.patch b/flex/patches/flex-2.5.35-gcc44-1.patch
similarity index 100%
rename from pkgs/flex/patches/flex-2.5.35-gcc44-1.patch
rename to flex/patches/flex-2.5.35-gcc44-1.patch
diff --git a/pkgs/fontconfig/fontconfig.nm b/fontconfig/fontconfig.nm
similarity index 100%
rename from pkgs/fontconfig/fontconfig.nm
rename to fontconfig/fontconfig.nm
diff --git a/pkgs/freeradius/freeradius.nm b/freeradius/freeradius.nm
similarity index 100%
rename from pkgs/freeradius/freeradius.nm
rename to freeradius/freeradius.nm
diff --git a/pkgs/freeradius/freeradius.pam b/freeradius/freeradius.pam
similarity index 100%
rename from pkgs/freeradius/freeradius.pam
rename to freeradius/freeradius.pam
diff --git a/pkgs/freeradius/freeradius.tmpfiles b/freeradius/freeradius.tmpfiles
similarity index 100%
rename from pkgs/freeradius/freeradius.tmpfiles
rename to freeradius/freeradius.tmpfiles
diff --git a/pkgs/freeradius/logrotate/freeradius b/freeradius/logrotate/freeradius
similarity index 100%
rename from pkgs/freeradius/logrotate/freeradius
rename to freeradius/logrotate/freeradius
diff --git a/pkgs/freeradius/patches/freeradius-2.1.6-cert-config.patch b/freeradius/patches/freeradius-2.1.6-cert-config.patch
similarity index 100%
rename from pkgs/freeradius/patches/freeradius-2.1.6-cert-config.patch
rename to freeradius/patches/freeradius-2.1.6-cert-config.patch
diff --git a/pkgs/freeradius/systemd/freeradius.service b/freeradius/systemd/freeradius.service
similarity index 100%
rename from pkgs/freeradius/systemd/freeradius.service
rename to freeradius/systemd/freeradius.service
diff --git a/pkgs/freetype/freetype.nm b/freetype/freetype.nm
similarity index 100%
rename from pkgs/freetype/freetype.nm
rename to freetype/freetype.nm
diff --git a/pkgs/fuse-sshfs/fuse-sshfs.nm b/fuse-sshfs/fuse-sshfs.nm
similarity index 100%
rename from pkgs/fuse-sshfs/fuse-sshfs.nm
rename to fuse-sshfs/fuse-sshfs.nm
diff --git a/pkgs/fuse/fuse.nm b/fuse/fuse.nm
similarity index 100%
rename from pkgs/fuse/fuse.nm
rename to fuse/fuse.nm
diff --git a/pkgs/fuse/patches/fuse-2.7.4-openfix.patch b/fuse/patches/fuse-2.7.4-openfix.patch
similarity index 100%
rename from pkgs/fuse/patches/fuse-2.7.4-openfix.patch
rename to fuse/patches/fuse-2.7.4-openfix.patch
diff --git a/pkgs/fuse/patches/fuse-2.7.4-udev_rules.patch b/fuse/patches/fuse-2.7.4-udev_rules.patch
similarity index 100%
rename from pkgs/fuse/patches/fuse-2.7.4-udev_rules.patch
rename to fuse/patches/fuse-2.7.4-udev_rules.patch
diff --git a/pkgs/gawk/gawk.nm b/gawk/gawk.nm
similarity index 100%
rename from pkgs/gawk/gawk.nm
rename to gawk/gawk.nm
diff --git a/pkgs/gcc/gcc.nm b/gcc/gcc.nm
similarity index 100%
rename from pkgs/gcc/gcc.nm
rename to gcc/gcc.nm
diff --git a/pkgs/gcc/patches/gcc-4.6.0-piepatches-20110407.patch b/gcc/patches/gcc-4.6.0-piepatches-20110407.patch
similarity index 100%
rename from pkgs/gcc/patches/gcc-4.6.0-piepatches-20110407.patch
rename to gcc/patches/gcc-4.6.0-piepatches-20110407.patch
diff --git a/pkgs/gcc/patches/gcc46-Woverlength-string-asm.patch0 b/gcc/patches/gcc46-Woverlength-string-asm.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-Woverlength-string-asm.patch0
rename to gcc/patches/gcc46-Woverlength-string-asm.patch0
diff --git a/pkgs/gcc/patches/gcc46-Woverlength-string.patch0 b/gcc/patches/gcc46-Woverlength-string.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-Woverlength-string.patch0
rename to gcc/patches/gcc46-Woverlength-string.patch0
diff --git a/pkgs/gcc/patches/gcc46-c++-builtin-redecl.patch0 b/gcc/patches/gcc46-c++-builtin-redecl.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-c++-builtin-redecl.patch0
rename to gcc/patches/gcc46-c++-builtin-redecl.patch0
diff --git a/pkgs/gcc/patches/gcc46-cloog-dl.patch0 b/gcc/patches/gcc46-cloog-dl.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-cloog-dl.patch0
rename to gcc/patches/gcc46-cloog-dl.patch0
diff --git a/pkgs/gcc/patches/gcc46-hack.patch0 b/gcc/patches/gcc46-hack.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-hack.patch0
rename to gcc/patches/gcc46-hack.patch0
diff --git a/pkgs/gcc/patches/gcc46-libgomp-omp_h-multilib.patch0 b/gcc/patches/gcc46-libgomp-omp_h-multilib.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-libgomp-omp_h-multilib.patch0
rename to gcc/patches/gcc46-libgomp-omp_h-multilib.patch0
diff --git a/pkgs/gcc/patches/gcc46-libtool-no-rpath.patch0 b/gcc/patches/gcc46-libtool-no-rpath.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-libtool-no-rpath.patch0
rename to gcc/patches/gcc46-libtool-no-rpath.patch0
diff --git a/pkgs/gcc/patches/gcc46-no-add-needed.patch0 b/gcc/patches/gcc46-no-add-needed.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-no-add-needed.patch0
rename to gcc/patches/gcc46-no-add-needed.patch0
diff --git a/pkgs/gcc/patches/gcc46-ppl-0.10.patch b/gcc/patches/gcc46-ppl-0.10.patch
similarity index 100%
rename from pkgs/gcc/patches/gcc46-ppl-0.10.patch
rename to gcc/patches/gcc46-ppl-0.10.patch
diff --git a/pkgs/gcc/patches/gcc46-pr33763.patch0 b/gcc/patches/gcc46-pr33763.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-pr33763.patch0
rename to gcc/patches/gcc46-pr33763.patch0
diff --git a/pkgs/gcc/patches/gcc46-pr38757.patch0 b/gcc/patches/gcc46-pr38757.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-pr38757.patch0
rename to gcc/patches/gcc46-pr38757.patch0
diff --git a/pkgs/gcc/patches/gcc46-unwind-debughook-sdt.patch0 b/gcc/patches/gcc46-unwind-debughook-sdt.patch0
similarity index 100%
rename from pkgs/gcc/patches/gcc46-unwind-debughook-sdt.patch0
rename to gcc/patches/gcc46-unwind-debughook-sdt.patch0
diff --git a/pkgs/gdb/gdb.nm b/gdb/gdb.nm
similarity index 100%
rename from pkgs/gdb/gdb.nm
rename to gdb/gdb.nm
diff --git a/pkgs/gdbm/gdbm.nm b/gdbm/gdbm.nm
similarity index 100%
rename from pkgs/gdbm/gdbm.nm
rename to gdbm/gdbm.nm
diff --git a/pkgs/gettext/gettext.nm b/gettext/gettext.nm
similarity index 100%
rename from pkgs/gettext/gettext.nm
rename to gettext/gettext.nm
diff --git a/pkgs/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm
similarity index 100%
rename from pkgs/ghostscript/ghostscript.nm
rename to ghostscript/ghostscript.nm
diff --git a/pkgs/git/git.nm b/git/git.nm
similarity index 100%
rename from pkgs/git/git.nm
rename to git/git.nm
diff --git a/pkgs/glib2/glib2-locale.sh b/glib2/glib2-locale.sh
similarity index 100%
rename from pkgs/glib2/glib2-locale.sh
rename to glib2/glib2-locale.sh
diff --git a/pkgs/glib2/glib2.nm b/glib2/glib2.nm
similarity index 100%
rename from pkgs/glib2/glib2.nm
rename to glib2/glib2.nm
diff --git a/pkgs/glibc/glibc-stack_chk_fail.c b/glibc/glibc-stack_chk_fail.c
similarity index 100%
rename from pkgs/glibc/glibc-stack_chk_fail.c
rename to glibc/glibc-stack_chk_fail.c
diff --git a/pkgs/glibc/glibc.nm b/glibc/glibc.nm
similarity index 100%
rename from pkgs/glibc/glibc.nm
rename to glibc/glibc.nm
diff --git a/pkgs/glibc/ld.so.conf b/glibc/ld.so.conf
similarity index 100%
rename from pkgs/glibc/ld.so.conf
rename to glibc/ld.so.conf
diff --git a/pkgs/glibc/nsswitch.conf b/glibc/nsswitch.conf
similarity index 100%
rename from pkgs/glibc/nsswitch.conf
rename to glibc/nsswitch.conf
diff --git a/pkgs/glibc/patches/glibc-2.10.1-arc4random.patch b/glibc/patches/glibc-2.10.1-arc4random.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-arc4random.patch
rename to glibc/patches/glibc-2.10.1-arc4random.patch
diff --git a/pkgs/glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch b/glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch
rename to glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch
diff --git a/pkgs/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch b/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch
rename to glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch
diff --git a/pkgs/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch b/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch
rename to glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch
diff --git a/pkgs/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch b/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch
rename to glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch
diff --git a/pkgs/glibc/patches/glibc-2.10.1-pt_pax-1.patch b/glibc/patches/glibc-2.10.1-pt_pax-1.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-pt_pax-1.patch
rename to glibc/patches/glibc-2.10.1-pt_pax-1.patch
diff --git a/pkgs/glibc/patches/glibc-2.10.1-sanitize_env.patch.off b/glibc/patches/glibc-2.10.1-sanitize_env.patch.off
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-sanitize_env.patch.off
rename to glibc/patches/glibc-2.10.1-sanitize_env.patch.off
diff --git a/pkgs/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch b/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch
rename to glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch
diff --git a/pkgs/glibc/patches/glibc-2.11.1-mktemp_urandom.patch b/glibc/patches/glibc-2.11.1-mktemp_urandom.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.11.1-mktemp_urandom.patch
rename to glibc/patches/glibc-2.11.1-mktemp_urandom.patch
diff --git a/pkgs/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch b/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch
rename to glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch
diff --git a/pkgs/glibc/patches/glibc-2.12-hardened-pie.patch b/glibc/patches/glibc-2.12-hardened-pie.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-2.12-hardened-pie.patch
rename to glibc/patches/glibc-2.12-hardened-pie.patch
diff --git a/pkgs/glibc/patches/glibc-fedora.patch b/glibc/patches/glibc-fedora.patch
similarity index 100%
rename from pkgs/glibc/patches/glibc-fedora.patch
rename to glibc/patches/glibc-fedora.patch
diff --git a/pkgs/gmp/gmp.nm b/gmp/gmp.nm
similarity index 100%
rename from pkgs/gmp/gmp.nm
rename to gmp/gmp.nm
diff --git a/pkgs/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm
similarity index 100%
rename from pkgs/gnupg2/gnupg2.nm
rename to gnupg2/gnupg2.nm
diff --git a/pkgs/gnutls/gnutls.nm b/gnutls/gnutls.nm
similarity index 100%
rename from pkgs/gnutls/gnutls.nm
rename to gnutls/gnutls.nm
diff --git a/pkgs/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm
similarity index 100%
rename from pkgs/gobject-introspection/gobject-introspection.nm
rename to gobject-introspection/gobject-introspection.nm
diff --git a/pkgs/gperf/gperf.nm b/gperf/gperf.nm
similarity index 100%
rename from pkgs/gperf/gperf.nm
rename to gperf/gperf.nm
diff --git a/pkgs/grep/grep.nm b/grep/grep.nm
similarity index 100%
rename from pkgs/grep/grep.nm
rename to grep/grep.nm
diff --git a/pkgs/groff/groff.nm b/groff/groff.nm
similarity index 100%
rename from pkgs/groff/groff.nm
rename to groff/groff.nm
diff --git a/pkgs/groff/patches/groff-1.18.1.4-debian_fixes-1.patch b/groff/patches/groff-1.18.1.4-debian_fixes-1.patch
similarity index 100%
rename from pkgs/groff/patches/groff-1.18.1.4-debian_fixes-1.patch
rename to groff/patches/groff-1.18.1.4-debian_fixes-1.patch
diff --git a/pkgs/grub/05_theme b/grub/05_theme
similarity index 100%
rename from pkgs/grub/05_theme
rename to grub/05_theme
diff --git a/pkgs/grub/grub.default b/grub/grub.default
similarity index 100%
rename from pkgs/grub/grub.default
rename to grub/grub.default
diff --git a/pkgs/grub/grub.nm b/grub/grub.nm
similarity index 100%
rename from pkgs/grub/grub.nm
rename to grub/grub.nm
diff --git a/pkgs/grub/patches/grub-1.97.1-initramfs.patch b/grub/patches/grub-1.97.1-initramfs.patch
similarity index 100%
rename from pkgs/grub/patches/grub-1.97.1-initramfs.patch
rename to grub/patches/grub-1.97.1-initramfs.patch
diff --git a/pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 b/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
similarity index 100%
rename from pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
rename to grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
diff --git a/pkgs/grub/splash.png b/grub/splash.png
similarity index 100%
rename from pkgs/grub/splash.png
rename to grub/splash.png
diff --git a/pkgs/gssdp/gssdp.nm b/gssdp/gssdp.nm
similarity index 100%
rename from pkgs/gssdp/gssdp.nm
rename to gssdp/gssdp.nm
diff --git a/pkgs/gssdp/patches/gssdp-fixdso.patch b/gssdp/patches/gssdp-fixdso.patch
similarity index 100%
rename from pkgs/gssdp/patches/gssdp-fixdso.patch
rename to gssdp/patches/gssdp-fixdso.patch
diff --git a/pkgs/guile/guile.nm b/guile/guile.nm
similarity index 100%
rename from pkgs/guile/guile.nm
rename to guile/guile.nm
diff --git a/pkgs/guile/patches/guile-1.8.7-linemarkers.patch b/guile/patches/guile-1.8.7-linemarkers.patch
similarity index 100%
rename from pkgs/guile/patches/guile-1.8.7-linemarkers.patch
rename to guile/patches/guile-1.8.7-linemarkers.patch
diff --git a/pkgs/guile/patches/guile-1.8.7-testsuite.patch b/guile/patches/guile-1.8.7-testsuite.patch
similarity index 100%
rename from pkgs/guile/patches/guile-1.8.7-testsuite.patch
rename to guile/patches/guile-1.8.7-testsuite.patch
diff --git a/pkgs/gupnp-av/gupnp-av.nm b/gupnp-av/gupnp-av.nm
similarity index 100%
rename from pkgs/gupnp-av/gupnp-av.nm
rename to gupnp-av/gupnp-av.nm
diff --git a/pkgs/gupnp-igd/gupnp-igd.nm b/gupnp-igd/gupnp-igd.nm
similarity index 100%
rename from pkgs/gupnp-igd/gupnp-igd.nm
rename to gupnp-igd/gupnp-igd.nm
diff --git a/pkgs/gupnp/gupnp.nm b/gupnp/gupnp.nm
similarity index 100%
rename from pkgs/gupnp/gupnp.nm
rename to gupnp/gupnp.nm
diff --git a/pkgs/gzip/gzip.nm b/gzip/gzip.nm
similarity index 100%
rename from pkgs/gzip/gzip.nm
rename to gzip/gzip.nm
diff --git a/pkgs/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch b/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch
similarity index 100%
rename from pkgs/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch
rename to gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch
diff --git a/pkgs/gzip/patches/gzip-1.3.13-cve-2006-4338.patch b/gzip/patches/gzip-1.3.13-cve-2006-4338.patch
similarity index 100%
rename from pkgs/gzip/patches/gzip-1.3.13-cve-2006-4338.patch
rename to gzip/patches/gzip-1.3.13-cve-2006-4338.patch
diff --git a/pkgs/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch b/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch
similarity index 100%
rename from pkgs/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch
rename to gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch
diff --git a/pkgs/hdparm/hdparm.nm b/hdparm/hdparm.nm
similarity index 100%
rename from pkgs/hdparm/hdparm.nm
rename to hdparm/hdparm.nm
diff --git a/pkgs/help2man/help2man.nm b/help2man/help2man.nm
similarity index 100%
rename from pkgs/help2man/help2man.nm
rename to help2man/help2man.nm
diff --git a/pkgs/hostapd/config b/hostapd/config
similarity index 100%
rename from pkgs/hostapd/config
rename to hostapd/config
diff --git a/pkgs/hostapd/hostapd.nm b/hostapd/hostapd.nm
similarity index 100%
rename from pkgs/hostapd/hostapd.nm
rename to hostapd/hostapd.nm
diff --git a/pkgs/hostapd/systemd/hostapd@.service b/hostapd/systemd/hostapd@.service
similarity index 100%
rename from pkgs/hostapd/systemd/hostapd@.service
rename to hostapd/systemd/hostapd@.service
diff --git a/pkgs/hplip/hplip.nm b/hplip/hplip.nm
similarity index 100%
rename from pkgs/hplip/hplip.nm
rename to hplip/hplip.nm
diff --git a/pkgs/hplip/patches/hplip-3.10.5-udev-rules.patch b/hplip/patches/hplip-3.10.5-udev-rules.patch
similarity index 100%
rename from pkgs/hplip/patches/hplip-3.10.5-udev-rules.patch
rename to hplip/patches/hplip-3.10.5-udev-rules.patch
diff --git a/pkgs/htop/htop.nm b/htop/htop.nm
similarity index 100%
rename from pkgs/htop/htop.nm
rename to htop/htop.nm
diff --git a/pkgs/hwdata/hwdata.nm b/hwdata/hwdata.nm
similarity index 100%
rename from pkgs/hwdata/hwdata.nm
rename to hwdata/hwdata.nm
diff --git a/pkgs/iana-etc/iana-etc.nm b/iana-etc/iana-etc.nm
similarity index 100%
rename from pkgs/iana-etc/iana-etc.nm
rename to iana-etc/iana-etc.nm
diff --git a/pkgs/icecream/icecream.nm b/icecream/icecream.nm
similarity index 100%
rename from pkgs/icecream/icecream.nm
rename to icecream/icecream.nm
diff --git a/pkgs/icecream/icecream.sh b/icecream/icecream.sh
similarity index 100%
rename from pkgs/icecream/icecream.sh
rename to icecream/icecream.sh
diff --git a/pkgs/icecream/patches/icecream-cleanup-conffile.patch0 b/icecream/patches/icecream-cleanup-conffile.patch0
similarity index 100%
rename from pkgs/icecream/patches/icecream-cleanup-conffile.patch0
rename to icecream/patches/icecream-cleanup-conffile.patch0
diff --git a/pkgs/icecream/patches/icecream-rename-scheduler.patch b/icecream/patches/icecream-rename-scheduler.patch
similarity index 100%
rename from pkgs/icecream/patches/icecream-rename-scheduler.patch
rename to icecream/patches/icecream-rename-scheduler.patch
diff --git a/pkgs/iftop/iftop.nm b/iftop/iftop.nm
similarity index 100%
rename from pkgs/iftop/iftop.nm
rename to iftop/iftop.nm
diff --git a/pkgs/igmpproxy/igmpproxy.nm b/igmpproxy/igmpproxy.nm
similarity index 100%
rename from pkgs/igmpproxy/igmpproxy.nm
rename to igmpproxy/igmpproxy.nm
diff --git a/pkgs/initscripts/functions b/initscripts/functions
similarity index 100%
rename from pkgs/initscripts/functions
rename to initscripts/functions
diff --git a/pkgs/initscripts/initscripts.nm b/initscripts/initscripts.nm
similarity index 100%
rename from pkgs/initscripts/initscripts.nm
rename to initscripts/initscripts.nm
diff --git a/pkgs/initscripts/src/Makefile b/initscripts/src/Makefile
similarity index 100%
rename from pkgs/initscripts/src/Makefile
rename to initscripts/src/Makefile
diff --git a/pkgs/initscripts/src/console_check.c b/initscripts/src/console_check.c
similarity index 100%
rename from pkgs/initscripts/src/console_check.c
rename to initscripts/src/console_check.c
diff --git a/pkgs/initscripts/src/console_init.c b/initscripts/src/console_init.c
similarity index 100%
rename from pkgs/initscripts/src/console_init.c
rename to initscripts/src/console_init.c
diff --git a/pkgs/initscripts/src/ipcalc-tests b/initscripts/src/ipcalc-tests
similarity index 100%
rename from pkgs/initscripts/src/ipcalc-tests
rename to initscripts/src/ipcalc-tests
diff --git a/pkgs/initscripts/src/ipcalc.1 b/initscripts/src/ipcalc.1
similarity index 100%
rename from pkgs/initscripts/src/ipcalc.1
rename to initscripts/src/ipcalc.1
diff --git a/pkgs/initscripts/src/ipcalc.c b/initscripts/src/ipcalc.c
similarity index 100%
rename from pkgs/initscripts/src/ipcalc.c
rename to initscripts/src/ipcalc.c
diff --git a/pkgs/initscripts/src/securetty.8 b/initscripts/src/securetty.8
similarity index 100%
rename from pkgs/initscripts/src/securetty.8
rename to initscripts/src/securetty.8
diff --git a/pkgs/initscripts/src/securetty.c b/initscripts/src/securetty.c
similarity index 100%
rename from pkgs/initscripts/src/securetty.c
rename to initscripts/src/securetty.c
diff --git a/pkgs/initscripts/src/shvar.c b/initscripts/src/shvar.c
similarity index 100%
rename from pkgs/initscripts/src/shvar.c
rename to initscripts/src/shvar.c
diff --git a/pkgs/initscripts/src/shvar.h b/initscripts/src/shvar.h
similarity index 100%
rename from pkgs/initscripts/src/shvar.h
rename to initscripts/src/shvar.h
diff --git a/pkgs/initscripts/sysconfig/clock b/initscripts/sysconfig/clock
similarity index 100%
rename from pkgs/initscripts/sysconfig/clock
rename to initscripts/sysconfig/clock
diff --git a/pkgs/initscripts/sysconfig/createfiles b/initscripts/sysconfig/createfiles
similarity index 100%
rename from pkgs/initscripts/sysconfig/createfiles
rename to initscripts/sysconfig/createfiles
diff --git a/pkgs/initscripts/sysconfig/modules b/initscripts/sysconfig/modules
similarity index 100%
rename from pkgs/initscripts/sysconfig/modules
rename to initscripts/sysconfig/modules
diff --git a/pkgs/initscripts/sysconfig/network b/initscripts/sysconfig/network
similarity index 100%
rename from pkgs/initscripts/sysconfig/network
rename to initscripts/sysconfig/network
diff --git a/pkgs/initscripts/sysconfig/rc b/initscripts/sysconfig/rc
similarity index 100%
rename from pkgs/initscripts/sysconfig/rc
rename to initscripts/sysconfig/rc
diff --git a/pkgs/initscripts/sysconfig/rc.local b/initscripts/sysconfig/rc.local
similarity index 100%
rename from pkgs/initscripts/sysconfig/rc.local
rename to initscripts/sysconfig/rc.local
diff --git a/pkgs/initscripts/sysconfig/rc.site b/initscripts/sysconfig/rc.site
similarity index 100%
rename from pkgs/initscripts/sysconfig/rc.site
rename to initscripts/sysconfig/rc.site
diff --git a/pkgs/initscripts/sysctl.conf b/initscripts/sysctl.conf
similarity index 100%
rename from pkgs/initscripts/sysctl.conf
rename to initscripts/sysctl.conf
diff --git a/pkgs/initscripts/udev/10-console.rules b/initscripts/udev/10-console.rules
similarity index 100%
rename from pkgs/initscripts/udev/10-console.rules
rename to initscripts/udev/10-console.rules
diff --git a/pkgs/initscripts/udev/88-clock.rules b/initscripts/udev/88-clock.rules
similarity index 100%
rename from pkgs/initscripts/udev/88-clock.rules
rename to initscripts/udev/88-clock.rules
diff --git a/pkgs/intltool/intltool.nm b/intltool/intltool.nm
similarity index 100%
rename from pkgs/intltool/intltool.nm
rename to intltool/intltool.nm
diff --git a/pkgs/iproute2/iproute2.nm b/iproute2/iproute2.nm
similarity index 100%
rename from pkgs/iproute2/iproute2.nm
rename to iproute2/iproute2.nm
diff --git a/pkgs/iptables/iptables.nm b/iptables/iptables.nm
similarity index 100%
rename from pkgs/iptables/iptables.nm
rename to iptables/iptables.nm
diff --git a/pkgs/iputils/iputils.nm b/iputils/iputils.nm
similarity index 100%
rename from pkgs/iputils/iputils.nm
rename to iputils/iputils.nm
diff --git a/pkgs/iputils/patches/iputils-s20071127-addrcache.patch b/iputils/patches/iputils-s20071127-addrcache.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-addrcache.patch
rename to iputils/patches/iputils-s20071127-addrcache.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-arping-infiniband.patch b/iputils/patches/iputils-s20071127-arping-infiniband.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-arping-infiniband.patch
rename to iputils/patches/iputils-s20071127-arping-infiniband.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-arping_timeout.patch b/iputils/patches/iputils-s20071127-arping_timeout.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-arping_timeout.patch
rename to iputils/patches/iputils-s20071127-arping_timeout.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-countermeasures.patch b/iputils/patches/iputils-s20071127-countermeasures.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-countermeasures.patch
rename to iputils/patches/iputils-s20071127-countermeasures.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-idn.patch b/iputils/patches/iputils-s20071127-idn.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-idn.patch
rename to iputils/patches/iputils-s20071127-idn.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-open-max.patch b/iputils/patches/iputils-s20071127-open-max.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-open-max.patch
rename to iputils/patches/iputils-s20071127-open-max.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-output.patch b/iputils/patches/iputils-s20071127-output.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-output.patch
rename to iputils/patches/iputils-s20071127-output.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-ping-subint.patch b/iputils/patches/iputils-s20071127-ping-subint.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-ping-subint.patch
rename to iputils/patches/iputils-s20071127-ping-subint.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-ping_cleanup.patch b/iputils/patches/iputils-s20071127-ping_cleanup.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-ping_cleanup.patch
rename to iputils/patches/iputils-s20071127-ping_cleanup.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-rh.patch b/iputils/patches/iputils-s20071127-rh.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-rh.patch
rename to iputils/patches/iputils-s20071127-rh.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-traffic_class.patch b/iputils/patches/iputils-s20071127-traffic_class.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-traffic_class.patch
rename to iputils/patches/iputils-s20071127-traffic_class.patch
diff --git a/pkgs/iputils/patches/iputils-s20071127-warnings.patch b/iputils/patches/iputils-s20071127-warnings.patch
similarity index 100%
rename from pkgs/iputils/patches/iputils-s20071127-warnings.patch
rename to iputils/patches/iputils-s20071127-warnings.patch
diff --git a/pkgs/iscsi-initiator-utils/04-iscsi b/iscsi-initiator-utils/04-iscsi
similarity index 100%
rename from pkgs/iscsi-initiator-utils/04-iscsi
rename to iscsi-initiator-utils/04-iscsi
diff --git a/pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm
similarity index 100%
rename from pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm
rename to iscsi-initiator-utils/iscsi-initiator-utils.nm
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
diff --git a/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch b/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
similarity index 100%
rename from pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
rename to iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
diff --git a/pkgs/iw/iw.nm b/iw/iw.nm
similarity index 100%
rename from pkgs/iw/iw.nm
rename to iw/iw.nm
diff --git a/pkgs/joe/joe.nm b/joe/joe.nm
similarity index 100%
rename from pkgs/joe/joe.nm
rename to joe/joe.nm
diff --git a/pkgs/joe/patches/joe-3.4-selinux.patch b/joe/patches/joe-3.4-selinux.patch
similarity index 100%
rename from pkgs/joe/patches/joe-3.4-selinux.patch
rename to joe/patches/joe-3.4-selinux.patch
diff --git a/pkgs/jwhois/jwhois.nm b/jwhois/jwhois.nm
similarity index 100%
rename from pkgs/jwhois/jwhois.nm
rename to jwhois/jwhois.nm
diff --git a/pkgs/jwhois/patches/jwhois-4.0-conf.patch b/jwhois/patches/jwhois-4.0-conf.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-conf.patch
rename to jwhois/patches/jwhois-4.0-conf.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-conf_update.patch b/jwhois/patches/jwhois-4.0-conf_update.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-conf_update.patch
rename to jwhois/patches/jwhois-4.0-conf_update.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-conf_update2.patch b/jwhois/patches/jwhois-4.0-conf_update2.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-conf_update2.patch
rename to jwhois/patches/jwhois-4.0-conf_update2.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-conf_update3.patch b/jwhois/patches/jwhois-4.0-conf_update3.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-conf_update3.patch
rename to jwhois/patches/jwhois-4.0-conf_update3.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-conf_update4.patch b/jwhois/patches/jwhois-4.0-conf_update4.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-conf_update4.patch
rename to jwhois/patches/jwhois-4.0-conf_update4.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-connect.patch b/jwhois/patches/jwhois-4.0-connect.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-connect.patch
rename to jwhois/patches/jwhois-4.0-connect.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-dotster.patch b/jwhois/patches/jwhois-4.0-dotster.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-dotster.patch
rename to jwhois/patches/jwhois-4.0-dotster.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-enum.patch b/jwhois/patches/jwhois-4.0-enum.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-enum.patch
rename to jwhois/patches/jwhois-4.0-enum.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-fclose.patch b/jwhois/patches/jwhois-4.0-fclose.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-fclose.patch
rename to jwhois/patches/jwhois-4.0-fclose.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-gi.patch b/jwhois/patches/jwhois-4.0-gi.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-gi.patch
rename to jwhois/patches/jwhois-4.0-gi.patch
diff --git a/pkgs/jwhois/patches/jwhois-4.0-ipv6match.patch b/jwhois/patches/jwhois-4.0-ipv6match.patch
similarity index 100%
rename from pkgs/jwhois/patches/jwhois-4.0-ipv6match.patch
rename to jwhois/patches/jwhois-4.0-ipv6match.patch
diff --git a/pkgs/kbd/kbd.nm b/kbd/kbd.nm
similarity index 100%
rename from pkgs/kbd/kbd.nm
rename to kbd/kbd.nm
diff --git a/pkgs/kbd/patches/kbd-1.15-defkeymap.patch b/kbd/patches/kbd-1.15-defkeymap.patch
similarity index 100%
rename from pkgs/kbd/patches/kbd-1.15-defkeymap.patch
rename to kbd/patches/kbd-1.15-defkeymap.patch
diff --git a/pkgs/kbd/patches/kbd-1.15-keycodes-man.patch b/kbd/patches/kbd-1.15-keycodes-man.patch
similarity index 100%
rename from pkgs/kbd/patches/kbd-1.15-keycodes-man.patch
rename to kbd/patches/kbd-1.15-keycodes-man.patch
diff --git a/pkgs/kbd/patches/kbd-1.15-po.patch b/kbd/patches/kbd-1.15-po.patch
similarity index 100%
rename from pkgs/kbd/patches/kbd-1.15-po.patch
rename to kbd/patches/kbd-1.15-po.patch
diff --git a/pkgs/kbd/patches/kbd-1.15-quiet_doc.patch b/kbd/patches/kbd-1.15-quiet_doc.patch
similarity index 100%
rename from pkgs/kbd/patches/kbd-1.15-quiet_doc.patch
rename to kbd/patches/kbd-1.15-quiet_doc.patch
diff --git a/pkgs/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/kbd/patches/kbd-1.15-resizecon-x86_64.patch
similarity index 100%
rename from pkgs/kbd/patches/kbd-1.15-resizecon-x86_64.patch
rename to kbd/patches/kbd-1.15-resizecon-x86_64.patch
diff --git a/pkgs/kbd/patches/kbd-1.15-sparc.patch b/kbd/patches/kbd-1.15-sparc.patch
similarity index 100%
rename from pkgs/kbd/patches/kbd-1.15-sparc.patch
rename to kbd/patches/kbd-1.15-sparc.patch
diff --git a/pkgs/kbd/patches/kbd-1.15-unicode_start.patch b/kbd/patches/kbd-1.15-unicode_start.patch
similarity index 100%
rename from pkgs/kbd/patches/kbd-1.15-unicode_start.patch
rename to kbd/patches/kbd-1.15-unicode_start.patch
diff --git a/pkgs/kernel/config b/kernel/config
similarity index 100%
rename from pkgs/kernel/config
rename to kernel/config
diff --git a/pkgs/kernel/ipfire_logo.ppm b/kernel/ipfire_logo.ppm
similarity index 100%
rename from pkgs/kernel/ipfire_logo.ppm
rename to kernel/ipfire_logo.ppm
diff --git a/pkgs/kernel/kernel.nm b/kernel/kernel.nm
similarity index 100%
rename from pkgs/kernel/kernel.nm
rename to kernel/kernel.nm
diff --git a/pkgs/kernel/patches/grsecurity-2.2.2-2.6.39-201105231910.patch b/kernel/patches/grsecurity-2.2.2-2.6.39-201105231910.patch
similarity index 100%
rename from pkgs/kernel/patches/grsecurity-2.2.2-2.6.39-201105231910.patch
rename to kernel/patches/grsecurity-2.2.2-2.6.39-201105231910.patch
diff --git a/pkgs/kernel/patches/linux-2.6.33-disable-compat-vdso.patch b/kernel/patches/linux-2.6.33-disable-compat-vdso.patch
similarity index 100%
rename from pkgs/kernel/patches/linux-2.6.33-disable-compat-vdso.patch
rename to kernel/patches/linux-2.6.33-disable-compat-vdso.patch
diff --git a/pkgs/l7-protocols/l7-protocols.nm b/l7-protocols/l7-protocols.nm
similarity index 100%
rename from pkgs/l7-protocols/l7-protocols.nm
rename to l7-protocols/l7-protocols.nm
diff --git a/pkgs/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm
similarity index 100%
rename from pkgs/ldapvi/ldapvi.nm
rename to ldapvi/ldapvi.nm
diff --git a/pkgs/less/less.nm b/less/less.nm
similarity index 100%
rename from pkgs/less/less.nm
rename to less/less.nm
diff --git a/pkgs/less/less.sh b/less/less.sh
similarity index 100%
rename from pkgs/less/less.sh
rename to less/less.sh
diff --git a/pkgs/less/lesspipe.sh b/less/lesspipe.sh
similarity index 100%
rename from pkgs/less/lesspipe.sh
rename to less/lesspipe.sh
diff --git a/pkgs/libICE/libICE.nm b/libICE/libICE.nm
similarity index 100%
rename from pkgs/libICE/libICE.nm
rename to libICE/libICE.nm
diff --git a/pkgs/libSM/libSM.nm b/libSM/libSM.nm
similarity index 100%
rename from pkgs/libSM/libSM.nm
rename to libSM/libSM.nm
diff --git a/pkgs/libVNCServer/libVNCServer.nm b/libVNCServer/libVNCServer.nm
similarity index 100%
rename from pkgs/libVNCServer/libVNCServer.nm
rename to libVNCServer/libVNCServer.nm
diff --git a/pkgs/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch b/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
similarity index 100%
rename from pkgs/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
rename to libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
diff --git a/pkgs/libVNCServer/patches/libvncserver-0.9.1-multilib.patch b/libVNCServer/patches/libvncserver-0.9.1-multilib.patch
similarity index 100%
rename from pkgs/libVNCServer/patches/libvncserver-0.9.1-multilib.patch
rename to libVNCServer/patches/libvncserver-0.9.1-multilib.patch
diff --git a/pkgs/libVNCServer/patches/libvncserver-0.9.7-Linux.patch b/libVNCServer/patches/libvncserver-0.9.7-Linux.patch
similarity index 100%
rename from pkgs/libVNCServer/patches/libvncserver-0.9.7-Linux.patch
rename to libVNCServer/patches/libvncserver-0.9.7-Linux.patch
diff --git a/pkgs/libX11/libX11.nm b/libX11/libX11.nm
similarity index 100%
rename from pkgs/libX11/libX11.nm
rename to libX11/libX11.nm
diff --git a/pkgs/libXau/libXau.nm b/libXau/libXau.nm
similarity index 100%
rename from pkgs/libXau/libXau.nm
rename to libXau/libXau.nm
diff --git a/pkgs/libXau/patches/xau-1.0.4-local.patch b/libXau/patches/xau-1.0.4-local.patch
similarity index 100%
rename from pkgs/libXau/patches/xau-1.0.4-local.patch
rename to libXau/patches/xau-1.0.4-local.patch
diff --git a/pkgs/libXaw/libXaw.nm b/libXaw/libXaw.nm
similarity index 100%
rename from pkgs/libXaw/libXaw.nm
rename to libXaw/libXaw.nm
diff --git a/pkgs/libXdamage/libXdamage.nm b/libXdamage/libXdamage.nm
similarity index 100%
rename from pkgs/libXdamage/libXdamage.nm
rename to libXdamage/libXdamage.nm
diff --git a/pkgs/libXdmcp/libXdmcp.nm b/libXdmcp/libXdmcp.nm
similarity index 100%
rename from pkgs/libXdmcp/libXdmcp.nm
rename to libXdmcp/libXdmcp.nm
diff --git a/pkgs/libXext/libXext.nm b/libXext/libXext.nm
similarity index 100%
rename from pkgs/libXext/libXext.nm
rename to libXext/libXext.nm
diff --git a/pkgs/libXfixes/libXfixes.nm b/libXfixes/libXfixes.nm
similarity index 100%
rename from pkgs/libXfixes/libXfixes.nm
rename to libXfixes/libXfixes.nm
diff --git a/pkgs/libXfont/libXfont.nm b/libXfont/libXfont.nm
similarity index 100%
rename from pkgs/libXfont/libXfont.nm
rename to libXfont/libXfont.nm
diff --git a/pkgs/libXft/libXft.nm b/libXft/libXft.nm
similarity index 100%
rename from pkgs/libXft/libXft.nm
rename to libXft/libXft.nm
diff --git a/pkgs/libXi/libXi.nm b/libXi/libXi.nm
similarity index 100%
rename from pkgs/libXi/libXi.nm
rename to libXi/libXi.nm
diff --git a/pkgs/libXmu/libXmu.nm b/libXmu/libXmu.nm
similarity index 100%
rename from pkgs/libXmu/libXmu.nm
rename to libXmu/libXmu.nm
diff --git a/pkgs/libXpm/libXpm.nm b/libXpm/libXpm.nm
similarity index 100%
rename from pkgs/libXpm/libXpm.nm
rename to libXpm/libXpm.nm
diff --git a/pkgs/libXrandr/libXrandr.nm b/libXrandr/libXrandr.nm
similarity index 100%
rename from pkgs/libXrandr/libXrandr.nm
rename to libXrandr/libXrandr.nm
diff --git a/pkgs/libXrandr/patches/libXrandr-1.3.0-fixes.patch b/libXrandr/patches/libXrandr-1.3.0-fixes.patch
similarity index 100%
rename from pkgs/libXrandr/patches/libXrandr-1.3.0-fixes.patch
rename to libXrandr/patches/libXrandr-1.3.0-fixes.patch
diff --git a/pkgs/libXrender/libXrender.nm b/libXrender/libXrender.nm
similarity index 100%
rename from pkgs/libXrender/libXrender.nm
rename to libXrender/libXrender.nm
diff --git a/pkgs/libXres/libXres.nm b/libXres/libXres.nm
similarity index 100%
rename from pkgs/libXres/libXres.nm
rename to libXres/libXres.nm
diff --git a/pkgs/libXt/libXt.nm b/libXt/libXt.nm
similarity index 100%
rename from pkgs/libXt/libXt.nm
rename to libXt/libXt.nm
diff --git a/pkgs/libXt/patches/libXt-1.0.7-libsm-fix.patch b/libXt/patches/libXt-1.0.7-libsm-fix.patch
similarity index 100%
rename from pkgs/libXt/patches/libXt-1.0.7-libsm-fix.patch
rename to libXt/patches/libXt-1.0.7-libsm-fix.patch
diff --git a/pkgs/libXtst/libXtst.nm b/libXtst/libXtst.nm
similarity index 100%
rename from pkgs/libXtst/libXtst.nm
rename to libXtst/libXtst.nm
diff --git a/pkgs/libXv/libXv.nm b/libXv/libXv.nm
similarity index 100%
rename from pkgs/libXv/libXv.nm
rename to libXv/libXv.nm
diff --git a/pkgs/libXvMC/libXvMC.nm b/libXvMC/libXvMC.nm
similarity index 100%
rename from pkgs/libXvMC/libXvMC.nm
rename to libXvMC/libXvMC.nm
diff --git a/pkgs/libXxf86vm/libXxf86vm.nm b/libXxf86vm/libXxf86vm.nm
similarity index 100%
rename from pkgs/libXxf86vm/libXxf86vm.nm
rename to libXxf86vm/libXxf86vm.nm
diff --git a/pkgs/libaal/libaal.nm b/libaal/libaal.nm
similarity index 100%
rename from pkgs/libaal/libaal.nm
rename to libaal/libaal.nm
diff --git a/pkgs/libaio/libaio.nm b/libaio/libaio.nm
similarity index 100%
rename from pkgs/libaio/libaio.nm
rename to libaio/libaio.nm
diff --git a/pkgs/libaio/patches/libaio-0.3.109-install-to-slash.patch b/libaio/patches/libaio-0.3.109-install-to-slash.patch
similarity index 100%
rename from pkgs/libaio/patches/libaio-0.3.109-install-to-slash.patch
rename to libaio/patches/libaio-0.3.109-install-to-slash.patch
diff --git a/pkgs/libarchive/libarchive.nm b/libarchive/libarchive.nm
similarity index 100%
rename from pkgs/libarchive/libarchive.nm
rename to libarchive/libarchive.nm
diff --git a/pkgs/libart/libart.nm b/libart/libart.nm
similarity index 100%
rename from pkgs/libart/libart.nm
rename to libart/libart.nm
diff --git a/pkgs/libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch b/libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch
similarity index 100%
rename from pkgs/libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch
rename to libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch
diff --git a/pkgs/libassuan/libassuan.nm b/libassuan/libassuan.nm
similarity index 100%
rename from pkgs/libassuan/libassuan.nm
rename to libassuan/libassuan.nm
diff --git a/pkgs/libatasmart/libatasmart.nm b/libatasmart/libatasmart.nm
similarity index 100%
rename from pkgs/libatasmart/libatasmart.nm
rename to libatasmart/libatasmart.nm
diff --git a/pkgs/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm
similarity index 100%
rename from pkgs/libcap-ng/libcap-ng.nm
rename to libcap-ng/libcap-ng.nm
diff --git a/pkgs/libcap/libcap.nm b/libcap/libcap.nm
similarity index 100%
rename from pkgs/libcap/libcap.nm
rename to libcap/libcap.nm
diff --git a/pkgs/libcap/patches/libcap-2.16-build-system-fixes.patch b/libcap/patches/libcap-2.16-build-system-fixes.patch
similarity index 100%
rename from pkgs/libcap/patches/libcap-2.16-build-system-fixes.patch
rename to libcap/patches/libcap-2.16-build-system-fixes.patch
diff --git a/pkgs/libcap/patches/libcap-2.16-headerfix.patch b/libcap/patches/libcap-2.16-headerfix.patch
similarity index 100%
rename from pkgs/libcap/patches/libcap-2.16-headerfix.patch
rename to libcap/patches/libcap-2.16-headerfix.patch
diff --git a/pkgs/libcgroup/libcgroup.nm b/libcgroup/libcgroup.nm
similarity index 100%
rename from pkgs/libcgroup/libcgroup.nm
rename to libcgroup/libcgroup.nm
diff --git a/pkgs/libdaemon/libdaemon.nm b/libdaemon/libdaemon.nm
similarity index 100%
rename from pkgs/libdaemon/libdaemon.nm
rename to libdaemon/libdaemon.nm
diff --git a/pkgs/libdnet/libdnet.nm b/libdnet/libdnet.nm
similarity index 100%
rename from pkgs/libdnet/libdnet.nm
rename to libdnet/libdnet.nm
diff --git a/pkgs/libdnet/patches/libdnet-1.12-shrext.patch b/libdnet/patches/libdnet-1.12-shrext.patch
similarity index 100%
rename from pkgs/libdnet/patches/libdnet-1.12-shrext.patch
rename to libdnet/patches/libdnet-1.12-shrext.patch
diff --git a/pkgs/libdrm/91-drm-modeset.rules b/libdrm/91-drm-modeset.rules
similarity index 100%
rename from pkgs/libdrm/91-drm-modeset.rules
rename to libdrm/91-drm-modeset.rules
diff --git a/pkgs/libdrm/libdrm.nm b/libdrm/libdrm.nm
similarity index 100%
rename from pkgs/libdrm/libdrm.nm
rename to libdrm/libdrm.nm
diff --git a/pkgs/libdrm/patches/libdrm-2.4.0-no-bc.patch b/libdrm/patches/libdrm-2.4.0-no-bc.patch
similarity index 100%
rename from pkgs/libdrm/patches/libdrm-2.4.0-no-bc.patch
rename to libdrm/patches/libdrm-2.4.0-no-bc.patch
diff --git a/pkgs/libdrm/patches/libdrm-2.4.21-b803918f3f.patch b/libdrm/patches/libdrm-2.4.21-b803918f3f.patch
similarity index 100%
rename from pkgs/libdrm/patches/libdrm-2.4.21-b803918f3f.patch
rename to libdrm/patches/libdrm-2.4.21-b803918f3f.patch
diff --git a/pkgs/libdrm/patches/libdrm-make-dri-perms-okay.patch b/libdrm/patches/libdrm-make-dri-perms-okay.patch
similarity index 100%
rename from pkgs/libdrm/patches/libdrm-make-dri-perms-okay.patch
rename to libdrm/patches/libdrm-make-dri-perms-okay.patch
diff --git a/pkgs/libedit/libedit.nm b/libedit/libedit.nm
similarity index 100%
rename from pkgs/libedit/libedit.nm
rename to libedit/libedit.nm
diff --git a/pkgs/libevent/libevent.nm b/libevent/libevent.nm
similarity index 100%
rename from pkgs/libevent/libevent.nm
rename to libevent/libevent.nm
diff --git a/pkgs/libffi/libffi.nm b/libffi/libffi.nm
similarity index 100%
rename from pkgs/libffi/libffi.nm
rename to libffi/libffi.nm
diff --git a/pkgs/libfontenc/libfontenc.nm b/libfontenc/libfontenc.nm
similarity index 100%
rename from pkgs/libfontenc/libfontenc.nm
rename to libfontenc/libfontenc.nm
diff --git a/pkgs/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm
similarity index 100%
rename from pkgs/libgcrypt/libgcrypt.nm
rename to libgcrypt/libgcrypt.nm
diff --git a/pkgs/libgpg-error/libgpg-error.nm b/libgpg-error/libgpg-error.nm
similarity index 100%
rename from pkgs/libgpg-error/libgpg-error.nm
rename to libgpg-error/libgpg-error.nm
diff --git a/pkgs/libgssglue/libgssglue.nm b/libgssglue/libgssglue.nm
similarity index 100%
rename from pkgs/libgssglue/libgssglue.nm
rename to libgssglue/libgssglue.nm
diff --git a/pkgs/libidn/libidn.nm b/libidn/libidn.nm
similarity index 100%
rename from pkgs/libidn/libidn.nm
rename to libidn/libidn.nm
diff --git a/pkgs/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm
similarity index 100%
rename from pkgs/libjpeg/libjpeg.nm
rename to libjpeg/libjpeg.nm
diff --git a/pkgs/libksba/libksba.nm b/libksba/libksba.nm
similarity index 100%
rename from pkgs/libksba/libksba.nm
rename to libksba/libksba.nm
diff --git a/pkgs/libmng/libmng.nm b/libmng/libmng.nm
similarity index 100%
rename from pkgs/libmng/libmng.nm
rename to libmng/libmng.nm
diff --git a/pkgs/libmpc/libmpc.nm b/libmpc/libmpc.nm
similarity index 100%
rename from pkgs/libmpc/libmpc.nm
rename to libmpc/libmpc.nm
diff --git a/pkgs/libnet/libnet.nm b/libnet/libnet.nm
similarity index 100%
rename from pkgs/libnet/libnet.nm
rename to libnet/libnet.nm
diff --git a/pkgs/libnet/patches/libnet-1.1.4-capability.patch b/libnet/patches/libnet-1.1.4-capability.patch
similarity index 100%
rename from pkgs/libnet/patches/libnet-1.1.4-capability.patch
rename to libnet/patches/libnet-1.1.4-capability.patch
diff --git a/pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm
similarity index 100%
rename from pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm
rename to libnetfilter_conntrack/libnetfilter_conntrack.nm
diff --git a/pkgs/libnetfilter_log/libnetfilter_log.nm b/libnetfilter_log/libnetfilter_log.nm
similarity index 100%
rename from pkgs/libnetfilter_log/libnetfilter_log.nm
rename to libnetfilter_log/libnetfilter_log.nm
diff --git a/pkgs/libnetfilter_queue/libnetfilter_queue.nm b/libnetfilter_queue/libnetfilter_queue.nm
similarity index 100%
rename from pkgs/libnetfilter_queue/libnetfilter_queue.nm
rename to libnetfilter_queue/libnetfilter_queue.nm
diff --git a/pkgs/libnfnetlink/libnfnetlink.nm b/libnfnetlink/libnfnetlink.nm
similarity index 100%
rename from pkgs/libnfnetlink/libnfnetlink.nm
rename to libnfnetlink/libnfnetlink.nm
diff --git a/pkgs/libnfsidmap/libnfsidmap.nm b/libnfsidmap/libnfsidmap.nm
similarity index 100%
rename from pkgs/libnfsidmap/libnfsidmap.nm
rename to libnfsidmap/libnfsidmap.nm
diff --git a/pkgs/libnl/libnl.nm b/libnl/libnl.nm
similarity index 100%
rename from pkgs/libnl/libnl.nm
rename to libnl/libnl.nm
diff --git a/pkgs/libnl/patches/libnl-1.1-include-limits-h.patch b/libnl/patches/libnl-1.1-include-limits-h.patch
similarity index 100%
rename from pkgs/libnl/patches/libnl-1.1-include-limits-h.patch
rename to libnl/patches/libnl-1.1-include-limits-h.patch
diff --git a/pkgs/libnl/patches/libnl-1.1-no-extern-inline.patch b/libnl/patches/libnl-1.1-no-extern-inline.patch
similarity index 100%
rename from pkgs/libnl/patches/libnl-1.1-no-extern-inline.patch
rename to libnl/patches/libnl-1.1-no-extern-inline.patch
diff --git a/pkgs/libnl/patches/libnl-1.1-permissions.patch b/libnl/patches/libnl-1.1-permissions.patch
similarity index 100%
rename from pkgs/libnl/patches/libnl-1.1-permissions.patch
rename to libnl/patches/libnl-1.1-permissions.patch
diff --git a/pkgs/libpcap/libpcap.nm b/libpcap/libpcap.nm
similarity index 100%
rename from pkgs/libpcap/libpcap.nm
rename to libpcap/libpcap.nm
diff --git a/pkgs/libpcap/patches/libpcap-0.8.3-ppp.patch b/libpcap/patches/libpcap-0.8.3-ppp.patch
similarity index 100%
rename from pkgs/libpcap/patches/libpcap-0.8.3-ppp.patch
rename to libpcap/patches/libpcap-0.8.3-ppp.patch
diff --git a/pkgs/libpciaccess/libpciaccess.nm b/libpciaccess/libpciaccess.nm
similarity index 100%
rename from pkgs/libpciaccess/libpciaccess.nm
rename to libpciaccess/libpciaccess.nm
diff --git a/pkgs/libpipeline/libpipeline.nm b/libpipeline/libpipeline.nm
similarity index 100%
rename from pkgs/libpipeline/libpipeline.nm
rename to libpipeline/libpipeline.nm
diff --git a/pkgs/libpng/libpng.nm b/libpng/libpng.nm
similarity index 100%
rename from pkgs/libpng/libpng.nm
rename to libpng/libpng.nm
diff --git a/pkgs/libpng/patches/libpng-1.4.2-pngconf.patch b/libpng/patches/libpng-1.4.2-pngconf.patch
similarity index 100%
rename from pkgs/libpng/patches/libpng-1.4.2-pngconf.patch
rename to libpng/patches/libpng-1.4.2-pngconf.patch
diff --git a/pkgs/librpcsecgss/librpcsecgss.nm b/librpcsecgss/librpcsecgss.nm
similarity index 100%
rename from pkgs/librpcsecgss/librpcsecgss.nm
rename to librpcsecgss/librpcsecgss.nm
diff --git a/pkgs/libselinux/libselinux.nm b/libselinux/libselinux.nm
similarity index 100%
rename from pkgs/libselinux/libselinux.nm
rename to libselinux/libselinux.nm
diff --git a/pkgs/libselinux/patches/libselinux-ipfire.patch b/libselinux/patches/libselinux-ipfire.patch
similarity index 100%
rename from pkgs/libselinux/patches/libselinux-ipfire.patch
rename to libselinux/patches/libselinux-ipfire.patch
diff --git a/pkgs/libsemanage/libsemanage.nm b/libsemanage/libsemanage.nm
similarity index 100%
rename from pkgs/libsemanage/libsemanage.nm
rename to libsemanage/libsemanage.nm
diff --git a/pkgs/libsemanage/patches/libsemanage-rhat.patch b/libsemanage/patches/libsemanage-rhat.patch
similarity index 100%
rename from pkgs/libsemanage/patches/libsemanage-rhat.patch
rename to libsemanage/patches/libsemanage-rhat.patch
diff --git a/pkgs/libsemanage/semanage.conf b/libsemanage/semanage.conf
similarity index 100%
rename from pkgs/libsemanage/semanage.conf
rename to libsemanage/semanage.conf
diff --git a/pkgs/libsepol/libsepol.nm b/libsepol/libsepol.nm
similarity index 100%
rename from pkgs/libsepol/libsepol.nm
rename to libsepol/libsepol.nm
diff --git a/pkgs/libsigc++/libsigc++.nm b/libsigc++/libsigc++.nm
similarity index 100%
rename from pkgs/libsigc++/libsigc++.nm
rename to libsigc++/libsigc++.nm
diff --git a/pkgs/libsolv/libsolv.nm b/libsolv/libsolv.nm
similarity index 100%
rename from pkgs/libsolv/libsolv.nm
rename to libsolv/libsolv.nm
diff --git a/pkgs/libsoup/libsoup.nm b/libsoup/libsoup.nm
similarity index 100%
rename from pkgs/libsoup/libsoup.nm
rename to libsoup/libsoup.nm
diff --git a/pkgs/libssh2/libssh2.nm b/libssh2/libssh2.nm
similarity index 100%
rename from pkgs/libssh2/libssh2.nm
rename to libssh2/libssh2.nm
diff --git a/pkgs/libtasn1/libtasn1.nm b/libtasn1/libtasn1.nm
similarity index 100%
rename from pkgs/libtasn1/libtasn1.nm
rename to libtasn1/libtasn1.nm
diff --git a/pkgs/libtiff/libtiff.nm b/libtiff/libtiff.nm
similarity index 100%
rename from pkgs/libtiff/libtiff.nm
rename to libtiff/libtiff.nm
diff --git a/pkgs/libtool/libtool.nm b/libtool/libtool.nm
similarity index 100%
rename from pkgs/libtool/libtool.nm
rename to libtool/libtool.nm
diff --git a/pkgs/libtorrent/libtorrent.nm b/libtorrent/libtorrent.nm
similarity index 100%
rename from pkgs/libtorrent/libtorrent.nm
rename to libtorrent/libtorrent.nm
diff --git a/pkgs/libusb-compat/libusb-compat.nm b/libusb-compat/libusb-compat.nm
similarity index 100%
rename from pkgs/libusb-compat/libusb-compat.nm
rename to libusb-compat/libusb-compat.nm
diff --git a/pkgs/libusb/libusb.nm b/libusb/libusb.nm
similarity index 100%
rename from pkgs/libusb/libusb.nm
rename to libusb/libusb.nm
diff --git a/pkgs/libuser/libuser.nm b/libuser/libuser.nm
similarity index 100%
rename from pkgs/libuser/libuser.nm
rename to libuser/libuser.nm
diff --git a/pkgs/libvirt/libvirt.nm b/libvirt/libvirt.nm
similarity index 100%
rename from pkgs/libvirt/libvirt.nm
rename to libvirt/libvirt.nm
diff --git a/pkgs/libxcb/libxcb.nm b/libxcb/libxcb.nm
similarity index 100%
rename from pkgs/libxcb/libxcb.nm
rename to libxcb/libxcb.nm
diff --git a/pkgs/libxkbfile/libxkbfile.nm b/libxkbfile/libxkbfile.nm
similarity index 100%
rename from pkgs/libxkbfile/libxkbfile.nm
rename to libxkbfile/libxkbfile.nm
diff --git a/pkgs/libxml2/libxml2.nm b/libxml2/libxml2.nm
similarity index 100%
rename from pkgs/libxml2/libxml2.nm
rename to libxml2/libxml2.nm
diff --git a/pkgs/libxslt/libxslt.nm b/libxslt/libxslt.nm
similarity index 100%
rename from pkgs/libxslt/libxslt.nm
rename to libxslt/libxslt.nm
diff --git a/pkgs/libyaml/libyaml.nm b/libyaml/libyaml.nm
similarity index 100%
rename from pkgs/libyaml/libyaml.nm
rename to libyaml/libyaml.nm
diff --git a/pkgs/lighttpd/lighttpd.conf b/lighttpd/lighttpd.conf
similarity index 100%
rename from pkgs/lighttpd/lighttpd.conf
rename to lighttpd/lighttpd.conf
diff --git a/pkgs/lighttpd/lighttpd.nm b/lighttpd/lighttpd.nm
similarity index 100%
rename from pkgs/lighttpd/lighttpd.nm
rename to lighttpd/lighttpd.nm
diff --git a/pkgs/lighttpd/lighttpd.tmpfiles b/lighttpd/lighttpd.tmpfiles
similarity index 100%
rename from pkgs/lighttpd/lighttpd.tmpfiles
rename to lighttpd/lighttpd.tmpfiles
diff --git a/pkgs/lighttpd/systemd/lighttpd.service b/lighttpd/systemd/lighttpd.service
similarity index 100%
rename from pkgs/lighttpd/systemd/lighttpd.service
rename to lighttpd/systemd/lighttpd.service
diff --git a/pkgs/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm
similarity index 100%
rename from pkgs/linux-atm/linux-atm.nm
rename to linux-atm/linux-atm.nm
diff --git a/pkgs/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch b/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
similarity index 100%
rename from pkgs/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
rename to linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
diff --git a/pkgs/linux-atm/patches/linux-atm-2.4.1-nmu.patch b/linux-atm/patches/linux-atm-2.4.1-nmu.patch
similarity index 100%
rename from pkgs/linux-atm/patches/linux-atm-2.4.1-nmu.patch
rename to linux-atm/patches/linux-atm-2.4.1-nmu.patch
diff --git a/pkgs/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm
similarity index 100%
rename from pkgs/linux-firmware/linux-firmware.nm
rename to linux-firmware/linux-firmware.nm
diff --git a/pkgs/lldpd/lldpd.nm b/lldpd/lldpd.nm
similarity index 100%
rename from pkgs/lldpd/lldpd.nm
rename to lldpd/lldpd.nm
diff --git a/pkgs/lldpd/lldpd.tmpfiles b/lldpd/lldpd.tmpfiles
similarity index 100%
rename from pkgs/lldpd/lldpd.tmpfiles
rename to lldpd/lldpd.tmpfiles
diff --git a/pkgs/lldpd/patches/lldpd-0.52.x-os-release.patch b/lldpd/patches/lldpd-0.52.x-os-release.patch
similarity index 100%
rename from pkgs/lldpd/patches/lldpd-0.52.x-os-release.patch
rename to lldpd/patches/lldpd-0.52.x-os-release.patch
diff --git a/pkgs/lldpd/systemd/lldpd.service b/lldpd/systemd/lldpd.service
similarity index 100%
rename from pkgs/lldpd/systemd/lldpd.service
rename to lldpd/systemd/lldpd.service
diff --git a/pkgs/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm
similarity index 100%
rename from pkgs/lm-sensors/lm-sensors.nm
rename to lm-sensors/lm-sensors.nm
diff --git a/pkgs/logrotate/logrotate.nm b/logrotate/logrotate.nm
similarity index 100%
rename from pkgs/logrotate/logrotate.nm
rename to logrotate/logrotate.nm
diff --git a/pkgs/logrotate/patches/logrotate-3.7.7-curdir.patch b/logrotate/patches/logrotate-3.7.7-curdir.patch
similarity index 100%
rename from pkgs/logrotate/patches/logrotate-3.7.7-curdir.patch
rename to logrotate/patches/logrotate-3.7.7-curdir.patch
diff --git a/pkgs/logrotate/patches/logrotate-3.7.7-toolarge.patch b/logrotate/patches/logrotate-3.7.7-toolarge.patch
similarity index 100%
rename from pkgs/logrotate/patches/logrotate-3.7.7-toolarge.patch
rename to logrotate/patches/logrotate-3.7.7-toolarge.patch
diff --git a/pkgs/logrotate/systemd/logrotate.service b/logrotate/systemd/logrotate.service
similarity index 100%
rename from pkgs/logrotate/systemd/logrotate.service
rename to logrotate/systemd/logrotate.service
diff --git a/pkgs/lsof/lsof.nm b/lsof/lsof.nm
similarity index 100%
rename from pkgs/lsof/lsof.nm
rename to lsof/lsof.nm
diff --git a/pkgs/lsof/patches/lsof_4.81-threads.patch b/lsof/patches/lsof_4.81-threads.patch
similarity index 100%
rename from pkgs/lsof/patches/lsof_4.81-threads.patch
rename to lsof/patches/lsof_4.81-threads.patch
diff --git a/pkgs/lua/lua.nm b/lua/lua.nm
similarity index 100%
rename from pkgs/lua/lua.nm
rename to lua/lua.nm
diff --git a/pkgs/lua/patches/lua-5.1.4-autotoolize.patch b/lua/patches/lua-5.1.4-autotoolize.patch
similarity index 100%
rename from pkgs/lua/patches/lua-5.1.4-autotoolize.patch
rename to lua/patches/lua-5.1.4-autotoolize.patch
diff --git a/pkgs/lvm2/lvm2.nm b/lvm2/lvm2.nm
similarity index 100%
rename from pkgs/lvm2/lvm2.nm
rename to lvm2/lvm2.nm
diff --git a/pkgs/lzo/lzo.nm b/lzo/lzo.nm
similarity index 100%
rename from pkgs/lzo/lzo.nm
rename to lzo/lzo.nm
diff --git a/pkgs/m4/m4.nm b/m4/m4.nm
similarity index 100%
rename from pkgs/m4/m4.nm
rename to m4/m4.nm
diff --git a/pkgs/mailcap/mailcap.nm b/mailcap/mailcap.nm
similarity index 100%
rename from pkgs/mailcap/mailcap.nm
rename to mailcap/mailcap.nm
diff --git a/pkgs/make/make.nm b/make/make.nm
similarity index 100%
rename from pkgs/make/make.nm
rename to make/make.nm
diff --git a/pkgs/make/patches/make-3.79.1-noclock_gettime.patch b/make/patches/make-3.79.1-noclock_gettime.patch
similarity index 100%
rename from pkgs/make/patches/make-3.79.1-noclock_gettime.patch
rename to make/patches/make-3.79.1-noclock_gettime.patch
diff --git a/pkgs/make/patches/make-3.80-getcwd.patch b/make/patches/make-3.80-getcwd.patch
similarity index 100%
rename from pkgs/make/patches/make-3.80-getcwd.patch
rename to make/patches/make-3.80-getcwd.patch
diff --git a/pkgs/make/patches/make-3.80-j8k.patch b/make/patches/make-3.80-j8k.patch
similarity index 100%
rename from pkgs/make/patches/make-3.80-j8k.patch
rename to make/patches/make-3.80-j8k.patch
diff --git a/pkgs/make/patches/make-3.81-err-reporting.patch b/make/patches/make-3.81-err-reporting.patch
similarity index 100%
rename from pkgs/make/patches/make-3.81-err-reporting.patch
rename to make/patches/make-3.81-err-reporting.patch
diff --git a/pkgs/make/patches/make-3.81-fdleak.patch b/make/patches/make-3.81-fdleak.patch
similarity index 100%
rename from pkgs/make/patches/make-3.81-fdleak.patch
rename to make/patches/make-3.81-fdleak.patch
diff --git a/pkgs/make/patches/make-3.81-jobserver.patch b/make/patches/make-3.81-jobserver.patch
similarity index 100%
rename from pkgs/make/patches/make-3.81-jobserver.patch
rename to make/patches/make-3.81-jobserver.patch
diff --git a/pkgs/make/patches/make-3.81-memory.patch b/make/patches/make-3.81-memory.patch
similarity index 100%
rename from pkgs/make/patches/make-3.81-memory.patch
rename to make/patches/make-3.81-memory.patch
diff --git a/pkgs/make/patches/make-3.81-newlines.patch b/make/patches/make-3.81-newlines.patch
similarity index 100%
rename from pkgs/make/patches/make-3.81-newlines.patch
rename to make/patches/make-3.81-newlines.patch
diff --git a/pkgs/make/patches/make-3.81-rlimit.patch b/make/patches/make-3.81-rlimit.patch
similarity index 100%
rename from pkgs/make/patches/make-3.81-rlimit.patch
rename to make/patches/make-3.81-rlimit.patch
diff --git a/pkgs/make/patches/make-3.81-strcpy-overlap.patch b/make/patches/make-3.81-strcpy-overlap.patch
similarity index 100%
rename from pkgs/make/patches/make-3.81-strcpy-overlap.patch
rename to make/patches/make-3.81-strcpy-overlap.patch
diff --git a/pkgs/man-db/man-db.nm b/man-db/man-db.nm
similarity index 100%
rename from pkgs/man-db/man-db.nm
rename to man-db/man-db.nm
diff --git a/pkgs/man-pages/man-pages.nm b/man-pages/man-pages.nm
similarity index 100%
rename from pkgs/man-pages/man-pages.nm
rename to man-pages/man-pages.nm
diff --git a/pkgs/mc/mc.nm b/mc/mc.nm
similarity index 100%
rename from pkgs/mc/mc.nm
rename to mc/mc.nm
diff --git a/pkgs/mdadm/mdadm.nm b/mdadm/mdadm.nm
similarity index 100%
rename from pkgs/mdadm/mdadm.nm
rename to mdadm/mdadm.nm
diff --git a/pkgs/memtest86+/memtest86+.grub b/memtest86+/memtest86+.grub
similarity index 100%
rename from pkgs/memtest86+/memtest86+.grub
rename to memtest86+/memtest86+.grub
diff --git a/pkgs/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm
similarity index 100%
rename from pkgs/memtest86+/memtest86+.nm
rename to memtest86+/memtest86+.nm
diff --git a/pkgs/mesa/mesa.nm b/mesa/mesa.nm
similarity index 100%
rename from pkgs/mesa/mesa.nm
rename to mesa/mesa.nm
diff --git a/pkgs/minicom/minicom.nm b/minicom/minicom.nm
similarity index 100%
rename from pkgs/minicom/minicom.nm
rename to minicom/minicom.nm
diff --git a/pkgs/module-init-tools/modprobe.d/blacklist.conf b/module-init-tools/modprobe.d/blacklist.conf
similarity index 100%
rename from pkgs/module-init-tools/modprobe.d/blacklist.conf
rename to module-init-tools/modprobe.d/blacklist.conf
diff --git a/pkgs/module-init-tools/modprobe.d/modprobe.conf b/module-init-tools/modprobe.d/modprobe.conf
similarity index 100%
rename from pkgs/module-init-tools/modprobe.d/modprobe.conf
rename to module-init-tools/modprobe.d/modprobe.conf
diff --git a/pkgs/module-init-tools/module-init-tools.nm b/module-init-tools/module-init-tools.nm
similarity index 100%
rename from pkgs/module-init-tools/module-init-tools.nm
rename to module-init-tools/module-init-tools.nm
diff --git a/pkgs/mpfr/mpfr.nm b/mpfr/mpfr.nm
similarity index 100%
rename from pkgs/mpfr/mpfr.nm
rename to mpfr/mpfr.nm
diff --git a/pkgs/multipath-tools/multipath-tools.nm b/multipath-tools/multipath-tools.nm
similarity index 100%
rename from pkgs/multipath-tools/multipath-tools.nm
rename to multipath-tools/multipath-tools.nm
diff --git a/pkgs/multipath-tools/patches/0001-RH-queue-without-daemon.patch b/multipath-tools/patches/0001-RH-queue-without-daemon.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0001-RH-queue-without-daemon.patch
rename to multipath-tools/patches/0001-RH-queue-without-daemon.patch
diff --git a/pkgs/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch b/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch
rename to multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch
diff --git a/pkgs/multipath-tools/patches/0002-RH-path-checker.patch b/multipath-tools/patches/0002-RH-path-checker.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0002-RH-path-checker.patch
rename to multipath-tools/patches/0002-RH-path-checker.patch
diff --git a/pkgs/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch b/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch
rename to multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch
diff --git a/pkgs/multipath-tools/patches/0003-RH-root-init-script.patch b/multipath-tools/patches/0003-RH-root-init-script.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0003-RH-root-init-script.patch
rename to multipath-tools/patches/0003-RH-root-init-script.patch
diff --git a/pkgs/multipath-tools/patches/0003-for-upstream-default-configs.patch b/multipath-tools/patches/0003-for-upstream-default-configs.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0003-for-upstream-default-configs.patch
rename to multipath-tools/patches/0003-for-upstream-default-configs.patch
diff --git a/pkgs/multipath-tools/patches/0004-RH-fix-kpartx.patch b/multipath-tools/patches/0004-RH-fix-kpartx.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0004-RH-fix-kpartx.patch
rename to multipath-tools/patches/0004-RH-fix-kpartx.patch
diff --git a/pkgs/multipath-tools/patches/0005-RH-cciss_id.patch b/multipath-tools/patches/0005-RH-cciss_id.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0005-RH-cciss_id.patch
rename to multipath-tools/patches/0005-RH-cciss_id.patch
diff --git a/pkgs/multipath-tools/patches/0006-RH-move-bindings.patch b/multipath-tools/patches/0006-RH-move-bindings.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0006-RH-move-bindings.patch
rename to multipath-tools/patches/0006-RH-move-bindings.patch
diff --git a/pkgs/multipath-tools/patches/0007-RH-do-not-remove.patch b/multipath-tools/patches/0007-RH-do-not-remove.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0007-RH-do-not-remove.patch
rename to multipath-tools/patches/0007-RH-do-not-remove.patch
diff --git a/pkgs/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch b/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch
rename to multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch
diff --git a/pkgs/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch b/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch
rename to multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch
diff --git a/pkgs/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch b/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch
rename to multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch
diff --git a/pkgs/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch b/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch
rename to multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch
diff --git a/pkgs/multipath-tools/patches/0012-RH-udev-sync-support.patch b/multipath-tools/patches/0012-RH-udev-sync-support.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0012-RH-udev-sync-support.patch
rename to multipath-tools/patches/0012-RH-udev-sync-support.patch
diff --git a/pkgs/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch b/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch
rename to multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch
diff --git a/pkgs/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch b/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch
rename to multipath-tools/patches/0014-RH-add-hp_tur-checker.patch
diff --git a/pkgs/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch b/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch
rename to multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch
diff --git a/pkgs/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch b/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch
rename to multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch
diff --git a/pkgs/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch b/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch
rename to multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch
diff --git a/pkgs/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch b/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch
rename to multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch
diff --git a/pkgs/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch b/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch
rename to multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch
diff --git a/pkgs/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch b/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch
rename to multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch
diff --git a/pkgs/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch b/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch
rename to multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch
diff --git a/pkgs/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch b/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch
rename to multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch
diff --git a/pkgs/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch b/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch
rename to multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch
diff --git a/pkgs/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch b/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch
similarity index 100%
rename from pkgs/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch
rename to multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch
diff --git a/pkgs/nano/nano.nm b/nano/nano.nm
similarity index 100%
rename from pkgs/nano/nano.nm
rename to nano/nano.nm
diff --git a/pkgs/nasm/nasm.nm b/nasm/nasm.nm
similarity index 100%
rename from pkgs/nasm/nasm.nm
rename to nasm/nasm.nm
diff --git a/pkgs/ncurses/ncurses.nm b/ncurses/ncurses.nm
similarity index 100%
rename from pkgs/ncurses/ncurses.nm
rename to ncurses/ncurses.nm
diff --git a/pkgs/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm
similarity index 100%
rename from pkgs/net-snmp/net-snmp.nm
rename to net-snmp/net-snmp.nm
diff --git a/pkgs/net-snmp/systemd/snmpd.service b/net-snmp/systemd/snmpd.service
similarity index 100%
rename from pkgs/net-snmp/systemd/snmpd.service
rename to net-snmp/systemd/snmpd.service
diff --git a/pkgs/net-tools/config.h b/net-tools/config.h
similarity index 100%
rename from pkgs/net-tools/config.h
rename to net-tools/config.h
diff --git a/pkgs/net-tools/config.make b/net-tools/config.make
similarity index 100%
rename from pkgs/net-tools/config.make
rename to net-tools/config.make
diff --git a/pkgs/net-tools/ether-wake.8 b/net-tools/ether-wake.8
similarity index 100%
rename from pkgs/net-tools/ether-wake.8
rename to net-tools/ether-wake.8
diff --git a/pkgs/net-tools/ether-wake.c b/net-tools/ether-wake.c
similarity index 100%
rename from pkgs/net-tools/ether-wake.c
rename to net-tools/ether-wake.c
diff --git a/pkgs/net-tools/ipmaddr.8 b/net-tools/ipmaddr.8
similarity index 100%
rename from pkgs/net-tools/ipmaddr.8
rename to net-tools/ipmaddr.8
diff --git a/pkgs/net-tools/iptunnel.8 b/net-tools/iptunnel.8
similarity index 100%
rename from pkgs/net-tools/iptunnel.8
rename to net-tools/iptunnel.8
diff --git a/pkgs/net-tools/mii-diag.8 b/net-tools/mii-diag.8
similarity index 100%
rename from pkgs/net-tools/mii-diag.8
rename to net-tools/mii-diag.8
diff --git a/pkgs/net-tools/mii-diag.c b/net-tools/mii-diag.c
similarity index 100%
rename from pkgs/net-tools/mii-diag.c
rename to net-tools/mii-diag.c
diff --git a/pkgs/net-tools/net-tools.nm b/net-tools/net-tools.nm
similarity index 100%
rename from pkgs/net-tools/net-tools.nm
rename to net-tools/net-tools.nm
diff --git a/pkgs/net-tools/patches/net-tools-1.57-bug22040.patch b/net-tools/patches/net-tools-1.57-bug22040.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.57-bug22040.patch
rename to net-tools/patches/net-tools-1.57-bug22040.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-IA64.patch b/net-tools/patches/net-tools-1.60-IA64.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-IA64.patch
rename to net-tools/patches/net-tools-1.60-IA64.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-a-option.patch b/net-tools/patches/net-tools-1.60-a-option.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-a-option.patch
rename to net-tools/patches/net-tools-1.60-a-option.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-arp-unaligned-access.patch b/net-tools/patches/net-tools-1.60-arp-unaligned-access.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-arp-unaligned-access.patch
rename to net-tools/patches/net-tools-1.60-arp-unaligned-access.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-arp_man.patch b/net-tools/patches/net-tools-1.60-arp_man.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-arp_man.patch
rename to net-tools/patches/net-tools-1.60-arp_man.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-arp_overflow.patch b/net-tools/patches/net-tools-1.60-arp_overflow.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-arp_overflow.patch
rename to net-tools/patches/net-tools-1.60-arp_overflow.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-avoid-name-resolution.patch b/net-tools/patches/net-tools-1.60-avoid-name-resolution.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-avoid-name-resolution.patch
rename to net-tools/patches/net-tools-1.60-avoid-name-resolution.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-bcast.patch b/net-tools/patches/net-tools-1.60-bcast.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-bcast.patch
rename to net-tools/patches/net-tools-1.60-bcast.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-clear-flag.patch b/net-tools/patches/net-tools-1.60-clear-flag.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-clear-flag.patch
rename to net-tools/patches/net-tools-1.60-clear-flag.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-continous-flush-stdout.patch b/net-tools/patches/net-tools-1.60-continous-flush-stdout.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-continous-flush-stdout.patch
rename to net-tools/patches/net-tools-1.60-continous-flush-stdout.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-cycle.patch b/net-tools/patches/net-tools-1.60-cycle.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-cycle.patch
rename to net-tools/patches/net-tools-1.60-cycle.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-de.patch b/net-tools/patches/net-tools-1.60-de.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-de.patch
rename to net-tools/patches/net-tools-1.60-de.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-debug-fix.patch b/net-tools/patches/net-tools-1.60-debug-fix.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-debug-fix.patch
rename to net-tools/patches/net-tools-1.60-debug-fix.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-duplicate-tcp.patch b/net-tools/patches/net-tools-1.60-duplicate-tcp.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-duplicate-tcp.patch
rename to net-tools/patches/net-tools-1.60-duplicate-tcp.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ec_hw_null.patch b/net-tools/patches/net-tools-1.60-ec_hw_null.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ec_hw_null.patch
rename to net-tools/patches/net-tools-1.60-ec_hw_null.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-fgets.patch b/net-tools/patches/net-tools-1.60-fgets.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-fgets.patch
rename to net-tools/patches/net-tools-1.60-fgets.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-gcc33.patch b/net-tools/patches/net-tools-1.60-gcc33.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-gcc33.patch
rename to net-tools/patches/net-tools-1.60-gcc33.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-gcc34.patch b/net-tools/patches/net-tools-1.60-gcc34.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-gcc34.patch
rename to net-tools/patches/net-tools-1.60-gcc34.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-hfi.patch b/net-tools/patches/net-tools-1.60-hfi.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-hfi.patch
rename to net-tools/patches/net-tools-1.60-hfi.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-hostname-short.patch b/net-tools/patches/net-tools-1.60-hostname-short.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-hostname-short.patch
rename to net-tools/patches/net-tools-1.60-hostname-short.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-hostname_man.patch b/net-tools/patches/net-tools-1.60-hostname_man.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-hostname_man.patch
rename to net-tools/patches/net-tools-1.60-hostname_man.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-i-option.patch b/net-tools/patches/net-tools-1.60-i-option.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-i-option.patch
rename to net-tools/patches/net-tools-1.60-i-option.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ib-warning.patch b/net-tools/patches/net-tools-1.60-ib-warning.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ib-warning.patch
rename to net-tools/patches/net-tools-1.60-ib-warning.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ifaceopt.patch b/net-tools/patches/net-tools-1.60-ifaceopt.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ifaceopt.patch
rename to net-tools/patches/net-tools-1.60-ifaceopt.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch b/net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch
rename to net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ifconfig.patch b/net-tools/patches/net-tools-1.60-ifconfig.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ifconfig.patch
rename to net-tools/patches/net-tools-1.60-ifconfig.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ifconfig_ib.patch b/net-tools/patches/net-tools-1.60-ifconfig_ib.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ifconfig_ib.patch
rename to net-tools/patches/net-tools-1.60-ifconfig_ib.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ifconfig_man.patch b/net-tools/patches/net-tools-1.60-ifconfig_man.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ifconfig_man.patch
rename to net-tools/patches/net-tools-1.60-ifconfig_man.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-inet6-lookup.patch b/net-tools/patches/net-tools-1.60-inet6-lookup.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-inet6-lookup.patch
rename to net-tools/patches/net-tools-1.60-inet6-lookup.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-interface.patch b/net-tools/patches/net-tools-1.60-interface.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-interface.patch
rename to net-tools/patches/net-tools-1.60-interface.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-interface_stack.patch b/net-tools/patches/net-tools-1.60-interface_stack.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-interface_stack.patch
rename to net-tools/patches/net-tools-1.60-interface_stack.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ipx.patch b/net-tools/patches/net-tools-1.60-ipx.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ipx.patch
rename to net-tools/patches/net-tools-1.60-ipx.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-isofix.patch b/net-tools/patches/net-tools-1.60-isofix.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-isofix.patch
rename to net-tools/patches/net-tools-1.60-isofix.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-large-indexes.patch b/net-tools/patches/net-tools-1.60-large-indexes.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-large-indexes.patch
rename to net-tools/patches/net-tools-1.60-large-indexes.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-makefile-berlios.patch b/net-tools/patches/net-tools-1.60-makefile-berlios.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-makefile-berlios.patch
rename to net-tools/patches/net-tools-1.60-makefile-berlios.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch b/net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch
rename to net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-man-obsolete.patch b/net-tools/patches/net-tools-1.60-man-obsolete.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-man-obsolete.patch
rename to net-tools/patches/net-tools-1.60-man-obsolete.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-man.patch b/net-tools/patches/net-tools-1.60-man.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-man.patch
rename to net-tools/patches/net-tools-1.60-man.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-manydevs.patch b/net-tools/patches/net-tools-1.60-manydevs.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-manydevs.patch
rename to net-tools/patches/net-tools-1.60-manydevs.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch b/net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch
rename to net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-metric-tunnel-man.patch b/net-tools/patches/net-tools-1.60-metric-tunnel-man.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-metric-tunnel-man.patch
rename to net-tools/patches/net-tools-1.60-metric-tunnel-man.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-mii-gigabit.patch b/net-tools/patches/net-tools-1.60-mii-gigabit.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-mii-gigabit.patch
rename to net-tools/patches/net-tools-1.60-mii-gigabit.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-mii-refactor.patch b/net-tools/patches/net-tools-1.60-mii-refactor.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-mii-refactor.patch
rename to net-tools/patches/net-tools-1.60-mii-refactor.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch b/net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch
rename to net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-miiioctl.patch b/net-tools/patches/net-tools-1.60-miiioctl.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-miiioctl.patch
rename to net-tools/patches/net-tools-1.60-miiioctl.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-nameif.patch b/net-tools/patches/net-tools-1.60-nameif.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-nameif.patch
rename to net-tools/patches/net-tools-1.60-nameif.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-nameif_strncpy.patch b/net-tools/patches/net-tools-1.60-nameif_strncpy.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-nameif_strncpy.patch
rename to net-tools/patches/net-tools-1.60-nameif_strncpy.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netdevice.patch b/net-tools/patches/net-tools-1.60-netdevice.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netdevice.patch
rename to net-tools/patches/net-tools-1.60-netdevice.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netmask.patch b/net-tools/patches/net-tools-1.60-netmask.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netmask.patch
rename to net-tools/patches/net-tools-1.60-netmask.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netstat-I-fix.patch b/net-tools/patches/net-tools-1.60-netstat-I-fix.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netstat-I-fix.patch
rename to net-tools/patches/net-tools-1.60-netstat-I-fix.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch b/net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch
rename to net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netstat-leak.patch b/net-tools/patches/net-tools-1.60-netstat-leak.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netstat-leak.patch
rename to net-tools/patches/net-tools-1.60-netstat-leak.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netstat-probe.patch b/net-tools/patches/net-tools-1.60-netstat-probe.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netstat-probe.patch
rename to net-tools/patches/net-tools-1.60-netstat-probe.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netstat_inode.patch b/net-tools/patches/net-tools-1.60-netstat_inode.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netstat_inode.patch
rename to net-tools/patches/net-tools-1.60-netstat_inode.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netstat_stop_trim.patch b/net-tools/patches/net-tools-1.60-netstat_stop_trim.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netstat_stop_trim.patch
rename to net-tools/patches/net-tools-1.60-netstat_stop_trim.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-netstat_ulong.patch b/net-tools/patches/net-tools-1.60-netstat_ulong.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-netstat_ulong.patch
rename to net-tools/patches/net-tools-1.60-netstat_ulong.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-note.patch b/net-tools/patches/net-tools-1.60-note.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-note.patch
rename to net-tools/patches/net-tools-1.60-note.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-num-ports.patch b/net-tools/patches/net-tools-1.60-num-ports.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-num-ports.patch
rename to net-tools/patches/net-tools-1.60-num-ports.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-overflow.patch b/net-tools/patches/net-tools-1.60-overflow.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-overflow.patch
rename to net-tools/patches/net-tools-1.60-overflow.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-parse.patch b/net-tools/patches/net-tools-1.60-parse.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-parse.patch
rename to net-tools/patches/net-tools-1.60-parse.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-pie.patch b/net-tools/patches/net-tools-1.60-pie.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-pie.patch
rename to net-tools/patches/net-tools-1.60-pie.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-remove_node.patch b/net-tools/patches/net-tools-1.60-remove_node.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-remove_node.patch
rename to net-tools/patches/net-tools-1.60-remove_node.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-return.patch b/net-tools/patches/net-tools-1.60-return.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-return.patch
rename to net-tools/patches/net-tools-1.60-return.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-scanf-format.patch b/net-tools/patches/net-tools-1.60-scanf-format.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-scanf-format.patch
rename to net-tools/patches/net-tools-1.60-scanf-format.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-sctp-addrs.patch b/net-tools/patches/net-tools-1.60-sctp-addrs.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-sctp-addrs.patch
rename to net-tools/patches/net-tools-1.60-sctp-addrs.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-sctp-quiet.patch b/net-tools/patches/net-tools-1.60-sctp-quiet.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-sctp-quiet.patch
rename to net-tools/patches/net-tools-1.60-sctp-quiet.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-sctp.patch b/net-tools/patches/net-tools-1.60-sctp.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-sctp.patch
rename to net-tools/patches/net-tools-1.60-sctp.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-selinux.patch b/net-tools/patches/net-tools-1.60-selinux.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-selinux.patch
rename to net-tools/patches/net-tools-1.60-selinux.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-siunits.patch b/net-tools/patches/net-tools-1.60-siunits.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-siunits.patch
rename to net-tools/patches/net-tools-1.60-siunits.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-skip.patch b/net-tools/patches/net-tools-1.60-skip.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-skip.patch
rename to net-tools/patches/net-tools-1.60-skip.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-slattach-fchown.patch b/net-tools/patches/net-tools-1.60-slattach-fchown.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-slattach-fchown.patch
rename to net-tools/patches/net-tools-1.60-slattach-fchown.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-statalias.patch b/net-tools/patches/net-tools-1.60-statalias.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-statalias.patch
rename to net-tools/patches/net-tools-1.60-statalias.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-statistics-doubleword.patch b/net-tools/patches/net-tools-1.60-statistics-doubleword.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-statistics-doubleword.patch
rename to net-tools/patches/net-tools-1.60-statistics-doubleword.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-statistics.patch b/net-tools/patches/net-tools-1.60-statistics.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-statistics.patch
rename to net-tools/patches/net-tools-1.60-statistics.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-statistics_buffer.patch b/net-tools/patches/net-tools-1.60-statistics_buffer.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-statistics_buffer.patch
rename to net-tools/patches/net-tools-1.60-statistics_buffer.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-stdo.patch b/net-tools/patches/net-tools-1.60-stdo.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-stdo.patch
rename to net-tools/patches/net-tools-1.60-stdo.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-trailingblank.patch b/net-tools/patches/net-tools-1.60-trailingblank.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-trailingblank.patch
rename to net-tools/patches/net-tools-1.60-trailingblank.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-trim_iface.patch b/net-tools/patches/net-tools-1.60-trim_iface.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-trim_iface.patch
rename to net-tools/patches/net-tools-1.60-trim_iface.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-trunc.patch b/net-tools/patches/net-tools-1.60-trunc.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-trunc.patch
rename to net-tools/patches/net-tools-1.60-trunc.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-ulong.patch b/net-tools/patches/net-tools-1.60-ulong.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-ulong.patch
rename to net-tools/patches/net-tools-1.60-ulong.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-virtualname.patch b/net-tools/patches/net-tools-1.60-virtualname.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-virtualname.patch
rename to net-tools/patches/net-tools-1.60-virtualname.patch
diff --git a/pkgs/net-tools/patches/net-tools-1.60-x25-proc.patch b/net-tools/patches/net-tools-1.60-x25-proc.patch
similarity index 100%
rename from pkgs/net-tools/patches/net-tools-1.60-x25-proc.patch
rename to net-tools/patches/net-tools-1.60-x25-proc.patch
diff --git a/pkgs/netplug/netplug.nm b/netplug/netplug.nm
similarity index 100%
rename from pkgs/netplug/netplug.nm
rename to netplug/netplug.nm
diff --git a/pkgs/netplug/patches/netplug-1.2.9.1-execshield.patch b/netplug/patches/netplug-1.2.9.1-execshield.patch
similarity index 100%
rename from pkgs/netplug/patches/netplug-1.2.9.1-execshield.patch
rename to netplug/patches/netplug-1.2.9.1-execshield.patch
diff --git a/pkgs/netplug/systemd/netplug.service b/netplug/systemd/netplug.service
similarity index 100%
rename from pkgs/netplug/systemd/netplug.service
rename to netplug/systemd/netplug.service
diff --git a/pkgs/nettle/nettle.nm b/nettle/nettle.nm
similarity index 100%
rename from pkgs/nettle/nettle.nm
rename to nettle/nettle.nm
diff --git a/pkgs/network/network.nm b/network/network.nm
similarity index 100%
rename from pkgs/network/network.nm
rename to network/network.nm
diff --git a/pkgs/network/systemd/network.service b/network/systemd/network.service
similarity index 100%
rename from pkgs/network/systemd/network.service
rename to network/systemd/network.service
diff --git a/pkgs/newt/newt.nm b/newt/newt.nm
similarity index 100%
rename from pkgs/newt/newt.nm
rename to newt/newt.nm
diff --git a/pkgs/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm
similarity index 100%
rename from pkgs/nfs-utils/nfs-utils.nm
rename to nfs-utils/nfs-utils.nm
diff --git a/pkgs/nmap/nmap.nm b/nmap/nmap.nm
similarity index 100%
rename from pkgs/nmap/nmap.nm
rename to nmap/nmap.nm
diff --git a/pkgs/nmap/patches/nmap-5.00-mktemp.patch b/nmap/patches/nmap-5.00-mktemp.patch
similarity index 100%
rename from pkgs/nmap/patches/nmap-5.00-mktemp.patch
rename to nmap/patches/nmap-5.00-mktemp.patch
diff --git a/pkgs/noip/noip.nm b/noip/noip.nm
similarity index 100%
rename from pkgs/noip/noip.nm
rename to noip/noip.nm
diff --git a/pkgs/nspr/nspr-config-vars.in b/nspr/nspr-config-vars.in
similarity index 100%
rename from pkgs/nspr/nspr-config-vars.in
rename to nspr/nspr-config-vars.in
diff --git a/pkgs/nspr/nspr.nm b/nspr/nspr.nm
similarity index 100%
rename from pkgs/nspr/nspr.nm
rename to nspr/nspr.nm
diff --git a/pkgs/nspr/nspr.pc.in b/nspr/nspr.pc.in
similarity index 100%
rename from pkgs/nspr/nspr.pc.in
rename to nspr/nspr.pc.in
diff --git a/pkgs/nspr/patches/nspr-config-pc.patch b/nspr/patches/nspr-config-pc.patch
similarity index 100%
rename from pkgs/nspr/patches/nspr-config-pc.patch
rename to nspr/patches/nspr-config-pc.patch
diff --git a/pkgs/nss-myhostname/nss-myhostname.nm b/nss-myhostname/nss-myhostname.nm
similarity index 100%
rename from pkgs/nss-myhostname/nss-myhostname.nm
rename to nss-myhostname/nss-myhostname.nm
diff --git a/pkgs/nss-softokn/nss-softokn-config.in b/nss-softokn/nss-softokn-config.in
similarity index 100%
rename from pkgs/nss-softokn/nss-softokn-config.in
rename to nss-softokn/nss-softokn-config.in
diff --git a/pkgs/nss-softokn/nss-softokn.nm b/nss-softokn/nss-softokn.nm
similarity index 100%
rename from pkgs/nss-softokn/nss-softokn.nm
rename to nss-softokn/nss-softokn.nm
diff --git a/pkgs/nss-softokn/nss-softokn.pc.in b/nss-softokn/nss-softokn.pc.in
similarity index 100%
rename from pkgs/nss-softokn/nss-softokn.pc.in
rename to nss-softokn/nss-softokn.pc.in
diff --git a/pkgs/nss-softokn/nss-softokn.spec b/nss-softokn/nss-softokn.spec
similarity index 100%
rename from pkgs/nss-softokn/nss-softokn.spec
rename to nss-softokn/nss-softokn.spec
diff --git a/pkgs/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch b/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
similarity index 100%
rename from pkgs/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
rename to nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
diff --git a/pkgs/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch b/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
similarity index 100%
rename from pkgs/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
rename to nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
diff --git a/pkgs/nss-util/nss-util-config.in b/nss-util/nss-util-config.in
similarity index 100%
rename from pkgs/nss-util/nss-util-config.in
rename to nss-util/nss-util-config.in
diff --git a/pkgs/nss-util/nss-util.nm b/nss-util/nss-util.nm
similarity index 100%
rename from pkgs/nss-util/nss-util.nm
rename to nss-util/nss-util.nm
diff --git a/pkgs/nss-util/nss-util.pc.in b/nss-util/nss-util.pc.in
similarity index 100%
rename from pkgs/nss-util/nss-util.pc.in
rename to nss-util/nss-util.pc.in
diff --git a/pkgs/nss-util/nss-util.spec b/nss-util/nss-util.spec
similarity index 100%
rename from pkgs/nss-util/nss-util.spec
rename to nss-util/nss-util.spec
diff --git a/pkgs/nss/PayPalEE.cert b/nss/PayPalEE.cert
similarity index 100%
rename from pkgs/nss/PayPalEE.cert
rename to nss/PayPalEE.cert
diff --git a/pkgs/nss/cert8.db b/nss/cert8.db
similarity index 100%
rename from pkgs/nss/cert8.db
rename to nss/cert8.db
diff --git a/pkgs/nss/cert9.db b/nss/cert9.db
similarity index 100%
rename from pkgs/nss/cert9.db
rename to nss/cert9.db
diff --git a/pkgs/nss/key3.db b/nss/key3.db
similarity index 100%
rename from pkgs/nss/key3.db
rename to nss/key3.db
diff --git a/pkgs/nss/key4.db b/nss/key4.db
similarity index 100%
rename from pkgs/nss/key4.db
rename to nss/key4.db
diff --git a/pkgs/nss/nss-config.in b/nss/nss-config.in
similarity index 100%
rename from pkgs/nss/nss-config.in
rename to nss/nss-config.in
diff --git a/pkgs/nss/nss.nm b/nss/nss.nm
similarity index 100%
rename from pkgs/nss/nss.nm
rename to nss/nss.nm
diff --git a/pkgs/nss/nss.pc.in b/nss/nss.pc.in
similarity index 100%
rename from pkgs/nss/nss.pc.in
rename to nss/nss.pc.in
diff --git a/pkgs/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch b/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
similarity index 100%
rename from pkgs/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
rename to nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
diff --git a/pkgs/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch b/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
similarity index 100%
rename from pkgs/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
rename to nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
diff --git a/pkgs/nss/patches/nss-enable-pem.patch b/nss/patches/nss-enable-pem.patch
similarity index 100%
rename from pkgs/nss/patches/nss-enable-pem.patch
rename to nss/patches/nss-enable-pem.patch
diff --git a/pkgs/nss/patches/nss-sysinit-userdb-first.patch b/nss/patches/nss-sysinit-userdb-first.patch
similarity index 100%
rename from pkgs/nss/patches/nss-sysinit-userdb-first.patch
rename to nss/patches/nss-sysinit-userdb-first.patch
diff --git a/pkgs/nss/patches/nsspem-596674.patch b/nss/patches/nsspem-596674.patch
similarity index 100%
rename from pkgs/nss/patches/nsspem-596674.patch
rename to nss/patches/nsspem-596674.patch
diff --git a/pkgs/nss/patches/renegotiate-transitional.patch b/nss/patches/renegotiate-transitional.patch
similarity index 100%
rename from pkgs/nss/patches/renegotiate-transitional.patch
rename to nss/patches/renegotiate-transitional.patch
diff --git a/pkgs/nss/secmod.db b/nss/secmod.db
similarity index 100%
rename from pkgs/nss/secmod.db
rename to nss/secmod.db
diff --git a/pkgs/nss/setup-nsssysinit.sh b/nss/setup-nsssysinit.sh
similarity index 100%
rename from pkgs/nss/setup-nsssysinit.sh
rename to nss/setup-nsssysinit.sh
diff --git a/pkgs/nss/system-pkcs11.txt b/nss/system-pkcs11.txt
similarity index 100%
rename from pkgs/nss/system-pkcs11.txt
rename to nss/system-pkcs11.txt
diff --git a/pkgs/nss_ldap/nss_ldap.nm b/nss_ldap/nss_ldap.nm
similarity index 100%
rename from pkgs/nss_ldap/nss_ldap.nm
rename to nss_ldap/nss_ldap.nm
diff --git a/pkgs/nss_ldap/patches/nss_ldap-254-soname.patch b/nss_ldap/patches/nss_ldap-254-soname.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-254-soname.patch
rename to nss_ldap/patches/nss_ldap-254-soname.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-257-mozldap.patch b/nss_ldap/patches/nss_ldap-257-mozldap.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-257-mozldap.patch
rename to nss_ldap/patches/nss_ldap-257-mozldap.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-259-res_init.patch b/nss_ldap/patches/nss_ldap-259-res_init.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-259-res_init.patch
rename to nss_ldap/patches/nss_ldap-259-res_init.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-264-checkcase.patch b/nss_ldap/patches/nss_ldap-264-checkcase.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-264-checkcase.patch
rename to nss_ldap/patches/nss_ldap-264-checkcase.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-264-cloexec.patch b/nss_ldap/patches/nss_ldap-264-cloexec.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-264-cloexec.patch
rename to nss_ldap/patches/nss_ldap-264-cloexec.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-depth.patch b/nss_ldap/patches/nss_ldap-265-depth.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-depth.patch
rename to nss_ldap/patches/nss_ldap-265-depth.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-ent_internal.patch b/nss_ldap/patches/nss_ldap-265-ent_internal.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-ent_internal.patch
rename to nss_ldap/patches/nss_ldap-265-ent_internal.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-erange.patch b/nss_ldap/patches/nss_ldap-265-erange.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-erange.patch
rename to nss_ldap/patches/nss_ldap-265-erange.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-fix-uninit.patch b/nss_ldap/patches/nss_ldap-265-fix-uninit.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-fix-uninit.patch
rename to nss_ldap/patches/nss_ldap-265-fix-uninit.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-initgroups-minimum_uid.patch b/nss_ldap/patches/nss_ldap-265-initgroups-minimum_uid.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-initgroups-minimum_uid.patch
rename to nss_ldap/patches/nss_ldap-265-initgroups-minimum_uid.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-local_users.patch b/nss_ldap/patches/nss_ldap-265-local_users.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-local_users.patch
rename to nss_ldap/patches/nss_ldap-265-local_users.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-padl-bug-418.patch b/nss_ldap/patches/nss_ldap-265-padl-bug-418.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-padl-bug-418.patch
rename to nss_ldap/patches/nss_ldap-265-padl-bug-418.patch
diff --git a/pkgs/nss_ldap/patches/nss_ldap-265-setnetgrent.patch b/nss_ldap/patches/nss_ldap-265-setnetgrent.patch
similarity index 100%
rename from pkgs/nss_ldap/patches/nss_ldap-265-setnetgrent.patch
rename to nss_ldap/patches/nss_ldap-265-setnetgrent.patch
diff --git a/pkgs/openl2tp/openl2tp.nm b/openl2tp/openl2tp.nm
similarity index 100%
rename from pkgs/openl2tp/openl2tp.nm
rename to openl2tp/openl2tp.nm
diff --git a/pkgs/openldap/openldap.nm b/openldap/openldap.nm
similarity index 100%
rename from pkgs/openldap/openldap.nm
rename to openldap/openldap.nm
diff --git a/pkgs/openldap/patches/openldap-2.4.17-disable_sys_err.patch b/openldap/patches/openldap-2.4.17-disable_sys_err.patch
similarity index 100%
rename from pkgs/openldap/patches/openldap-2.4.17-disable_sys_err.patch
rename to openldap/patches/openldap-2.4.17-disable_sys_err.patch
diff --git a/pkgs/openldap/slapd.conf b/openldap/slapd.conf
similarity index 100%
rename from pkgs/openldap/slapd.conf
rename to openldap/slapd.conf
diff --git a/pkgs/openldap/systemd/openldap.service b/openldap/systemd/openldap.service
similarity index 100%
rename from pkgs/openldap/systemd/openldap.service
rename to openldap/systemd/openldap.service
diff --git a/pkgs/openssh/openssh.nm b/openssh/openssh.nm
similarity index 100%
rename from pkgs/openssh/openssh.nm
rename to openssh/openssh.nm
diff --git a/pkgs/openssh/patches/openssh-4.3p2-askpass-grab-info.patch b/openssh/patches/openssh-4.3p2-askpass-grab-info.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-4.3p2-askpass-grab-info.patch
rename to openssh/patches/openssh-4.3p2-askpass-grab-info.patch
diff --git a/pkgs/openssh/patches/openssh-5.1p1-askpass-progress.patch b/openssh/patches/openssh-5.1p1-askpass-progress.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.1p1-askpass-progress.patch
rename to openssh/patches/openssh-5.1p1-askpass-progress.patch
diff --git a/pkgs/openssh/patches/openssh-5.1p1-scp-manpage.patch b/openssh/patches/openssh-5.1p1-scp-manpage.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.1p1-scp-manpage.patch
rename to openssh/patches/openssh-5.1p1-scp-manpage.patch
diff --git a/pkgs/openssh/patches/openssh-5.2p1-allow-ip-opts.patch b/openssh/patches/openssh-5.2p1-allow-ip-opts.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.2p1-allow-ip-opts.patch
rename to openssh/patches/openssh-5.2p1-allow-ip-opts.patch
diff --git a/pkgs/openssh/patches/openssh-5.2p1-edns.patch b/openssh/patches/openssh-5.2p1-edns.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.2p1-edns.patch
rename to openssh/patches/openssh-5.2p1-edns.patch
diff --git a/pkgs/openssh/patches/openssh-5.5p1-x11.patch b/openssh/patches/openssh-5.5p1-x11.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.5p1-x11.patch
rename to openssh/patches/openssh-5.5p1-x11.patch
diff --git a/pkgs/openssh/patches/openssh-5.6p1-exit-deadlock.patch b/openssh/patches/openssh-5.6p1-exit-deadlock.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.6p1-exit-deadlock.patch
rename to openssh/patches/openssh-5.6p1-exit-deadlock.patch
diff --git a/pkgs/openssh/patches/openssh-5.6p1-keygen.patch b/openssh/patches/openssh-5.6p1-keygen.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.6p1-keygen.patch
rename to openssh/patches/openssh-5.6p1-keygen.patch
diff --git a/pkgs/openssh/patches/openssh-5.6p1-redhat.patch b/openssh/patches/openssh-5.6p1-redhat.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.6p1-redhat.patch
rename to openssh/patches/openssh-5.6p1-redhat.patch
diff --git a/pkgs/openssh/patches/openssh-5.8p1-authorized-keys-command.patch b/openssh/patches/openssh-5.8p1-authorized-keys-command.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.8p1-authorized-keys-command.patch
rename to openssh/patches/openssh-5.8p1-authorized-keys-command.patch
diff --git a/pkgs/openssh/patches/openssh-5.8p1-fingerprint.patch b/openssh/patches/openssh-5.8p1-fingerprint.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.8p1-fingerprint.patch
rename to openssh/patches/openssh-5.8p1-fingerprint.patch
diff --git a/pkgs/openssh/patches/openssh-5.8p1-kuserok.patch b/openssh/patches/openssh-5.8p1-kuserok.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.8p1-kuserok.patch
rename to openssh/patches/openssh-5.8p1-kuserok.patch
diff --git a/pkgs/openssh/patches/openssh-5.8p1-mls.patch b/openssh/patches/openssh-5.8p1-mls.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.8p1-mls.patch
rename to openssh/patches/openssh-5.8p1-mls.patch
diff --git a/pkgs/openssh/patches/openssh-5.8p1-randclean.patch b/openssh/patches/openssh-5.8p1-randclean.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.8p1-randclean.patch
rename to openssh/patches/openssh-5.8p1-randclean.patch
diff --git a/pkgs/openssh/patches/openssh-5.8p1-selinux-role.patch b/openssh/patches/openssh-5.8p1-selinux-role.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.8p1-selinux-role.patch
rename to openssh/patches/openssh-5.8p1-selinux-role.patch
diff --git a/pkgs/openssh/patches/openssh-5.8p1-selinux.patch b/openssh/patches/openssh-5.8p1-selinux.patch
similarity index 100%
rename from pkgs/openssh/patches/openssh-5.8p1-selinux.patch
rename to openssh/patches/openssh-5.8p1-selinux.patch
diff --git a/pkgs/openssh/ssh-keygen b/openssh/ssh-keygen
similarity index 100%
rename from pkgs/openssh/ssh-keygen
rename to openssh/ssh-keygen
diff --git a/pkgs/openssh/sshd.pam b/openssh/sshd.pam
similarity index 100%
rename from pkgs/openssh/sshd.pam
rename to openssh/sshd.pam
diff --git a/pkgs/openssh/sshd_config b/openssh/sshd_config
similarity index 100%
rename from pkgs/openssh/sshd_config
rename to openssh/sshd_config
diff --git a/pkgs/openssh/systemd/openssh.service b/openssh/systemd/openssh.service
similarity index 100%
rename from pkgs/openssh/systemd/openssh.service
rename to openssh/systemd/openssh.service
diff --git a/pkgs/openssl/openssl.cnf b/openssl/openssl.cnf
similarity index 100%
rename from pkgs/openssl/openssl.cnf
rename to openssl/openssl.cnf
diff --git a/pkgs/openssl/openssl.nm b/openssl/openssl.nm
similarity index 100%
rename from pkgs/openssl/openssl.nm
rename to openssl/openssl.nm
diff --git a/pkgs/openssl/patches/openssl-0.9.8b-test-use-localhost.patch b/openssl/patches/openssl-0.9.8b-test-use-localhost.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-0.9.8b-test-use-localhost.patch
rename to openssl/patches/openssl-0.9.8b-test-use-localhost.patch
diff --git a/pkgs/openssl/patches/openssl-0.9.8j-env-nozlib.patch b/openssl/patches/openssl-0.9.8j-env-nozlib.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-0.9.8j-env-nozlib.patch
rename to openssl/patches/openssl-0.9.8j-env-nozlib.patch
diff --git a/pkgs/openssl/patches/openssl-0.9.8j-version-add-engines.patch b/openssl/patches/openssl-0.9.8j-version-add-engines.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-0.9.8j-version-add-engines.patch
rename to openssl/patches/openssl-0.9.8j-version-add-engines.patch
diff --git a/pkgs/openssl/patches/openssl-0.9.8k-no-rpath.patch b/openssl/patches/openssl-0.9.8k-no-rpath.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-0.9.8k-no-rpath.patch
rename to openssl/patches/openssl-0.9.8k-no-rpath.patch
diff --git a/pkgs/openssl/patches/openssl-1.0.0-beta3-soversion.patch b/openssl/patches/openssl-1.0.0-beta3-soversion.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-1.0.0-beta3-soversion.patch
rename to openssl/patches/openssl-1.0.0-beta3-soversion.patch
diff --git a/pkgs/openssl/patches/openssl-1.0.0-beta4-redhat.patch b/openssl/patches/openssl-1.0.0-beta4-redhat.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-1.0.0-beta4-redhat.patch
rename to openssl/patches/openssl-1.0.0-beta4-redhat.patch
diff --git a/pkgs/openssl/patches/openssl-1.0.0-beta5-enginesdir.patch b/openssl/patches/openssl-1.0.0-beta5-enginesdir.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-1.0.0-beta5-enginesdir.patch
rename to openssl/patches/openssl-1.0.0-beta5-enginesdir.patch
diff --git a/pkgs/openssl/patches/openssl-1.0.0d-version.patch b/openssl/patches/openssl-1.0.0d-version.patch
similarity index 100%
rename from pkgs/openssl/patches/openssl-1.0.0d-version.patch
rename to openssl/patches/openssl-1.0.0d-version.patch
diff --git a/pkgs/openvpn/openvpn.nm b/openvpn/openvpn.nm
similarity index 100%
rename from pkgs/openvpn/openvpn.nm
rename to openvpn/openvpn.nm
diff --git a/pkgs/os-prober/os-prober.nm b/os-prober/os-prober.nm
similarity index 100%
rename from pkgs/os-prober/os-prober.nm
rename to os-prober/os-prober.nm
diff --git a/pkgs/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm
similarity index 100%
rename from pkgs/p11-kit/p11-kit.nm
rename to p11-kit/p11-kit.nm
diff --git a/pkgs/pakfire/pakfire.nm b/pakfire/pakfire.nm
similarity index 100%
rename from pkgs/pakfire/pakfire.nm
rename to pakfire/pakfire.nm
diff --git a/pkgs/pam/login.defs b/pam/login.defs
similarity index 100%
rename from pkgs/pam/login.defs
rename to pam/login.defs
diff --git a/pkgs/pam/pam.d/other b/pam/pam.d/other
similarity index 100%
rename from pkgs/pam/pam.d/other
rename to pam/pam.d/other
diff --git a/pkgs/pam/pam.d/system-auth b/pam/pam.d/system-auth
similarity index 100%
rename from pkgs/pam/pam.d/system-auth
rename to pam/pam.d/system-auth
diff --git a/pkgs/pam/pam.nm b/pam/pam.nm
similarity index 100%
rename from pkgs/pam/pam.nm
rename to pam/pam.nm
diff --git a/pkgs/pam/pam_env.conf b/pam/pam_env.conf
similarity index 100%
rename from pkgs/pam/pam_env.conf
rename to pam/pam_env.conf
diff --git a/pkgs/pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch b/pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch
similarity index 100%
rename from pkgs/pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch
rename to pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch
diff --git a/pkgs/pam/securetty b/pam/securetty
similarity index 100%
rename from pkgs/pam/securetty
rename to pam/securetty
diff --git a/pkgs/pam_ldap/pam_ldap.nm b/pam_ldap/pam_ldap.nm
similarity index 100%
rename from pkgs/pam_ldap/pam_ldap.nm
rename to pam_ldap/pam_ldap.nm
diff --git a/pkgs/pam_ldap/patches/pam_ldap-176-authenticateOnChangeExpiredAuthtok.patch b/pam_ldap/patches/pam_ldap-176-authenticateOnChangeExpiredAuthtok.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-176-authenticateOnChangeExpiredAuthtok.patch
rename to pam_ldap/patches/pam_ldap-176-authenticateOnChangeExpiredAuthtok.patch
diff --git a/pkgs/pam_ldap/patches/pam_ldap-176-exop-modify.patch b/pam_ldap/patches/pam_ldap-176-exop-modify.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-176-exop-modify.patch
rename to pam_ldap/patches/pam_ldap-176-exop-modify.patch
diff --git a/pkgs/pam_ldap/patches/pam_ldap-180-install-perms.patch b/pam_ldap/patches/pam_ldap-180-install-perms.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-180-install-perms.patch
rename to pam_ldap/patches/pam_ldap-180-install-perms.patch
diff --git a/pkgs/pam_ldap/patches/pam_ldap-182-manpointer.patch b/pam_ldap/patches/pam_ldap-182-manpointer.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-182-manpointer.patch
rename to pam_ldap/patches/pam_ldap-182-manpointer.patch
diff --git a/pkgs/pam_ldap/patches/pam_ldap-183-releaseconfig.patch b/pam_ldap/patches/pam_ldap-183-releaseconfig.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-183-releaseconfig.patch
rename to pam_ldap/patches/pam_ldap-183-releaseconfig.patch
diff --git a/pkgs/pam_ldap/patches/pam_ldap-184-nsrole.patch b/pam_ldap/patches/pam_ldap-184-nsrole.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-184-nsrole.patch
rename to pam_ldap/patches/pam_ldap-184-nsrole.patch
diff --git a/pkgs/pam_ldap/patches/pam_ldap-185-dnsconfig.patch b/pam_ldap/patches/pam_ldap-185-dnsconfig.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-185-dnsconfig.patch
rename to pam_ldap/patches/pam_ldap-185-dnsconfig.patch
diff --git a/pkgs/pam_ldap/patches/pam_ldap-185-expiration4.patch b/pam_ldap/patches/pam_ldap-185-expiration4.patch
similarity index 100%
rename from pkgs/pam_ldap/patches/pam_ldap-185-expiration4.patch
rename to pam_ldap/patches/pam_ldap-185-expiration4.patch
diff --git a/pkgs/pango/pango.nm b/pango/pango.nm
similarity index 100%
rename from pkgs/pango/pango.nm
rename to pango/pango.nm
diff --git a/pkgs/parted/parted.nm b/parted/parted.nm
similarity index 100%
rename from pkgs/parted/parted.nm
rename to parted/parted.nm
diff --git a/pkgs/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch b/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch
similarity index 100%
rename from pkgs/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch
rename to parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch
diff --git a/pkgs/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch b/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch
similarity index 100%
rename from pkgs/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch
rename to parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch
diff --git a/pkgs/parted/patches/parted-2.1-default-alignment.patch b/parted/patches/parted-2.1-default-alignment.patch
similarity index 100%
rename from pkgs/parted/patches/parted-2.1-default-alignment.patch
rename to parted/patches/parted-2.1-default-alignment.patch
diff --git a/pkgs/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch b/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch
similarity index 100%
rename from pkgs/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch
rename to parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch
diff --git a/pkgs/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch b/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch
similarity index 100%
rename from pkgs/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch
rename to parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch
diff --git a/pkgs/parted/patches/parted-2.1-needs_clobber-rh566181.patch b/parted/patches/parted-2.1-needs_clobber-rh566181.patch
similarity index 100%
rename from pkgs/parted/patches/parted-2.1-needs_clobber-rh566181.patch
rename to parted/patches/parted-2.1-needs_clobber-rh566181.patch
diff --git a/pkgs/passwd/passwd.nm b/passwd/passwd.nm
similarity index 100%
rename from pkgs/passwd/passwd.nm
rename to passwd/passwd.nm
diff --git a/pkgs/passwd/passwd.pam b/passwd/passwd.pam
similarity index 100%
rename from pkgs/passwd/passwd.pam
rename to passwd/passwd.pam
diff --git a/pkgs/patch/patch.nm b/patch/patch.nm
similarity index 100%
rename from pkgs/patch/patch.nm
rename to patch/patch.nm
diff --git a/pkgs/patch/patches/patch-2.5.4-sigsegv.patch b/patch/patches/patch-2.5.4-sigsegv.patch
similarity index 100%
rename from pkgs/patch/patches/patch-2.5.4-sigsegv.patch
rename to patch/patches/patch-2.5.4-sigsegv.patch
diff --git a/pkgs/patch/patches/patch-2.6.1-CVE-2010-4651.patch b/patch/patches/patch-2.6.1-CVE-2010-4651.patch
similarity index 100%
rename from pkgs/patch/patches/patch-2.6.1-CVE-2010-4651.patch
rename to patch/patches/patch-2.6.1-CVE-2010-4651.patch
diff --git a/pkgs/patch/patches/patch-2.6.1-backup-if-mismatch.patch b/patch/patches/patch-2.6.1-backup-if-mismatch.patch
similarity index 100%
rename from pkgs/patch/patches/patch-2.6.1-backup-if-mismatch.patch
rename to patch/patches/patch-2.6.1-backup-if-mismatch.patch
diff --git a/pkgs/patch/patches/patch-2.6.1-get-arg.patch b/patch/patches/patch-2.6.1-get-arg.patch
similarity index 100%
rename from pkgs/patch/patches/patch-2.6.1-get-arg.patch
rename to patch/patches/patch-2.6.1-get-arg.patch
diff --git a/pkgs/patch/patches/patch-selinux.patch b/patch/patches/patch-selinux.patch
similarity index 100%
rename from pkgs/patch/patches/patch-selinux.patch
rename to patch/patches/patch-selinux.patch
diff --git a/pkgs/pax-utils/pax-utils.nm b/pax-utils/pax-utils.nm
similarity index 100%
rename from pkgs/pax-utils/pax-utils.nm
rename to pax-utils/pax-utils.nm
diff --git a/pkgs/paxctl/paxctl.nm b/paxctl/paxctl.nm
similarity index 100%
rename from pkgs/paxctl/paxctl.nm
rename to paxctl/paxctl.nm
diff --git a/pkgs/paxtest/paxtest.nm b/paxtest/paxtest.nm
similarity index 100%
rename from pkgs/paxtest/paxtest.nm
rename to paxtest/paxtest.nm
diff --git a/pkgs/pcapy/pcapy.nm b/pcapy/pcapy.nm
similarity index 100%
rename from pkgs/pcapy/pcapy.nm
rename to pcapy/pcapy.nm
diff --git a/pkgs/pciutils/pciutils.nm b/pciutils/pciutils.nm
similarity index 100%
rename from pkgs/pciutils/pciutils.nm
rename to pciutils/pciutils.nm
diff --git a/pkgs/pcre/pcre.nm b/pcre/pcre.nm
similarity index 100%
rename from pkgs/pcre/pcre.nm
rename to pcre/pcre.nm
diff --git a/pkgs/pdns-recursor/patches/pdns-recursor-fixmakefile.patch b/pdns-recursor/patches/pdns-recursor-fixmakefile.patch
similarity index 100%
rename from pkgs/pdns-recursor/patches/pdns-recursor-fixmakefile.patch
rename to pdns-recursor/patches/pdns-recursor-fixmakefile.patch
diff --git a/pkgs/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch b/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
similarity index 100%
rename from pkgs/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
rename to pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
diff --git a/pkgs/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm
similarity index 100%
rename from pkgs/pdns-recursor/pdns-recursor.nm
rename to pdns-recursor/pdns-recursor.nm
diff --git a/pkgs/pdns-recursor/pdns-recursor.tmpfiles b/pdns-recursor/pdns-recursor.tmpfiles
similarity index 100%
rename from pkgs/pdns-recursor/pdns-recursor.tmpfiles
rename to pdns-recursor/pdns-recursor.tmpfiles
diff --git a/pkgs/pdns-recursor/recursor.conf b/pdns-recursor/recursor.conf
similarity index 100%
rename from pkgs/pdns-recursor/recursor.conf
rename to pdns-recursor/recursor.conf
diff --git a/pkgs/pdns-recursor/systemd/pdns-recursor.service b/pdns-recursor/systemd/pdns-recursor.service
similarity index 100%
rename from pkgs/pdns-recursor/systemd/pdns-recursor.service
rename to pdns-recursor/systemd/pdns-recursor.service
diff --git a/pkgs/pdns/patches/pdns-fix-lua-detection.patch b/pdns/patches/pdns-fix-lua-detection.patch
similarity index 100%
rename from pkgs/pdns/patches/pdns-fix-lua-detection.patch
rename to pdns/patches/pdns-fix-lua-detection.patch
diff --git a/pkgs/pdns/pdns.nm b/pdns/pdns.nm
similarity index 100%
rename from pkgs/pdns/pdns.nm
rename to pdns/pdns.nm
diff --git a/pkgs/pdns/systemd/pdns.service b/pdns/systemd/pdns.service
similarity index 100%
rename from pkgs/pdns/systemd/pdns.service
rename to pdns/systemd/pdns.service
diff --git a/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm b/perl-HTML-Parser/perl-HTML-Parser.nm
similarity index 100%
rename from pkgs/perl-HTML-Parser/perl-HTML-Parser.nm
rename to perl-HTML-Parser/perl-HTML-Parser.nm
diff --git a/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm b/perl-HTML-Tagset/perl-HTML-Tagset.nm
similarity index 100%
rename from pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm
rename to perl-HTML-Tagset/perl-HTML-Tagset.nm
diff --git a/pkgs/perl-Test-Simple/perl-Test-Simple.nm b/perl-Test-Simple/perl-Test-Simple.nm
similarity index 100%
rename from pkgs/perl-Test-Simple/perl-Test-Simple.nm
rename to perl-Test-Simple/perl-Test-Simple.nm
diff --git a/pkgs/perl-URI/perl-URI.nm b/perl-URI/perl-URI.nm
similarity index 100%
rename from pkgs/perl-URI/perl-URI.nm
rename to perl-URI/perl-URI.nm
diff --git a/pkgs/perl-XML-Parser/perl-XML-Parser.nm b/perl-XML-Parser/perl-XML-Parser.nm
similarity index 100%
rename from pkgs/perl-XML-Parser/perl-XML-Parser.nm
rename to perl-XML-Parser/perl-XML-Parser.nm
diff --git a/pkgs/perl-libwww-perl/perl-libwww-perl.nm b/perl-libwww-perl/perl-libwww-perl.nm
similarity index 100%
rename from pkgs/perl-libwww-perl/perl-libwww-perl.nm
rename to perl-libwww-perl/perl-libwww-perl.nm
diff --git a/pkgs/perl/patches/perl-5.10.0-libresolv.patch b/perl/patches/perl-5.10.0-libresolv.patch
similarity index 100%
rename from pkgs/perl/patches/perl-5.10.0-libresolv.patch
rename to perl/patches/perl-5.10.0-libresolv.patch
diff --git a/pkgs/perl/patches/perl-5.8.0-libdir64.patch b/perl/patches/perl-5.8.0-libdir64.patch
similarity index 100%
rename from pkgs/perl/patches/perl-5.8.0-libdir64.patch
rename to perl/patches/perl-5.8.0-libdir64.patch
diff --git a/pkgs/perl/patches/perl-5.8.8-rpath-make.patch b/perl/patches/perl-5.8.8-rpath-make.patch
similarity index 100%
rename from pkgs/perl/patches/perl-5.8.8-rpath-make.patch
rename to perl/patches/perl-5.8.8-rpath-make.patch
diff --git a/pkgs/perl/patches/perl-USE_MM_LD_RUN_PATH.patch b/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
similarity index 100%
rename from pkgs/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
rename to perl/patches/perl-USE_MM_LD_RUN_PATH.patch
diff --git a/pkgs/perl/patches/perl-disable_test_hosts.patch b/perl/patches/perl-disable_test_hosts.patch
similarity index 100%
rename from pkgs/perl/patches/perl-disable_test_hosts.patch
rename to perl/patches/perl-disable_test_hosts.patch
diff --git a/pkgs/perl/patches/perl-perlbug-tag.patch b/perl/patches/perl-perlbug-tag.patch
similarity index 100%
rename from pkgs/perl/patches/perl-perlbug-tag.patch
rename to perl/patches/perl-perlbug-tag.patch
diff --git a/pkgs/perl/perl.nm b/perl/perl.nm
similarity index 100%
rename from pkgs/perl/perl.nm
rename to perl/perl.nm
diff --git a/pkgs/pinentry/pinentry.nm b/pinentry/pinentry.nm
similarity index 100%
rename from pkgs/pinentry/pinentry.nm
rename to pinentry/pinentry.nm
diff --git a/pkgs/pixman/pixman.nm b/pixman/pixman.nm
similarity index 100%
rename from pkgs/pixman/pixman.nm
rename to pixman/pixman.nm
diff --git a/pkgs/pkg-config/patches/pkg-config-0.25-autoconf-1.patch b/pkg-config/patches/pkg-config-0.25-autoconf-1.patch
similarity index 100%
rename from pkgs/pkg-config/patches/pkg-config-0.25-autoconf-1.patch
rename to pkg-config/patches/pkg-config-0.25-autoconf-1.patch
diff --git a/pkgs/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm
similarity index 100%
rename from pkgs/pkg-config/pkg-config.nm
rename to pkg-config/pkg-config.nm
diff --git a/pkgs/polkit/polkit.nm b/polkit/polkit.nm
similarity index 100%
rename from pkgs/polkit/polkit.nm
rename to polkit/polkit.nm
diff --git a/pkgs/popt/popt.nm b/popt/popt.nm
similarity index 100%
rename from pkgs/popt/popt.nm
rename to popt/popt.nm
diff --git a/pkgs/powertop/powertop.nm b/powertop/powertop.nm
similarity index 100%
rename from pkgs/powertop/powertop.nm
rename to powertop/powertop.nm
diff --git a/pkgs/ppl/ppl.nm b/ppl/ppl.nm
similarity index 100%
rename from pkgs/ppl/ppl.nm
rename to ppl/ppl.nm
diff --git a/pkgs/ppp/patches/ppp-2.3.6-sample.patch b/ppp/patches/ppp-2.3.6-sample.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.3.6-sample.patch
rename to ppp/patches/ppp-2.3.6-sample.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.1-varargs.patch b/ppp/patches/ppp-2.4.1-varargs.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.1-varargs.patch
rename to ppp/patches/ppp-2.4.1-varargs.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.2-change_resolv_conf.patch b/ppp/patches/ppp-2.4.2-change_resolv_conf.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.2-change_resolv_conf.patch
rename to ppp/patches/ppp-2.4.2-change_resolv_conf.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.2-ifname.patch b/ppp/patches/ppp-2.4.2-ifname.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.2-ifname.patch
rename to ppp/patches/ppp-2.4.2-ifname.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.2-pppoatm-make.patch b/ppp/patches/ppp-2.4.2-pppoatm-make.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.2-pppoatm-make.patch
rename to ppp/patches/ppp-2.4.2-pppoatm-make.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.3-fix.patch b/ppp/patches/ppp-2.4.3-fix.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.3-fix.patch
rename to ppp/patches/ppp-2.4.3-fix.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.3-fix64.patch b/ppp/patches/ppp-2.4.3-fix64.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.3-fix64.patch
rename to ppp/patches/ppp-2.4.3-fix64.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.3-make.patch b/ppp/patches/ppp-2.4.3-make.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.3-make.patch
rename to ppp/patches/ppp-2.4.3-make.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-cbcp.patch b/ppp/patches/ppp-2.4.4-cbcp.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-cbcp.patch
rename to ppp/patches/ppp-2.4.4-cbcp.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-dontwriteetc.patch b/ppp/patches/ppp-2.4.4-dontwriteetc.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-dontwriteetc.patch
rename to ppp/patches/ppp-2.4.4-dontwriteetc.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-fd_leak.patch b/ppp/patches/ppp-2.4.4-fd_leak.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-fd_leak.patch
rename to ppp/patches/ppp-2.4.4-fd_leak.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch b/ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch
rename to ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-lib64.patch b/ppp/patches/ppp-2.4.4-lib64.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-lib64.patch
rename to ppp/patches/ppp-2.4.4-lib64.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-libutil.patch b/ppp/patches/ppp-2.4.4-libutil.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-libutil.patch
rename to ppp/patches/ppp-2.4.4-libutil.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-local.patch b/ppp/patches/ppp-2.4.4-local.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-local.patch
rename to ppp/patches/ppp-2.4.4-local.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.4-pie.patch b/ppp/patches/ppp-2.4.4-pie.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.4-pie.patch
rename to ppp/patches/ppp-2.4.4-pie.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch b/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch
rename to ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.5-eth.patch b/ppp/patches/ppp-2.4.5-eth.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.5-eth.patch
rename to ppp/patches/ppp-2.4.5-eth.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.5-lock.patch b/ppp/patches/ppp-2.4.5-lock.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.5-lock.patch
rename to ppp/patches/ppp-2.4.5-lock.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.5-man.patch b/ppp/patches/ppp-2.4.5-man.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.5-man.patch
rename to ppp/patches/ppp-2.4.5-man.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.5-ppp_resolv.patch b/ppp/patches/ppp-2.4.5-ppp_resolv.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.5-ppp_resolv.patch
rename to ppp/patches/ppp-2.4.5-ppp_resolv.patch
diff --git a/pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch b/ppp/patches/ppp-2.4.5-var_run_ppp.patch
similarity index 100%
rename from pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch
rename to ppp/patches/ppp-2.4.5-var_run_ppp.patch
diff --git a/pkgs/ppp/ppp.nm b/ppp/ppp.nm
similarity index 100%
rename from pkgs/ppp/ppp.nm
rename to ppp/ppp.nm
diff --git a/pkgs/ppp/ppp.pam b/ppp/ppp.pam
similarity index 100%
rename from pkgs/ppp/ppp.pam
rename to ppp/ppp.pam
diff --git a/pkgs/pptp/patches/pptp-1.7.2-compat.patch b/pptp/patches/pptp-1.7.2-compat.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-compat.patch
rename to pptp/patches/pptp-1.7.2-compat.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-conn-free.patch b/pptp/patches/pptp-1.7.2-conn-free.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-conn-free.patch
rename to pptp/patches/pptp-1.7.2-conn-free.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-conn-free2.patch b/pptp/patches/pptp-1.7.2-conn-free2.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-conn-free2.patch
rename to pptp/patches/pptp-1.7.2-conn-free2.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-ip-path.patch b/pptp/patches/pptp-1.7.2-ip-path.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-ip-path.patch
rename to pptp/patches/pptp-1.7.2-ip-path.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-makedeps.patch b/pptp/patches/pptp-1.7.2-makedeps.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-makedeps.patch
rename to pptp/patches/pptp-1.7.2-makedeps.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch b/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
rename to pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch b/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
rename to pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-pptpsetup.patch b/pptp/patches/pptp-1.7.2-pptpsetup.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-pptpsetup.patch
rename to pptp/patches/pptp-1.7.2-pptpsetup.patch
diff --git a/pkgs/pptp/patches/pptp-1.7.2-waitpid.patch b/pptp/patches/pptp-1.7.2-waitpid.patch
similarity index 100%
rename from pkgs/pptp/patches/pptp-1.7.2-waitpid.patch
rename to pptp/patches/pptp-1.7.2-waitpid.patch
diff --git a/pkgs/pptp/pptp.nm b/pptp/pptp.nm
similarity index 100%
rename from pkgs/pptp/pptp.nm
rename to pptp/pptp.nm
diff --git a/pkgs/procps/patches/procps-3.2.8-selinux.patch b/procps/patches/procps-3.2.8-selinux.patch
similarity index 100%
rename from pkgs/procps/patches/procps-3.2.8-selinux.patch
rename to procps/patches/procps-3.2.8-selinux.patch
diff --git a/pkgs/procps/patches/procps-3.2.8-watch_unicode-2.patch b/procps/patches/procps-3.2.8-watch_unicode-2.patch
similarity index 100%
rename from pkgs/procps/patches/procps-3.2.8-watch_unicode-2.patch
rename to procps/patches/procps-3.2.8-watch_unicode-2.patch
diff --git a/pkgs/procps/procps.nm b/procps/procps.nm
similarity index 100%
rename from pkgs/procps/procps.nm
rename to procps/procps.nm
diff --git a/pkgs/psmisc/psmisc.nm b/psmisc/psmisc.nm
similarity index 100%
rename from pkgs/psmisc/psmisc.nm
rename to psmisc/psmisc.nm
diff --git a/pkgs/pth/pth.nm b/pth/pth.nm
similarity index 100%
rename from pkgs/pth/pth.nm
rename to pth/pth.nm
diff --git a/pkgs/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch b/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch
similarity index 100%
rename from pkgs/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch
rename to pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch
diff --git a/pkgs/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch b/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch
similarity index 100%
rename from pkgs/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch
rename to pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch
diff --git a/pkgs/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch b/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
similarity index 100%
rename from pkgs/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
rename to pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
diff --git a/pkgs/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch b/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
similarity index 100%
rename from pkgs/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
rename to pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
diff --git a/pkgs/pyQt/pyQt.nm b/pyQt/pyQt.nm
similarity index 100%
rename from pkgs/pyQt/pyQt.nm
rename to pyQt/pyQt.nm
diff --git a/pkgs/pychecker/pychecker.nm b/pychecker/pychecker.nm
similarity index 100%
rename from pkgs/pychecker/pychecker.nm
rename to pychecker/pychecker.nm
diff --git a/pkgs/pyfire/pyfire.nm b/pyfire/pyfire.nm
similarity index 100%
rename from pkgs/pyfire/pyfire.nm
rename to pyfire/pyfire.nm
diff --git a/pkgs/pyfire/src/Makefile b/pyfire/src/Makefile
similarity index 100%
rename from pkgs/pyfire/src/Makefile
rename to pyfire/src/Makefile
diff --git a/pkgs/pyfire/src/__init__.py b/pyfire/src/__init__.py
similarity index 100%
rename from pkgs/pyfire/src/__init__.py
rename to pyfire/src/__init__.py
diff --git a/pkgs/pyfire/src/config.py b/pyfire/src/config.py
similarity index 100%
rename from pkgs/pyfire/src/config.py
rename to pyfire/src/config.py
diff --git a/pkgs/pyfire/src/executil.py b/pyfire/src/executil.py
similarity index 100%
rename from pkgs/pyfire/src/executil.py
rename to pyfire/src/executil.py
diff --git a/pkgs/pyfire/src/hal.py b/pyfire/src/hal.py
similarity index 100%
rename from pkgs/pyfire/src/hal.py
rename to pyfire/src/hal.py
diff --git a/pkgs/pyfire/src/net.py b/pyfire/src/net.py
similarity index 100%
rename from pkgs/pyfire/src/net.py
rename to pyfire/src/net.py
diff --git a/pkgs/pyfire/src/web.py b/pyfire/src/web.py
similarity index 100%
rename from pkgs/pyfire/src/web.py
rename to pyfire/src/web.py
diff --git a/pkgs/pygobject2/pygobject2.nm b/pygobject2/pygobject2.nm
similarity index 100%
rename from pkgs/pygobject2/pygobject2.nm
rename to pygobject2/pygobject2.nm
diff --git a/pkgs/pyliblzma/patches/no-script-liblzma.patch b/pyliblzma/patches/no-script-liblzma.patch
similarity index 100%
rename from pkgs/pyliblzma/patches/no-script-liblzma.patch
rename to pyliblzma/patches/no-script-liblzma.patch
diff --git a/pkgs/pyliblzma/pyliblzma.nm b/pyliblzma/pyliblzma.nm
similarity index 100%
rename from pkgs/pyliblzma/pyliblzma.nm
rename to pyliblzma/pyliblzma.nm
diff --git a/pkgs/pyserial/pyserial.nm b/pyserial/pyserial.nm
similarity index 100%
rename from pkgs/pyserial/pyserial.nm
rename to pyserial/pyserial.nm
diff --git a/pkgs/python-IPy/python-IPy.nm b/python-IPy/python-IPy.nm
similarity index 100%
rename from pkgs/python-IPy/python-IPy.nm
rename to python-IPy/python-IPy.nm
diff --git a/pkgs/python-cairo/python-cairo.nm b/python-cairo/python-cairo.nm
similarity index 100%
rename from pkgs/python-cairo/python-cairo.nm
rename to python-cairo/python-cairo.nm
diff --git a/pkgs/python-cryptsetup/python-cryptsetup.nm b/python-cryptsetup/python-cryptsetup.nm
similarity index 100%
rename from pkgs/python-cryptsetup/python-cryptsetup.nm
rename to python-cryptsetup/python-cryptsetup.nm
diff --git a/pkgs/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm
similarity index 100%
rename from pkgs/python-dbus/python-dbus.nm
rename to python-dbus/python-dbus.nm
diff --git a/pkgs/python-decorator/python-decorator.nm b/python-decorator/python-decorator.nm
similarity index 100%
rename from pkgs/python-decorator/python-decorator.nm
rename to python-decorator/python-decorator.nm
diff --git a/pkgs/python-distutils-extra/python-distutils-extra.nm b/python-distutils-extra/python-distutils-extra.nm
similarity index 100%
rename from pkgs/python-distutils-extra/python-distutils-extra.nm
rename to python-distutils-extra/python-distutils-extra.nm
diff --git a/pkgs/python-gudev/python-gudev.nm b/python-gudev/python-gudev.nm
similarity index 100%
rename from pkgs/python-gudev/python-gudev.nm
rename to python-gudev/python-gudev.nm
diff --git a/pkgs/python-m2crypto/python-m2crypto.nm b/python-m2crypto/python-m2crypto.nm
similarity index 100%
rename from pkgs/python-m2crypto/python-m2crypto.nm
rename to python-m2crypto/python-m2crypto.nm
diff --git a/pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm b/python-netfilter_conntrack/python-netfilter_conntrack.nm
similarity index 100%
rename from pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm
rename to python-netfilter_conntrack/python-netfilter_conntrack.nm
diff --git a/pkgs/python-parted/python-parted.nm b/python-parted/python-parted.nm
similarity index 100%
rename from pkgs/python-parted/python-parted.nm
rename to python-parted/python-parted.nm
diff --git a/pkgs/python-piksemel/python-piksemel.nm b/python-piksemel/python-piksemel.nm
similarity index 100%
rename from pkgs/python-piksemel/python-piksemel.nm
rename to python-piksemel/python-piksemel.nm
diff --git a/pkgs/python-progressbar/python-progressbar.nm b/python-progressbar/python-progressbar.nm
similarity index 100%
rename from pkgs/python-progressbar/python-progressbar.nm
rename to python-progressbar/python-progressbar.nm
diff --git a/pkgs/python-pyaspects/python-pyaspects.nm b/python-pyaspects/python-pyaspects.nm
similarity index 100%
rename from pkgs/python-pyaspects/python-pyaspects.nm
rename to python-pyaspects/python-pyaspects.nm
diff --git a/pkgs/python-pyblock/python-pyblock.nm b/python-pyblock/python-pyblock.nm
similarity index 100%
rename from pkgs/python-pyblock/python-pyblock.nm
rename to python-pyblock/python-pyblock.nm
diff --git a/pkgs/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch b/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch
similarity index 100%
rename from pkgs/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch
rename to python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch
diff --git a/pkgs/python-pycurl/patches/python-pycurl-no-static-libs.patch0 b/python-pycurl/patches/python-pycurl-no-static-libs.patch0
similarity index 100%
rename from pkgs/python-pycurl/patches/python-pycurl-no-static-libs.patch0
rename to python-pycurl/patches/python-pycurl-no-static-libs.patch0
diff --git a/pkgs/python-pycurl/python-pycurl.nm b/python-pycurl/python-pycurl.nm
similarity index 100%
rename from pkgs/python-pycurl/python-pycurl.nm
rename to python-pycurl/python-pycurl.nm
diff --git a/pkgs/python-qtermwidget/patches/addStartShell.patch b/python-qtermwidget/patches/addStartShell.patch
similarity index 100%
rename from pkgs/python-qtermwidget/patches/addStartShell.patch
rename to python-qtermwidget/patches/addStartShell.patch
diff --git a/pkgs/python-qtermwidget/python-qtermwidget.nm b/python-qtermwidget/python-qtermwidget.nm
similarity index 100%
rename from pkgs/python-qtermwidget/python-qtermwidget.nm
rename to python-qtermwidget/python-qtermwidget.nm
diff --git a/pkgs/python-setuptools/python-setuptools.nm b/python-setuptools/python-setuptools.nm
similarity index 100%
rename from pkgs/python-setuptools/python-setuptools.nm
rename to python-setuptools/python-setuptools.nm
diff --git a/pkgs/python-tornado/python-tornado.nm b/python-tornado/python-tornado.nm
similarity index 100%
rename from pkgs/python-tornado/python-tornado.nm
rename to python-tornado/python-tornado.nm
diff --git a/pkgs/python-urlgrabber/patches/urlgrabber-HEAD.patch b/python-urlgrabber/patches/urlgrabber-HEAD.patch
similarity index 100%
rename from pkgs/python-urlgrabber/patches/urlgrabber-HEAD.patch
rename to python-urlgrabber/patches/urlgrabber-HEAD.patch
diff --git a/pkgs/python-urlgrabber/python-urlgrabber.nm b/python-urlgrabber/python-urlgrabber.nm
similarity index 100%
rename from pkgs/python-urlgrabber/python-urlgrabber.nm
rename to python-urlgrabber/python-urlgrabber.nm
diff --git a/pkgs/python/patches/python-2.3.4-lib64-regex.patch b/python/patches/python-2.3.4-lib64-regex.patch
similarity index 100%
rename from pkgs/python/patches/python-2.3.4-lib64-regex.patch
rename to python/patches/python-2.3.4-lib64-regex.patch
diff --git a/pkgs/python/patches/python-2.5-cflags.patch b/python/patches/python-2.5-cflags.patch
similarity index 100%
rename from pkgs/python/patches/python-2.5-cflags.patch
rename to python/patches/python-2.5-cflags.patch
diff --git a/pkgs/python/patches/python-2.6-rpath.patch b/python/patches/python-2.6-rpath.patch
similarity index 100%
rename from pkgs/python/patches/python-2.6-rpath.patch
rename to python/patches/python-2.6-rpath.patch
diff --git a/pkgs/python/patches/python-2.6.4-distutils-rpath.patch b/python/patches/python-2.6.4-distutils-rpath.patch
similarity index 100%
rename from pkgs/python/patches/python-2.6.4-distutils-rpath.patch
rename to python/patches/python-2.6.4-distutils-rpath.patch
diff --git a/pkgs/python/python.nm b/python/python.nm
similarity index 100%
rename from pkgs/python/python.nm
rename to python/python.nm
diff --git a/pkgs/pyxattr/pyxattr.nm b/pyxattr/pyxattr.nm
similarity index 100%
rename from pkgs/pyxattr/pyxattr.nm
rename to pyxattr/pyxattr.nm
diff --git a/pkgs/qemu/qemu.nm b/qemu/qemu.nm
similarity index 100%
rename from pkgs/qemu/qemu.nm
rename to qemu/qemu.nm
diff --git a/pkgs/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch b/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
similarity index 100%
rename from pkgs/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
rename to qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
diff --git a/pkgs/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch b/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
similarity index 100%
rename from pkgs/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
rename to qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
diff --git a/pkgs/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch b/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
similarity index 100%
rename from pkgs/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
rename to qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
diff --git a/pkgs/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch b/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
similarity index 100%
rename from pkgs/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
rename to qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
diff --git a/pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch b/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
similarity index 100%
rename from pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
rename to qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
diff --git a/pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch b/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
similarity index 100%
rename from pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
rename to qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
diff --git a/pkgs/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch b/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
similarity index 100%
rename from pkgs/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
rename to qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
diff --git a/pkgs/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch b/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
similarity index 100%
rename from pkgs/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
rename to qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch b/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
rename to qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
rename to qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
diff --git a/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
similarity index 100%
rename from pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
rename to qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
diff --git a/pkgs/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch b/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
similarity index 100%
rename from pkgs/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
rename to qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
diff --git a/pkgs/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch b/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
similarity index 100%
rename from pkgs/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
rename to qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
diff --git a/pkgs/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch b/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
similarity index 100%
rename from pkgs/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
rename to qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
diff --git a/pkgs/qt/qt.nm b/qt/qt.nm
similarity index 100%
rename from pkgs/qt/qt.nm
rename to qt/qt.nm
diff --git a/pkgs/qtermwidget/patches/shared.patch b/qtermwidget/patches/shared.patch
similarity index 100%
rename from pkgs/qtermwidget/patches/shared.patch
rename to qtermwidget/patches/shared.patch
diff --git a/pkgs/qtermwidget/qtermwidget.nm b/qtermwidget/qtermwidget.nm
similarity index 100%
rename from pkgs/qtermwidget/qtermwidget.nm
rename to qtermwidget/qtermwidget.nm
diff --git a/pkgs/quagga/quagga.nm b/quagga/quagga.nm
similarity index 100%
rename from pkgs/quagga/quagga.nm
rename to quagga/quagga.nm
diff --git a/pkgs/radvd/radvd.nm b/radvd/radvd.nm
similarity index 100%
rename from pkgs/radvd/radvd.nm
rename to radvd/radvd.nm
diff --git a/pkgs/radvd/radvd.tmpfiles b/radvd/radvd.tmpfiles
similarity index 100%
rename from pkgs/radvd/radvd.tmpfiles
rename to radvd/radvd.tmpfiles
diff --git a/pkgs/radvd/systemd/radvd.service b/radvd/systemd/radvd.service
similarity index 100%
rename from pkgs/radvd/systemd/radvd.service
rename to radvd/systemd/radvd.service
diff --git a/pkgs/readline/inputrc b/readline/inputrc
similarity index 100%
rename from pkgs/readline/inputrc
rename to readline/inputrc
diff --git a/pkgs/readline/patches/readline-6.1-audit.patch b/readline/patches/readline-6.1-audit.patch
similarity index 100%
rename from pkgs/readline/patches/readline-6.1-audit.patch
rename to readline/patches/readline-6.1-audit.patch
diff --git a/pkgs/readline/patches/readline-6.2-shlib.patch b/readline/patches/readline-6.2-shlib.patch
similarity index 100%
rename from pkgs/readline/patches/readline-6.2-shlib.patch
rename to readline/patches/readline-6.2-shlib.patch
diff --git a/pkgs/readline/readline.nm b/readline/readline.nm
similarity index 100%
rename from pkgs/readline/readline.nm
rename to readline/readline.nm
diff --git a/pkgs/readline/readline.sh b/readline/readline.sh
similarity index 100%
rename from pkgs/readline/readline.sh
rename to readline/readline.sh
diff --git a/pkgs/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch b/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch
similarity index 100%
rename from pkgs/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch
rename to reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch
diff --git a/pkgs/reiser4progs/patches/reiser4progs-libaal.patch b/reiser4progs/patches/reiser4progs-libaal.patch
similarity index 100%
rename from pkgs/reiser4progs/patches/reiser4progs-libaal.patch
rename to reiser4progs/patches/reiser4progs-libaal.patch
diff --git a/pkgs/reiser4progs/patches/reiser4progs-makefile.patch b/reiser4progs/patches/reiser4progs-makefile.patch
similarity index 100%
rename from pkgs/reiser4progs/patches/reiser4progs-makefile.patch
rename to reiser4progs/patches/reiser4progs-makefile.patch
diff --git a/pkgs/reiser4progs/patches/reiser4progs-opt.patch b/reiser4progs/patches/reiser4progs-opt.patch
similarity index 100%
rename from pkgs/reiser4progs/patches/reiser4progs-opt.patch
rename to reiser4progs/patches/reiser4progs-opt.patch
diff --git a/pkgs/reiser4progs/reiser4progs.nm b/reiser4progs/reiser4progs.nm
similarity index 100%
rename from pkgs/reiser4progs/reiser4progs.nm
rename to reiser4progs/reiser4progs.nm
diff --git a/pkgs/reiserfsprogs/reiserfsprogs.nm b/reiserfsprogs/reiserfsprogs.nm
similarity index 100%
rename from pkgs/reiserfsprogs/reiserfsprogs.nm
rename to reiserfsprogs/reiserfsprogs.nm
diff --git a/pkgs/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm
similarity index 100%
rename from pkgs/rrdtool/rrdtool.nm
rename to rrdtool/rrdtool.nm
diff --git a/pkgs/rstp/bridge-stp b/rstp/bridge-stp
similarity index 100%
rename from pkgs/rstp/bridge-stp
rename to rstp/bridge-stp
diff --git a/pkgs/rstp/patches/rstp-0.21-dump-commands.patch b/rstp/patches/rstp-0.21-dump-commands.patch
similarity index 100%
rename from pkgs/rstp/patches/rstp-0.21-dump-commands.patch
rename to rstp/patches/rstp-0.21-dump-commands.patch
diff --git a/pkgs/rstp/patches/rstp-0.21-upstream-fixes.patch b/rstp/patches/rstp-0.21-upstream-fixes.patch
similarity index 100%
rename from pkgs/rstp/patches/rstp-0.21-upstream-fixes.patch
rename to rstp/patches/rstp-0.21-upstream-fixes.patch
diff --git a/pkgs/rstp/rstp.nm b/rstp/rstp.nm
similarity index 100%
rename from pkgs/rstp/rstp.nm
rename to rstp/rstp.nm
diff --git a/pkgs/rstp/systemd/rstp.service b/rstp/systemd/rstp.service
similarity index 100%
rename from pkgs/rstp/systemd/rstp.service
rename to rstp/systemd/rstp.service
diff --git a/pkgs/rsync/patches/rsync-3.0.7-buf-overflow.patch b/rsync/patches/rsync-3.0.7-buf-overflow.patch
similarity index 100%
rename from pkgs/rsync/patches/rsync-3.0.7-buf-overflow.patch
rename to rsync/patches/rsync-3.0.7-buf-overflow.patch
diff --git a/pkgs/rsync/rsync.nm b/rsync/rsync.nm
similarity index 100%
rename from pkgs/rsync/rsync.nm
rename to rsync/rsync.nm
diff --git a/pkgs/rsync/rsync.xinetd b/rsync/rsync.xinetd
similarity index 100%
rename from pkgs/rsync/rsync.xinetd
rename to rsync/rsync.xinetd
diff --git a/pkgs/rsyslog/patches/rsyslog-5.7.9-systemd.patch b/rsyslog/patches/rsyslog-5.7.9-systemd.patch
similarity index 100%
rename from pkgs/rsyslog/patches/rsyslog-5.7.9-systemd.patch
rename to rsyslog/patches/rsyslog-5.7.9-systemd.patch
diff --git a/pkgs/rsyslog/rsyslog.conf b/rsyslog/rsyslog.conf
similarity index 100%
rename from pkgs/rsyslog/rsyslog.conf
rename to rsyslog/rsyslog.conf
diff --git a/pkgs/rsyslog/rsyslog.log b/rsyslog/rsyslog.log
similarity index 100%
rename from pkgs/rsyslog/rsyslog.log
rename to rsyslog/rsyslog.log
diff --git a/pkgs/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm
similarity index 100%
rename from pkgs/rsyslog/rsyslog.nm
rename to rsyslog/rsyslog.nm
diff --git a/pkgs/rsyslog/rsyslog.sysconfig b/rsyslog/rsyslog.sysconfig
similarity index 100%
rename from pkgs/rsyslog/rsyslog.sysconfig
rename to rsyslog/rsyslog.sysconfig
diff --git a/pkgs/rtorrent/rtorrent.nm b/rtorrent/rtorrent.nm
similarity index 100%
rename from pkgs/rtorrent/rtorrent.nm
rename to rtorrent/rtorrent.nm
diff --git a/pkgs/samba/samba.nm b/samba/samba.nm
similarity index 100%
rename from pkgs/samba/samba.nm
rename to samba/samba.nm
diff --git a/pkgs/sane/patches/sane-1.0.20-lockdir.patch b/sane/patches/sane-1.0.20-lockdir.patch
similarity index 100%
rename from pkgs/sane/patches/sane-1.0.20-lockdir.patch
rename to sane/patches/sane-1.0.20-lockdir.patch
diff --git a/pkgs/sane/patches/sane-1.0.21-epson-expression800.patch b/sane/patches/sane-1.0.21-epson-expression800.patch
similarity index 100%
rename from pkgs/sane/patches/sane-1.0.21-epson-expression800.patch
rename to sane/patches/sane-1.0.21-epson-expression800.patch
diff --git a/pkgs/sane/patches/sane-1.0.21-i18n.patch b/sane/patches/sane-1.0.21-i18n.patch
similarity index 100%
rename from pkgs/sane/patches/sane-1.0.21-i18n.patch
rename to sane/patches/sane-1.0.21-i18n.patch
diff --git a/pkgs/sane/patches/sane-1.0.21-pkgconfig.patch b/sane/patches/sane-1.0.21-pkgconfig.patch
similarity index 100%
rename from pkgs/sane/patches/sane-1.0.21-pkgconfig.patch
rename to sane/patches/sane-1.0.21-pkgconfig.patch
diff --git a/pkgs/sane/patches/sane-1.0.21-udev.patch b/sane/patches/sane-1.0.21-udev.patch
similarity index 100%
rename from pkgs/sane/patches/sane-1.0.21-udev.patch
rename to sane/patches/sane-1.0.21-udev.patch
diff --git a/pkgs/sane/sane.nm b/sane/sane.nm
similarity index 100%
rename from pkgs/sane/sane.nm
rename to sane/sane.nm
diff --git a/pkgs/screen/patches/screen-4.0.1-args.patch b/screen/patches/screen-4.0.1-args.patch
similarity index 100%
rename from pkgs/screen/patches/screen-4.0.1-args.patch
rename to screen/patches/screen-4.0.1-args.patch
diff --git a/pkgs/screen/patches/screen-4.0.2-maxstr.patch b/screen/patches/screen-4.0.2-maxstr.patch
similarity index 100%
rename from pkgs/screen/patches/screen-4.0.2-maxstr.patch
rename to screen/patches/screen-4.0.2-maxstr.patch
diff --git a/pkgs/screen/patches/screen-4.0.3-configh.patch b/screen/patches/screen-4.0.3-configh.patch
similarity index 100%
rename from pkgs/screen/patches/screen-4.0.3-configh.patch
rename to screen/patches/screen-4.0.3-configh.patch
diff --git a/pkgs/screen/patches/screen-4.0.3-ipv6.patch b/screen/patches/screen-4.0.3-ipv6.patch
similarity index 100%
rename from pkgs/screen/patches/screen-4.0.3-ipv6.patch
rename to screen/patches/screen-4.0.3-ipv6.patch
diff --git a/pkgs/screen/patches/screen-4.0.3-libs.patch b/screen/patches/screen-4.0.3-libs.patch
similarity index 100%
rename from pkgs/screen/patches/screen-4.0.3-libs.patch
rename to screen/patches/screen-4.0.3-libs.patch
diff --git a/pkgs/screen/patches/screen-4.0.3-screenrc.patch b/screen/patches/screen-4.0.3-screenrc.patch
similarity index 100%
rename from pkgs/screen/patches/screen-4.0.3-screenrc.patch
rename to screen/patches/screen-4.0.3-screenrc.patch
diff --git a/pkgs/screen/patches/screen-4.0.3-stropts.patch b/screen/patches/screen-4.0.3-stropts.patch
similarity index 100%
rename from pkgs/screen/patches/screen-4.0.3-stropts.patch
rename to screen/patches/screen-4.0.3-stropts.patch
diff --git a/pkgs/screen/screen.nm b/screen/screen.nm
similarity index 100%
rename from pkgs/screen/screen.nm
rename to screen/screen.nm
diff --git a/pkgs/screen/screen.pam b/screen/screen.pam
similarity index 100%
rename from pkgs/screen/screen.pam
rename to screen/screen.pam
diff --git a/pkgs/screen/screenrc b/screen/screenrc
similarity index 100%
rename from pkgs/screen/screenrc
rename to screen/screenrc
diff --git a/pkgs/sdl/sdl.nm b/sdl/sdl.nm
similarity index 100%
rename from pkgs/sdl/sdl.nm
rename to sdl/sdl.nm
diff --git a/pkgs/sed/sed.nm b/sed/sed.nm
similarity index 100%
rename from pkgs/sed/sed.nm
rename to sed/sed.nm
diff --git a/pkgs/setup/Makefile b/setup/Makefile
similarity index 100%
rename from pkgs/setup/Makefile
rename to setup/Makefile
diff --git a/pkgs/setup/aliases b/setup/aliases
similarity index 100%
rename from pkgs/setup/aliases
rename to setup/aliases
diff --git a/pkgs/setup/bashrc b/setup/bashrc
similarity index 100%
rename from pkgs/setup/bashrc
rename to setup/bashrc
diff --git a/pkgs/setup/exports b/setup/exports
similarity index 100%
rename from pkgs/setup/exports
rename to setup/exports
diff --git a/pkgs/setup/filesystems b/setup/filesystems
similarity index 100%
rename from pkgs/setup/filesystems
rename to setup/filesystems
diff --git a/pkgs/setup/group b/setup/group
similarity index 100%
rename from pkgs/setup/group
rename to setup/group
diff --git a/pkgs/setup/host.conf b/setup/host.conf
similarity index 100%
rename from pkgs/setup/host.conf
rename to setup/host.conf
diff --git a/pkgs/setup/hosts b/setup/hosts
similarity index 100%
rename from pkgs/setup/hosts
rename to setup/hosts
diff --git a/pkgs/setup/hosts.allow b/setup/hosts.allow
similarity index 100%
rename from pkgs/setup/hosts.allow
rename to setup/hosts.allow
diff --git a/pkgs/setup/hosts.deny b/setup/hosts.deny
similarity index 100%
rename from pkgs/setup/hosts.deny
rename to setup/hosts.deny
diff --git a/pkgs/setup/inputrc b/setup/inputrc
similarity index 100%
rename from pkgs/setup/inputrc
rename to setup/inputrc
diff --git a/pkgs/setup/motd b/setup/motd
similarity index 100%
rename from pkgs/setup/motd
rename to setup/motd
diff --git a/pkgs/setup/passwd b/setup/passwd
similarity index 100%
rename from pkgs/setup/passwd
rename to setup/passwd
diff --git a/pkgs/setup/printcap b/setup/printcap
similarity index 100%
rename from pkgs/setup/printcap
rename to setup/printcap
diff --git a/pkgs/setup/profile b/setup/profile
similarity index 100%
rename from pkgs/setup/profile
rename to setup/profile
diff --git a/pkgs/setup/securetty b/setup/securetty
similarity index 100%
rename from pkgs/setup/securetty
rename to setup/securetty
diff --git a/pkgs/setup/setup.nm b/setup/setup.nm
similarity index 100%
rename from pkgs/setup/setup.nm
rename to setup/setup.nm
diff --git a/pkgs/setup/shadowconvert.sh b/setup/shadowconvert.sh
similarity index 100%
rename from pkgs/setup/shadowconvert.sh
rename to setup/shadowconvert.sh
diff --git a/pkgs/setup/shells b/setup/shells
similarity index 100%
rename from pkgs/setup/shells
rename to setup/shells
diff --git a/pkgs/setup/uidgid b/setup/uidgid
similarity index 100%
rename from pkgs/setup/uidgid
rename to setup/uidgid
diff --git a/pkgs/setup/uidgidlint b/setup/uidgidlint
similarity index 100%
rename from pkgs/setup/uidgidlint
rename to setup/uidgidlint
diff --git a/pkgs/sg3-utils/sg3-utils.nm b/sg3-utils/sg3-utils.nm
similarity index 100%
rename from pkgs/sg3-utils/sg3-utils.nm
rename to sg3-utils/sg3-utils.nm
diff --git a/pkgs/shadow-utils/login.defs b/shadow-utils/login.defs
similarity index 100%
rename from pkgs/shadow-utils/login.defs
rename to shadow-utils/login.defs
diff --git a/pkgs/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch b/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch
similarity index 100%
rename from pkgs/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch
rename to shadow-utils/patches/shadow-4.1.4.2-ipfire.patch
diff --git a/pkgs/shadow-utils/patches/shadow-4.1.4.3-goodname.patch b/shadow-utils/patches/shadow-4.1.4.3-goodname.patch
similarity index 100%
rename from pkgs/shadow-utils/patches/shadow-4.1.4.3-goodname.patch
rename to shadow-utils/patches/shadow-4.1.4.3-goodname.patch
diff --git a/pkgs/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm
similarity index 100%
rename from pkgs/shadow-utils/shadow-utils.nm
rename to shadow-utils/shadow-utils.nm
diff --git a/pkgs/shadow-utils/useradd.default b/shadow-utils/useradd.default
similarity index 100%
rename from pkgs/shadow-utils/useradd.default
rename to shadow-utils/useradd.default
diff --git a/pkgs/sip/patches/disable-rpaths.patch b/sip/patches/disable-rpaths.patch
similarity index 100%
rename from pkgs/sip/patches/disable-rpaths.patch
rename to sip/patches/disable-rpaths.patch
diff --git a/pkgs/sip/patches/fix-linking.patch b/sip/patches/fix-linking.patch
similarity index 100%
rename from pkgs/sip/patches/fix-linking.patch
rename to sip/patches/fix-linking.patch
diff --git a/pkgs/sip/patches/no-strip.patch b/sip/patches/no-strip.patch
similarity index 100%
rename from pkgs/sip/patches/no-strip.patch
rename to sip/patches/no-strip.patch
diff --git a/pkgs/sip/sip.nm b/sip/sip.nm
similarity index 100%
rename from pkgs/sip/sip.nm
rename to sip/sip.nm
diff --git a/pkgs/slang/patches/slang-2.1.4-makefile.patch b/slang/patches/slang-2.1.4-makefile.patch
similarity index 100%
rename from pkgs/slang/patches/slang-2.1.4-makefile.patch
rename to slang/patches/slang-2.1.4-makefile.patch
diff --git a/pkgs/slang/slang.nm b/slang/slang.nm
similarity index 100%
rename from pkgs/slang/slang.nm
rename to slang/slang.nm
diff --git a/pkgs/smartmontools/smartmontools.nm b/smartmontools/smartmontools.nm
similarity index 100%
rename from pkgs/smartmontools/smartmontools.nm
rename to smartmontools/smartmontools.nm
diff --git a/pkgs/sqlite/patches/sqlite-3.6.12-libdl.patch b/sqlite/patches/sqlite-3.6.12-libdl.patch
similarity index 100%
rename from pkgs/sqlite/patches/sqlite-3.6.12-libdl.patch
rename to sqlite/patches/sqlite-3.6.12-libdl.patch
diff --git a/pkgs/sqlite/sqlite.nm b/sqlite/sqlite.nm
similarity index 100%
rename from pkgs/sqlite/sqlite.nm
rename to sqlite/sqlite.nm
diff --git a/pkgs/squashfs-tools/patches/squashfs-cflags.patch b/squashfs-tools/patches/squashfs-cflags.patch
similarity index 100%
rename from pkgs/squashfs-tools/patches/squashfs-cflags.patch
rename to squashfs-tools/patches/squashfs-cflags.patch
diff --git a/pkgs/squashfs-tools/patches/squashfs-xz.patch b/squashfs-tools/patches/squashfs-xz.patch
similarity index 100%
rename from pkgs/squashfs-tools/patches/squashfs-xz.patch
rename to squashfs-tools/patches/squashfs-xz.patch
diff --git a/pkgs/squashfs-tools/squashfs-tools.nm b/squashfs-tools/squashfs-tools.nm
similarity index 100%
rename from pkgs/squashfs-tools/squashfs-tools.nm
rename to squashfs-tools/squashfs-tools.nm
diff --git a/pkgs/squid/patches/squid-3.0.STABLE1-perlpath.patch b/squid/patches/squid-3.0.STABLE1-perlpath.patch
similarity index 100%
rename from pkgs/squid/patches/squid-3.0.STABLE1-perlpath.patch
rename to squid/patches/squid-3.0.STABLE1-perlpath.patch
diff --git a/pkgs/squid/patches/squid-3.0.STABLE7-from_manpg.patch b/squid/patches/squid-3.0.STABLE7-from_manpg.patch
similarity index 100%
rename from pkgs/squid/patches/squid-3.0.STABLE7-from_manpg.patch
rename to squid/patches/squid-3.0.STABLE7-from_manpg.patch
diff --git a/pkgs/squid/patches/squid-3.1.0.9-config.patch b/squid/patches/squid-3.1.0.9-config.patch
similarity index 100%
rename from pkgs/squid/patches/squid-3.1.0.9-config.patch
rename to squid/patches/squid-3.1.0.9-config.patch
diff --git a/pkgs/squid/patches/squid-3.1.0.9-location.patch b/squid/patches/squid-3.1.0.9-location.patch
similarity index 100%
rename from pkgs/squid/patches/squid-3.1.0.9-location.patch
rename to squid/patches/squid-3.1.0.9-location.patch
diff --git a/pkgs/squid/squid.nm b/squid/squid.nm
similarity index 100%
rename from pkgs/squid/squid.nm
rename to squid/squid.nm
diff --git a/pkgs/squidGuard/squidGuard.nm b/squidGuard/squidGuard.nm
similarity index 100%
rename from pkgs/squidGuard/squidGuard.nm
rename to squidGuard/squidGuard.nm
diff --git a/pkgs/strace/patches/strace-4.5.19-fix-kernel-headers.patch b/strace/patches/strace-4.5.19-fix-kernel-headers.patch
similarity index 100%
rename from pkgs/strace/patches/strace-4.5.19-fix-kernel-headers.patch
rename to strace/patches/strace-4.5.19-fix-kernel-headers.patch
diff --git a/pkgs/strace/strace.nm b/strace/strace.nm
similarity index 100%
rename from pkgs/strace/strace.nm
rename to strace/strace.nm
diff --git a/pkgs/strongswan/strongswan.nm b/strongswan/strongswan.nm
similarity index 100%
rename from pkgs/strongswan/strongswan.nm
rename to strongswan/strongswan.nm
diff --git a/pkgs/sudo/sudo.nm b/sudo/sudo.nm
similarity index 100%
rename from pkgs/sudo/sudo.nm
rename to sudo/sudo.nm
diff --git a/pkgs/sudo/sudo.pam b/sudo/sudo.pam
similarity index 100%
rename from pkgs/sudo/sudo.pam
rename to sudo/sudo.pam
diff --git a/pkgs/sudo/sudoers b/sudo/sudoers
similarity index 100%
rename from pkgs/sudo/sudoers
rename to sudo/sudoers
diff --git a/pkgs/suricata/suricata.logrotate b/suricata/suricata.logrotate
similarity index 100%
rename from pkgs/suricata/suricata.logrotate
rename to suricata/suricata.logrotate
diff --git a/pkgs/suricata/suricata.nm b/suricata/suricata.nm
similarity index 100%
rename from pkgs/suricata/suricata.nm
rename to suricata/suricata.nm
diff --git a/pkgs/swig/patches/swig-1.3.23-pylib.patch b/swig/patches/swig-1.3.23-pylib.patch
similarity index 100%
rename from pkgs/swig/patches/swig-1.3.23-pylib.patch
rename to swig/patches/swig-1.3.23-pylib.patch
diff --git a/pkgs/swig/patches/swig200-rh623854.patch b/swig/patches/swig200-rh623854.patch
similarity index 100%
rename from pkgs/swig/patches/swig200-rh623854.patch
rename to swig/patches/swig200-rh623854.patch
diff --git a/pkgs/swig/swig.nm b/swig/swig.nm
similarity index 100%
rename from pkgs/swig/swig.nm
rename to swig/swig.nm
diff --git a/pkgs/sysfsutils/sysfsutils.nm b/sysfsutils/sysfsutils.nm
similarity index 100%
rename from pkgs/sysfsutils/sysfsutils.nm
rename to sysfsutils/sysfsutils.nm
diff --git a/pkgs/syslinux/syslinux.nm b/syslinux/syslinux.nm
similarity index 100%
rename from pkgs/syslinux/syslinux.nm
rename to syslinux/syslinux.nm
diff --git a/pkgs/system-release/system-release.nm b/system-release/system-release.nm
similarity index 100%
rename from pkgs/system-release/system-release.nm
rename to system-release/system-release.nm
diff --git a/pkgs/systemd/locale.conf b/systemd/locale.conf
similarity index 100%
rename from pkgs/systemd/locale.conf
rename to systemd/locale.conf
diff --git a/pkgs/systemd/patches/systemd-33-no_manpages.patch b/systemd/patches/systemd-33-no_manpages.patch
similarity index 100%
rename from pkgs/systemd/patches/systemd-33-no_manpages.patch
rename to systemd/patches/systemd-33-no_manpages.patch
diff --git a/pkgs/systemd/systemd.nm b/systemd/systemd.nm
similarity index 100%
rename from pkgs/systemd/systemd.nm
rename to systemd/systemd.nm
diff --git a/pkgs/systemd/vconsole.conf b/systemd/vconsole.conf
similarity index 100%
rename from pkgs/systemd/vconsole.conf
rename to systemd/vconsole.conf
diff --git a/pkgs/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
similarity index 100%
rename from pkgs/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
rename to sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
diff --git a/pkgs/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm
similarity index 100%
rename from pkgs/sysvinit/sysvinit.nm
rename to sysvinit/sysvinit.nm
diff --git a/pkgs/tar/patches/tar-1.14-loneZeroWarning.patch b/tar/patches/tar-1.14-loneZeroWarning.patch
similarity index 100%
rename from pkgs/tar/patches/tar-1.14-loneZeroWarning.patch
rename to tar/patches/tar-1.14-loneZeroWarning.patch
diff --git a/pkgs/tar/patches/tar-1.15.1-vfatTruncate.patch b/tar/patches/tar-1.15.1-vfatTruncate.patch
similarity index 100%
rename from pkgs/tar/patches/tar-1.15.1-vfatTruncate.patch
rename to tar/patches/tar-1.15.1-vfatTruncate.patch
diff --git a/pkgs/tar/patches/tar-1.17-wildcards.patch b/tar/patches/tar-1.17-wildcards.patch
similarity index 100%
rename from pkgs/tar/patches/tar-1.17-wildcards.patch
rename to tar/patches/tar-1.17-wildcards.patch
diff --git a/pkgs/tar/patches/tar-1.22-atime-rofs.patch b/tar/patches/tar-1.22-atime-rofs.patch
similarity index 100%
rename from pkgs/tar/patches/tar-1.22-atime-rofs.patch
rename to tar/patches/tar-1.22-atime-rofs.patch
diff --git a/pkgs/tar/patches/tar-1.23-oldarchive.patch b/tar/patches/tar-1.23-oldarchive.patch
similarity index 100%
rename from pkgs/tar/patches/tar-1.23-oldarchive.patch
rename to tar/patches/tar-1.23-oldarchive.patch
diff --git a/pkgs/tar/patches/tar-1.24-xattrs.patch b/tar/patches/tar-1.24-xattrs.patch
similarity index 100%
rename from pkgs/tar/patches/tar-1.24-xattrs.patch
rename to tar/patches/tar-1.24-xattrs.patch
diff --git a/pkgs/tar/patches/tar-sigpipe.patch b/tar/patches/tar-sigpipe.patch
similarity index 100%
rename from pkgs/tar/patches/tar-sigpipe.patch
rename to tar/patches/tar-sigpipe.patch
diff --git a/pkgs/tar/tar.nm b/tar/tar.nm
similarity index 100%
rename from pkgs/tar/tar.nm
rename to tar/tar.nm
diff --git a/pkgs/tcl/patches/tcl-8.5.8-autopath.patch b/tcl/patches/tcl-8.5.8-autopath.patch
similarity index 100%
rename from pkgs/tcl/patches/tcl-8.5.8-autopath.patch
rename to tcl/patches/tcl-8.5.8-autopath.patch
diff --git a/pkgs/tcl/patches/tcl-8.5.8-conf.patch b/tcl/patches/tcl-8.5.8-conf.patch
similarity index 100%
rename from pkgs/tcl/patches/tcl-8.5.8-conf.patch
rename to tcl/patches/tcl-8.5.8-conf.patch
diff --git a/pkgs/tcl/tcl.nm b/tcl/tcl.nm
similarity index 100%
rename from pkgs/tcl/tcl.nm
rename to tcl/tcl.nm
diff --git a/pkgs/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm
similarity index 100%
rename from pkgs/tcpdump/tcpdump.nm
rename to tcpdump/tcpdump.nm
diff --git a/pkgs/telnet/patches/netkit-telnet-0.17-ipv6.diff b/telnet/patches/netkit-telnet-0.17-ipv6.diff
similarity index 100%
rename from pkgs/telnet/patches/netkit-telnet-0.17-ipv6.diff
rename to telnet/patches/netkit-telnet-0.17-ipv6.diff
diff --git a/pkgs/telnet/patches/netkit-telnet-0.17-nodns.patch b/telnet/patches/netkit-telnet-0.17-nodns.patch
similarity index 100%
rename from pkgs/telnet/patches/netkit-telnet-0.17-nodns.patch
rename to telnet/patches/netkit-telnet-0.17-nodns.patch
diff --git a/pkgs/telnet/patches/netkit-telnet-0.17-reallynodns.patch b/telnet/patches/netkit-telnet-0.17-reallynodns.patch
similarity index 100%
rename from pkgs/telnet/patches/netkit-telnet-0.17-reallynodns.patch
rename to telnet/patches/netkit-telnet-0.17-reallynodns.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-8bit.patch b/telnet/patches/telnet-0.17-8bit.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-8bit.patch
rename to telnet/patches/telnet-0.17-8bit.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-CAN-2005-468_469.patch b/telnet/patches/telnet-0.17-CAN-2005-468_469.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-CAN-2005-468_469.patch
rename to telnet/patches/telnet-0.17-CAN-2005-468_469.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-argv.patch b/telnet/patches/telnet-0.17-argv.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-argv.patch
rename to telnet/patches/telnet-0.17-argv.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-cleanup_race.patch b/telnet/patches/telnet-0.17-cleanup_race.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-cleanup_race.patch
rename to telnet/patches/telnet-0.17-cleanup_race.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-conf.patch b/telnet/patches/telnet-0.17-conf.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-conf.patch
rename to telnet/patches/telnet-0.17-conf.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-env.patch b/telnet/patches/telnet-0.17-env.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-env.patch
rename to telnet/patches/telnet-0.17-env.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-errno_test_sys_bsd.patch b/telnet/patches/telnet-0.17-errno_test_sys_bsd.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-errno_test_sys_bsd.patch
rename to telnet/patches/telnet-0.17-errno_test_sys_bsd.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-issue.patch b/telnet/patches/telnet-0.17-issue.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-issue.patch
rename to telnet/patches/telnet-0.17-issue.patch
diff --git a/pkgs/telnet/patches/telnet-0.17-pek.patch0 b/telnet/patches/telnet-0.17-pek.patch0
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-pek.patch0
rename to telnet/patches/telnet-0.17-pek.patch0
diff --git a/pkgs/telnet/patches/telnet-0.17-sa-01-49.patch b/telnet/patches/telnet-0.17-sa-01-49.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-0.17-sa-01-49.patch
rename to telnet/patches/telnet-0.17-sa-01-49.patch
diff --git a/pkgs/telnet/patches/telnet-client-cvs.patch0 b/telnet/patches/telnet-client-cvs.patch0
similarity index 100%
rename from pkgs/telnet/patches/telnet-client-cvs.patch0
rename to telnet/patches/telnet-client-cvs.patch0
diff --git a/pkgs/telnet/patches/telnet-gethostbyname.patch b/telnet/patches/telnet-gethostbyname.patch
similarity index 100%
rename from pkgs/telnet/patches/telnet-gethostbyname.patch
rename to telnet/patches/telnet-gethostbyname.patch
diff --git a/pkgs/telnet/patches/telnetd-0.17-pty_read.patch0 b/telnet/patches/telnetd-0.17-pty_read.patch0
similarity index 100%
rename from pkgs/telnet/patches/telnetd-0.17-pty_read.patch0
rename to telnet/patches/telnetd-0.17-pty_read.patch0
diff --git a/pkgs/telnet/patches/telnetd-0.17.patch0 b/telnet/patches/telnetd-0.17.patch0
similarity index 100%
rename from pkgs/telnet/patches/telnetd-0.17.patch0
rename to telnet/patches/telnetd-0.17.patch0
diff --git a/pkgs/telnet/telnet.nm b/telnet/telnet.nm
similarity index 100%
rename from pkgs/telnet/telnet.nm
rename to telnet/telnet.nm
diff --git a/pkgs/texinfo/patches/texinfo-4.12-zlib.patch b/texinfo/patches/texinfo-4.12-zlib.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.12-zlib.patch
rename to texinfo/patches/texinfo-4.12-zlib.patch
diff --git a/pkgs/texinfo/patches/texinfo-4.13a-data_types.patch b/texinfo/patches/texinfo-4.13a-data_types.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.13a-data_types.patch
rename to texinfo/patches/texinfo-4.13a-data_types.patch
diff --git a/pkgs/texinfo/patches/texinfo-4.13a-help-index-segfault.patch b/texinfo/patches/texinfo-4.13a-help-index-segfault.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.13a-help-index-segfault.patch
rename to texinfo/patches/texinfo-4.13a-help-index-segfault.patch
diff --git a/pkgs/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch b/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch
rename to texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch
diff --git a/pkgs/texinfo/patches/texinfo-4.13a-mosdo-crash.patch b/texinfo/patches/texinfo-4.13a-mosdo-crash.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.13a-mosdo-crash.patch
rename to texinfo/patches/texinfo-4.13a-mosdo-crash.patch
diff --git a/pkgs/texinfo/patches/texinfo-4.13a-powerpc.patch b/texinfo/patches/texinfo-4.13a-powerpc.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.13a-powerpc.patch
rename to texinfo/patches/texinfo-4.13a-powerpc.patch
diff --git a/pkgs/texinfo/patches/texinfo-4.13a-testsuite_fix.patch b/texinfo/patches/texinfo-4.13a-testsuite_fix.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.13a-testsuite_fix.patch
rename to texinfo/patches/texinfo-4.13a-testsuite_fix.patch
diff --git a/pkgs/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch b/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch
similarity index 100%
rename from pkgs/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch
rename to texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch
diff --git a/pkgs/texinfo/texinfo.nm b/texinfo/texinfo.nm
similarity index 100%
rename from pkgs/texinfo/texinfo.nm
rename to texinfo/texinfo.nm
diff --git a/pkgs/tinc/tinc.nm b/tinc/tinc.nm
similarity index 100%
rename from pkgs/tinc/tinc.nm
rename to tinc/tinc.nm
diff --git a/pkgs/traceroute/traceroute.nm b/traceroute/traceroute.nm
similarity index 100%
rename from pkgs/traceroute/traceroute.nm
rename to traceroute/traceroute.nm
diff --git a/pkgs/transmission/transmission.nm b/transmission/transmission.nm
similarity index 100%
rename from pkgs/transmission/transmission.nm
rename to transmission/transmission.nm
diff --git a/pkgs/tunctl/tunctl.nm b/tunctl/tunctl.nm
similarity index 100%
rename from pkgs/tunctl/tunctl.nm
rename to tunctl/tunctl.nm
diff --git a/pkgs/udev/console_init b/udev/console_init
similarity index 100%
rename from pkgs/udev/console_init
rename to udev/console_init
diff --git a/pkgs/udev/rules/10-console.rules b/udev/rules/10-console.rules
similarity index 100%
rename from pkgs/udev/rules/10-console.rules
rename to udev/rules/10-console.rules
diff --git a/pkgs/udev/udev.nm b/udev/udev.nm
similarity index 100%
rename from pkgs/udev/udev.nm
rename to udev/udev.nm
diff --git a/pkgs/udisks/udisks.nm b/udisks/udisks.nm
similarity index 100%
rename from pkgs/udisks/udisks.nm
rename to udisks/udisks.nm
diff --git a/pkgs/ulogd2/sqlite3.table b/ulogd2/sqlite3.table
similarity index 100%
rename from pkgs/ulogd2/sqlite3.table
rename to ulogd2/sqlite3.table
diff --git a/pkgs/ulogd2/systemd/ulogd.service b/ulogd2/systemd/ulogd.service
similarity index 100%
rename from pkgs/ulogd2/systemd/ulogd.service
rename to ulogd2/systemd/ulogd.service
diff --git a/pkgs/ulogd2/ulogd.conf b/ulogd2/ulogd.conf
similarity index 100%
rename from pkgs/ulogd2/ulogd.conf
rename to ulogd2/ulogd.conf
diff --git a/pkgs/ulogd2/ulogd.logrotate b/ulogd2/ulogd.logrotate
similarity index 100%
rename from pkgs/ulogd2/ulogd.logrotate
rename to ulogd2/ulogd.logrotate
diff --git a/pkgs/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
similarity index 100%
rename from pkgs/ulogd2/ulogd2.nm
rename to ulogd2/ulogd2.nm
diff --git a/pkgs/unzip/patches/unzip-6.0-attribs-overflow.patch b/unzip/patches/unzip-6.0-attribs-overflow.patch
similarity index 100%
rename from pkgs/unzip/patches/unzip-6.0-attribs-overflow.patch
rename to unzip/patches/unzip-6.0-attribs-overflow.patch
diff --git a/pkgs/unzip/patches/unzip-6.0-bzip2-configure.patch b/unzip/patches/unzip-6.0-bzip2-configure.patch
similarity index 100%
rename from pkgs/unzip/patches/unzip-6.0-bzip2-configure.patch
rename to unzip/patches/unzip-6.0-bzip2-configure.patch
diff --git a/pkgs/unzip/patches/unzip-6.0-close.patch b/unzip/patches/unzip-6.0-close.patch
similarity index 100%
rename from pkgs/unzip/patches/unzip-6.0-close.patch
rename to unzip/patches/unzip-6.0-close.patch
diff --git a/pkgs/unzip/patches/unzip-6.0-exec-shield.patch b/unzip/patches/unzip-6.0-exec-shield.patch
similarity index 100%
rename from pkgs/unzip/patches/unzip-6.0-exec-shield.patch
rename to unzip/patches/unzip-6.0-exec-shield.patch
diff --git a/pkgs/unzip/patches/unzip-6.0-nostrip.patch b/unzip/patches/unzip-6.0-nostrip.patch
similarity index 100%
rename from pkgs/unzip/patches/unzip-6.0-nostrip.patch
rename to unzip/patches/unzip-6.0-nostrip.patch
diff --git a/pkgs/unzip/unzip.nm b/unzip/unzip.nm
similarity index 100%
rename from pkgs/unzip/unzip.nm
rename to unzip/unzip.nm
diff --git a/pkgs/upower/upower.nm b/upower/upower.nm
similarity index 100%
rename from pkgs/upower/upower.nm
rename to upower/upower.nm
diff --git a/pkgs/usb-modemswitch/usb-modeswitch.nm b/usb-modemswitch/usb-modeswitch.nm
similarity index 100%
rename from pkgs/usb-modemswitch/usb-modeswitch.nm
rename to usb-modemswitch/usb-modeswitch.nm
diff --git a/pkgs/usbutils/usbutils.nm b/usbutils/usbutils.nm
similarity index 100%
rename from pkgs/usbutils/usbutils.nm
rename to usbutils/usbutils.nm
diff --git a/pkgs/ustr/ustr.nm b/ustr/ustr.nm
similarity index 100%
rename from pkgs/ustr/ustr.nm
rename to ustr/ustr.nm
diff --git a/pkgs/util-linux/nologin.8 b/util-linux/nologin.8
similarity index 100%
rename from pkgs/util-linux/nologin.8
rename to util-linux/nologin.8
diff --git a/pkgs/util-linux/nologin.c b/util-linux/nologin.c
similarity index 100%
rename from pkgs/util-linux/nologin.c
rename to util-linux/nologin.c
diff --git a/pkgs/util-linux/pam.d/login b/util-linux/pam.d/login
similarity index 100%
rename from pkgs/util-linux/pam.d/login
rename to util-linux/pam.d/login
diff --git a/pkgs/util-linux/util-linux.nm b/util-linux/util-linux.nm
similarity index 100%
rename from pkgs/util-linux/util-linux.nm
rename to util-linux/util-linux.nm
diff --git a/pkgs/vala/vala.nm b/vala/vala.nm
similarity index 100%
rename from pkgs/vala/vala.nm
rename to vala/vala.nm
diff --git a/pkgs/vim/patches/vim-7.3.001.patch0 b/vim/patches/vim-7.3.001.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.001.patch0
rename to vim/patches/vim-7.3.001.patch0
diff --git a/pkgs/vim/patches/vim-7.3.002.patch0 b/vim/patches/vim-7.3.002.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.002.patch0
rename to vim/patches/vim-7.3.002.patch0
diff --git a/pkgs/vim/patches/vim-7.3.003.patch0 b/vim/patches/vim-7.3.003.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.003.patch0
rename to vim/patches/vim-7.3.003.patch0
diff --git a/pkgs/vim/patches/vim-7.3.004.patch0 b/vim/patches/vim-7.3.004.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.004.patch0
rename to vim/patches/vim-7.3.004.patch0
diff --git a/pkgs/vim/patches/vim-7.3.005.patch0 b/vim/patches/vim-7.3.005.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.005.patch0
rename to vim/patches/vim-7.3.005.patch0
diff --git a/pkgs/vim/patches/vim-7.3.006.patch0 b/vim/patches/vim-7.3.006.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.006.patch0
rename to vim/patches/vim-7.3.006.patch0
diff --git a/pkgs/vim/patches/vim-7.3.007.patch0 b/vim/patches/vim-7.3.007.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.007.patch0
rename to vim/patches/vim-7.3.007.patch0
diff --git a/pkgs/vim/patches/vim-7.3.008.patch0 b/vim/patches/vim-7.3.008.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.008.patch0
rename to vim/patches/vim-7.3.008.patch0
diff --git a/pkgs/vim/patches/vim-7.3.009.patch0 b/vim/patches/vim-7.3.009.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.009.patch0
rename to vim/patches/vim-7.3.009.patch0
diff --git a/pkgs/vim/patches/vim-7.3.010.patch0 b/vim/patches/vim-7.3.010.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.010.patch0
rename to vim/patches/vim-7.3.010.patch0
diff --git a/pkgs/vim/patches/vim-7.3.011.patch0 b/vim/patches/vim-7.3.011.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.011.patch0
rename to vim/patches/vim-7.3.011.patch0
diff --git a/pkgs/vim/patches/vim-7.3.012.patch0 b/vim/patches/vim-7.3.012.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.012.patch0
rename to vim/patches/vim-7.3.012.patch0
diff --git a/pkgs/vim/patches/vim-7.3.013.patch0 b/vim/patches/vim-7.3.013.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.013.patch0
rename to vim/patches/vim-7.3.013.patch0
diff --git a/pkgs/vim/patches/vim-7.3.014.patch0 b/vim/patches/vim-7.3.014.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.014.patch0
rename to vim/patches/vim-7.3.014.patch0
diff --git a/pkgs/vim/patches/vim-7.3.015.patch0 b/vim/patches/vim-7.3.015.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.015.patch0
rename to vim/patches/vim-7.3.015.patch0
diff --git a/pkgs/vim/patches/vim-7.3.016.patch0 b/vim/patches/vim-7.3.016.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.016.patch0
rename to vim/patches/vim-7.3.016.patch0
diff --git a/pkgs/vim/patches/vim-7.3.017.patch0 b/vim/patches/vim-7.3.017.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.017.patch0
rename to vim/patches/vim-7.3.017.patch0
diff --git a/pkgs/vim/patches/vim-7.3.018.patch0 b/vim/patches/vim-7.3.018.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.018.patch0
rename to vim/patches/vim-7.3.018.patch0
diff --git a/pkgs/vim/patches/vim-7.3.019.patch0 b/vim/patches/vim-7.3.019.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.019.patch0
rename to vim/patches/vim-7.3.019.patch0
diff --git a/pkgs/vim/patches/vim-7.3.020.patch0 b/vim/patches/vim-7.3.020.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.020.patch0
rename to vim/patches/vim-7.3.020.patch0
diff --git a/pkgs/vim/patches/vim-7.3.021.patch0 b/vim/patches/vim-7.3.021.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.021.patch0
rename to vim/patches/vim-7.3.021.patch0
diff --git a/pkgs/vim/patches/vim-7.3.022.patch0 b/vim/patches/vim-7.3.022.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.022.patch0
rename to vim/patches/vim-7.3.022.patch0
diff --git a/pkgs/vim/patches/vim-7.3.023.patch0 b/vim/patches/vim-7.3.023.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.023.patch0
rename to vim/patches/vim-7.3.023.patch0
diff --git a/pkgs/vim/patches/vim-7.3.024.patch0 b/vim/patches/vim-7.3.024.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.024.patch0
rename to vim/patches/vim-7.3.024.patch0
diff --git a/pkgs/vim/patches/vim-7.3.025.patch0 b/vim/patches/vim-7.3.025.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.025.patch0
rename to vim/patches/vim-7.3.025.patch0
diff --git a/pkgs/vim/patches/vim-7.3.026.patch0 b/vim/patches/vim-7.3.026.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.026.patch0
rename to vim/patches/vim-7.3.026.patch0
diff --git a/pkgs/vim/patches/vim-7.3.027.patch0 b/vim/patches/vim-7.3.027.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.027.patch0
rename to vim/patches/vim-7.3.027.patch0
diff --git a/pkgs/vim/patches/vim-7.3.028.patch0 b/vim/patches/vim-7.3.028.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.028.patch0
rename to vim/patches/vim-7.3.028.patch0
diff --git a/pkgs/vim/patches/vim-7.3.029.patch0 b/vim/patches/vim-7.3.029.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.029.patch0
rename to vim/patches/vim-7.3.029.patch0
diff --git a/pkgs/vim/patches/vim-7.3.030.patch0 b/vim/patches/vim-7.3.030.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.030.patch0
rename to vim/patches/vim-7.3.030.patch0
diff --git a/pkgs/vim/patches/vim-7.3.031.patch0 b/vim/patches/vim-7.3.031.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.031.patch0
rename to vim/patches/vim-7.3.031.patch0
diff --git a/pkgs/vim/patches/vim-7.3.032.patch0 b/vim/patches/vim-7.3.032.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.032.patch0
rename to vim/patches/vim-7.3.032.patch0
diff --git a/pkgs/vim/patches/vim-7.3.033.patch0 b/vim/patches/vim-7.3.033.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.033.patch0
rename to vim/patches/vim-7.3.033.patch0
diff --git a/pkgs/vim/patches/vim-7.3.034.patch0 b/vim/patches/vim-7.3.034.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.034.patch0
rename to vim/patches/vim-7.3.034.patch0
diff --git a/pkgs/vim/patches/vim-7.3.035.patch0 b/vim/patches/vim-7.3.035.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.035.patch0
rename to vim/patches/vim-7.3.035.patch0
diff --git a/pkgs/vim/patches/vim-7.3.036.patch0 b/vim/patches/vim-7.3.036.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.036.patch0
rename to vim/patches/vim-7.3.036.patch0
diff --git a/pkgs/vim/patches/vim-7.3.037.patch0 b/vim/patches/vim-7.3.037.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.037.patch0
rename to vim/patches/vim-7.3.037.patch0
diff --git a/pkgs/vim/patches/vim-7.3.038.patch0 b/vim/patches/vim-7.3.038.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.038.patch0
rename to vim/patches/vim-7.3.038.patch0
diff --git a/pkgs/vim/patches/vim-7.3.039.patch0 b/vim/patches/vim-7.3.039.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.039.patch0
rename to vim/patches/vim-7.3.039.patch0
diff --git a/pkgs/vim/patches/vim-7.3.040.patch0 b/vim/patches/vim-7.3.040.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.040.patch0
rename to vim/patches/vim-7.3.040.patch0
diff --git a/pkgs/vim/patches/vim-7.3.041.patch0 b/vim/patches/vim-7.3.041.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.041.patch0
rename to vim/patches/vim-7.3.041.patch0
diff --git a/pkgs/vim/patches/vim-7.3.042.patch0 b/vim/patches/vim-7.3.042.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.042.patch0
rename to vim/patches/vim-7.3.042.patch0
diff --git a/pkgs/vim/patches/vim-7.3.043.patch0 b/vim/patches/vim-7.3.043.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.043.patch0
rename to vim/patches/vim-7.3.043.patch0
diff --git a/pkgs/vim/patches/vim-7.3.044.patch0 b/vim/patches/vim-7.3.044.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.044.patch0
rename to vim/patches/vim-7.3.044.patch0
diff --git a/pkgs/vim/patches/vim-7.3.045.patch0 b/vim/patches/vim-7.3.045.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.045.patch0
rename to vim/patches/vim-7.3.045.patch0
diff --git a/pkgs/vim/patches/vim-7.3.046.patch0 b/vim/patches/vim-7.3.046.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.046.patch0
rename to vim/patches/vim-7.3.046.patch0
diff --git a/pkgs/vim/patches/vim-7.3.047.patch0 b/vim/patches/vim-7.3.047.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.047.patch0
rename to vim/patches/vim-7.3.047.patch0
diff --git a/pkgs/vim/patches/vim-7.3.048.patch0 b/vim/patches/vim-7.3.048.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.048.patch0
rename to vim/patches/vim-7.3.048.patch0
diff --git a/pkgs/vim/patches/vim-7.3.049.patch0 b/vim/patches/vim-7.3.049.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.049.patch0
rename to vim/patches/vim-7.3.049.patch0
diff --git a/pkgs/vim/patches/vim-7.3.050.patch0 b/vim/patches/vim-7.3.050.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.050.patch0
rename to vim/patches/vim-7.3.050.patch0
diff --git a/pkgs/vim/patches/vim-7.3.051.patch0 b/vim/patches/vim-7.3.051.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.051.patch0
rename to vim/patches/vim-7.3.051.patch0
diff --git a/pkgs/vim/patches/vim-7.3.052.patch0 b/vim/patches/vim-7.3.052.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.052.patch0
rename to vim/patches/vim-7.3.052.patch0
diff --git a/pkgs/vim/patches/vim-7.3.053.patch0 b/vim/patches/vim-7.3.053.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.053.patch0
rename to vim/patches/vim-7.3.053.patch0
diff --git a/pkgs/vim/patches/vim-7.3.054.patch0 b/vim/patches/vim-7.3.054.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.054.patch0
rename to vim/patches/vim-7.3.054.patch0
diff --git a/pkgs/vim/patches/vim-7.3.055.patch0 b/vim/patches/vim-7.3.055.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.055.patch0
rename to vim/patches/vim-7.3.055.patch0
diff --git a/pkgs/vim/patches/vim-7.3.056.patch0 b/vim/patches/vim-7.3.056.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.056.patch0
rename to vim/patches/vim-7.3.056.patch0
diff --git a/pkgs/vim/patches/vim-7.3.057.patch0 b/vim/patches/vim-7.3.057.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.057.patch0
rename to vim/patches/vim-7.3.057.patch0
diff --git a/pkgs/vim/patches/vim-7.3.058.patch0 b/vim/patches/vim-7.3.058.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.058.patch0
rename to vim/patches/vim-7.3.058.patch0
diff --git a/pkgs/vim/patches/vim-7.3.059.patch0 b/vim/patches/vim-7.3.059.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.059.patch0
rename to vim/patches/vim-7.3.059.patch0
diff --git a/pkgs/vim/patches/vim-7.3.060.patch0 b/vim/patches/vim-7.3.060.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.060.patch0
rename to vim/patches/vim-7.3.060.patch0
diff --git a/pkgs/vim/patches/vim-7.3.061.patch0 b/vim/patches/vim-7.3.061.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.061.patch0
rename to vim/patches/vim-7.3.061.patch0
diff --git a/pkgs/vim/patches/vim-7.3.062.patch0 b/vim/patches/vim-7.3.062.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.062.patch0
rename to vim/patches/vim-7.3.062.patch0
diff --git a/pkgs/vim/patches/vim-7.3.063.patch0 b/vim/patches/vim-7.3.063.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.063.patch0
rename to vim/patches/vim-7.3.063.patch0
diff --git a/pkgs/vim/patches/vim-7.3.064.patch0 b/vim/patches/vim-7.3.064.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.064.patch0
rename to vim/patches/vim-7.3.064.patch0
diff --git a/pkgs/vim/patches/vim-7.3.065.patch0 b/vim/patches/vim-7.3.065.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.065.patch0
rename to vim/patches/vim-7.3.065.patch0
diff --git a/pkgs/vim/patches/vim-7.3.066.patch0 b/vim/patches/vim-7.3.066.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.066.patch0
rename to vim/patches/vim-7.3.066.patch0
diff --git a/pkgs/vim/patches/vim-7.3.067.patch0 b/vim/patches/vim-7.3.067.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.067.patch0
rename to vim/patches/vim-7.3.067.patch0
diff --git a/pkgs/vim/patches/vim-7.3.068.patch0 b/vim/patches/vim-7.3.068.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.068.patch0
rename to vim/patches/vim-7.3.068.patch0
diff --git a/pkgs/vim/patches/vim-7.3.069.patch0 b/vim/patches/vim-7.3.069.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.069.patch0
rename to vim/patches/vim-7.3.069.patch0
diff --git a/pkgs/vim/patches/vim-7.3.070.patch0 b/vim/patches/vim-7.3.070.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.070.patch0
rename to vim/patches/vim-7.3.070.patch0
diff --git a/pkgs/vim/patches/vim-7.3.071.patch0 b/vim/patches/vim-7.3.071.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.071.patch0
rename to vim/patches/vim-7.3.071.patch0
diff --git a/pkgs/vim/patches/vim-7.3.072.patch0 b/vim/patches/vim-7.3.072.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.072.patch0
rename to vim/patches/vim-7.3.072.patch0
diff --git a/pkgs/vim/patches/vim-7.3.073.patch0 b/vim/patches/vim-7.3.073.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.073.patch0
rename to vim/patches/vim-7.3.073.patch0
diff --git a/pkgs/vim/patches/vim-7.3.074.patch0 b/vim/patches/vim-7.3.074.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.074.patch0
rename to vim/patches/vim-7.3.074.patch0
diff --git a/pkgs/vim/patches/vim-7.3.075.patch0 b/vim/patches/vim-7.3.075.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.075.patch0
rename to vim/patches/vim-7.3.075.patch0
diff --git a/pkgs/vim/patches/vim-7.3.076.patch0 b/vim/patches/vim-7.3.076.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.076.patch0
rename to vim/patches/vim-7.3.076.patch0
diff --git a/pkgs/vim/patches/vim-7.3.077.patch0 b/vim/patches/vim-7.3.077.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.077.patch0
rename to vim/patches/vim-7.3.077.patch0
diff --git a/pkgs/vim/patches/vim-7.3.078.patch0 b/vim/patches/vim-7.3.078.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.078.patch0
rename to vim/patches/vim-7.3.078.patch0
diff --git a/pkgs/vim/patches/vim-7.3.079.patch0 b/vim/patches/vim-7.3.079.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.079.patch0
rename to vim/patches/vim-7.3.079.patch0
diff --git a/pkgs/vim/patches/vim-7.3.080.patch0 b/vim/patches/vim-7.3.080.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.080.patch0
rename to vim/patches/vim-7.3.080.patch0
diff --git a/pkgs/vim/patches/vim-7.3.081.patch0 b/vim/patches/vim-7.3.081.patch0
similarity index 100%
rename from pkgs/vim/patches/vim-7.3.081.patch0
rename to vim/patches/vim-7.3.081.patch0
diff --git a/pkgs/vim/vim.nm b/vim/vim.nm
similarity index 100%
rename from pkgs/vim/vim.nm
rename to vim/vim.nm
diff --git a/pkgs/vim/vimrc b/vim/vimrc
similarity index 100%
rename from pkgs/vim/vimrc
rename to vim/vimrc
diff --git a/pkgs/vlan/vlan.nm b/vlan/vlan.nm
similarity index 100%
rename from pkgs/vlan/vlan.nm
rename to vlan/vlan.nm
diff --git a/pkgs/vsftpd/patches/1-vsftpd-build_ssl.patch b/vsftpd/patches/1-vsftpd-build_ssl.patch
similarity index 100%
rename from pkgs/vsftpd/patches/1-vsftpd-build_ssl.patch
rename to vsftpd/patches/1-vsftpd-build_ssl.patch
diff --git a/pkgs/vsftpd/patches/2-vsftpd-libs-3.patch b/vsftpd/patches/2-vsftpd-libs-3.patch
similarity index 100%
rename from pkgs/vsftpd/patches/2-vsftpd-libs-3.patch
rename to vsftpd/patches/2-vsftpd-libs-3.patch
diff --git a/pkgs/vsftpd/patches/3-vsftpd-pam_hostname-1.patch b/vsftpd/patches/3-vsftpd-pam_hostname-1.patch
similarity index 100%
rename from pkgs/vsftpd/patches/3-vsftpd-pam_hostname-1.patch
rename to vsftpd/patches/3-vsftpd-pam_hostname-1.patch
diff --git a/pkgs/vsftpd/patches/4-vsftpd-close-std-fds.patch b/vsftpd/patches/4-vsftpd-close-std-fds.patch
similarity index 100%
rename from pkgs/vsftpd/patches/4-vsftpd-close-std-fds.patch
rename to vsftpd/patches/4-vsftpd-close-std-fds.patch
diff --git a/pkgs/vsftpd/patches/5-vsftpd-configuration-1.patch b/vsftpd/patches/5-vsftpd-configuration-1.patch
similarity index 100%
rename from pkgs/vsftpd/patches/5-vsftpd-configuration-1.patch
rename to vsftpd/patches/5-vsftpd-configuration-1.patch
diff --git a/pkgs/vsftpd/patches/vsftpd-2.2.0-openssl.patch b/vsftpd/patches/vsftpd-2.2.0-openssl.patch
similarity index 100%
rename from pkgs/vsftpd/patches/vsftpd-2.2.0-openssl.patch
rename to vsftpd/patches/vsftpd-2.2.0-openssl.patch
diff --git a/pkgs/vsftpd/systemd/vsftpd.service b/vsftpd/systemd/vsftpd.service
similarity index 100%
rename from pkgs/vsftpd/systemd/vsftpd.service
rename to vsftpd/systemd/vsftpd.service
diff --git a/pkgs/vsftpd/vsftpd.conf b/vsftpd/vsftpd.conf
similarity index 100%
rename from pkgs/vsftpd/vsftpd.conf
rename to vsftpd/vsftpd.conf
diff --git a/pkgs/vsftpd/vsftpd.nm b/vsftpd/vsftpd.nm
similarity index 100%
rename from pkgs/vsftpd/vsftpd.nm
rename to vsftpd/vsftpd.nm
diff --git a/pkgs/vsftpd/vsftpd.pam b/vsftpd/vsftpd.pam
similarity index 100%
rename from pkgs/vsftpd/vsftpd.pam
rename to vsftpd/vsftpd.pam
diff --git a/pkgs/vsftpd/vsftpd.user_list b/vsftpd/vsftpd.user_list
similarity index 100%
rename from pkgs/vsftpd/vsftpd.user_list
rename to vsftpd/vsftpd.user_list
diff --git a/pkgs/wavemon/wavemon.nm b/wavemon/wavemon.nm
similarity index 100%
rename from pkgs/wavemon/wavemon.nm
rename to wavemon/wavemon.nm
diff --git a/pkgs/wget/wget.nm b/wget/wget.nm
similarity index 100%
rename from pkgs/wget/wget.nm
rename to wget/wget.nm
diff --git a/pkgs/which/which.nm b/which/which.nm
similarity index 100%
rename from pkgs/which/which.nm
rename to which/which.nm
diff --git a/pkgs/wireless-regdb/wireless-regdb.nm b/wireless-regdb/wireless-regdb.nm
similarity index 100%
rename from pkgs/wireless-regdb/wireless-regdb.nm
rename to wireless-regdb/wireless-regdb.nm
diff --git a/pkgs/wireless-tools/patches/wireless_tools.29-makefile.patch b/wireless-tools/patches/wireless_tools.29-makefile.patch
similarity index 100%
rename from pkgs/wireless-tools/patches/wireless_tools.29-makefile.patch
rename to wireless-tools/patches/wireless_tools.29-makefile.patch
diff --git a/pkgs/wireless-tools/wireless-tools.nm b/wireless-tools/wireless-tools.nm
similarity index 100%
rename from pkgs/wireless-tools/wireless-tools.nm
rename to wireless-tools/wireless-tools.nm
diff --git a/pkgs/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from pkgs/wpa_supplicant/wpa_supplicant.conf
rename to wpa_supplicant/wpa_supplicant.conf
diff --git a/pkgs/wpa_supplicant/wpa_supplicant.config b/wpa_supplicant/wpa_supplicant.config
similarity index 100%
rename from pkgs/wpa_supplicant/wpa_supplicant.config
rename to wpa_supplicant/wpa_supplicant.config
diff --git a/pkgs/wpa_supplicant/wpa_supplicant.logrotate b/wpa_supplicant/wpa_supplicant.logrotate
similarity index 100%
rename from pkgs/wpa_supplicant/wpa_supplicant.logrotate
rename to wpa_supplicant/wpa_supplicant.logrotate
diff --git a/pkgs/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm
similarity index 100%
rename from pkgs/wpa_supplicant/wpa_supplicant.nm
rename to wpa_supplicant/wpa_supplicant.nm
diff --git a/pkgs/xcb-proto/xcb-proto.nm b/xcb-proto/xcb-proto.nm
similarity index 100%
rename from pkgs/xcb-proto/xcb-proto.nm
rename to xcb-proto/xcb-proto.nm
diff --git a/pkgs/xcb-util/xcb-util.nm b/xcb-util/xcb-util.nm
similarity index 100%
rename from pkgs/xcb-util/xcb-util.nm
rename to xcb-util/xcb-util.nm
diff --git a/pkgs/xen/patches/00-xen-detect.patch b/xen/patches/00-xen-detect.patch
similarity index 100%
rename from pkgs/xen/patches/00-xen-detect.patch
rename to xen/patches/00-xen-detect.patch
diff --git a/pkgs/xen/patches/xen-gcc-4.6.0.patch b/xen/patches/xen-gcc-4.6.0.patch
similarity index 100%
rename from pkgs/xen/patches/xen-gcc-4.6.0.patch
rename to xen/patches/xen-gcc-4.6.0.patch
diff --git a/pkgs/xen/xen.nm b/xen/xen.nm
similarity index 100%
rename from pkgs/xen/xen.nm
rename to xen/xen.nm
diff --git a/pkgs/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
similarity index 100%
rename from pkgs/xfsprogs/xfsprogs.nm
rename to xfsprogs/xfsprogs.nm
diff --git a/pkgs/xkeyboard-config/xkeyboard-config.nm b/xkeyboard-config/xkeyboard-config.nm
similarity index 100%
rename from pkgs/xkeyboard-config/xkeyboard-config.nm
rename to xkeyboard-config/xkeyboard-config.nm
diff --git a/pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
rename to xorg-x11-drv-ati/xorg-x11-drv-ati.nm
diff --git a/pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
rename to xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
diff --git a/pkgs/xorg-x11-drv-intel/intel.xinf b/xorg-x11-drv-intel/intel.xinf
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/intel.xinf
rename to xorg-x11-drv-intel/intel.xinf
diff --git a/pkgs/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch b/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
rename to xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
diff --git a/pkgs/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch b/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
rename to xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
diff --git a/pkgs/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch b/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
rename to xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
diff --git a/pkgs/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch b/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
rename to xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
diff --git a/pkgs/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch b/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
rename to xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
diff --git a/pkgs/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch b/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
rename to xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
diff --git a/pkgs/xorg-x11-drv-intel/patches/kill-svideo.patch b/xorg-x11-drv-intel/patches/kill-svideo.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/kill-svideo.patch
rename to xorg-x11-drv-intel/patches/kill-svideo.patch
diff --git a/pkgs/xorg-x11-drv-intel/patches/uevent.patch b/xorg-x11-drv-intel/patches/uevent.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/patches/uevent.patch
rename to xorg-x11-drv-intel/patches/uevent.patch
diff --git a/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
rename to xorg-x11-drv-intel/xorg-x11-drv-intel.nm
diff --git a/pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
rename to xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
diff --git a/pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
rename to xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
diff --git a/pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch b/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
rename to xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
diff --git a/pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch b/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
rename to xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
diff --git a/pkgs/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch b/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
rename to xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
diff --git a/pkgs/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch b/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
rename to xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
diff --git a/pkgs/xorg-x11-drv-nv/patches/nv-save-rom.patch b/xorg-x11-drv-nv/patches/nv-save-rom.patch
similarity index 100%
rename from pkgs/xorg-x11-drv-nv/patches/nv-save-rom.patch
rename to xorg-x11-drv-nv/patches/nv-save-rom.patch
diff --git a/pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm b/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
rename to xorg-x11-drv-nv/xorg-x11-drv-nv.nm
diff --git a/pkgs/xorg-x11-drv-synaptics/50-synaptics.conf b/xorg-x11-drv-synaptics/50-synaptics.conf
similarity index 100%
rename from pkgs/xorg-x11-drv-synaptics/50-synaptics.conf
rename to xorg-x11-drv-synaptics/50-synaptics.conf
diff --git a/pkgs/xorg-x11-drv-synaptics/70-touchpad-quirks.rules b/xorg-x11-drv-synaptics/70-touchpad-quirks.rules
similarity index 100%
rename from pkgs/xorg-x11-drv-synaptics/70-touchpad-quirks.rules
rename to xorg-x11-drv-synaptics/70-touchpad-quirks.rules
diff --git a/pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm b/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
rename to xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
diff --git a/pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
rename to xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
diff --git a/pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
similarity index 100%
rename from pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
rename to xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
diff --git a/pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm b/xorg-x11-font-utils/xorg-x11-font-utils.nm
similarity index 100%
rename from pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm
rename to xorg-x11-font-utils/xorg-x11-font-utils.nm
diff --git a/pkgs/xorg-x11-fonts/xorg-x11-fonts.nm b/xorg-x11-fonts/xorg-x11-fonts.nm
similarity index 100%
rename from pkgs/xorg-x11-fonts/xorg-x11-fonts.nm
rename to xorg-x11-fonts/xorg-x11-fonts.nm
diff --git a/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
similarity index 100%
rename from pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
rename to xorg-x11-proto-devel/xorg-x11-proto-devel.nm
diff --git a/pkgs/xorg-x11-server/10-quirks.conf b/xorg-x11-server/10-quirks.conf
similarity index 100%
rename from pkgs/xorg-x11-server/10-quirks.conf
rename to xorg-x11-server/10-quirks.conf
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch b/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
rename to xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
rename to xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch b/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
rename to xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch b/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
rename to xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch b/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
rename to xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
rename to xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch b/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
rename to xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch b/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
rename to xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.6.99-right-of.patch b/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
rename to xorg-x11-server/patches/xserver-1.6.99-right-of.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch b/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
rename to xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch b/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
rename to xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.7.1-multilib.patch b/xorg-x11-server/patches/xserver-1.7.1-multilib.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.7.1-multilib.patch
rename to xorg-x11-server/patches/xserver-1.7.1-multilib.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch b/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
rename to xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch b/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
rename to xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.8-randr-initial.patch b/xorg-x11-server/patches/xserver-1.8-randr-initial.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.8-randr-initial.patch
rename to xorg-x11-server/patches/xserver-1.8-randr-initial.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.8-udev-warning.patch b/xorg-x11-server/patches/xserver-1.8-udev-warning.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.8-udev-warning.patch
rename to xorg-x11-server/patches/xserver-1.8-udev-warning.patch
diff --git a/pkgs/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch b/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
similarity index 100%
rename from pkgs/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
rename to xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
diff --git a/pkgs/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
similarity index 100%
rename from pkgs/xorg-x11-server/xorg-x11-server.nm
rename to xorg-x11-server/xorg-x11-server.nm
diff --git a/pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm b/xorg-x11-util-macros/xorg-x11-util-macros.nm
similarity index 100%
rename from pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm
rename to xorg-x11-util-macros/xorg-x11-util-macros.nm
diff --git a/pkgs/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm
similarity index 100%
rename from pkgs/xorg-x11-xinit/xorg-x11-xinit.nm
rename to xorg-x11-xinit/xorg-x11-xinit.nm
diff --git a/pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
similarity index 100%
rename from pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
rename to xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
diff --git a/pkgs/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch b/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
similarity index 100%
rename from pkgs/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
rename to xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
diff --git a/pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
similarity index 100%
rename from pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
rename to xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
diff --git a/pkgs/xrandr/xrandr.nm b/xrandr/xrandr.nm
similarity index 100%
rename from pkgs/xrandr/xrandr.nm
rename to xrandr/xrandr.nm
diff --git a/pkgs/xterm/patches/xterm-245-resources.patch b/xterm/patches/xterm-245-resources.patch
similarity index 100%
rename from pkgs/xterm/patches/xterm-245-resources.patch
rename to xterm/patches/xterm-245-resources.patch
diff --git a/pkgs/xterm/patches/xterm-256-man-page_paths.patch b/xterm/patches/xterm-256-man-page_paths.patch
similarity index 100%
rename from pkgs/xterm/patches/xterm-256-man-page_paths.patch
rename to xterm/patches/xterm-256-man-page_paths.patch
diff --git a/pkgs/xterm/patches/xterm-261-desk.patch b/xterm/patches/xterm-261-desk.patch
similarity index 100%
rename from pkgs/xterm/patches/xterm-261-desk.patch
rename to xterm/patches/xterm-261-desk.patch
diff --git a/pkgs/xterm/xterm.nm b/xterm/xterm.nm
similarity index 100%
rename from pkgs/xterm/xterm.nm
rename to xterm/xterm.nm
diff --git a/pkgs/xz/xz.nm b/xz/xz.nm
similarity index 100%
rename from pkgs/xz/xz.nm
rename to xz/xz.nm
diff --git a/pkgs/zerofree/zerofree.nm b/zerofree/zerofree.nm
similarity index 100%
rename from pkgs/zerofree/zerofree.nm
rename to zerofree/zerofree.nm
diff --git a/pkgs/zlib/zlib.nm b/zlib/zlib.nm
similarity index 100%
rename from pkgs/zlib/zlib.nm
rename to zlib/zlib.nm
-- 
2.39.2