diff --git a/src/apps/bin/coreutils-5.0/ABOUT-NLS b/src/apps/bin/coreutils/ABOUT-NLS
similarity index 100%
rename from src/apps/bin/coreutils-5.0/ABOUT-NLS
rename to src/apps/bin/coreutils/ABOUT-NLS
diff --git a/src/apps/bin/coreutils-5.0/AUTHORS b/src/apps/bin/coreutils/AUTHORS
similarity index 100%
rename from src/apps/bin/coreutils-5.0/AUTHORS
rename to src/apps/bin/coreutils/AUTHORS
diff --git a/src/apps/bin/coreutils-5.0/COPYING b/src/apps/bin/coreutils/COPYING
similarity index 100%
rename from src/apps/bin/coreutils-5.0/COPYING
rename to src/apps/bin/coreutils/COPYING
diff --git a/src/apps/bin/coreutils-5.0/ChangeLog b/src/apps/bin/coreutils/ChangeLog
similarity index 100%
rename from src/apps/bin/coreutils-5.0/ChangeLog
rename to src/apps/bin/coreutils/ChangeLog
diff --git a/src/apps/bin/coreutils-5.0/GNUmakefile b/src/apps/bin/coreutils/GNUmakefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/GNUmakefile
rename to src/apps/bin/coreutils/GNUmakefile
diff --git a/src/apps/bin/coreutils-5.0/INSTALL b/src/apps/bin/coreutils/INSTALL
similarity index 100%
rename from src/apps/bin/coreutils-5.0/INSTALL
rename to src/apps/bin/coreutils/INSTALL
diff --git a/src/apps/bin/coreutils-5.0/Jamfile b/src/apps/bin/coreutils/Jamfile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/Jamfile
rename to src/apps/bin/coreutils/Jamfile
diff --git a/src/apps/bin/coreutils-5.0/Makefile b/src/apps/bin/coreutils/Makefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/Makefile
rename to src/apps/bin/coreutils/Makefile
diff --git a/src/apps/bin/coreutils-5.0/Makefile.am b/src/apps/bin/coreutils/Makefile.am
similarity index 100%
rename from src/apps/bin/coreutils-5.0/Makefile.am
rename to src/apps/bin/coreutils/Makefile.am
diff --git a/src/apps/bin/coreutils-5.0/Makefile.cfg b/src/apps/bin/coreutils/Makefile.cfg
similarity index 100%
rename from src/apps/bin/coreutils-5.0/Makefile.cfg
rename to src/apps/bin/coreutils/Makefile.cfg
diff --git a/src/apps/bin/coreutils-5.0/Makefile.in b/src/apps/bin/coreutils/Makefile.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/Makefile.in
rename to src/apps/bin/coreutils/Makefile.in
diff --git a/src/apps/bin/coreutils-5.0/Makefile.maint b/src/apps/bin/coreutils/Makefile.maint
similarity index 100%
rename from src/apps/bin/coreutils-5.0/Makefile.maint
rename to src/apps/bin/coreutils/Makefile.maint
diff --git a/src/apps/bin/coreutils-5.0/NEWS b/src/apps/bin/coreutils/NEWS
similarity index 100%
rename from src/apps/bin/coreutils-5.0/NEWS
rename to src/apps/bin/coreutils/NEWS
diff --git a/src/apps/bin/coreutils-5.0/README b/src/apps/bin/coreutils/README
similarity index 100%
rename from src/apps/bin/coreutils-5.0/README
rename to src/apps/bin/coreutils/README
diff --git a/src/apps/bin/coreutils-5.0/THANKS b/src/apps/bin/coreutils/THANKS
similarity index 100%
rename from src/apps/bin/coreutils-5.0/THANKS
rename to src/apps/bin/coreutils/THANKS
diff --git a/src/apps/bin/coreutils-5.0/THANKS-to-translators b/src/apps/bin/coreutils/THANKS-to-translators
similarity index 100%
rename from src/apps/bin/coreutils-5.0/THANKS-to-translators
rename to src/apps/bin/coreutils/THANKS-to-translators
diff --git a/src/apps/bin/coreutils-5.0/THANKStt.in b/src/apps/bin/coreutils/THANKStt.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/THANKStt.in
rename to src/apps/bin/coreutils/THANKStt.in
diff --git a/src/apps/bin/coreutils-5.0/TODO b/src/apps/bin/coreutils/TODO
similarity index 100%
rename from src/apps/bin/coreutils-5.0/TODO
rename to src/apps/bin/coreutils/TODO
diff --git a/src/apps/bin/coreutils-5.0/aclocal.m4 b/src/apps/bin/coreutils/aclocal.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/aclocal.m4
rename to src/apps/bin/coreutils/aclocal.m4
diff --git a/src/apps/bin/coreutils-5.0/announce-gen b/src/apps/bin/coreutils/announce-gen
similarity index 100%
rename from src/apps/bin/coreutils-5.0/announce-gen
rename to src/apps/bin/coreutils/announce-gen
diff --git a/src/apps/bin/coreutils-5.0/config.h b/src/apps/bin/coreutils/config.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config.h
rename to src/apps/bin/coreutils/config.h
diff --git a/src/apps/bin/coreutils-5.0/config.hin b/src/apps/bin/coreutils/config.hin
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config.hin
rename to src/apps/bin/coreutils/config.hin
diff --git a/src/apps/bin/coreutils-5.0/config.log b/src/apps/bin/coreutils/config.log
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config.log
rename to src/apps/bin/coreutils/config.log
diff --git a/src/apps/bin/coreutils-5.0/config.status b/src/apps/bin/coreutils/config.status
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config.status
rename to src/apps/bin/coreutils/config.status
diff --git a/src/apps/bin/coreutils-5.0/config/ChangeLog b/src/apps/bin/coreutils/config/ChangeLog
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/ChangeLog
rename to src/apps/bin/coreutils/config/ChangeLog
diff --git a/src/apps/bin/coreutils-5.0/config/config.guess b/src/apps/bin/coreutils/config/config.guess
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/config.guess
rename to src/apps/bin/coreutils/config/config.guess
diff --git a/src/apps/bin/coreutils-5.0/config/config.rpath b/src/apps/bin/coreutils/config/config.rpath
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/config.rpath
rename to src/apps/bin/coreutils/config/config.rpath
diff --git a/src/apps/bin/coreutils-5.0/config/config.sub b/src/apps/bin/coreutils/config/config.sub
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/config.sub
rename to src/apps/bin/coreutils/config/config.sub
diff --git a/src/apps/bin/coreutils-5.0/config/depcomp b/src/apps/bin/coreutils/config/depcomp
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/depcomp
rename to src/apps/bin/coreutils/config/depcomp
diff --git a/src/apps/bin/coreutils-5.0/config/install-sh b/src/apps/bin/coreutils/config/install-sh
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/install-sh
rename to src/apps/bin/coreutils/config/install-sh
diff --git a/src/apps/bin/coreutils-5.0/config/mdate-sh b/src/apps/bin/coreutils/config/mdate-sh
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/mdate-sh
rename to src/apps/bin/coreutils/config/mdate-sh
diff --git a/src/apps/bin/coreutils-5.0/config/missing b/src/apps/bin/coreutils/config/missing
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/missing
rename to src/apps/bin/coreutils/config/missing
diff --git a/src/apps/bin/coreutils-5.0/config/mkinstalldirs b/src/apps/bin/coreutils/config/mkinstalldirs
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/mkinstalldirs
rename to src/apps/bin/coreutils/config/mkinstalldirs
diff --git a/src/apps/bin/coreutils-5.0/config/texinfo.tex b/src/apps/bin/coreutils/config/texinfo.tex
similarity index 100%
rename from src/apps/bin/coreutils-5.0/config/texinfo.tex
rename to src/apps/bin/coreutils/config/texinfo.tex
diff --git a/src/apps/bin/coreutils-5.0/configure b/src/apps/bin/coreutils/configure
similarity index 100%
rename from src/apps/bin/coreutils-5.0/configure
rename to src/apps/bin/coreutils/configure
diff --git a/src/apps/bin/coreutils-5.0/configure.ac b/src/apps/bin/coreutils/configure.ac
similarity index 100%
rename from src/apps/bin/coreutils-5.0/configure.ac
rename to src/apps/bin/coreutils/configure.ac
diff --git a/src/apps/bin/coreutils-5.0/doc/ChangeLog b/src/apps/bin/coreutils/doc/ChangeLog
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/ChangeLog
rename to src/apps/bin/coreutils/doc/ChangeLog
diff --git a/src/apps/bin/coreutils-5.0/doc/Makefile b/src/apps/bin/coreutils/doc/Makefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/Makefile
rename to src/apps/bin/coreutils/doc/Makefile
diff --git a/src/apps/bin/coreutils-5.0/doc/Makefile.am b/src/apps/bin/coreutils/doc/Makefile.am
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/Makefile.am
rename to src/apps/bin/coreutils/doc/Makefile.am
diff --git a/src/apps/bin/coreutils-5.0/doc/Makefile.in b/src/apps/bin/coreutils/doc/Makefile.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/Makefile.in
rename to src/apps/bin/coreutils/doc/Makefile.in
diff --git a/src/apps/bin/coreutils-5.0/doc/constants.texi b/src/apps/bin/coreutils/doc/constants.texi
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/constants.texi
rename to src/apps/bin/coreutils/doc/constants.texi
diff --git a/src/apps/bin/coreutils-5.0/doc/coreutils.info b/src/apps/bin/coreutils/doc/coreutils.info
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/coreutils.info
rename to src/apps/bin/coreutils/doc/coreutils.info
diff --git a/src/apps/bin/coreutils-5.0/doc/coreutils.texi b/src/apps/bin/coreutils/doc/coreutils.texi
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/coreutils.texi
rename to src/apps/bin/coreutils/doc/coreutils.texi
diff --git a/src/apps/bin/coreutils-5.0/doc/doclicense.texi b/src/apps/bin/coreutils/doc/doclicense.texi
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/doclicense.texi
rename to src/apps/bin/coreutils/doc/doclicense.texi
diff --git a/src/apps/bin/coreutils-5.0/doc/getdate.texi b/src/apps/bin/coreutils/doc/getdate.texi
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/getdate.texi
rename to src/apps/bin/coreutils/doc/getdate.texi
diff --git a/src/apps/bin/coreutils-5.0/doc/perm.texi b/src/apps/bin/coreutils/doc/perm.texi
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/perm.texi
rename to src/apps/bin/coreutils/doc/perm.texi
diff --git a/src/apps/bin/coreutils-5.0/doc/stamp-vti b/src/apps/bin/coreutils/doc/stamp-vti
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/stamp-vti
rename to src/apps/bin/coreutils/doc/stamp-vti
diff --git a/src/apps/bin/coreutils-5.0/doc/version.texi b/src/apps/bin/coreutils/doc/version.texi
similarity index 100%
rename from src/apps/bin/coreutils-5.0/doc/version.texi
rename to src/apps/bin/coreutils/doc/version.texi
diff --git a/src/apps/bin/coreutils-5.0/lib/ChangeLog b/src/apps/bin/coreutils/lib/ChangeLog
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ChangeLog
rename to src/apps/bin/coreutils/lib/ChangeLog
diff --git a/src/apps/bin/coreutils-5.0/lib/Jamfile b/src/apps/bin/coreutils/lib/Jamfile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/Jamfile
rename to src/apps/bin/coreutils/lib/Jamfile
diff --git a/src/apps/bin/coreutils-5.0/lib/Makefile b/src/apps/bin/coreutils/lib/Makefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/Makefile
rename to src/apps/bin/coreutils/lib/Makefile
diff --git a/src/apps/bin/coreutils-5.0/lib/Makefile.am b/src/apps/bin/coreutils/lib/Makefile.am
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/Makefile.am
rename to src/apps/bin/coreutils/lib/Makefile.am
diff --git a/src/apps/bin/coreutils-5.0/lib/Makefile.in b/src/apps/bin/coreutils/lib/Makefile.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/Makefile.in
rename to src/apps/bin/coreutils/lib/Makefile.in
diff --git a/src/apps/bin/coreutils-5.0/lib/README b/src/apps/bin/coreutils/lib/README
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/README
rename to src/apps/bin/coreutils/lib/README
diff --git a/src/apps/bin/coreutils-5.0/lib/TODO b/src/apps/bin/coreutils/lib/TODO
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/TODO
rename to src/apps/bin/coreutils/lib/TODO
diff --git a/src/apps/bin/coreutils-5.0/lib/__fpending.c b/src/apps/bin/coreutils/lib/__fpending.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/__fpending.c
rename to src/apps/bin/coreutils/lib/__fpending.c
diff --git a/src/apps/bin/coreutils-5.0/lib/__fpending.h b/src/apps/bin/coreutils/lib/__fpending.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/__fpending.h
rename to src/apps/bin/coreutils/lib/__fpending.h
diff --git a/src/apps/bin/coreutils-5.0/lib/acl.c b/src/apps/bin/coreutils/lib/acl.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/acl.c
rename to src/apps/bin/coreutils/lib/acl.c
diff --git a/src/apps/bin/coreutils-5.0/lib/acl.h b/src/apps/bin/coreutils/lib/acl.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/acl.h
rename to src/apps/bin/coreutils/lib/acl.h
diff --git a/src/apps/bin/coreutils-5.0/lib/addext.c b/src/apps/bin/coreutils/lib/addext.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/addext.c
rename to src/apps/bin/coreutils/lib/addext.c
diff --git a/src/apps/bin/coreutils-5.0/lib/alloca.c b/src/apps/bin/coreutils/lib/alloca.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/alloca.c
rename to src/apps/bin/coreutils/lib/alloca.c
diff --git a/src/apps/bin/coreutils-5.0/lib/argmatch.c b/src/apps/bin/coreutils/lib/argmatch.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/argmatch.c
rename to src/apps/bin/coreutils/lib/argmatch.c
diff --git a/src/apps/bin/coreutils-5.0/lib/argmatch.h b/src/apps/bin/coreutils/lib/argmatch.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/argmatch.h
rename to src/apps/bin/coreutils/lib/argmatch.h
diff --git a/src/apps/bin/coreutils-5.0/lib/atexit.c b/src/apps/bin/coreutils/lib/atexit.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/atexit.c
rename to src/apps/bin/coreutils/lib/atexit.c
diff --git a/src/apps/bin/coreutils-5.0/lib/backupfile.c b/src/apps/bin/coreutils/lib/backupfile.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/backupfile.c
rename to src/apps/bin/coreutils/lib/backupfile.c
diff --git a/src/apps/bin/coreutils-5.0/lib/backupfile.h b/src/apps/bin/coreutils/lib/backupfile.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/backupfile.h
rename to src/apps/bin/coreutils/lib/backupfile.h
diff --git a/src/apps/bin/coreutils-5.0/lib/basename.c b/src/apps/bin/coreutils/lib/basename.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/basename.c
rename to src/apps/bin/coreutils/lib/basename.c
diff --git a/src/apps/bin/coreutils-5.0/lib/bumpalloc.h b/src/apps/bin/coreutils/lib/bumpalloc.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/bumpalloc.h
rename to src/apps/bin/coreutils/lib/bumpalloc.h
diff --git a/src/apps/bin/coreutils-5.0/lib/canon-host.c b/src/apps/bin/coreutils/lib/canon-host.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/canon-host.c
rename to src/apps/bin/coreutils/lib/canon-host.c
diff --git a/src/apps/bin/coreutils-5.0/lib/canonicalize.c b/src/apps/bin/coreutils/lib/canonicalize.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/canonicalize.c
rename to src/apps/bin/coreutils/lib/canonicalize.c
diff --git a/src/apps/bin/coreutils-5.0/lib/canonicalize.h b/src/apps/bin/coreutils/lib/canonicalize.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/canonicalize.h
rename to src/apps/bin/coreutils/lib/canonicalize.h
diff --git a/src/apps/bin/coreutils-5.0/lib/charset.alias b/src/apps/bin/coreutils/lib/charset.alias
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/charset.alias
rename to src/apps/bin/coreutils/lib/charset.alias
diff --git a/src/apps/bin/coreutils-5.0/lib/chown.c b/src/apps/bin/coreutils/lib/chown.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/chown.c
rename to src/apps/bin/coreutils/lib/chown.c
diff --git a/src/apps/bin/coreutils-5.0/lib/closeout.c b/src/apps/bin/coreutils/lib/closeout.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/closeout.c
rename to src/apps/bin/coreutils/lib/closeout.c
diff --git a/src/apps/bin/coreutils-5.0/lib/closeout.h b/src/apps/bin/coreutils/lib/closeout.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/closeout.h
rename to src/apps/bin/coreutils/lib/closeout.h
diff --git a/src/apps/bin/coreutils-5.0/lib/config.charset b/src/apps/bin/coreutils/lib/config.charset
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/config.charset
rename to src/apps/bin/coreutils/lib/config.charset
diff --git a/src/apps/bin/coreutils-5.0/lib/cycle-check.c b/src/apps/bin/coreutils/lib/cycle-check.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/cycle-check.c
rename to src/apps/bin/coreutils/lib/cycle-check.c
diff --git a/src/apps/bin/coreutils-5.0/lib/cycle-check.h b/src/apps/bin/coreutils/lib/cycle-check.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/cycle-check.h
rename to src/apps/bin/coreutils/lib/cycle-check.h
diff --git a/src/apps/bin/coreutils-5.0/lib/dev-ino.h b/src/apps/bin/coreutils/lib/dev-ino.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/dev-ino.h
rename to src/apps/bin/coreutils/lib/dev-ino.h
diff --git a/src/apps/bin/coreutils-5.0/lib/diacrit.c b/src/apps/bin/coreutils/lib/diacrit.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/diacrit.c
rename to src/apps/bin/coreutils/lib/diacrit.c
diff --git a/src/apps/bin/coreutils-5.0/lib/diacrit.h b/src/apps/bin/coreutils/lib/diacrit.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/diacrit.h
rename to src/apps/bin/coreutils/lib/diacrit.h
diff --git a/src/apps/bin/coreutils-5.0/lib/dirfd.c b/src/apps/bin/coreutils/lib/dirfd.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/dirfd.c
rename to src/apps/bin/coreutils/lib/dirfd.c
diff --git a/src/apps/bin/coreutils-5.0/lib/dirfd.h b/src/apps/bin/coreutils/lib/dirfd.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/dirfd.h
rename to src/apps/bin/coreutils/lib/dirfd.h
diff --git a/src/apps/bin/coreutils-5.0/lib/dirname.c b/src/apps/bin/coreutils/lib/dirname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/dirname.c
rename to src/apps/bin/coreutils/lib/dirname.c
diff --git a/src/apps/bin/coreutils-5.0/lib/dirname.h b/src/apps/bin/coreutils/lib/dirname.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/dirname.h
rename to src/apps/bin/coreutils/lib/dirname.h
diff --git a/src/apps/bin/coreutils-5.0/lib/dup-safer.c b/src/apps/bin/coreutils/lib/dup-safer.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/dup-safer.c
rename to src/apps/bin/coreutils/lib/dup-safer.c
diff --git a/src/apps/bin/coreutils-5.0/lib/dup2.c b/src/apps/bin/coreutils/lib/dup2.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/dup2.c
rename to src/apps/bin/coreutils/lib/dup2.c
diff --git a/src/apps/bin/coreutils-5.0/lib/error.c b/src/apps/bin/coreutils/lib/error.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/error.c
rename to src/apps/bin/coreutils/lib/error.c
diff --git a/src/apps/bin/coreutils-5.0/lib/error.h b/src/apps/bin/coreutils/lib/error.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/error.h
rename to src/apps/bin/coreutils/lib/error.h
diff --git a/src/apps/bin/coreutils-5.0/lib/euidaccess.c b/src/apps/bin/coreutils/lib/euidaccess.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/euidaccess.c
rename to src/apps/bin/coreutils/lib/euidaccess.c
diff --git a/src/apps/bin/coreutils-5.0/lib/euidaccess.h b/src/apps/bin/coreutils/lib/euidaccess.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/euidaccess.h
rename to src/apps/bin/coreutils/lib/euidaccess.h
diff --git a/src/apps/bin/coreutils-5.0/lib/exclude.c b/src/apps/bin/coreutils/lib/exclude.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/exclude.c
rename to src/apps/bin/coreutils/lib/exclude.c
diff --git a/src/apps/bin/coreutils-5.0/lib/exclude.h b/src/apps/bin/coreutils/lib/exclude.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/exclude.h
rename to src/apps/bin/coreutils/lib/exclude.h
diff --git a/src/apps/bin/coreutils-5.0/lib/exitfail.c b/src/apps/bin/coreutils/lib/exitfail.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/exitfail.c
rename to src/apps/bin/coreutils/lib/exitfail.c
diff --git a/src/apps/bin/coreutils-5.0/lib/exitfail.h b/src/apps/bin/coreutils/lib/exitfail.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/exitfail.h
rename to src/apps/bin/coreutils/lib/exitfail.h
diff --git a/src/apps/bin/coreutils-5.0/lib/fchdir-stub.c b/src/apps/bin/coreutils/lib/fchdir-stub.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fchdir-stub.c
rename to src/apps/bin/coreutils/lib/fchdir-stub.c
diff --git a/src/apps/bin/coreutils-5.0/lib/fchown-stub.c b/src/apps/bin/coreutils/lib/fchown-stub.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fchown-stub.c
rename to src/apps/bin/coreutils/lib/fchown-stub.c
diff --git a/src/apps/bin/coreutils-5.0/lib/file-type.c b/src/apps/bin/coreutils/lib/file-type.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/file-type.c
rename to src/apps/bin/coreutils/lib/file-type.c
diff --git a/src/apps/bin/coreutils-5.0/lib/file-type.h b/src/apps/bin/coreutils/lib/file-type.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/file-type.h
rename to src/apps/bin/coreutils/lib/file-type.h
diff --git a/src/apps/bin/coreutils-5.0/lib/fileblocks.c b/src/apps/bin/coreutils/lib/fileblocks.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fileblocks.c
rename to src/apps/bin/coreutils/lib/fileblocks.c
diff --git a/src/apps/bin/coreutils-5.0/lib/filemode.c b/src/apps/bin/coreutils/lib/filemode.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/filemode.c
rename to src/apps/bin/coreutils/lib/filemode.c
diff --git a/src/apps/bin/coreutils-5.0/lib/filemode.h b/src/apps/bin/coreutils/lib/filemode.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/filemode.h
rename to src/apps/bin/coreutils/lib/filemode.h
diff --git a/src/apps/bin/coreutils-5.0/lib/fnmatch.c b/src/apps/bin/coreutils/lib/fnmatch.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fnmatch.c
rename to src/apps/bin/coreutils/lib/fnmatch.c
diff --git a/src/apps/bin/coreutils-5.0/lib/fnmatch.h b/src/apps/bin/coreutils/lib/fnmatch.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fnmatch.h
rename to src/apps/bin/coreutils/lib/fnmatch.h
diff --git a/src/apps/bin/coreutils-5.0/lib/fnmatch_.h b/src/apps/bin/coreutils/lib/fnmatch_.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fnmatch_.h
rename to src/apps/bin/coreutils/lib/fnmatch_.h
diff --git a/src/apps/bin/coreutils-5.0/lib/fnmatch_loop.c b/src/apps/bin/coreutils/lib/fnmatch_loop.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fnmatch_loop.c
rename to src/apps/bin/coreutils/lib/fnmatch_loop.c
diff --git a/src/apps/bin/coreutils-5.0/lib/fopen-safer.c b/src/apps/bin/coreutils/lib/fopen-safer.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fopen-safer.c
rename to src/apps/bin/coreutils/lib/fopen-safer.c
diff --git a/src/apps/bin/coreutils-5.0/lib/fsusage.c b/src/apps/bin/coreutils/lib/fsusage.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fsusage.c
rename to src/apps/bin/coreutils/lib/fsusage.c
diff --git a/src/apps/bin/coreutils-5.0/lib/fsusage.h b/src/apps/bin/coreutils/lib/fsusage.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/fsusage.h
rename to src/apps/bin/coreutils/lib/fsusage.h
diff --git a/src/apps/bin/coreutils-5.0/lib/ftruncate.c b/src/apps/bin/coreutils/lib/ftruncate.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ftruncate.c
rename to src/apps/bin/coreutils/lib/ftruncate.c
diff --git a/src/apps/bin/coreutils-5.0/lib/ftw.c b/src/apps/bin/coreutils/lib/ftw.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ftw.c
rename to src/apps/bin/coreutils/lib/ftw.c
diff --git a/src/apps/bin/coreutils-5.0/lib/ftw.h b/src/apps/bin/coreutils/lib/ftw.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ftw.h
rename to src/apps/bin/coreutils/lib/ftw.h
diff --git a/src/apps/bin/coreutils-5.0/lib/ftw_.h b/src/apps/bin/coreutils/lib/ftw_.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ftw_.h
rename to src/apps/bin/coreutils/lib/ftw_.h
diff --git a/src/apps/bin/coreutils-5.0/lib/full-read.c b/src/apps/bin/coreutils/lib/full-read.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/full-read.c
rename to src/apps/bin/coreutils/lib/full-read.c
diff --git a/src/apps/bin/coreutils-5.0/lib/full-read.h b/src/apps/bin/coreutils/lib/full-read.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/full-read.h
rename to src/apps/bin/coreutils/lib/full-read.h
diff --git a/src/apps/bin/coreutils-5.0/lib/full-write.c b/src/apps/bin/coreutils/lib/full-write.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/full-write.c
rename to src/apps/bin/coreutils/lib/full-write.c
diff --git a/src/apps/bin/coreutils-5.0/lib/full-write.h b/src/apps/bin/coreutils/lib/full-write.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/full-write.h
rename to src/apps/bin/coreutils/lib/full-write.h
diff --git a/src/apps/bin/coreutils-5.0/lib/getcwd.c b/src/apps/bin/coreutils/lib/getcwd.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getcwd.c
rename to src/apps/bin/coreutils/lib/getcwd.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getdate.c b/src/apps/bin/coreutils/lib/getdate.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getdate.c
rename to src/apps/bin/coreutils/lib/getdate.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getdate.h b/src/apps/bin/coreutils/lib/getdate.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getdate.h
rename to src/apps/bin/coreutils/lib/getdate.h
diff --git a/src/apps/bin/coreutils-5.0/lib/getdate.y b/src/apps/bin/coreutils/lib/getdate.y
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getdate.y
rename to src/apps/bin/coreutils/lib/getdate.y
diff --git a/src/apps/bin/coreutils-5.0/lib/getgroups.c b/src/apps/bin/coreutils/lib/getgroups.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getgroups.c
rename to src/apps/bin/coreutils/lib/getgroups.c
diff --git a/src/apps/bin/coreutils-5.0/lib/gethostname.c b/src/apps/bin/coreutils/lib/gethostname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/gethostname.c
rename to src/apps/bin/coreutils/lib/gethostname.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getline.c b/src/apps/bin/coreutils/lib/getline.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getline.c
rename to src/apps/bin/coreutils/lib/getline.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getline.h b/src/apps/bin/coreutils/lib/getline.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getline.h
rename to src/apps/bin/coreutils/lib/getline.h
diff --git a/src/apps/bin/coreutils-5.0/lib/getloadavg.c b/src/apps/bin/coreutils/lib/getloadavg.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getloadavg.c
rename to src/apps/bin/coreutils/lib/getloadavg.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getopt.c b/src/apps/bin/coreutils/lib/getopt.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getopt.c
rename to src/apps/bin/coreutils/lib/getopt.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getopt.h b/src/apps/bin/coreutils/lib/getopt.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getopt.h
rename to src/apps/bin/coreutils/lib/getopt.h
diff --git a/src/apps/bin/coreutils-5.0/lib/getopt1.c b/src/apps/bin/coreutils/lib/getopt1.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getopt1.c
rename to src/apps/bin/coreutils/lib/getopt1.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getpagesize.h b/src/apps/bin/coreutils/lib/getpagesize.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getpagesize.h
rename to src/apps/bin/coreutils/lib/getpagesize.h
diff --git a/src/apps/bin/coreutils-5.0/lib/getpass.c b/src/apps/bin/coreutils/lib/getpass.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getpass.c
rename to src/apps/bin/coreutils/lib/getpass.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getstr.c b/src/apps/bin/coreutils/lib/getstr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getstr.c
rename to src/apps/bin/coreutils/lib/getstr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getstr.h b/src/apps/bin/coreutils/lib/getstr.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getstr.h
rename to src/apps/bin/coreutils/lib/getstr.h
diff --git a/src/apps/bin/coreutils-5.0/lib/gettext.h b/src/apps/bin/coreutils/lib/gettext.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/gettext.h
rename to src/apps/bin/coreutils/lib/gettext.h
diff --git a/src/apps/bin/coreutils-5.0/lib/gettime.c b/src/apps/bin/coreutils/lib/gettime.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/gettime.c
rename to src/apps/bin/coreutils/lib/gettime.c
diff --git a/src/apps/bin/coreutils-5.0/lib/gettimeofday.c b/src/apps/bin/coreutils/lib/gettimeofday.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/gettimeofday.c
rename to src/apps/bin/coreutils/lib/gettimeofday.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getugroups.c b/src/apps/bin/coreutils/lib/getugroups.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getugroups.c
rename to src/apps/bin/coreutils/lib/getugroups.c
diff --git a/src/apps/bin/coreutils-5.0/lib/getusershell.c b/src/apps/bin/coreutils/lib/getusershell.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/getusershell.c
rename to src/apps/bin/coreutils/lib/getusershell.c
diff --git a/src/apps/bin/coreutils-5.0/lib/group-member.c b/src/apps/bin/coreutils/lib/group-member.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/group-member.c
rename to src/apps/bin/coreutils/lib/group-member.c
diff --git a/src/apps/bin/coreutils-5.0/lib/group-member.h b/src/apps/bin/coreutils/lib/group-member.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/group-member.h
rename to src/apps/bin/coreutils/lib/group-member.h
diff --git a/src/apps/bin/coreutils-5.0/lib/hard-locale.c b/src/apps/bin/coreutils/lib/hard-locale.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/hard-locale.c
rename to src/apps/bin/coreutils/lib/hard-locale.c
diff --git a/src/apps/bin/coreutils-5.0/lib/hard-locale.h b/src/apps/bin/coreutils/lib/hard-locale.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/hard-locale.h
rename to src/apps/bin/coreutils/lib/hard-locale.h
diff --git a/src/apps/bin/coreutils-5.0/lib/hash-pjw.c b/src/apps/bin/coreutils/lib/hash-pjw.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/hash-pjw.c
rename to src/apps/bin/coreutils/lib/hash-pjw.c
diff --git a/src/apps/bin/coreutils-5.0/lib/hash-pjw.h b/src/apps/bin/coreutils/lib/hash-pjw.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/hash-pjw.h
rename to src/apps/bin/coreutils/lib/hash-pjw.h
diff --git a/src/apps/bin/coreutils-5.0/lib/hash.c b/src/apps/bin/coreutils/lib/hash.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/hash.c
rename to src/apps/bin/coreutils/lib/hash.c
diff --git a/src/apps/bin/coreutils-5.0/lib/hash.h b/src/apps/bin/coreutils/lib/hash.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/hash.h
rename to src/apps/bin/coreutils/lib/hash.h
diff --git a/src/apps/bin/coreutils-5.0/lib/human.c b/src/apps/bin/coreutils/lib/human.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/human.c
rename to src/apps/bin/coreutils/lib/human.c
diff --git a/src/apps/bin/coreutils-5.0/lib/human.h b/src/apps/bin/coreutils/lib/human.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/human.h
rename to src/apps/bin/coreutils/lib/human.h
diff --git a/src/apps/bin/coreutils-5.0/lib/idcache.c b/src/apps/bin/coreutils/lib/idcache.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/idcache.c
rename to src/apps/bin/coreutils/lib/idcache.c
diff --git a/src/apps/bin/coreutils-5.0/lib/imaxtostr.c b/src/apps/bin/coreutils/lib/imaxtostr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/imaxtostr.c
rename to src/apps/bin/coreutils/lib/imaxtostr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/inttostr.c b/src/apps/bin/coreutils/lib/inttostr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/inttostr.c
rename to src/apps/bin/coreutils/lib/inttostr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/inttostr.h b/src/apps/bin/coreutils/lib/inttostr.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/inttostr.h
rename to src/apps/bin/coreutils/lib/inttostr.h
diff --git a/src/apps/bin/coreutils-5.0/lib/isdir.c b/src/apps/bin/coreutils/lib/isdir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/isdir.c
rename to src/apps/bin/coreutils/lib/isdir.c
diff --git a/src/apps/bin/coreutils-5.0/lib/lchown.c b/src/apps/bin/coreutils/lib/lchown.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/lchown.c
rename to src/apps/bin/coreutils/lib/lchown.c
diff --git a/src/apps/bin/coreutils-5.0/lib/lchown.h b/src/apps/bin/coreutils/lib/lchown.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/lchown.h
rename to src/apps/bin/coreutils/lib/lchown.h
diff --git a/src/apps/bin/coreutils-5.0/lib/linebuffer.c b/src/apps/bin/coreutils/lib/linebuffer.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/linebuffer.c
rename to src/apps/bin/coreutils/lib/linebuffer.c
diff --git a/src/apps/bin/coreutils-5.0/lib/linebuffer.h b/src/apps/bin/coreutils/lib/linebuffer.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/linebuffer.h
rename to src/apps/bin/coreutils/lib/linebuffer.h
diff --git a/src/apps/bin/coreutils-5.0/lib/localcharset.c b/src/apps/bin/coreutils/lib/localcharset.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/localcharset.c
rename to src/apps/bin/coreutils/lib/localcharset.c
diff --git a/src/apps/bin/coreutils-5.0/lib/long-options.c b/src/apps/bin/coreutils/lib/long-options.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/long-options.c
rename to src/apps/bin/coreutils/lib/long-options.c
diff --git a/src/apps/bin/coreutils-5.0/lib/long-options.h b/src/apps/bin/coreutils/lib/long-options.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/long-options.h
rename to src/apps/bin/coreutils/lib/long-options.h
diff --git a/src/apps/bin/coreutils-5.0/lib/lstat-stub.c b/src/apps/bin/coreutils/lib/lstat-stub.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/lstat-stub.c
rename to src/apps/bin/coreutils/lib/lstat-stub.c
diff --git a/src/apps/bin/coreutils-5.0/lib/lstat.c b/src/apps/bin/coreutils/lib/lstat.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/lstat.c
rename to src/apps/bin/coreutils/lib/lstat.c
diff --git a/src/apps/bin/coreutils-5.0/lib/makepath.c b/src/apps/bin/coreutils/lib/makepath.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/makepath.c
rename to src/apps/bin/coreutils/lib/makepath.c
diff --git a/src/apps/bin/coreutils-5.0/lib/makepath.h b/src/apps/bin/coreutils/lib/makepath.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/makepath.h
rename to src/apps/bin/coreutils/lib/makepath.h
diff --git a/src/apps/bin/coreutils-5.0/lib/malloc.c b/src/apps/bin/coreutils/lib/malloc.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/malloc.c
rename to src/apps/bin/coreutils/lib/malloc.c
diff --git a/src/apps/bin/coreutils-5.0/lib/mbswidth.c b/src/apps/bin/coreutils/lib/mbswidth.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/mbswidth.c
rename to src/apps/bin/coreutils/lib/mbswidth.c
diff --git a/src/apps/bin/coreutils-5.0/lib/mbswidth.h b/src/apps/bin/coreutils/lib/mbswidth.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/mbswidth.h
rename to src/apps/bin/coreutils/lib/mbswidth.h
diff --git a/src/apps/bin/coreutils-5.0/lib/md5.c b/src/apps/bin/coreutils/lib/md5.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/md5.c
rename to src/apps/bin/coreutils/lib/md5.c
diff --git a/src/apps/bin/coreutils-5.0/lib/md5.h b/src/apps/bin/coreutils/lib/md5.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/md5.h
rename to src/apps/bin/coreutils/lib/md5.h
diff --git a/src/apps/bin/coreutils-5.0/lib/memcasecmp.c b/src/apps/bin/coreutils/lib/memcasecmp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memcasecmp.c
rename to src/apps/bin/coreutils/lib/memcasecmp.c
diff --git a/src/apps/bin/coreutils-5.0/lib/memcasecmp.h b/src/apps/bin/coreutils/lib/memcasecmp.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memcasecmp.h
rename to src/apps/bin/coreutils/lib/memcasecmp.h
diff --git a/src/apps/bin/coreutils-5.0/lib/memchr.c b/src/apps/bin/coreutils/lib/memchr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memchr.c
rename to src/apps/bin/coreutils/lib/memchr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/memcmp.c b/src/apps/bin/coreutils/lib/memcmp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memcmp.c
rename to src/apps/bin/coreutils/lib/memcmp.c
diff --git a/src/apps/bin/coreutils-5.0/lib/memcoll.c b/src/apps/bin/coreutils/lib/memcoll.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memcoll.c
rename to src/apps/bin/coreutils/lib/memcoll.c
diff --git a/src/apps/bin/coreutils-5.0/lib/memcoll.h b/src/apps/bin/coreutils/lib/memcoll.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memcoll.h
rename to src/apps/bin/coreutils/lib/memcoll.h
diff --git a/src/apps/bin/coreutils-5.0/lib/memcpy.c b/src/apps/bin/coreutils/lib/memcpy.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memcpy.c
rename to src/apps/bin/coreutils/lib/memcpy.c
diff --git a/src/apps/bin/coreutils-5.0/lib/memmove.c b/src/apps/bin/coreutils/lib/memmove.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memmove.c
rename to src/apps/bin/coreutils/lib/memmove.c
diff --git a/src/apps/bin/coreutils-5.0/lib/memrchr.c b/src/apps/bin/coreutils/lib/memrchr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memrchr.c
rename to src/apps/bin/coreutils/lib/memrchr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/memset.c b/src/apps/bin/coreutils/lib/memset.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/memset.c
rename to src/apps/bin/coreutils/lib/memset.c
diff --git a/src/apps/bin/coreutils-5.0/lib/mkdir.c b/src/apps/bin/coreutils/lib/mkdir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/mkdir.c
rename to src/apps/bin/coreutils/lib/mkdir.c
diff --git a/src/apps/bin/coreutils-5.0/lib/mkstemp.c b/src/apps/bin/coreutils/lib/mkstemp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/mkstemp.c
rename to src/apps/bin/coreutils/lib/mkstemp.c
diff --git a/src/apps/bin/coreutils-5.0/lib/mktime.c b/src/apps/bin/coreutils/lib/mktime.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/mktime.c
rename to src/apps/bin/coreutils/lib/mktime.c
diff --git a/src/apps/bin/coreutils-5.0/lib/modechange.c b/src/apps/bin/coreutils/lib/modechange.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/modechange.c
rename to src/apps/bin/coreutils/lib/modechange.c
diff --git a/src/apps/bin/coreutils-5.0/lib/modechange.h b/src/apps/bin/coreutils/lib/modechange.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/modechange.h
rename to src/apps/bin/coreutils/lib/modechange.h
diff --git a/src/apps/bin/coreutils-5.0/lib/mountlist.c b/src/apps/bin/coreutils/lib/mountlist.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/mountlist.c
rename to src/apps/bin/coreutils/lib/mountlist.c
diff --git a/src/apps/bin/coreutils-5.0/lib/mountlist.h b/src/apps/bin/coreutils/lib/mountlist.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/mountlist.h
rename to src/apps/bin/coreutils/lib/mountlist.h
diff --git a/src/apps/bin/coreutils-5.0/lib/nanosleep.c b/src/apps/bin/coreutils/lib/nanosleep.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/nanosleep.c
rename to src/apps/bin/coreutils/lib/nanosleep.c
diff --git a/src/apps/bin/coreutils-5.0/lib/obstack.c b/src/apps/bin/coreutils/lib/obstack.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/obstack.c
rename to src/apps/bin/coreutils/lib/obstack.c
diff --git a/src/apps/bin/coreutils-5.0/lib/obstack.h b/src/apps/bin/coreutils/lib/obstack.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/obstack.h
rename to src/apps/bin/coreutils/lib/obstack.h
diff --git a/src/apps/bin/coreutils-5.0/lib/offtostr.c b/src/apps/bin/coreutils/lib/offtostr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/offtostr.c
rename to src/apps/bin/coreutils/lib/offtostr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/path-concat.c b/src/apps/bin/coreutils/lib/path-concat.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/path-concat.c
rename to src/apps/bin/coreutils/lib/path-concat.c
diff --git a/src/apps/bin/coreutils-5.0/lib/path-concat.h b/src/apps/bin/coreutils/lib/path-concat.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/path-concat.h
rename to src/apps/bin/coreutils/lib/path-concat.h
diff --git a/src/apps/bin/coreutils-5.0/lib/pathmax.h b/src/apps/bin/coreutils/lib/pathmax.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/pathmax.h
rename to src/apps/bin/coreutils/lib/pathmax.h
diff --git a/src/apps/bin/coreutils-5.0/lib/physmem.c b/src/apps/bin/coreutils/lib/physmem.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/physmem.c
rename to src/apps/bin/coreutils/lib/physmem.c
diff --git a/src/apps/bin/coreutils-5.0/lib/physmem.h b/src/apps/bin/coreutils/lib/physmem.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/physmem.h
rename to src/apps/bin/coreutils/lib/physmem.h
diff --git a/src/apps/bin/coreutils-5.0/lib/posixtm.c b/src/apps/bin/coreutils/lib/posixtm.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/posixtm.c
rename to src/apps/bin/coreutils/lib/posixtm.c
diff --git a/src/apps/bin/coreutils-5.0/lib/posixtm.h b/src/apps/bin/coreutils/lib/posixtm.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/posixtm.h
rename to src/apps/bin/coreutils/lib/posixtm.h
diff --git a/src/apps/bin/coreutils-5.0/lib/posixver.c b/src/apps/bin/coreutils/lib/posixver.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/posixver.c
rename to src/apps/bin/coreutils/lib/posixver.c
diff --git a/src/apps/bin/coreutils-5.0/lib/posixver.h b/src/apps/bin/coreutils/lib/posixver.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/posixver.h
rename to src/apps/bin/coreutils/lib/posixver.h
diff --git a/src/apps/bin/coreutils-5.0/lib/putenv.c b/src/apps/bin/coreutils/lib/putenv.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/putenv.c
rename to src/apps/bin/coreutils/lib/putenv.c
diff --git a/src/apps/bin/coreutils-5.0/lib/quote.c b/src/apps/bin/coreutils/lib/quote.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/quote.c
rename to src/apps/bin/coreutils/lib/quote.c
diff --git a/src/apps/bin/coreutils-5.0/lib/quote.h b/src/apps/bin/coreutils/lib/quote.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/quote.h
rename to src/apps/bin/coreutils/lib/quote.h
diff --git a/src/apps/bin/coreutils-5.0/lib/quotearg.c b/src/apps/bin/coreutils/lib/quotearg.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/quotearg.c
rename to src/apps/bin/coreutils/lib/quotearg.c
diff --git a/src/apps/bin/coreutils-5.0/lib/quotearg.h b/src/apps/bin/coreutils/lib/quotearg.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/quotearg.h
rename to src/apps/bin/coreutils/lib/quotearg.h
diff --git a/src/apps/bin/coreutils-5.0/lib/raise.c b/src/apps/bin/coreutils/lib/raise.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/raise.c
rename to src/apps/bin/coreutils/lib/raise.c
diff --git a/src/apps/bin/coreutils-5.0/lib/readlink-stub.c b/src/apps/bin/coreutils/lib/readlink-stub.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/readlink-stub.c
rename to src/apps/bin/coreutils/lib/readlink-stub.c
diff --git a/src/apps/bin/coreutils-5.0/lib/readtokens.c b/src/apps/bin/coreutils/lib/readtokens.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/readtokens.c
rename to src/apps/bin/coreutils/lib/readtokens.c
diff --git a/src/apps/bin/coreutils-5.0/lib/readtokens.h b/src/apps/bin/coreutils/lib/readtokens.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/readtokens.h
rename to src/apps/bin/coreutils/lib/readtokens.h
diff --git a/src/apps/bin/coreutils-5.0/lib/readutmp.c b/src/apps/bin/coreutils/lib/readutmp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/readutmp.c
rename to src/apps/bin/coreutils/lib/readutmp.c
diff --git a/src/apps/bin/coreutils-5.0/lib/readutmp.h b/src/apps/bin/coreutils/lib/readutmp.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/readutmp.h
rename to src/apps/bin/coreutils/lib/readutmp.h
diff --git a/src/apps/bin/coreutils-5.0/lib/realloc.c b/src/apps/bin/coreutils/lib/realloc.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/realloc.c
rename to src/apps/bin/coreutils/lib/realloc.c
diff --git a/src/apps/bin/coreutils-5.0/lib/ref-add.sed b/src/apps/bin/coreutils/lib/ref-add.sed
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ref-add.sed
rename to src/apps/bin/coreutils/lib/ref-add.sed
diff --git a/src/apps/bin/coreutils-5.0/lib/ref-add.sin b/src/apps/bin/coreutils/lib/ref-add.sin
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ref-add.sin
rename to src/apps/bin/coreutils/lib/ref-add.sin
diff --git a/src/apps/bin/coreutils-5.0/lib/ref-del.sed b/src/apps/bin/coreutils/lib/ref-del.sed
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ref-del.sed
rename to src/apps/bin/coreutils/lib/ref-del.sed
diff --git a/src/apps/bin/coreutils-5.0/lib/ref-del.sin b/src/apps/bin/coreutils/lib/ref-del.sin
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/ref-del.sin
rename to src/apps/bin/coreutils/lib/ref-del.sin
diff --git a/src/apps/bin/coreutils-5.0/lib/regex.c b/src/apps/bin/coreutils/lib/regex.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/regex.c
rename to src/apps/bin/coreutils/lib/regex.c
diff --git a/src/apps/bin/coreutils-5.0/lib/regex.h b/src/apps/bin/coreutils/lib/regex.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/regex.h
rename to src/apps/bin/coreutils/lib/regex.h
diff --git a/src/apps/bin/coreutils-5.0/lib/rename.c b/src/apps/bin/coreutils/lib/rename.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/rename.c
rename to src/apps/bin/coreutils/lib/rename.c
diff --git a/src/apps/bin/coreutils-5.0/lib/rmdir.c b/src/apps/bin/coreutils/lib/rmdir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/rmdir.c
rename to src/apps/bin/coreutils/lib/rmdir.c
diff --git a/src/apps/bin/coreutils-5.0/lib/rpmatch.c b/src/apps/bin/coreutils/lib/rpmatch.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/rpmatch.c
rename to src/apps/bin/coreutils/lib/rpmatch.c
diff --git a/src/apps/bin/coreutils-5.0/lib/safe-read.c b/src/apps/bin/coreutils/lib/safe-read.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/safe-read.c
rename to src/apps/bin/coreutils/lib/safe-read.c
diff --git a/src/apps/bin/coreutils-5.0/lib/safe-read.h b/src/apps/bin/coreutils/lib/safe-read.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/safe-read.h
rename to src/apps/bin/coreutils/lib/safe-read.h
diff --git a/src/apps/bin/coreutils-5.0/lib/safe-write.c b/src/apps/bin/coreutils/lib/safe-write.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/safe-write.c
rename to src/apps/bin/coreutils/lib/safe-write.c
diff --git a/src/apps/bin/coreutils-5.0/lib/safe-write.h b/src/apps/bin/coreutils/lib/safe-write.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/safe-write.h
rename to src/apps/bin/coreutils/lib/safe-write.h
diff --git a/src/apps/bin/coreutils-5.0/lib/same.c b/src/apps/bin/coreutils/lib/same.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/same.c
rename to src/apps/bin/coreutils/lib/same.c
diff --git a/src/apps/bin/coreutils-5.0/lib/same.h b/src/apps/bin/coreutils/lib/same.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/same.h
rename to src/apps/bin/coreutils/lib/same.h
diff --git a/src/apps/bin/coreutils-5.0/lib/save-cwd.c b/src/apps/bin/coreutils/lib/save-cwd.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/save-cwd.c
rename to src/apps/bin/coreutils/lib/save-cwd.c
diff --git a/src/apps/bin/coreutils-5.0/lib/save-cwd.h b/src/apps/bin/coreutils/lib/save-cwd.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/save-cwd.h
rename to src/apps/bin/coreutils/lib/save-cwd.h
diff --git a/src/apps/bin/coreutils-5.0/lib/savedir.c b/src/apps/bin/coreutils/lib/savedir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/savedir.c
rename to src/apps/bin/coreutils/lib/savedir.c
diff --git a/src/apps/bin/coreutils-5.0/lib/savedir.h b/src/apps/bin/coreutils/lib/savedir.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/savedir.h
rename to src/apps/bin/coreutils/lib/savedir.h
diff --git a/src/apps/bin/coreutils-5.0/lib/search.h b/src/apps/bin/coreutils/lib/search.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/search.h
rename to src/apps/bin/coreutils/lib/search.h
diff --git a/src/apps/bin/coreutils-5.0/lib/search_.h b/src/apps/bin/coreutils/lib/search_.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/search_.h
rename to src/apps/bin/coreutils/lib/search_.h
diff --git a/src/apps/bin/coreutils-5.0/lib/settime.c b/src/apps/bin/coreutils/lib/settime.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/settime.c
rename to src/apps/bin/coreutils/lib/settime.c
diff --git a/src/apps/bin/coreutils-5.0/lib/sha.c b/src/apps/bin/coreutils/lib/sha.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/sha.c
rename to src/apps/bin/coreutils/lib/sha.c
diff --git a/src/apps/bin/coreutils-5.0/lib/sha.h b/src/apps/bin/coreutils/lib/sha.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/sha.h
rename to src/apps/bin/coreutils/lib/sha.h
diff --git a/src/apps/bin/coreutils-5.0/lib/sig2str.c b/src/apps/bin/coreutils/lib/sig2str.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/sig2str.c
rename to src/apps/bin/coreutils/lib/sig2str.c
diff --git a/src/apps/bin/coreutils-5.0/lib/sig2str.h b/src/apps/bin/coreutils/lib/sig2str.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/sig2str.h
rename to src/apps/bin/coreutils/lib/sig2str.h
diff --git a/src/apps/bin/coreutils-5.0/lib/stat.c b/src/apps/bin/coreutils/lib/stat.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/stat.c
rename to src/apps/bin/coreutils/lib/stat.c
diff --git a/src/apps/bin/coreutils-5.0/lib/stdio-safer.h b/src/apps/bin/coreutils/lib/stdio-safer.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/stdio-safer.h
rename to src/apps/bin/coreutils/lib/stdio-safer.h
diff --git a/src/apps/bin/coreutils-5.0/lib/stpcpy.c b/src/apps/bin/coreutils/lib/stpcpy.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/stpcpy.c
rename to src/apps/bin/coreutils/lib/stpcpy.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strcasecmp.c b/src/apps/bin/coreutils/lib/strcasecmp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strcasecmp.c
rename to src/apps/bin/coreutils/lib/strcasecmp.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strcspn.c b/src/apps/bin/coreutils/lib/strcspn.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strcspn.c
rename to src/apps/bin/coreutils/lib/strcspn.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strdup.c b/src/apps/bin/coreutils/lib/strdup.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strdup.c
rename to src/apps/bin/coreutils/lib/strdup.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strftime.c b/src/apps/bin/coreutils/lib/strftime.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strftime.c
rename to src/apps/bin/coreutils/lib/strftime.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strftime.h b/src/apps/bin/coreutils/lib/strftime.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strftime.h
rename to src/apps/bin/coreutils/lib/strftime.h
diff --git a/src/apps/bin/coreutils-5.0/lib/stripslash.c b/src/apps/bin/coreutils/lib/stripslash.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/stripslash.c
rename to src/apps/bin/coreutils/lib/stripslash.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strncasecmp.c b/src/apps/bin/coreutils/lib/strncasecmp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strncasecmp.c
rename to src/apps/bin/coreutils/lib/strncasecmp.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strndup.c b/src/apps/bin/coreutils/lib/strndup.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strndup.c
rename to src/apps/bin/coreutils/lib/strndup.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strnlen.c b/src/apps/bin/coreutils/lib/strnlen.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strnlen.c
rename to src/apps/bin/coreutils/lib/strnlen.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strpbrk.c b/src/apps/bin/coreutils/lib/strpbrk.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strpbrk.c
rename to src/apps/bin/coreutils/lib/strpbrk.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strstr.c b/src/apps/bin/coreutils/lib/strstr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strstr.c
rename to src/apps/bin/coreutils/lib/strstr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strtod.c b/src/apps/bin/coreutils/lib/strtod.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strtod.c
rename to src/apps/bin/coreutils/lib/strtod.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strtoimax.c b/src/apps/bin/coreutils/lib/strtoimax.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strtoimax.c
rename to src/apps/bin/coreutils/lib/strtoimax.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strtol.c b/src/apps/bin/coreutils/lib/strtol.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strtol.c
rename to src/apps/bin/coreutils/lib/strtol.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strtoll.c b/src/apps/bin/coreutils/lib/strtoll.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strtoll.c
rename to src/apps/bin/coreutils/lib/strtoll.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strtoul.c b/src/apps/bin/coreutils/lib/strtoul.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strtoul.c
rename to src/apps/bin/coreutils/lib/strtoul.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strtoull.c b/src/apps/bin/coreutils/lib/strtoull.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strtoull.c
rename to src/apps/bin/coreutils/lib/strtoull.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strtoumax.c b/src/apps/bin/coreutils/lib/strtoumax.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strtoumax.c
rename to src/apps/bin/coreutils/lib/strtoumax.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strverscmp.c b/src/apps/bin/coreutils/lib/strverscmp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strverscmp.c
rename to src/apps/bin/coreutils/lib/strverscmp.c
diff --git a/src/apps/bin/coreutils-5.0/lib/strverscmp.h b/src/apps/bin/coreutils/lib/strverscmp.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/strverscmp.h
rename to src/apps/bin/coreutils/lib/strverscmp.h
diff --git a/src/apps/bin/coreutils-5.0/lib/tempname.c b/src/apps/bin/coreutils/lib/tempname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/tempname.c
rename to src/apps/bin/coreutils/lib/tempname.c
diff --git a/src/apps/bin/coreutils-5.0/lib/timespec.h b/src/apps/bin/coreutils/lib/timespec.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/timespec.h
rename to src/apps/bin/coreutils/lib/timespec.h
diff --git a/src/apps/bin/coreutils-5.0/lib/tsearch.c b/src/apps/bin/coreutils/lib/tsearch.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/tsearch.c
rename to src/apps/bin/coreutils/lib/tsearch.c
diff --git a/src/apps/bin/coreutils-5.0/lib/umaxtostr.c b/src/apps/bin/coreutils/lib/umaxtostr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/umaxtostr.c
rename to src/apps/bin/coreutils/lib/umaxtostr.c
diff --git a/src/apps/bin/coreutils-5.0/lib/unicodeio.c b/src/apps/bin/coreutils/lib/unicodeio.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/unicodeio.c
rename to src/apps/bin/coreutils/lib/unicodeio.c
diff --git a/src/apps/bin/coreutils-5.0/lib/unicodeio.h b/src/apps/bin/coreutils/lib/unicodeio.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/unicodeio.h
rename to src/apps/bin/coreutils/lib/unicodeio.h
diff --git a/src/apps/bin/coreutils-5.0/lib/unistd-safer.h b/src/apps/bin/coreutils/lib/unistd-safer.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/unistd-safer.h
rename to src/apps/bin/coreutils/lib/unistd-safer.h
diff --git a/src/apps/bin/coreutils-5.0/lib/unlocked-io.h b/src/apps/bin/coreutils/lib/unlocked-io.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/unlocked-io.h
rename to src/apps/bin/coreutils/lib/unlocked-io.h
diff --git a/src/apps/bin/coreutils-5.0/lib/userspec.c b/src/apps/bin/coreutils/lib/userspec.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/userspec.c
rename to src/apps/bin/coreutils/lib/userspec.c
diff --git a/src/apps/bin/coreutils-5.0/lib/utime.c b/src/apps/bin/coreutils/lib/utime.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/utime.c
rename to src/apps/bin/coreutils/lib/utime.c
diff --git a/src/apps/bin/coreutils-5.0/lib/version-etc.c b/src/apps/bin/coreutils/lib/version-etc.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/version-etc.c
rename to src/apps/bin/coreutils/lib/version-etc.c
diff --git a/src/apps/bin/coreutils-5.0/lib/version-etc.h b/src/apps/bin/coreutils/lib/version-etc.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/version-etc.h
rename to src/apps/bin/coreutils/lib/version-etc.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xalloc.h b/src/apps/bin/coreutils/lib/xalloc.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xalloc.h
rename to src/apps/bin/coreutils/lib/xalloc.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xgetcwd.c b/src/apps/bin/coreutils/lib/xgetcwd.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xgetcwd.c
rename to src/apps/bin/coreutils/lib/xgetcwd.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xgetcwd.h b/src/apps/bin/coreutils/lib/xgetcwd.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xgetcwd.h
rename to src/apps/bin/coreutils/lib/xgetcwd.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xgethostname.c b/src/apps/bin/coreutils/lib/xgethostname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xgethostname.c
rename to src/apps/bin/coreutils/lib/xgethostname.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xmalloc.c b/src/apps/bin/coreutils/lib/xmalloc.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xmalloc.c
rename to src/apps/bin/coreutils/lib/xmalloc.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xmemcoll.c b/src/apps/bin/coreutils/lib/xmemcoll.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xmemcoll.c
rename to src/apps/bin/coreutils/lib/xmemcoll.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xmemcoll.h b/src/apps/bin/coreutils/lib/xmemcoll.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xmemcoll.h
rename to src/apps/bin/coreutils/lib/xmemcoll.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xnanosleep.c b/src/apps/bin/coreutils/lib/xnanosleep.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xnanosleep.c
rename to src/apps/bin/coreutils/lib/xnanosleep.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xnanosleep.h b/src/apps/bin/coreutils/lib/xnanosleep.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xnanosleep.h
rename to src/apps/bin/coreutils/lib/xnanosleep.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xreadlink.c b/src/apps/bin/coreutils/lib/xreadlink.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xreadlink.c
rename to src/apps/bin/coreutils/lib/xreadlink.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xreadlink.h b/src/apps/bin/coreutils/lib/xreadlink.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xreadlink.h
rename to src/apps/bin/coreutils/lib/xreadlink.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrdup.c b/src/apps/bin/coreutils/lib/xstrdup.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrdup.c
rename to src/apps/bin/coreutils/lib/xstrdup.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrtod.c b/src/apps/bin/coreutils/lib/xstrtod.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrtod.c
rename to src/apps/bin/coreutils/lib/xstrtod.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrtod.h b/src/apps/bin/coreutils/lib/xstrtod.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrtod.h
rename to src/apps/bin/coreutils/lib/xstrtod.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrtoimax.c b/src/apps/bin/coreutils/lib/xstrtoimax.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrtoimax.c
rename to src/apps/bin/coreutils/lib/xstrtoimax.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrtol.c b/src/apps/bin/coreutils/lib/xstrtol.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrtol.c
rename to src/apps/bin/coreutils/lib/xstrtol.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrtol.h b/src/apps/bin/coreutils/lib/xstrtol.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrtol.h
rename to src/apps/bin/coreutils/lib/xstrtol.h
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrtoul.c b/src/apps/bin/coreutils/lib/xstrtoul.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrtoul.c
rename to src/apps/bin/coreutils/lib/xstrtoul.c
diff --git a/src/apps/bin/coreutils-5.0/lib/xstrtoumax.c b/src/apps/bin/coreutils/lib/xstrtoumax.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/xstrtoumax.c
rename to src/apps/bin/coreutils/lib/xstrtoumax.c
diff --git a/src/apps/bin/coreutils-5.0/lib/yesno.c b/src/apps/bin/coreutils/lib/yesno.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/lib/yesno.c
rename to src/apps/bin/coreutils/lib/yesno.c
diff --git a/src/apps/bin/coreutils-5.0/m4/ChangeLog b/src/apps/bin/coreutils/m4/ChangeLog
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/ChangeLog
rename to src/apps/bin/coreutils/m4/ChangeLog
diff --git a/src/apps/bin/coreutils-5.0/m4/Makefile b/src/apps/bin/coreutils/m4/Makefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/Makefile
rename to src/apps/bin/coreutils/m4/Makefile
diff --git a/src/apps/bin/coreutils-5.0/m4/Makefile.am b/src/apps/bin/coreutils/m4/Makefile.am
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/Makefile.am
rename to src/apps/bin/coreutils/m4/Makefile.am
diff --git a/src/apps/bin/coreutils-5.0/m4/Makefile.am.in b/src/apps/bin/coreutils/m4/Makefile.am.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/Makefile.am.in
rename to src/apps/bin/coreutils/m4/Makefile.am.in
diff --git a/src/apps/bin/coreutils-5.0/m4/Makefile.in b/src/apps/bin/coreutils/m4/Makefile.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/Makefile.in
rename to src/apps/bin/coreutils/m4/Makefile.in
diff --git a/src/apps/bin/coreutils-5.0/m4/README b/src/apps/bin/coreutils/m4/README
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/README
rename to src/apps/bin/coreutils/m4/README
diff --git a/src/apps/bin/coreutils-5.0/m4/acl.m4 b/src/apps/bin/coreutils/m4/acl.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/acl.m4
rename to src/apps/bin/coreutils/m4/acl.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/afs.m4 b/src/apps/bin/coreutils/m4/afs.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/afs.m4
rename to src/apps/bin/coreutils/m4/afs.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/assert.m4 b/src/apps/bin/coreutils/m4/assert.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/assert.m4
rename to src/apps/bin/coreutils/m4/assert.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/bison.m4 b/src/apps/bin/coreutils/m4/bison.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/bison.m4
rename to src/apps/bin/coreutils/m4/bison.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/boottime.m4 b/src/apps/bin/coreutils/m4/boottime.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/boottime.m4
rename to src/apps/bin/coreutils/m4/boottime.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/c-stack.m4 b/src/apps/bin/coreutils/m4/c-stack.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/c-stack.m4
rename to src/apps/bin/coreutils/m4/c-stack.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/canonicalize.m4 b/src/apps/bin/coreutils/m4/canonicalize.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/canonicalize.m4
rename to src/apps/bin/coreutils/m4/canonicalize.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/check-decl.m4 b/src/apps/bin/coreutils/m4/check-decl.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/check-decl.m4
rename to src/apps/bin/coreutils/m4/check-decl.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/chown.m4 b/src/apps/bin/coreutils/m4/chown.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/chown.m4
rename to src/apps/bin/coreutils/m4/chown.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/codeset.m4 b/src/apps/bin/coreutils/m4/codeset.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/codeset.m4
rename to src/apps/bin/coreutils/m4/codeset.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/d-ino.m4 b/src/apps/bin/coreutils/m4/d-ino.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/d-ino.m4
rename to src/apps/bin/coreutils/m4/d-ino.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/d-type.m4 b/src/apps/bin/coreutils/m4/d-type.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/d-type.m4
rename to src/apps/bin/coreutils/m4/d-type.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/dirfd.m4 b/src/apps/bin/coreutils/m4/dirfd.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/dirfd.m4
rename to src/apps/bin/coreutils/m4/dirfd.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/dos.m4 b/src/apps/bin/coreutils/m4/dos.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/dos.m4
rename to src/apps/bin/coreutils/m4/dos.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/error.m4 b/src/apps/bin/coreutils/m4/error.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/error.m4
rename to src/apps/bin/coreutils/m4/error.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/fpending.m4 b/src/apps/bin/coreutils/m4/fpending.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/fpending.m4
rename to src/apps/bin/coreutils/m4/fpending.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/fstypename.m4 b/src/apps/bin/coreutils/m4/fstypename.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/fstypename.m4
rename to src/apps/bin/coreutils/m4/fstypename.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/fsusage.m4 b/src/apps/bin/coreutils/m4/fsusage.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/fsusage.m4
rename to src/apps/bin/coreutils/m4/fsusage.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/ftruncate.m4 b/src/apps/bin/coreutils/m4/ftruncate.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/ftruncate.m4
rename to src/apps/bin/coreutils/m4/ftruncate.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/ftw.m4 b/src/apps/bin/coreutils/m4/ftw.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/ftw.m4
rename to src/apps/bin/coreutils/m4/ftw.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/getcwd-path-max.m4 b/src/apps/bin/coreutils/m4/getcwd-path-max.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/getcwd-path-max.m4
rename to src/apps/bin/coreutils/m4/getcwd-path-max.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/getcwd.m4 b/src/apps/bin/coreutils/m4/getcwd.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/getcwd.m4
rename to src/apps/bin/coreutils/m4/getcwd.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/getgroups.m4 b/src/apps/bin/coreutils/m4/getgroups.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/getgroups.m4
rename to src/apps/bin/coreutils/m4/getgroups.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/getline.m4 b/src/apps/bin/coreutils/m4/getline.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/getline.m4
rename to src/apps/bin/coreutils/m4/getline.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/gettext.m4 b/src/apps/bin/coreutils/m4/gettext.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/gettext.m4
rename to src/apps/bin/coreutils/m4/gettext.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/gettimeofday.m4 b/src/apps/bin/coreutils/m4/gettimeofday.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/gettimeofday.m4
rename to src/apps/bin/coreutils/m4/gettimeofday.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/glibc.m4 b/src/apps/bin/coreutils/m4/glibc.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/glibc.m4
rename to src/apps/bin/coreutils/m4/glibc.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/glibc21.m4 b/src/apps/bin/coreutils/m4/glibc21.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/glibc21.m4
rename to src/apps/bin/coreutils/m4/glibc21.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/group-member.m4 b/src/apps/bin/coreutils/m4/group-member.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/group-member.m4
rename to src/apps/bin/coreutils/m4/group-member.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/host-os.m4 b/src/apps/bin/coreutils/m4/host-os.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/host-os.m4
rename to src/apps/bin/coreutils/m4/host-os.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/iconv.m4 b/src/apps/bin/coreutils/m4/iconv.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/iconv.m4
rename to src/apps/bin/coreutils/m4/iconv.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/intdiv0.m4 b/src/apps/bin/coreutils/m4/intdiv0.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/intdiv0.m4
rename to src/apps/bin/coreutils/m4/intdiv0.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/inttypes-pri.m4 b/src/apps/bin/coreutils/m4/inttypes-pri.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/inttypes-pri.m4
rename to src/apps/bin/coreutils/m4/inttypes-pri.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/inttypes.m4 b/src/apps/bin/coreutils/m4/inttypes.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/inttypes.m4
rename to src/apps/bin/coreutils/m4/inttypes.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/isc-posix.m4 b/src/apps/bin/coreutils/m4/isc-posix.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/isc-posix.m4
rename to src/apps/bin/coreutils/m4/isc-posix.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/jm-glibc-io.m4 b/src/apps/bin/coreutils/m4/jm-glibc-io.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/jm-glibc-io.m4
rename to src/apps/bin/coreutils/m4/jm-glibc-io.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/jm-macros.m4 b/src/apps/bin/coreutils/m4/jm-macros.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/jm-macros.m4
rename to src/apps/bin/coreutils/m4/jm-macros.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/jm-mktime.m4 b/src/apps/bin/coreutils/m4/jm-mktime.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/jm-mktime.m4
rename to src/apps/bin/coreutils/m4/jm-mktime.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/jm-winsz1.m4 b/src/apps/bin/coreutils/m4/jm-winsz1.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/jm-winsz1.m4
rename to src/apps/bin/coreutils/m4/jm-winsz1.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/jm-winsz2.m4 b/src/apps/bin/coreutils/m4/jm-winsz2.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/jm-winsz2.m4
rename to src/apps/bin/coreutils/m4/jm-winsz2.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/lchown.m4 b/src/apps/bin/coreutils/m4/lchown.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/lchown.m4
rename to src/apps/bin/coreutils/m4/lchown.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/lcmessage.m4 b/src/apps/bin/coreutils/m4/lcmessage.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/lcmessage.m4
rename to src/apps/bin/coreutils/m4/lcmessage.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/lib-check.m4 b/src/apps/bin/coreutils/m4/lib-check.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/lib-check.m4
rename to src/apps/bin/coreutils/m4/lib-check.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/lib-ld.m4 b/src/apps/bin/coreutils/m4/lib-ld.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/lib-ld.m4
rename to src/apps/bin/coreutils/m4/lib-ld.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/lib-link.m4 b/src/apps/bin/coreutils/m4/lib-link.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/lib-link.m4
rename to src/apps/bin/coreutils/m4/lib-link.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/lib-prefix.m4 b/src/apps/bin/coreutils/m4/lib-prefix.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/lib-prefix.m4
rename to src/apps/bin/coreutils/m4/lib-prefix.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/link-follow.m4 b/src/apps/bin/coreutils/m4/link-follow.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/link-follow.m4
rename to src/apps/bin/coreutils/m4/link-follow.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/longlong.m4 b/src/apps/bin/coreutils/m4/longlong.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/longlong.m4
rename to src/apps/bin/coreutils/m4/longlong.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/ls-mntd-fs.m4 b/src/apps/bin/coreutils/m4/ls-mntd-fs.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/ls-mntd-fs.m4
rename to src/apps/bin/coreutils/m4/ls-mntd-fs.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/lstat.m4 b/src/apps/bin/coreutils/m4/lstat.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/lstat.m4
rename to src/apps/bin/coreutils/m4/lstat.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/mbrtowc.m4 b/src/apps/bin/coreutils/m4/mbrtowc.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/mbrtowc.m4
rename to src/apps/bin/coreutils/m4/mbrtowc.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/mbswidth.m4 b/src/apps/bin/coreutils/m4/mbswidth.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/mbswidth.m4
rename to src/apps/bin/coreutils/m4/mbswidth.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/memcmp.m4 b/src/apps/bin/coreutils/m4/memcmp.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/memcmp.m4
rename to src/apps/bin/coreutils/m4/memcmp.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/mkdir-slash.m4 b/src/apps/bin/coreutils/m4/mkdir-slash.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/mkdir-slash.m4
rename to src/apps/bin/coreutils/m4/mkdir-slash.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/mkstemp.m4 b/src/apps/bin/coreutils/m4/mkstemp.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/mkstemp.m4
rename to src/apps/bin/coreutils/m4/mkstemp.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/nanosleep.m4 b/src/apps/bin/coreutils/m4/nanosleep.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/nanosleep.m4
rename to src/apps/bin/coreutils/m4/nanosleep.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/onceonly.m4 b/src/apps/bin/coreutils/m4/onceonly.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/onceonly.m4
rename to src/apps/bin/coreutils/m4/onceonly.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/open-max.m4 b/src/apps/bin/coreutils/m4/open-max.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/open-max.m4
rename to src/apps/bin/coreutils/m4/open-max.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/perl.m4 b/src/apps/bin/coreutils/m4/perl.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/perl.m4
rename to src/apps/bin/coreutils/m4/perl.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/prereq.m4 b/src/apps/bin/coreutils/m4/prereq.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/prereq.m4
rename to src/apps/bin/coreutils/m4/prereq.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/progtest.m4 b/src/apps/bin/coreutils/m4/progtest.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/progtest.m4
rename to src/apps/bin/coreutils/m4/progtest.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/putenv.m4 b/src/apps/bin/coreutils/m4/putenv.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/putenv.m4
rename to src/apps/bin/coreutils/m4/putenv.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/regex.m4 b/src/apps/bin/coreutils/m4/regex.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/regex.m4
rename to src/apps/bin/coreutils/m4/regex.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/rename.m4 b/src/apps/bin/coreutils/m4/rename.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/rename.m4
rename to src/apps/bin/coreutils/m4/rename.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/restrict.m4 b/src/apps/bin/coreutils/m4/restrict.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/restrict.m4
rename to src/apps/bin/coreutils/m4/restrict.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/rmdir-errno.m4 b/src/apps/bin/coreutils/m4/rmdir-errno.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/rmdir-errno.m4
rename to src/apps/bin/coreutils/m4/rmdir-errno.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/search-libs.m4 b/src/apps/bin/coreutils/m4/search-libs.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/search-libs.m4
rename to src/apps/bin/coreutils/m4/search-libs.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/st_dm_mode.m4 b/src/apps/bin/coreutils/m4/st_dm_mode.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/st_dm_mode.m4
rename to src/apps/bin/coreutils/m4/st_dm_mode.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/st_mtim.m4 b/src/apps/bin/coreutils/m4/st_mtim.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/st_mtim.m4
rename to src/apps/bin/coreutils/m4/st_mtim.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/stat.m4 b/src/apps/bin/coreutils/m4/stat.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/stat.m4
rename to src/apps/bin/coreutils/m4/stat.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/stdbool.m4 b/src/apps/bin/coreutils/m4/stdbool.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/stdbool.m4
rename to src/apps/bin/coreutils/m4/stdbool.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/strftime.m4 b/src/apps/bin/coreutils/m4/strftime.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/strftime.m4
rename to src/apps/bin/coreutils/m4/strftime.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/timespec.m4 b/src/apps/bin/coreutils/m4/timespec.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/timespec.m4
rename to src/apps/bin/coreutils/m4/timespec.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/unlink-busy.m4 b/src/apps/bin/coreutils/m4/unlink-busy.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/unlink-busy.m4
rename to src/apps/bin/coreutils/m4/unlink-busy.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/uptime.m4 b/src/apps/bin/coreutils/m4/uptime.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/uptime.m4
rename to src/apps/bin/coreutils/m4/uptime.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/utimbuf.m4 b/src/apps/bin/coreutils/m4/utimbuf.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/utimbuf.m4
rename to src/apps/bin/coreutils/m4/utimbuf.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/utime.m4 b/src/apps/bin/coreutils/m4/utime.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/utime.m4
rename to src/apps/bin/coreutils/m4/utime.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/utimes.m4 b/src/apps/bin/coreutils/m4/utimes.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/utimes.m4
rename to src/apps/bin/coreutils/m4/utimes.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/xstrtoimax.m4 b/src/apps/bin/coreutils/m4/xstrtoimax.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/xstrtoimax.m4
rename to src/apps/bin/coreutils/m4/xstrtoimax.m4
diff --git a/src/apps/bin/coreutils-5.0/m4/xstrtoumax.m4 b/src/apps/bin/coreutils/m4/xstrtoumax.m4
similarity index 100%
rename from src/apps/bin/coreutils-5.0/m4/xstrtoumax.m4
rename to src/apps/bin/coreutils/m4/xstrtoumax.m4
diff --git a/src/apps/bin/coreutils-5.0/man/Makefile b/src/apps/bin/coreutils/man/Makefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/Makefile
rename to src/apps/bin/coreutils/man/Makefile
diff --git a/src/apps/bin/coreutils-5.0/man/Makefile.am b/src/apps/bin/coreutils/man/Makefile.am
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/Makefile.am
rename to src/apps/bin/coreutils/man/Makefile.am
diff --git a/src/apps/bin/coreutils-5.0/man/Makefile.in b/src/apps/bin/coreutils/man/Makefile.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/Makefile.in
rename to src/apps/bin/coreutils/man/Makefile.in
diff --git a/src/apps/bin/coreutils-5.0/man/basename.1 b/src/apps/bin/coreutils/man/basename.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/basename.1
rename to src/apps/bin/coreutils/man/basename.1
diff --git a/src/apps/bin/coreutils-5.0/man/basename.x b/src/apps/bin/coreutils/man/basename.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/basename.x
rename to src/apps/bin/coreutils/man/basename.x
diff --git a/src/apps/bin/coreutils-5.0/man/cat.1 b/src/apps/bin/coreutils/man/cat.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cat.1
rename to src/apps/bin/coreutils/man/cat.1
diff --git a/src/apps/bin/coreutils-5.0/man/cat.x b/src/apps/bin/coreutils/man/cat.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cat.x
rename to src/apps/bin/coreutils/man/cat.x
diff --git a/src/apps/bin/coreutils-5.0/man/chgrp.1 b/src/apps/bin/coreutils/man/chgrp.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chgrp.1
rename to src/apps/bin/coreutils/man/chgrp.1
diff --git a/src/apps/bin/coreutils-5.0/man/chgrp.x b/src/apps/bin/coreutils/man/chgrp.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chgrp.x
rename to src/apps/bin/coreutils/man/chgrp.x
diff --git a/src/apps/bin/coreutils-5.0/man/chmod.1 b/src/apps/bin/coreutils/man/chmod.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chmod.1
rename to src/apps/bin/coreutils/man/chmod.1
diff --git a/src/apps/bin/coreutils-5.0/man/chmod.x b/src/apps/bin/coreutils/man/chmod.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chmod.x
rename to src/apps/bin/coreutils/man/chmod.x
diff --git a/src/apps/bin/coreutils-5.0/man/chown.1 b/src/apps/bin/coreutils/man/chown.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chown.1
rename to src/apps/bin/coreutils/man/chown.1
diff --git a/src/apps/bin/coreutils-5.0/man/chown.x b/src/apps/bin/coreutils/man/chown.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chown.x
rename to src/apps/bin/coreutils/man/chown.x
diff --git a/src/apps/bin/coreutils-5.0/man/chroot.1 b/src/apps/bin/coreutils/man/chroot.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chroot.1
rename to src/apps/bin/coreutils/man/chroot.1
diff --git a/src/apps/bin/coreutils-5.0/man/chroot.x b/src/apps/bin/coreutils/man/chroot.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/chroot.x
rename to src/apps/bin/coreutils/man/chroot.x
diff --git a/src/apps/bin/coreutils-5.0/man/cksum.1 b/src/apps/bin/coreutils/man/cksum.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cksum.1
rename to src/apps/bin/coreutils/man/cksum.1
diff --git a/src/apps/bin/coreutils-5.0/man/cksum.x b/src/apps/bin/coreutils/man/cksum.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cksum.x
rename to src/apps/bin/coreutils/man/cksum.x
diff --git a/src/apps/bin/coreutils-5.0/man/comm.1 b/src/apps/bin/coreutils/man/comm.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/comm.1
rename to src/apps/bin/coreutils/man/comm.1
diff --git a/src/apps/bin/coreutils-5.0/man/comm.x b/src/apps/bin/coreutils/man/comm.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/comm.x
rename to src/apps/bin/coreutils/man/comm.x
diff --git a/src/apps/bin/coreutils-5.0/man/cp.1 b/src/apps/bin/coreutils/man/cp.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cp.1
rename to src/apps/bin/coreutils/man/cp.1
diff --git a/src/apps/bin/coreutils-5.0/man/cp.x b/src/apps/bin/coreutils/man/cp.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cp.x
rename to src/apps/bin/coreutils/man/cp.x
diff --git a/src/apps/bin/coreutils-5.0/man/csplit.1 b/src/apps/bin/coreutils/man/csplit.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/csplit.1
rename to src/apps/bin/coreutils/man/csplit.1
diff --git a/src/apps/bin/coreutils-5.0/man/csplit.x b/src/apps/bin/coreutils/man/csplit.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/csplit.x
rename to src/apps/bin/coreutils/man/csplit.x
diff --git a/src/apps/bin/coreutils-5.0/man/cut.1 b/src/apps/bin/coreutils/man/cut.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cut.1
rename to src/apps/bin/coreutils/man/cut.1
diff --git a/src/apps/bin/coreutils-5.0/man/cut.x b/src/apps/bin/coreutils/man/cut.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/cut.x
rename to src/apps/bin/coreutils/man/cut.x
diff --git a/src/apps/bin/coreutils-5.0/man/date.1 b/src/apps/bin/coreutils/man/date.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/date.1
rename to src/apps/bin/coreutils/man/date.1
diff --git a/src/apps/bin/coreutils-5.0/man/date.x b/src/apps/bin/coreutils/man/date.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/date.x
rename to src/apps/bin/coreutils/man/date.x
diff --git a/src/apps/bin/coreutils-5.0/man/dd.1 b/src/apps/bin/coreutils/man/dd.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dd.1
rename to src/apps/bin/coreutils/man/dd.1
diff --git a/src/apps/bin/coreutils-5.0/man/dd.x b/src/apps/bin/coreutils/man/dd.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dd.x
rename to src/apps/bin/coreutils/man/dd.x
diff --git a/src/apps/bin/coreutils-5.0/man/df.1 b/src/apps/bin/coreutils/man/df.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/df.1
rename to src/apps/bin/coreutils/man/df.1
diff --git a/src/apps/bin/coreutils-5.0/man/df.x b/src/apps/bin/coreutils/man/df.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/df.x
rename to src/apps/bin/coreutils/man/df.x
diff --git a/src/apps/bin/coreutils-5.0/man/dir.1 b/src/apps/bin/coreutils/man/dir.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dir.1
rename to src/apps/bin/coreutils/man/dir.1
diff --git a/src/apps/bin/coreutils-5.0/man/dir.x b/src/apps/bin/coreutils/man/dir.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dir.x
rename to src/apps/bin/coreutils/man/dir.x
diff --git a/src/apps/bin/coreutils-5.0/man/dircolors.1 b/src/apps/bin/coreutils/man/dircolors.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dircolors.1
rename to src/apps/bin/coreutils/man/dircolors.1
diff --git a/src/apps/bin/coreutils-5.0/man/dircolors.x b/src/apps/bin/coreutils/man/dircolors.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dircolors.x
rename to src/apps/bin/coreutils/man/dircolors.x
diff --git a/src/apps/bin/coreutils-5.0/man/dirname.1 b/src/apps/bin/coreutils/man/dirname.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dirname.1
rename to src/apps/bin/coreutils/man/dirname.1
diff --git a/src/apps/bin/coreutils-5.0/man/dirname.x b/src/apps/bin/coreutils/man/dirname.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/dirname.x
rename to src/apps/bin/coreutils/man/dirname.x
diff --git a/src/apps/bin/coreutils-5.0/man/du.1 b/src/apps/bin/coreutils/man/du.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/du.1
rename to src/apps/bin/coreutils/man/du.1
diff --git a/src/apps/bin/coreutils-5.0/man/du.x b/src/apps/bin/coreutils/man/du.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/du.x
rename to src/apps/bin/coreutils/man/du.x
diff --git a/src/apps/bin/coreutils-5.0/man/echo.1 b/src/apps/bin/coreutils/man/echo.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/echo.1
rename to src/apps/bin/coreutils/man/echo.1
diff --git a/src/apps/bin/coreutils-5.0/man/echo.x b/src/apps/bin/coreutils/man/echo.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/echo.x
rename to src/apps/bin/coreutils/man/echo.x
diff --git a/src/apps/bin/coreutils-5.0/man/env.1 b/src/apps/bin/coreutils/man/env.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/env.1
rename to src/apps/bin/coreutils/man/env.1
diff --git a/src/apps/bin/coreutils-5.0/man/env.x b/src/apps/bin/coreutils/man/env.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/env.x
rename to src/apps/bin/coreutils/man/env.x
diff --git a/src/apps/bin/coreutils-5.0/man/expand.1 b/src/apps/bin/coreutils/man/expand.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/expand.1
rename to src/apps/bin/coreutils/man/expand.1
diff --git a/src/apps/bin/coreutils-5.0/man/expand.x b/src/apps/bin/coreutils/man/expand.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/expand.x
rename to src/apps/bin/coreutils/man/expand.x
diff --git a/src/apps/bin/coreutils-5.0/man/expr.1 b/src/apps/bin/coreutils/man/expr.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/expr.1
rename to src/apps/bin/coreutils/man/expr.1
diff --git a/src/apps/bin/coreutils-5.0/man/expr.x b/src/apps/bin/coreutils/man/expr.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/expr.x
rename to src/apps/bin/coreutils/man/expr.x
diff --git a/src/apps/bin/coreutils-5.0/man/factor.1 b/src/apps/bin/coreutils/man/factor.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/factor.1
rename to src/apps/bin/coreutils/man/factor.1
diff --git a/src/apps/bin/coreutils-5.0/man/factor.x b/src/apps/bin/coreutils/man/factor.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/factor.x
rename to src/apps/bin/coreutils/man/factor.x
diff --git a/src/apps/bin/coreutils-5.0/man/false.1 b/src/apps/bin/coreutils/man/false.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/false.1
rename to src/apps/bin/coreutils/man/false.1
diff --git a/src/apps/bin/coreutils-5.0/man/false.x b/src/apps/bin/coreutils/man/false.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/false.x
rename to src/apps/bin/coreutils/man/false.x
diff --git a/src/apps/bin/coreutils-5.0/man/fmt.1 b/src/apps/bin/coreutils/man/fmt.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/fmt.1
rename to src/apps/bin/coreutils/man/fmt.1
diff --git a/src/apps/bin/coreutils-5.0/man/fmt.x b/src/apps/bin/coreutils/man/fmt.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/fmt.x
rename to src/apps/bin/coreutils/man/fmt.x
diff --git a/src/apps/bin/coreutils-5.0/man/fold.1 b/src/apps/bin/coreutils/man/fold.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/fold.1
rename to src/apps/bin/coreutils/man/fold.1
diff --git a/src/apps/bin/coreutils-5.0/man/fold.x b/src/apps/bin/coreutils/man/fold.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/fold.x
rename to src/apps/bin/coreutils/man/fold.x
diff --git a/src/apps/bin/coreutils-5.0/man/groups.1 b/src/apps/bin/coreutils/man/groups.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/groups.1
rename to src/apps/bin/coreutils/man/groups.1
diff --git a/src/apps/bin/coreutils-5.0/man/groups.x b/src/apps/bin/coreutils/man/groups.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/groups.x
rename to src/apps/bin/coreutils/man/groups.x
diff --git a/src/apps/bin/coreutils-5.0/man/head.1 b/src/apps/bin/coreutils/man/head.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/head.1
rename to src/apps/bin/coreutils/man/head.1
diff --git a/src/apps/bin/coreutils-5.0/man/head.x b/src/apps/bin/coreutils/man/head.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/head.x
rename to src/apps/bin/coreutils/man/head.x
diff --git a/src/apps/bin/coreutils-5.0/man/hostid.1 b/src/apps/bin/coreutils/man/hostid.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/hostid.1
rename to src/apps/bin/coreutils/man/hostid.1
diff --git a/src/apps/bin/coreutils-5.0/man/hostid.x b/src/apps/bin/coreutils/man/hostid.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/hostid.x
rename to src/apps/bin/coreutils/man/hostid.x
diff --git a/src/apps/bin/coreutils-5.0/man/hostname.1 b/src/apps/bin/coreutils/man/hostname.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/hostname.1
rename to src/apps/bin/coreutils/man/hostname.1
diff --git a/src/apps/bin/coreutils-5.0/man/hostname.x b/src/apps/bin/coreutils/man/hostname.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/hostname.x
rename to src/apps/bin/coreutils/man/hostname.x
diff --git a/src/apps/bin/coreutils-5.0/man/id.1 b/src/apps/bin/coreutils/man/id.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/id.1
rename to src/apps/bin/coreutils/man/id.1
diff --git a/src/apps/bin/coreutils-5.0/man/id.x b/src/apps/bin/coreutils/man/id.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/id.x
rename to src/apps/bin/coreutils/man/id.x
diff --git a/src/apps/bin/coreutils-5.0/man/install.1 b/src/apps/bin/coreutils/man/install.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/install.1
rename to src/apps/bin/coreutils/man/install.1
diff --git a/src/apps/bin/coreutils-5.0/man/install.x b/src/apps/bin/coreutils/man/install.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/install.x
rename to src/apps/bin/coreutils/man/install.x
diff --git a/src/apps/bin/coreutils-5.0/man/join.1 b/src/apps/bin/coreutils/man/join.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/join.1
rename to src/apps/bin/coreutils/man/join.1
diff --git a/src/apps/bin/coreutils-5.0/man/join.x b/src/apps/bin/coreutils/man/join.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/join.x
rename to src/apps/bin/coreutils/man/join.x
diff --git a/src/apps/bin/coreutils-5.0/man/link.1 b/src/apps/bin/coreutils/man/link.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/link.1
rename to src/apps/bin/coreutils/man/link.1
diff --git a/src/apps/bin/coreutils-5.0/man/link.x b/src/apps/bin/coreutils/man/link.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/link.x
rename to src/apps/bin/coreutils/man/link.x
diff --git a/src/apps/bin/coreutils-5.0/man/ln.1 b/src/apps/bin/coreutils/man/ln.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/ln.1
rename to src/apps/bin/coreutils/man/ln.1
diff --git a/src/apps/bin/coreutils-5.0/man/ln.x b/src/apps/bin/coreutils/man/ln.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/ln.x
rename to src/apps/bin/coreutils/man/ln.x
diff --git a/src/apps/bin/coreutils-5.0/man/logname.1 b/src/apps/bin/coreutils/man/logname.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/logname.1
rename to src/apps/bin/coreutils/man/logname.1
diff --git a/src/apps/bin/coreutils-5.0/man/logname.x b/src/apps/bin/coreutils/man/logname.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/logname.x
rename to src/apps/bin/coreutils/man/logname.x
diff --git a/src/apps/bin/coreutils-5.0/man/ls.1 b/src/apps/bin/coreutils/man/ls.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/ls.1
rename to src/apps/bin/coreutils/man/ls.1
diff --git a/src/apps/bin/coreutils-5.0/man/ls.x b/src/apps/bin/coreutils/man/ls.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/ls.x
rename to src/apps/bin/coreutils/man/ls.x
diff --git a/src/apps/bin/coreutils-5.0/man/md5sum.1 b/src/apps/bin/coreutils/man/md5sum.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/md5sum.1
rename to src/apps/bin/coreutils/man/md5sum.1
diff --git a/src/apps/bin/coreutils-5.0/man/md5sum.x b/src/apps/bin/coreutils/man/md5sum.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/md5sum.x
rename to src/apps/bin/coreutils/man/md5sum.x
diff --git a/src/apps/bin/coreutils-5.0/man/mkdir.1 b/src/apps/bin/coreutils/man/mkdir.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mkdir.1
rename to src/apps/bin/coreutils/man/mkdir.1
diff --git a/src/apps/bin/coreutils-5.0/man/mkdir.x b/src/apps/bin/coreutils/man/mkdir.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mkdir.x
rename to src/apps/bin/coreutils/man/mkdir.x
diff --git a/src/apps/bin/coreutils-5.0/man/mkfifo.1 b/src/apps/bin/coreutils/man/mkfifo.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mkfifo.1
rename to src/apps/bin/coreutils/man/mkfifo.1
diff --git a/src/apps/bin/coreutils-5.0/man/mkfifo.x b/src/apps/bin/coreutils/man/mkfifo.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mkfifo.x
rename to src/apps/bin/coreutils/man/mkfifo.x
diff --git a/src/apps/bin/coreutils-5.0/man/mknod.1 b/src/apps/bin/coreutils/man/mknod.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mknod.1
rename to src/apps/bin/coreutils/man/mknod.1
diff --git a/src/apps/bin/coreutils-5.0/man/mknod.x b/src/apps/bin/coreutils/man/mknod.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mknod.x
rename to src/apps/bin/coreutils/man/mknod.x
diff --git a/src/apps/bin/coreutils-5.0/man/mv.1 b/src/apps/bin/coreutils/man/mv.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mv.1
rename to src/apps/bin/coreutils/man/mv.1
diff --git a/src/apps/bin/coreutils-5.0/man/mv.x b/src/apps/bin/coreutils/man/mv.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/mv.x
rename to src/apps/bin/coreutils/man/mv.x
diff --git a/src/apps/bin/coreutils-5.0/man/nice.1 b/src/apps/bin/coreutils/man/nice.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/nice.1
rename to src/apps/bin/coreutils/man/nice.1
diff --git a/src/apps/bin/coreutils-5.0/man/nice.x b/src/apps/bin/coreutils/man/nice.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/nice.x
rename to src/apps/bin/coreutils/man/nice.x
diff --git a/src/apps/bin/coreutils-5.0/man/nl.1 b/src/apps/bin/coreutils/man/nl.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/nl.1
rename to src/apps/bin/coreutils/man/nl.1
diff --git a/src/apps/bin/coreutils-5.0/man/nl.x b/src/apps/bin/coreutils/man/nl.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/nl.x
rename to src/apps/bin/coreutils/man/nl.x
diff --git a/src/apps/bin/coreutils-5.0/man/nohup.1 b/src/apps/bin/coreutils/man/nohup.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/nohup.1
rename to src/apps/bin/coreutils/man/nohup.1
diff --git a/src/apps/bin/coreutils-5.0/man/nohup.x b/src/apps/bin/coreutils/man/nohup.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/nohup.x
rename to src/apps/bin/coreutils/man/nohup.x
diff --git a/src/apps/bin/coreutils-5.0/man/od.1 b/src/apps/bin/coreutils/man/od.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/od.1
rename to src/apps/bin/coreutils/man/od.1
diff --git a/src/apps/bin/coreutils-5.0/man/od.x b/src/apps/bin/coreutils/man/od.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/od.x
rename to src/apps/bin/coreutils/man/od.x
diff --git a/src/apps/bin/coreutils-5.0/man/paste.1 b/src/apps/bin/coreutils/man/paste.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/paste.1
rename to src/apps/bin/coreutils/man/paste.1
diff --git a/src/apps/bin/coreutils-5.0/man/paste.x b/src/apps/bin/coreutils/man/paste.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/paste.x
rename to src/apps/bin/coreutils/man/paste.x
diff --git a/src/apps/bin/coreutils-5.0/man/pathchk.1 b/src/apps/bin/coreutils/man/pathchk.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pathchk.1
rename to src/apps/bin/coreutils/man/pathchk.1
diff --git a/src/apps/bin/coreutils-5.0/man/pathchk.x b/src/apps/bin/coreutils/man/pathchk.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pathchk.x
rename to src/apps/bin/coreutils/man/pathchk.x
diff --git a/src/apps/bin/coreutils-5.0/man/pinky.1 b/src/apps/bin/coreutils/man/pinky.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pinky.1
rename to src/apps/bin/coreutils/man/pinky.1
diff --git a/src/apps/bin/coreutils-5.0/man/pinky.x b/src/apps/bin/coreutils/man/pinky.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pinky.x
rename to src/apps/bin/coreutils/man/pinky.x
diff --git a/src/apps/bin/coreutils-5.0/man/pr.1 b/src/apps/bin/coreutils/man/pr.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pr.1
rename to src/apps/bin/coreutils/man/pr.1
diff --git a/src/apps/bin/coreutils-5.0/man/pr.x b/src/apps/bin/coreutils/man/pr.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pr.x
rename to src/apps/bin/coreutils/man/pr.x
diff --git a/src/apps/bin/coreutils-5.0/man/printenv.1 b/src/apps/bin/coreutils/man/printenv.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/printenv.1
rename to src/apps/bin/coreutils/man/printenv.1
diff --git a/src/apps/bin/coreutils-5.0/man/printenv.x b/src/apps/bin/coreutils/man/printenv.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/printenv.x
rename to src/apps/bin/coreutils/man/printenv.x
diff --git a/src/apps/bin/coreutils-5.0/man/printf.1 b/src/apps/bin/coreutils/man/printf.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/printf.1
rename to src/apps/bin/coreutils/man/printf.1
diff --git a/src/apps/bin/coreutils-5.0/man/printf.x b/src/apps/bin/coreutils/man/printf.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/printf.x
rename to src/apps/bin/coreutils/man/printf.x
diff --git a/src/apps/bin/coreutils-5.0/man/ptx.1 b/src/apps/bin/coreutils/man/ptx.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/ptx.1
rename to src/apps/bin/coreutils/man/ptx.1
diff --git a/src/apps/bin/coreutils-5.0/man/ptx.x b/src/apps/bin/coreutils/man/ptx.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/ptx.x
rename to src/apps/bin/coreutils/man/ptx.x
diff --git a/src/apps/bin/coreutils-5.0/man/pwd.1 b/src/apps/bin/coreutils/man/pwd.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pwd.1
rename to src/apps/bin/coreutils/man/pwd.1
diff --git a/src/apps/bin/coreutils-5.0/man/pwd.x b/src/apps/bin/coreutils/man/pwd.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/pwd.x
rename to src/apps/bin/coreutils/man/pwd.x
diff --git a/src/apps/bin/coreutils-5.0/man/readlink.1 b/src/apps/bin/coreutils/man/readlink.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/readlink.1
rename to src/apps/bin/coreutils/man/readlink.1
diff --git a/src/apps/bin/coreutils-5.0/man/readlink.x b/src/apps/bin/coreutils/man/readlink.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/readlink.x
rename to src/apps/bin/coreutils/man/readlink.x
diff --git a/src/apps/bin/coreutils-5.0/man/rm.1 b/src/apps/bin/coreutils/man/rm.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/rm.1
rename to src/apps/bin/coreutils/man/rm.1
diff --git a/src/apps/bin/coreutils-5.0/man/rm.x b/src/apps/bin/coreutils/man/rm.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/rm.x
rename to src/apps/bin/coreutils/man/rm.x
diff --git a/src/apps/bin/coreutils-5.0/man/rmdir.1 b/src/apps/bin/coreutils/man/rmdir.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/rmdir.1
rename to src/apps/bin/coreutils/man/rmdir.1
diff --git a/src/apps/bin/coreutils-5.0/man/rmdir.x b/src/apps/bin/coreutils/man/rmdir.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/rmdir.x
rename to src/apps/bin/coreutils/man/rmdir.x
diff --git a/src/apps/bin/coreutils-5.0/man/seq.1 b/src/apps/bin/coreutils/man/seq.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/seq.1
rename to src/apps/bin/coreutils/man/seq.1
diff --git a/src/apps/bin/coreutils-5.0/man/seq.x b/src/apps/bin/coreutils/man/seq.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/seq.x
rename to src/apps/bin/coreutils/man/seq.x
diff --git a/src/apps/bin/coreutils-5.0/man/sha1sum.1 b/src/apps/bin/coreutils/man/sha1sum.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sha1sum.1
rename to src/apps/bin/coreutils/man/sha1sum.1
diff --git a/src/apps/bin/coreutils-5.0/man/sha1sum.x b/src/apps/bin/coreutils/man/sha1sum.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sha1sum.x
rename to src/apps/bin/coreutils/man/sha1sum.x
diff --git a/src/apps/bin/coreutils-5.0/man/shred.1 b/src/apps/bin/coreutils/man/shred.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/shred.1
rename to src/apps/bin/coreutils/man/shred.1
diff --git a/src/apps/bin/coreutils-5.0/man/shred.x b/src/apps/bin/coreutils/man/shred.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/shred.x
rename to src/apps/bin/coreutils/man/shred.x
diff --git a/src/apps/bin/coreutils-5.0/man/sleep.1 b/src/apps/bin/coreutils/man/sleep.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sleep.1
rename to src/apps/bin/coreutils/man/sleep.1
diff --git a/src/apps/bin/coreutils-5.0/man/sleep.x b/src/apps/bin/coreutils/man/sleep.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sleep.x
rename to src/apps/bin/coreutils/man/sleep.x
diff --git a/src/apps/bin/coreutils-5.0/man/sort.1 b/src/apps/bin/coreutils/man/sort.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sort.1
rename to src/apps/bin/coreutils/man/sort.1
diff --git a/src/apps/bin/coreutils-5.0/man/sort.x b/src/apps/bin/coreutils/man/sort.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sort.x
rename to src/apps/bin/coreutils/man/sort.x
diff --git a/src/apps/bin/coreutils-5.0/man/split.1 b/src/apps/bin/coreutils/man/split.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/split.1
rename to src/apps/bin/coreutils/man/split.1
diff --git a/src/apps/bin/coreutils-5.0/man/split.x b/src/apps/bin/coreutils/man/split.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/split.x
rename to src/apps/bin/coreutils/man/split.x
diff --git a/src/apps/bin/coreutils-5.0/man/stat.1 b/src/apps/bin/coreutils/man/stat.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/stat.1
rename to src/apps/bin/coreutils/man/stat.1
diff --git a/src/apps/bin/coreutils-5.0/man/stat.x b/src/apps/bin/coreutils/man/stat.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/stat.x
rename to src/apps/bin/coreutils/man/stat.x
diff --git a/src/apps/bin/coreutils-5.0/man/stty.1 b/src/apps/bin/coreutils/man/stty.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/stty.1
rename to src/apps/bin/coreutils/man/stty.1
diff --git a/src/apps/bin/coreutils-5.0/man/stty.x b/src/apps/bin/coreutils/man/stty.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/stty.x
rename to src/apps/bin/coreutils/man/stty.x
diff --git a/src/apps/bin/coreutils-5.0/man/su.1 b/src/apps/bin/coreutils/man/su.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/su.1
rename to src/apps/bin/coreutils/man/su.1
diff --git a/src/apps/bin/coreutils-5.0/man/su.x b/src/apps/bin/coreutils/man/su.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/su.x
rename to src/apps/bin/coreutils/man/su.x
diff --git a/src/apps/bin/coreutils-5.0/man/sum.1 b/src/apps/bin/coreutils/man/sum.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sum.1
rename to src/apps/bin/coreutils/man/sum.1
diff --git a/src/apps/bin/coreutils-5.0/man/sum.x b/src/apps/bin/coreutils/man/sum.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sum.x
rename to src/apps/bin/coreutils/man/sum.x
diff --git a/src/apps/bin/coreutils-5.0/man/sync.1 b/src/apps/bin/coreutils/man/sync.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sync.1
rename to src/apps/bin/coreutils/man/sync.1
diff --git a/src/apps/bin/coreutils-5.0/man/sync.x b/src/apps/bin/coreutils/man/sync.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/sync.x
rename to src/apps/bin/coreutils/man/sync.x
diff --git a/src/apps/bin/coreutils-5.0/man/tac.1 b/src/apps/bin/coreutils/man/tac.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tac.1
rename to src/apps/bin/coreutils/man/tac.1
diff --git a/src/apps/bin/coreutils-5.0/man/tac.x b/src/apps/bin/coreutils/man/tac.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tac.x
rename to src/apps/bin/coreutils/man/tac.x
diff --git a/src/apps/bin/coreutils-5.0/man/tail.1 b/src/apps/bin/coreutils/man/tail.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tail.1
rename to src/apps/bin/coreutils/man/tail.1
diff --git a/src/apps/bin/coreutils-5.0/man/tail.x b/src/apps/bin/coreutils/man/tail.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tail.x
rename to src/apps/bin/coreutils/man/tail.x
diff --git a/src/apps/bin/coreutils-5.0/man/tee.1 b/src/apps/bin/coreutils/man/tee.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tee.1
rename to src/apps/bin/coreutils/man/tee.1
diff --git a/src/apps/bin/coreutils-5.0/man/tee.x b/src/apps/bin/coreutils/man/tee.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tee.x
rename to src/apps/bin/coreutils/man/tee.x
diff --git a/src/apps/bin/coreutils-5.0/man/test.1 b/src/apps/bin/coreutils/man/test.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/test.1
rename to src/apps/bin/coreutils/man/test.1
diff --git a/src/apps/bin/coreutils-5.0/man/test.x b/src/apps/bin/coreutils/man/test.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/test.x
rename to src/apps/bin/coreutils/man/test.x
diff --git a/src/apps/bin/coreutils-5.0/man/touch.1 b/src/apps/bin/coreutils/man/touch.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/touch.1
rename to src/apps/bin/coreutils/man/touch.1
diff --git a/src/apps/bin/coreutils-5.0/man/touch.x b/src/apps/bin/coreutils/man/touch.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/touch.x
rename to src/apps/bin/coreutils/man/touch.x
diff --git a/src/apps/bin/coreutils-5.0/man/tr.1 b/src/apps/bin/coreutils/man/tr.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tr.1
rename to src/apps/bin/coreutils/man/tr.1
diff --git a/src/apps/bin/coreutils-5.0/man/tr.x b/src/apps/bin/coreutils/man/tr.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tr.x
rename to src/apps/bin/coreutils/man/tr.x
diff --git a/src/apps/bin/coreutils-5.0/man/true.1 b/src/apps/bin/coreutils/man/true.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/true.1
rename to src/apps/bin/coreutils/man/true.1
diff --git a/src/apps/bin/coreutils-5.0/man/true.x b/src/apps/bin/coreutils/man/true.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/true.x
rename to src/apps/bin/coreutils/man/true.x
diff --git a/src/apps/bin/coreutils-5.0/man/tsort.1 b/src/apps/bin/coreutils/man/tsort.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tsort.1
rename to src/apps/bin/coreutils/man/tsort.1
diff --git a/src/apps/bin/coreutils-5.0/man/tsort.x b/src/apps/bin/coreutils/man/tsort.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tsort.x
rename to src/apps/bin/coreutils/man/tsort.x
diff --git a/src/apps/bin/coreutils-5.0/man/tty.1 b/src/apps/bin/coreutils/man/tty.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tty.1
rename to src/apps/bin/coreutils/man/tty.1
diff --git a/src/apps/bin/coreutils-5.0/man/tty.x b/src/apps/bin/coreutils/man/tty.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/tty.x
rename to src/apps/bin/coreutils/man/tty.x
diff --git a/src/apps/bin/coreutils-5.0/man/uname.1 b/src/apps/bin/coreutils/man/uname.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/uname.1
rename to src/apps/bin/coreutils/man/uname.1
diff --git a/src/apps/bin/coreutils-5.0/man/uname.x b/src/apps/bin/coreutils/man/uname.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/uname.x
rename to src/apps/bin/coreutils/man/uname.x
diff --git a/src/apps/bin/coreutils-5.0/man/unexpand.1 b/src/apps/bin/coreutils/man/unexpand.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/unexpand.1
rename to src/apps/bin/coreutils/man/unexpand.1
diff --git a/src/apps/bin/coreutils-5.0/man/unexpand.x b/src/apps/bin/coreutils/man/unexpand.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/unexpand.x
rename to src/apps/bin/coreutils/man/unexpand.x
diff --git a/src/apps/bin/coreutils-5.0/man/uniq.1 b/src/apps/bin/coreutils/man/uniq.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/uniq.1
rename to src/apps/bin/coreutils/man/uniq.1
diff --git a/src/apps/bin/coreutils-5.0/man/uniq.x b/src/apps/bin/coreutils/man/uniq.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/uniq.x
rename to src/apps/bin/coreutils/man/uniq.x
diff --git a/src/apps/bin/coreutils-5.0/man/unlink.1 b/src/apps/bin/coreutils/man/unlink.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/unlink.1
rename to src/apps/bin/coreutils/man/unlink.1
diff --git a/src/apps/bin/coreutils-5.0/man/unlink.x b/src/apps/bin/coreutils/man/unlink.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/unlink.x
rename to src/apps/bin/coreutils/man/unlink.x
diff --git a/src/apps/bin/coreutils-5.0/man/uptime.1 b/src/apps/bin/coreutils/man/uptime.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/uptime.1
rename to src/apps/bin/coreutils/man/uptime.1
diff --git a/src/apps/bin/coreutils-5.0/man/uptime.x b/src/apps/bin/coreutils/man/uptime.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/uptime.x
rename to src/apps/bin/coreutils/man/uptime.x
diff --git a/src/apps/bin/coreutils-5.0/man/users.1 b/src/apps/bin/coreutils/man/users.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/users.1
rename to src/apps/bin/coreutils/man/users.1
diff --git a/src/apps/bin/coreutils-5.0/man/users.x b/src/apps/bin/coreutils/man/users.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/users.x
rename to src/apps/bin/coreutils/man/users.x
diff --git a/src/apps/bin/coreutils-5.0/man/vdir.1 b/src/apps/bin/coreutils/man/vdir.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/vdir.1
rename to src/apps/bin/coreutils/man/vdir.1
diff --git a/src/apps/bin/coreutils-5.0/man/vdir.x b/src/apps/bin/coreutils/man/vdir.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/vdir.x
rename to src/apps/bin/coreutils/man/vdir.x
diff --git a/src/apps/bin/coreutils-5.0/man/wc.1 b/src/apps/bin/coreutils/man/wc.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/wc.1
rename to src/apps/bin/coreutils/man/wc.1
diff --git a/src/apps/bin/coreutils-5.0/man/wc.x b/src/apps/bin/coreutils/man/wc.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/wc.x
rename to src/apps/bin/coreutils/man/wc.x
diff --git a/src/apps/bin/coreutils-5.0/man/who.1 b/src/apps/bin/coreutils/man/who.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/who.1
rename to src/apps/bin/coreutils/man/who.1
diff --git a/src/apps/bin/coreutils-5.0/man/who.x b/src/apps/bin/coreutils/man/who.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/who.x
rename to src/apps/bin/coreutils/man/who.x
diff --git a/src/apps/bin/coreutils-5.0/man/whoami.1 b/src/apps/bin/coreutils/man/whoami.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/whoami.1
rename to src/apps/bin/coreutils/man/whoami.1
diff --git a/src/apps/bin/coreutils-5.0/man/whoami.x b/src/apps/bin/coreutils/man/whoami.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/whoami.x
rename to src/apps/bin/coreutils/man/whoami.x
diff --git a/src/apps/bin/coreutils-5.0/man/yes.1 b/src/apps/bin/coreutils/man/yes.1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/yes.1
rename to src/apps/bin/coreutils/man/yes.1
diff --git a/src/apps/bin/coreutils-5.0/man/yes.x b/src/apps/bin/coreutils/man/yes.x
similarity index 100%
rename from src/apps/bin/coreutils-5.0/man/yes.x
rename to src/apps/bin/coreutils/man/yes.x
diff --git a/src/apps/bin/coreutils-5.0/po/ChangeLog b/src/apps/bin/coreutils/po/ChangeLog
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ChangeLog
rename to src/apps/bin/coreutils/po/ChangeLog
diff --git a/src/apps/bin/coreutils-5.0/po/LINGUAS b/src/apps/bin/coreutils/po/LINGUAS
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/LINGUAS
rename to src/apps/bin/coreutils/po/LINGUAS
diff --git a/src/apps/bin/coreutils-5.0/po/Makefile b/src/apps/bin/coreutils/po/Makefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/Makefile
rename to src/apps/bin/coreutils/po/Makefile
diff --git a/src/apps/bin/coreutils-5.0/po/Makefile.in b/src/apps/bin/coreutils/po/Makefile.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/Makefile.in
rename to src/apps/bin/coreutils/po/Makefile.in
diff --git a/src/apps/bin/coreutils-5.0/po/Makefile.in.in b/src/apps/bin/coreutils/po/Makefile.in.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/Makefile.in.in
rename to src/apps/bin/coreutils/po/Makefile.in.in
diff --git a/src/apps/bin/coreutils-5.0/po/Makevars b/src/apps/bin/coreutils/po/Makevars
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/Makevars
rename to src/apps/bin/coreutils/po/Makevars
diff --git a/src/apps/bin/coreutils-5.0/po/POTFILES b/src/apps/bin/coreutils/po/POTFILES
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/POTFILES
rename to src/apps/bin/coreutils/po/POTFILES
diff --git a/src/apps/bin/coreutils-5.0/po/POTFILES.in b/src/apps/bin/coreutils/po/POTFILES.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/POTFILES.in
rename to src/apps/bin/coreutils/po/POTFILES.in
diff --git a/src/apps/bin/coreutils-5.0/po/Rules-quot b/src/apps/bin/coreutils/po/Rules-quot
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/Rules-quot
rename to src/apps/bin/coreutils/po/Rules-quot
diff --git a/src/apps/bin/coreutils-5.0/po/be.gmo b/src/apps/bin/coreutils/po/be.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/be.gmo
rename to src/apps/bin/coreutils/po/be.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/be.po b/src/apps/bin/coreutils/po/be.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/be.po
rename to src/apps/bin/coreutils/po/be.po
diff --git a/src/apps/bin/coreutils-5.0/po/boldquot.sed b/src/apps/bin/coreutils/po/boldquot.sed
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/boldquot.sed
rename to src/apps/bin/coreutils/po/boldquot.sed
diff --git a/src/apps/bin/coreutils-5.0/po/ca.gmo b/src/apps/bin/coreutils/po/ca.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ca.gmo
rename to src/apps/bin/coreutils/po/ca.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/ca.po b/src/apps/bin/coreutils/po/ca.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ca.po
rename to src/apps/bin/coreutils/po/ca.po
diff --git a/src/apps/bin/coreutils-5.0/po/coreutils.pot b/src/apps/bin/coreutils/po/coreutils.pot
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/coreutils.pot
rename to src/apps/bin/coreutils/po/coreutils.pot
diff --git a/src/apps/bin/coreutils-5.0/po/cs.gmo b/src/apps/bin/coreutils/po/cs.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/cs.gmo
rename to src/apps/bin/coreutils/po/cs.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/cs.po b/src/apps/bin/coreutils/po/cs.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/cs.po
rename to src/apps/bin/coreutils/po/cs.po
diff --git a/src/apps/bin/coreutils-5.0/po/da.gmo b/src/apps/bin/coreutils/po/da.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/da.gmo
rename to src/apps/bin/coreutils/po/da.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/da.po b/src/apps/bin/coreutils/po/da.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/da.po
rename to src/apps/bin/coreutils/po/da.po
diff --git a/src/apps/bin/coreutils-5.0/po/de.gmo b/src/apps/bin/coreutils/po/de.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/de.gmo
rename to src/apps/bin/coreutils/po/de.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/de.po b/src/apps/bin/coreutils/po/de.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/de.po
rename to src/apps/bin/coreutils/po/de.po
diff --git a/src/apps/bin/coreutils-5.0/po/el.gmo b/src/apps/bin/coreutils/po/el.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/el.gmo
rename to src/apps/bin/coreutils/po/el.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/el.po b/src/apps/bin/coreutils/po/el.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/el.po
rename to src/apps/bin/coreutils/po/el.po
diff --git a/src/apps/bin/coreutils-5.0/po/en@boldquot.header b/src/apps/bin/coreutils/po/en@boldquot.header
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/en@boldquot.header
rename to src/apps/bin/coreutils/po/en@boldquot.header
diff --git a/src/apps/bin/coreutils-5.0/po/en@quot.header b/src/apps/bin/coreutils/po/en@quot.header
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/en@quot.header
rename to src/apps/bin/coreutils/po/en@quot.header
diff --git a/src/apps/bin/coreutils-5.0/po/es.gmo b/src/apps/bin/coreutils/po/es.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/es.gmo
rename to src/apps/bin/coreutils/po/es.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/es.po b/src/apps/bin/coreutils/po/es.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/es.po
rename to src/apps/bin/coreutils/po/es.po
diff --git a/src/apps/bin/coreutils-5.0/po/et.gmo b/src/apps/bin/coreutils/po/et.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/et.gmo
rename to src/apps/bin/coreutils/po/et.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/et.po b/src/apps/bin/coreutils/po/et.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/et.po
rename to src/apps/bin/coreutils/po/et.po
diff --git a/src/apps/bin/coreutils-5.0/po/fi.gmo b/src/apps/bin/coreutils/po/fi.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/fi.gmo
rename to src/apps/bin/coreutils/po/fi.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/fi.po b/src/apps/bin/coreutils/po/fi.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/fi.po
rename to src/apps/bin/coreutils/po/fi.po
diff --git a/src/apps/bin/coreutils-5.0/po/fr.gmo b/src/apps/bin/coreutils/po/fr.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/fr.gmo
rename to src/apps/bin/coreutils/po/fr.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/fr.po b/src/apps/bin/coreutils/po/fr.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/fr.po
rename to src/apps/bin/coreutils/po/fr.po
diff --git a/src/apps/bin/coreutils-5.0/po/gl.gmo b/src/apps/bin/coreutils/po/gl.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/gl.gmo
rename to src/apps/bin/coreutils/po/gl.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/gl.po b/src/apps/bin/coreutils/po/gl.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/gl.po
rename to src/apps/bin/coreutils/po/gl.po
diff --git a/src/apps/bin/coreutils-5.0/po/hu.gmo b/src/apps/bin/coreutils/po/hu.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/hu.gmo
rename to src/apps/bin/coreutils/po/hu.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/hu.po b/src/apps/bin/coreutils/po/hu.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/hu.po
rename to src/apps/bin/coreutils/po/hu.po
diff --git a/src/apps/bin/coreutils-5.0/po/insert-header.sin b/src/apps/bin/coreutils/po/insert-header.sin
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/insert-header.sin
rename to src/apps/bin/coreutils/po/insert-header.sin
diff --git a/src/apps/bin/coreutils-5.0/po/it.gmo b/src/apps/bin/coreutils/po/it.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/it.gmo
rename to src/apps/bin/coreutils/po/it.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/it.po b/src/apps/bin/coreutils/po/it.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/it.po
rename to src/apps/bin/coreutils/po/it.po
diff --git a/src/apps/bin/coreutils-5.0/po/ja.gmo b/src/apps/bin/coreutils/po/ja.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ja.gmo
rename to src/apps/bin/coreutils/po/ja.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/ja.po b/src/apps/bin/coreutils/po/ja.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ja.po
rename to src/apps/bin/coreutils/po/ja.po
diff --git a/src/apps/bin/coreutils-5.0/po/ko.gmo b/src/apps/bin/coreutils/po/ko.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ko.gmo
rename to src/apps/bin/coreutils/po/ko.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/ko.po b/src/apps/bin/coreutils/po/ko.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ko.po
rename to src/apps/bin/coreutils/po/ko.po
diff --git a/src/apps/bin/coreutils-5.0/po/lg.gmo b/src/apps/bin/coreutils/po/lg.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/lg.gmo
rename to src/apps/bin/coreutils/po/lg.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/lg.po b/src/apps/bin/coreutils/po/lg.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/lg.po
rename to src/apps/bin/coreutils/po/lg.po
diff --git a/src/apps/bin/coreutils-5.0/po/ms.gmo b/src/apps/bin/coreutils/po/ms.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ms.gmo
rename to src/apps/bin/coreutils/po/ms.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/ms.po b/src/apps/bin/coreutils/po/ms.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ms.po
rename to src/apps/bin/coreutils/po/ms.po
diff --git a/src/apps/bin/coreutils-5.0/po/nb.gmo b/src/apps/bin/coreutils/po/nb.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/nb.gmo
rename to src/apps/bin/coreutils/po/nb.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/nb.po b/src/apps/bin/coreutils/po/nb.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/nb.po
rename to src/apps/bin/coreutils/po/nb.po
diff --git a/src/apps/bin/coreutils-5.0/po/nl.gmo b/src/apps/bin/coreutils/po/nl.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/nl.gmo
rename to src/apps/bin/coreutils/po/nl.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/nl.po b/src/apps/bin/coreutils/po/nl.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/nl.po
rename to src/apps/bin/coreutils/po/nl.po
diff --git a/src/apps/bin/coreutils-5.0/po/no.gmo b/src/apps/bin/coreutils/po/no.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/no.gmo
rename to src/apps/bin/coreutils/po/no.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/no.po b/src/apps/bin/coreutils/po/no.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/no.po
rename to src/apps/bin/coreutils/po/no.po
diff --git a/src/apps/bin/coreutils-5.0/po/pl.gmo b/src/apps/bin/coreutils/po/pl.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/pl.gmo
rename to src/apps/bin/coreutils/po/pl.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/pl.po b/src/apps/bin/coreutils/po/pl.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/pl.po
rename to src/apps/bin/coreutils/po/pl.po
diff --git a/src/apps/bin/coreutils-5.0/po/pt.gmo b/src/apps/bin/coreutils/po/pt.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/pt.gmo
rename to src/apps/bin/coreutils/po/pt.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/pt.po b/src/apps/bin/coreutils/po/pt.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/pt.po
rename to src/apps/bin/coreutils/po/pt.po
diff --git a/src/apps/bin/coreutils-5.0/po/pt_BR.gmo b/src/apps/bin/coreutils/po/pt_BR.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/pt_BR.gmo
rename to src/apps/bin/coreutils/po/pt_BR.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/pt_BR.po b/src/apps/bin/coreutils/po/pt_BR.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/pt_BR.po
rename to src/apps/bin/coreutils/po/pt_BR.po
diff --git a/src/apps/bin/coreutils-5.0/po/quot.sed b/src/apps/bin/coreutils/po/quot.sed
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/quot.sed
rename to src/apps/bin/coreutils/po/quot.sed
diff --git a/src/apps/bin/coreutils-5.0/po/remove-potcdate.sin b/src/apps/bin/coreutils/po/remove-potcdate.sin
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/remove-potcdate.sin
rename to src/apps/bin/coreutils/po/remove-potcdate.sin
diff --git a/src/apps/bin/coreutils-5.0/po/ru.gmo b/src/apps/bin/coreutils/po/ru.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ru.gmo
rename to src/apps/bin/coreutils/po/ru.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/ru.po b/src/apps/bin/coreutils/po/ru.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/ru.po
rename to src/apps/bin/coreutils/po/ru.po
diff --git a/src/apps/bin/coreutils-5.0/po/sk.gmo b/src/apps/bin/coreutils/po/sk.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/sk.gmo
rename to src/apps/bin/coreutils/po/sk.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/sk.po b/src/apps/bin/coreutils/po/sk.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/sk.po
rename to src/apps/bin/coreutils/po/sk.po
diff --git a/src/apps/bin/coreutils-5.0/po/sl.gmo b/src/apps/bin/coreutils/po/sl.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/sl.gmo
rename to src/apps/bin/coreutils/po/sl.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/sl.po b/src/apps/bin/coreutils/po/sl.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/sl.po
rename to src/apps/bin/coreutils/po/sl.po
diff --git a/src/apps/bin/coreutils-5.0/po/sv.gmo b/src/apps/bin/coreutils/po/sv.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/sv.gmo
rename to src/apps/bin/coreutils/po/sv.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/sv.po b/src/apps/bin/coreutils/po/sv.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/sv.po
rename to src/apps/bin/coreutils/po/sv.po
diff --git a/src/apps/bin/coreutils-5.0/po/tr.gmo b/src/apps/bin/coreutils/po/tr.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/tr.gmo
rename to src/apps/bin/coreutils/po/tr.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/tr.po b/src/apps/bin/coreutils/po/tr.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/tr.po
rename to src/apps/bin/coreutils/po/tr.po
diff --git a/src/apps/bin/coreutils-5.0/po/zh_CN.gmo b/src/apps/bin/coreutils/po/zh_CN.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/zh_CN.gmo
rename to src/apps/bin/coreutils/po/zh_CN.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/zh_CN.po b/src/apps/bin/coreutils/po/zh_CN.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/zh_CN.po
rename to src/apps/bin/coreutils/po/zh_CN.po
diff --git a/src/apps/bin/coreutils-5.0/po/zh_TW.gmo b/src/apps/bin/coreutils/po/zh_TW.gmo
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/zh_TW.gmo
rename to src/apps/bin/coreutils/po/zh_TW.gmo
diff --git a/src/apps/bin/coreutils-5.0/po/zh_TW.po b/src/apps/bin/coreutils/po/zh_TW.po
similarity index 100%
rename from src/apps/bin/coreutils-5.0/po/zh_TW.po
rename to src/apps/bin/coreutils/po/zh_TW.po
diff --git a/src/apps/bin/coreutils-5.0/src/Jamfile b/src/apps/bin/coreutils/src/Jamfile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/Jamfile
rename to src/apps/bin/coreutils/src/Jamfile
diff --git a/src/apps/bin/coreutils-5.0/src/Makefile b/src/apps/bin/coreutils/src/Makefile
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/Makefile
rename to src/apps/bin/coreutils/src/Makefile
diff --git a/src/apps/bin/coreutils-5.0/src/Makefile.am b/src/apps/bin/coreutils/src/Makefile.am
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/Makefile.am
rename to src/apps/bin/coreutils/src/Makefile.am
diff --git a/src/apps/bin/coreutils-5.0/src/Makefile.in b/src/apps/bin/coreutils/src/Makefile.in
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/Makefile.in
rename to src/apps/bin/coreutils/src/Makefile.in
diff --git a/src/apps/bin/coreutils-5.0/src/Makefile.mod b/src/apps/bin/coreutils/src/Makefile.mod
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/Makefile.mod
rename to src/apps/bin/coreutils/src/Makefile.mod
diff --git a/src/apps/bin/coreutils-5.0/src/basename.c b/src/apps/bin/coreutils/src/basename.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/basename.c
rename to src/apps/bin/coreutils/src/basename.c
diff --git a/src/apps/bin/coreutils-5.0/src/cat.c b/src/apps/bin/coreutils/src/cat.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/cat.c
rename to src/apps/bin/coreutils/src/cat.c
diff --git a/src/apps/bin/coreutils-5.0/src/checksum.h b/src/apps/bin/coreutils/src/checksum.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/checksum.h
rename to src/apps/bin/coreutils/src/checksum.h
diff --git a/src/apps/bin/coreutils-5.0/src/chgrp.c b/src/apps/bin/coreutils/src/chgrp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/chgrp.c
rename to src/apps/bin/coreutils/src/chgrp.c
diff --git a/src/apps/bin/coreutils-5.0/src/chmod.c b/src/apps/bin/coreutils/src/chmod.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/chmod.c
rename to src/apps/bin/coreutils/src/chmod.c
diff --git a/src/apps/bin/coreutils-5.0/src/chown-core.c b/src/apps/bin/coreutils/src/chown-core.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/chown-core.c
rename to src/apps/bin/coreutils/src/chown-core.c
diff --git a/src/apps/bin/coreutils-5.0/src/chown-core.h b/src/apps/bin/coreutils/src/chown-core.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/chown-core.h
rename to src/apps/bin/coreutils/src/chown-core.h
diff --git a/src/apps/bin/coreutils-5.0/src/chown.c b/src/apps/bin/coreutils/src/chown.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/chown.c
rename to src/apps/bin/coreutils/src/chown.c
diff --git a/src/apps/bin/coreutils-5.0/src/chroot.c b/src/apps/bin/coreutils/src/chroot.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/chroot.c
rename to src/apps/bin/coreutils/src/chroot.c
diff --git a/src/apps/bin/coreutils-5.0/src/cksum.c b/src/apps/bin/coreutils/src/cksum.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/cksum.c
rename to src/apps/bin/coreutils/src/cksum.c
diff --git a/src/apps/bin/coreutils-5.0/src/comm.c b/src/apps/bin/coreutils/src/comm.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/comm.c
rename to src/apps/bin/coreutils/src/comm.c
diff --git a/src/apps/bin/coreutils-5.0/src/copy.c b/src/apps/bin/coreutils/src/copy.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/copy.c
rename to src/apps/bin/coreutils/src/copy.c
diff --git a/src/apps/bin/coreutils-5.0/src/copy.h b/src/apps/bin/coreutils/src/copy.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/copy.h
rename to src/apps/bin/coreutils/src/copy.h
diff --git a/src/apps/bin/coreutils-5.0/src/coreutils.rdef b/src/apps/bin/coreutils/src/coreutils.rdef
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/coreutils.rdef
rename to src/apps/bin/coreutils/src/coreutils.rdef
diff --git a/src/apps/bin/coreutils-5.0/src/cp-hash.c b/src/apps/bin/coreutils/src/cp-hash.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/cp-hash.c
rename to src/apps/bin/coreutils/src/cp-hash.c
diff --git a/src/apps/bin/coreutils-5.0/src/cp-hash.h b/src/apps/bin/coreutils/src/cp-hash.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/cp-hash.h
rename to src/apps/bin/coreutils/src/cp-hash.h
diff --git a/src/apps/bin/coreutils-5.0/src/cp.c b/src/apps/bin/coreutils/src/cp.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/cp.c
rename to src/apps/bin/coreutils/src/cp.c
diff --git a/src/apps/bin/coreutils-5.0/src/csplit.c b/src/apps/bin/coreutils/src/csplit.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/csplit.c
rename to src/apps/bin/coreutils/src/csplit.c
diff --git a/src/apps/bin/coreutils-5.0/src/cut.c b/src/apps/bin/coreutils/src/cut.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/cut.c
rename to src/apps/bin/coreutils/src/cut.c
diff --git a/src/apps/bin/coreutils-5.0/src/date.c b/src/apps/bin/coreutils/src/date.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/date.c
rename to src/apps/bin/coreutils/src/date.c
diff --git a/src/apps/bin/coreutils-5.0/src/dcgen b/src/apps/bin/coreutils/src/dcgen
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/dcgen
rename to src/apps/bin/coreutils/src/dcgen
diff --git a/src/apps/bin/coreutils-5.0/src/dd.c b/src/apps/bin/coreutils/src/dd.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/dd.c
rename to src/apps/bin/coreutils/src/dd.c
diff --git a/src/apps/bin/coreutils-5.0/src/df.c b/src/apps/bin/coreutils/src/df.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/df.c
rename to src/apps/bin/coreutils/src/df.c
diff --git a/src/apps/bin/coreutils-5.0/src/dircolors.c b/src/apps/bin/coreutils/src/dircolors.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/dircolors.c
rename to src/apps/bin/coreutils/src/dircolors.c
diff --git a/src/apps/bin/coreutils-5.0/src/dircolors.h b/src/apps/bin/coreutils/src/dircolors.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/dircolors.h
rename to src/apps/bin/coreutils/src/dircolors.h
diff --git a/src/apps/bin/coreutils-5.0/src/dircolors.hin b/src/apps/bin/coreutils/src/dircolors.hin
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/dircolors.hin
rename to src/apps/bin/coreutils/src/dircolors.hin
diff --git a/src/apps/bin/coreutils-5.0/src/dirname.c b/src/apps/bin/coreutils/src/dirname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/dirname.c
rename to src/apps/bin/coreutils/src/dirname.c
diff --git a/src/apps/bin/coreutils-5.0/src/du.c b/src/apps/bin/coreutils/src/du.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/du.c
rename to src/apps/bin/coreutils/src/du.c
diff --git a/src/apps/bin/coreutils-5.0/src/echo.c b/src/apps/bin/coreutils/src/echo.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/echo.c
rename to src/apps/bin/coreutils/src/echo.c
diff --git a/src/apps/bin/coreutils-5.0/src/env.c b/src/apps/bin/coreutils/src/env.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/env.c
rename to src/apps/bin/coreutils/src/env.c
diff --git a/src/apps/bin/coreutils-5.0/src/expand.c b/src/apps/bin/coreutils/src/expand.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/expand.c
rename to src/apps/bin/coreutils/src/expand.c
diff --git a/src/apps/bin/coreutils-5.0/src/expr.c b/src/apps/bin/coreutils/src/expr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/expr.c
rename to src/apps/bin/coreutils/src/expr.c
diff --git a/src/apps/bin/coreutils-5.0/src/factor.c b/src/apps/bin/coreutils/src/factor.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/factor.c
rename to src/apps/bin/coreutils/src/factor.c
diff --git a/src/apps/bin/coreutils-5.0/src/false.c b/src/apps/bin/coreutils/src/false.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/false.c
rename to src/apps/bin/coreutils/src/false.c
diff --git a/src/apps/bin/coreutils-5.0/src/fmt.c b/src/apps/bin/coreutils/src/fmt.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/fmt.c
rename to src/apps/bin/coreutils/src/fmt.c
diff --git a/src/apps/bin/coreutils-5.0/src/fold.c b/src/apps/bin/coreutils/src/fold.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/fold.c
rename to src/apps/bin/coreutils/src/fold.c
diff --git a/src/apps/bin/coreutils-5.0/src/fs.h b/src/apps/bin/coreutils/src/fs.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/fs.h
rename to src/apps/bin/coreutils/src/fs.h
diff --git a/src/apps/bin/coreutils-5.0/src/groups.sh b/src/apps/bin/coreutils/src/groups.sh
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/groups.sh
rename to src/apps/bin/coreutils/src/groups.sh
diff --git a/src/apps/bin/coreutils-5.0/src/head.c b/src/apps/bin/coreutils/src/head.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/head.c
rename to src/apps/bin/coreutils/src/head.c
diff --git a/src/apps/bin/coreutils-5.0/src/hostid.c b/src/apps/bin/coreutils/src/hostid.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/hostid.c
rename to src/apps/bin/coreutils/src/hostid.c
diff --git a/src/apps/bin/coreutils-5.0/src/hostname.c b/src/apps/bin/coreutils/src/hostname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/hostname.c
rename to src/apps/bin/coreutils/src/hostname.c
diff --git a/src/apps/bin/coreutils-5.0/src/id.c b/src/apps/bin/coreutils/src/id.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/id.c
rename to src/apps/bin/coreutils/src/id.c
diff --git a/src/apps/bin/coreutils-5.0/src/install.c b/src/apps/bin/coreutils/src/install.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/install.c
rename to src/apps/bin/coreutils/src/install.c
diff --git a/src/apps/bin/coreutils-5.0/src/join.c b/src/apps/bin/coreutils/src/join.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/join.c
rename to src/apps/bin/coreutils/src/join.c
diff --git a/src/apps/bin/coreutils-5.0/src/kill.c b/src/apps/bin/coreutils/src/kill.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/kill.c
rename to src/apps/bin/coreutils/src/kill.c
diff --git a/src/apps/bin/coreutils-5.0/src/link.c b/src/apps/bin/coreutils/src/link.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/link.c
rename to src/apps/bin/coreutils/src/link.c
diff --git a/src/apps/bin/coreutils-5.0/src/ln.c b/src/apps/bin/coreutils/src/ln.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/ln.c
rename to src/apps/bin/coreutils/src/ln.c
diff --git a/src/apps/bin/coreutils-5.0/src/logname.c b/src/apps/bin/coreutils/src/logname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/logname.c
rename to src/apps/bin/coreutils/src/logname.c
diff --git a/src/apps/bin/coreutils-5.0/src/ls-dir.c b/src/apps/bin/coreutils/src/ls-dir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/ls-dir.c
rename to src/apps/bin/coreutils/src/ls-dir.c
diff --git a/src/apps/bin/coreutils-5.0/src/ls-ls.c b/src/apps/bin/coreutils/src/ls-ls.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/ls-ls.c
rename to src/apps/bin/coreutils/src/ls-ls.c
diff --git a/src/apps/bin/coreutils-5.0/src/ls-vdir.c b/src/apps/bin/coreutils/src/ls-vdir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/ls-vdir.c
rename to src/apps/bin/coreutils/src/ls-vdir.c
diff --git a/src/apps/bin/coreutils-5.0/src/ls.c b/src/apps/bin/coreutils/src/ls.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/ls.c
rename to src/apps/bin/coreutils/src/ls.c
diff --git a/src/apps/bin/coreutils-5.0/src/ls.h b/src/apps/bin/coreutils/src/ls.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/ls.h
rename to src/apps/bin/coreutils/src/ls.h
diff --git a/src/apps/bin/coreutils-5.0/src/md5.c b/src/apps/bin/coreutils/src/md5.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/md5.c
rename to src/apps/bin/coreutils/src/md5.c
diff --git a/src/apps/bin/coreutils-5.0/src/md5sum.c b/src/apps/bin/coreutils/src/md5sum.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/md5sum.c
rename to src/apps/bin/coreutils/src/md5sum.c
diff --git a/src/apps/bin/coreutils-5.0/src/mkdir.c b/src/apps/bin/coreutils/src/mkdir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/mkdir.c
rename to src/apps/bin/coreutils/src/mkdir.c
diff --git a/src/apps/bin/coreutils-5.0/src/mkfifo.c b/src/apps/bin/coreutils/src/mkfifo.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/mkfifo.c
rename to src/apps/bin/coreutils/src/mkfifo.c
diff --git a/src/apps/bin/coreutils-5.0/src/mknod.c b/src/apps/bin/coreutils/src/mknod.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/mknod.c
rename to src/apps/bin/coreutils/src/mknod.c
diff --git a/src/apps/bin/coreutils-5.0/src/mv.c b/src/apps/bin/coreutils/src/mv.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/mv.c
rename to src/apps/bin/coreutils/src/mv.c
diff --git a/src/apps/bin/coreutils-5.0/src/nice.c b/src/apps/bin/coreutils/src/nice.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/nice.c
rename to src/apps/bin/coreutils/src/nice.c
diff --git a/src/apps/bin/coreutils-5.0/src/nl.c b/src/apps/bin/coreutils/src/nl.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/nl.c
rename to src/apps/bin/coreutils/src/nl.c
diff --git a/src/apps/bin/coreutils-5.0/src/nohup.sh b/src/apps/bin/coreutils/src/nohup.sh
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/nohup.sh
rename to src/apps/bin/coreutils/src/nohup.sh
diff --git a/src/apps/bin/coreutils-5.0/src/od.c b/src/apps/bin/coreutils/src/od.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/od.c
rename to src/apps/bin/coreutils/src/od.c
diff --git a/src/apps/bin/coreutils-5.0/src/paste.c b/src/apps/bin/coreutils/src/paste.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/paste.c
rename to src/apps/bin/coreutils/src/paste.c
diff --git a/src/apps/bin/coreutils-5.0/src/pathchk.c b/src/apps/bin/coreutils/src/pathchk.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/pathchk.c
rename to src/apps/bin/coreutils/src/pathchk.c
diff --git a/src/apps/bin/coreutils-5.0/src/pinky.c b/src/apps/bin/coreutils/src/pinky.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/pinky.c
rename to src/apps/bin/coreutils/src/pinky.c
diff --git a/src/apps/bin/coreutils-5.0/src/pr.c b/src/apps/bin/coreutils/src/pr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/pr.c
rename to src/apps/bin/coreutils/src/pr.c
diff --git a/src/apps/bin/coreutils-5.0/src/printenv.c b/src/apps/bin/coreutils/src/printenv.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/printenv.c
rename to src/apps/bin/coreutils/src/printenv.c
diff --git a/src/apps/bin/coreutils-5.0/src/printf.c b/src/apps/bin/coreutils/src/printf.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/printf.c
rename to src/apps/bin/coreutils/src/printf.c
diff --git a/src/apps/bin/coreutils-5.0/src/ptx.c b/src/apps/bin/coreutils/src/ptx.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/ptx.c
rename to src/apps/bin/coreutils/src/ptx.c
diff --git a/src/apps/bin/coreutils-5.0/src/pwd.c b/src/apps/bin/coreutils/src/pwd.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/pwd.c
rename to src/apps/bin/coreutils/src/pwd.c
diff --git a/src/apps/bin/coreutils-5.0/src/readlink.c b/src/apps/bin/coreutils/src/readlink.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/readlink.c
rename to src/apps/bin/coreutils/src/readlink.c
diff --git a/src/apps/bin/coreutils-5.0/src/remove.c b/src/apps/bin/coreutils/src/remove.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/remove.c
rename to src/apps/bin/coreutils/src/remove.c
diff --git a/src/apps/bin/coreutils-5.0/src/remove.h b/src/apps/bin/coreutils/src/remove.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/remove.h
rename to src/apps/bin/coreutils/src/remove.h
diff --git a/src/apps/bin/coreutils-5.0/src/rm.c b/src/apps/bin/coreutils/src/rm.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/rm.c
rename to src/apps/bin/coreutils/src/rm.c
diff --git a/src/apps/bin/coreutils-5.0/src/rmdir.c b/src/apps/bin/coreutils/src/rmdir.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/rmdir.c
rename to src/apps/bin/coreutils/src/rmdir.c
diff --git a/src/apps/bin/coreutils-5.0/src/seq.c b/src/apps/bin/coreutils/src/seq.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/seq.c
rename to src/apps/bin/coreutils/src/seq.c
diff --git a/src/apps/bin/coreutils-5.0/src/sha1sum.c b/src/apps/bin/coreutils/src/sha1sum.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/sha1sum.c
rename to src/apps/bin/coreutils/src/sha1sum.c
diff --git a/src/apps/bin/coreutils-5.0/src/shred.c b/src/apps/bin/coreutils/src/shred.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/shred.c
rename to src/apps/bin/coreutils/src/shred.c
diff --git a/src/apps/bin/coreutils-5.0/src/sleep.c b/src/apps/bin/coreutils/src/sleep.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/sleep.c
rename to src/apps/bin/coreutils/src/sleep.c
diff --git a/src/apps/bin/coreutils-5.0/src/sort.c b/src/apps/bin/coreutils/src/sort.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/sort.c
rename to src/apps/bin/coreutils/src/sort.c
diff --git a/src/apps/bin/coreutils-5.0/src/split.c b/src/apps/bin/coreutils/src/split.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/split.c
rename to src/apps/bin/coreutils/src/split.c
diff --git a/src/apps/bin/coreutils-5.0/src/stat.c b/src/apps/bin/coreutils/src/stat.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/stat.c
rename to src/apps/bin/coreutils/src/stat.c
diff --git a/src/apps/bin/coreutils-5.0/src/stty.c b/src/apps/bin/coreutils/src/stty.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/stty.c
rename to src/apps/bin/coreutils/src/stty.c
diff --git a/src/apps/bin/coreutils-5.0/src/su.c b/src/apps/bin/coreutils/src/su.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/su.c
rename to src/apps/bin/coreutils/src/su.c
diff --git a/src/apps/bin/coreutils-5.0/src/sum.c b/src/apps/bin/coreutils/src/sum.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/sum.c
rename to src/apps/bin/coreutils/src/sum.c
diff --git a/src/apps/bin/coreutils-5.0/src/sync.c b/src/apps/bin/coreutils/src/sync.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/sync.c
rename to src/apps/bin/coreutils/src/sync.c
diff --git a/src/apps/bin/coreutils-5.0/src/sys2.h b/src/apps/bin/coreutils/src/sys2.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/sys2.h
rename to src/apps/bin/coreutils/src/sys2.h
diff --git a/src/apps/bin/coreutils-5.0/src/system.h b/src/apps/bin/coreutils/src/system.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/system.h
rename to src/apps/bin/coreutils/src/system.h
diff --git a/src/apps/bin/coreutils-5.0/src/tac-pipe.c b/src/apps/bin/coreutils/src/tac-pipe.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/tac-pipe.c
rename to src/apps/bin/coreutils/src/tac-pipe.c
diff --git a/src/apps/bin/coreutils-5.0/src/tac.c b/src/apps/bin/coreutils/src/tac.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/tac.c
rename to src/apps/bin/coreutils/src/tac.c
diff --git a/src/apps/bin/coreutils-5.0/src/tail.c b/src/apps/bin/coreutils/src/tail.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/tail.c
rename to src/apps/bin/coreutils/src/tail.c
diff --git a/src/apps/bin/coreutils-5.0/src/tee.c b/src/apps/bin/coreutils/src/tee.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/tee.c
rename to src/apps/bin/coreutils/src/tee.c
diff --git a/src/apps/bin/coreutils-5.0/src/test.c b/src/apps/bin/coreutils/src/test.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/test.c
rename to src/apps/bin/coreutils/src/test.c
diff --git a/src/apps/bin/coreutils-5.0/src/touch.c b/src/apps/bin/coreutils/src/touch.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/touch.c
rename to src/apps/bin/coreutils/src/touch.c
diff --git a/src/apps/bin/coreutils-5.0/src/tr.c b/src/apps/bin/coreutils/src/tr.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/tr.c
rename to src/apps/bin/coreutils/src/tr.c
diff --git a/src/apps/bin/coreutils-5.0/src/true.c b/src/apps/bin/coreutils/src/true.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/true.c
rename to src/apps/bin/coreutils/src/true.c
diff --git a/src/apps/bin/coreutils-5.0/src/tsort.c b/src/apps/bin/coreutils/src/tsort.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/tsort.c
rename to src/apps/bin/coreutils/src/tsort.c
diff --git a/src/apps/bin/coreutils-5.0/src/tty.c b/src/apps/bin/coreutils/src/tty.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/tty.c
rename to src/apps/bin/coreutils/src/tty.c
diff --git a/src/apps/bin/coreutils-5.0/src/uname.c b/src/apps/bin/coreutils/src/uname.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/uname.c
rename to src/apps/bin/coreutils/src/uname.c
diff --git a/src/apps/bin/coreutils-5.0/src/unexpand.c b/src/apps/bin/coreutils/src/unexpand.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/unexpand.c
rename to src/apps/bin/coreutils/src/unexpand.c
diff --git a/src/apps/bin/coreutils-5.0/src/uniq.c b/src/apps/bin/coreutils/src/uniq.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/uniq.c
rename to src/apps/bin/coreutils/src/uniq.c
diff --git a/src/apps/bin/coreutils-5.0/src/unlink.c b/src/apps/bin/coreutils/src/unlink.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/unlink.c
rename to src/apps/bin/coreutils/src/unlink.c
diff --git a/src/apps/bin/coreutils-5.0/src/uptime.c b/src/apps/bin/coreutils/src/uptime.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/uptime.c
rename to src/apps/bin/coreutils/src/uptime.c
diff --git a/src/apps/bin/coreutils-5.0/src/users.c b/src/apps/bin/coreutils/src/users.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/users.c
rename to src/apps/bin/coreutils/src/users.c
diff --git a/src/apps/bin/coreutils-5.0/src/wc.c b/src/apps/bin/coreutils/src/wc.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/wc.c
rename to src/apps/bin/coreutils/src/wc.c
diff --git a/src/apps/bin/coreutils-5.0/src/wheel-gen.pl b/src/apps/bin/coreutils/src/wheel-gen.pl
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/wheel-gen.pl
rename to src/apps/bin/coreutils/src/wheel-gen.pl
diff --git a/src/apps/bin/coreutils-5.0/src/wheel-size.h b/src/apps/bin/coreutils/src/wheel-size.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/wheel-size.h
rename to src/apps/bin/coreutils/src/wheel-size.h
diff --git a/src/apps/bin/coreutils-5.0/src/wheel.h b/src/apps/bin/coreutils/src/wheel.h
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/wheel.h
rename to src/apps/bin/coreutils/src/wheel.h
diff --git a/src/apps/bin/coreutils-5.0/src/who.c b/src/apps/bin/coreutils/src/who.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/who.c
rename to src/apps/bin/coreutils/src/who.c
diff --git a/src/apps/bin/coreutils-5.0/src/whoami.c b/src/apps/bin/coreutils/src/whoami.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/whoami.c
rename to src/apps/bin/coreutils/src/whoami.c
diff --git a/src/apps/bin/coreutils-5.0/src/yes.c b/src/apps/bin/coreutils/src/yes.c
similarity index 100%
rename from src/apps/bin/coreutils-5.0/src/yes.c
rename to src/apps/bin/coreutils/src/yes.c
diff --git a/src/apps/bin/coreutils-5.0/stamp-h1 b/src/apps/bin/coreutils/stamp-h1
similarity index 100%
rename from src/apps/bin/coreutils-5.0/stamp-h1
rename to src/apps/bin/coreutils/stamp-h1