diff --git a/pkgs-ng/README b/pkgs/README similarity index 100% rename from pkgs-ng/README rename to pkgs/README diff --git a/pkgs-ng/applications/graphics/gqview/builder.sh b/pkgs/applications/graphics/gqview/builder.sh similarity index 100% rename from pkgs-ng/applications/graphics/gqview/builder.sh rename to pkgs/applications/graphics/gqview/builder.sh diff --git a/pkgs-ng/applications/graphics/gqview/default.fix b/pkgs/applications/graphics/gqview/default.fix similarity index 100% rename from pkgs-ng/applications/graphics/gqview/default.fix rename to pkgs/applications/graphics/gqview/default.fix diff --git a/pkgs-ng/applications/networking/browsers/firebird/builder.sh b/pkgs/applications/networking/browsers/firebird/builder.sh similarity index 100% rename from pkgs-ng/applications/networking/browsers/firebird/builder.sh rename to pkgs/applications/networking/browsers/firebird/builder.sh diff --git a/pkgs-ng/applications/networking/browsers/firebird/default.fix b/pkgs/applications/networking/browsers/firebird/default.fix similarity index 100% rename from pkgs-ng/applications/networking/browsers/firebird/default.fix rename to pkgs/applications/networking/browsers/firebird/default.fix diff --git a/pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh b/pkgs/applications/networking/mailreaders/sylpheed/builder.sh similarity index 100% rename from pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh rename to pkgs/applications/networking/mailreaders/sylpheed/builder.sh diff --git a/pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix b/pkgs/applications/networking/mailreaders/sylpheed/default.fix similarity index 100% rename from pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix rename to pkgs/applications/networking/mailreaders/sylpheed/default.fix diff --git a/pkgs-ng/applications/networking/newsreaders/pan/builder.sh b/pkgs/applications/networking/newsreaders/pan/builder.sh similarity index 100% rename from pkgs-ng/applications/networking/newsreaders/pan/builder.sh rename to pkgs/applications/networking/newsreaders/pan/builder.sh diff --git a/pkgs-ng/applications/networking/newsreaders/pan/default.fix b/pkgs/applications/networking/newsreaders/pan/default.fix similarity index 100% rename from pkgs-ng/applications/networking/newsreaders/pan/default.fix rename to pkgs/applications/networking/newsreaders/pan/default.fix diff --git a/pkgs-ng/applications/version-management/subversion/builder.sh b/pkgs/applications/version-management/subversion/builder.sh similarity index 100% rename from pkgs-ng/applications/version-management/subversion/builder.sh rename to pkgs/applications/version-management/subversion/builder.sh diff --git a/pkgs-ng/applications/version-management/subversion/default.fix b/pkgs/applications/version-management/subversion/default.fix similarity index 100% rename from pkgs-ng/applications/version-management/subversion/default.fix rename to pkgs/applications/version-management/subversion/default.fix diff --git a/pkgs-ng/applications/video/MPlayer/builder.sh b/pkgs/applications/video/MPlayer/builder.sh similarity index 100% rename from pkgs-ng/applications/video/MPlayer/builder.sh rename to pkgs/applications/video/MPlayer/builder.sh diff --git a/pkgs-ng/applications/video/MPlayer/default.fix b/pkgs/applications/video/MPlayer/default.fix similarity index 100% rename from pkgs-ng/applications/video/MPlayer/default.fix rename to pkgs/applications/video/MPlayer/default.fix diff --git a/pkgs-ng/applications/video/MPlayer/win32codecs/builder.sh b/pkgs/applications/video/MPlayer/win32codecs/builder.sh similarity index 100% rename from pkgs-ng/applications/video/MPlayer/win32codecs/builder.sh rename to pkgs/applications/video/MPlayer/win32codecs/builder.sh diff --git a/pkgs-ng/applications/video/MPlayer/win32codecs/default.fix b/pkgs/applications/video/MPlayer/win32codecs/default.fix similarity index 100% rename from pkgs-ng/applications/video/MPlayer/win32codecs/default.fix rename to pkgs/applications/video/MPlayer/win32codecs/default.fix diff --git a/pkgs-ng/applications/video/mplayerplug-in/builder.sh b/pkgs/applications/video/mplayerplug-in/builder.sh similarity index 100% rename from pkgs-ng/applications/video/mplayerplug-in/builder.sh rename to pkgs/applications/video/mplayerplug-in/builder.sh diff --git a/pkgs-ng/applications/video/mplayerplug-in/default.fix b/pkgs/applications/video/mplayerplug-in/default.fix similarity index 100% rename from pkgs-ng/applications/video/mplayerplug-in/default.fix rename to pkgs/applications/video/mplayerplug-in/default.fix diff --git a/pkgs-ng/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh similarity index 100% rename from pkgs-ng/build-support/fetchurl/builder.sh rename to pkgs/build-support/fetchurl/builder.sh diff --git a/pkgs-ng/build-support/fetchurl/default.fix b/pkgs/build-support/fetchurl/default.fix similarity index 100% rename from pkgs-ng/build-support/fetchurl/default.fix rename to pkgs/build-support/fetchurl/default.fix diff --git a/pkgs-ng/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh similarity index 100% rename from pkgs-ng/development/compilers/gcc/builder.sh rename to pkgs/development/compilers/gcc/builder.sh diff --git a/pkgs-ng/development/compilers/gcc/default.fix b/pkgs/development/compilers/gcc/default.fix similarity index 100% rename from pkgs-ng/development/compilers/gcc/default.fix rename to pkgs/development/compilers/gcc/default.fix diff --git a/pkgs-ng/development/interpreters/perl/builder.sh b/pkgs/development/interpreters/perl/builder.sh similarity index 100% rename from pkgs-ng/development/interpreters/perl/builder.sh rename to pkgs/development/interpreters/perl/builder.sh diff --git a/pkgs-ng/development/interpreters/perl/default.fix b/pkgs/development/interpreters/perl/default.fix similarity index 100% rename from pkgs-ng/development/interpreters/perl/default.fix rename to pkgs/development/interpreters/perl/default.fix diff --git a/pkgs-ng/development/libraries/aterm/builder.sh b/pkgs/development/libraries/aterm/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/aterm/builder.sh rename to pkgs/development/libraries/aterm/builder.sh diff --git a/pkgs-ng/development/libraries/aterm/default.fix b/pkgs/development/libraries/aterm/default.fix similarity index 100% rename from pkgs-ng/development/libraries/aterm/default.fix rename to pkgs/development/libraries/aterm/default.fix diff --git a/pkgs-ng/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/db4/builder.sh rename to pkgs/development/libraries/db4/builder.sh diff --git a/pkgs-ng/development/libraries/db4/default.fix b/pkgs/development/libraries/db4/default.fix similarity index 100% rename from pkgs-ng/development/libraries/db4/default.fix rename to pkgs/development/libraries/db4/default.fix diff --git a/pkgs-ng/development/libraries/expat/builder.sh b/pkgs/development/libraries/expat/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/expat/builder.sh rename to pkgs/development/libraries/expat/builder.sh diff --git a/pkgs-ng/development/libraries/expat/default.fix b/pkgs/development/libraries/expat/default.fix similarity index 100% rename from pkgs-ng/development/libraries/expat/default.fix rename to pkgs/development/libraries/expat/default.fix diff --git a/pkgs-ng/development/libraries/fontconfig/builder.sh b/pkgs/development/libraries/fontconfig/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/fontconfig/builder.sh rename to pkgs/development/libraries/fontconfig/builder.sh diff --git a/pkgs-ng/development/libraries/fontconfig/default.fix b/pkgs/development/libraries/fontconfig/default.fix similarity index 100% rename from pkgs-ng/development/libraries/fontconfig/default.fix rename to pkgs/development/libraries/fontconfig/default.fix diff --git a/pkgs-ng/development/libraries/freetype/builder.sh b/pkgs/development/libraries/freetype/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/freetype/builder.sh rename to pkgs/development/libraries/freetype/builder.sh diff --git a/pkgs-ng/development/libraries/freetype/default.fix b/pkgs/development/libraries/freetype/default.fix similarity index 100% rename from pkgs-ng/development/libraries/freetype/default.fix rename to pkgs/development/libraries/freetype/default.fix diff --git a/pkgs-ng/development/libraries/gettext/builder.sh b/pkgs/development/libraries/gettext/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gettext/builder.sh rename to pkgs/development/libraries/gettext/builder.sh diff --git a/pkgs-ng/development/libraries/gettext/default.fix b/pkgs/development/libraries/gettext/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gettext/default.fix rename to pkgs/development/libraries/gettext/default.fix diff --git a/pkgs-ng/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/glibc/builder.sh rename to pkgs/development/libraries/glibc/builder.sh diff --git a/pkgs-ng/development/libraries/glibc/default.fix b/pkgs/development/libraries/glibc/default.fix similarity index 100% rename from pkgs-ng/development/libraries/glibc/default.fix rename to pkgs/development/libraries/glibc/default.fix diff --git a/pkgs-ng/development/libraries/glibc/glibc-2.3.2-sscanf-1.patch b/pkgs/development/libraries/glibc/glibc-2.3.2-sscanf-1.patch similarity index 100% rename from pkgs-ng/development/libraries/glibc/glibc-2.3.2-sscanf-1.patch rename to pkgs/development/libraries/glibc/glibc-2.3.2-sscanf-1.patch diff --git a/pkgs-ng/development/libraries/gnet/builder.sh b/pkgs/development/libraries/gnet/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gnet/builder.sh rename to pkgs/development/libraries/gnet/builder.sh diff --git a/pkgs-ng/development/libraries/gnet/default.fix b/pkgs/development/libraries/gnet/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gnet/default.fix rename to pkgs/development/libraries/gnet/default.fix diff --git a/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh rename to pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh diff --git a/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/default.fix b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/default.fix rename to pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.fix diff --git a/pkgs-ng/development/libraries/gtk+-1/glib/builder.sh b/pkgs/development/libraries/gtk+-1/glib/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gtk+-1/glib/builder.sh rename to pkgs/development/libraries/gtk+-1/glib/builder.sh diff --git a/pkgs-ng/development/libraries/gtk+-1/glib/default.fix b/pkgs/development/libraries/gtk+-1/glib/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gtk+-1/glib/default.fix rename to pkgs/development/libraries/gtk+-1/glib/default.fix diff --git a/pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh b/pkgs/development/libraries/gtk+-1/gtk+/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh rename to pkgs/development/libraries/gtk+-1/gtk+/builder.sh diff --git a/pkgs-ng/development/libraries/gtk+-1/gtk+/default.fix b/pkgs/development/libraries/gtk+-1/gtk+/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gtk+-1/gtk+/default.fix rename to pkgs/development/libraries/gtk+-1/gtk+/default.fix diff --git a/pkgs-ng/development/libraries/gtk+/atk/builder.sh b/pkgs/development/libraries/gtk+/atk/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gtk+/atk/builder.sh rename to pkgs/development/libraries/gtk+/atk/builder.sh diff --git a/pkgs-ng/development/libraries/gtk+/atk/default.fix b/pkgs/development/libraries/gtk+/atk/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gtk+/atk/default.fix rename to pkgs/development/libraries/gtk+/atk/default.fix diff --git a/pkgs-ng/development/libraries/gtk+/glib/builder.sh b/pkgs/development/libraries/gtk+/glib/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gtk+/glib/builder.sh rename to pkgs/development/libraries/gtk+/glib/builder.sh diff --git a/pkgs-ng/development/libraries/gtk+/glib/default.fix b/pkgs/development/libraries/gtk+/glib/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gtk+/glib/default.fix rename to pkgs/development/libraries/gtk+/glib/default.fix diff --git a/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh b/pkgs/development/libraries/gtk+/gtk+/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gtk+/gtk+/builder.sh rename to pkgs/development/libraries/gtk+/gtk+/builder.sh diff --git a/pkgs-ng/development/libraries/gtk+/gtk+/default.fix b/pkgs/development/libraries/gtk+/gtk+/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gtk+/gtk+/default.fix rename to pkgs/development/libraries/gtk+/gtk+/default.fix diff --git a/pkgs-ng/development/libraries/gtk+/pango/builder.sh b/pkgs/development/libraries/gtk+/pango/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/gtk+/pango/builder.sh rename to pkgs/development/libraries/gtk+/pango/builder.sh diff --git a/pkgs-ng/development/libraries/gtk+/pango/default.fix b/pkgs/development/libraries/gtk+/pango/default.fix similarity index 100% rename from pkgs-ng/development/libraries/gtk+/pango/default.fix rename to pkgs/development/libraries/gtk+/pango/default.fix diff --git a/pkgs-ng/development/libraries/libIDL/builder.sh b/pkgs/development/libraries/libIDL/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/libIDL/builder.sh rename to pkgs/development/libraries/libIDL/builder.sh diff --git a/pkgs-ng/development/libraries/libIDL/default.fix b/pkgs/development/libraries/libIDL/default.fix similarity index 100% rename from pkgs-ng/development/libraries/libIDL/default.fix rename to pkgs/development/libraries/libIDL/default.fix diff --git a/pkgs-ng/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/libjpeg/builder.sh rename to pkgs/development/libraries/libjpeg/builder.sh diff --git a/pkgs-ng/development/libraries/libjpeg/default.fix b/pkgs/development/libraries/libjpeg/default.fix similarity index 100% rename from pkgs-ng/development/libraries/libjpeg/default.fix rename to pkgs/development/libraries/libjpeg/default.fix diff --git a/pkgs-ng/development/libraries/libpng/builder.sh b/pkgs/development/libraries/libpng/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/libpng/builder.sh rename to pkgs/development/libraries/libpng/builder.sh diff --git a/pkgs-ng/development/libraries/libpng/default.fix b/pkgs/development/libraries/libpng/default.fix similarity index 100% rename from pkgs-ng/development/libraries/libpng/default.fix rename to pkgs/development/libraries/libpng/default.fix diff --git a/pkgs-ng/development/libraries/libtiff/builder.sh b/pkgs/development/libraries/libtiff/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/libtiff/builder.sh rename to pkgs/development/libraries/libtiff/builder.sh diff --git a/pkgs-ng/development/libraries/libtiff/default.fix b/pkgs/development/libraries/libtiff/default.fix similarity index 100% rename from pkgs-ng/development/libraries/libtiff/default.fix rename to pkgs/development/libraries/libtiff/default.fix diff --git a/pkgs-ng/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/libxml2/builder.sh rename to pkgs/development/libraries/libxml2/builder.sh diff --git a/pkgs-ng/development/libraries/libxml2/default.fix b/pkgs/development/libraries/libxml2/default.fix similarity index 100% rename from pkgs-ng/development/libraries/libxml2/default.fix rename to pkgs/development/libraries/libxml2/default.fix diff --git a/pkgs-ng/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/openssl/builder.sh rename to pkgs/development/libraries/openssl/builder.sh diff --git a/pkgs-ng/development/libraries/openssl/default.fix b/pkgs/development/libraries/openssl/default.fix similarity index 100% rename from pkgs-ng/development/libraries/openssl/default.fix rename to pkgs/development/libraries/openssl/default.fix diff --git a/pkgs-ng/development/libraries/pcre/builder.sh b/pkgs/development/libraries/pcre/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/pcre/builder.sh rename to pkgs/development/libraries/pcre/builder.sh diff --git a/pkgs-ng/development/libraries/pcre/default.fix b/pkgs/development/libraries/pcre/default.fix similarity index 100% rename from pkgs-ng/development/libraries/pcre/default.fix rename to pkgs/development/libraries/pcre/default.fix diff --git a/pkgs-ng/development/libraries/xft/builder.sh b/pkgs/development/libraries/xft/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/xft/builder.sh rename to pkgs/development/libraries/xft/builder.sh diff --git a/pkgs-ng/development/libraries/xft/default.fix b/pkgs/development/libraries/xft/default.fix similarity index 100% rename from pkgs-ng/development/libraries/xft/default.fix rename to pkgs/development/libraries/xft/default.fix diff --git a/pkgs-ng/development/libraries/zlib/builder.sh b/pkgs/development/libraries/zlib/builder.sh similarity index 100% rename from pkgs-ng/development/libraries/zlib/builder.sh rename to pkgs/development/libraries/zlib/builder.sh diff --git a/pkgs-ng/development/libraries/zlib/default.fix b/pkgs/development/libraries/zlib/default.fix similarity index 100% rename from pkgs-ng/development/libraries/zlib/default.fix rename to pkgs/development/libraries/zlib/default.fix diff --git a/pkgs-ng/development/tools/build-managers/gnumake/builder.sh b/pkgs/development/tools/build-managers/gnumake/builder.sh similarity index 100% rename from pkgs-ng/development/tools/build-managers/gnumake/builder.sh rename to pkgs/development/tools/build-managers/gnumake/builder.sh diff --git a/pkgs-ng/development/tools/build-managers/gnumake/default.fix b/pkgs/development/tools/build-managers/gnumake/default.fix similarity index 100% rename from pkgs-ng/development/tools/build-managers/gnumake/default.fix rename to pkgs/development/tools/build-managers/gnumake/default.fix diff --git a/pkgs-ng/development/tools/misc/binutils/builder.sh b/pkgs/development/tools/misc/binutils/builder.sh similarity index 100% rename from pkgs-ng/development/tools/misc/binutils/builder.sh rename to pkgs/development/tools/misc/binutils/builder.sh diff --git a/pkgs-ng/development/tools/misc/binutils/default.fix b/pkgs/development/tools/misc/binutils/default.fix similarity index 100% rename from pkgs-ng/development/tools/misc/binutils/default.fix rename to pkgs/development/tools/misc/binutils/default.fix diff --git a/pkgs-ng/development/tools/misc/gnum4/builder.sh b/pkgs/development/tools/misc/gnum4/builder.sh similarity index 100% rename from pkgs-ng/development/tools/misc/gnum4/builder.sh rename to pkgs/development/tools/misc/gnum4/builder.sh diff --git a/pkgs-ng/development/tools/misc/gnum4/default.fix b/pkgs/development/tools/misc/gnum4/default.fix similarity index 100% rename from pkgs-ng/development/tools/misc/gnum4/default.fix rename to pkgs/development/tools/misc/gnum4/default.fix diff --git a/pkgs-ng/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh similarity index 100% rename from pkgs-ng/development/tools/misc/pkgconfig/builder.sh rename to pkgs/development/tools/misc/pkgconfig/builder.sh diff --git a/pkgs-ng/development/tools/misc/pkgconfig/default.fix b/pkgs/development/tools/misc/pkgconfig/default.fix similarity index 100% rename from pkgs-ng/development/tools/misc/pkgconfig/default.fix rename to pkgs/development/tools/misc/pkgconfig/default.fix diff --git a/pkgs-ng/development/tools/parsing/bison/builder.sh b/pkgs/development/tools/parsing/bison/builder.sh similarity index 100% rename from pkgs-ng/development/tools/parsing/bison/builder.sh rename to pkgs/development/tools/parsing/bison/builder.sh diff --git a/pkgs-ng/development/tools/parsing/bison/default.fix b/pkgs/development/tools/parsing/bison/default.fix similarity index 100% rename from pkgs-ng/development/tools/parsing/bison/default.fix rename to pkgs/development/tools/parsing/bison/default.fix diff --git a/pkgs-ng/development/tools/parsing/flex/builder.sh b/pkgs/development/tools/parsing/flex/builder.sh similarity index 100% rename from pkgs-ng/development/tools/parsing/flex/builder.sh rename to pkgs/development/tools/parsing/flex/builder.sh diff --git a/pkgs-ng/development/tools/parsing/flex/default.fix b/pkgs/development/tools/parsing/flex/default.fix similarity index 100% rename from pkgs-ng/development/tools/parsing/flex/default.fix rename to pkgs/development/tools/parsing/flex/default.fix diff --git a/pkgs-ng/os-specific/linux/alsa/library/builder.sh b/pkgs/os-specific/linux/alsa/library/builder.sh similarity index 100% rename from pkgs-ng/os-specific/linux/alsa/library/builder.sh rename to pkgs/os-specific/linux/alsa/library/builder.sh diff --git a/pkgs-ng/os-specific/linux/alsa/library/default.fix b/pkgs/os-specific/linux/alsa/library/default.fix similarity index 100% rename from pkgs-ng/os-specific/linux/alsa/library/default.fix rename to pkgs/os-specific/linux/alsa/library/default.fix diff --git a/pkgs-ng/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh similarity index 100% rename from pkgs-ng/os-specific/linux/kernel-headers/builder.sh rename to pkgs/os-specific/linux/kernel-headers/builder.sh diff --git a/pkgs-ng/os-specific/linux/kernel-headers/default.fix b/pkgs/os-specific/linux/kernel-headers/default.fix similarity index 100% rename from pkgs-ng/os-specific/linux/kernel-headers/default.fix rename to pkgs/os-specific/linux/kernel-headers/default.fix diff --git a/pkgs-ng/servers/http/apache-httpd/builder.sh b/pkgs/servers/http/apache-httpd/builder.sh similarity index 100% rename from pkgs-ng/servers/http/apache-httpd/builder.sh rename to pkgs/servers/http/apache-httpd/builder.sh diff --git a/pkgs-ng/servers/http/apache-httpd/default.fix b/pkgs/servers/http/apache-httpd/default.fix similarity index 100% rename from pkgs-ng/servers/http/apache-httpd/default.fix rename to pkgs/servers/http/apache-httpd/default.fix diff --git a/pkgs-ng/servers/x11/xfree86/builder.sh b/pkgs/servers/x11/xfree86/builder.sh similarity index 100% rename from pkgs-ng/servers/x11/xfree86/builder.sh rename to pkgs/servers/x11/xfree86/builder.sh diff --git a/pkgs-ng/servers/x11/xfree86/default.fix b/pkgs/servers/x11/xfree86/default.fix similarity index 100% rename from pkgs-ng/servers/x11/xfree86/default.fix rename to pkgs/servers/x11/xfree86/default.fix diff --git a/pkgs-ng/servers/x11/xfree86/host.def b/pkgs/servers/x11/xfree86/host.def similarity index 100% rename from pkgs-ng/servers/x11/xfree86/host.def rename to pkgs/servers/x11/xfree86/host.def diff --git a/pkgs-ng/shells/bash/builder.sh b/pkgs/shells/bash/builder.sh similarity index 100% rename from pkgs-ng/shells/bash/builder.sh rename to pkgs/shells/bash/builder.sh diff --git a/pkgs-ng/shells/bash/default.fix b/pkgs/shells/bash/default.fix similarity index 100% rename from pkgs-ng/shells/bash/default.fix rename to pkgs/shells/bash/default.fix diff --git a/pkgs-ng/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh similarity index 100% rename from pkgs-ng/stdenv/generic/builder.sh rename to pkgs/stdenv/generic/builder.sh diff --git a/pkgs-ng/stdenv/generic/default.fix b/pkgs/stdenv/generic/default.fix similarity index 100% rename from pkgs-ng/stdenv/generic/default.fix rename to pkgs/stdenv/generic/default.fix diff --git a/pkgs-ng/stdenv/generic/gcc-wrapper.sh b/pkgs/stdenv/generic/gcc-wrapper.sh similarity index 100% rename from pkgs-ng/stdenv/generic/gcc-wrapper.sh rename to pkgs/stdenv/generic/gcc-wrapper.sh diff --git a/pkgs-ng/stdenv/generic/ld-wrapper.sh b/pkgs/stdenv/generic/ld-wrapper.sh similarity index 100% rename from pkgs-ng/stdenv/generic/ld-wrapper.sh rename to pkgs/stdenv/generic/ld-wrapper.sh diff --git a/pkgs-ng/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh similarity index 100% rename from pkgs-ng/stdenv/generic/setup.sh rename to pkgs/stdenv/generic/setup.sh diff --git a/pkgs-ng/stdenv/native/default.fix b/pkgs/stdenv/native/default.fix similarity index 100% rename from pkgs-ng/stdenv/native/default.fix rename to pkgs/stdenv/native/default.fix diff --git a/pkgs-ng/stdenv/native/posthook.sh b/pkgs/stdenv/native/posthook.sh similarity index 100% rename from pkgs-ng/stdenv/native/posthook.sh rename to pkgs/stdenv/native/posthook.sh diff --git a/pkgs-ng/stdenv/native/prehook.sh b/pkgs/stdenv/native/prehook.sh similarity index 100% rename from pkgs-ng/stdenv/native/prehook.sh rename to pkgs/stdenv/native/prehook.sh diff --git a/pkgs-ng/stdenv/nix-linux/boot.fix b/pkgs/stdenv/nix-linux/boot.fix similarity index 100% rename from pkgs-ng/stdenv/nix-linux/boot.fix rename to pkgs/stdenv/nix-linux/boot.fix diff --git a/pkgs-ng/stdenv/nix-linux/default.fix b/pkgs/stdenv/nix-linux/default.fix similarity index 100% rename from pkgs-ng/stdenv/nix-linux/default.fix rename to pkgs/stdenv/nix-linux/default.fix diff --git a/pkgs-ng/stdenv/nix-linux/posthook.sh b/pkgs/stdenv/nix-linux/posthook.sh similarity index 100% rename from pkgs-ng/stdenv/nix-linux/posthook.sh rename to pkgs/stdenv/nix-linux/posthook.sh diff --git a/pkgs-ng/stdenv/nix-linux/prehook-boot.sh b/pkgs/stdenv/nix-linux/prehook-boot.sh similarity index 100% rename from pkgs-ng/stdenv/nix-linux/prehook-boot.sh rename to pkgs/stdenv/nix-linux/prehook-boot.sh diff --git a/pkgs-ng/stdenv/nix-linux/prehook.sh b/pkgs/stdenv/nix-linux/prehook.sh similarity index 100% rename from pkgs-ng/stdenv/nix-linux/prehook.sh rename to pkgs/stdenv/nix-linux/prehook.sh diff --git a/pkgs-ng/stdenv/nix/default.fix b/pkgs/stdenv/nix/default.fix similarity index 100% rename from pkgs-ng/stdenv/nix/default.fix rename to pkgs/stdenv/nix/default.fix diff --git a/pkgs-ng/stdenv/nix/path.fix b/pkgs/stdenv/nix/path.fix similarity index 100% rename from pkgs-ng/stdenv/nix/path.fix rename to pkgs/stdenv/nix/path.fix diff --git a/pkgs-ng/stdenv/nix/posthook.sh b/pkgs/stdenv/nix/posthook.sh similarity index 100% rename from pkgs-ng/stdenv/nix/posthook.sh rename to pkgs/stdenv/nix/posthook.sh diff --git a/pkgs-ng/stdenv/nix/prehook.sh b/pkgs/stdenv/nix/prehook.sh similarity index 100% rename from pkgs-ng/stdenv/nix/prehook.sh rename to pkgs/stdenv/nix/prehook.sh diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs/system/all-packages-generic.fix similarity index 100% rename from pkgs-ng/system/all-packages-generic.fix rename to pkgs/system/all-packages-generic.fix diff --git a/pkgs-ng/system/all-packages.fix b/pkgs/system/all-packages.fix similarity index 100% rename from pkgs-ng/system/all-packages.fix rename to pkgs/system/all-packages.fix diff --git a/pkgs-ng/system/i686-suse-linux.fix b/pkgs/system/i686-suse-linux.fix similarity index 100% rename from pkgs-ng/system/i686-suse-linux.fix rename to pkgs/system/i686-suse-linux.fix diff --git a/pkgs-ng/system/populate-linkdirs.pl b/pkgs/system/populate-linkdirs.pl similarity index 100% rename from pkgs-ng/system/populate-linkdirs.pl rename to pkgs/system/populate-linkdirs.pl diff --git a/pkgs-ng/system/user-environment.fix b/pkgs/system/user-environment.fix similarity index 100% rename from pkgs-ng/system/user-environment.fix rename to pkgs/system/user-environment.fix diff --git a/pkgs-ng/tools/archivers/gnutar/builder.sh b/pkgs/tools/archivers/gnutar/builder.sh similarity index 100% rename from pkgs-ng/tools/archivers/gnutar/builder.sh rename to pkgs/tools/archivers/gnutar/builder.sh diff --git a/pkgs-ng/tools/archivers/gnutar/default.fix b/pkgs/tools/archivers/gnutar/default.fix similarity index 100% rename from pkgs-ng/tools/archivers/gnutar/default.fix rename to pkgs/tools/archivers/gnutar/default.fix diff --git a/pkgs-ng/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh similarity index 100% rename from pkgs-ng/tools/archivers/zip/builder.sh rename to pkgs/tools/archivers/zip/builder.sh diff --git a/pkgs-ng/tools/archivers/zip/default.fix b/pkgs/tools/archivers/zip/default.fix similarity index 100% rename from pkgs-ng/tools/archivers/zip/default.fix rename to pkgs/tools/archivers/zip/default.fix diff --git a/pkgs-ng/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh similarity index 100% rename from pkgs-ng/tools/compression/bzip2/builder.sh rename to pkgs/tools/compression/bzip2/builder.sh diff --git a/pkgs-ng/tools/compression/bzip2/default.fix b/pkgs/tools/compression/bzip2/default.fix similarity index 100% rename from pkgs-ng/tools/compression/bzip2/default.fix rename to pkgs/tools/compression/bzip2/default.fix diff --git a/pkgs-ng/tools/compression/gzip/builder.sh b/pkgs/tools/compression/gzip/builder.sh similarity index 100% rename from pkgs-ng/tools/compression/gzip/builder.sh rename to pkgs/tools/compression/gzip/builder.sh diff --git a/pkgs-ng/tools/compression/gzip/default.fix b/pkgs/tools/compression/gzip/default.fix similarity index 100% rename from pkgs-ng/tools/compression/gzip/default.fix rename to pkgs/tools/compression/gzip/default.fix diff --git a/pkgs-ng/tools/misc/coreutils/builder.sh b/pkgs/tools/misc/coreutils/builder.sh similarity index 100% rename from pkgs-ng/tools/misc/coreutils/builder.sh rename to pkgs/tools/misc/coreutils/builder.sh diff --git a/pkgs-ng/tools/misc/coreutils/default.fix b/pkgs/tools/misc/coreutils/default.fix similarity index 100% rename from pkgs-ng/tools/misc/coreutils/default.fix rename to pkgs/tools/misc/coreutils/default.fix diff --git a/pkgs-ng/tools/misc/findutils/builder.sh b/pkgs/tools/misc/findutils/builder.sh similarity index 100% rename from pkgs-ng/tools/misc/findutils/builder.sh rename to pkgs/tools/misc/findutils/builder.sh diff --git a/pkgs-ng/tools/misc/findutils/default.fix b/pkgs/tools/misc/findutils/default.fix similarity index 100% rename from pkgs-ng/tools/misc/findutils/default.fix rename to pkgs/tools/misc/findutils/default.fix diff --git a/pkgs-ng/tools/networking/wget/builder.sh b/pkgs/tools/networking/wget/builder.sh similarity index 100% rename from pkgs-ng/tools/networking/wget/builder.sh rename to pkgs/tools/networking/wget/builder.sh diff --git a/pkgs-ng/tools/networking/wget/default.fix b/pkgs/tools/networking/wget/default.fix similarity index 100% rename from pkgs-ng/tools/networking/wget/default.fix rename to pkgs/tools/networking/wget/default.fix diff --git a/pkgs-ng/tools/text/diffutils/builder.sh b/pkgs/tools/text/diffutils/builder.sh similarity index 100% rename from pkgs-ng/tools/text/diffutils/builder.sh rename to pkgs/tools/text/diffutils/builder.sh diff --git a/pkgs-ng/tools/text/diffutils/default.fix b/pkgs/tools/text/diffutils/default.fix similarity index 100% rename from pkgs-ng/tools/text/diffutils/default.fix rename to pkgs/tools/text/diffutils/default.fix diff --git a/pkgs-ng/tools/text/ed/builder.sh b/pkgs/tools/text/ed/builder.sh similarity index 100% rename from pkgs-ng/tools/text/ed/builder.sh rename to pkgs/tools/text/ed/builder.sh diff --git a/pkgs-ng/tools/text/ed/default.fix b/pkgs/tools/text/ed/default.fix similarity index 100% rename from pkgs-ng/tools/text/ed/default.fix rename to pkgs/tools/text/ed/default.fix diff --git a/pkgs-ng/tools/text/gawk/builder.sh b/pkgs/tools/text/gawk/builder.sh similarity index 100% rename from pkgs-ng/tools/text/gawk/builder.sh rename to pkgs/tools/text/gawk/builder.sh diff --git a/pkgs-ng/tools/text/gawk/default.fix b/pkgs/tools/text/gawk/default.fix similarity index 100% rename from pkgs-ng/tools/text/gawk/default.fix rename to pkgs/tools/text/gawk/default.fix diff --git a/pkgs-ng/tools/text/gnugrep/builder.sh b/pkgs/tools/text/gnugrep/builder.sh similarity index 100% rename from pkgs-ng/tools/text/gnugrep/builder.sh rename to pkgs/tools/text/gnugrep/builder.sh diff --git a/pkgs-ng/tools/text/gnugrep/default.fix b/pkgs/tools/text/gnugrep/default.fix similarity index 100% rename from pkgs-ng/tools/text/gnugrep/default.fix rename to pkgs/tools/text/gnugrep/default.fix diff --git a/pkgs-ng/tools/text/gnused/builder.sh b/pkgs/tools/text/gnused/builder.sh similarity index 100% rename from pkgs-ng/tools/text/gnused/builder.sh rename to pkgs/tools/text/gnused/builder.sh diff --git a/pkgs-ng/tools/text/gnused/default.fix b/pkgs/tools/text/gnused/default.fix similarity index 100% rename from pkgs-ng/tools/text/gnused/default.fix rename to pkgs/tools/text/gnused/default.fix