Move packages to pkgs subdirectory.

diff --git a/pkgs/core/X11vnc/X11vnc.nm b/pkgs/X11vnc/X11vnc.nm
similarity index 100%
rename from pkgs/core/X11vnc/X11vnc.nm
rename to pkgs/X11vnc/X11vnc.nm

diff --git a/pkgs/core/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch b/pkgs/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
similarity index 100%
rename from pkgs/core/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch
rename to pkgs/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch

diff --git a/pkgs/core/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch b/pkgs/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
similarity index 100%
rename from pkgs/core/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch
rename to pkgs/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch

diff --git a/pkgs/core/acl/acl.nm b/pkgs/acl/acl.nm
similarity index 100%
rename from pkgs/core/acl/acl.nm
rename to pkgs/acl/acl.nm

diff --git a/pkgs/core/acl/patches/acl-2.2.47-build-1.patch b/pkgs/acl/patches/acl-2.2.47-build-1.patch
similarity index 100%
rename from pkgs/core/acl/patches/acl-2.2.47-build-1.patch
rename to pkgs/acl/patches/acl-2.2.47-build-1.patch

diff --git a/pkgs/core/acl/patches/acl-2.2.47-exitcode.patch b/pkgs/acl/patches/acl-2.2.47-exitcode.patch
similarity index 100%
rename from pkgs/core/acl/patches/acl-2.2.47-exitcode.patch
rename to pkgs/acl/patches/acl-2.2.47-exitcode.patch

diff --git a/pkgs/core/acl/patches/acl-2.2.47-nfs4.patch b/pkgs/acl/patches/acl-2.2.47-nfs4.patch
similarity index 100%
rename from pkgs/core/acl/patches/acl-2.2.47-nfs4.patch
rename to pkgs/acl/patches/acl-2.2.47-nfs4.patch

diff --git a/pkgs/core/acl/patches/acl-2.2.47-params.patch b/pkgs/acl/patches/acl-2.2.47-params.patch
similarity index 100%
rename from pkgs/core/acl/patches/acl-2.2.47-params.patch
rename to pkgs/acl/patches/acl-2.2.47-params.patch

diff --git a/pkgs/core/acl/patches/acl-2.2.47-path_max.patch b/pkgs/acl/patches/acl-2.2.47-path_max.patch
similarity index 100%
rename from pkgs/core/acl/patches/acl-2.2.47-path_max.patch
rename to pkgs/acl/patches/acl-2.2.47-path_max.patch

diff --git a/pkgs/core/acl/patches/acl-2.2.47-segfault.patch b/pkgs/acl/patches/acl-2.2.47-segfault.patch
similarity index 100%
rename from pkgs/core/acl/patches/acl-2.2.47-segfault.patch
rename to pkgs/acl/patches/acl-2.2.47-segfault.patch

diff --git a/pkgs/core/acl/patches/acl-2.2.47-walk.patch.broken b/pkgs/acl/patches/acl-2.2.47-walk.patch.broken
similarity index 100%
rename from pkgs/core/acl/patches/acl-2.2.47-walk.patch.broken
rename to pkgs/acl/patches/acl-2.2.47-walk.patch.broken

diff --git a/pkgs/core/acpid/acpid.init b/pkgs/acpid/acpid.init
similarity index 100%
rename from pkgs/core/acpid/acpid.init
rename to pkgs/acpid/acpid.init

diff --git a/pkgs/core/acpid/acpid.nm b/pkgs/acpid/acpid.nm
similarity index 100%
rename from pkgs/core/acpid/acpid.nm
rename to pkgs/acpid/acpid.nm

diff --git a/pkgs/core/acpid/patches/acpid-2.0.2-makefile.patch b/pkgs/acpid/patches/acpid-2.0.2-makefile.patch
similarity index 100%
rename from pkgs/core/acpid/patches/acpid-2.0.2-makefile.patch
rename to pkgs/acpid/patches/acpid-2.0.2-makefile.patch

diff --git a/pkgs/core/acpid/power b/pkgs/acpid/power
similarity index 100%
rename from pkgs/core/acpid/power
rename to pkgs/acpid/power

diff --git a/pkgs/core/acpid/power.sh b/pkgs/acpid/power.sh
similarity index 100%
rename from pkgs/core/acpid/power.sh
rename to pkgs/acpid/power.sh

diff --git a/pkgs/core/aiccu/aiccu.nm b/pkgs/aiccu/aiccu.nm
similarity index 100%
rename from pkgs/core/aiccu/aiccu.nm
rename to pkgs/aiccu/aiccu.nm

diff --git a/pkgs/core/attr/attr.nm b/pkgs/attr/attr.nm
similarity index 100%
rename from pkgs/core/attr/attr.nm
rename to pkgs/attr/attr.nm

diff --git a/pkgs/core/audit/audit.nm b/pkgs/audit/audit.nm
similarity index 100%
rename from pkgs/core/audit/audit.nm
rename to pkgs/audit/audit.nm

diff --git a/pkgs/core/autoconf/autoconf.nm b/pkgs/autoconf/autoconf.nm
similarity index 100%
rename from pkgs/core/autoconf/autoconf.nm
rename to pkgs/autoconf/autoconf.nm

diff --git a/pkgs/core/autogen/autogen.nm b/pkgs/autogen/autogen.nm
similarity index 100%
rename from pkgs/core/autogen/autogen.nm
rename to pkgs/autogen/autogen.nm

diff --git a/pkgs/core/autogen/patches/autogen-5.9.4-autoopts-config.patch b/pkgs/autogen/patches/autogen-5.9.4-autoopts-config.patch
similarity index 100%
rename from pkgs/core/autogen/patches/autogen-5.9.4-autoopts-config.patch
rename to pkgs/autogen/patches/autogen-5.9.4-autoopts-config.patch

diff --git a/pkgs/core/autogen/patches/autogen-5.9.4-pkgconfig.patch b/pkgs/autogen/patches/autogen-5.9.4-pkgconfig.patch
similarity index 100%
rename from pkgs/core/autogen/patches/autogen-5.9.4-pkgconfig.patch
rename to pkgs/autogen/patches/autogen-5.9.4-pkgconfig.patch

diff --git a/pkgs/core/automake/automake.nm b/pkgs/automake/automake.nm
similarity index 100%
rename from pkgs/core/automake/automake.nm
rename to pkgs/automake/automake.nm

diff --git a/pkgs/core/avahi/avahi.nm b/pkgs/avahi/avahi.nm
similarity index 100%
rename from pkgs/core/avahi/avahi.nm
rename to pkgs/avahi/avahi.nm

diff --git a/pkgs/core/basesystem/basesystem.nm b/pkgs/basesystem/basesystem.nm
similarity index 100%
rename from pkgs/core/basesystem/basesystem.nm
rename to pkgs/basesystem/basesystem.nm

diff --git a/pkgs/core/basesystem/resolv.conf b/pkgs/basesystem/resolv.conf
similarity index 100%
rename from pkgs/core/basesystem/resolv.conf
rename to pkgs/basesystem/resolv.conf

diff --git a/pkgs/core/bash/bash.nm b/pkgs/bash/bash.nm
similarity index 100%
rename from pkgs/core/bash/bash.nm
rename to pkgs/bash/bash.nm

diff --git a/pkgs/core/bash/bashrc b/pkgs/bash/bashrc
similarity index 100%
rename from pkgs/core/bash/bashrc
rename to pkgs/bash/bashrc

diff --git a/pkgs/core/bash/dot_bash_logout b/pkgs/bash/dot_bash_logout
similarity index 100%
rename from pkgs/core/bash/dot_bash_logout
rename to pkgs/bash/dot_bash_logout

diff --git a/pkgs/core/bash/dot_bash_profile b/pkgs/bash/dot_bash_profile
similarity index 100%
rename from pkgs/core/bash/dot_bash_profile
rename to pkgs/bash/dot_bash_profile

diff --git a/pkgs/core/bash/dot_bashrc b/pkgs/bash/dot_bashrc
similarity index 100%
rename from pkgs/core/bash/dot_bashrc
rename to pkgs/bash/dot_bashrc

diff --git a/pkgs/core/bash/patches/bash-4.0-paths-1.patch b/pkgs/bash/patches/bash-4.0-paths-1.patch
similarity index 100%
rename from pkgs/core/bash/patches/bash-4.0-paths-1.patch
rename to pkgs/bash/patches/bash-4.0-paths-1.patch

diff --git a/pkgs/core/bash/patches/bash-4.0-profile-1.patch b/pkgs/bash/patches/bash-4.0-profile-1.patch
similarity index 100%
rename from pkgs/core/bash/patches/bash-4.0-profile-1.patch
rename to pkgs/bash/patches/bash-4.0-profile-1.patch

diff --git a/pkgs/core/bash/profile b/pkgs/bash/profile
similarity index 100%
rename from pkgs/core/bash/profile
rename to pkgs/bash/profile

diff --git a/pkgs/core/bash/profile.d/i18n.sh b/pkgs/bash/profile.d/i18n.sh
similarity index 100%
rename from pkgs/core/bash/profile.d/i18n.sh
rename to pkgs/bash/profile.d/i18n.sh

diff --git a/pkgs/core/bash/profile.d/lang.sh b/pkgs/bash/profile.d/lang.sh
similarity index 100%
rename from pkgs/core/bash/profile.d/lang.sh
rename to pkgs/bash/profile.d/lang.sh

diff --git a/pkgs/core/bash/shells b/pkgs/bash/shells
similarity index 100%
rename from pkgs/core/bash/shells
rename to pkgs/bash/shells

diff --git a/pkgs/core/bc/bc.nm b/pkgs/bc/bc.nm
similarity index 100%
rename from pkgs/core/bc/bc.nm
rename to pkgs/bc/bc.nm

diff --git a/pkgs/core/beep/beep.nm b/pkgs/beep/beep.nm
similarity index 100%
rename from pkgs/core/beep/beep.nm
rename to pkgs/beep/beep.nm

diff --git a/pkgs/core/bind/bind.nm b/pkgs/bind/bind.nm
similarity index 100%
rename from pkgs/core/bind/bind.nm
rename to pkgs/bind/bind.nm

diff --git a/pkgs/core/binutils/binutils.nm b/pkgs/binutils/binutils.nm
similarity index 100%
rename from pkgs/core/binutils/binutils.nm
rename to pkgs/binutils/binutils.nm

diff --git a/pkgs/core/binutils/patches/binutils-2.19.1-asprintf_fix.patch b/pkgs/binutils/patches/binutils-2.19.1-asprintf_fix.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.19.1-asprintf_fix.patch
rename to pkgs/binutils/patches/binutils-2.19.1-asprintf_fix.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.19.1-ld_makefile.patch b/pkgs/binutils/patches/binutils-2.19.1-ld_makefile.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.19.1-ld_makefile.patch
rename to pkgs/binutils/patches/binutils-2.19.1-ld_makefile.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20-ipfire-ld-elf-1.patch b/pkgs/binutils/patches/binutils-2.20-ipfire-ld-elf-1.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20-ipfire-ld-elf-1.patch
rename to pkgs/binutils/patches/binutils-2.20-ipfire-ld-elf-1.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20-objcopy.patch b/pkgs/binutils/patches/binutils-2.20-objcopy.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20-objcopy.patch
rename to pkgs/binutils/patches/binutils-2.20-objcopy.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20-pt_pax-1.patch b/pkgs/binutils/patches/binutils-2.20-pt_pax-1.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20-pt_pax-1.patch
rename to pkgs/binutils/patches/binutils-2.20-pt_pax-1.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch b/pkgs/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch
rename to pkgs/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch b/pkgs/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch
rename to pkgs/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch b/pkgs/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch
rename to pkgs/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-use-relro.patch b/pkgs/binutils/patches/binutils-2.20.1-gentoo-use-relro.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20.1-gentoo-use-relro.patch
rename to pkgs/binutils/patches/binutils-2.20.1-gentoo-use-relro.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch b/pkgs/binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch
rename to pkgs/binutils/patches/binutils-2.20.1-gentoo-warn-textrel.patch

diff --git a/pkgs/core/binutils/patches/binutils-2.20.51.0.2-build-id.patch b/pkgs/binutils/patches/binutils-2.20.51.0.2-build-id.patch
similarity index 100%
rename from pkgs/core/binutils/patches/binutils-2.20.51.0.2-build-id.patch
rename to pkgs/binutils/patches/binutils-2.20.51.0.2-build-id.patch

diff --git a/pkgs/core/bison/bison.nm b/pkgs/bison/bison.nm
similarity index 100%
rename from pkgs/core/bison/bison.nm
rename to pkgs/bison/bison.nm

diff --git a/pkgs/core/boost/boost.nm b/pkgs/boost/boost.nm
similarity index 100%
rename from pkgs/core/boost/boost.nm
rename to pkgs/boost/boost.nm

diff --git a/pkgs/core/boost/patches/boost-1.41.0-iostreams-zlib.patch b/pkgs/boost/patches/boost-1.41.0-iostreams-zlib.patch
similarity index 100%
rename from pkgs/core/boost/patches/boost-1.41.0-iostreams-zlib.patch
rename to pkgs/boost/patches/boost-1.41.0-iostreams-zlib.patch

diff --git a/pkgs/core/boost/patches/boost-1.41.0-mapnik.patch b/pkgs/boost/patches/boost-1.41.0-mapnik.patch
similarity index 100%
rename from pkgs/core/boost/patches/boost-1.41.0-mapnik.patch
rename to pkgs/boost/patches/boost-1.41.0-mapnik.patch

diff --git a/pkgs/core/boost/patches/boost-1.41.0-shared_ptr_serialization.patch b/pkgs/boost/patches/boost-1.41.0-shared_ptr_serialization.patch
similarity index 100%
rename from pkgs/core/boost/patches/boost-1.41.0-shared_ptr_serialization.patch
rename to pkgs/boost/patches/boost-1.41.0-shared_ptr_serialization.patch

diff --git a/pkgs/core/boost/patches/boost-graph-compile.patch b/pkgs/boost/patches/boost-graph-compile.patch
similarity index 100%
rename from pkgs/core/boost/patches/boost-graph-compile.patch
rename to pkgs/boost/patches/boost-graph-compile.patch

diff --git a/pkgs/core/bootchart2/bootchart2.nm b/pkgs/bootchart2/bootchart2.nm
similarity index 100%
rename from pkgs/core/bootchart2/bootchart2.nm
rename to pkgs/bootchart2/bootchart2.nm

diff --git a/pkgs/core/br2684ctl/br2684ctl.nm b/pkgs/br2684ctl/br2684ctl.nm
similarity index 100%
rename from pkgs/core/br2684ctl/br2684ctl.nm
rename to pkgs/br2684ctl/br2684ctl.nm

diff --git a/pkgs/core/bridge-utils/bridge-utils.nm b/pkgs/bridge-utils/bridge-utils.nm
similarity index 100%
rename from pkgs/core/bridge-utils/bridge-utils.nm
rename to pkgs/bridge-utils/bridge-utils.nm

diff --git a/pkgs/core/btrfs-progs/btrfs-progs.nm b/pkgs/btrfs-progs/btrfs-progs.nm
similarity index 100%
rename from pkgs/core/btrfs-progs/btrfs-progs.nm
rename to pkgs/btrfs-progs/btrfs-progs.nm

diff --git a/pkgs/core/btrfs-progs/patches/btrfs-progs-build-fixes.patch b/pkgs/btrfs-progs/patches/btrfs-progs-build-fixes.patch
similarity index 100%
rename from pkgs/core/btrfs-progs/patches/btrfs-progs-build-fixes.patch
rename to pkgs/btrfs-progs/patches/btrfs-progs-build-fixes.patch

diff --git a/pkgs/core/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
similarity index 100%
rename from pkgs/core/build-essentials/build-essentials.nm
rename to pkgs/build-essentials/build-essentials.nm

diff --git a/pkgs/core/build-essentials/buildsystem-tools/chroot-shell b/pkgs/build-essentials/buildsystem-tools/chroot-shell
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/chroot-shell
rename to pkgs/build-essentials/buildsystem-tools/chroot-shell

diff --git a/pkgs/core/build-essentials/buildsystem-tools/common-functions b/pkgs/build-essentials/buildsystem-tools/common-functions
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/common-functions
rename to pkgs/build-essentials/buildsystem-tools/common-functions

diff --git a/pkgs/core/build-essentials/buildsystem-tools/dependency-tracker b/pkgs/build-essentials/buildsystem-tools/dependency-tracker
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/dependency-tracker
rename to pkgs/build-essentials/buildsystem-tools/dependency-tracker

diff --git a/pkgs/core/build-essentials/buildsystem-tools/functions-common b/pkgs/build-essentials/buildsystem-tools/functions-common
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/functions-common
rename to pkgs/build-essentials/buildsystem-tools/functions-common

diff --git a/pkgs/core/build-essentials/buildsystem-tools/functions-constants b/pkgs/build-essentials/buildsystem-tools/functions-constants
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/functions-constants
rename to pkgs/build-essentials/buildsystem-tools/functions-constants

diff --git a/pkgs/core/build-essentials/buildsystem-tools/functions-directories b/pkgs/build-essentials/buildsystem-tools/functions-directories
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/functions-directories
rename to pkgs/build-essentials/buildsystem-tools/functions-directories

diff --git a/pkgs/core/build-essentials/buildsystem-tools/functions-files b/pkgs/build-essentials/buildsystem-tools/functions-files
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/functions-files
rename to pkgs/build-essentials/buildsystem-tools/functions-files

diff --git a/pkgs/core/build-essentials/buildsystem-tools/functions-lists b/pkgs/build-essentials/buildsystem-tools/functions-lists
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/functions-lists
rename to pkgs/build-essentials/buildsystem-tools/functions-lists

diff --git a/pkgs/core/build-essentials/buildsystem-tools/functions-logging b/pkgs/build-essentials/buildsystem-tools/functions-logging
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/functions-logging
rename to pkgs/build-essentials/buildsystem-tools/functions-logging

diff --git a/pkgs/core/build-essentials/buildsystem-tools/functions-packager-find b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/functions-packager-find
rename to pkgs/build-essentials/buildsystem-tools/functions-packager-find

diff --git a/pkgs/core/build-essentials/buildsystem-tools/patch b/pkgs/build-essentials/buildsystem-tools/patch
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/patch
rename to pkgs/build-essentials/buildsystem-tools/patch

diff --git a/pkgs/core/build-essentials/buildsystem-tools/perl.prov b/pkgs/build-essentials/buildsystem-tools/perl.prov
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/perl.prov
rename to pkgs/build-essentials/buildsystem-tools/perl.prov

diff --git a/pkgs/core/build-essentials/buildsystem-tools/perl.req b/pkgs/build-essentials/buildsystem-tools/perl.req
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/perl.req
rename to pkgs/build-essentials/buildsystem-tools/perl.req

diff --git a/pkgs/core/build-essentials/buildsystem-tools/py-compile b/pkgs/build-essentials/buildsystem-tools/py-compile
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem-tools/py-compile
rename to pkgs/build-essentials/buildsystem-tools/py-compile

diff --git a/pkgs/core/build-essentials/buildsystem.sh b/pkgs/build-essentials/buildsystem.sh
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem.sh
rename to pkgs/build-essentials/buildsystem.sh

diff --git a/pkgs/core/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem/Constants
rename to pkgs/build-essentials/buildsystem/Constants

diff --git a/pkgs/core/build-essentials/buildsystem/Functions b/pkgs/build-essentials/buildsystem/Functions
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem/Functions
rename to pkgs/build-essentials/buildsystem/Functions

diff --git a/pkgs/core/build-essentials/buildsystem/Include b/pkgs/build-essentials/buildsystem/Include
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem/Include
rename to pkgs/build-essentials/buildsystem/Include

diff --git a/pkgs/core/build-essentials/buildsystem/Targets b/pkgs/build-essentials/buildsystem/Targets
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem/Targets
rename to pkgs/build-essentials/buildsystem/Targets

diff --git a/pkgs/core/build-essentials/buildsystem/Templates b/pkgs/build-essentials/buildsystem/Templates
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem/Templates
rename to pkgs/build-essentials/buildsystem/Templates

diff --git a/pkgs/core/build-essentials/buildsystem/__gmsl b/pkgs/build-essentials/buildsystem/__gmsl
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem/__gmsl
rename to pkgs/build-essentials/buildsystem/__gmsl

diff --git a/pkgs/core/build-essentials/buildsystem/gmsl b/pkgs/build-essentials/buildsystem/gmsl
similarity index 100%
rename from pkgs/core/build-essentials/buildsystem/gmsl
rename to pkgs/build-essentials/buildsystem/gmsl

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent b/pkgs/build-essentials/quality-agent/quality-agent
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent
rename to pkgs/build-essentials/quality-agent/quality-agent

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/001-include-files b/pkgs/build-essentials/quality-agent/quality-agent.d/001-include-files
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/001-include-files
rename to pkgs/build-essentials/quality-agent/quality-agent.d/001-include-files

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/001-remove-info-files b/pkgs/build-essentials/quality-agent/quality-agent.d/001-remove-info-files
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/001-remove-info-files
rename to pkgs/build-essentials/quality-agent/quality-agent.d/001-remove-info-files

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/001-remove-static-libs b/pkgs/build-essentials/quality-agent/quality-agent.d/001-remove-static-libs
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/001-remove-static-libs
rename to pkgs/build-essentials/quality-agent/quality-agent.d/001-remove-static-libs

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/001-unsafe-files b/pkgs/build-essentials/quality-agent/quality-agent.d/001-unsafe-files
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/001-unsafe-files
rename to pkgs/build-essentials/quality-agent/quality-agent.d/001-unsafe-files

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks b/pkgs/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks
rename to pkgs/build-essentials/quality-agent/quality-agent.d/002-bad-symlinks

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/003-libs-location b/pkgs/build-essentials/quality-agent/quality-agent.d/003-libs-location
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/003-libs-location
rename to pkgs/build-essentials/quality-agent/quality-agent.d/003-libs-location

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-canary b/pkgs/build-essentials/quality-agent/quality-agent.d/050-canary
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-canary
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-canary

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-execstacks b/pkgs/build-essentials/quality-agent/quality-agent.d/050-execstacks
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-execstacks
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-execstacks

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-invalid-interpreters b/pkgs/build-essentials/quality-agent/quality-agent.d/050-invalid-interpreters
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-invalid-interpreters
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-invalid-interpreters

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-libs-needed b/pkgs/build-essentials/quality-agent/quality-agent.d/050-libs-needed
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-libs-needed
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-libs-needed

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-libs-soname b/pkgs/build-essentials/quality-agent/quality-agent.d/050-libs-soname
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-libs-soname
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-libs-soname

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-nx b/pkgs/build-essentials/quality-agent/quality-agent.d/050-nx
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-nx
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-nx

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-relro b/pkgs/build-essentials/quality-agent/quality-agent.d/050-relro
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-relro
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-relro

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-root-links-to-usr b/pkgs/build-essentials/quality-agent/quality-agent.d/050-root-links-to-usr
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-root-links-to-usr
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-root-links-to-usr

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/050-rpaths b/pkgs/build-essentials/quality-agent/quality-agent.d/050-rpaths
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/050-rpaths
rename to pkgs/build-essentials/quality-agent/quality-agent.d/050-rpaths

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/090-man-pages b/pkgs/build-essentials/quality-agent/quality-agent.d/090-man-pages
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/090-man-pages
rename to pkgs/build-essentials/quality-agent/quality-agent.d/090-man-pages

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/090-python-hardlinks b/pkgs/build-essentials/quality-agent/quality-agent.d/090-python-hardlinks
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/090-python-hardlinks
rename to pkgs/build-essentials/quality-agent/quality-agent.d/090-python-hardlinks

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/090-remove-empty-dirs b/pkgs/build-essentials/quality-agent/quality-agent.d/090-remove-empty-dirs
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/090-remove-empty-dirs
rename to pkgs/build-essentials/quality-agent/quality-agent.d/090-remove-empty-dirs

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/095-directory-layout b/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/095-directory-layout
rename to pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/099-strip b/pkgs/build-essentials/quality-agent/quality-agent.d/099-strip
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/099-strip
rename to pkgs/build-essentials/quality-agent/quality-agent.d/099-strip

diff --git a/pkgs/core/build-essentials/quality-agent/quality-agent.d/qa-include b/pkgs/build-essentials/quality-agent/quality-agent.d/qa-include
similarity index 100%
rename from pkgs/core/build-essentials/quality-agent/quality-agent.d/qa-include
rename to pkgs/build-essentials/quality-agent/quality-agent.d/qa-include

diff --git a/pkgs/core/bwm-ng/bwm-ng.nm b/pkgs/bwm-ng/bwm-ng.nm
similarity index 100%
rename from pkgs/core/bwm-ng/bwm-ng.nm
rename to pkgs/bwm-ng/bwm-ng.nm

diff --git a/pkgs/core/bzip2/bzip2.nm b/pkgs/bzip2/bzip2.nm
similarity index 100%
rename from pkgs/core/bzip2/bzip2.nm
rename to pkgs/bzip2/bzip2.nm

diff --git a/pkgs/core/bzip2/patches/bzip2-1.0.5-install_docs-1.patch b/pkgs/bzip2/patches/bzip2-1.0.5-install_docs-1.patch
similarity index 100%
rename from pkgs/core/bzip2/patches/bzip2-1.0.5-install_docs-1.patch
rename to pkgs/bzip2/patches/bzip2-1.0.5-install_docs-1.patch

diff --git a/pkgs/core/cairo/cairo.nm b/pkgs/cairo/cairo.nm
similarity index 100%
rename from pkgs/core/cairo/cairo.nm
rename to pkgs/cairo/cairo.nm

diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/ccache/ccache.nm
similarity index 100%
rename from pkgs/core/ccache/ccache.nm
rename to pkgs/ccache/ccache.nm

diff --git a/pkgs/core/ccache/ccache.sh b/pkgs/ccache/ccache.sh
similarity index 100%
rename from pkgs/core/ccache/ccache.sh
rename to pkgs/ccache/ccache.sh

diff --git a/pkgs/core/cloog/cloog.nm b/pkgs/cloog/cloog.nm
similarity index 100%
rename from pkgs/core/cloog/cloog.nm
rename to pkgs/cloog/cloog.nm

diff --git a/pkgs/core/cmake/cmake.nm b/pkgs/cmake/cmake.nm
similarity index 100%
rename from pkgs/core/cmake/cmake.nm
rename to pkgs/cmake/cmake.nm

diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/coreutils/coreutils.nm
similarity index 100%
rename from pkgs/core/coreutils/coreutils.nm
rename to pkgs/coreutils/coreutils.nm

diff --git a/pkgs/core/coreutils/pam.d/su b/pkgs/coreutils/pam.d/su
similarity index 100%
rename from pkgs/core/coreutils/pam.d/su
rename to pkgs/coreutils/pam.d/su

diff --git a/pkgs/core/coreutils/pam.d/su-l b/pkgs/coreutils/pam.d/su-l
similarity index 100%
rename from pkgs/core/coreutils/pam.d/su-l
rename to pkgs/coreutils/pam.d/su-l

diff --git a/pkgs/core/coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off b/pkgs/coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off
similarity index 100%
rename from pkgs/core/coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off
rename to pkgs/coreutils/patches/coreutils-7.6-uname_PIC-1.patch.off

diff --git a/pkgs/core/coreutils/patches/coreutils-8.5-pam.patch b/pkgs/coreutils/patches/coreutils-8.5-pam.patch
similarity index 100%
rename from pkgs/core/coreutils/patches/coreutils-8.5-pam.patch
rename to pkgs/coreutils/patches/coreutils-8.5-pam.patch

diff --git a/pkgs/core/coreutils/patches/coreutils-i18n.patch b/pkgs/coreutils/patches/coreutils-i18n.patch
similarity index 100%
rename from pkgs/core/coreutils/patches/coreutils-i18n.patch
rename to pkgs/coreutils/patches/coreutils-i18n.patch

diff --git a/pkgs/core/coreutils/patches/coreutils-selinux.patch b/pkgs/coreutils/patches/coreutils-selinux.patch
similarity index 100%
rename from pkgs/core/coreutils/patches/coreutils-selinux.patch
rename to pkgs/coreutils/patches/coreutils-selinux.patch

diff --git a/pkgs/core/coreutils/patches/coreutils-selinuxmanpages.patch b/pkgs/coreutils/patches/coreutils-selinuxmanpages.patch
similarity index 100%
rename from pkgs/core/coreutils/patches/coreutils-selinuxmanpages.patch
rename to pkgs/coreutils/patches/coreutils-selinuxmanpages.patch

diff --git a/pkgs/core/coreutils/profile.d/colorls.sh b/pkgs/coreutils/profile.d/colorls.sh
similarity index 100%
rename from pkgs/core/coreutils/profile.d/colorls.sh
rename to pkgs/coreutils/profile.d/colorls.sh

diff --git a/pkgs/core/cpio/cpio.nm b/pkgs/cpio/cpio.nm
similarity index 100%
rename from pkgs/core/cpio/cpio.nm
rename to pkgs/cpio/cpio.nm

diff --git a/pkgs/core/cracklib/cracklib.nm b/pkgs/cracklib/cracklib.nm
similarity index 100%
rename from pkgs/core/cracklib/cracklib.nm
rename to pkgs/cracklib/cracklib.nm

diff --git a/pkgs/core/cryptsetup-luks/cryptsetup-luks.nm b/pkgs/cryptsetup-luks/cryptsetup-luks.nm
similarity index 100%
rename from pkgs/core/cryptsetup-luks/cryptsetup-luks.nm
rename to pkgs/cryptsetup-luks/cryptsetup-luks.nm

diff --git a/pkgs/core/cups/cups.init b/pkgs/cups/cups.init
similarity index 100%
rename from pkgs/core/cups/cups.init
rename to pkgs/cups/cups.init

diff --git a/pkgs/core/cups/cups.logrotate b/pkgs/cups/cups.logrotate
similarity index 100%
rename from pkgs/core/cups/cups.logrotate
rename to pkgs/cups/cups.logrotate

diff --git a/pkgs/core/cups/cups.nm b/pkgs/cups/cups.nm
similarity index 100%
rename from pkgs/core/cups/cups.nm
rename to pkgs/cups/cups.nm

diff --git a/pkgs/core/cups/patches/cups-0755.patch b/pkgs/cups/patches/cups-0755.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-0755.patch
rename to pkgs/cups/patches/cups-0755.patch

diff --git a/pkgs/core/cups/patches/cups-1.1.16-system-auth.patch b/pkgs/cups/patches/cups-1.1.16-system-auth.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-1.1.16-system-auth.patch
rename to pkgs/cups/patches/cups-1.1.16-system-auth.patch

diff --git a/pkgs/core/cups/patches/cups-EAI_AGAIN.patch b/pkgs/cups/patches/cups-EAI_AGAIN.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-EAI_AGAIN.patch
rename to pkgs/cups/patches/cups-EAI_AGAIN.patch

diff --git a/pkgs/core/cups/patches/cups-autotype-crash.patch b/pkgs/cups/patches/cups-autotype-crash.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-autotype-crash.patch
rename to pkgs/cups/patches/cups-autotype-crash.patch

diff --git a/pkgs/core/cups/patches/cups-avahi.patch b/pkgs/cups/patches/cups-avahi.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-avahi.patch
rename to pkgs/cups/patches/cups-avahi.patch

diff --git a/pkgs/core/cups/patches/cups-banners.patch b/pkgs/cups/patches/cups-banners.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-banners.patch
rename to pkgs/cups/patches/cups-banners.patch

diff --git a/pkgs/core/cups/patches/cups-build.patch b/pkgs/cups/patches/cups-build.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-build.patch
rename to pkgs/cups/patches/cups-build.patch

diff --git a/pkgs/core/cups/patches/cups-cups-get-classes.patch b/pkgs/cups/patches/cups-cups-get-classes.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-cups-get-classes.patch
rename to pkgs/cups/patches/cups-cups-get-classes.patch

diff --git a/pkgs/core/cups/patches/cups-direct-usb.patch b/pkgs/cups/patches/cups-direct-usb.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-direct-usb.patch
rename to pkgs/cups/patches/cups-direct-usb.patch

diff --git a/pkgs/core/cups/patches/cups-dnssd-deviceid.patch b/pkgs/cups/patches/cups-dnssd-deviceid.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-dnssd-deviceid.patch
rename to pkgs/cups/patches/cups-dnssd-deviceid.patch

diff --git a/pkgs/core/cups/patches/cups-driverd-timeout.patch b/pkgs/cups/patches/cups-driverd-timeout.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-driverd-timeout.patch
rename to pkgs/cups/patches/cups-driverd-timeout.patch

diff --git a/pkgs/core/cups/patches/cups-eggcups.patch b/pkgs/cups/patches/cups-eggcups.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-eggcups.patch
rename to pkgs/cups/patches/cups-eggcups.patch

diff --git a/pkgs/core/cups/patches/cups-filter-debug.patch b/pkgs/cups/patches/cups-filter-debug.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-filter-debug.patch
rename to pkgs/cups/patches/cups-filter-debug.patch

diff --git a/pkgs/core/cups/patches/cups-force-gnutls.patch b/pkgs/cups/patches/cups-force-gnutls.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-force-gnutls.patch
rename to pkgs/cups/patches/cups-force-gnutls.patch

diff --git a/pkgs/core/cups/patches/cups-getpass.patch b/pkgs/cups/patches/cups-getpass.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-getpass.patch
rename to pkgs/cups/patches/cups-getpass.patch

diff --git a/pkgs/core/cups/patches/cups-hostnamelookups.patch b/pkgs/cups/patches/cups-hostnamelookups.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-hostnamelookups.patch
rename to pkgs/cups/patches/cups-hostnamelookups.patch

diff --git a/pkgs/core/cups/patches/cups-hp-deviceid-oid.patch b/pkgs/cups/patches/cups-hp-deviceid-oid.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-hp-deviceid-oid.patch
rename to pkgs/cups/patches/cups-hp-deviceid-oid.patch

diff --git a/pkgs/core/cups/patches/cups-logrotate.patch b/pkgs/cups/patches/cups-logrotate.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-logrotate.patch
rename to pkgs/cups/patches/cups-logrotate.patch

diff --git a/pkgs/core/cups/patches/cups-lpr-help.patch b/pkgs/cups/patches/cups-lpr-help.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-lpr-help.patch
rename to pkgs/cups/patches/cups-lpr-help.patch

diff --git a/pkgs/core/cups/patches/cups-multilib.patch b/pkgs/cups/patches/cups-multilib.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-multilib.patch
rename to pkgs/cups/patches/cups-multilib.patch

diff --git a/pkgs/core/cups/patches/cups-no-export-ssllibs.patch b/pkgs/cups/patches/cups-no-export-ssllibs.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-no-export-ssllibs.patch
rename to pkgs/cups/patches/cups-no-export-ssllibs.patch

diff --git a/pkgs/core/cups/patches/cups-no-gzip-man.patch b/pkgs/cups/patches/cups-no-gzip-man.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-no-gzip-man.patch
rename to pkgs/cups/patches/cups-no-gzip-man.patch

diff --git a/pkgs/core/cups/patches/cups-page-label.patch b/pkgs/cups/patches/cups-page-label.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-page-label.patch
rename to pkgs/cups/patches/cups-page-label.patch

diff --git a/pkgs/core/cups/patches/cups-peercred.patch b/pkgs/cups/patches/cups-peercred.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-peercred.patch
rename to pkgs/cups/patches/cups-peercred.patch

diff --git a/pkgs/core/cups/patches/cups-pid.patch b/pkgs/cups/patches/cups-pid.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-pid.patch
rename to pkgs/cups/patches/cups-pid.patch

diff --git a/pkgs/core/cups/patches/cups-res_init.patch b/pkgs/cups/patches/cups-res_init.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-res_init.patch
rename to pkgs/cups/patches/cups-res_init.patch

diff --git a/pkgs/core/cups/patches/cups-ricoh-deviceid-oid.patch b/pkgs/cups/patches/cups-ricoh-deviceid-oid.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-ricoh-deviceid-oid.patch
rename to pkgs/cups/patches/cups-ricoh-deviceid-oid.patch

diff --git a/pkgs/core/cups/patches/cups-serial.patch b/pkgs/cups/patches/cups-serial.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-serial.patch
rename to pkgs/cups/patches/cups-serial.patch

diff --git a/pkgs/core/cups/patches/cups-serialize-gnutls.patch b/pkgs/cups/patches/cups-serialize-gnutls.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-serialize-gnutls.patch
rename to pkgs/cups/patches/cups-serialize-gnutls.patch

diff --git a/pkgs/core/cups/patches/cups-serverbin-compat.patch b/pkgs/cups/patches/cups-serverbin-compat.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-serverbin-compat.patch
rename to pkgs/cups/patches/cups-serverbin-compat.patch

diff --git a/pkgs/core/cups/patches/cups-snmp-quirks.patch b/pkgs/cups/patches/cups-snmp-quirks.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-snmp-quirks.patch
rename to pkgs/cups/patches/cups-snmp-quirks.patch

diff --git a/pkgs/core/cups/patches/cups-str3382.patch b/pkgs/cups/patches/cups-str3382.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-str3382.patch
rename to pkgs/cups/patches/cups-str3382.patch

diff --git a/pkgs/core/cups/patches/cups-str3754.patch b/pkgs/cups/patches/cups-str3754.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-str3754.patch
rename to pkgs/cups/patches/cups-str3754.patch

diff --git a/pkgs/core/cups/patches/cups-strict-ppd-line-length.patch b/pkgs/cups/patches/cups-strict-ppd-line-length.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-strict-ppd-line-length.patch
rename to pkgs/cups/patches/cups-strict-ppd-line-length.patch

diff --git a/pkgs/core/cups/patches/cups-texttops-rotate-page.patch b/pkgs/cups/patches/cups-texttops-rotate-page.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-texttops-rotate-page.patch
rename to pkgs/cups/patches/cups-texttops-rotate-page.patch

diff --git a/pkgs/core/cups/patches/cups-uri-compat.patch b/pkgs/cups/patches/cups-uri-compat.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-uri-compat.patch
rename to pkgs/cups/patches/cups-uri-compat.patch

diff --git a/pkgs/core/cups/patches/cups-usb-paperout.patch b/pkgs/cups/patches/cups-usb-paperout.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-usb-paperout.patch
rename to pkgs/cups/patches/cups-usb-paperout.patch

diff --git a/pkgs/core/cups/patches/cups-x-lspp.patch b/pkgs/cups/patches/cups-x-lspp.patch
similarity index 100%
rename from pkgs/core/cups/patches/cups-x-lspp.patch
rename to pkgs/cups/patches/cups-x-lspp.patch

diff --git a/pkgs/core/curl/curl.nm b/pkgs/curl/curl.nm
similarity index 100%
rename from pkgs/core/curl/curl.nm
rename to pkgs/curl/curl.nm

diff --git a/pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch b/pkgs/curl/patches/0101-curl-7.21.1-multilib.patch
similarity index 100%
rename from pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch
rename to pkgs/curl/patches/0101-curl-7.21.1-multilib.patch

diff --git a/pkgs/core/cyrus-sasl/cyrus-sasl.nm b/pkgs/cyrus-sasl/cyrus-sasl.nm
similarity index 100%
rename from pkgs/core/cyrus-sasl/cyrus-sasl.nm
rename to pkgs/cyrus-sasl/cyrus-sasl.nm

diff --git a/pkgs/core/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch b/pkgs/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
similarity index 100%
rename from pkgs/core/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
rename to pkgs/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch

diff --git a/pkgs/core/cyrus-sasl/smtpd.conf b/pkgs/cyrus-sasl/smtpd.conf
similarity index 100%
rename from pkgs/core/cyrus-sasl/smtpd.conf
rename to pkgs/cyrus-sasl/smtpd.conf

diff --git a/pkgs/core/dansguardian/dansguardian.nm b/pkgs/dansguardian/dansguardian.nm
similarity index 100%
rename from pkgs/core/dansguardian/dansguardian.nm
rename to pkgs/dansguardian/dansguardian.nm

diff --git a/pkgs/core/dansguardian/patches/dansguardian-gcc44.patch b/pkgs/dansguardian/patches/dansguardian-gcc44.patch
similarity index 100%
rename from pkgs/core/dansguardian/patches/dansguardian-gcc44.patch
rename to pkgs/dansguardian/patches/dansguardian-gcc44.patch

diff --git a/pkgs/core/db4/db4.nm b/pkgs/db4/db4.nm
similarity index 100%
rename from pkgs/core/db4/db4.nm
rename to pkgs/db4/db4.nm

diff --git a/pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch b/pkgs/db4/patches/db-4.7.25-upstream_fixes-1.patch
similarity index 100%
rename from pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch
rename to pkgs/db4/patches/db-4.7.25-upstream_fixes-1.patch

diff --git a/pkgs/core/dbus-glib/dbus-glib.nm b/pkgs/dbus-glib/dbus-glib.nm
similarity index 100%
rename from pkgs/core/dbus-glib/dbus-glib.nm
rename to pkgs/dbus-glib/dbus-glib.nm

diff --git a/pkgs/core/dbus/dbus.nm b/pkgs/dbus/dbus.nm
similarity index 100%
rename from pkgs/core/dbus/dbus.nm
rename to pkgs/dbus/dbus.nm

diff --git a/pkgs/core/dbus/messagebus.init b/pkgs/dbus/messagebus.init
similarity index 100%
rename from pkgs/core/dbus/messagebus.init
rename to pkgs/dbus/messagebus.init

diff --git a/pkgs/core/dejagnu/dejagnu.nm b/pkgs/dejagnu/dejagnu.nm
similarity index 100%
rename from pkgs/core/dejagnu/dejagnu.nm
rename to pkgs/dejagnu/dejagnu.nm

diff --git a/pkgs/core/dejagnu/patches/dejagnu-1.4.4-runtest.patch b/pkgs/dejagnu/patches/dejagnu-1.4.4-runtest.patch
similarity index 100%
rename from pkgs/core/dejagnu/patches/dejagnu-1.4.4-runtest.patch
rename to pkgs/dejagnu/patches/dejagnu-1.4.4-runtest.patch

diff --git a/pkgs/core/dejagnu/patches/dejagnu-1.4.4-smp-1.patch b/pkgs/dejagnu/patches/dejagnu-1.4.4-smp-1.patch
similarity index 100%
rename from pkgs/core/dejagnu/patches/dejagnu-1.4.4-smp-1.patch
rename to pkgs/dejagnu/patches/dejagnu-1.4.4-smp-1.patch

diff --git a/pkgs/core/dejagnu/patches/dejagnu-1.4.4-testsuite.patch b/pkgs/dejagnu/patches/dejagnu-1.4.4-testsuite.patch
similarity index 100%
rename from pkgs/core/dejagnu/patches/dejagnu-1.4.4-testsuite.patch
rename to pkgs/dejagnu/patches/dejagnu-1.4.4-testsuite.patch

diff --git a/pkgs/core/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch b/pkgs/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
similarity index 100%
rename from pkgs/core/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
rename to pkgs/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch

diff --git a/pkgs/core/dhcp/dhclient-script b/pkgs/dhcp/dhclient-script
similarity index 100%
rename from pkgs/core/dhcp/dhclient-script
rename to pkgs/dhcp/dhclient-script

diff --git a/pkgs/core/dhcp/dhcp.nm b/pkgs/dhcp/dhcp.nm
similarity index 100%
rename from pkgs/core/dhcp/dhcp.nm
rename to pkgs/dhcp/dhcp.nm

diff --git a/pkgs/core/diffutils/diffutils.nm b/pkgs/diffutils/diffutils.nm
similarity index 100%
rename from pkgs/core/diffutils/diffutils.nm
rename to pkgs/diffutils/diffutils.nm

diff --git a/pkgs/core/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch b/pkgs/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch
similarity index 100%
rename from pkgs/core/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch
rename to pkgs/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch

diff --git a/pkgs/core/diffutils/patches/diffutils-2.9-i18n-1.patch b/pkgs/diffutils/patches/diffutils-2.9-i18n-1.patch
similarity index 100%
rename from pkgs/core/diffutils/patches/diffutils-2.9-i18n-1.patch
rename to pkgs/diffutils/patches/diffutils-2.9-i18n-1.patch

diff --git a/pkgs/core/directfb/directfb.nm b/pkgs/directfb/directfb.nm
similarity index 100%
rename from pkgs/core/directfb/directfb.nm
rename to pkgs/directfb/directfb.nm

diff --git a/pkgs/core/dmidecode/dmidecode.nm b/pkgs/dmidecode/dmidecode.nm
similarity index 100%
rename from pkgs/core/dmidecode/dmidecode.nm
rename to pkgs/dmidecode/dmidecode.nm

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch b/pkgs/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
similarity index 100%
rename from pkgs/core/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
rename to pkgs/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch b/pkgs/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
similarity index 100%
rename from pkgs/core/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
rename to pkgs/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch b/pkgs/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
similarity index 100%
rename from pkgs/core/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
rename to pkgs/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch b/pkgs/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
similarity index 100%
rename from pkgs/core/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
rename to pkgs/dmidecode/patches/dmidecode-2.10-smbios-updates.patch

diff --git a/pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch b/pkgs/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
similarity index 100%
rename from pkgs/core/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
rename to pkgs/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch

diff --git a/pkgs/core/dmraid/dmraid.nm b/pkgs/dmraid/dmraid.nm
similarity index 100%
rename from pkgs/core/dmraid/dmraid.nm
rename to pkgs/dmraid/dmraid.nm

diff --git a/pkgs/core/dos2unix/dos2unix.nm b/pkgs/dos2unix/dos2unix.nm
similarity index 100%
rename from pkgs/core/dos2unix/dos2unix.nm
rename to pkgs/dos2unix/dos2unix.nm

diff --git a/pkgs/core/dosfstools/dosfstools.nm b/pkgs/dosfstools/dosfstools.nm
similarity index 100%
rename from pkgs/core/dosfstools/dosfstools.nm
rename to pkgs/dosfstools/dosfstools.nm

diff --git a/pkgs/core/dracut/dracut.nm b/pkgs/dracut/dracut.nm
similarity index 100%
rename from pkgs/core/dracut/dracut.nm
rename to pkgs/dracut/dracut.nm

diff --git a/pkgs/core/dvdrtools/dvdrtools.nm b/pkgs/dvdrtools/dvdrtools.nm
similarity index 100%
rename from pkgs/core/dvdrtools/dvdrtools.nm
rename to pkgs/dvdrtools/dvdrtools.nm

diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/e2fsprogs/e2fsprogs.nm
similarity index 100%
rename from pkgs/core/e2fsprogs/e2fsprogs.nm
rename to pkgs/e2fsprogs/e2fsprogs.nm

diff --git a/pkgs/core/ebtables/ebtables.nm b/pkgs/ebtables/ebtables.nm
similarity index 100%
rename from pkgs/core/ebtables/ebtables.nm
rename to pkgs/ebtables/ebtables.nm

diff --git a/pkgs/core/ebtables/patches/ebtables-2.0.8-cflags.patch b/pkgs/ebtables/patches/ebtables-2.0.8-cflags.patch
similarity index 100%
rename from pkgs/core/ebtables/patches/ebtables-2.0.8-cflags.patch
rename to pkgs/ebtables/patches/ebtables-2.0.8-cflags.patch

diff --git a/pkgs/core/ebtables/patches/ebtables-2.0.8-norootinst.patch b/pkgs/ebtables/patches/ebtables-2.0.8-norootinst.patch
similarity index 100%
rename from pkgs/core/ebtables/patches/ebtables-2.0.8-norootinst.patch
rename to pkgs/ebtables/patches/ebtables-2.0.8-norootinst.patch

diff --git a/pkgs/core/ebtables/patches/ebtables-2.0.9-lsb.patch b/pkgs/ebtables/patches/ebtables-2.0.9-lsb.patch
similarity index 100%
rename from pkgs/core/ebtables/patches/ebtables-2.0.9-lsb.patch
rename to pkgs/ebtables/patches/ebtables-2.0.9-lsb.patch

diff --git a/pkgs/core/eggdbus/eggdbus.nm b/pkgs/eggdbus/eggdbus.nm
similarity index 100%
rename from pkgs/core/eggdbus/eggdbus.nm
rename to pkgs/eggdbus/eggdbus.nm

diff --git a/pkgs/core/eject/eject.nm b/pkgs/eject/eject.nm
similarity index 100%
rename from pkgs/core/eject/eject.nm
rename to pkgs/eject/eject.nm

diff --git a/pkgs/core/eject/patches/eject-2.1.1-verbose.patch b/pkgs/eject/patches/eject-2.1.1-verbose.patch
similarity index 100%
rename from pkgs/core/eject/patches/eject-2.1.1-verbose.patch
rename to pkgs/eject/patches/eject-2.1.1-verbose.patch

diff --git a/pkgs/core/eject/patches/eject-2.1.5-lock.patch b/pkgs/eject/patches/eject-2.1.5-lock.patch
similarity index 100%
rename from pkgs/core/eject/patches/eject-2.1.5-lock.patch
rename to pkgs/eject/patches/eject-2.1.5-lock.patch

diff --git a/pkgs/core/eject/patches/eject-2.1.5-opendevice.patch b/pkgs/eject/patches/eject-2.1.5-opendevice.patch
similarity index 100%
rename from pkgs/core/eject/patches/eject-2.1.5-opendevice.patch
rename to pkgs/eject/patches/eject-2.1.5-opendevice.patch

diff --git a/pkgs/core/eject/patches/eject-2.1.5-spaces.patch b/pkgs/eject/patches/eject-2.1.5-spaces.patch
similarity index 100%
rename from pkgs/core/eject/patches/eject-2.1.5-spaces.patch
rename to pkgs/eject/patches/eject-2.1.5-spaces.patch

diff --git a/pkgs/core/eject/patches/eject-2.1.5-umount.patch b/pkgs/eject/patches/eject-2.1.5-umount.patch
similarity index 100%
rename from pkgs/core/eject/patches/eject-2.1.5-umount.patch
rename to pkgs/eject/patches/eject-2.1.5-umount.patch

diff --git a/pkgs/core/eject/patches/eject-timeout.patch b/pkgs/eject/patches/eject-timeout.patch
similarity index 100%
rename from pkgs/core/eject/patches/eject-timeout.patch
rename to pkgs/eject/patches/eject-timeout.patch

diff --git a/pkgs/core/elfutils/elfutils.nm b/pkgs/elfutils/elfutils.nm
similarity index 100%
rename from pkgs/core/elfutils/elfutils.nm
rename to pkgs/elfutils/elfutils.nm

diff --git a/pkgs/core/elfutils/patches/elfutils-robustify.patch b/pkgs/elfutils/patches/elfutils-robustify.patch
similarity index 100%
rename from pkgs/core/elfutils/patches/elfutils-robustify.patch
rename to pkgs/elfutils/patches/elfutils-robustify.patch

diff --git a/pkgs/core/etherwake/etherwake.nm b/pkgs/etherwake/etherwake.nm
similarity index 100%
rename from pkgs/core/etherwake/etherwake.nm
rename to pkgs/etherwake/etherwake.nm

diff --git a/pkgs/core/etherwake/patches/etherwake-1.09-install.patch b/pkgs/etherwake/patches/etherwake-1.09-install.patch
similarity index 100%
rename from pkgs/core/etherwake/patches/etherwake-1.09-install.patch
rename to pkgs/etherwake/patches/etherwake-1.09-install.patch

diff --git a/pkgs/core/ethtool/ethtool.nm b/pkgs/ethtool/ethtool.nm
similarity index 100%
rename from pkgs/core/ethtool/ethtool.nm
rename to pkgs/ethtool/ethtool.nm

diff --git a/pkgs/core/eventlog/eventlog.nm b/pkgs/eventlog/eventlog.nm
similarity index 100%
rename from pkgs/core/eventlog/eventlog.nm
rename to pkgs/eventlog/eventlog.nm

diff --git a/pkgs/core/expat/expat.nm b/pkgs/expat/expat.nm
similarity index 100%
rename from pkgs/core/expat/expat.nm
rename to pkgs/expat/expat.nm

diff --git a/pkgs/core/expect/expect.nm b/pkgs/expect/expect.nm
similarity index 100%
rename from pkgs/core/expect/expect.nm
rename to pkgs/expect/expect.nm

diff --git a/pkgs/core/expect/patches/expect-5.32.2-random.patch b/pkgs/expect/patches/expect-5.32.2-random.patch
similarity index 100%
rename from pkgs/core/expect/patches/expect-5.32.2-random.patch
rename to pkgs/expect/patches/expect-5.32.2-random.patch

diff --git a/pkgs/core/expect/patches/expect-5.38.0-lib-spec.patch b/pkgs/expect/patches/expect-5.38.0-lib-spec.patch
similarity index 100%
rename from pkgs/core/expect/patches/expect-5.38.0-lib-spec.patch
rename to pkgs/expect/patches/expect-5.38.0-lib-spec.patch

diff --git a/pkgs/core/expect/patches/expect-5.39.0-libdir.patch b/pkgs/expect/patches/expect-5.39.0-libdir.patch
similarity index 100%
rename from pkgs/core/expect/patches/expect-5.39.0-libdir.patch
rename to pkgs/expect/patches/expect-5.39.0-libdir.patch

diff --git a/pkgs/core/expect/patches/expect-5.43.0-override_default_prefix.patch b/pkgs/expect/patches/expect-5.43.0-override_default_prefix.patch
similarity index 100%
rename from pkgs/core/expect/patches/expect-5.43.0-override_default_prefix.patch
rename to pkgs/expect/patches/expect-5.43.0-override_default_prefix.patch

diff --git a/pkgs/core/expect/patches/expect-5.43.0-spawn-1.patch b/pkgs/expect/patches/expect-5.43.0-spawn-1.patch
similarity index 100%
rename from pkgs/core/expect/patches/expect-5.43.0-spawn-1.patch
rename to pkgs/expect/patches/expect-5.43.0-spawn-1.patch

diff --git a/pkgs/core/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch b/pkgs/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch
similarity index 100%
rename from pkgs/core/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch
rename to pkgs/expect/patches/expect-5.43.0-tcl_8.5.8_fix-1.patch

diff --git a/pkgs/core/ez-ipupdate/ez-ipupdate.nm b/pkgs/ez-ipupdate/ez-ipupdate.nm
similarity index 100%
rename from pkgs/core/ez-ipupdate/ez-ipupdate.nm
rename to pkgs/ez-ipupdate/ez-ipupdate.nm

diff --git a/pkgs/core/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch b/pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
similarity index 100%
rename from pkgs/core/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
rename to pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch

diff --git a/pkgs/core/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch b/pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
similarity index 100%
rename from pkgs/core/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
rename to pkgs/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch

diff --git a/pkgs/core/fail2ban/fail2ban.logrotate b/pkgs/fail2ban/fail2ban.logrotate
similarity index 100%
rename from pkgs/core/fail2ban/fail2ban.logrotate
rename to pkgs/fail2ban/fail2ban.logrotate

diff --git a/pkgs/core/fail2ban/fail2ban.nm b/pkgs/fail2ban/fail2ban.nm
similarity index 100%
rename from pkgs/core/fail2ban/fail2ban.nm
rename to pkgs/fail2ban/fail2ban.nm

diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.1-sshd.patch b/pkgs/fail2ban/patches/fail2ban-0.8.1-sshd.patch
similarity index 100%
rename from pkgs/core/fail2ban/patches/fail2ban-0.8.1-sshd.patch
rename to pkgs/fail2ban/patches/fail2ban-0.8.1-sshd.patch

diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch b/pkgs/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
similarity index 100%
rename from pkgs/core/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
rename to pkgs/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch

diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.3-init.patch b/pkgs/fail2ban/patches/fail2ban-0.8.3-init.patch
similarity index 100%
rename from pkgs/core/fail2ban/patches/fail2ban-0.8.3-init.patch
rename to pkgs/fail2ban/patches/fail2ban-0.8.3-init.patch

diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch b/pkgs/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
similarity index 100%
rename from pkgs/core/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
rename to pkgs/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch

diff --git a/pkgs/core/file/file.nm b/pkgs/file/file.nm
similarity index 100%
rename from pkgs/core/file/file.nm
rename to pkgs/file/file.nm

diff --git a/pkgs/core/findutils/findutils.nm b/pkgs/findutils/findutils.nm
similarity index 100%
rename from pkgs/core/findutils/findutils.nm
rename to pkgs/findutils/findutils.nm

diff --git a/pkgs/core/firewall/firewall-reload.init b/pkgs/firewall/firewall-reload.init
similarity index 100%
rename from pkgs/core/firewall/firewall-reload.init
rename to pkgs/firewall/firewall-reload.init

diff --git a/pkgs/core/firewall/firewall.init b/pkgs/firewall/firewall.init
similarity index 100%
rename from pkgs/core/firewall/firewall.init
rename to pkgs/firewall/firewall.init

diff --git a/pkgs/core/firewall/firewall.nm b/pkgs/firewall/firewall.nm
similarity index 100%
rename from pkgs/core/firewall/firewall.nm
rename to pkgs/firewall/firewall.nm

diff --git a/pkgs/core/firewall/src/firewall b/pkgs/firewall/src/firewall
similarity index 100%
rename from pkgs/core/firewall/src/firewall
rename to pkgs/firewall/src/firewall

diff --git a/pkgs/core/firewall/src/functions b/pkgs/firewall/src/functions
similarity index 100%
rename from pkgs/core/firewall/src/functions
rename to pkgs/firewall/src/functions

diff --git a/pkgs/core/firewall/src/functions.commands b/pkgs/firewall/src/functions.commands
similarity index 100%
rename from pkgs/core/firewall/src/functions.commands
rename to pkgs/firewall/src/functions.commands

diff --git a/pkgs/core/firewall/src/functions.config b/pkgs/firewall/src/functions.config
similarity index 100%
rename from pkgs/core/firewall/src/functions.config
rename to pkgs/firewall/src/functions.config

diff --git a/pkgs/core/firewall/src/functions.firewall b/pkgs/firewall/src/functions.firewall
similarity index 100%
rename from pkgs/core/firewall/src/functions.firewall
rename to pkgs/firewall/src/functions.firewall

diff --git a/pkgs/core/firewall/src/functions.ip b/pkgs/firewall/src/functions.ip
similarity index 100%
rename from pkgs/core/firewall/src/functions.ip
rename to pkgs/firewall/src/functions.ip

diff --git a/pkgs/core/firewall/src/functions.iptables b/pkgs/firewall/src/functions.iptables
similarity index 100%
rename from pkgs/core/firewall/src/functions.iptables
rename to pkgs/firewall/src/functions.iptables

diff --git a/pkgs/core/firewall/src/functions.macros b/pkgs/firewall/src/functions.macros
similarity index 100%
rename from pkgs/core/firewall/src/functions.macros
rename to pkgs/firewall/src/functions.macros

diff --git a/pkgs/core/firewall/src/functions.zones b/pkgs/firewall/src/functions.zones
similarity index 100%
rename from pkgs/core/firewall/src/functions.zones
rename to pkgs/firewall/src/functions.zones

diff --git a/pkgs/core/firewall/src/macros/DHCP b/pkgs/firewall/src/macros/DHCP
similarity index 100%
rename from pkgs/core/firewall/src/macros/DHCP
rename to pkgs/firewall/src/macros/DHCP

diff --git a/pkgs/core/firewall/src/macros/HTTP b/pkgs/firewall/src/macros/HTTP
similarity index 100%
rename from pkgs/core/firewall/src/macros/HTTP
rename to pkgs/firewall/src/macros/HTTP

diff --git a/pkgs/core/firewall/src/macros/HTTPS b/pkgs/firewall/src/macros/HTTPS
similarity index 100%
rename from pkgs/core/firewall/src/macros/HTTPS
rename to pkgs/firewall/src/macros/HTTPS

diff --git a/pkgs/core/firewall/src/macros/WWW b/pkgs/firewall/src/macros/WWW
similarity index 100%
rename from pkgs/core/firewall/src/macros/WWW
rename to pkgs/firewall/src/macros/WWW

diff --git a/pkgs/core/firewall/src/zones.green b/pkgs/firewall/src/zones.green
similarity index 100%
rename from pkgs/core/firewall/src/zones.green
rename to pkgs/firewall/src/zones.green

diff --git a/pkgs/core/firewall/src/zones.orange b/pkgs/firewall/src/zones.orange
similarity index 100%
rename from pkgs/core/firewall/src/zones.orange
rename to pkgs/firewall/src/zones.orange

diff --git a/pkgs/core/firewall/src/zones.red b/pkgs/firewall/src/zones.red
similarity index 100%
rename from pkgs/core/firewall/src/zones.red
rename to pkgs/firewall/src/zones.red

diff --git a/pkgs/core/flex/flex.nm b/pkgs/flex/flex.nm
similarity index 100%
rename from pkgs/core/flex/flex.nm
rename to pkgs/flex/flex.nm

diff --git a/pkgs/core/flex/patches/flex-2.5.35-gcc44-1.patch b/pkgs/flex/patches/flex-2.5.35-gcc44-1.patch
similarity index 100%
rename from pkgs/core/flex/patches/flex-2.5.35-gcc44-1.patch
rename to pkgs/flex/patches/flex-2.5.35-gcc44-1.patch

diff --git a/pkgs/core/fontconfig/fontconfig.nm b/pkgs/fontconfig/fontconfig.nm
similarity index 100%
rename from pkgs/core/fontconfig/fontconfig.nm
rename to pkgs/fontconfig/fontconfig.nm

diff --git a/pkgs/core/freeradius/freeradius.init b/pkgs/freeradius/freeradius.init
similarity index 100%
rename from pkgs/core/freeradius/freeradius.init
rename to pkgs/freeradius/freeradius.init

diff --git a/pkgs/core/freeradius/freeradius.nm b/pkgs/freeradius/freeradius.nm
similarity index 100%
rename from pkgs/core/freeradius/freeradius.nm
rename to pkgs/freeradius/freeradius.nm

diff --git a/pkgs/core/freeradius/freeradius.pam b/pkgs/freeradius/freeradius.pam
similarity index 100%
rename from pkgs/core/freeradius/freeradius.pam
rename to pkgs/freeradius/freeradius.pam

diff --git a/pkgs/core/freeradius/logrotate/freeradius b/pkgs/freeradius/logrotate/freeradius
similarity index 100%
rename from pkgs/core/freeradius/logrotate/freeradius
rename to pkgs/freeradius/logrotate/freeradius

diff --git a/pkgs/core/freeradius/patches/freeradius-2.1.6-cert-config.patch b/pkgs/freeradius/patches/freeradius-2.1.6-cert-config.patch
similarity index 100%
rename from pkgs/core/freeradius/patches/freeradius-2.1.6-cert-config.patch
rename to pkgs/freeradius/patches/freeradius-2.1.6-cert-config.patch

diff --git a/pkgs/core/freetype/freetype.nm b/pkgs/freetype/freetype.nm
similarity index 100%
rename from pkgs/core/freetype/freetype.nm
rename to pkgs/freetype/freetype.nm

diff --git a/pkgs/core/fuse/fuse.nm b/pkgs/fuse/fuse.nm
similarity index 100%
rename from pkgs/core/fuse/fuse.nm
rename to pkgs/fuse/fuse.nm

diff --git a/pkgs/core/fuse/patches/fuse-2.7.4-openfix.patch b/pkgs/fuse/patches/fuse-2.7.4-openfix.patch
similarity index 100%
rename from pkgs/core/fuse/patches/fuse-2.7.4-openfix.patch
rename to pkgs/fuse/patches/fuse-2.7.4-openfix.patch

diff --git a/pkgs/core/fuse/patches/fuse-2.7.4-udev_rules.patch b/pkgs/fuse/patches/fuse-2.7.4-udev_rules.patch
similarity index 100%
rename from pkgs/core/fuse/patches/fuse-2.7.4-udev_rules.patch
rename to pkgs/fuse/patches/fuse-2.7.4-udev_rules.patch

diff --git a/pkgs/core/gawk/gawk.nm b/pkgs/gawk/gawk.nm
similarity index 100%
rename from pkgs/core/gawk/gawk.nm
rename to pkgs/gawk/gawk.nm

diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/gcc/gcc.nm
similarity index 100%
rename from pkgs/core/gcc/gcc.nm
rename to pkgs/gcc/gcc.nm

diff --git a/pkgs/core/gcc/patches/gcc-4.4-optimize_linking.patch b/pkgs/gcc/patches/gcc-4.4-optimize_linking.patch
similarity index 100%
rename from pkgs/core/gcc/patches/gcc-4.4-optimize_linking.patch
rename to pkgs/gcc/patches/gcc-4.4-optimize_linking.patch

diff --git a/pkgs/core/gcc/patches/gcc-4.4.1-asprintf_fix.patch b/pkgs/gcc/patches/gcc-4.4.1-asprintf_fix.patch
similarity index 100%
rename from pkgs/core/gcc/patches/gcc-4.4.1-asprintf_fix.patch
rename to pkgs/gcc/patches/gcc-4.4.1-asprintf_fix.patch

diff --git a/pkgs/core/gcc/patches/gcc-4.5.0-no-add-needed.patch b/pkgs/gcc/patches/gcc-4.5.0-no-add-needed.patch
similarity index 100%
rename from pkgs/core/gcc/patches/gcc-4.5.0-no-add-needed.patch
rename to pkgs/gcc/patches/gcc-4.5.0-no-add-needed.patch

diff --git a/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch b/pkgs/gcc/patches/gcc-4.5.0-piepatches-20100421.patch
similarity index 100%
rename from pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch
rename to pkgs/gcc/patches/gcc-4.5.0-piepatches-20100421.patch

diff --git a/pkgs/core/gcc/patches/gcc45-libtool-no-rpath.patch b/pkgs/gcc/patches/gcc45-libtool-no-rpath.patch
similarity index 100%
rename from pkgs/core/gcc/patches/gcc45-libtool-no-rpath.patch
rename to pkgs/gcc/patches/gcc45-libtool-no-rpath.patch

diff --git a/pkgs/core/gcc/patches/gcc45-pr33763.patch b/pkgs/gcc/patches/gcc45-pr33763.patch
similarity index 100%
rename from pkgs/core/gcc/patches/gcc45-pr33763.patch
rename to pkgs/gcc/patches/gcc45-pr33763.patch

diff --git a/pkgs/core/gcc/patches/gcc45-pr38757.patch b/pkgs/gcc/patches/gcc45-pr38757.patch
similarity index 100%
rename from pkgs/core/gcc/patches/gcc45-pr38757.patch
rename to pkgs/gcc/patches/gcc45-pr38757.patch

diff --git a/pkgs/core/gdb/gdb.nm b/pkgs/gdb/gdb.nm
similarity index 100%
rename from pkgs/core/gdb/gdb.nm
rename to pkgs/gdb/gdb.nm

diff --git a/pkgs/core/gdbm/gdbm.nm b/pkgs/gdbm/gdbm.nm
similarity index 100%
rename from pkgs/core/gdbm/gdbm.nm
rename to pkgs/gdbm/gdbm.nm

diff --git a/pkgs/core/gettext/gettext.nm b/pkgs/gettext/gettext.nm
similarity index 100%
rename from pkgs/core/gettext/gettext.nm
rename to pkgs/gettext/gettext.nm

diff --git a/pkgs/core/ghostscript/ghostscript.nm b/pkgs/ghostscript/ghostscript.nm
similarity index 100%
rename from pkgs/core/ghostscript/ghostscript.nm
rename to pkgs/ghostscript/ghostscript.nm

diff --git a/pkgs/core/git/git.nm b/pkgs/git/git.nm
similarity index 100%
rename from pkgs/core/git/git.nm
rename to pkgs/git/git.nm

diff --git a/pkgs/core/glib2/glib2-locale.sh b/pkgs/glib2/glib2-locale.sh
similarity index 100%
rename from pkgs/core/glib2/glib2-locale.sh
rename to pkgs/glib2/glib2-locale.sh

diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/glib2/glib2.nm
similarity index 100%
rename from pkgs/core/glib2/glib2.nm
rename to pkgs/glib2/glib2.nm

diff --git a/pkgs/core/glibc/glibc-stack_chk_fail.c b/pkgs/glibc/glibc-stack_chk_fail.c
similarity index 100%
rename from pkgs/core/glibc/glibc-stack_chk_fail.c
rename to pkgs/glibc/glibc-stack_chk_fail.c

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/glibc/glibc.nm
similarity index 100%
rename from pkgs/core/glibc/glibc.nm
rename to pkgs/glibc/glibc.nm

diff --git a/pkgs/core/glibc/ld.so.conf b/pkgs/glibc/ld.so.conf
similarity index 100%
rename from pkgs/core/glibc/ld.so.conf
rename to pkgs/glibc/ld.so.conf

diff --git a/pkgs/core/glibc/nsswitch.conf b/pkgs/glibc/nsswitch.conf
similarity index 100%
rename from pkgs/core/glibc/nsswitch.conf
rename to pkgs/glibc/nsswitch.conf

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-arc4random.patch b/pkgs/glibc/patches/glibc-2.10.1-arc4random.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-arc4random.patch
rename to pkgs/glibc/patches/glibc-2.10.1-arc4random.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch b/pkgs/glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch
rename to pkgs/glibc/patches/glibc-2.10.1-asprintf_reset2null-1.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch b/pkgs/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch
rename to pkgs/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch b/pkgs/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch
rename to pkgs/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch b/pkgs/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch
rename to pkgs/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-pt_pax-1.patch b/pkgs/glibc/patches/glibc-2.10.1-pt_pax-1.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-pt_pax-1.patch
rename to pkgs/glibc/patches/glibc-2.10.1-pt_pax-1.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-sanitize_env.patch.off b/pkgs/glibc/patches/glibc-2.10.1-sanitize_env.patch.off
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-sanitize_env.patch.off
rename to pkgs/glibc/patches/glibc-2.10.1-sanitize_env.patch.off

diff --git a/pkgs/core/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch b/pkgs/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch
rename to pkgs/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.11.1-mktemp_urandom.patch b/pkgs/glibc/patches/glibc-2.11.1-mktemp_urandom.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.11.1-mktemp_urandom.patch
rename to pkgs/glibc/patches/glibc-2.11.1-mktemp_urandom.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch b/pkgs/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch
rename to pkgs/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch

diff --git a/pkgs/core/glibc/patches/glibc-2.12-hardened-pie.patch b/pkgs/glibc/patches/glibc-2.12-hardened-pie.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-2.12-hardened-pie.patch
rename to pkgs/glibc/patches/glibc-2.12-hardened-pie.patch

diff --git a/pkgs/core/glibc/patches/glibc-fedora.patch b/pkgs/glibc/patches/glibc-fedora.patch
similarity index 100%
rename from pkgs/core/glibc/patches/glibc-fedora.patch
rename to pkgs/glibc/patches/glibc-fedora.patch

diff --git a/pkgs/core/gmp/gmp.nm b/pkgs/gmp/gmp.nm
similarity index 100%
rename from pkgs/core/gmp/gmp.nm
rename to pkgs/gmp/gmp.nm

diff --git a/pkgs/core/gnupg2/gnupg2.nm b/pkgs/gnupg2/gnupg2.nm
similarity index 100%
rename from pkgs/core/gnupg2/gnupg2.nm
rename to pkgs/gnupg2/gnupg2.nm

diff --git a/pkgs/core/gnutls/gnutls.nm b/pkgs/gnutls/gnutls.nm
similarity index 100%
rename from pkgs/core/gnutls/gnutls.nm
rename to pkgs/gnutls/gnutls.nm

diff --git a/pkgs/core/gobject-introspection/gobject-introspection.nm b/pkgs/gobject-introspection/gobject-introspection.nm
similarity index 100%
rename from pkgs/core/gobject-introspection/gobject-introspection.nm
rename to pkgs/gobject-introspection/gobject-introspection.nm

diff --git a/pkgs/core/gperf/gperf.nm b/pkgs/gperf/gperf.nm
similarity index 100%
rename from pkgs/core/gperf/gperf.nm
rename to pkgs/gperf/gperf.nm

diff --git a/pkgs/core/grep/grep.nm b/pkgs/grep/grep.nm
similarity index 100%
rename from pkgs/core/grep/grep.nm
rename to pkgs/grep/grep.nm

diff --git a/pkgs/core/groff/groff.nm b/pkgs/groff/groff.nm
similarity index 100%
rename from pkgs/core/groff/groff.nm
rename to pkgs/groff/groff.nm

diff --git a/pkgs/core/groff/patches/groff-1.18.1.4-debian_fixes-1.patch b/pkgs/groff/patches/groff-1.18.1.4-debian_fixes-1.patch
similarity index 100%
rename from pkgs/core/groff/patches/groff-1.18.1.4-debian_fixes-1.patch
rename to pkgs/groff/patches/groff-1.18.1.4-debian_fixes-1.patch

diff --git a/pkgs/core/grub/05_theme b/pkgs/grub/05_theme
similarity index 100%
rename from pkgs/core/grub/05_theme
rename to pkgs/grub/05_theme

diff --git a/pkgs/core/grub/grub.default b/pkgs/grub/grub.default
similarity index 100%
rename from pkgs/core/grub/grub.default
rename to pkgs/grub/grub.default

diff --git a/pkgs/core/grub/grub.nm b/pkgs/grub/grub.nm
similarity index 100%
rename from pkgs/core/grub/grub.nm
rename to pkgs/grub/grub.nm

diff --git a/pkgs/core/grub/patches/grub-1.97.1-initramfs.patch b/pkgs/grub/patches/grub-1.97.1-initramfs.patch
similarity index 100%
rename from pkgs/core/grub/patches/grub-1.97.1-initramfs.patch
rename to pkgs/grub/patches/grub-1.97.1-initramfs.patch

diff --git a/pkgs/core/grub/splash.png b/pkgs/grub/splash.png
similarity index 100%
rename from pkgs/core/grub/splash.png
rename to pkgs/grub/splash.png

diff --git a/pkgs/core/gssdp/gssdp.nm b/pkgs/gssdp/gssdp.nm
similarity index 100%
rename from pkgs/core/gssdp/gssdp.nm
rename to pkgs/gssdp/gssdp.nm

diff --git a/pkgs/core/guile/guile.nm b/pkgs/guile/guile.nm
similarity index 100%
rename from pkgs/core/guile/guile.nm
rename to pkgs/guile/guile.nm

diff --git a/pkgs/core/guile/patches/guile-1.8.7-linemarkers.patch b/pkgs/guile/patches/guile-1.8.7-linemarkers.patch
similarity index 100%
rename from pkgs/core/guile/patches/guile-1.8.7-linemarkers.patch
rename to pkgs/guile/patches/guile-1.8.7-linemarkers.patch

diff --git a/pkgs/core/guile/patches/guile-1.8.7-testsuite.patch b/pkgs/guile/patches/guile-1.8.7-testsuite.patch
similarity index 100%
rename from pkgs/core/guile/patches/guile-1.8.7-testsuite.patch
rename to pkgs/guile/patches/guile-1.8.7-testsuite.patch

diff --git a/pkgs/core/guile/patches/guile-1.8.7-testsuite2.patch b/pkgs/guile/patches/guile-1.8.7-testsuite2.patch
similarity index 100%
rename from pkgs/core/guile/patches/guile-1.8.7-testsuite2.patch
rename to pkgs/guile/patches/guile-1.8.7-testsuite2.patch

diff --git a/pkgs/core/gupnp-av/gupnp-av.nm b/pkgs/gupnp-av/gupnp-av.nm
similarity index 100%
rename from pkgs/core/gupnp-av/gupnp-av.nm
rename to pkgs/gupnp-av/gupnp-av.nm

diff --git a/pkgs/core/gupnp-igd/gupnp-igd.nm b/pkgs/gupnp-igd/gupnp-igd.nm
similarity index 100%
rename from pkgs/core/gupnp-igd/gupnp-igd.nm
rename to pkgs/gupnp-igd/gupnp-igd.nm

diff --git a/pkgs/core/gupnp/gupnp.nm b/pkgs/gupnp/gupnp.nm
similarity index 100%
rename from pkgs/core/gupnp/gupnp.nm
rename to pkgs/gupnp/gupnp.nm

diff --git a/pkgs/core/gzip/gzip.nm b/pkgs/gzip/gzip.nm
similarity index 100%
rename from pkgs/core/gzip/gzip.nm
rename to pkgs/gzip/gzip.nm

diff --git a/pkgs/core/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch b/pkgs/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch
similarity index 100%
rename from pkgs/core/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch
rename to pkgs/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch

diff --git a/pkgs/core/gzip/patches/gzip-1.3.13-cve-2006-4338.patch b/pkgs/gzip/patches/gzip-1.3.13-cve-2006-4338.patch
similarity index 100%
rename from pkgs/core/gzip/patches/gzip-1.3.13-cve-2006-4338.patch
rename to pkgs/gzip/patches/gzip-1.3.13-cve-2006-4338.patch

diff --git a/pkgs/core/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch b/pkgs/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch
similarity index 100%
rename from pkgs/core/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch
rename to pkgs/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch

diff --git a/pkgs/core/hdparm/hdparm.nm b/pkgs/hdparm/hdparm.nm
similarity index 100%
rename from pkgs/core/hdparm/hdparm.nm
rename to pkgs/hdparm/hdparm.nm

diff --git a/pkgs/core/hostapd/config b/pkgs/hostapd/config
similarity index 100%
rename from pkgs/core/hostapd/config
rename to pkgs/hostapd/config

diff --git a/pkgs/core/hostapd/hostapd.nm b/pkgs/hostapd/hostapd.nm
similarity index 100%
rename from pkgs/core/hostapd/hostapd.nm
rename to pkgs/hostapd/hostapd.nm

diff --git a/pkgs/core/hplip/hplip.nm b/pkgs/hplip/hplip.nm
similarity index 100%
rename from pkgs/core/hplip/hplip.nm
rename to pkgs/hplip/hplip.nm

diff --git a/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch b/pkgs/hplip/patches/hplip-3.10.5-udev-rules.patch
similarity index 100%
rename from pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch
rename to pkgs/hplip/patches/hplip-3.10.5-udev-rules.patch

diff --git a/pkgs/core/htop/htop.nm b/pkgs/htop/htop.nm
similarity index 100%
rename from pkgs/core/htop/htop.nm
rename to pkgs/htop/htop.nm

diff --git a/pkgs/core/hwdata/hwdata.nm b/pkgs/hwdata/hwdata.nm
similarity index 100%
rename from pkgs/core/hwdata/hwdata.nm
rename to pkgs/hwdata/hwdata.nm

diff --git a/pkgs/core/iana-etc/iana-etc.nm b/pkgs/iana-etc/iana-etc.nm
similarity index 100%
rename from pkgs/core/iana-etc/iana-etc.nm
rename to pkgs/iana-etc/iana-etc.nm

diff --git a/pkgs/core/icecream/icecream.nm b/pkgs/icecream/icecream.nm
similarity index 100%
rename from pkgs/core/icecream/icecream.nm
rename to pkgs/icecream/icecream.nm

diff --git a/pkgs/core/icecream/icecream.sh b/pkgs/icecream/icecream.sh
similarity index 100%
rename from pkgs/core/icecream/icecream.sh
rename to pkgs/icecream/icecream.sh

diff --git a/pkgs/core/icecream/patches/icecream-cleanup-conffile.patch0 b/pkgs/icecream/patches/icecream-cleanup-conffile.patch0
similarity index 100%
rename from pkgs/core/icecream/patches/icecream-cleanup-conffile.patch0
rename to pkgs/icecream/patches/icecream-cleanup-conffile.patch0

diff --git a/pkgs/core/icecream/patches/icecream-rename-scheduler.patch b/pkgs/icecream/patches/icecream-rename-scheduler.patch
similarity index 100%
rename from pkgs/core/icecream/patches/icecream-rename-scheduler.patch
rename to pkgs/icecream/patches/icecream-rename-scheduler.patch

diff --git a/pkgs/core/initscripts/functions b/pkgs/initscripts/functions
similarity index 100%
rename from pkgs/core/initscripts/functions
rename to pkgs/initscripts/functions

diff --git a/pkgs/core/initscripts/init/checkfs.conf b/pkgs/initscripts/init/checkfs.conf
similarity index 100%
rename from pkgs/core/initscripts/init/checkfs.conf
rename to pkgs/initscripts/init/checkfs.conf

diff --git a/pkgs/core/initscripts/init/cleanfs.conf b/pkgs/initscripts/init/cleanfs.conf
similarity index 100%
rename from pkgs/core/initscripts/init/cleanfs.conf
rename to pkgs/initscripts/init/cleanfs.conf

diff --git a/pkgs/core/initscripts/init/control-alt-delete.conf b/pkgs/initscripts/init/control-alt-delete.conf
similarity index 100%
rename from pkgs/core/initscripts/init/control-alt-delete.conf
rename to pkgs/initscripts/init/control-alt-delete.conf

diff --git a/pkgs/core/initscripts/init/load-modules.conf b/pkgs/initscripts/init/load-modules.conf
similarity index 100%
rename from pkgs/core/initscripts/init/load-modules.conf
rename to pkgs/initscripts/init/load-modules.conf

diff --git a/pkgs/core/initscripts/init/loopback.conf b/pkgs/initscripts/init/loopback.conf
similarity index 100%
rename from pkgs/core/initscripts/init/loopback.conf
rename to pkgs/initscripts/init/loopback.conf

diff --git a/pkgs/core/initscripts/init/mountfs.conf b/pkgs/initscripts/init/mountfs.conf
similarity index 100%
rename from pkgs/core/initscripts/init/mountfs.conf
rename to pkgs/initscripts/init/mountfs.conf

diff --git a/pkgs/core/initscripts/init/serial.conf b/pkgs/initscripts/init/serial.conf
similarity index 100%
rename from pkgs/core/initscripts/init/serial.conf
rename to pkgs/initscripts/init/serial.conf

diff --git a/pkgs/core/initscripts/init/shutdown.conf b/pkgs/initscripts/init/shutdown.conf
similarity index 100%
rename from pkgs/core/initscripts/init/shutdown.conf
rename to pkgs/initscripts/init/shutdown.conf

diff --git a/pkgs/core/initscripts/init/swap.conf b/pkgs/initscripts/init/swap.conf
similarity index 100%
rename from pkgs/core/initscripts/init/swap.conf
rename to pkgs/initscripts/init/swap.conf

diff --git a/pkgs/core/initscripts/init/sysctl.conf b/pkgs/initscripts/init/sysctl.conf
similarity index 100%
rename from pkgs/core/initscripts/init/sysctl.conf
rename to pkgs/initscripts/init/sysctl.conf

diff --git a/pkgs/core/initscripts/init/tty1.conf b/pkgs/initscripts/init/tty1.conf
similarity index 100%
rename from pkgs/core/initscripts/init/tty1.conf
rename to pkgs/initscripts/init/tty1.conf

diff --git a/pkgs/core/initscripts/init/tty2.conf b/pkgs/initscripts/init/tty2.conf
similarity index 100%
rename from pkgs/core/initscripts/init/tty2.conf
rename to pkgs/initscripts/init/tty2.conf

diff --git a/pkgs/core/initscripts/init/tty3.conf b/pkgs/initscripts/init/tty3.conf
similarity index 100%
rename from pkgs/core/initscripts/init/tty3.conf
rename to pkgs/initscripts/init/tty3.conf

diff --git a/pkgs/core/initscripts/init/tty4.conf b/pkgs/initscripts/init/tty4.conf
similarity index 100%
rename from pkgs/core/initscripts/init/tty4.conf
rename to pkgs/initscripts/init/tty4.conf

diff --git a/pkgs/core/initscripts/init/udev-retry.conf b/pkgs/initscripts/init/udev-retry.conf
similarity index 100%
rename from pkgs/core/initscripts/init/udev-retry.conf
rename to pkgs/initscripts/init/udev-retry.conf

diff --git a/pkgs/core/initscripts/init/udev.conf b/pkgs/initscripts/init/udev.conf
similarity index 100%
rename from pkgs/core/initscripts/init/udev.conf
rename to pkgs/initscripts/init/udev.conf

diff --git a/pkgs/core/initscripts/init/udevtrigger.conf b/pkgs/initscripts/init/udevtrigger.conf
similarity index 100%
rename from pkgs/core/initscripts/init/udevtrigger.conf
rename to pkgs/initscripts/init/udevtrigger.conf

diff --git a/pkgs/core/initscripts/init/welcome.conf b/pkgs/initscripts/init/welcome.conf
similarity index 100%
rename from pkgs/core/initscripts/init/welcome.conf
rename to pkgs/initscripts/init/welcome.conf

diff --git a/pkgs/core/initscripts/initscripts.nm b/pkgs/initscripts/initscripts.nm
similarity index 100%
rename from pkgs/core/initscripts/initscripts.nm
rename to pkgs/initscripts/initscripts.nm

diff --git a/pkgs/core/initscripts/src/Makefile b/pkgs/initscripts/src/Makefile
similarity index 100%
rename from pkgs/core/initscripts/src/Makefile
rename to pkgs/initscripts/src/Makefile

diff --git a/pkgs/core/initscripts/src/console_check.c b/pkgs/initscripts/src/console_check.c
similarity index 100%
rename from pkgs/core/initscripts/src/console_check.c
rename to pkgs/initscripts/src/console_check.c

diff --git a/pkgs/core/initscripts/src/securetty.c b/pkgs/initscripts/src/securetty.c
similarity index 100%
rename from pkgs/core/initscripts/src/securetty.c
rename to pkgs/initscripts/src/securetty.c

diff --git a/pkgs/core/initscripts/sysconfig/clock b/pkgs/initscripts/sysconfig/clock
similarity index 100%
rename from pkgs/core/initscripts/sysconfig/clock
rename to pkgs/initscripts/sysconfig/clock

diff --git a/pkgs/core/initscripts/sysconfig/createfiles b/pkgs/initscripts/sysconfig/createfiles
similarity index 100%
rename from pkgs/core/initscripts/sysconfig/createfiles
rename to pkgs/initscripts/sysconfig/createfiles

diff --git a/pkgs/core/initscripts/sysconfig/modules b/pkgs/initscripts/sysconfig/modules
similarity index 100%
rename from pkgs/core/initscripts/sysconfig/modules
rename to pkgs/initscripts/sysconfig/modules

diff --git a/pkgs/core/initscripts/sysconfig/network b/pkgs/initscripts/sysconfig/network
similarity index 100%
rename from pkgs/core/initscripts/sysconfig/network
rename to pkgs/initscripts/sysconfig/network

diff --git a/pkgs/core/initscripts/sysconfig/rc b/pkgs/initscripts/sysconfig/rc
similarity index 100%
rename from pkgs/core/initscripts/sysconfig/rc
rename to pkgs/initscripts/sysconfig/rc

diff --git a/pkgs/core/initscripts/sysconfig/rc.local b/pkgs/initscripts/sysconfig/rc.local
similarity index 100%
rename from pkgs/core/initscripts/sysconfig/rc.local
rename to pkgs/initscripts/sysconfig/rc.local

diff --git a/pkgs/core/initscripts/sysconfig/rc.site b/pkgs/initscripts/sysconfig/rc.site
similarity index 100%
rename from pkgs/core/initscripts/sysconfig/rc.site
rename to pkgs/initscripts/sysconfig/rc.site

diff --git a/pkgs/core/initscripts/sysctl.conf b/pkgs/initscripts/sysctl.conf
similarity index 100%
rename from pkgs/core/initscripts/sysctl.conf
rename to pkgs/initscripts/sysctl.conf

diff --git a/pkgs/core/intltool/intltool.nm b/pkgs/intltool/intltool.nm
similarity index 100%
rename from pkgs/core/intltool/intltool.nm
rename to pkgs/intltool/intltool.nm

diff --git a/pkgs/core/iproute2/iproute2.nm b/pkgs/iproute2/iproute2.nm
similarity index 100%
rename from pkgs/core/iproute2/iproute2.nm
rename to pkgs/iproute2/iproute2.nm

diff --git a/pkgs/core/iptables/iptables.nm b/pkgs/iptables/iptables.nm
similarity index 100%
rename from pkgs/core/iptables/iptables.nm
rename to pkgs/iptables/iptables.nm

diff --git a/pkgs/core/iputils/iputils.nm b/pkgs/iputils/iputils.nm
similarity index 100%
rename from pkgs/core/iputils/iputils.nm
rename to pkgs/iputils/iputils.nm

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-addrcache.patch b/pkgs/iputils/patches/iputils-s20071127-addrcache.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-addrcache.patch
rename to pkgs/iputils/patches/iputils-s20071127-addrcache.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-arping-infiniband.patch b/pkgs/iputils/patches/iputils-s20071127-arping-infiniband.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-arping-infiniband.patch
rename to pkgs/iputils/patches/iputils-s20071127-arping-infiniband.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-arping_timeout.patch b/pkgs/iputils/patches/iputils-s20071127-arping_timeout.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-arping_timeout.patch
rename to pkgs/iputils/patches/iputils-s20071127-arping_timeout.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-countermeasures.patch b/pkgs/iputils/patches/iputils-s20071127-countermeasures.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-countermeasures.patch
rename to pkgs/iputils/patches/iputils-s20071127-countermeasures.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-idn.patch b/pkgs/iputils/patches/iputils-s20071127-idn.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-idn.patch
rename to pkgs/iputils/patches/iputils-s20071127-idn.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-open-max.patch b/pkgs/iputils/patches/iputils-s20071127-open-max.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-open-max.patch
rename to pkgs/iputils/patches/iputils-s20071127-open-max.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-output.patch b/pkgs/iputils/patches/iputils-s20071127-output.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-output.patch
rename to pkgs/iputils/patches/iputils-s20071127-output.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-ping-subint.patch b/pkgs/iputils/patches/iputils-s20071127-ping-subint.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-ping-subint.patch
rename to pkgs/iputils/patches/iputils-s20071127-ping-subint.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-ping_cleanup.patch b/pkgs/iputils/patches/iputils-s20071127-ping_cleanup.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-ping_cleanup.patch
rename to pkgs/iputils/patches/iputils-s20071127-ping_cleanup.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-rh.patch b/pkgs/iputils/patches/iputils-s20071127-rh.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-rh.patch
rename to pkgs/iputils/patches/iputils-s20071127-rh.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-traffic_class.patch b/pkgs/iputils/patches/iputils-s20071127-traffic_class.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-traffic_class.patch
rename to pkgs/iputils/patches/iputils-s20071127-traffic_class.patch

diff --git a/pkgs/core/iputils/patches/iputils-s20071127-warnings.patch b/pkgs/iputils/patches/iputils-s20071127-warnings.patch
similarity index 100%
rename from pkgs/core/iputils/patches/iputils-s20071127-warnings.patch
rename to pkgs/iputils/patches/iputils-s20071127-warnings.patch

diff --git a/pkgs/core/iscsi-initiator-utils/04-iscsi b/pkgs/iscsi-initiator-utils/04-iscsi
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/04-iscsi
rename to pkgs/iscsi-initiator-utils/04-iscsi

diff --git a/pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm b/pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm
rename to pkgs/iscsi-initiator-utils/iscsi-initiator-utils.nm

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch

diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch b/pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
similarity index 100%
rename from pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
rename to pkgs/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch

diff --git a/pkgs/core/iw/iw.nm b/pkgs/iw/iw.nm
similarity index 100%
rename from pkgs/core/iw/iw.nm
rename to pkgs/iw/iw.nm

diff --git a/pkgs/core/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch b/pkgs/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch
similarity index 100%
rename from pkgs/core/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch
rename to pkgs/iw/patches/iw-0.9.17-default-install-to-PREFIX-sbin.patch

diff --git a/pkgs/core/joe/joe.nm b/pkgs/joe/joe.nm
similarity index 100%
rename from pkgs/core/joe/joe.nm
rename to pkgs/joe/joe.nm

diff --git a/pkgs/core/joe/patches/joe-3.4-selinux.patch b/pkgs/joe/patches/joe-3.4-selinux.patch
similarity index 100%
rename from pkgs/core/joe/patches/joe-3.4-selinux.patch
rename to pkgs/joe/patches/joe-3.4-selinux.patch

diff --git a/pkgs/core/jwhois/jwhois.nm b/pkgs/jwhois/jwhois.nm
similarity index 100%
rename from pkgs/core/jwhois/jwhois.nm
rename to pkgs/jwhois/jwhois.nm

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-conf.patch b/pkgs/jwhois/patches/jwhois-4.0-conf.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-conf.patch
rename to pkgs/jwhois/patches/jwhois-4.0-conf.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-conf_update.patch b/pkgs/jwhois/patches/jwhois-4.0-conf_update.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-conf_update.patch
rename to pkgs/jwhois/patches/jwhois-4.0-conf_update.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-conf_update2.patch b/pkgs/jwhois/patches/jwhois-4.0-conf_update2.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-conf_update2.patch
rename to pkgs/jwhois/patches/jwhois-4.0-conf_update2.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-conf_update3.patch b/pkgs/jwhois/patches/jwhois-4.0-conf_update3.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-conf_update3.patch
rename to pkgs/jwhois/patches/jwhois-4.0-conf_update3.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-conf_update4.patch b/pkgs/jwhois/patches/jwhois-4.0-conf_update4.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-conf_update4.patch
rename to pkgs/jwhois/patches/jwhois-4.0-conf_update4.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-connect.patch b/pkgs/jwhois/patches/jwhois-4.0-connect.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-connect.patch
rename to pkgs/jwhois/patches/jwhois-4.0-connect.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-dotster.patch b/pkgs/jwhois/patches/jwhois-4.0-dotster.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-dotster.patch
rename to pkgs/jwhois/patches/jwhois-4.0-dotster.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-enum.patch b/pkgs/jwhois/patches/jwhois-4.0-enum.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-enum.patch
rename to pkgs/jwhois/patches/jwhois-4.0-enum.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-fclose.patch b/pkgs/jwhois/patches/jwhois-4.0-fclose.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-fclose.patch
rename to pkgs/jwhois/patches/jwhois-4.0-fclose.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-gi.patch b/pkgs/jwhois/patches/jwhois-4.0-gi.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-gi.patch
rename to pkgs/jwhois/patches/jwhois-4.0-gi.patch

diff --git a/pkgs/core/jwhois/patches/jwhois-4.0-ipv6match.patch b/pkgs/jwhois/patches/jwhois-4.0-ipv6match.patch
similarity index 100%
rename from pkgs/core/jwhois/patches/jwhois-4.0-ipv6match.patch
rename to pkgs/jwhois/patches/jwhois-4.0-ipv6match.patch

diff --git a/pkgs/core/kbd/kbd.nm b/pkgs/kbd/kbd.nm
similarity index 100%
rename from pkgs/core/kbd/kbd.nm
rename to pkgs/kbd/kbd.nm

diff --git a/pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch b/pkgs/kbd/patches/kbd-1.15-defkeymap.patch
similarity index 100%
rename from pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch
rename to pkgs/kbd/patches/kbd-1.15-defkeymap.patch

diff --git a/pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch b/pkgs/kbd/patches/kbd-1.15-keycodes-man.patch
similarity index 100%
rename from pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch
rename to pkgs/kbd/patches/kbd-1.15-keycodes-man.patch

diff --git a/pkgs/core/kbd/patches/kbd-1.15-po.patch b/pkgs/kbd/patches/kbd-1.15-po.patch
similarity index 100%
rename from pkgs/core/kbd/patches/kbd-1.15-po.patch
rename to pkgs/kbd/patches/kbd-1.15-po.patch

diff --git a/pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch b/pkgs/kbd/patches/kbd-1.15-quiet_doc.patch
similarity index 100%
rename from pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch
rename to pkgs/kbd/patches/kbd-1.15-quiet_doc.patch

diff --git a/pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/pkgs/kbd/patches/kbd-1.15-resizecon-x86_64.patch
similarity index 100%
rename from pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch
rename to pkgs/kbd/patches/kbd-1.15-resizecon-x86_64.patch

diff --git a/pkgs/core/kbd/patches/kbd-1.15-sparc.patch b/pkgs/kbd/patches/kbd-1.15-sparc.patch
similarity index 100%
rename from pkgs/core/kbd/patches/kbd-1.15-sparc.patch
rename to pkgs/kbd/patches/kbd-1.15-sparc.patch

diff --git a/pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch b/pkgs/kbd/patches/kbd-1.15-unicode_start.patch
similarity index 100%
rename from pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch
rename to pkgs/kbd/patches/kbd-1.15-unicode_start.patch

diff --git a/pkgs/core/kernel/config b/pkgs/kernel/config
similarity index 100%
rename from pkgs/core/kernel/config
rename to pkgs/kernel/config

diff --git a/pkgs/core/kernel/ipfire_logo.ppm b/pkgs/kernel/ipfire_logo.ppm
similarity index 100%
rename from pkgs/core/kernel/ipfire_logo.ppm
rename to pkgs/kernel/ipfire_logo.ppm

diff --git a/pkgs/core/kernel/kernel.nm b/pkgs/kernel/kernel.nm
similarity index 100%
rename from pkgs/core/kernel/kernel.nm
rename to pkgs/kernel/kernel.nm

diff --git a/pkgs/core/kernel/patches/grsecurity-2.2.1-2.6.37.1-201102221638.patch b/pkgs/kernel/patches/grsecurity-2.2.1-2.6.37.1-201102221638.patch
similarity index 100%
rename from pkgs/core/kernel/patches/grsecurity-2.2.1-2.6.37.1-201102221638.patch
rename to pkgs/kernel/patches/grsecurity-2.2.1-2.6.37.1-201102221638.patch

diff --git a/pkgs/core/kernel/patches/linux-2.6.33-disable-compat-vdso.patch b/pkgs/kernel/patches/linux-2.6.33-disable-compat-vdso.patch
similarity index 100%
rename from pkgs/core/kernel/patches/linux-2.6.33-disable-compat-vdso.patch
rename to pkgs/kernel/patches/linux-2.6.33-disable-compat-vdso.patch

diff --git a/pkgs/core/kernel/patches/routes-2.6.37-16.diff b/pkgs/kernel/patches/routes-2.6.37-16.diff
similarity index 100%
rename from pkgs/core/kernel/patches/routes-2.6.37-16.diff
rename to pkgs/kernel/patches/routes-2.6.37-16.diff

diff --git a/pkgs/core/l7-protocols/l7-protocols.nm b/pkgs/l7-protocols/l7-protocols.nm
similarity index 100%
rename from pkgs/core/l7-protocols/l7-protocols.nm
rename to pkgs/l7-protocols/l7-protocols.nm

diff --git a/pkgs/core/ldapvi/ldapvi.nm b/pkgs/ldapvi/ldapvi.nm
similarity index 100%
rename from pkgs/core/ldapvi/ldapvi.nm
rename to pkgs/ldapvi/ldapvi.nm

diff --git a/pkgs/core/less/less.nm b/pkgs/less/less.nm
similarity index 100%
rename from pkgs/core/less/less.nm
rename to pkgs/less/less.nm

diff --git a/pkgs/core/less/less.sh b/pkgs/less/less.sh
similarity index 100%
rename from pkgs/core/less/less.sh
rename to pkgs/less/less.sh

diff --git a/pkgs/core/less/lesspipe.sh b/pkgs/less/lesspipe.sh
similarity index 100%
rename from pkgs/core/less/lesspipe.sh
rename to pkgs/less/lesspipe.sh

diff --git a/pkgs/core/libICE/libICE.nm b/pkgs/libICE/libICE.nm
similarity index 100%
rename from pkgs/core/libICE/libICE.nm
rename to pkgs/libICE/libICE.nm

diff --git a/pkgs/core/libSM/libSM.nm b/pkgs/libSM/libSM.nm
similarity index 100%
rename from pkgs/core/libSM/libSM.nm
rename to pkgs/libSM/libSM.nm

diff --git a/pkgs/core/libVNCServer/libVNCServer.nm b/pkgs/libVNCServer/libVNCServer.nm
similarity index 100%
rename from pkgs/core/libVNCServer/libVNCServer.nm
rename to pkgs/libVNCServer/libVNCServer.nm

diff --git a/pkgs/core/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch b/pkgs/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
similarity index 100%
rename from pkgs/core/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
rename to pkgs/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch

diff --git a/pkgs/core/libVNCServer/patches/libvncserver-0.9.1-multilib.patch b/pkgs/libVNCServer/patches/libvncserver-0.9.1-multilib.patch
similarity index 100%
rename from pkgs/core/libVNCServer/patches/libvncserver-0.9.1-multilib.patch
rename to pkgs/libVNCServer/patches/libvncserver-0.9.1-multilib.patch

diff --git a/pkgs/core/libVNCServer/patches/libvncserver-0.9.7-Linux.patch b/pkgs/libVNCServer/patches/libvncserver-0.9.7-Linux.patch
similarity index 100%
rename from pkgs/core/libVNCServer/patches/libvncserver-0.9.7-Linux.patch
rename to pkgs/libVNCServer/patches/libvncserver-0.9.7-Linux.patch

diff --git a/pkgs/core/libX11/libX11.nm b/pkgs/libX11/libX11.nm
similarity index 100%
rename from pkgs/core/libX11/libX11.nm
rename to pkgs/libX11/libX11.nm

diff --git a/pkgs/core/libXau/libXau.nm b/pkgs/libXau/libXau.nm
similarity index 100%
rename from pkgs/core/libXau/libXau.nm
rename to pkgs/libXau/libXau.nm

diff --git a/pkgs/core/libXau/patches/xau-1.0.4-local.patch b/pkgs/libXau/patches/xau-1.0.4-local.patch
similarity index 100%
rename from pkgs/core/libXau/patches/xau-1.0.4-local.patch
rename to pkgs/libXau/patches/xau-1.0.4-local.patch

diff --git a/pkgs/core/libXaw/libXaw.nm b/pkgs/libXaw/libXaw.nm
similarity index 100%
rename from pkgs/core/libXaw/libXaw.nm
rename to pkgs/libXaw/libXaw.nm

diff --git a/pkgs/core/libXdamage/libXdamage.nm b/pkgs/libXdamage/libXdamage.nm
similarity index 100%
rename from pkgs/core/libXdamage/libXdamage.nm
rename to pkgs/libXdamage/libXdamage.nm

diff --git a/pkgs/core/libXdmcp/libXdmcp.nm b/pkgs/libXdmcp/libXdmcp.nm
similarity index 100%
rename from pkgs/core/libXdmcp/libXdmcp.nm
rename to pkgs/libXdmcp/libXdmcp.nm

diff --git a/pkgs/core/libXext/libXext.nm b/pkgs/libXext/libXext.nm
similarity index 100%
rename from pkgs/core/libXext/libXext.nm
rename to pkgs/libXext/libXext.nm

diff --git a/pkgs/core/libXfixes/libXfixes.nm b/pkgs/libXfixes/libXfixes.nm
similarity index 100%
rename from pkgs/core/libXfixes/libXfixes.nm
rename to pkgs/libXfixes/libXfixes.nm

diff --git a/pkgs/core/libXfont/libXfont.nm b/pkgs/libXfont/libXfont.nm
similarity index 100%
rename from pkgs/core/libXfont/libXfont.nm
rename to pkgs/libXfont/libXfont.nm

diff --git a/pkgs/core/libXft/libXft.nm b/pkgs/libXft/libXft.nm
similarity index 100%
rename from pkgs/core/libXft/libXft.nm
rename to pkgs/libXft/libXft.nm

diff --git a/pkgs/core/libXi/libXi.nm b/pkgs/libXi/libXi.nm
similarity index 100%
rename from pkgs/core/libXi/libXi.nm
rename to pkgs/libXi/libXi.nm

diff --git a/pkgs/core/libXmu/libXmu.nm b/pkgs/libXmu/libXmu.nm
similarity index 100%
rename from pkgs/core/libXmu/libXmu.nm
rename to pkgs/libXmu/libXmu.nm

diff --git a/pkgs/core/libXpm/libXpm.nm b/pkgs/libXpm/libXpm.nm
similarity index 100%
rename from pkgs/core/libXpm/libXpm.nm
rename to pkgs/libXpm/libXpm.nm

diff --git a/pkgs/core/libXrandr/libXrandr.nm b/pkgs/libXrandr/libXrandr.nm
similarity index 100%
rename from pkgs/core/libXrandr/libXrandr.nm
rename to pkgs/libXrandr/libXrandr.nm

diff --git a/pkgs/core/libXrandr/patches/libXrandr-1.3.0-fixes.patch b/pkgs/libXrandr/patches/libXrandr-1.3.0-fixes.patch
similarity index 100%
rename from pkgs/core/libXrandr/patches/libXrandr-1.3.0-fixes.patch
rename to pkgs/libXrandr/patches/libXrandr-1.3.0-fixes.patch

diff --git a/pkgs/core/libXrender/libXrender.nm b/pkgs/libXrender/libXrender.nm
similarity index 100%
rename from pkgs/core/libXrender/libXrender.nm
rename to pkgs/libXrender/libXrender.nm

diff --git a/pkgs/core/libXres/libXres.nm b/pkgs/libXres/libXres.nm
similarity index 100%
rename from pkgs/core/libXres/libXres.nm
rename to pkgs/libXres/libXres.nm

diff --git a/pkgs/core/libXt/libXt.nm b/pkgs/libXt/libXt.nm
similarity index 100%
rename from pkgs/core/libXt/libXt.nm
rename to pkgs/libXt/libXt.nm

diff --git a/pkgs/core/libXt/patches/libXt-1.0.7-libsm-fix.patch b/pkgs/libXt/patches/libXt-1.0.7-libsm-fix.patch
similarity index 100%
rename from pkgs/core/libXt/patches/libXt-1.0.7-libsm-fix.patch
rename to pkgs/libXt/patches/libXt-1.0.7-libsm-fix.patch

diff --git a/pkgs/core/libXtst/libXtst.nm b/pkgs/libXtst/libXtst.nm
similarity index 100%
rename from pkgs/core/libXtst/libXtst.nm
rename to pkgs/libXtst/libXtst.nm

diff --git a/pkgs/core/libXv/libXv.nm b/pkgs/libXv/libXv.nm
similarity index 100%
rename from pkgs/core/libXv/libXv.nm
rename to pkgs/libXv/libXv.nm

diff --git a/pkgs/core/libXvMC/libXvMC.nm b/pkgs/libXvMC/libXvMC.nm
similarity index 100%
rename from pkgs/core/libXvMC/libXvMC.nm
rename to pkgs/libXvMC/libXvMC.nm

diff --git a/pkgs/core/libXxf86vm/libXxf86vm.nm b/pkgs/libXxf86vm/libXxf86vm.nm
similarity index 100%
rename from pkgs/core/libXxf86vm/libXxf86vm.nm
rename to pkgs/libXxf86vm/libXxf86vm.nm

diff --git a/pkgs/core/libaal/libaal.nm b/pkgs/libaal/libaal.nm
similarity index 100%
rename from pkgs/core/libaal/libaal.nm
rename to pkgs/libaal/libaal.nm

diff --git a/pkgs/core/libaio/libaio.nm b/pkgs/libaio/libaio.nm
similarity index 100%
rename from pkgs/core/libaio/libaio.nm
rename to pkgs/libaio/libaio.nm

diff --git a/pkgs/core/libaio/patches/libaio-0.3.109-install-to-slash.patch b/pkgs/libaio/patches/libaio-0.3.109-install-to-slash.patch
similarity index 100%
rename from pkgs/core/libaio/patches/libaio-0.3.109-install-to-slash.patch
rename to pkgs/libaio/patches/libaio-0.3.109-install-to-slash.patch

diff --git a/pkgs/core/libart/libart.nm b/pkgs/libart/libart.nm
similarity index 100%
rename from pkgs/core/libart/libart.nm
rename to pkgs/libart/libart.nm

diff --git a/pkgs/core/libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch b/pkgs/libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch
similarity index 100%
rename from pkgs/core/libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch
rename to pkgs/libart/patches/libart_lgpl-2.3.19-upstream_fix-1.patch

diff --git a/pkgs/core/libassuan/libassuan.nm b/pkgs/libassuan/libassuan.nm
similarity index 100%
rename from pkgs/core/libassuan/libassuan.nm
rename to pkgs/libassuan/libassuan.nm

diff --git a/pkgs/core/libatasmart/libatasmart.nm b/pkgs/libatasmart/libatasmart.nm
similarity index 100%
rename from pkgs/core/libatasmart/libatasmart.nm
rename to pkgs/libatasmart/libatasmart.nm

diff --git a/pkgs/core/libcap-ng/libcap-ng.nm b/pkgs/libcap-ng/libcap-ng.nm
similarity index 100%
rename from pkgs/core/libcap-ng/libcap-ng.nm
rename to pkgs/libcap-ng/libcap-ng.nm

diff --git a/pkgs/core/libcap/libcap.nm b/pkgs/libcap/libcap.nm
similarity index 100%
rename from pkgs/core/libcap/libcap.nm
rename to pkgs/libcap/libcap.nm

diff --git a/pkgs/core/libcap/patches/libcap-2.16-build-system-fixes.patch b/pkgs/libcap/patches/libcap-2.16-build-system-fixes.patch
similarity index 100%
rename from pkgs/core/libcap/patches/libcap-2.16-build-system-fixes.patch
rename to pkgs/libcap/patches/libcap-2.16-build-system-fixes.patch

diff --git a/pkgs/core/libcap/patches/libcap-2.16-headerfix.patch b/pkgs/libcap/patches/libcap-2.16-headerfix.patch
similarity index 100%
rename from pkgs/core/libcap/patches/libcap-2.16-headerfix.patch
rename to pkgs/libcap/patches/libcap-2.16-headerfix.patch

diff --git a/pkgs/core/libdaemon/libdaemon.nm b/pkgs/libdaemon/libdaemon.nm
similarity index 100%
rename from pkgs/core/libdaemon/libdaemon.nm
rename to pkgs/libdaemon/libdaemon.nm

diff --git a/pkgs/core/libdnet/libdnet.nm b/pkgs/libdnet/libdnet.nm
similarity index 100%
rename from pkgs/core/libdnet/libdnet.nm
rename to pkgs/libdnet/libdnet.nm

diff --git a/pkgs/core/libdnet/patches/libdnet-1.12-shrext.patch b/pkgs/libdnet/patches/libdnet-1.12-shrext.patch
similarity index 100%
rename from pkgs/core/libdnet/patches/libdnet-1.12-shrext.patch
rename to pkgs/libdnet/patches/libdnet-1.12-shrext.patch

diff --git a/pkgs/core/libdrm/91-drm-modeset.rules b/pkgs/libdrm/91-drm-modeset.rules
similarity index 100%
rename from pkgs/core/libdrm/91-drm-modeset.rules
rename to pkgs/libdrm/91-drm-modeset.rules

diff --git a/pkgs/core/libdrm/libdrm.nm b/pkgs/libdrm/libdrm.nm
similarity index 100%
rename from pkgs/core/libdrm/libdrm.nm
rename to pkgs/libdrm/libdrm.nm

diff --git a/pkgs/core/libdrm/patches/libdrm-2.4.0-no-bc.patch b/pkgs/libdrm/patches/libdrm-2.4.0-no-bc.patch
similarity index 100%
rename from pkgs/core/libdrm/patches/libdrm-2.4.0-no-bc.patch
rename to pkgs/libdrm/patches/libdrm-2.4.0-no-bc.patch

diff --git a/pkgs/core/libdrm/patches/libdrm-2.4.21-b803918f3f.patch b/pkgs/libdrm/patches/libdrm-2.4.21-b803918f3f.patch
similarity index 100%
rename from pkgs/core/libdrm/patches/libdrm-2.4.21-b803918f3f.patch
rename to pkgs/libdrm/patches/libdrm-2.4.21-b803918f3f.patch

diff --git a/pkgs/core/libdrm/patches/libdrm-make-dri-perms-okay.patch b/pkgs/libdrm/patches/libdrm-make-dri-perms-okay.patch
similarity index 100%
rename from pkgs/core/libdrm/patches/libdrm-make-dri-perms-okay.patch
rename to pkgs/libdrm/patches/libdrm-make-dri-perms-okay.patch

diff --git a/pkgs/core/libevent/libevent.nm b/pkgs/libevent/libevent.nm
similarity index 100%
rename from pkgs/core/libevent/libevent.nm
rename to pkgs/libevent/libevent.nm

diff --git a/pkgs/core/libffi/libffi.nm b/pkgs/libffi/libffi.nm
similarity index 100%
rename from pkgs/core/libffi/libffi.nm
rename to pkgs/libffi/libffi.nm

diff --git a/pkgs/core/libfontenc/libfontenc.nm b/pkgs/libfontenc/libfontenc.nm
similarity index 100%
rename from pkgs/core/libfontenc/libfontenc.nm
rename to pkgs/libfontenc/libfontenc.nm

diff --git a/pkgs/core/libgcrypt/libgcrypt.nm b/pkgs/libgcrypt/libgcrypt.nm
similarity index 100%
rename from pkgs/core/libgcrypt/libgcrypt.nm
rename to pkgs/libgcrypt/libgcrypt.nm

diff --git a/pkgs/core/libgcrypt/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch b/pkgs/libgcrypt/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch
similarity index 100%
rename from pkgs/core/libgcrypt/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch
rename to pkgs/libgcrypt/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch

diff --git a/pkgs/core/libgpg-error/libgpg-error.nm b/pkgs/libgpg-error/libgpg-error.nm
similarity index 100%
rename from pkgs/core/libgpg-error/libgpg-error.nm
rename to pkgs/libgpg-error/libgpg-error.nm

diff --git a/pkgs/core/libgssglue/libgssglue.nm b/pkgs/libgssglue/libgssglue.nm
similarity index 100%
rename from pkgs/core/libgssglue/libgssglue.nm
rename to pkgs/libgssglue/libgssglue.nm

diff --git a/pkgs/core/libidn/libidn.nm b/pkgs/libidn/libidn.nm
similarity index 100%
rename from pkgs/core/libidn/libidn.nm
rename to pkgs/libidn/libidn.nm

diff --git a/pkgs/core/libjpeg/libjpeg.nm b/pkgs/libjpeg/libjpeg.nm
similarity index 100%
rename from pkgs/core/libjpeg/libjpeg.nm
rename to pkgs/libjpeg/libjpeg.nm

diff --git a/pkgs/core/libksba/libksba.nm b/pkgs/libksba/libksba.nm
similarity index 100%
rename from pkgs/core/libksba/libksba.nm
rename to pkgs/libksba/libksba.nm

diff --git a/pkgs/core/libmng/libmng.nm b/pkgs/libmng/libmng.nm
similarity index 100%
rename from pkgs/core/libmng/libmng.nm
rename to pkgs/libmng/libmng.nm

diff --git a/pkgs/core/libnet/libnet.nm b/pkgs/libnet/libnet.nm
similarity index 100%
rename from pkgs/core/libnet/libnet.nm
rename to pkgs/libnet/libnet.nm

diff --git a/pkgs/core/libnet/patches/libnet-1.1.4-capability.patch b/pkgs/libnet/patches/libnet-1.1.4-capability.patch
similarity index 100%
rename from pkgs/core/libnet/patches/libnet-1.1.4-capability.patch
rename to pkgs/libnet/patches/libnet-1.1.4-capability.patch

diff --git a/pkgs/core/libnetfilter_conntrack/libnetfilter_conntrack.nm b/pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm
similarity index 100%
rename from pkgs/core/libnetfilter_conntrack/libnetfilter_conntrack.nm
rename to pkgs/libnetfilter_conntrack/libnetfilter_conntrack.nm

diff --git a/pkgs/core/libnetfilter_log/libnetfilter_log.nm b/pkgs/libnetfilter_log/libnetfilter_log.nm
similarity index 100%
rename from pkgs/core/libnetfilter_log/libnetfilter_log.nm
rename to pkgs/libnetfilter_log/libnetfilter_log.nm

diff --git a/pkgs/core/libnetfilter_queue/libnetfilter_queue.nm b/pkgs/libnetfilter_queue/libnetfilter_queue.nm
similarity index 100%
rename from pkgs/core/libnetfilter_queue/libnetfilter_queue.nm
rename to pkgs/libnetfilter_queue/libnetfilter_queue.nm

diff --git a/pkgs/core/libnfnetlink/libnfnetlink.nm b/pkgs/libnfnetlink/libnfnetlink.nm
similarity index 100%
rename from pkgs/core/libnfnetlink/libnfnetlink.nm
rename to pkgs/libnfnetlink/libnfnetlink.nm

diff --git a/pkgs/core/libnfsidmap/libnfsidmap.nm b/pkgs/libnfsidmap/libnfsidmap.nm
similarity index 100%
rename from pkgs/core/libnfsidmap/libnfsidmap.nm
rename to pkgs/libnfsidmap/libnfsidmap.nm

diff --git a/pkgs/core/libnih/libnih.nm b/pkgs/libnih/libnih.nm
similarity index 100%
rename from pkgs/core/libnih/libnih.nm
rename to pkgs/libnih/libnih.nm

diff --git a/pkgs/core/libnl/libnl.nm b/pkgs/libnl/libnl.nm
similarity index 100%
rename from pkgs/core/libnl/libnl.nm
rename to pkgs/libnl/libnl.nm

diff --git a/pkgs/core/libnl/patches/libnl-1.1-include-limits-h.patch b/pkgs/libnl/patches/libnl-1.1-include-limits-h.patch
similarity index 100%
rename from pkgs/core/libnl/patches/libnl-1.1-include-limits-h.patch
rename to pkgs/libnl/patches/libnl-1.1-include-limits-h.patch

diff --git a/pkgs/core/libnl/patches/libnl-1.1-no-extern-inline.patch b/pkgs/libnl/patches/libnl-1.1-no-extern-inline.patch
similarity index 100%
rename from pkgs/core/libnl/patches/libnl-1.1-no-extern-inline.patch
rename to pkgs/libnl/patches/libnl-1.1-no-extern-inline.patch

diff --git a/pkgs/core/libnl/patches/libnl-1.1-permissions.patch b/pkgs/libnl/patches/libnl-1.1-permissions.patch
similarity index 100%
rename from pkgs/core/libnl/patches/libnl-1.1-permissions.patch
rename to pkgs/libnl/patches/libnl-1.1-permissions.patch

diff --git a/pkgs/core/libpcap/libpcap.nm b/pkgs/libpcap/libpcap.nm
similarity index 100%
rename from pkgs/core/libpcap/libpcap.nm
rename to pkgs/libpcap/libpcap.nm

diff --git a/pkgs/core/libpcap/patches/libpcap-0.8.3-ppp.patch b/pkgs/libpcap/patches/libpcap-0.8.3-ppp.patch
similarity index 100%
rename from pkgs/core/libpcap/patches/libpcap-0.8.3-ppp.patch
rename to pkgs/libpcap/patches/libpcap-0.8.3-ppp.patch

diff --git a/pkgs/core/libpciaccess/libpciaccess.nm b/pkgs/libpciaccess/libpciaccess.nm
similarity index 100%
rename from pkgs/core/libpciaccess/libpciaccess.nm
rename to pkgs/libpciaccess/libpciaccess.nm

diff --git a/pkgs/core/libpng/libpng.nm b/pkgs/libpng/libpng.nm
similarity index 100%
rename from pkgs/core/libpng/libpng.nm
rename to pkgs/libpng/libpng.nm

diff --git a/pkgs/core/libpng/patches/libpng-1.4.2-pngconf.patch b/pkgs/libpng/patches/libpng-1.4.2-pngconf.patch
similarity index 100%
rename from pkgs/core/libpng/patches/libpng-1.4.2-pngconf.patch
rename to pkgs/libpng/patches/libpng-1.4.2-pngconf.patch

diff --git a/pkgs/core/librpcsecgss/librpcsecgss.nm b/pkgs/librpcsecgss/librpcsecgss.nm
similarity index 100%
rename from pkgs/core/librpcsecgss/librpcsecgss.nm
rename to pkgs/librpcsecgss/librpcsecgss.nm

diff --git a/pkgs/core/libselinux/libselinux.nm b/pkgs/libselinux/libselinux.nm
similarity index 100%
rename from pkgs/core/libselinux/libselinux.nm
rename to pkgs/libselinux/libselinux.nm

diff --git a/pkgs/core/libselinux/patches/libselinux-ipfire.patch b/pkgs/libselinux/patches/libselinux-ipfire.patch
similarity index 100%
rename from pkgs/core/libselinux/patches/libselinux-ipfire.patch
rename to pkgs/libselinux/patches/libselinux-ipfire.patch

diff --git a/pkgs/core/libsemanage/libsemanage.nm b/pkgs/libsemanage/libsemanage.nm
similarity index 100%
rename from pkgs/core/libsemanage/libsemanage.nm
rename to pkgs/libsemanage/libsemanage.nm

diff --git a/pkgs/core/libsemanage/patches/libsemanage-rhat.patch b/pkgs/libsemanage/patches/libsemanage-rhat.patch
similarity index 100%
rename from pkgs/core/libsemanage/patches/libsemanage-rhat.patch
rename to pkgs/libsemanage/patches/libsemanage-rhat.patch

diff --git a/pkgs/core/libsemanage/semanage.conf b/pkgs/libsemanage/semanage.conf
similarity index 100%
rename from pkgs/core/libsemanage/semanage.conf
rename to pkgs/libsemanage/semanage.conf

diff --git a/pkgs/core/libsepol/libsepol.nm b/pkgs/libsepol/libsepol.nm
similarity index 100%
rename from pkgs/core/libsepol/libsepol.nm
rename to pkgs/libsepol/libsepol.nm

diff --git a/pkgs/core/libsoup/libsoup.nm b/pkgs/libsoup/libsoup.nm
similarity index 100%
rename from pkgs/core/libsoup/libsoup.nm
rename to pkgs/libsoup/libsoup.nm

diff --git a/pkgs/core/libssh2/libssh2.nm b/pkgs/libssh2/libssh2.nm
similarity index 100%
rename from pkgs/core/libssh2/libssh2.nm
rename to pkgs/libssh2/libssh2.nm

diff --git a/pkgs/core/libtiff/libtiff.nm b/pkgs/libtiff/libtiff.nm
similarity index 100%
rename from pkgs/core/libtiff/libtiff.nm
rename to pkgs/libtiff/libtiff.nm

diff --git a/pkgs/core/libtool/libtool.nm b/pkgs/libtool/libtool.nm
similarity index 100%
rename from pkgs/core/libtool/libtool.nm
rename to pkgs/libtool/libtool.nm

diff --git a/pkgs/core/libusb-compat/libusb-compat.nm b/pkgs/libusb-compat/libusb-compat.nm
similarity index 100%
rename from pkgs/core/libusb-compat/libusb-compat.nm
rename to pkgs/libusb-compat/libusb-compat.nm

diff --git a/pkgs/core/libusb/libusb.nm b/pkgs/libusb/libusb.nm
similarity index 100%
rename from pkgs/core/libusb/libusb.nm
rename to pkgs/libusb/libusb.nm

diff --git a/pkgs/core/libuser/libuser.nm b/pkgs/libuser/libuser.nm
similarity index 100%
rename from pkgs/core/libuser/libuser.nm
rename to pkgs/libuser/libuser.nm

diff --git a/pkgs/core/libvirt/libvirt.nm b/pkgs/libvirt/libvirt.nm
similarity index 100%
rename from pkgs/core/libvirt/libvirt.nm
rename to pkgs/libvirt/libvirt.nm

diff --git a/pkgs/core/libxcb/libxcb.nm b/pkgs/libxcb/libxcb.nm
similarity index 100%
rename from pkgs/core/libxcb/libxcb.nm
rename to pkgs/libxcb/libxcb.nm

diff --git a/pkgs/core/libxkbfile/libxkbfile.nm b/pkgs/libxkbfile/libxkbfile.nm
similarity index 100%
rename from pkgs/core/libxkbfile/libxkbfile.nm
rename to pkgs/libxkbfile/libxkbfile.nm

diff --git a/pkgs/core/libxml2/libxml2.nm b/pkgs/libxml2/libxml2.nm
similarity index 100%
rename from pkgs/core/libxml2/libxml2.nm
rename to pkgs/libxml2/libxml2.nm

diff --git a/pkgs/core/libxslt/libxslt.nm b/pkgs/libxslt/libxslt.nm
similarity index 100%
rename from pkgs/core/libxslt/libxslt.nm
rename to pkgs/libxslt/libxslt.nm

diff --git a/pkgs/core/libyaml/libyaml.nm b/pkgs/libyaml/libyaml.nm
similarity index 100%
rename from pkgs/core/libyaml/libyaml.nm
rename to pkgs/libyaml/libyaml.nm

diff --git a/pkgs/core/lighttpd/lighttpd.conf b/pkgs/lighttpd/lighttpd.conf
similarity index 100%
rename from pkgs/core/lighttpd/lighttpd.conf
rename to pkgs/lighttpd/lighttpd.conf

diff --git a/pkgs/core/lighttpd/lighttpd.init b/pkgs/lighttpd/lighttpd.init
similarity index 100%
rename from pkgs/core/lighttpd/lighttpd.init
rename to pkgs/lighttpd/lighttpd.init

diff --git a/pkgs/core/lighttpd/lighttpd.nm b/pkgs/lighttpd/lighttpd.nm
similarity index 100%
rename from pkgs/core/lighttpd/lighttpd.nm
rename to pkgs/lighttpd/lighttpd.nm

diff --git a/pkgs/core/linux-atm/linux-atm.nm b/pkgs/linux-atm/linux-atm.nm
similarity index 100%
rename from pkgs/core/linux-atm/linux-atm.nm
rename to pkgs/linux-atm/linux-atm.nm

diff --git a/pkgs/core/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch b/pkgs/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
similarity index 100%
rename from pkgs/core/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
rename to pkgs/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch

diff --git a/pkgs/core/linux-atm/patches/linux-atm-2.4.1-nmu.patch b/pkgs/linux-atm/patches/linux-atm-2.4.1-nmu.patch
similarity index 100%
rename from pkgs/core/linux-atm/patches/linux-atm-2.4.1-nmu.patch
rename to pkgs/linux-atm/patches/linux-atm-2.4.1-nmu.patch

diff --git a/pkgs/core/lldpd/lldpd.init b/pkgs/lldpd/lldpd.init
similarity index 100%
rename from pkgs/core/lldpd/lldpd.init
rename to pkgs/lldpd/lldpd.init

diff --git a/pkgs/core/lldpd/lldpd.nm b/pkgs/lldpd/lldpd.nm
similarity index 100%
rename from pkgs/core/lldpd/lldpd.nm
rename to pkgs/lldpd/lldpd.nm

diff --git a/pkgs/core/lm-sensors/lm-sensors.nm b/pkgs/lm-sensors/lm-sensors.nm
similarity index 100%
rename from pkgs/core/lm-sensors/lm-sensors.nm
rename to pkgs/lm-sensors/lm-sensors.nm

diff --git a/pkgs/core/logrotate/logrotate.init b/pkgs/logrotate/logrotate.init
similarity index 100%
rename from pkgs/core/logrotate/logrotate.init
rename to pkgs/logrotate/logrotate.init

diff --git a/pkgs/core/logrotate/logrotate.nm b/pkgs/logrotate/logrotate.nm
similarity index 100%
rename from pkgs/core/logrotate/logrotate.nm
rename to pkgs/logrotate/logrotate.nm

diff --git a/pkgs/core/logrotate/patches/logrotate-3.7.7-curdir.patch b/pkgs/logrotate/patches/logrotate-3.7.7-curdir.patch
similarity index 100%
rename from pkgs/core/logrotate/patches/logrotate-3.7.7-curdir.patch
rename to pkgs/logrotate/patches/logrotate-3.7.7-curdir.patch

diff --git a/pkgs/core/logrotate/patches/logrotate-3.7.7-toolarge.patch b/pkgs/logrotate/patches/logrotate-3.7.7-toolarge.patch
similarity index 100%
rename from pkgs/core/logrotate/patches/logrotate-3.7.7-toolarge.patch
rename to pkgs/logrotate/patches/logrotate-3.7.7-toolarge.patch

diff --git a/pkgs/core/lsof/lsof.nm b/pkgs/lsof/lsof.nm
similarity index 100%
rename from pkgs/core/lsof/lsof.nm
rename to pkgs/lsof/lsof.nm

diff --git a/pkgs/core/lsof/patches/lsof_4.81-threads.patch b/pkgs/lsof/patches/lsof_4.81-threads.patch
similarity index 100%
rename from pkgs/core/lsof/patches/lsof_4.81-threads.patch
rename to pkgs/lsof/patches/lsof_4.81-threads.patch

diff --git a/pkgs/core/lua/lua.nm b/pkgs/lua/lua.nm
similarity index 100%
rename from pkgs/core/lua/lua.nm
rename to pkgs/lua/lua.nm

diff --git a/pkgs/core/lua/patches/lua-5.1.4-autotoolize.patch b/pkgs/lua/patches/lua-5.1.4-autotoolize.patch
similarity index 100%
rename from pkgs/core/lua/patches/lua-5.1.4-autotoolize.patch
rename to pkgs/lua/patches/lua-5.1.4-autotoolize.patch

diff --git a/pkgs/core/lvm2/lvm2.nm b/pkgs/lvm2/lvm2.nm
similarity index 100%
rename from pkgs/core/lvm2/lvm2.nm
rename to pkgs/lvm2/lvm2.nm

diff --git a/pkgs/core/lzo/lzo.nm b/pkgs/lzo/lzo.nm
similarity index 100%
rename from pkgs/core/lzo/lzo.nm
rename to pkgs/lzo/lzo.nm

diff --git a/pkgs/core/m4/m4.nm b/pkgs/m4/m4.nm
similarity index 100%
rename from pkgs/core/m4/m4.nm
rename to pkgs/m4/m4.nm

diff --git a/pkgs/core/m4/patches/m4-1.4.14-include.patch b/pkgs/m4/patches/m4-1.4.14-include.patch
similarity index 100%
rename from pkgs/core/m4/patches/m4-1.4.14-include.patch
rename to pkgs/m4/patches/m4-1.4.14-include.patch

diff --git a/pkgs/core/make/make.nm b/pkgs/make/make.nm
similarity index 100%
rename from pkgs/core/make/make.nm
rename to pkgs/make/make.nm

diff --git a/pkgs/core/make/patches/make-3.79.1-noclock_gettime.patch b/pkgs/make/patches/make-3.79.1-noclock_gettime.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.79.1-noclock_gettime.patch
rename to pkgs/make/patches/make-3.79.1-noclock_gettime.patch

diff --git a/pkgs/core/make/patches/make-3.80-getcwd.patch b/pkgs/make/patches/make-3.80-getcwd.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.80-getcwd.patch
rename to pkgs/make/patches/make-3.80-getcwd.patch

diff --git a/pkgs/core/make/patches/make-3.80-j8k.patch b/pkgs/make/patches/make-3.80-j8k.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.80-j8k.patch
rename to pkgs/make/patches/make-3.80-j8k.patch

diff --git a/pkgs/core/make/patches/make-3.81-err-reporting.patch b/pkgs/make/patches/make-3.81-err-reporting.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.81-err-reporting.patch
rename to pkgs/make/patches/make-3.81-err-reporting.patch

diff --git a/pkgs/core/make/patches/make-3.81-fdleak.patch b/pkgs/make/patches/make-3.81-fdleak.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.81-fdleak.patch
rename to pkgs/make/patches/make-3.81-fdleak.patch

diff --git a/pkgs/core/make/patches/make-3.81-jobserver.patch b/pkgs/make/patches/make-3.81-jobserver.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.81-jobserver.patch
rename to pkgs/make/patches/make-3.81-jobserver.patch

diff --git a/pkgs/core/make/patches/make-3.81-memory.patch b/pkgs/make/patches/make-3.81-memory.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.81-memory.patch
rename to pkgs/make/patches/make-3.81-memory.patch

diff --git a/pkgs/core/make/patches/make-3.81-newlines.patch b/pkgs/make/patches/make-3.81-newlines.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.81-newlines.patch
rename to pkgs/make/patches/make-3.81-newlines.patch

diff --git a/pkgs/core/make/patches/make-3.81-rlimit.patch b/pkgs/make/patches/make-3.81-rlimit.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.81-rlimit.patch
rename to pkgs/make/patches/make-3.81-rlimit.patch

diff --git a/pkgs/core/make/patches/make-3.81-strcpy-overlap.patch b/pkgs/make/patches/make-3.81-strcpy-overlap.patch
similarity index 100%
rename from pkgs/core/make/patches/make-3.81-strcpy-overlap.patch
rename to pkgs/make/patches/make-3.81-strcpy-overlap.patch

diff --git a/pkgs/core/man-db/man-db.nm b/pkgs/man-db/man-db.nm
similarity index 100%
rename from pkgs/core/man-db/man-db.nm
rename to pkgs/man-db/man-db.nm

diff --git a/pkgs/core/man-pages/man-pages.nm b/pkgs/man-pages/man-pages.nm
similarity index 100%
rename from pkgs/core/man-pages/man-pages.nm
rename to pkgs/man-pages/man-pages.nm

diff --git a/pkgs/core/mc/mc.nm b/pkgs/mc/mc.nm
similarity index 100%
rename from pkgs/core/mc/mc.nm
rename to pkgs/mc/mc.nm

diff --git a/pkgs/core/mdadm/mdadm.nm b/pkgs/mdadm/mdadm.nm
similarity index 100%
rename from pkgs/core/mdadm/mdadm.nm
rename to pkgs/mdadm/mdadm.nm

diff --git a/pkgs/core/mdadm/patches/mdadm-3.0-devel2-warn.patch b/pkgs/mdadm/patches/mdadm-3.0-devel2-warn.patch
similarity index 100%
rename from pkgs/core/mdadm/patches/mdadm-3.0-devel2-warn.patch
rename to pkgs/mdadm/patches/mdadm-3.0-devel2-warn.patch

diff --git a/pkgs/core/memtest86+/memtest86+.grub b/pkgs/memtest86+/memtest86+.grub
similarity index 100%
rename from pkgs/core/memtest86+/memtest86+.grub
rename to pkgs/memtest86+/memtest86+.grub

diff --git a/pkgs/core/memtest86+/memtest86+.nm b/pkgs/memtest86+/memtest86+.nm
similarity index 100%
rename from pkgs/core/memtest86+/memtest86+.nm
rename to pkgs/memtest86+/memtest86+.nm

diff --git a/pkgs/core/mesa/mesa.nm b/pkgs/mesa/mesa.nm
similarity index 100%
rename from pkgs/core/mesa/mesa.nm
rename to pkgs/mesa/mesa.nm

diff --git a/pkgs/core/module-init-tools/modprobe.d/blacklist.conf b/pkgs/module-init-tools/modprobe.d/blacklist.conf
similarity index 100%
rename from pkgs/core/module-init-tools/modprobe.d/blacklist.conf
rename to pkgs/module-init-tools/modprobe.d/blacklist.conf

diff --git a/pkgs/core/module-init-tools/modprobe.d/modprobe.conf b/pkgs/module-init-tools/modprobe.d/modprobe.conf
similarity index 100%
rename from pkgs/core/module-init-tools/modprobe.d/modprobe.conf
rename to pkgs/module-init-tools/modprobe.d/modprobe.conf

diff --git a/pkgs/core/module-init-tools/module-init-tools.nm b/pkgs/module-init-tools/module-init-tools.nm
similarity index 100%
rename from pkgs/core/module-init-tools/module-init-tools.nm
rename to pkgs/module-init-tools/module-init-tools.nm

diff --git a/pkgs/core/mpc/mpc.nm b/pkgs/mpc/mpc.nm
similarity index 100%
rename from pkgs/core/mpc/mpc.nm
rename to pkgs/mpc/mpc.nm

diff --git a/pkgs/core/mpfr/mpfr.nm b/pkgs/mpfr/mpfr.nm
similarity index 100%
rename from pkgs/core/mpfr/mpfr.nm
rename to pkgs/mpfr/mpfr.nm

diff --git a/pkgs/core/multipath-tools/multipath-tools.nm b/pkgs/multipath-tools/multipath-tools.nm
similarity index 100%
rename from pkgs/core/multipath-tools/multipath-tools.nm
rename to pkgs/multipath-tools/multipath-tools.nm

diff --git a/pkgs/core/multipath-tools/patches/0001-RH-queue-without-daemon.patch b/pkgs/multipath-tools/patches/0001-RH-queue-without-daemon.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0001-RH-queue-without-daemon.patch
rename to pkgs/multipath-tools/patches/0001-RH-queue-without-daemon.patch

diff --git a/pkgs/core/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch b/pkgs/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch
rename to pkgs/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch

diff --git a/pkgs/core/multipath-tools/patches/0002-RH-path-checker.patch b/pkgs/multipath-tools/patches/0002-RH-path-checker.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0002-RH-path-checker.patch
rename to pkgs/multipath-tools/patches/0002-RH-path-checker.patch

diff --git a/pkgs/core/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch b/pkgs/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch
rename to pkgs/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch

diff --git a/pkgs/core/multipath-tools/patches/0003-RH-root-init-script.patch b/pkgs/multipath-tools/patches/0003-RH-root-init-script.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0003-RH-root-init-script.patch
rename to pkgs/multipath-tools/patches/0003-RH-root-init-script.patch

diff --git a/pkgs/core/multipath-tools/patches/0003-for-upstream-default-configs.patch b/pkgs/multipath-tools/patches/0003-for-upstream-default-configs.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0003-for-upstream-default-configs.patch
rename to pkgs/multipath-tools/patches/0003-for-upstream-default-configs.patch

diff --git a/pkgs/core/multipath-tools/patches/0004-RH-fix-kpartx.patch b/pkgs/multipath-tools/patches/0004-RH-fix-kpartx.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0004-RH-fix-kpartx.patch
rename to pkgs/multipath-tools/patches/0004-RH-fix-kpartx.patch

diff --git a/pkgs/core/multipath-tools/patches/0005-RH-cciss_id.patch b/pkgs/multipath-tools/patches/0005-RH-cciss_id.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0005-RH-cciss_id.patch
rename to pkgs/multipath-tools/patches/0005-RH-cciss_id.patch

diff --git a/pkgs/core/multipath-tools/patches/0006-RH-move-bindings.patch b/pkgs/multipath-tools/patches/0006-RH-move-bindings.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0006-RH-move-bindings.patch
rename to pkgs/multipath-tools/patches/0006-RH-move-bindings.patch

diff --git a/pkgs/core/multipath-tools/patches/0007-RH-do-not-remove.patch b/pkgs/multipath-tools/patches/0007-RH-do-not-remove.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0007-RH-do-not-remove.patch
rename to pkgs/multipath-tools/patches/0007-RH-do-not-remove.patch

diff --git a/pkgs/core/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch b/pkgs/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch
rename to pkgs/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch

diff --git a/pkgs/core/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch b/pkgs/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch
rename to pkgs/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch

diff --git a/pkgs/core/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch b/pkgs/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch
rename to pkgs/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch

diff --git a/pkgs/core/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch b/pkgs/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch
rename to pkgs/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch

diff --git a/pkgs/core/multipath-tools/patches/0012-RH-udev-sync-support.patch b/pkgs/multipath-tools/patches/0012-RH-udev-sync-support.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0012-RH-udev-sync-support.patch
rename to pkgs/multipath-tools/patches/0012-RH-udev-sync-support.patch

diff --git a/pkgs/core/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch b/pkgs/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch
rename to pkgs/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch

diff --git a/pkgs/core/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch b/pkgs/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch
rename to pkgs/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch

diff --git a/pkgs/core/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch b/pkgs/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch
rename to pkgs/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch

diff --git a/pkgs/core/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch b/pkgs/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch
rename to pkgs/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch

diff --git a/pkgs/core/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch b/pkgs/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch
rename to pkgs/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch

diff --git a/pkgs/core/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch b/pkgs/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch
rename to pkgs/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch

diff --git a/pkgs/core/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch b/pkgs/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch
rename to pkgs/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch

diff --git a/pkgs/core/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch b/pkgs/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch
rename to pkgs/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch

diff --git a/pkgs/core/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch b/pkgs/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch
rename to pkgs/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch

diff --git a/pkgs/core/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch b/pkgs/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch
rename to pkgs/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch

diff --git a/pkgs/core/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch b/pkgs/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch
rename to pkgs/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch

diff --git a/pkgs/core/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch b/pkgs/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch
similarity index 100%
rename from pkgs/core/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch
rename to pkgs/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch

diff --git a/pkgs/core/nano/nano.nm b/pkgs/nano/nano.nm
similarity index 100%
rename from pkgs/core/nano/nano.nm
rename to pkgs/nano/nano.nm

diff --git a/pkgs/core/nasm/nasm.nm b/pkgs/nasm/nasm.nm
similarity index 100%
rename from pkgs/core/nasm/nasm.nm
rename to pkgs/nasm/nasm.nm

diff --git a/pkgs/core/ncurses/ncurses.nm b/pkgs/ncurses/ncurses.nm
similarity index 100%
rename from pkgs/core/ncurses/ncurses.nm
rename to pkgs/ncurses/ncurses.nm

diff --git a/pkgs/core/net-snmp/net-snmp.nm b/pkgs/net-snmp/net-snmp.nm
similarity index 100%
rename from pkgs/core/net-snmp/net-snmp.nm
rename to pkgs/net-snmp/net-snmp.nm

diff --git a/pkgs/core/net-snmp/snmpd.init b/pkgs/net-snmp/snmpd.init
similarity index 100%
rename from pkgs/core/net-snmp/snmpd.init
rename to pkgs/net-snmp/snmpd.init

diff --git a/pkgs/core/net-tools/config.h b/pkgs/net-tools/config.h
similarity index 100%
rename from pkgs/core/net-tools/config.h
rename to pkgs/net-tools/config.h

diff --git a/pkgs/core/net-tools/config.make b/pkgs/net-tools/config.make
similarity index 100%
rename from pkgs/core/net-tools/config.make
rename to pkgs/net-tools/config.make

diff --git a/pkgs/core/net-tools/ether-wake.8 b/pkgs/net-tools/ether-wake.8
similarity index 100%
rename from pkgs/core/net-tools/ether-wake.8
rename to pkgs/net-tools/ether-wake.8

diff --git a/pkgs/core/net-tools/ether-wake.c b/pkgs/net-tools/ether-wake.c
similarity index 100%
rename from pkgs/core/net-tools/ether-wake.c
rename to pkgs/net-tools/ether-wake.c

diff --git a/pkgs/core/net-tools/ipmaddr.8 b/pkgs/net-tools/ipmaddr.8
similarity index 100%
rename from pkgs/core/net-tools/ipmaddr.8
rename to pkgs/net-tools/ipmaddr.8

diff --git a/pkgs/core/net-tools/iptunnel.8 b/pkgs/net-tools/iptunnel.8
similarity index 100%
rename from pkgs/core/net-tools/iptunnel.8
rename to pkgs/net-tools/iptunnel.8

diff --git a/pkgs/core/net-tools/mii-diag.8 b/pkgs/net-tools/mii-diag.8
similarity index 100%
rename from pkgs/core/net-tools/mii-diag.8
rename to pkgs/net-tools/mii-diag.8

diff --git a/pkgs/core/net-tools/mii-diag.c b/pkgs/net-tools/mii-diag.c
similarity index 100%
rename from pkgs/core/net-tools/mii-diag.c
rename to pkgs/net-tools/mii-diag.c

diff --git a/pkgs/core/net-tools/net-tools.nm b/pkgs/net-tools/net-tools.nm
similarity index 100%
rename from pkgs/core/net-tools/net-tools.nm
rename to pkgs/net-tools/net-tools.nm

diff --git a/pkgs/core/net-tools/patches/net-tools-1.57-bug22040.patch b/pkgs/net-tools/patches/net-tools-1.57-bug22040.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.57-bug22040.patch
rename to pkgs/net-tools/patches/net-tools-1.57-bug22040.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-IA64.patch b/pkgs/net-tools/patches/net-tools-1.60-IA64.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-IA64.patch
rename to pkgs/net-tools/patches/net-tools-1.60-IA64.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-a-option.patch b/pkgs/net-tools/patches/net-tools-1.60-a-option.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-a-option.patch
rename to pkgs/net-tools/patches/net-tools-1.60-a-option.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-arp-unaligned-access.patch b/pkgs/net-tools/patches/net-tools-1.60-arp-unaligned-access.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-arp-unaligned-access.patch
rename to pkgs/net-tools/patches/net-tools-1.60-arp-unaligned-access.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-arp_man.patch b/pkgs/net-tools/patches/net-tools-1.60-arp_man.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-arp_man.patch
rename to pkgs/net-tools/patches/net-tools-1.60-arp_man.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-arp_overflow.patch b/pkgs/net-tools/patches/net-tools-1.60-arp_overflow.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-arp_overflow.patch
rename to pkgs/net-tools/patches/net-tools-1.60-arp_overflow.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-avoid-name-resolution.patch b/pkgs/net-tools/patches/net-tools-1.60-avoid-name-resolution.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-avoid-name-resolution.patch
rename to pkgs/net-tools/patches/net-tools-1.60-avoid-name-resolution.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-bcast.patch b/pkgs/net-tools/patches/net-tools-1.60-bcast.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-bcast.patch
rename to pkgs/net-tools/patches/net-tools-1.60-bcast.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-clear-flag.patch b/pkgs/net-tools/patches/net-tools-1.60-clear-flag.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-clear-flag.patch
rename to pkgs/net-tools/patches/net-tools-1.60-clear-flag.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-continous-flush-stdout.patch b/pkgs/net-tools/patches/net-tools-1.60-continous-flush-stdout.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-continous-flush-stdout.patch
rename to pkgs/net-tools/patches/net-tools-1.60-continous-flush-stdout.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-cycle.patch b/pkgs/net-tools/patches/net-tools-1.60-cycle.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-cycle.patch
rename to pkgs/net-tools/patches/net-tools-1.60-cycle.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-de.patch b/pkgs/net-tools/patches/net-tools-1.60-de.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-de.patch
rename to pkgs/net-tools/patches/net-tools-1.60-de.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-debug-fix.patch b/pkgs/net-tools/patches/net-tools-1.60-debug-fix.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-debug-fix.patch
rename to pkgs/net-tools/patches/net-tools-1.60-debug-fix.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-duplicate-tcp.patch b/pkgs/net-tools/patches/net-tools-1.60-duplicate-tcp.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-duplicate-tcp.patch
rename to pkgs/net-tools/patches/net-tools-1.60-duplicate-tcp.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ec_hw_null.patch b/pkgs/net-tools/patches/net-tools-1.60-ec_hw_null.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ec_hw_null.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ec_hw_null.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-fgets.patch b/pkgs/net-tools/patches/net-tools-1.60-fgets.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-fgets.patch
rename to pkgs/net-tools/patches/net-tools-1.60-fgets.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-gcc33.patch b/pkgs/net-tools/patches/net-tools-1.60-gcc33.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-gcc33.patch
rename to pkgs/net-tools/patches/net-tools-1.60-gcc33.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-gcc34.patch b/pkgs/net-tools/patches/net-tools-1.60-gcc34.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-gcc34.patch
rename to pkgs/net-tools/patches/net-tools-1.60-gcc34.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-hfi.patch b/pkgs/net-tools/patches/net-tools-1.60-hfi.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-hfi.patch
rename to pkgs/net-tools/patches/net-tools-1.60-hfi.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-hostname-short.patch b/pkgs/net-tools/patches/net-tools-1.60-hostname-short.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-hostname-short.patch
rename to pkgs/net-tools/patches/net-tools-1.60-hostname-short.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-hostname_man.patch b/pkgs/net-tools/patches/net-tools-1.60-hostname_man.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-hostname_man.patch
rename to pkgs/net-tools/patches/net-tools-1.60-hostname_man.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-i-option.patch b/pkgs/net-tools/patches/net-tools-1.60-i-option.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-i-option.patch
rename to pkgs/net-tools/patches/net-tools-1.60-i-option.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ib-warning.patch b/pkgs/net-tools/patches/net-tools-1.60-ib-warning.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ib-warning.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ib-warning.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ifaceopt.patch b/pkgs/net-tools/patches/net-tools-1.60-ifaceopt.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ifaceopt.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ifaceopt.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch b/pkgs/net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ifconfig-long-iface-crasher.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ifconfig.patch b/pkgs/net-tools/patches/net-tools-1.60-ifconfig.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ifconfig.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ifconfig.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ifconfig_ib.patch b/pkgs/net-tools/patches/net-tools-1.60-ifconfig_ib.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ifconfig_ib.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ifconfig_ib.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ifconfig_man.patch b/pkgs/net-tools/patches/net-tools-1.60-ifconfig_man.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ifconfig_man.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ifconfig_man.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-inet6-lookup.patch b/pkgs/net-tools/patches/net-tools-1.60-inet6-lookup.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-inet6-lookup.patch
rename to pkgs/net-tools/patches/net-tools-1.60-inet6-lookup.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-interface.patch b/pkgs/net-tools/patches/net-tools-1.60-interface.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-interface.patch
rename to pkgs/net-tools/patches/net-tools-1.60-interface.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-interface_stack.patch b/pkgs/net-tools/patches/net-tools-1.60-interface_stack.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-interface_stack.patch
rename to pkgs/net-tools/patches/net-tools-1.60-interface_stack.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ipx.patch b/pkgs/net-tools/patches/net-tools-1.60-ipx.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ipx.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ipx.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-isofix.patch b/pkgs/net-tools/patches/net-tools-1.60-isofix.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-isofix.patch
rename to pkgs/net-tools/patches/net-tools-1.60-isofix.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-large-indexes.patch b/pkgs/net-tools/patches/net-tools-1.60-large-indexes.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-large-indexes.patch
rename to pkgs/net-tools/patches/net-tools-1.60-large-indexes.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-makefile-berlios.patch b/pkgs/net-tools/patches/net-tools-1.60-makefile-berlios.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-makefile-berlios.patch
rename to pkgs/net-tools/patches/net-tools-1.60-makefile-berlios.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch b/pkgs/net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch
rename to pkgs/net-tools/patches/net-tools-1.60-man-RHEL-bugs.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-man-obsolete.patch b/pkgs/net-tools/patches/net-tools-1.60-man-obsolete.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-man-obsolete.patch
rename to pkgs/net-tools/patches/net-tools-1.60-man-obsolete.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-man.patch b/pkgs/net-tools/patches/net-tools-1.60-man.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-man.patch
rename to pkgs/net-tools/patches/net-tools-1.60-man.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-manydevs.patch b/pkgs/net-tools/patches/net-tools-1.60-manydevs.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-manydevs.patch
rename to pkgs/net-tools/patches/net-tools-1.60-manydevs.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch b/pkgs/net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch
rename to pkgs/net-tools/patches/net-tools-1.60-masqinfo-raw-ip.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-metric-tunnel-man.patch b/pkgs/net-tools/patches/net-tools-1.60-metric-tunnel-man.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-metric-tunnel-man.patch
rename to pkgs/net-tools/patches/net-tools-1.60-metric-tunnel-man.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-mii-gigabit.patch b/pkgs/net-tools/patches/net-tools-1.60-mii-gigabit.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-mii-gigabit.patch
rename to pkgs/net-tools/patches/net-tools-1.60-mii-gigabit.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-mii-refactor.patch b/pkgs/net-tools/patches/net-tools-1.60-mii-refactor.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-mii-refactor.patch
rename to pkgs/net-tools/patches/net-tools-1.60-mii-refactor.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch b/pkgs/net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch
rename to pkgs/net-tools/patches/net-tools-1.60-mii-tool-obsolete.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-miiioctl.patch b/pkgs/net-tools/patches/net-tools-1.60-miiioctl.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-miiioctl.patch
rename to pkgs/net-tools/patches/net-tools-1.60-miiioctl.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-nameif.patch b/pkgs/net-tools/patches/net-tools-1.60-nameif.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-nameif.patch
rename to pkgs/net-tools/patches/net-tools-1.60-nameif.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-nameif_strncpy.patch b/pkgs/net-tools/patches/net-tools-1.60-nameif_strncpy.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-nameif_strncpy.patch
rename to pkgs/net-tools/patches/net-tools-1.60-nameif_strncpy.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netdevice.patch b/pkgs/net-tools/patches/net-tools-1.60-netdevice.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netdevice.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netdevice.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netmask.patch b/pkgs/net-tools/patches/net-tools-1.60-netmask.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netmask.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netmask.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netstat-I-fix.patch b/pkgs/net-tools/patches/net-tools-1.60-netstat-I-fix.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netstat-I-fix.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netstat-I-fix.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch b/pkgs/net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netstat-interfaces-crash.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netstat-leak.patch b/pkgs/net-tools/patches/net-tools-1.60-netstat-leak.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netstat-leak.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netstat-leak.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netstat-probe.patch b/pkgs/net-tools/patches/net-tools-1.60-netstat-probe.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netstat-probe.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netstat-probe.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netstat_inode.patch b/pkgs/net-tools/patches/net-tools-1.60-netstat_inode.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netstat_inode.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netstat_inode.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netstat_stop_trim.patch b/pkgs/net-tools/patches/net-tools-1.60-netstat_stop_trim.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netstat_stop_trim.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netstat_stop_trim.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-netstat_ulong.patch b/pkgs/net-tools/patches/net-tools-1.60-netstat_ulong.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-netstat_ulong.patch
rename to pkgs/net-tools/patches/net-tools-1.60-netstat_ulong.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-note.patch b/pkgs/net-tools/patches/net-tools-1.60-note.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-note.patch
rename to pkgs/net-tools/patches/net-tools-1.60-note.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-num-ports.patch b/pkgs/net-tools/patches/net-tools-1.60-num-ports.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-num-ports.patch
rename to pkgs/net-tools/patches/net-tools-1.60-num-ports.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-overflow.patch b/pkgs/net-tools/patches/net-tools-1.60-overflow.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-overflow.patch
rename to pkgs/net-tools/patches/net-tools-1.60-overflow.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-parse.patch b/pkgs/net-tools/patches/net-tools-1.60-parse.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-parse.patch
rename to pkgs/net-tools/patches/net-tools-1.60-parse.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-pie.patch b/pkgs/net-tools/patches/net-tools-1.60-pie.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-pie.patch
rename to pkgs/net-tools/patches/net-tools-1.60-pie.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-remove_node.patch b/pkgs/net-tools/patches/net-tools-1.60-remove_node.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-remove_node.patch
rename to pkgs/net-tools/patches/net-tools-1.60-remove_node.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-return.patch b/pkgs/net-tools/patches/net-tools-1.60-return.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-return.patch
rename to pkgs/net-tools/patches/net-tools-1.60-return.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-scanf-format.patch b/pkgs/net-tools/patches/net-tools-1.60-scanf-format.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-scanf-format.patch
rename to pkgs/net-tools/patches/net-tools-1.60-scanf-format.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-sctp-addrs.patch b/pkgs/net-tools/patches/net-tools-1.60-sctp-addrs.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-sctp-addrs.patch
rename to pkgs/net-tools/patches/net-tools-1.60-sctp-addrs.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-sctp-quiet.patch b/pkgs/net-tools/patches/net-tools-1.60-sctp-quiet.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-sctp-quiet.patch
rename to pkgs/net-tools/patches/net-tools-1.60-sctp-quiet.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-sctp.patch b/pkgs/net-tools/patches/net-tools-1.60-sctp.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-sctp.patch
rename to pkgs/net-tools/patches/net-tools-1.60-sctp.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-selinux.patch b/pkgs/net-tools/patches/net-tools-1.60-selinux.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-selinux.patch
rename to pkgs/net-tools/patches/net-tools-1.60-selinux.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-siunits.patch b/pkgs/net-tools/patches/net-tools-1.60-siunits.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-siunits.patch
rename to pkgs/net-tools/patches/net-tools-1.60-siunits.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-skip.patch b/pkgs/net-tools/patches/net-tools-1.60-skip.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-skip.patch
rename to pkgs/net-tools/patches/net-tools-1.60-skip.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-slattach-fchown.patch b/pkgs/net-tools/patches/net-tools-1.60-slattach-fchown.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-slattach-fchown.patch
rename to pkgs/net-tools/patches/net-tools-1.60-slattach-fchown.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-statalias.patch b/pkgs/net-tools/patches/net-tools-1.60-statalias.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-statalias.patch
rename to pkgs/net-tools/patches/net-tools-1.60-statalias.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-statistics-doubleword.patch b/pkgs/net-tools/patches/net-tools-1.60-statistics-doubleword.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-statistics-doubleword.patch
rename to pkgs/net-tools/patches/net-tools-1.60-statistics-doubleword.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-statistics.patch b/pkgs/net-tools/patches/net-tools-1.60-statistics.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-statistics.patch
rename to pkgs/net-tools/patches/net-tools-1.60-statistics.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-statistics_buffer.patch b/pkgs/net-tools/patches/net-tools-1.60-statistics_buffer.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-statistics_buffer.patch
rename to pkgs/net-tools/patches/net-tools-1.60-statistics_buffer.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-stdo.patch b/pkgs/net-tools/patches/net-tools-1.60-stdo.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-stdo.patch
rename to pkgs/net-tools/patches/net-tools-1.60-stdo.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-trailingblank.patch b/pkgs/net-tools/patches/net-tools-1.60-trailingblank.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-trailingblank.patch
rename to pkgs/net-tools/patches/net-tools-1.60-trailingblank.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-trim_iface.patch b/pkgs/net-tools/patches/net-tools-1.60-trim_iface.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-trim_iface.patch
rename to pkgs/net-tools/patches/net-tools-1.60-trim_iface.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-trunc.patch b/pkgs/net-tools/patches/net-tools-1.60-trunc.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-trunc.patch
rename to pkgs/net-tools/patches/net-tools-1.60-trunc.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-ulong.patch b/pkgs/net-tools/patches/net-tools-1.60-ulong.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-ulong.patch
rename to pkgs/net-tools/patches/net-tools-1.60-ulong.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-virtualname.patch b/pkgs/net-tools/patches/net-tools-1.60-virtualname.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-virtualname.patch
rename to pkgs/net-tools/patches/net-tools-1.60-virtualname.patch

diff --git a/pkgs/core/net-tools/patches/net-tools-1.60-x25-proc.patch b/pkgs/net-tools/patches/net-tools-1.60-x25-proc.patch
similarity index 100%
rename from pkgs/core/net-tools/patches/net-tools-1.60-x25-proc.patch
rename to pkgs/net-tools/patches/net-tools-1.60-x25-proc.patch

diff --git a/pkgs/core/netplug/netplug.nm b/pkgs/netplug/netplug.nm
similarity index 100%
rename from pkgs/core/netplug/netplug.nm
rename to pkgs/netplug/netplug.nm

diff --git a/pkgs/core/netplug/netplugd.init b/pkgs/netplug/netplugd.init
similarity index 100%
rename from pkgs/core/netplug/netplugd.init
rename to pkgs/netplug/netplugd.init

diff --git a/pkgs/core/netplug/patches/netplug-1.2.9.1-execshield.patch b/pkgs/netplug/patches/netplug-1.2.9.1-execshield.patch
similarity index 100%
rename from pkgs/core/netplug/patches/netplug-1.2.9.1-execshield.patch
rename to pkgs/netplug/patches/netplug-1.2.9.1-execshield.patch

diff --git a/pkgs/core/network/network-init.init b/pkgs/network/network-init.init
similarity index 100%
rename from pkgs/core/network/network-init.init
rename to pkgs/network/network-init.init

diff --git a/pkgs/core/network/network.init b/pkgs/network/network.init
similarity index 100%
rename from pkgs/core/network/network.init
rename to pkgs/network/network.init

diff --git a/pkgs/core/network/network.nm b/pkgs/network/network.nm
similarity index 100%
rename from pkgs/core/network/network.nm
rename to pkgs/network/network.nm

diff --git a/pkgs/core/newt/newt.nm b/pkgs/newt/newt.nm
similarity index 100%
rename from pkgs/core/newt/newt.nm
rename to pkgs/newt/newt.nm

diff --git a/pkgs/core/nfs-utils/nfs-utils.nm b/pkgs/nfs-utils/nfs-utils.nm
similarity index 100%
rename from pkgs/core/nfs-utils/nfs-utils.nm
rename to pkgs/nfs-utils/nfs-utils.nm

diff --git a/pkgs/core/nmap/nmap.nm b/pkgs/nmap/nmap.nm
similarity index 100%
rename from pkgs/core/nmap/nmap.nm
rename to pkgs/nmap/nmap.nm

diff --git a/pkgs/core/nmap/patches/nmap-5.00-mktemp.patch b/pkgs/nmap/patches/nmap-5.00-mktemp.patch
similarity index 100%
rename from pkgs/core/nmap/patches/nmap-5.00-mktemp.patch
rename to pkgs/nmap/patches/nmap-5.00-mktemp.patch

diff --git a/pkgs/core/noip/noip.nm b/pkgs/noip/noip.nm
similarity index 100%
rename from pkgs/core/noip/noip.nm
rename to pkgs/noip/noip.nm

diff --git a/pkgs/core/nspr/nspr-config-vars.in b/pkgs/nspr/nspr-config-vars.in
similarity index 100%
rename from pkgs/core/nspr/nspr-config-vars.in
rename to pkgs/nspr/nspr-config-vars.in

diff --git a/pkgs/core/nspr/nspr.nm b/pkgs/nspr/nspr.nm
similarity index 100%
rename from pkgs/core/nspr/nspr.nm
rename to pkgs/nspr/nspr.nm

diff --git a/pkgs/core/nspr/nspr.pc.in b/pkgs/nspr/nspr.pc.in
similarity index 100%
rename from pkgs/core/nspr/nspr.pc.in
rename to pkgs/nspr/nspr.pc.in

diff --git a/pkgs/core/nspr/patches/nspr-config-pc.patch b/pkgs/nspr/patches/nspr-config-pc.patch
similarity index 100%
rename from pkgs/core/nspr/patches/nspr-config-pc.patch
rename to pkgs/nspr/patches/nspr-config-pc.patch

diff --git a/pkgs/core/nss-softokn/nss-softokn-config.in b/pkgs/nss-softokn/nss-softokn-config.in
similarity index 100%
rename from pkgs/core/nss-softokn/nss-softokn-config.in
rename to pkgs/nss-softokn/nss-softokn-config.in

diff --git a/pkgs/core/nss-softokn/nss-softokn.nm b/pkgs/nss-softokn/nss-softokn.nm
similarity index 100%
rename from pkgs/core/nss-softokn/nss-softokn.nm
rename to pkgs/nss-softokn/nss-softokn.nm

diff --git a/pkgs/core/nss-softokn/nss-softokn.pc.in b/pkgs/nss-softokn/nss-softokn.pc.in
similarity index 100%
rename from pkgs/core/nss-softokn/nss-softokn.pc.in
rename to pkgs/nss-softokn/nss-softokn.pc.in

diff --git a/pkgs/core/nss-softokn/nss-softokn.spec b/pkgs/nss-softokn/nss-softokn.spec
similarity index 100%
rename from pkgs/core/nss-softokn/nss-softokn.spec
rename to pkgs/nss-softokn/nss-softokn.spec

diff --git a/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch b/pkgs/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
similarity index 100%
rename from pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
rename to pkgs/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch

diff --git a/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch b/pkgs/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
similarity index 100%
rename from pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
rename to pkgs/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch

diff --git a/pkgs/core/nss-util/nss-util-config.in b/pkgs/nss-util/nss-util-config.in
similarity index 100%
rename from pkgs/core/nss-util/nss-util-config.in
rename to pkgs/nss-util/nss-util-config.in

diff --git a/pkgs/core/nss-util/nss-util.nm b/pkgs/nss-util/nss-util.nm
similarity index 100%
rename from pkgs/core/nss-util/nss-util.nm
rename to pkgs/nss-util/nss-util.nm

diff --git a/pkgs/core/nss-util/nss-util.pc.in b/pkgs/nss-util/nss-util.pc.in
similarity index 100%
rename from pkgs/core/nss-util/nss-util.pc.in
rename to pkgs/nss-util/nss-util.pc.in

diff --git a/pkgs/core/nss-util/nss-util.spec b/pkgs/nss-util/nss-util.spec
similarity index 100%
rename from pkgs/core/nss-util/nss-util.spec
rename to pkgs/nss-util/nss-util.spec

diff --git a/pkgs/core/nss/PayPalEE.cert b/pkgs/nss/PayPalEE.cert
similarity index 100%
rename from pkgs/core/nss/PayPalEE.cert
rename to pkgs/nss/PayPalEE.cert

diff --git a/pkgs/core/nss/cert8.db b/pkgs/nss/cert8.db
similarity index 100%
rename from pkgs/core/nss/cert8.db
rename to pkgs/nss/cert8.db

diff --git a/pkgs/core/nss/cert9.db b/pkgs/nss/cert9.db
similarity index 100%
rename from pkgs/core/nss/cert9.db
rename to pkgs/nss/cert9.db

diff --git a/pkgs/core/nss/key3.db b/pkgs/nss/key3.db
similarity index 100%
rename from pkgs/core/nss/key3.db
rename to pkgs/nss/key3.db

diff --git a/pkgs/core/nss/key4.db b/pkgs/nss/key4.db
similarity index 100%
rename from pkgs/core/nss/key4.db
rename to pkgs/nss/key4.db

diff --git a/pkgs/core/nss/nss-config.in b/pkgs/nss/nss-config.in
similarity index 100%
rename from pkgs/core/nss/nss-config.in
rename to pkgs/nss/nss-config.in

diff --git a/pkgs/core/nss/nss.nm b/pkgs/nss/nss.nm
similarity index 100%
rename from pkgs/core/nss/nss.nm
rename to pkgs/nss/nss.nm

diff --git a/pkgs/core/nss/nss.pc.in b/pkgs/nss/nss.pc.in
similarity index 100%
rename from pkgs/core/nss/nss.pc.in
rename to pkgs/nss/nss.pc.in

diff --git a/pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch b/pkgs/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
similarity index 100%
rename from pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
rename to pkgs/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch

diff --git a/pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch b/pkgs/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
similarity index 100%
rename from pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
rename to pkgs/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch

diff --git a/pkgs/core/nss/patches/nss-enable-pem.patch b/pkgs/nss/patches/nss-enable-pem.patch
similarity index 100%
rename from pkgs/core/nss/patches/nss-enable-pem.patch
rename to pkgs/nss/patches/nss-enable-pem.patch

diff --git a/pkgs/core/nss/patches/nss-sysinit-userdb-first.patch b/pkgs/nss/patches/nss-sysinit-userdb-first.patch
similarity index 100%
rename from pkgs/core/nss/patches/nss-sysinit-userdb-first.patch
rename to pkgs/nss/patches/nss-sysinit-userdb-first.patch

diff --git a/pkgs/core/nss/patches/nsspem-596674.patch b/pkgs/nss/patches/nsspem-596674.patch
similarity index 100%
rename from pkgs/core/nss/patches/nsspem-596674.patch
rename to pkgs/nss/patches/nsspem-596674.patch

diff --git a/pkgs/core/nss/patches/renegotiate-transitional.patch b/pkgs/nss/patches/renegotiate-transitional.patch
similarity index 100%
rename from pkgs/core/nss/patches/renegotiate-transitional.patch
rename to pkgs/nss/patches/renegotiate-transitional.patch

diff --git a/pkgs/core/nss/secmod.db b/pkgs/nss/secmod.db
similarity index 100%
rename from pkgs/core/nss/secmod.db
rename to pkgs/nss/secmod.db

diff --git a/pkgs/core/nss/setup-nsssysinit.sh b/pkgs/nss/setup-nsssysinit.sh
similarity index 100%
rename from pkgs/core/nss/setup-nsssysinit.sh
rename to pkgs/nss/setup-nsssysinit.sh

diff --git a/pkgs/core/nss/system-pkcs11.txt b/pkgs/nss/system-pkcs11.txt
similarity index 100%
rename from pkgs/core/nss/system-pkcs11.txt
rename to pkgs/nss/system-pkcs11.txt

diff --git a/pkgs/core/nss_ldap/nss_ldap.nm b/pkgs/nss_ldap/nss_ldap.nm
similarity index 100%
rename from pkgs/core/nss_ldap/nss_ldap.nm
rename to pkgs/nss_ldap/nss_ldap.nm

diff --git a/pkgs/core/ntp/ntp.conf b/pkgs/ntp/ntp.conf
similarity index 100%
rename from pkgs/core/ntp/ntp.conf
rename to pkgs/ntp/ntp.conf

diff --git a/pkgs/core/ntp/ntp.init b/pkgs/ntp/ntp.init
similarity index 100%
rename from pkgs/core/ntp/ntp.init
rename to pkgs/ntp/ntp.init

diff --git a/pkgs/core/ntp/ntp.nm b/pkgs/ntp/ntp.nm
similarity index 100%
rename from pkgs/core/ntp/ntp.nm
rename to pkgs/ntp/ntp.nm

diff --git a/pkgs/core/openl2tp/openl2tp.nm b/pkgs/openl2tp/openl2tp.nm
similarity index 100%
rename from pkgs/core/openl2tp/openl2tp.nm
rename to pkgs/openl2tp/openl2tp.nm

diff --git a/pkgs/core/openldap/openldap.init b/pkgs/openldap/openldap.init
similarity index 100%
rename from pkgs/core/openldap/openldap.init
rename to pkgs/openldap/openldap.init

diff --git a/pkgs/core/openldap/openldap.nm b/pkgs/openldap/openldap.nm
similarity index 100%
rename from pkgs/core/openldap/openldap.nm
rename to pkgs/openldap/openldap.nm

diff --git a/pkgs/core/openldap/patches/openldap-2.4.17-disable_sys_err.patch b/pkgs/openldap/patches/openldap-2.4.17-disable_sys_err.patch
similarity index 100%
rename from pkgs/core/openldap/patches/openldap-2.4.17-disable_sys_err.patch
rename to pkgs/openldap/patches/openldap-2.4.17-disable_sys_err.patch

diff --git a/pkgs/core/openldap/slapd.conf b/pkgs/openldap/slapd.conf
similarity index 100%
rename from pkgs/core/openldap/slapd.conf
rename to pkgs/openldap/slapd.conf

diff --git a/pkgs/core/openssh/openssh.init b/pkgs/openssh/openssh.init
similarity index 100%
rename from pkgs/core/openssh/openssh.init
rename to pkgs/openssh/openssh.init

diff --git a/pkgs/core/openssh/openssh.nm b/pkgs/openssh/openssh.nm
similarity index 100%
rename from pkgs/core/openssh/openssh.nm
rename to pkgs/openssh/openssh.nm

diff --git a/pkgs/core/openssh/patches/openssh-4.3p2-askpass-grab-info.patch b/pkgs/openssh/patches/openssh-4.3p2-askpass-grab-info.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-4.3p2-askpass-grab-info.patch
rename to pkgs/openssh/patches/openssh-4.3p2-askpass-grab-info.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.1p1-askpass-progress.patch b/pkgs/openssh/patches/openssh-5.1p1-askpass-progress.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.1p1-askpass-progress.patch
rename to pkgs/openssh/patches/openssh-5.1p1-askpass-progress.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.1p1-scp-manpage.patch b/pkgs/openssh/patches/openssh-5.1p1-scp-manpage.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.1p1-scp-manpage.patch
rename to pkgs/openssh/patches/openssh-5.1p1-scp-manpage.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.2p1-allow-ip-opts.patch b/pkgs/openssh/patches/openssh-5.2p1-allow-ip-opts.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.2p1-allow-ip-opts.patch
rename to pkgs/openssh/patches/openssh-5.2p1-allow-ip-opts.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.2p1-edns.patch b/pkgs/openssh/patches/openssh-5.2p1-edns.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.2p1-edns.patch
rename to pkgs/openssh/patches/openssh-5.2p1-edns.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.5p1-x11.patch b/pkgs/openssh/patches/openssh-5.5p1-x11.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.5p1-x11.patch
rename to pkgs/openssh/patches/openssh-5.5p1-x11.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.6p1-exit-deadlock.patch b/pkgs/openssh/patches/openssh-5.6p1-exit-deadlock.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.6p1-exit-deadlock.patch
rename to pkgs/openssh/patches/openssh-5.6p1-exit-deadlock.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.6p1-keygen.patch b/pkgs/openssh/patches/openssh-5.6p1-keygen.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.6p1-keygen.patch
rename to pkgs/openssh/patches/openssh-5.6p1-keygen.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.6p1-redhat.patch b/pkgs/openssh/patches/openssh-5.6p1-redhat.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.6p1-redhat.patch
rename to pkgs/openssh/patches/openssh-5.6p1-redhat.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.8p1-authorized-keys-command.patch b/pkgs/openssh/patches/openssh-5.8p1-authorized-keys-command.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.8p1-authorized-keys-command.patch
rename to pkgs/openssh/patches/openssh-5.8p1-authorized-keys-command.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.8p1-fingerprint.patch b/pkgs/openssh/patches/openssh-5.8p1-fingerprint.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.8p1-fingerprint.patch
rename to pkgs/openssh/patches/openssh-5.8p1-fingerprint.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.8p1-kuserok.patch b/pkgs/openssh/patches/openssh-5.8p1-kuserok.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.8p1-kuserok.patch
rename to pkgs/openssh/patches/openssh-5.8p1-kuserok.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.8p1-mls.patch b/pkgs/openssh/patches/openssh-5.8p1-mls.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.8p1-mls.patch
rename to pkgs/openssh/patches/openssh-5.8p1-mls.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.8p1-randclean.patch b/pkgs/openssh/patches/openssh-5.8p1-randclean.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.8p1-randclean.patch
rename to pkgs/openssh/patches/openssh-5.8p1-randclean.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.8p1-selinux-role.patch b/pkgs/openssh/patches/openssh-5.8p1-selinux-role.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.8p1-selinux-role.patch
rename to pkgs/openssh/patches/openssh-5.8p1-selinux-role.patch

diff --git a/pkgs/core/openssh/patches/openssh-5.8p1-selinux.patch b/pkgs/openssh/patches/openssh-5.8p1-selinux.patch
similarity index 100%
rename from pkgs/core/openssh/patches/openssh-5.8p1-selinux.patch
rename to pkgs/openssh/patches/openssh-5.8p1-selinux.patch

diff --git a/pkgs/core/openssh/sshd.pam b/pkgs/openssh/sshd.pam
similarity index 100%
rename from pkgs/core/openssh/sshd.pam
rename to pkgs/openssh/sshd.pam

diff --git a/pkgs/core/openssh/sshd_config b/pkgs/openssh/sshd_config
similarity index 100%
rename from pkgs/core/openssh/sshd_config
rename to pkgs/openssh/sshd_config

diff --git a/pkgs/core/openssl/openssl.cnf b/pkgs/openssl/openssl.cnf
similarity index 100%
rename from pkgs/core/openssl/openssl.cnf
rename to pkgs/openssl/openssl.cnf

diff --git a/pkgs/core/openssl/openssl.nm b/pkgs/openssl/openssl.nm
similarity index 100%
rename from pkgs/core/openssl/openssl.nm
rename to pkgs/openssl/openssl.nm

diff --git a/pkgs/core/openssl/patches/openssl-0.9.8b-test-use-localhost.patch b/pkgs/openssl/patches/openssl-0.9.8b-test-use-localhost.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-0.9.8b-test-use-localhost.patch
rename to pkgs/openssl/patches/openssl-0.9.8b-test-use-localhost.patch

diff --git a/pkgs/core/openssl/patches/openssl-0.9.8j-env-nozlib.patch b/pkgs/openssl/patches/openssl-0.9.8j-env-nozlib.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-0.9.8j-env-nozlib.patch
rename to pkgs/openssl/patches/openssl-0.9.8j-env-nozlib.patch

diff --git a/pkgs/core/openssl/patches/openssl-0.9.8j-version-add-engines.patch b/pkgs/openssl/patches/openssl-0.9.8j-version-add-engines.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-0.9.8j-version-add-engines.patch
rename to pkgs/openssl/patches/openssl-0.9.8j-version-add-engines.patch

diff --git a/pkgs/core/openssl/patches/openssl-0.9.8k-no-rpath.patch b/pkgs/openssl/patches/openssl-0.9.8k-no-rpath.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-0.9.8k-no-rpath.patch
rename to pkgs/openssl/patches/openssl-0.9.8k-no-rpath.patch

diff --git a/pkgs/core/openssl/patches/openssl-1.0.0-beta3-soversion.patch b/pkgs/openssl/patches/openssl-1.0.0-beta3-soversion.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-1.0.0-beta3-soversion.patch
rename to pkgs/openssl/patches/openssl-1.0.0-beta3-soversion.patch

diff --git a/pkgs/core/openssl/patches/openssl-1.0.0-beta4-redhat.patch b/pkgs/openssl/patches/openssl-1.0.0-beta4-redhat.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-1.0.0-beta4-redhat.patch
rename to pkgs/openssl/patches/openssl-1.0.0-beta4-redhat.patch

diff --git a/pkgs/core/openssl/patches/openssl-1.0.0-beta5-enginesdir.patch b/pkgs/openssl/patches/openssl-1.0.0-beta5-enginesdir.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-1.0.0-beta5-enginesdir.patch
rename to pkgs/openssl/patches/openssl-1.0.0-beta5-enginesdir.patch

diff --git a/pkgs/core/openssl/patches/openssl-1.0.0d-version.patch b/pkgs/openssl/patches/openssl-1.0.0d-version.patch
similarity index 100%
rename from pkgs/core/openssl/patches/openssl-1.0.0d-version.patch
rename to pkgs/openssl/patches/openssl-1.0.0d-version.patch

diff --git a/pkgs/core/openvpn/openvpn.nm b/pkgs/openvpn/openvpn.nm
similarity index 100%
rename from pkgs/core/openvpn/openvpn.nm
rename to pkgs/openvpn/openvpn.nm

diff --git a/pkgs/core/os-prober/os-prober.nm b/pkgs/os-prober/os-prober.nm
similarity index 100%
rename from pkgs/core/os-prober/os-prober.nm
rename to pkgs/os-prober/os-prober.nm

diff --git a/pkgs/core/pakfire/pakfire.nm b/pkgs/pakfire/pakfire.nm
similarity index 100%
rename from pkgs/core/pakfire/pakfire.nm
rename to pkgs/pakfire/pakfire.nm

diff --git a/pkgs/core/pakfire/src/Makefile b/pkgs/pakfire/src/Makefile
similarity index 100%
rename from pkgs/core/pakfire/src/Makefile
rename to pkgs/pakfire/src/Makefile

diff --git a/pkgs/core/pakfire/src/decompressor b/pkgs/pakfire/src/decompressor
similarity index 100%
rename from pkgs/core/pakfire/src/decompressor
rename to pkgs/pakfire/src/decompressor

diff --git a/pkgs/core/pakfire/src/functions b/pkgs/pakfire/src/functions
similarity index 100%
rename from pkgs/core/pakfire/src/functions
rename to pkgs/pakfire/src/functions

diff --git a/pkgs/core/pakfire/src/index b/pkgs/pakfire/src/index
similarity index 100%
rename from pkgs/core/pakfire/src/index
rename to pkgs/pakfire/src/index

diff --git a/pkgs/core/pakfire/src/pakfire.in b/pkgs/pakfire/src/pakfire.in
similarity index 100%
rename from pkgs/core/pakfire/src/pakfire.in
rename to pkgs/pakfire/src/pakfire.in

diff --git a/pkgs/core/pakfire/src/pakfire.sh b/pkgs/pakfire/src/pakfire.sh
similarity index 100%
rename from pkgs/core/pakfire/src/pakfire.sh
rename to pkgs/pakfire/src/pakfire.sh

diff --git a/pkgs/core/pakfire/src/python/__init__.py b/pkgs/pakfire/src/python/__init__.py
similarity index 100%
rename from pkgs/core/pakfire/src/python/__init__.py
rename to pkgs/pakfire/src/python/__init__.py

diff --git a/pkgs/core/pakfire/src/python/db.py b/pkgs/pakfire/src/python/db.py
similarity index 100%
rename from pkgs/core/pakfire/src/python/db.py
rename to pkgs/pakfire/src/python/db.py

diff --git a/pkgs/core/pakfire/src/python/io.py b/pkgs/pakfire/src/python/io.py
similarity index 100%
rename from pkgs/core/pakfire/src/python/io.py
rename to pkgs/pakfire/src/python/io.py

diff --git a/pkgs/core/pakfire/src/python/package.py b/pkgs/pakfire/src/python/package.py
similarity index 100%
rename from pkgs/core/pakfire/src/python/package.py
rename to pkgs/pakfire/src/python/package.py

diff --git a/pkgs/core/pakfire/src/python/repo.py b/pkgs/pakfire/src/python/repo.py
similarity index 100%
rename from pkgs/core/pakfire/src/python/repo.py
rename to pkgs/pakfire/src/python/repo.py

diff --git a/pkgs/core/pakfire/src/python/servers.py b/pkgs/pakfire/src/python/servers.py
similarity index 100%
rename from pkgs/core/pakfire/src/python/servers.py
rename to pkgs/pakfire/src/python/servers.py

diff --git a/pkgs/core/pakfire/src/python/transactionset.py b/pkgs/pakfire/src/python/transactionset.py
similarity index 100%
rename from pkgs/core/pakfire/src/python/transactionset.py
rename to pkgs/pakfire/src/python/transactionset.py

diff --git a/pkgs/core/pam/login.defs b/pkgs/pam/login.defs
similarity index 100%
rename from pkgs/core/pam/login.defs
rename to pkgs/pam/login.defs

diff --git a/pkgs/core/pam/pam.d/other b/pkgs/pam/pam.d/other
similarity index 100%
rename from pkgs/core/pam/pam.d/other
rename to pkgs/pam/pam.d/other

diff --git a/pkgs/core/pam/pam.d/system-auth b/pkgs/pam/pam.d/system-auth
similarity index 100%
rename from pkgs/core/pam/pam.d/system-auth
rename to pkgs/pam/pam.d/system-auth

diff --git a/pkgs/core/pam/pam.nm b/pkgs/pam/pam.nm
similarity index 100%
rename from pkgs/core/pam/pam.nm
rename to pkgs/pam/pam.nm

diff --git a/pkgs/core/pam/pam_env.conf b/pkgs/pam/pam_env.conf
similarity index 100%
rename from pkgs/core/pam/pam_env.conf
rename to pkgs/pam/pam_env.conf

diff --git a/pkgs/core/pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch b/pkgs/pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch
similarity index 100%
rename from pkgs/core/pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch
rename to pkgs/pam/patches/Linux-PAM-1.1.0-no-yywrap-1.patch

diff --git a/pkgs/core/pam/securetty b/pkgs/pam/securetty
similarity index 100%
rename from pkgs/core/pam/securetty
rename to pkgs/pam/securetty

diff --git a/pkgs/core/pam_ldap/pam_ldap.nm b/pkgs/pam_ldap/pam_ldap.nm
similarity index 100%
rename from pkgs/core/pam_ldap/pam_ldap.nm
rename to pkgs/pam_ldap/pam_ldap.nm

diff --git a/pkgs/core/pango/pango.nm b/pkgs/pango/pango.nm
similarity index 100%
rename from pkgs/core/pango/pango.nm
rename to pkgs/pango/pango.nm

diff --git a/pkgs/core/parted/parted.nm b/pkgs/parted/parted.nm
similarity index 100%
rename from pkgs/core/parted/parted.nm
rename to pkgs/parted/parted.nm

diff --git a/pkgs/core/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch b/pkgs/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch
similarity index 100%
rename from pkgs/core/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch
rename to pkgs/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch

diff --git a/pkgs/core/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch b/pkgs/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch
similarity index 100%
rename from pkgs/core/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch
rename to pkgs/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch

diff --git a/pkgs/core/parted/patches/parted-2.1-default-alignment.patch b/pkgs/parted/patches/parted-2.1-default-alignment.patch
similarity index 100%
rename from pkgs/core/parted/patches/parted-2.1-default-alignment.patch
rename to pkgs/parted/patches/parted-2.1-default-alignment.patch

diff --git a/pkgs/core/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch b/pkgs/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch
similarity index 100%
rename from pkgs/core/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch
rename to pkgs/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch

diff --git a/pkgs/core/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch b/pkgs/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch
similarity index 100%
rename from pkgs/core/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch
rename to pkgs/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch

diff --git a/pkgs/core/parted/patches/parted-2.1-needs_clobber-rh566181.patch b/pkgs/parted/patches/parted-2.1-needs_clobber-rh566181.patch
similarity index 100%
rename from pkgs/core/parted/patches/parted-2.1-needs_clobber-rh566181.patch
rename to pkgs/parted/patches/parted-2.1-needs_clobber-rh566181.patch

diff --git a/pkgs/core/passwd/passwd.nm b/pkgs/passwd/passwd.nm
similarity index 100%
rename from pkgs/core/passwd/passwd.nm
rename to pkgs/passwd/passwd.nm

diff --git a/pkgs/core/passwd/passwd.pam b/pkgs/passwd/passwd.pam
similarity index 100%
rename from pkgs/core/passwd/passwd.pam
rename to pkgs/passwd/passwd.pam

diff --git a/pkgs/core/patch/patch.nm b/pkgs/patch/patch.nm
similarity index 100%
rename from pkgs/core/patch/patch.nm
rename to pkgs/patch/patch.nm

diff --git a/pkgs/core/patch/patches/patch-2.5.4-sigsegv.patch b/pkgs/patch/patches/patch-2.5.4-sigsegv.patch
similarity index 100%
rename from pkgs/core/patch/patches/patch-2.5.4-sigsegv.patch
rename to pkgs/patch/patches/patch-2.5.4-sigsegv.patch

diff --git a/pkgs/core/pax-utils/pax-utils.nm b/pkgs/pax-utils/pax-utils.nm
similarity index 100%
rename from pkgs/core/pax-utils/pax-utils.nm
rename to pkgs/pax-utils/pax-utils.nm

diff --git a/pkgs/core/paxctl/paxctl.nm b/pkgs/paxctl/paxctl.nm
similarity index 100%
rename from pkgs/core/paxctl/paxctl.nm
rename to pkgs/paxctl/paxctl.nm

diff --git a/pkgs/core/paxtest/paxtest.nm b/pkgs/paxtest/paxtest.nm
similarity index 100%
rename from pkgs/core/paxtest/paxtest.nm
rename to pkgs/paxtest/paxtest.nm

diff --git a/pkgs/core/pcapy/pcapy.nm b/pkgs/pcapy/pcapy.nm
similarity index 100%
rename from pkgs/core/pcapy/pcapy.nm
rename to pkgs/pcapy/pcapy.nm

diff --git a/pkgs/core/pciutils/pciutils.nm b/pkgs/pciutils/pciutils.nm
similarity index 100%
rename from pkgs/core/pciutils/pciutils.nm
rename to pkgs/pciutils/pciutils.nm

diff --git a/pkgs/core/pcre/pcre.nm b/pkgs/pcre/pcre.nm
similarity index 100%
rename from pkgs/core/pcre/pcre.nm
rename to pkgs/pcre/pcre.nm

diff --git a/pkgs/core/pdns-recursor/patches/pdns-recursor-fixmakefile.patch b/pkgs/pdns-recursor/patches/pdns-recursor-fixmakefile.patch
similarity index 100%
rename from pkgs/core/pdns-recursor/patches/pdns-recursor-fixmakefile.patch
rename to pkgs/pdns-recursor/patches/pdns-recursor-fixmakefile.patch

diff --git a/pkgs/core/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch b/pkgs/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
similarity index 100%
rename from pkgs/core/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
rename to pkgs/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch

diff --git a/pkgs/core/pdns-recursor/pdns-recursor.init b/pkgs/pdns-recursor/pdns-recursor.init
similarity index 100%
rename from pkgs/core/pdns-recursor/pdns-recursor.init
rename to pkgs/pdns-recursor/pdns-recursor.init

diff --git a/pkgs/core/pdns-recursor/pdns-recursor.nm b/pkgs/pdns-recursor/pdns-recursor.nm
similarity index 100%
rename from pkgs/core/pdns-recursor/pdns-recursor.nm
rename to pkgs/pdns-recursor/pdns-recursor.nm

diff --git a/pkgs/core/pdns/patches/pdns-2.9.22-gcc44-fixes.patch b/pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch
similarity index 100%
rename from pkgs/core/pdns/patches/pdns-2.9.22-gcc44-fixes.patch
rename to pkgs/pdns/patches/pdns-2.9.22-gcc44-fixes.patch

diff --git a/pkgs/core/pdns/pdns.nm b/pkgs/pdns/pdns.nm
similarity index 100%
rename from pkgs/core/pdns/pdns.nm
rename to pkgs/pdns/pdns.nm

diff --git a/pkgs/core/perl-XML-Parser/perl-XML-Parser.nm b/pkgs/perl-XML-Parser/perl-XML-Parser.nm
similarity index 100%
rename from pkgs/core/perl-XML-Parser/perl-XML-Parser.nm
rename to pkgs/perl-XML-Parser/perl-XML-Parser.nm

diff --git a/pkgs/core/perl/patches/perl-5.10.0-libresolv.patch b/pkgs/perl/patches/perl-5.10.0-libresolv.patch
similarity index 100%
rename from pkgs/core/perl/patches/perl-5.10.0-libresolv.patch
rename to pkgs/perl/patches/perl-5.10.0-libresolv.patch

diff --git a/pkgs/core/perl/patches/perl-5.8.0-libdir64.patch b/pkgs/perl/patches/perl-5.8.0-libdir64.patch
similarity index 100%
rename from pkgs/core/perl/patches/perl-5.8.0-libdir64.patch
rename to pkgs/perl/patches/perl-5.8.0-libdir64.patch

diff --git a/pkgs/core/perl/patches/perl-5.8.8-rpath-make.patch b/pkgs/perl/patches/perl-5.8.8-rpath-make.patch
similarity index 100%
rename from pkgs/core/perl/patches/perl-5.8.8-rpath-make.patch
rename to pkgs/perl/patches/perl-5.8.8-rpath-make.patch

diff --git a/pkgs/core/perl/patches/perl-USE_MM_LD_RUN_PATH.patch b/pkgs/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
similarity index 100%
rename from pkgs/core/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
rename to pkgs/perl/patches/perl-USE_MM_LD_RUN_PATH.patch

diff --git a/pkgs/core/perl/patches/perl-disable_test_hosts.patch b/pkgs/perl/patches/perl-disable_test_hosts.patch
similarity index 100%
rename from pkgs/core/perl/patches/perl-disable_test_hosts.patch
rename to pkgs/perl/patches/perl-disable_test_hosts.patch

diff --git a/pkgs/core/perl/patches/perl-perlbug-tag.patch b/pkgs/perl/patches/perl-perlbug-tag.patch
similarity index 100%
rename from pkgs/core/perl/patches/perl-perlbug-tag.patch
rename to pkgs/perl/patches/perl-perlbug-tag.patch

diff --git a/pkgs/core/perl/perl.nm b/pkgs/perl/perl.nm
similarity index 100%
rename from pkgs/core/perl/perl.nm
rename to pkgs/perl/perl.nm

diff --git a/pkgs/core/pinentry/pinentry.nm b/pkgs/pinentry/pinentry.nm
similarity index 100%
rename from pkgs/core/pinentry/pinentry.nm
rename to pkgs/pinentry/pinentry.nm

diff --git a/pkgs/core/pixman/pixman.nm b/pkgs/pixman/pixman.nm
similarity index 100%
rename from pkgs/core/pixman/pixman.nm
rename to pkgs/pixman/pixman.nm

diff --git a/pkgs/core/pkg-config/patches/pkg-config-0.25-autoconf-1.patch b/pkgs/pkg-config/patches/pkg-config-0.25-autoconf-1.patch
similarity index 100%
rename from pkgs/core/pkg-config/patches/pkg-config-0.25-autoconf-1.patch
rename to pkgs/pkg-config/patches/pkg-config-0.25-autoconf-1.patch

diff --git a/pkgs/core/pkg-config/pkg-config.nm b/pkgs/pkg-config/pkg-config.nm
similarity index 100%
rename from pkgs/core/pkg-config/pkg-config.nm
rename to pkgs/pkg-config/pkg-config.nm

diff --git a/pkgs/core/polkit/polkit.nm b/pkgs/polkit/polkit.nm
similarity index 100%
rename from pkgs/core/polkit/polkit.nm
rename to pkgs/polkit/polkit.nm

diff --git a/pkgs/core/popt/popt.nm b/pkgs/popt/popt.nm
similarity index 100%
rename from pkgs/core/popt/popt.nm
rename to pkgs/popt/popt.nm

diff --git a/pkgs/core/powertop/powertop.nm b/pkgs/powertop/powertop.nm
similarity index 100%
rename from pkgs/core/powertop/powertop.nm
rename to pkgs/powertop/powertop.nm

diff --git a/pkgs/core/ppl/patches/ppl-0.10.2-Makefile.patch b/pkgs/ppl/patches/ppl-0.10.2-Makefile.patch
similarity index 100%
rename from pkgs/core/ppl/patches/ppl-0.10.2-Makefile.patch
rename to pkgs/ppl/patches/ppl-0.10.2-Makefile.patch

diff --git a/pkgs/core/ppl/patches/ppl-0.10.2-gmp-build-fix.patch b/pkgs/ppl/patches/ppl-0.10.2-gmp-build-fix.patch
similarity index 100%
rename from pkgs/core/ppl/patches/ppl-0.10.2-gmp-build-fix.patch
rename to pkgs/ppl/patches/ppl-0.10.2-gmp-build-fix.patch

diff --git a/pkgs/core/ppl/patches/ppl-0.10.2-m4-update.patch b/pkgs/ppl/patches/ppl-0.10.2-m4-update.patch
similarity index 100%
rename from pkgs/core/ppl/patches/ppl-0.10.2-m4-update.patch
rename to pkgs/ppl/patches/ppl-0.10.2-m4-update.patch

diff --git a/pkgs/core/ppl/ppl.nm b/pkgs/ppl/ppl.nm
similarity index 100%
rename from pkgs/core/ppl/ppl.nm
rename to pkgs/ppl/ppl.nm

diff --git a/pkgs/core/ppp/patches/ppp-2.4.2-ifname.patch b/pkgs/ppp/patches/ppp-2.4.2-ifname.patch
similarity index 100%
rename from pkgs/core/ppp/patches/ppp-2.4.2-ifname.patch
rename to pkgs/ppp/patches/ppp-2.4.2-ifname.patch

diff --git a/pkgs/core/ppp/patches/ppp-2.4.4-dontwriteetc.patch b/pkgs/ppp/patches/ppp-2.4.4-dontwriteetc.patch
similarity index 100%
rename from pkgs/core/ppp/patches/ppp-2.4.4-dontwriteetc.patch
rename to pkgs/ppp/patches/ppp-2.4.4-dontwriteetc.patch

diff --git a/pkgs/core/ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch b/pkgs/ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch
similarity index 100%
rename from pkgs/core/ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch
rename to pkgs/ppp/patches/ppp-2.4.4-ipv6-accept-remote.patch

diff --git a/pkgs/core/ppp/patches/ppp-2.4.4-libutil.patch b/pkgs/ppp/patches/ppp-2.4.4-libutil.patch
similarity index 100%
rename from pkgs/core/ppp/patches/ppp-2.4.4-libutil.patch
rename to pkgs/ppp/patches/ppp-2.4.4-libutil.patch

diff --git a/pkgs/core/ppp/patches/ppp-2.4.4-local.patch b/pkgs/ppp/patches/ppp-2.4.4-local.patch
similarity index 100%
rename from pkgs/core/ppp/patches/ppp-2.4.4-local.patch
rename to pkgs/ppp/patches/ppp-2.4.4-local.patch

diff --git a/pkgs/core/ppp/patches/ppp-2.4.4-pie.patch b/pkgs/ppp/patches/ppp-2.4.4-pie.patch
similarity index 100%
rename from pkgs/core/ppp/patches/ppp-2.4.4-pie.patch
rename to pkgs/ppp/patches/ppp-2.4.4-pie.patch

diff --git a/pkgs/core/ppp/patches/ppp-2.4.5-var_run_ppp.patch b/pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch
similarity index 100%
rename from pkgs/core/ppp/patches/ppp-2.4.5-var_run_ppp.patch
rename to pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch

diff --git a/pkgs/core/ppp/ppp.nm b/pkgs/ppp/ppp.nm
similarity index 100%
rename from pkgs/core/ppp/ppp.nm
rename to pkgs/ppp/ppp.nm

diff --git a/pkgs/core/ppp/ppp.pam b/pkgs/ppp/ppp.pam
similarity index 100%
rename from pkgs/core/ppp/ppp.pam
rename to pkgs/ppp/ppp.pam

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-compat.patch b/pkgs/pptp/patches/pptp-1.7.2-compat.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-compat.patch
rename to pkgs/pptp/patches/pptp-1.7.2-compat.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-conn-free.patch b/pkgs/pptp/patches/pptp-1.7.2-conn-free.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-conn-free.patch
rename to pkgs/pptp/patches/pptp-1.7.2-conn-free.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-conn-free2.patch b/pkgs/pptp/patches/pptp-1.7.2-conn-free2.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-conn-free2.patch
rename to pkgs/pptp/patches/pptp-1.7.2-conn-free2.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-ip-path.patch b/pkgs/pptp/patches/pptp-1.7.2-ip-path.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-ip-path.patch
rename to pkgs/pptp/patches/pptp-1.7.2-ip-path.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-makedeps.patch b/pkgs/pptp/patches/pptp-1.7.2-makedeps.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-makedeps.patch
rename to pkgs/pptp/patches/pptp-1.7.2-makedeps.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch b/pkgs/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch
rename to pkgs/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch b/pkgs/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch
rename to pkgs/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup.patch b/pkgs/pptp/patches/pptp-1.7.2-pptpsetup.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup.patch
rename to pkgs/pptp/patches/pptp-1.7.2-pptpsetup.patch

diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-waitpid.patch b/pkgs/pptp/patches/pptp-1.7.2-waitpid.patch
similarity index 100%
rename from pkgs/core/pptp/patches/pptp-1.7.2-waitpid.patch
rename to pkgs/pptp/patches/pptp-1.7.2-waitpid.patch

diff --git a/pkgs/core/pptp/pptp.nm b/pkgs/pptp/pptp.nm
similarity index 100%
rename from pkgs/core/pptp/pptp.nm
rename to pkgs/pptp/pptp.nm

diff --git a/pkgs/core/procps/patches/procps-3.2.8-selinux.patch b/pkgs/procps/patches/procps-3.2.8-selinux.patch
similarity index 100%
rename from pkgs/core/procps/patches/procps-3.2.8-selinux.patch
rename to pkgs/procps/patches/procps-3.2.8-selinux.patch

diff --git a/pkgs/core/procps/patches/procps-3.2.8-watch_unicode-2.patch b/pkgs/procps/patches/procps-3.2.8-watch_unicode-2.patch
similarity index 100%
rename from pkgs/core/procps/patches/procps-3.2.8-watch_unicode-2.patch
rename to pkgs/procps/patches/procps-3.2.8-watch_unicode-2.patch

diff --git a/pkgs/core/procps/procps.nm b/pkgs/procps/procps.nm
similarity index 100%
rename from pkgs/core/procps/procps.nm
rename to pkgs/procps/procps.nm

diff --git a/pkgs/core/psmisc/psmisc.nm b/pkgs/psmisc/psmisc.nm
similarity index 100%
rename from pkgs/core/psmisc/psmisc.nm
rename to pkgs/psmisc/psmisc.nm

diff --git a/pkgs/core/pth/pth.nm b/pkgs/pth/pth.nm
similarity index 100%
rename from pkgs/core/pth/pth.nm
rename to pkgs/pth/pth.nm

diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch b/pkgs/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch
similarity index 100%
rename from pkgs/core/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch
rename to pkgs/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch

diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch b/pkgs/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch
similarity index 100%
rename from pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch
rename to pkgs/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch

diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch b/pkgs/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
similarity index 100%
rename from pkgs/core/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
rename to pkgs/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch

diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch b/pkgs/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
similarity index 100%
rename from pkgs/core/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
rename to pkgs/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch

diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/pyQt/pyQt.nm
similarity index 100%
rename from pkgs/core/pyQt/pyQt.nm
rename to pkgs/pyQt/pyQt.nm

diff --git a/pkgs/core/pychecker/pychecker.nm b/pkgs/pychecker/pychecker.nm
similarity index 100%
rename from pkgs/core/pychecker/pychecker.nm
rename to pkgs/pychecker/pychecker.nm

diff --git a/pkgs/core/pyfire/pyfire.nm b/pkgs/pyfire/pyfire.nm
similarity index 100%
rename from pkgs/core/pyfire/pyfire.nm
rename to pkgs/pyfire/pyfire.nm

diff --git a/pkgs/core/pyfire/src/Makefile b/pkgs/pyfire/src/Makefile
similarity index 100%
rename from pkgs/core/pyfire/src/Makefile
rename to pkgs/pyfire/src/Makefile

diff --git a/pkgs/core/pyfire/src/__init__.py b/pkgs/pyfire/src/__init__.py
similarity index 100%
rename from pkgs/core/pyfire/src/__init__.py
rename to pkgs/pyfire/src/__init__.py

diff --git a/pkgs/core/pyfire/src/config.py b/pkgs/pyfire/src/config.py
similarity index 100%
rename from pkgs/core/pyfire/src/config.py
rename to pkgs/pyfire/src/config.py

diff --git a/pkgs/core/pyfire/src/executil.py b/pkgs/pyfire/src/executil.py
similarity index 100%
rename from pkgs/core/pyfire/src/executil.py
rename to pkgs/pyfire/src/executil.py

diff --git a/pkgs/core/pyfire/src/hal.py b/pkgs/pyfire/src/hal.py
similarity index 100%
rename from pkgs/core/pyfire/src/hal.py
rename to pkgs/pyfire/src/hal.py

diff --git a/pkgs/core/pyfire/src/net.py b/pkgs/pyfire/src/net.py
similarity index 100%
rename from pkgs/core/pyfire/src/net.py
rename to pkgs/pyfire/src/net.py

diff --git a/pkgs/core/pyfire/src/web.py b/pkgs/pyfire/src/web.py
similarity index 100%
rename from pkgs/core/pyfire/src/web.py
rename to pkgs/pyfire/src/web.py

diff --git a/pkgs/core/pygobject2/pygobject2.nm b/pkgs/pygobject2/pygobject2.nm
similarity index 100%
rename from pkgs/core/pygobject2/pygobject2.nm
rename to pkgs/pygobject2/pygobject2.nm

diff --git a/pkgs/core/pyliblzma/patches/no-script-liblzma.patch b/pkgs/pyliblzma/patches/no-script-liblzma.patch
similarity index 100%
rename from pkgs/core/pyliblzma/patches/no-script-liblzma.patch
rename to pkgs/pyliblzma/patches/no-script-liblzma.patch

diff --git a/pkgs/core/pyliblzma/pyliblzma.nm b/pkgs/pyliblzma/pyliblzma.nm
similarity index 100%
rename from pkgs/core/pyliblzma/pyliblzma.nm
rename to pkgs/pyliblzma/pyliblzma.nm

diff --git a/pkgs/core/python-IPy/python-IPy.nm b/pkgs/python-IPy/python-IPy.nm
similarity index 100%
rename from pkgs/core/python-IPy/python-IPy.nm
rename to pkgs/python-IPy/python-IPy.nm

diff --git a/pkgs/core/python-cairo/python-cairo.nm b/pkgs/python-cairo/python-cairo.nm
similarity index 100%
rename from pkgs/core/python-cairo/python-cairo.nm
rename to pkgs/python-cairo/python-cairo.nm

diff --git a/pkgs/core/python-cryptsetup/python-cryptsetup.nm b/pkgs/python-cryptsetup/python-cryptsetup.nm
similarity index 100%
rename from pkgs/core/python-cryptsetup/python-cryptsetup.nm
rename to pkgs/python-cryptsetup/python-cryptsetup.nm

diff --git a/pkgs/core/python-dbus/python-dbus.nm b/pkgs/python-dbus/python-dbus.nm
similarity index 100%
rename from pkgs/core/python-dbus/python-dbus.nm
rename to pkgs/python-dbus/python-dbus.nm

diff --git a/pkgs/core/python-decorator/python-decorator.nm b/pkgs/python-decorator/python-decorator.nm
similarity index 100%
rename from pkgs/core/python-decorator/python-decorator.nm
rename to pkgs/python-decorator/python-decorator.nm

diff --git a/pkgs/core/python-distutils-extra/python-distutils-extra.nm b/pkgs/python-distutils-extra/python-distutils-extra.nm
similarity index 100%
rename from pkgs/core/python-distutils-extra/python-distutils-extra.nm
rename to pkgs/python-distutils-extra/python-distutils-extra.nm

diff --git a/pkgs/core/python-gudev/python-gudev.nm b/pkgs/python-gudev/python-gudev.nm
similarity index 100%
rename from pkgs/core/python-gudev/python-gudev.nm
rename to pkgs/python-gudev/python-gudev.nm

diff --git a/pkgs/core/python-netfilter_conntrack/python-netfilter_conntrack.nm b/pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm
similarity index 100%
rename from pkgs/core/python-netfilter_conntrack/python-netfilter_conntrack.nm
rename to pkgs/python-netfilter_conntrack/python-netfilter_conntrack.nm

diff --git a/pkgs/core/python-parted/python-parted.nm b/pkgs/python-parted/python-parted.nm
similarity index 100%
rename from pkgs/core/python-parted/python-parted.nm
rename to pkgs/python-parted/python-parted.nm

diff --git a/pkgs/core/python-piksemel/python-piksemel.nm b/pkgs/python-piksemel/python-piksemel.nm
similarity index 100%
rename from pkgs/core/python-piksemel/python-piksemel.nm
rename to pkgs/python-piksemel/python-piksemel.nm

diff --git a/pkgs/core/python-progressbar/python-progressbar.nm b/pkgs/python-progressbar/python-progressbar.nm
similarity index 100%
rename from pkgs/core/python-progressbar/python-progressbar.nm
rename to pkgs/python-progressbar/python-progressbar.nm

diff --git a/pkgs/core/python-pyaspects/python-pyaspects.nm b/pkgs/python-pyaspects/python-pyaspects.nm
similarity index 100%
rename from pkgs/core/python-pyaspects/python-pyaspects.nm
rename to pkgs/python-pyaspects/python-pyaspects.nm

diff --git a/pkgs/core/python-pyblock/python-pyblock.nm b/pkgs/python-pyblock/python-pyblock.nm
similarity index 100%
rename from pkgs/core/python-pyblock/python-pyblock.nm
rename to pkgs/python-pyblock/python-pyblock.nm

diff --git a/pkgs/core/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch b/pkgs/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch
similarity index 100%
rename from pkgs/core/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch
rename to pkgs/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch

diff --git a/pkgs/core/python-pycurl/patches/python-pycurl-no-static-libs.patch0 b/pkgs/python-pycurl/patches/python-pycurl-no-static-libs.patch0
similarity index 100%
rename from pkgs/core/python-pycurl/patches/python-pycurl-no-static-libs.patch0
rename to pkgs/python-pycurl/patches/python-pycurl-no-static-libs.patch0

diff --git a/pkgs/core/python-pycurl/python-pycurl.nm b/pkgs/python-pycurl/python-pycurl.nm
similarity index 100%
rename from pkgs/core/python-pycurl/python-pycurl.nm
rename to pkgs/python-pycurl/python-pycurl.nm

diff --git a/pkgs/core/python-qtermwidget/patches/addStartShell.patch b/pkgs/python-qtermwidget/patches/addStartShell.patch
similarity index 100%
rename from pkgs/core/python-qtermwidget/patches/addStartShell.patch
rename to pkgs/python-qtermwidget/patches/addStartShell.patch

diff --git a/pkgs/core/python-qtermwidget/python-qtermwidget.nm b/pkgs/python-qtermwidget/python-qtermwidget.nm
similarity index 100%
rename from pkgs/core/python-qtermwidget/python-qtermwidget.nm
rename to pkgs/python-qtermwidget/python-qtermwidget.nm

diff --git a/pkgs/core/python-setuptools/python-setuptools.nm b/pkgs/python-setuptools/python-setuptools.nm
similarity index 100%
rename from pkgs/core/python-setuptools/python-setuptools.nm
rename to pkgs/python-setuptools/python-setuptools.nm

diff --git a/pkgs/core/python-tornado/python-tornado.nm b/pkgs/python-tornado/python-tornado.nm
similarity index 100%
rename from pkgs/core/python-tornado/python-tornado.nm
rename to pkgs/python-tornado/python-tornado.nm

diff --git a/pkgs/core/python-urlgrabber/patches/urlgrabber-HEAD.patch b/pkgs/python-urlgrabber/patches/urlgrabber-HEAD.patch
similarity index 100%
rename from pkgs/core/python-urlgrabber/patches/urlgrabber-HEAD.patch
rename to pkgs/python-urlgrabber/patches/urlgrabber-HEAD.patch

diff --git a/pkgs/core/python-urlgrabber/python-urlgrabber.nm b/pkgs/python-urlgrabber/python-urlgrabber.nm
similarity index 100%
rename from pkgs/core/python-urlgrabber/python-urlgrabber.nm
rename to pkgs/python-urlgrabber/python-urlgrabber.nm

diff --git a/pkgs/core/python/patches/python-2.3.4-lib64-regex.patch b/pkgs/python/patches/python-2.3.4-lib64-regex.patch
similarity index 100%
rename from pkgs/core/python/patches/python-2.3.4-lib64-regex.patch
rename to pkgs/python/patches/python-2.3.4-lib64-regex.patch

diff --git a/pkgs/core/python/patches/python-2.5-cflags.patch b/pkgs/python/patches/python-2.5-cflags.patch
similarity index 100%
rename from pkgs/core/python/patches/python-2.5-cflags.patch
rename to pkgs/python/patches/python-2.5-cflags.patch

diff --git a/pkgs/core/python/patches/python-2.6-rpath.patch b/pkgs/python/patches/python-2.6-rpath.patch
similarity index 100%
rename from pkgs/core/python/patches/python-2.6-rpath.patch
rename to pkgs/python/patches/python-2.6-rpath.patch

diff --git a/pkgs/core/python/patches/python-2.6.4-distutils-rpath.patch b/pkgs/python/patches/python-2.6.4-distutils-rpath.patch
similarity index 100%
rename from pkgs/core/python/patches/python-2.6.4-distutils-rpath.patch
rename to pkgs/python/patches/python-2.6.4-distutils-rpath.patch

diff --git a/pkgs/core/python/patches/python-2.7rc1-ctypes-noexecmem.patch b/pkgs/python/patches/python-2.7rc1-ctypes-noexecmem.patch
similarity index 100%
rename from pkgs/core/python/patches/python-2.7rc1-ctypes-noexecmem.patch
rename to pkgs/python/patches/python-2.7rc1-ctypes-noexecmem.patch

diff --git a/pkgs/core/python/python.nm b/pkgs/python/python.nm
similarity index 100%
rename from pkgs/core/python/python.nm
rename to pkgs/python/python.nm

diff --git a/pkgs/core/pyxattr/pyxattr.nm b/pkgs/pyxattr/pyxattr.nm
similarity index 100%
rename from pkgs/core/pyxattr/pyxattr.nm
rename to pkgs/pyxattr/pyxattr.nm

diff --git a/pkgs/core/qemu/qemu.nm b/pkgs/qemu/qemu.nm
similarity index 100%
rename from pkgs/core/qemu/qemu.nm
rename to pkgs/qemu/qemu.nm

diff --git a/pkgs/core/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch b/pkgs/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
similarity index 100%
rename from pkgs/core/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch
rename to pkgs/qt/patches/0002-This-patch-makes-override-redirect-windows-popup-men.patch

diff --git a/pkgs/core/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch b/pkgs/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
similarity index 100%
rename from pkgs/core/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
rename to pkgs/qt/patches/0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch

diff --git a/pkgs/core/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch b/pkgs/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
similarity index 100%
rename from pkgs/core/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
rename to pkgs/qt/patches/0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch

diff --git a/pkgs/core/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch b/pkgs/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
similarity index 100%
rename from pkgs/core/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch
rename to pkgs/qt/patches/0012-Add-context-to-tr-calls-in-QShortcut.patch

diff --git a/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch b/pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch
rename to pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562049.patch

diff --git a/pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch b/pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch
rename to pkgs/qt/patches/qt-4.6.3-bn-rendering-bz562058.patch

diff --git a/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch b/pkgs/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch
rename to pkgs/qt/patches/qt-4.6.3-indic-rendering-bz631732.patch

diff --git a/pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch b/pkgs/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch
rename to pkgs/qt/patches/qt-4.6.3-indic-rendering-bz636399.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-13567-QTreeView.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch

diff --git a/pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch b/pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch
rename to pkgs/qt/patches/qt-everywhere-opensource-src-4.7.0-bpp24.patch

diff --git a/pkgs/core/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch b/pkgs/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch
rename to pkgs/qt/patches/qt-x11-opensource-src-4.2.2-multilib-optflags.patch

diff --git a/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch b/pkgs/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
rename to pkgs/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch

diff --git a/pkgs/core/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch b/pkgs/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
similarity index 100%
rename from pkgs/core/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
rename to pkgs/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch

diff --git a/pkgs/core/qt/qt.nm b/pkgs/qt/qt.nm
similarity index 100%
rename from pkgs/core/qt/qt.nm
rename to pkgs/qt/qt.nm

diff --git a/pkgs/core/qtermwidget/patches/shared.patch b/pkgs/qtermwidget/patches/shared.patch
similarity index 100%
rename from pkgs/core/qtermwidget/patches/shared.patch
rename to pkgs/qtermwidget/patches/shared.patch

diff --git a/pkgs/core/qtermwidget/qtermwidget.nm b/pkgs/qtermwidget/qtermwidget.nm
similarity index 100%
rename from pkgs/core/qtermwidget/qtermwidget.nm
rename to pkgs/qtermwidget/qtermwidget.nm

diff --git a/pkgs/core/quagga/quagga.nm b/pkgs/quagga/quagga.nm
similarity index 100%
rename from pkgs/core/quagga/quagga.nm
rename to pkgs/quagga/quagga.nm

diff --git a/pkgs/core/radvd/radvd.init b/pkgs/radvd/radvd.init
similarity index 100%
rename from pkgs/core/radvd/radvd.init
rename to pkgs/radvd/radvd.init

diff --git a/pkgs/core/radvd/radvd.nm b/pkgs/radvd/radvd.nm
similarity index 100%
rename from pkgs/core/radvd/radvd.nm
rename to pkgs/radvd/radvd.nm

diff --git a/pkgs/core/readline/inputrc b/pkgs/readline/inputrc
similarity index 100%
rename from pkgs/core/readline/inputrc
rename to pkgs/readline/inputrc

diff --git a/pkgs/core/readline/patches/readline-6.1-audit.patch b/pkgs/readline/patches/readline-6.1-audit.patch
similarity index 100%
rename from pkgs/core/readline/patches/readline-6.1-audit.patch
rename to pkgs/readline/patches/readline-6.1-audit.patch

diff --git a/pkgs/core/readline/patches/readline-6.2-shlib.patch b/pkgs/readline/patches/readline-6.2-shlib.patch
similarity index 100%
rename from pkgs/core/readline/patches/readline-6.2-shlib.patch
rename to pkgs/readline/patches/readline-6.2-shlib.patch

diff --git a/pkgs/core/readline/readline.nm b/pkgs/readline/readline.nm
similarity index 100%
rename from pkgs/core/readline/readline.nm
rename to pkgs/readline/readline.nm

diff --git a/pkgs/core/readline/readline.sh b/pkgs/readline/readline.sh
similarity index 100%
rename from pkgs/core/readline/readline.sh
rename to pkgs/readline/readline.sh

diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch b/pkgs/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch
similarity index 100%
rename from pkgs/core/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch
rename to pkgs/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch

diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-libaal.patch b/pkgs/reiser4progs/patches/reiser4progs-libaal.patch
similarity index 100%
rename from pkgs/core/reiser4progs/patches/reiser4progs-libaal.patch
rename to pkgs/reiser4progs/patches/reiser4progs-libaal.patch

diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-makefile.patch b/pkgs/reiser4progs/patches/reiser4progs-makefile.patch
similarity index 100%
rename from pkgs/core/reiser4progs/patches/reiser4progs-makefile.patch
rename to pkgs/reiser4progs/patches/reiser4progs-makefile.patch

diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-opt.patch b/pkgs/reiser4progs/patches/reiser4progs-opt.patch
similarity index 100%
rename from pkgs/core/reiser4progs/patches/reiser4progs-opt.patch
rename to pkgs/reiser4progs/patches/reiser4progs-opt.patch

diff --git a/pkgs/core/reiser4progs/reiser4progs.nm b/pkgs/reiser4progs/reiser4progs.nm
similarity index 100%
rename from pkgs/core/reiser4progs/reiser4progs.nm
rename to pkgs/reiser4progs/reiser4progs.nm

diff --git a/pkgs/core/reiserfsprogs/reiserfsprogs.nm b/pkgs/reiserfsprogs/reiserfsprogs.nm
similarity index 100%
rename from pkgs/core/reiserfsprogs/reiserfsprogs.nm
rename to pkgs/reiserfsprogs/reiserfsprogs.nm

diff --git a/pkgs/core/rrdtool/rrdtool.nm b/pkgs/rrdtool/rrdtool.nm
similarity index 100%
rename from pkgs/core/rrdtool/rrdtool.nm
rename to pkgs/rrdtool/rrdtool.nm

diff --git a/pkgs/core/rstp/bridge-stp b/pkgs/rstp/bridge-stp
similarity index 100%
rename from pkgs/core/rstp/bridge-stp
rename to pkgs/rstp/bridge-stp

diff --git a/pkgs/core/rstp/patches/rstp-0.21-dump-commands.patch b/pkgs/rstp/patches/rstp-0.21-dump-commands.patch
similarity index 100%
rename from pkgs/core/rstp/patches/rstp-0.21-dump-commands.patch
rename to pkgs/rstp/patches/rstp-0.21-dump-commands.patch

diff --git a/pkgs/core/rstp/rstp.init b/pkgs/rstp/rstp.init
similarity index 100%
rename from pkgs/core/rstp/rstp.init
rename to pkgs/rstp/rstp.init

diff --git a/pkgs/core/rstp/rstp.nm b/pkgs/rstp/rstp.nm
similarity index 100%
rename from pkgs/core/rstp/rstp.nm
rename to pkgs/rstp/rstp.nm

diff --git a/pkgs/core/samba/samba.nm b/pkgs/samba/samba.nm
similarity index 100%
rename from pkgs/core/samba/samba.nm
rename to pkgs/samba/samba.nm

diff --git a/pkgs/core/sane/patches/sane-1.0.20-lockdir.patch b/pkgs/sane/patches/sane-1.0.20-lockdir.patch
similarity index 100%
rename from pkgs/core/sane/patches/sane-1.0.20-lockdir.patch
rename to pkgs/sane/patches/sane-1.0.20-lockdir.patch

diff --git a/pkgs/core/sane/patches/sane-1.0.21-epson-expression800.patch b/pkgs/sane/patches/sane-1.0.21-epson-expression800.patch
similarity index 100%
rename from pkgs/core/sane/patches/sane-1.0.21-epson-expression800.patch
rename to pkgs/sane/patches/sane-1.0.21-epson-expression800.patch

diff --git a/pkgs/core/sane/patches/sane-1.0.21-i18n.patch b/pkgs/sane/patches/sane-1.0.21-i18n.patch
similarity index 100%
rename from pkgs/core/sane/patches/sane-1.0.21-i18n.patch
rename to pkgs/sane/patches/sane-1.0.21-i18n.patch

diff --git a/pkgs/core/sane/patches/sane-1.0.21-pkgconfig.patch b/pkgs/sane/patches/sane-1.0.21-pkgconfig.patch
similarity index 100%
rename from pkgs/core/sane/patches/sane-1.0.21-pkgconfig.patch
rename to pkgs/sane/patches/sane-1.0.21-pkgconfig.patch

diff --git a/pkgs/core/sane/patches/sane-1.0.21-udev.patch b/pkgs/sane/patches/sane-1.0.21-udev.patch
similarity index 100%
rename from pkgs/core/sane/patches/sane-1.0.21-udev.patch
rename to pkgs/sane/patches/sane-1.0.21-udev.patch

diff --git a/pkgs/core/sane/sane.nm b/pkgs/sane/sane.nm
similarity index 100%
rename from pkgs/core/sane/sane.nm
rename to pkgs/sane/sane.nm

diff --git a/pkgs/core/screen/patches/screen-4.0.1-args.patch b/pkgs/screen/patches/screen-4.0.1-args.patch
similarity index 100%
rename from pkgs/core/screen/patches/screen-4.0.1-args.patch
rename to pkgs/screen/patches/screen-4.0.1-args.patch

diff --git a/pkgs/core/screen/patches/screen-4.0.2-maxstr.patch b/pkgs/screen/patches/screen-4.0.2-maxstr.patch
similarity index 100%
rename from pkgs/core/screen/patches/screen-4.0.2-maxstr.patch
rename to pkgs/screen/patches/screen-4.0.2-maxstr.patch

diff --git a/pkgs/core/screen/patches/screen-4.0.3-configh.patch b/pkgs/screen/patches/screen-4.0.3-configh.patch
similarity index 100%
rename from pkgs/core/screen/patches/screen-4.0.3-configh.patch
rename to pkgs/screen/patches/screen-4.0.3-configh.patch

diff --git a/pkgs/core/screen/patches/screen-4.0.3-ipv6.patch b/pkgs/screen/patches/screen-4.0.3-ipv6.patch
similarity index 100%
rename from pkgs/core/screen/patches/screen-4.0.3-ipv6.patch
rename to pkgs/screen/patches/screen-4.0.3-ipv6.patch

diff --git a/pkgs/core/screen/patches/screen-4.0.3-libs.patch b/pkgs/screen/patches/screen-4.0.3-libs.patch
similarity index 100%
rename from pkgs/core/screen/patches/screen-4.0.3-libs.patch
rename to pkgs/screen/patches/screen-4.0.3-libs.patch

diff --git a/pkgs/core/screen/patches/screen-4.0.3-screenrc.patch b/pkgs/screen/patches/screen-4.0.3-screenrc.patch
similarity index 100%
rename from pkgs/core/screen/patches/screen-4.0.3-screenrc.patch
rename to pkgs/screen/patches/screen-4.0.3-screenrc.patch

diff --git a/pkgs/core/screen/patches/screen-4.0.3-stropts.patch b/pkgs/screen/patches/screen-4.0.3-stropts.patch
similarity index 100%
rename from pkgs/core/screen/patches/screen-4.0.3-stropts.patch
rename to pkgs/screen/patches/screen-4.0.3-stropts.patch

diff --git a/pkgs/core/screen/screen.nm b/pkgs/screen/screen.nm
similarity index 100%
rename from pkgs/core/screen/screen.nm
rename to pkgs/screen/screen.nm

diff --git a/pkgs/core/screen/screen.pam b/pkgs/screen/screen.pam
similarity index 100%
rename from pkgs/core/screen/screen.pam
rename to pkgs/screen/screen.pam

diff --git a/pkgs/core/screen/screenrc b/pkgs/screen/screenrc
similarity index 100%
rename from pkgs/core/screen/screenrc
rename to pkgs/screen/screenrc

diff --git a/pkgs/core/sdl/sdl.nm b/pkgs/sdl/sdl.nm
similarity index 100%
rename from pkgs/core/sdl/sdl.nm
rename to pkgs/sdl/sdl.nm

diff --git a/pkgs/core/sed/sed.nm b/pkgs/sed/sed.nm
similarity index 100%
rename from pkgs/core/sed/sed.nm
rename to pkgs/sed/sed.nm

diff --git a/pkgs/core/sg3-utils/sg3-utils.nm b/pkgs/sg3-utils/sg3-utils.nm
similarity index 100%
rename from pkgs/core/sg3-utils/sg3-utils.nm
rename to pkgs/sg3-utils/sg3-utils.nm

diff --git a/pkgs/core/shadow/patches/shadow-4.1.4.2-goodname.patch b/pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch
similarity index 100%
rename from pkgs/core/shadow/patches/shadow-4.1.4.2-goodname.patch
rename to pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch

diff --git a/pkgs/core/shadow/patches/shadow-4.1.4.2-ipfire.patch b/pkgs/shadow/patches/shadow-4.1.4.2-ipfire.patch
similarity index 100%
rename from pkgs/core/shadow/patches/shadow-4.1.4.2-ipfire.patch
rename to pkgs/shadow/patches/shadow-4.1.4.2-ipfire.patch

diff --git a/pkgs/core/shadow/shadow.nm b/pkgs/shadow/shadow.nm
similarity index 100%
rename from pkgs/core/shadow/shadow.nm
rename to pkgs/shadow/shadow.nm

diff --git a/pkgs/core/sip/patches/disable-rpaths.patch b/pkgs/sip/patches/disable-rpaths.patch
similarity index 100%
rename from pkgs/core/sip/patches/disable-rpaths.patch
rename to pkgs/sip/patches/disable-rpaths.patch

diff --git a/pkgs/core/sip/patches/fix-linking.patch b/pkgs/sip/patches/fix-linking.patch
similarity index 100%
rename from pkgs/core/sip/patches/fix-linking.patch
rename to pkgs/sip/patches/fix-linking.patch

diff --git a/pkgs/core/sip/patches/no-strip.patch b/pkgs/sip/patches/no-strip.patch
similarity index 100%
rename from pkgs/core/sip/patches/no-strip.patch
rename to pkgs/sip/patches/no-strip.patch

diff --git a/pkgs/core/sip/sip.nm b/pkgs/sip/sip.nm
similarity index 100%
rename from pkgs/core/sip/sip.nm
rename to pkgs/sip/sip.nm

diff --git a/pkgs/core/slang/patches/slang-2.1.4-makefile.patch b/pkgs/slang/patches/slang-2.1.4-makefile.patch
similarity index 100%
rename from pkgs/core/slang/patches/slang-2.1.4-makefile.patch
rename to pkgs/slang/patches/slang-2.1.4-makefile.patch

diff --git a/pkgs/core/slang/slang.nm b/pkgs/slang/slang.nm
similarity index 100%
rename from pkgs/core/slang/slang.nm
rename to pkgs/slang/slang.nm

diff --git a/pkgs/core/smartmontools/smartmontools.nm b/pkgs/smartmontools/smartmontools.nm
similarity index 100%
rename from pkgs/core/smartmontools/smartmontools.nm
rename to pkgs/smartmontools/smartmontools.nm

diff --git a/pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch b/pkgs/sqlite/patches/sqlite-3.6.12-libdl.patch
similarity index 100%
rename from pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch
rename to pkgs/sqlite/patches/sqlite-3.6.12-libdl.patch

diff --git a/pkgs/core/sqlite/sqlite.nm b/pkgs/sqlite/sqlite.nm
similarity index 100%
rename from pkgs/core/sqlite/sqlite.nm
rename to pkgs/sqlite/sqlite.nm

diff --git a/pkgs/core/squashfs-tools/patches/squashfs-cflags.patch b/pkgs/squashfs-tools/patches/squashfs-cflags.patch
similarity index 100%
rename from pkgs/core/squashfs-tools/patches/squashfs-cflags.patch
rename to pkgs/squashfs-tools/patches/squashfs-cflags.patch

diff --git a/pkgs/core/squashfs-tools/patches/squashfs-xz.patch b/pkgs/squashfs-tools/patches/squashfs-xz.patch
similarity index 100%
rename from pkgs/core/squashfs-tools/patches/squashfs-xz.patch
rename to pkgs/squashfs-tools/patches/squashfs-xz.patch

diff --git a/pkgs/core/squashfs-tools/squashfs-tools.nm b/pkgs/squashfs-tools/squashfs-tools.nm
similarity index 100%
rename from pkgs/core/squashfs-tools/squashfs-tools.nm
rename to pkgs/squashfs-tools/squashfs-tools.nm

diff --git a/pkgs/core/squid/patches/squid-3.0.STABLE1-perlpath.patch b/pkgs/squid/patches/squid-3.0.STABLE1-perlpath.patch
similarity index 100%
rename from pkgs/core/squid/patches/squid-3.0.STABLE1-perlpath.patch
rename to pkgs/squid/patches/squid-3.0.STABLE1-perlpath.patch

diff --git a/pkgs/core/squid/patches/squid-3.0.STABLE7-from_manpg.patch b/pkgs/squid/patches/squid-3.0.STABLE7-from_manpg.patch
similarity index 100%
rename from pkgs/core/squid/patches/squid-3.0.STABLE7-from_manpg.patch
rename to pkgs/squid/patches/squid-3.0.STABLE7-from_manpg.patch

diff --git a/pkgs/core/squid/patches/squid-3.1.0.15-smb-path.patch b/pkgs/squid/patches/squid-3.1.0.15-smb-path.patch
similarity index 100%
rename from pkgs/core/squid/patches/squid-3.1.0.15-smb-path.patch
rename to pkgs/squid/patches/squid-3.1.0.15-smb-path.patch

diff --git a/pkgs/core/squid/patches/squid-3.1.0.9-config.patch b/pkgs/squid/patches/squid-3.1.0.9-config.patch
similarity index 100%
rename from pkgs/core/squid/patches/squid-3.1.0.9-config.patch
rename to pkgs/squid/patches/squid-3.1.0.9-config.patch

diff --git a/pkgs/core/squid/patches/squid-3.1.0.9-location.patch b/pkgs/squid/patches/squid-3.1.0.9-location.patch
similarity index 100%
rename from pkgs/core/squid/patches/squid-3.1.0.9-location.patch
rename to pkgs/squid/patches/squid-3.1.0.9-location.patch

diff --git a/pkgs/core/squid/squid.nm b/pkgs/squid/squid.nm
similarity index 100%
rename from pkgs/core/squid/squid.nm
rename to pkgs/squid/squid.nm

diff --git a/pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch b/pkgs/strace/patches/strace-4.5.19-fix-kernel-headers.patch
similarity index 100%
rename from pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch
rename to pkgs/strace/patches/strace-4.5.19-fix-kernel-headers.patch

diff --git a/pkgs/core/strace/strace.nm b/pkgs/strace/strace.nm
similarity index 100%
rename from pkgs/core/strace/strace.nm
rename to pkgs/strace/strace.nm

diff --git a/pkgs/core/strongswan/strongswan.nm b/pkgs/strongswan/strongswan.nm
similarity index 100%
rename from pkgs/core/strongswan/strongswan.nm
rename to pkgs/strongswan/strongswan.nm

diff --git a/pkgs/core/sudo/sudo.nm b/pkgs/sudo/sudo.nm
similarity index 100%
rename from pkgs/core/sudo/sudo.nm
rename to pkgs/sudo/sudo.nm

diff --git a/pkgs/core/sudo/sudo.pam b/pkgs/sudo/sudo.pam
similarity index 100%
rename from pkgs/core/sudo/sudo.pam
rename to pkgs/sudo/sudo.pam

diff --git a/pkgs/core/sudo/sudoers b/pkgs/sudo/sudoers
similarity index 100%
rename from pkgs/core/sudo/sudoers
rename to pkgs/sudo/sudoers

diff --git a/pkgs/core/suricata/suricata.logrotate b/pkgs/suricata/suricata.logrotate
similarity index 100%
rename from pkgs/core/suricata/suricata.logrotate
rename to pkgs/suricata/suricata.logrotate

diff --git a/pkgs/core/suricata/suricata.nm b/pkgs/suricata/suricata.nm
similarity index 100%
rename from pkgs/core/suricata/suricata.nm
rename to pkgs/suricata/suricata.nm

diff --git a/pkgs/core/swig/patches/swig-1.3.23-pylib.patch b/pkgs/swig/patches/swig-1.3.23-pylib.patch
similarity index 100%
rename from pkgs/core/swig/patches/swig-1.3.23-pylib.patch
rename to pkgs/swig/patches/swig-1.3.23-pylib.patch

diff --git a/pkgs/core/swig/patches/swig200-rh623854.patch b/pkgs/swig/patches/swig200-rh623854.patch
similarity index 100%
rename from pkgs/core/swig/patches/swig200-rh623854.patch
rename to pkgs/swig/patches/swig200-rh623854.patch

diff --git a/pkgs/core/swig/swig.nm b/pkgs/swig/swig.nm
similarity index 100%
rename from pkgs/core/swig/swig.nm
rename to pkgs/swig/swig.nm

diff --git a/pkgs/core/sysfsutils/sysfsutils.nm b/pkgs/sysfsutils/sysfsutils.nm
similarity index 100%
rename from pkgs/core/sysfsutils/sysfsutils.nm
rename to pkgs/sysfsutils/sysfsutils.nm

diff --git a/pkgs/core/syslinux/syslinux.nm b/pkgs/syslinux/syslinux.nm
similarity index 100%
rename from pkgs/core/syslinux/syslinux.nm
rename to pkgs/syslinux/syslinux.nm

diff --git a/pkgs/core/syslog-ng/logextract b/pkgs/syslog-ng/logextract
similarity index 100%
rename from pkgs/core/syslog-ng/logextract
rename to pkgs/syslog-ng/logextract

diff --git a/pkgs/core/syslog-ng/syslog-ng.conf b/pkgs/syslog-ng/syslog-ng.conf
similarity index 100%
rename from pkgs/core/syslog-ng/syslog-ng.conf
rename to pkgs/syslog-ng/syslog-ng.conf

diff --git a/pkgs/core/syslog-ng/syslog-ng.init b/pkgs/syslog-ng/syslog-ng.init
similarity index 100%
rename from pkgs/core/syslog-ng/syslog-ng.init
rename to pkgs/syslog-ng/syslog-ng.init

diff --git a/pkgs/core/syslog-ng/syslog-ng.nm b/pkgs/syslog-ng/syslog-ng.nm
similarity index 100%
rename from pkgs/core/syslog-ng/syslog-ng.nm
rename to pkgs/syslog-ng/syslog-ng.nm

diff --git a/pkgs/core/system-release/system-release.nm b/pkgs/system-release/system-release.nm
similarity index 100%
rename from pkgs/core/system-release/system-release.nm
rename to pkgs/system-release/system-release.nm

diff --git a/pkgs/core/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/pkgs/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
similarity index 100%
rename from pkgs/core/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
rename to pkgs/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch

diff --git a/pkgs/core/sysvinit/sysvinit.nm b/pkgs/sysvinit/sysvinit.nm
similarity index 100%
rename from pkgs/core/sysvinit/sysvinit.nm
rename to pkgs/sysvinit/sysvinit.nm

diff --git a/pkgs/core/tar/patches/tar-1.14-loneZeroWarning.patch b/pkgs/tar/patches/tar-1.14-loneZeroWarning.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.14-loneZeroWarning.patch
rename to pkgs/tar/patches/tar-1.14-loneZeroWarning.patch

diff --git a/pkgs/core/tar/patches/tar-1.15.1-vfatTruncate.patch b/pkgs/tar/patches/tar-1.15.1-vfatTruncate.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.15.1-vfatTruncate.patch
rename to pkgs/tar/patches/tar-1.15.1-vfatTruncate.patch

diff --git a/pkgs/core/tar/patches/tar-1.17-wildcards.patch b/pkgs/tar/patches/tar-1.17-wildcards.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.17-wildcards.patch
rename to pkgs/tar/patches/tar-1.17-wildcards.patch

diff --git a/pkgs/core/tar/patches/tar-1.22-atime-rofs.patch b/pkgs/tar/patches/tar-1.22-atime-rofs.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.22-atime-rofs.patch
rename to pkgs/tar/patches/tar-1.22-atime-rofs.patch

diff --git a/pkgs/core/tar/patches/tar-1.23-oldarchive.patch b/pkgs/tar/patches/tar-1.23-oldarchive.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.23-oldarchive.patch
rename to pkgs/tar/patches/tar-1.23-oldarchive.patch

diff --git a/pkgs/core/tar/patches/tar-1.24-xattrs.patch b/pkgs/tar/patches/tar-1.24-xattrs.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.24-xattrs.patch
rename to pkgs/tar/patches/tar-1.24-xattrs.patch

diff --git a/pkgs/core/tar/patches/tar-1.25-listedincremental.patch b/pkgs/tar/patches/tar-1.25-listedincremental.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.25-listedincremental.patch
rename to pkgs/tar/patches/tar-1.25-listedincremental.patch

diff --git a/pkgs/core/tar/patches/tar-1.25-sparse-names.patch b/pkgs/tar/patches/tar-1.25-sparse-names.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-1.25-sparse-names.patch
rename to pkgs/tar/patches/tar-1.25-sparse-names.patch

diff --git a/pkgs/core/tar/patches/tar-sigpipe.patch b/pkgs/tar/patches/tar-sigpipe.patch
similarity index 100%
rename from pkgs/core/tar/patches/tar-sigpipe.patch
rename to pkgs/tar/patches/tar-sigpipe.patch

diff --git a/pkgs/core/tar/tar.nm b/pkgs/tar/tar.nm
similarity index 100%
rename from pkgs/core/tar/tar.nm
rename to pkgs/tar/tar.nm

diff --git a/pkgs/core/tcl/patches/tcl-8.5.8-autopath.patch b/pkgs/tcl/patches/tcl-8.5.8-autopath.patch
similarity index 100%
rename from pkgs/core/tcl/patches/tcl-8.5.8-autopath.patch
rename to pkgs/tcl/patches/tcl-8.5.8-autopath.patch

diff --git a/pkgs/core/tcl/patches/tcl-8.5.8-conf.patch b/pkgs/tcl/patches/tcl-8.5.8-conf.patch
similarity index 100%
rename from pkgs/core/tcl/patches/tcl-8.5.8-conf.patch
rename to pkgs/tcl/patches/tcl-8.5.8-conf.patch

diff --git a/pkgs/core/tcl/patches/tcl-8.5.8-pic.patch b/pkgs/tcl/patches/tcl-8.5.8-pic.patch
similarity index 100%
rename from pkgs/core/tcl/patches/tcl-8.5.8-pic.patch
rename to pkgs/tcl/patches/tcl-8.5.8-pic.patch

diff --git a/pkgs/core/tcl/tcl.nm b/pkgs/tcl/tcl.nm
similarity index 100%
rename from pkgs/core/tcl/tcl.nm
rename to pkgs/tcl/tcl.nm

diff --git a/pkgs/core/tcpdump/tcpdump.nm b/pkgs/tcpdump/tcpdump.nm
similarity index 100%
rename from pkgs/core/tcpdump/tcpdump.nm
rename to pkgs/tcpdump/tcpdump.nm

diff --git a/pkgs/core/texinfo/texinfo.nm b/pkgs/texinfo/texinfo.nm
similarity index 100%
rename from pkgs/core/texinfo/texinfo.nm
rename to pkgs/texinfo/texinfo.nm

diff --git a/pkgs/core/traceroute/traceroute.nm b/pkgs/traceroute/traceroute.nm
similarity index 100%
rename from pkgs/core/traceroute/traceroute.nm
rename to pkgs/traceroute/traceroute.nm

diff --git a/pkgs/core/tunctl/tunctl.nm b/pkgs/tunctl/tunctl.nm
similarity index 100%
rename from pkgs/core/tunctl/tunctl.nm
rename to pkgs/tunctl/tunctl.nm

diff --git a/pkgs/core/udev/console_init b/pkgs/udev/console_init
similarity index 100%
rename from pkgs/core/udev/console_init
rename to pkgs/udev/console_init

diff --git a/pkgs/core/udev/rules/10-console.rules b/pkgs/udev/rules/10-console.rules
similarity index 100%
rename from pkgs/core/udev/rules/10-console.rules
rename to pkgs/udev/rules/10-console.rules

diff --git a/pkgs/core/udev/udev.nm b/pkgs/udev/udev.nm
similarity index 100%
rename from pkgs/core/udev/udev.nm
rename to pkgs/udev/udev.nm

diff --git a/pkgs/core/udisks/udisks.nm b/pkgs/udisks/udisks.nm
similarity index 100%
rename from pkgs/core/udisks/udisks.nm
rename to pkgs/udisks/udisks.nm

diff --git a/pkgs/core/ulogd2/sqlite3.table b/pkgs/ulogd2/sqlite3.table
similarity index 100%
rename from pkgs/core/ulogd2/sqlite3.table
rename to pkgs/ulogd2/sqlite3.table

diff --git a/pkgs/core/ulogd2/ulogd.conf b/pkgs/ulogd2/ulogd.conf
similarity index 100%
rename from pkgs/core/ulogd2/ulogd.conf
rename to pkgs/ulogd2/ulogd.conf

diff --git a/pkgs/core/ulogd2/ulogd.init b/pkgs/ulogd2/ulogd.init
similarity index 100%
rename from pkgs/core/ulogd2/ulogd.init
rename to pkgs/ulogd2/ulogd.init

diff --git a/pkgs/core/ulogd2/ulogd.logrotate b/pkgs/ulogd2/ulogd.logrotate
similarity index 100%
rename from pkgs/core/ulogd2/ulogd.logrotate
rename to pkgs/ulogd2/ulogd.logrotate

diff --git a/pkgs/core/ulogd2/ulogd2.nm b/pkgs/ulogd2/ulogd2.nm
similarity index 100%
rename from pkgs/core/ulogd2/ulogd2.nm
rename to pkgs/ulogd2/ulogd2.nm

diff --git a/pkgs/core/unzip/unzip.nm b/pkgs/unzip/unzip.nm
similarity index 100%
rename from pkgs/core/unzip/unzip.nm
rename to pkgs/unzip/unzip.nm

diff --git a/pkgs/core/upower/upower.nm b/pkgs/upower/upower.nm
similarity index 100%
rename from pkgs/core/upower/upower.nm
rename to pkgs/upower/upower.nm

diff --git a/pkgs/core/upstart/patches/upstart-0.6.7-upstream-1.patch b/pkgs/upstart/patches/upstart-0.6.7-upstream-1.patch
similarity index 100%
rename from pkgs/core/upstart/patches/upstart-0.6.7-upstream-1.patch
rename to pkgs/upstart/patches/upstart-0.6.7-upstream-1.patch

diff --git a/pkgs/core/upstart/upstart.nm b/pkgs/upstart/upstart.nm
similarity index 100%
rename from pkgs/core/upstart/upstart.nm
rename to pkgs/upstart/upstart.nm

diff --git a/pkgs/core/usbutils/usbutils.nm b/pkgs/usbutils/usbutils.nm
similarity index 100%
rename from pkgs/core/usbutils/usbutils.nm
rename to pkgs/usbutils/usbutils.nm

diff --git a/pkgs/core/ustr/ustr.nm b/pkgs/ustr/ustr.nm
similarity index 100%
rename from pkgs/core/ustr/ustr.nm
rename to pkgs/ustr/ustr.nm

diff --git a/pkgs/core/util-linux-ng/nologin.8 b/pkgs/util-linux-ng/nologin.8
similarity index 100%
rename from pkgs/core/util-linux-ng/nologin.8
rename to pkgs/util-linux-ng/nologin.8

diff --git a/pkgs/core/util-linux-ng/nologin.c b/pkgs/util-linux-ng/nologin.c
similarity index 100%
rename from pkgs/core/util-linux-ng/nologin.c
rename to pkgs/util-linux-ng/nologin.c

diff --git a/pkgs/core/util-linux-ng/pam.d/login b/pkgs/util-linux-ng/pam.d/login
similarity index 100%
rename from pkgs/core/util-linux-ng/pam.d/login
rename to pkgs/util-linux-ng/pam.d/login

diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/util-linux-ng/util-linux-ng.nm
similarity index 100%
rename from pkgs/core/util-linux-ng/util-linux-ng.nm
rename to pkgs/util-linux-ng/util-linux-ng.nm

diff --git a/pkgs/core/vim/patches/vim-7.3.001.patch0 b/pkgs/vim/patches/vim-7.3.001.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.001.patch0
rename to pkgs/vim/patches/vim-7.3.001.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.002.patch0 b/pkgs/vim/patches/vim-7.3.002.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.002.patch0
rename to pkgs/vim/patches/vim-7.3.002.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.003.patch0 b/pkgs/vim/patches/vim-7.3.003.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.003.patch0
rename to pkgs/vim/patches/vim-7.3.003.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.004.patch0 b/pkgs/vim/patches/vim-7.3.004.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.004.patch0
rename to pkgs/vim/patches/vim-7.3.004.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.005.patch0 b/pkgs/vim/patches/vim-7.3.005.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.005.patch0
rename to pkgs/vim/patches/vim-7.3.005.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.006.patch0 b/pkgs/vim/patches/vim-7.3.006.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.006.patch0
rename to pkgs/vim/patches/vim-7.3.006.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.007.patch0 b/pkgs/vim/patches/vim-7.3.007.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.007.patch0
rename to pkgs/vim/patches/vim-7.3.007.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.008.patch0 b/pkgs/vim/patches/vim-7.3.008.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.008.patch0
rename to pkgs/vim/patches/vim-7.3.008.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.009.patch0 b/pkgs/vim/patches/vim-7.3.009.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.009.patch0
rename to pkgs/vim/patches/vim-7.3.009.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.010.patch0 b/pkgs/vim/patches/vim-7.3.010.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.010.patch0
rename to pkgs/vim/patches/vim-7.3.010.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.011.patch0 b/pkgs/vim/patches/vim-7.3.011.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.011.patch0
rename to pkgs/vim/patches/vim-7.3.011.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.012.patch0 b/pkgs/vim/patches/vim-7.3.012.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.012.patch0
rename to pkgs/vim/patches/vim-7.3.012.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.013.patch0 b/pkgs/vim/patches/vim-7.3.013.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.013.patch0
rename to pkgs/vim/patches/vim-7.3.013.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.014.patch0 b/pkgs/vim/patches/vim-7.3.014.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.014.patch0
rename to pkgs/vim/patches/vim-7.3.014.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.015.patch0 b/pkgs/vim/patches/vim-7.3.015.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.015.patch0
rename to pkgs/vim/patches/vim-7.3.015.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.016.patch0 b/pkgs/vim/patches/vim-7.3.016.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.016.patch0
rename to pkgs/vim/patches/vim-7.3.016.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.017.patch0 b/pkgs/vim/patches/vim-7.3.017.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.017.patch0
rename to pkgs/vim/patches/vim-7.3.017.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.018.patch0 b/pkgs/vim/patches/vim-7.3.018.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.018.patch0
rename to pkgs/vim/patches/vim-7.3.018.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.019.patch0 b/pkgs/vim/patches/vim-7.3.019.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.019.patch0
rename to pkgs/vim/patches/vim-7.3.019.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.020.patch0 b/pkgs/vim/patches/vim-7.3.020.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.020.patch0
rename to pkgs/vim/patches/vim-7.3.020.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.021.patch0 b/pkgs/vim/patches/vim-7.3.021.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.021.patch0
rename to pkgs/vim/patches/vim-7.3.021.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.022.patch0 b/pkgs/vim/patches/vim-7.3.022.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.022.patch0
rename to pkgs/vim/patches/vim-7.3.022.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.023.patch0 b/pkgs/vim/patches/vim-7.3.023.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.023.patch0
rename to pkgs/vim/patches/vim-7.3.023.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.024.patch0 b/pkgs/vim/patches/vim-7.3.024.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.024.patch0
rename to pkgs/vim/patches/vim-7.3.024.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.025.patch0 b/pkgs/vim/patches/vim-7.3.025.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.025.patch0
rename to pkgs/vim/patches/vim-7.3.025.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.026.patch0 b/pkgs/vim/patches/vim-7.3.026.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.026.patch0
rename to pkgs/vim/patches/vim-7.3.026.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.027.patch0 b/pkgs/vim/patches/vim-7.3.027.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.027.patch0
rename to pkgs/vim/patches/vim-7.3.027.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.028.patch0 b/pkgs/vim/patches/vim-7.3.028.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.028.patch0
rename to pkgs/vim/patches/vim-7.3.028.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.029.patch0 b/pkgs/vim/patches/vim-7.3.029.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.029.patch0
rename to pkgs/vim/patches/vim-7.3.029.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.030.patch0 b/pkgs/vim/patches/vim-7.3.030.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.030.patch0
rename to pkgs/vim/patches/vim-7.3.030.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.031.patch0 b/pkgs/vim/patches/vim-7.3.031.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.031.patch0
rename to pkgs/vim/patches/vim-7.3.031.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.032.patch0 b/pkgs/vim/patches/vim-7.3.032.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.032.patch0
rename to pkgs/vim/patches/vim-7.3.032.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.033.patch0 b/pkgs/vim/patches/vim-7.3.033.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.033.patch0
rename to pkgs/vim/patches/vim-7.3.033.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.034.patch0 b/pkgs/vim/patches/vim-7.3.034.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.034.patch0
rename to pkgs/vim/patches/vim-7.3.034.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.035.patch0 b/pkgs/vim/patches/vim-7.3.035.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.035.patch0
rename to pkgs/vim/patches/vim-7.3.035.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.036.patch0 b/pkgs/vim/patches/vim-7.3.036.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.036.patch0
rename to pkgs/vim/patches/vim-7.3.036.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.037.patch0 b/pkgs/vim/patches/vim-7.3.037.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.037.patch0
rename to pkgs/vim/patches/vim-7.3.037.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.038.patch0 b/pkgs/vim/patches/vim-7.3.038.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.038.patch0
rename to pkgs/vim/patches/vim-7.3.038.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.039.patch0 b/pkgs/vim/patches/vim-7.3.039.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.039.patch0
rename to pkgs/vim/patches/vim-7.3.039.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.040.patch0 b/pkgs/vim/patches/vim-7.3.040.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.040.patch0
rename to pkgs/vim/patches/vim-7.3.040.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.041.patch0 b/pkgs/vim/patches/vim-7.3.041.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.041.patch0
rename to pkgs/vim/patches/vim-7.3.041.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.042.patch0 b/pkgs/vim/patches/vim-7.3.042.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.042.patch0
rename to pkgs/vim/patches/vim-7.3.042.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.043.patch0 b/pkgs/vim/patches/vim-7.3.043.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.043.patch0
rename to pkgs/vim/patches/vim-7.3.043.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.044.patch0 b/pkgs/vim/patches/vim-7.3.044.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.044.patch0
rename to pkgs/vim/patches/vim-7.3.044.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.045.patch0 b/pkgs/vim/patches/vim-7.3.045.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.045.patch0
rename to pkgs/vim/patches/vim-7.3.045.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.046.patch0 b/pkgs/vim/patches/vim-7.3.046.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.046.patch0
rename to pkgs/vim/patches/vim-7.3.046.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.047.patch0 b/pkgs/vim/patches/vim-7.3.047.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.047.patch0
rename to pkgs/vim/patches/vim-7.3.047.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.048.patch0 b/pkgs/vim/patches/vim-7.3.048.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.048.patch0
rename to pkgs/vim/patches/vim-7.3.048.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.049.patch0 b/pkgs/vim/patches/vim-7.3.049.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.049.patch0
rename to pkgs/vim/patches/vim-7.3.049.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.050.patch0 b/pkgs/vim/patches/vim-7.3.050.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.050.patch0
rename to pkgs/vim/patches/vim-7.3.050.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.051.patch0 b/pkgs/vim/patches/vim-7.3.051.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.051.patch0
rename to pkgs/vim/patches/vim-7.3.051.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.052.patch0 b/pkgs/vim/patches/vim-7.3.052.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.052.patch0
rename to pkgs/vim/patches/vim-7.3.052.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.053.patch0 b/pkgs/vim/patches/vim-7.3.053.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.053.patch0
rename to pkgs/vim/patches/vim-7.3.053.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.054.patch0 b/pkgs/vim/patches/vim-7.3.054.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.054.patch0
rename to pkgs/vim/patches/vim-7.3.054.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.055.patch0 b/pkgs/vim/patches/vim-7.3.055.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.055.patch0
rename to pkgs/vim/patches/vim-7.3.055.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.056.patch0 b/pkgs/vim/patches/vim-7.3.056.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.056.patch0
rename to pkgs/vim/patches/vim-7.3.056.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.057.patch0 b/pkgs/vim/patches/vim-7.3.057.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.057.patch0
rename to pkgs/vim/patches/vim-7.3.057.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.058.patch0 b/pkgs/vim/patches/vim-7.3.058.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.058.patch0
rename to pkgs/vim/patches/vim-7.3.058.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.059.patch0 b/pkgs/vim/patches/vim-7.3.059.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.059.patch0
rename to pkgs/vim/patches/vim-7.3.059.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.060.patch0 b/pkgs/vim/patches/vim-7.3.060.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.060.patch0
rename to pkgs/vim/patches/vim-7.3.060.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.061.patch0 b/pkgs/vim/patches/vim-7.3.061.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.061.patch0
rename to pkgs/vim/patches/vim-7.3.061.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.062.patch0 b/pkgs/vim/patches/vim-7.3.062.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.062.patch0
rename to pkgs/vim/patches/vim-7.3.062.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.063.patch0 b/pkgs/vim/patches/vim-7.3.063.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.063.patch0
rename to pkgs/vim/patches/vim-7.3.063.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.064.patch0 b/pkgs/vim/patches/vim-7.3.064.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.064.patch0
rename to pkgs/vim/patches/vim-7.3.064.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.065.patch0 b/pkgs/vim/patches/vim-7.3.065.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.065.patch0
rename to pkgs/vim/patches/vim-7.3.065.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.066.patch0 b/pkgs/vim/patches/vim-7.3.066.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.066.patch0
rename to pkgs/vim/patches/vim-7.3.066.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.067.patch0 b/pkgs/vim/patches/vim-7.3.067.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.067.patch0
rename to pkgs/vim/patches/vim-7.3.067.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.068.patch0 b/pkgs/vim/patches/vim-7.3.068.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.068.patch0
rename to pkgs/vim/patches/vim-7.3.068.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.069.patch0 b/pkgs/vim/patches/vim-7.3.069.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.069.patch0
rename to pkgs/vim/patches/vim-7.3.069.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.070.patch0 b/pkgs/vim/patches/vim-7.3.070.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.070.patch0
rename to pkgs/vim/patches/vim-7.3.070.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.071.patch0 b/pkgs/vim/patches/vim-7.3.071.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.071.patch0
rename to pkgs/vim/patches/vim-7.3.071.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.072.patch0 b/pkgs/vim/patches/vim-7.3.072.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.072.patch0
rename to pkgs/vim/patches/vim-7.3.072.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.073.patch0 b/pkgs/vim/patches/vim-7.3.073.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.073.patch0
rename to pkgs/vim/patches/vim-7.3.073.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.074.patch0 b/pkgs/vim/patches/vim-7.3.074.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.074.patch0
rename to pkgs/vim/patches/vim-7.3.074.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.075.patch0 b/pkgs/vim/patches/vim-7.3.075.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.075.patch0
rename to pkgs/vim/patches/vim-7.3.075.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.076.patch0 b/pkgs/vim/patches/vim-7.3.076.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.076.patch0
rename to pkgs/vim/patches/vim-7.3.076.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.077.patch0 b/pkgs/vim/patches/vim-7.3.077.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.077.patch0
rename to pkgs/vim/patches/vim-7.3.077.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.078.patch0 b/pkgs/vim/patches/vim-7.3.078.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.078.patch0
rename to pkgs/vim/patches/vim-7.3.078.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.079.patch0 b/pkgs/vim/patches/vim-7.3.079.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.079.patch0
rename to pkgs/vim/patches/vim-7.3.079.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.080.patch0 b/pkgs/vim/patches/vim-7.3.080.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.080.patch0
rename to pkgs/vim/patches/vim-7.3.080.patch0

diff --git a/pkgs/core/vim/patches/vim-7.3.081.patch0 b/pkgs/vim/patches/vim-7.3.081.patch0
similarity index 100%
rename from pkgs/core/vim/patches/vim-7.3.081.patch0
rename to pkgs/vim/patches/vim-7.3.081.patch0

diff --git a/pkgs/core/vim/vim.nm b/pkgs/vim/vim.nm
similarity index 100%
rename from pkgs/core/vim/vim.nm
rename to pkgs/vim/vim.nm

diff --git a/pkgs/core/vim/vimrc b/pkgs/vim/vimrc
similarity index 100%
rename from pkgs/core/vim/vimrc
rename to pkgs/vim/vimrc

diff --git a/pkgs/core/vlan/vlan.nm b/pkgs/vlan/vlan.nm
similarity index 100%
rename from pkgs/core/vlan/vlan.nm
rename to pkgs/vlan/vlan.nm

diff --git a/pkgs/core/vsftpd/patches/1-vsftpd-build_ssl.patch b/pkgs/vsftpd/patches/1-vsftpd-build_ssl.patch
similarity index 100%
rename from pkgs/core/vsftpd/patches/1-vsftpd-build_ssl.patch
rename to pkgs/vsftpd/patches/1-vsftpd-build_ssl.patch

diff --git a/pkgs/core/vsftpd/patches/2-vsftpd-libs-3.patch b/pkgs/vsftpd/patches/2-vsftpd-libs-3.patch
similarity index 100%
rename from pkgs/core/vsftpd/patches/2-vsftpd-libs-3.patch
rename to pkgs/vsftpd/patches/2-vsftpd-libs-3.patch

diff --git a/pkgs/core/vsftpd/patches/3-vsftpd-pam_hostname-1.patch b/pkgs/vsftpd/patches/3-vsftpd-pam_hostname-1.patch
similarity index 100%
rename from pkgs/core/vsftpd/patches/3-vsftpd-pam_hostname-1.patch
rename to pkgs/vsftpd/patches/3-vsftpd-pam_hostname-1.patch

diff --git a/pkgs/core/vsftpd/patches/4-vsftpd-close-std-fds.patch b/pkgs/vsftpd/patches/4-vsftpd-close-std-fds.patch
similarity index 100%
rename from pkgs/core/vsftpd/patches/4-vsftpd-close-std-fds.patch
rename to pkgs/vsftpd/patches/4-vsftpd-close-std-fds.patch

diff --git a/pkgs/core/vsftpd/patches/5-vsftpd-configuration-1.patch b/pkgs/vsftpd/patches/5-vsftpd-configuration-1.patch
similarity index 100%
rename from pkgs/core/vsftpd/patches/5-vsftpd-configuration-1.patch
rename to pkgs/vsftpd/patches/5-vsftpd-configuration-1.patch

diff --git a/pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch b/pkgs/vsftpd/patches/vsftpd-2.2.0-openssl.patch
similarity index 100%
rename from pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch
rename to pkgs/vsftpd/patches/vsftpd-2.2.0-openssl.patch

diff --git a/pkgs/core/vsftpd/vsftpd.conf b/pkgs/vsftpd/vsftpd.conf
similarity index 100%
rename from pkgs/core/vsftpd/vsftpd.conf
rename to pkgs/vsftpd/vsftpd.conf

diff --git a/pkgs/core/vsftpd/vsftpd.init b/pkgs/vsftpd/vsftpd.init
similarity index 100%
rename from pkgs/core/vsftpd/vsftpd.init
rename to pkgs/vsftpd/vsftpd.init

diff --git a/pkgs/core/vsftpd/vsftpd.nm b/pkgs/vsftpd/vsftpd.nm
similarity index 100%
rename from pkgs/core/vsftpd/vsftpd.nm
rename to pkgs/vsftpd/vsftpd.nm

diff --git a/pkgs/core/vsftpd/vsftpd.pam b/pkgs/vsftpd/vsftpd.pam
similarity index 100%
rename from pkgs/core/vsftpd/vsftpd.pam
rename to pkgs/vsftpd/vsftpd.pam

diff --git a/pkgs/core/vsftpd/vsftpd.user_list b/pkgs/vsftpd/vsftpd.user_list
similarity index 100%
rename from pkgs/core/vsftpd/vsftpd.user_list
rename to pkgs/vsftpd/vsftpd.user_list

diff --git a/pkgs/core/which/which.nm b/pkgs/which/which.nm
similarity index 100%
rename from pkgs/core/which/which.nm
rename to pkgs/which/which.nm

diff --git a/pkgs/core/wireless-tools/patches/wireless_tools.29-makefile.patch b/pkgs/wireless-tools/patches/wireless_tools.29-makefile.patch
similarity index 100%
rename from pkgs/core/wireless-tools/patches/wireless_tools.29-makefile.patch
rename to pkgs/wireless-tools/patches/wireless_tools.29-makefile.patch

diff --git a/pkgs/core/wireless-tools/wireless-tools.nm b/pkgs/wireless-tools/wireless-tools.nm
similarity index 100%
rename from pkgs/core/wireless-tools/wireless-tools.nm
rename to pkgs/wireless-tools/wireless-tools.nm

diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.conf b/pkgs/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from pkgs/core/wpa_supplicant/wpa_supplicant.conf
rename to pkgs/wpa_supplicant/wpa_supplicant.conf

diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.config b/pkgs/wpa_supplicant/wpa_supplicant.config
similarity index 100%
rename from pkgs/core/wpa_supplicant/wpa_supplicant.config
rename to pkgs/wpa_supplicant/wpa_supplicant.config

diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.logrotate b/pkgs/wpa_supplicant/wpa_supplicant.logrotate
similarity index 100%
rename from pkgs/core/wpa_supplicant/wpa_supplicant.logrotate
rename to pkgs/wpa_supplicant/wpa_supplicant.logrotate

diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.nm b/pkgs/wpa_supplicant/wpa_supplicant.nm
similarity index 100%
rename from pkgs/core/wpa_supplicant/wpa_supplicant.nm
rename to pkgs/wpa_supplicant/wpa_supplicant.nm

diff --git a/pkgs/core/xcb-proto/xcb-proto.nm b/pkgs/xcb-proto/xcb-proto.nm
similarity index 100%
rename from pkgs/core/xcb-proto/xcb-proto.nm
rename to pkgs/xcb-proto/xcb-proto.nm

diff --git a/pkgs/core/xen/patches/xen-WRITE.patch b/pkgs/xen/patches/xen-WRITE.patch
similarity index 100%
rename from pkgs/core/xen/patches/xen-WRITE.patch
rename to pkgs/xen/patches/xen-WRITE.patch

diff --git a/pkgs/core/xen/patches/xen-tools.patch b/pkgs/xen/patches/xen-tools.patch
similarity index 100%
rename from pkgs/core/xen/patches/xen-tools.patch
rename to pkgs/xen/patches/xen-tools.patch

diff --git a/pkgs/core/xen/xen.nm b/pkgs/xen/xen.nm
similarity index 100%
rename from pkgs/core/xen/xen.nm
rename to pkgs/xen/xen.nm

diff --git a/pkgs/core/xfsprogs/xfsprogs.nm b/pkgs/xfsprogs/xfsprogs.nm
similarity index 100%
rename from pkgs/core/xfsprogs/xfsprogs.nm
rename to pkgs/xfsprogs/xfsprogs.nm

diff --git a/pkgs/core/xkeyboard-config/xkeyboard-config.nm b/pkgs/xkeyboard-config/xkeyboard-config.nm
similarity index 100%
rename from pkgs/core/xkeyboard-config/xkeyboard-config.nm
rename to pkgs/xkeyboard-config/xkeyboard-config.nm

diff --git a/pkgs/core/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
rename to pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm

diff --git a/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
rename to pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm

diff --git a/pkgs/core/xorg-x11-drv-intel/intel.xinf b/pkgs/xorg-x11-drv-intel/intel.xinf
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/intel.xinf
rename to pkgs/xorg-x11-drv-intel/intel.xinf

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch b/pkgs/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
rename to pkgs/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch b/pkgs/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
rename to pkgs/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch b/pkgs/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
rename to pkgs/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch b/pkgs/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
rename to pkgs/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch b/pkgs/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
rename to pkgs/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch b/pkgs/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
rename to pkgs/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/kill-svideo.patch b/pkgs/xorg-x11-drv-intel/patches/kill-svideo.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/kill-svideo.patch
rename to pkgs/xorg-x11-drv-intel/patches/kill-svideo.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/patches/uevent.patch b/pkgs/xorg-x11-drv-intel/patches/uevent.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/patches/uevent.patch
rename to pkgs/xorg-x11-drv-intel/patches/uevent.patch

diff --git a/pkgs/core/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
rename to pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm

diff --git a/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
rename to pkgs/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm

diff --git a/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
rename to pkgs/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm

diff --git a/pkgs/core/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch b/pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
rename to pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch

diff --git a/pkgs/core/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch b/pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
rename to pkgs/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch

diff --git a/pkgs/core/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch b/pkgs/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
rename to pkgs/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch

diff --git a/pkgs/core/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch b/pkgs/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
rename to pkgs/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch

diff --git a/pkgs/core/xorg-x11-drv-nv/patches/nv-save-rom.patch b/pkgs/xorg-x11-drv-nv/patches/nv-save-rom.patch
similarity index 100%
rename from pkgs/core/xorg-x11-drv-nv/patches/nv-save-rom.patch
rename to pkgs/xorg-x11-drv-nv/patches/nv-save-rom.patch

diff --git a/pkgs/core/xorg-x11-drv-nv/xorg-x11-drv-nv.nm b/pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
rename to pkgs/xorg-x11-drv-nv/xorg-x11-drv-nv.nm

diff --git a/pkgs/core/xorg-x11-drv-synaptics/50-synaptics.conf b/pkgs/xorg-x11-drv-synaptics/50-synaptics.conf
similarity index 100%
rename from pkgs/core/xorg-x11-drv-synaptics/50-synaptics.conf
rename to pkgs/xorg-x11-drv-synaptics/50-synaptics.conf

diff --git a/pkgs/core/xorg-x11-drv-synaptics/70-touchpad-quirks.rules b/pkgs/xorg-x11-drv-synaptics/70-touchpad-quirks.rules
similarity index 100%
rename from pkgs/core/xorg-x11-drv-synaptics/70-touchpad-quirks.rules
rename to pkgs/xorg-x11-drv-synaptics/70-touchpad-quirks.rules

diff --git a/pkgs/core/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm b/pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm
rename to pkgs/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm

diff --git a/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
rename to pkgs/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm

diff --git a/pkgs/core/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
similarity index 100%
rename from pkgs/core/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
rename to pkgs/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm

diff --git a/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm b/pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm
similarity index 100%
rename from pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm
rename to pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm

diff --git a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm b/pkgs/xorg-x11-fonts/xorg-x11-fonts.nm
similarity index 100%
rename from pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm
rename to pkgs/xorg-x11-fonts/xorg-x11-fonts.nm

diff --git a/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
similarity index 100%
rename from pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
rename to pkgs/xorg-x11-proto-devel/xorg-x11-proto-devel.nm

diff --git a/pkgs/core/xorg-x11-server/10-quirks.conf b/pkgs/xorg-x11-server/10-quirks.conf
similarity index 100%
rename from pkgs/core/xorg-x11-server/10-quirks.conf
rename to pkgs/xorg-x11-server/10-quirks.conf

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch b/pkgs/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/pkgs/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch b/pkgs/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch b/pkgs/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch b/pkgs/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/pkgs/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch b/pkgs/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch b/pkgs/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-right-of.patch b/pkgs/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.6.99-right-of.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch b/pkgs/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch b/pkgs/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-multilib.patch b/pkgs/xorg-x11-server/patches/xserver-1.7.1-multilib.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.7.1-multilib.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.7.1-multilib.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch b/pkgs/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch b/pkgs/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-randr-initial.patch b/pkgs/xorg-x11-server/patches/xserver-1.8-randr-initial.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.8-randr-initial.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.8-randr-initial.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-udev-warning.patch b/pkgs/xorg-x11-server/patches/xserver-1.8-udev-warning.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.8-udev-warning.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.8-udev-warning.patch

diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch b/pkgs/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
similarity index 100%
rename from pkgs/core/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
rename to pkgs/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch

diff --git a/pkgs/core/xorg-x11-server/xorg-x11-server.nm b/pkgs/xorg-x11-server/xorg-x11-server.nm
similarity index 100%
rename from pkgs/core/xorg-x11-server/xorg-x11-server.nm
rename to pkgs/xorg-x11-server/xorg-x11-server.nm

diff --git a/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm b/pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm
similarity index 100%
rename from pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm
rename to pkgs/xorg-x11-util-macros/xorg-x11-util-macros.nm

diff --git a/pkgs/core/xorg-x11-xinit/xorg-x11-xinit.nm b/pkgs/xorg-x11-xinit/xorg-x11-xinit.nm
similarity index 100%
rename from pkgs/core/xorg-x11-xinit/xorg-x11-xinit.nm
rename to pkgs/xorg-x11-xinit/xorg-x11-xinit.nm

diff --git a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
similarity index 100%
rename from pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm
rename to pkgs/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm

diff --git a/pkgs/core/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch b/pkgs/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
similarity index 100%
rename from pkgs/core/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch
rename to pkgs/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch

diff --git a/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
similarity index 100%
rename from pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm
rename to pkgs/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm

diff --git a/pkgs/core/xrandr/xrandr.nm b/pkgs/xrandr/xrandr.nm
similarity index 100%
rename from pkgs/core/xrandr/xrandr.nm
rename to pkgs/xrandr/xrandr.nm

diff --git a/pkgs/core/xterm/patches/xterm-245-resources.patch b/pkgs/xterm/patches/xterm-245-resources.patch
similarity index 100%
rename from pkgs/core/xterm/patches/xterm-245-resources.patch
rename to pkgs/xterm/patches/xterm-245-resources.patch

diff --git a/pkgs/core/xterm/patches/xterm-256-man-page_paths.patch b/pkgs/xterm/patches/xterm-256-man-page_paths.patch
similarity index 100%
rename from pkgs/core/xterm/patches/xterm-256-man-page_paths.patch
rename to pkgs/xterm/patches/xterm-256-man-page_paths.patch

diff --git a/pkgs/core/xterm/patches/xterm-261-desk.patch b/pkgs/xterm/patches/xterm-261-desk.patch
similarity index 100%
rename from pkgs/core/xterm/patches/xterm-261-desk.patch
rename to pkgs/xterm/patches/xterm-261-desk.patch

diff --git a/pkgs/core/xterm/xterm.nm b/pkgs/xterm/xterm.nm
similarity index 100%
rename from pkgs/core/xterm/xterm.nm
rename to pkgs/xterm/xterm.nm

diff --git a/pkgs/core/xz/xz.nm b/pkgs/xz/xz.nm
similarity index 100%
rename from pkgs/core/xz/xz.nm
rename to pkgs/xz/xz.nm

diff --git a/pkgs/core/zerofree/zerofree.nm b/pkgs/zerofree/zerofree.nm
similarity index 100%
rename from pkgs/core/zerofree/zerofree.nm
rename to pkgs/zerofree/zerofree.nm

diff --git a/pkgs/core/zlib/zlib.nm b/pkgs/zlib/zlib.nm
similarity index 100%
rename from pkgs/core/zlib/zlib.nm
rename to pkgs/zlib/zlib.nm