diff --git a/pkgs-ng/README b/pkgs-ng/README
index 232163562bb..835be306568 100644
--- a/pkgs-ng/README
+++ b/pkgs-ng/README
@@ -19,7 +19,7 @@ IF it's used to support SOFTWARE DEVELOPMENT:
     ./development/interpreters
   ELSE IF it's a development TOOL (or set of):
     IF it's a PARSER GENERATOR (incl. lexers):
-      ./development/tools/lexer
+      ./development/tools/parsing
       (e.g., bison, flex)
     ELSE IF it's a BUILD MANAGER:
       ./development/tools/build-managers
@@ -43,7 +43,7 @@ ELSE IF it's a TOOL (or set of):
   ELSE IF it's a SYSTEM utility, i.e., something related or essential
     to the operation of a system:
     ./tools/system
-    (e.g., coreutils)
+    (e.g., init)
   ELSE IF it's an ARCHIVER (which may include a compression function):
     ./tools/archivers
     (e.g., zip, tar)
diff --git a/pkgs-ng/development/libs/aterm/builder.sh b/pkgs-ng/development/libraries/aterm/builder.sh
similarity index 100%
rename from pkgs-ng/development/libs/aterm/builder.sh
rename to pkgs-ng/development/libraries/aterm/builder.sh
diff --git a/pkgs-ng/development/libs/aterm/default.fix b/pkgs-ng/development/libraries/aterm/default.fix
similarity index 100%
rename from pkgs-ng/development/libs/aterm/default.fix
rename to pkgs-ng/development/libraries/aterm/default.fix
diff --git a/pkgs-ng/development/libs/glibc/builder.sh b/pkgs-ng/development/libraries/glibc/builder.sh
similarity index 100%
rename from pkgs-ng/development/libs/glibc/builder.sh
rename to pkgs-ng/development/libraries/glibc/builder.sh
diff --git a/pkgs-ng/development/libs/glibc/default.fix b/pkgs-ng/development/libraries/glibc/default.fix
similarity index 100%
rename from pkgs-ng/development/libs/glibc/default.fix
rename to pkgs-ng/development/libraries/glibc/default.fix
diff --git a/pkgs-ng/development/libs/glibc/glibc-2.3.2-sscanf-1.patch b/pkgs-ng/development/libraries/glibc/glibc-2.3.2-sscanf-1.patch
similarity index 100%
rename from pkgs-ng/development/libs/glibc/glibc-2.3.2-sscanf-1.patch
rename to pkgs-ng/development/libraries/glibc/glibc-2.3.2-sscanf-1.patch
diff --git a/pkgs-ng/development/libs/pcre/builder.sh b/pkgs-ng/development/libraries/pcre/builder.sh
similarity index 100%
rename from pkgs-ng/development/libs/pcre/builder.sh
rename to pkgs-ng/development/libraries/pcre/builder.sh
diff --git a/pkgs-ng/development/libs/pcre/default.fix b/pkgs-ng/development/libraries/pcre/default.fix
similarity index 100%
rename from pkgs-ng/development/libs/pcre/default.fix
rename to pkgs-ng/development/libraries/pcre/default.fix
diff --git a/pkgs-ng/development/tools/gnumake/builder.sh b/pkgs-ng/development/tools/build-managers/gnumake/builder.sh
similarity index 100%
rename from pkgs-ng/development/tools/gnumake/builder.sh
rename to pkgs-ng/development/tools/build-managers/gnumake/builder.sh
diff --git a/pkgs-ng/development/tools/gnumake/default.fix b/pkgs-ng/development/tools/build-managers/gnumake/default.fix
similarity index 100%
rename from pkgs-ng/development/tools/gnumake/default.fix
rename to pkgs-ng/development/tools/build-managers/gnumake/default.fix
diff --git a/pkgs-ng/development/tools/binutils/builder.sh b/pkgs-ng/development/tools/misc/binutils/builder.sh
similarity index 100%
rename from pkgs-ng/development/tools/binutils/builder.sh
rename to pkgs-ng/development/tools/misc/binutils/builder.sh
diff --git a/pkgs-ng/development/tools/binutils/default.fix b/pkgs-ng/development/tools/misc/binutils/default.fix
similarity index 100%
rename from pkgs-ng/development/tools/binutils/default.fix
rename to pkgs-ng/development/tools/misc/binutils/default.fix
diff --git a/pkgs-ng/archivers/gnutar/builder.sh b/pkgs-ng/tools/archivers/gnutar/builder.sh
similarity index 100%
rename from pkgs-ng/archivers/gnutar/builder.sh
rename to pkgs-ng/tools/archivers/gnutar/builder.sh
diff --git a/pkgs-ng/archivers/gnutar/default.fix b/pkgs-ng/tools/archivers/gnutar/default.fix
similarity index 100%
rename from pkgs-ng/archivers/gnutar/default.fix
rename to pkgs-ng/tools/archivers/gnutar/default.fix
diff --git a/pkgs-ng/compression/bzip2/builder.sh b/pkgs-ng/tools/compression/bzip2/builder.sh
similarity index 100%
rename from pkgs-ng/compression/bzip2/builder.sh
rename to pkgs-ng/tools/compression/bzip2/builder.sh
diff --git a/pkgs-ng/compression/bzip2/default.fix b/pkgs-ng/tools/compression/bzip2/default.fix
similarity index 100%
rename from pkgs-ng/compression/bzip2/default.fix
rename to pkgs-ng/tools/compression/bzip2/default.fix
diff --git a/pkgs-ng/compression/gzip/builder.sh b/pkgs-ng/tools/compression/gzip/builder.sh
similarity index 100%
rename from pkgs-ng/compression/gzip/builder.sh
rename to pkgs-ng/tools/compression/gzip/builder.sh
diff --git a/pkgs-ng/compression/gzip/default.fix b/pkgs-ng/tools/compression/gzip/default.fix
similarity index 100%
rename from pkgs-ng/compression/gzip/default.fix
rename to pkgs-ng/tools/compression/gzip/default.fix
diff --git a/pkgs-ng/sys-utils/coreutils/builder.sh b/pkgs-ng/tools/misc/coreutils/builder.sh
similarity index 100%
rename from pkgs-ng/sys-utils/coreutils/builder.sh
rename to pkgs-ng/tools/misc/coreutils/builder.sh
diff --git a/pkgs-ng/sys-utils/coreutils/default.fix b/pkgs-ng/tools/misc/coreutils/default.fix
similarity index 100%
rename from pkgs-ng/sys-utils/coreutils/default.fix
rename to pkgs-ng/tools/misc/coreutils/default.fix
diff --git a/pkgs-ng/sys-utils/diffutils/builder.sh b/pkgs-ng/tools/text/diffutils/builder.sh
similarity index 100%
rename from pkgs-ng/sys-utils/diffutils/builder.sh
rename to pkgs-ng/tools/text/diffutils/builder.sh
diff --git a/pkgs-ng/sys-utils/diffutils/default.fix b/pkgs-ng/tools/text/diffutils/default.fix
similarity index 100%
rename from pkgs-ng/sys-utils/diffutils/default.fix
rename to pkgs-ng/tools/text/diffutils/default.fix
diff --git a/pkgs-ng/sys-utils/gawk/builder.sh b/pkgs-ng/tools/text/gawk/builder.sh
similarity index 100%
rename from pkgs-ng/sys-utils/gawk/builder.sh
rename to pkgs-ng/tools/text/gawk/builder.sh
diff --git a/pkgs-ng/sys-utils/gawk/default.fix b/pkgs-ng/tools/text/gawk/default.fix
similarity index 100%
rename from pkgs-ng/sys-utils/gawk/default.fix
rename to pkgs-ng/tools/text/gawk/default.fix
diff --git a/pkgs-ng/sys-utils/gnugrep/builder.sh b/pkgs-ng/tools/text/gnugrep/builder.sh
similarity index 100%
rename from pkgs-ng/sys-utils/gnugrep/builder.sh
rename to pkgs-ng/tools/text/gnugrep/builder.sh
diff --git a/pkgs-ng/sys-utils/gnugrep/default.fix b/pkgs-ng/tools/text/gnugrep/default.fix
similarity index 100%
rename from pkgs-ng/sys-utils/gnugrep/default.fix
rename to pkgs-ng/tools/text/gnugrep/default.fix
diff --git a/pkgs-ng/sys-utils/gnused/builder.sh b/pkgs-ng/tools/text/gnused/builder.sh
similarity index 100%
rename from pkgs-ng/sys-utils/gnused/builder.sh
rename to pkgs-ng/tools/text/gnused/builder.sh
diff --git a/pkgs-ng/sys-utils/gnused/default.fix b/pkgs-ng/tools/text/gnused/default.fix
similarity index 100%
rename from pkgs-ng/sys-utils/gnused/default.fix
rename to pkgs-ng/tools/text/gnused/default.fix