diff --git a/src/apps/bin/diffutils-2.8.1/ABOUT-NLS b/src/apps/bin/diffutils/ABOUT-NLS
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ABOUT-NLS
rename to src/apps/bin/diffutils/ABOUT-NLS
diff --git a/src/apps/bin/diffutils-2.8.1/AUTHORS b/src/apps/bin/diffutils/AUTHORS
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/AUTHORS
rename to src/apps/bin/diffutils/AUTHORS
diff --git a/src/apps/bin/diffutils-2.8.1/COPYING b/src/apps/bin/diffutils/COPYING
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/COPYING
rename to src/apps/bin/diffutils/COPYING
diff --git a/src/apps/bin/diffutils-2.8.1/ChangeLog b/src/apps/bin/diffutils/ChangeLog
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ChangeLog
rename to src/apps/bin/diffutils/ChangeLog
diff --git a/src/apps/bin/diffutils-2.8.1/INSTALL b/src/apps/bin/diffutils/INSTALL
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/INSTALL
rename to src/apps/bin/diffutils/INSTALL
diff --git a/src/apps/bin/diffutils-2.8.1/INSTALLME b/src/apps/bin/diffutils/INSTALLME
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/INSTALLME
rename to src/apps/bin/diffutils/INSTALLME
diff --git a/src/apps/bin/diffutils-2.8.1/Jamfile b/src/apps/bin/diffutils/Jamfile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/Jamfile
rename to src/apps/bin/diffutils/Jamfile
diff --git a/src/apps/bin/diffutils-2.8.1/Makefile b/src/apps/bin/diffutils/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/Makefile
rename to src/apps/bin/diffutils/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/Makefile.am b/src/apps/bin/diffutils/Makefile.am
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/Makefile.am
rename to src/apps/bin/diffutils/Makefile.am
diff --git a/src/apps/bin/diffutils-2.8.1/Makefile.in b/src/apps/bin/diffutils/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/Makefile.in
rename to src/apps/bin/diffutils/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/NEWS b/src/apps/bin/diffutils/NEWS
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/NEWS
rename to src/apps/bin/diffutils/NEWS
diff --git a/src/apps/bin/diffutils-2.8.1/README b/src/apps/bin/diffutils/README
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/README
rename to src/apps/bin/diffutils/README
diff --git a/src/apps/bin/diffutils-2.8.1/THANKS b/src/apps/bin/diffutils/THANKS
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/THANKS
rename to src/apps/bin/diffutils/THANKS
diff --git a/src/apps/bin/diffutils-2.8.1/aclocal.m4 b/src/apps/bin/diffutils/aclocal.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/aclocal.m4
rename to src/apps/bin/diffutils/aclocal.m4
diff --git a/src/apps/bin/diffutils-2.8.1/config.h b/src/apps/bin/diffutils/config.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config.h
rename to src/apps/bin/diffutils/config.h
diff --git a/src/apps/bin/diffutils-2.8.1/config.hin b/src/apps/bin/diffutils/config.hin
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config.hin
rename to src/apps/bin/diffutils/config.hin
diff --git a/src/apps/bin/diffutils-2.8.1/config.log b/src/apps/bin/diffutils/config.log
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config.log
rename to src/apps/bin/diffutils/config.log
diff --git a/src/apps/bin/diffutils-2.8.1/config.status b/src/apps/bin/diffutils/config.status
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config.status
rename to src/apps/bin/diffutils/config.status
diff --git a/src/apps/bin/diffutils-2.8.1/config/config.guess b/src/apps/bin/diffutils/config/config.guess
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/config.guess
rename to src/apps/bin/diffutils/config/config.guess
diff --git a/src/apps/bin/diffutils-2.8.1/config/config.rpath b/src/apps/bin/diffutils/config/config.rpath
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/config.rpath
rename to src/apps/bin/diffutils/config/config.rpath
diff --git a/src/apps/bin/diffutils-2.8.1/config/config.sub b/src/apps/bin/diffutils/config/config.sub
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/config.sub
rename to src/apps/bin/diffutils/config/config.sub
diff --git a/src/apps/bin/diffutils-2.8.1/config/depcomp b/src/apps/bin/diffutils/config/depcomp
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/depcomp
rename to src/apps/bin/diffutils/config/depcomp
diff --git a/src/apps/bin/diffutils-2.8.1/config/install-sh b/src/apps/bin/diffutils/config/install-sh
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/install-sh
rename to src/apps/bin/diffutils/config/install-sh
diff --git a/src/apps/bin/diffutils-2.8.1/config/mdate-sh b/src/apps/bin/diffutils/config/mdate-sh
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/mdate-sh
rename to src/apps/bin/diffutils/config/mdate-sh
diff --git a/src/apps/bin/diffutils-2.8.1/config/missing b/src/apps/bin/diffutils/config/missing
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/missing
rename to src/apps/bin/diffutils/config/missing
diff --git a/src/apps/bin/diffutils-2.8.1/config/mkinstalldirs b/src/apps/bin/diffutils/config/mkinstalldirs
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/mkinstalldirs
rename to src/apps/bin/diffutils/config/mkinstalldirs
diff --git a/src/apps/bin/diffutils-2.8.1/config/texinfo.tex b/src/apps/bin/diffutils/config/texinfo.tex
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/config/texinfo.tex
rename to src/apps/bin/diffutils/config/texinfo.tex
diff --git a/src/apps/bin/diffutils-2.8.1/configure b/src/apps/bin/diffutils/configure
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/configure
rename to src/apps/bin/diffutils/configure
diff --git a/src/apps/bin/diffutils-2.8.1/configure.ac b/src/apps/bin/diffutils/configure.ac
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/configure.ac
rename to src/apps/bin/diffutils/configure.ac
diff --git a/src/apps/bin/diffutils-2.8.1/doc/Makefile b/src/apps/bin/diffutils/doc/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/Makefile
rename to src/apps/bin/diffutils/doc/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/doc/Makefile.am b/src/apps/bin/diffutils/doc/Makefile.am
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/Makefile.am
rename to src/apps/bin/diffutils/doc/Makefile.am
diff --git a/src/apps/bin/diffutils-2.8.1/doc/Makefile.in b/src/apps/bin/diffutils/doc/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/Makefile.in
rename to src/apps/bin/diffutils/doc/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/doc/diagmeet.note b/src/apps/bin/diffutils/doc/diagmeet.note
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/diagmeet.note
rename to src/apps/bin/diffutils/doc/diagmeet.note
diff --git a/src/apps/bin/diffutils-2.8.1/doc/diff.info b/src/apps/bin/diffutils/doc/diff.info
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/diff.info
rename to src/apps/bin/diffutils/doc/diff.info
diff --git a/src/apps/bin/diffutils-2.8.1/doc/diff.texi b/src/apps/bin/diffutils/doc/diff.texi
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/diff.texi
rename to src/apps/bin/diffutils/doc/diff.texi
diff --git a/src/apps/bin/diffutils-2.8.1/doc/fdl.texi b/src/apps/bin/diffutils/doc/fdl.texi
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/fdl.texi
rename to src/apps/bin/diffutils/doc/fdl.texi
diff --git a/src/apps/bin/diffutils-2.8.1/doc/stamp-vti b/src/apps/bin/diffutils/doc/stamp-vti
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/stamp-vti
rename to src/apps/bin/diffutils/doc/stamp-vti
diff --git a/src/apps/bin/diffutils-2.8.1/doc/version.texi b/src/apps/bin/diffutils/doc/version.texi
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/doc/version.texi
rename to src/apps/bin/diffutils/doc/version.texi
diff --git a/src/apps/bin/diffutils-2.8.1/exgettext b/src/apps/bin/diffutils/exgettext
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/exgettext
rename to src/apps/bin/diffutils/exgettext
diff --git a/src/apps/bin/diffutils-2.8.1/lib/Jamfile b/src/apps/bin/diffutils/lib/Jamfile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/Jamfile
rename to src/apps/bin/diffutils/lib/Jamfile
diff --git a/src/apps/bin/diffutils-2.8.1/lib/Makefile b/src/apps/bin/diffutils/lib/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/Makefile
rename to src/apps/bin/diffutils/lib/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/lib/Makefile.am b/src/apps/bin/diffutils/lib/Makefile.am
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/Makefile.am
rename to src/apps/bin/diffutils/lib/Makefile.am
diff --git a/src/apps/bin/diffutils-2.8.1/lib/Makefile.in b/src/apps/bin/diffutils/lib/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/Makefile.in
rename to src/apps/bin/diffutils/lib/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/lib/alloca.c b/src/apps/bin/diffutils/lib/alloca.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/alloca.c
rename to src/apps/bin/diffutils/lib/alloca.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/basename.c b/src/apps/bin/diffutils/lib/basename.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/basename.c
rename to src/apps/bin/diffutils/lib/basename.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/c-stack.c b/src/apps/bin/diffutils/lib/c-stack.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/c-stack.c
rename to src/apps/bin/diffutils/lib/c-stack.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/c-stack.h b/src/apps/bin/diffutils/lib/c-stack.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/c-stack.h
rename to src/apps/bin/diffutils/lib/c-stack.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/cmpbuf.c b/src/apps/bin/diffutils/lib/cmpbuf.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/cmpbuf.c
rename to src/apps/bin/diffutils/lib/cmpbuf.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/cmpbuf.h b/src/apps/bin/diffutils/lib/cmpbuf.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/cmpbuf.h
rename to src/apps/bin/diffutils/lib/cmpbuf.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/dirname.h b/src/apps/bin/diffutils/lib/dirname.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/dirname.h
rename to src/apps/bin/diffutils/lib/dirname.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/error.c b/src/apps/bin/diffutils/lib/error.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/error.c
rename to src/apps/bin/diffutils/lib/error.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/error.h b/src/apps/bin/diffutils/lib/error.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/error.h
rename to src/apps/bin/diffutils/lib/error.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/exclude.c b/src/apps/bin/diffutils/lib/exclude.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/exclude.c
rename to src/apps/bin/diffutils/lib/exclude.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/exclude.h b/src/apps/bin/diffutils/lib/exclude.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/exclude.h
rename to src/apps/bin/diffutils/lib/exclude.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/exitfail.c b/src/apps/bin/diffutils/lib/exitfail.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/exitfail.c
rename to src/apps/bin/diffutils/lib/exitfail.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/exitfail.h b/src/apps/bin/diffutils/lib/exitfail.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/exitfail.h
rename to src/apps/bin/diffutils/lib/exitfail.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/fnmatch.c b/src/apps/bin/diffutils/lib/fnmatch.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/fnmatch.c
rename to src/apps/bin/diffutils/lib/fnmatch.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/fnmatch.h b/src/apps/bin/diffutils/lib/fnmatch.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/fnmatch.h
rename to src/apps/bin/diffutils/lib/fnmatch.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/fnmatch.hin b/src/apps/bin/diffutils/lib/fnmatch.hin
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/fnmatch.hin
rename to src/apps/bin/diffutils/lib/fnmatch.hin
diff --git a/src/apps/bin/diffutils-2.8.1/lib/freesoft.c b/src/apps/bin/diffutils/lib/freesoft.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/freesoft.c
rename to src/apps/bin/diffutils/lib/freesoft.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/freesoft.h b/src/apps/bin/diffutils/lib/freesoft.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/freesoft.h
rename to src/apps/bin/diffutils/lib/freesoft.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/getopt.c b/src/apps/bin/diffutils/lib/getopt.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/getopt.c
rename to src/apps/bin/diffutils/lib/getopt.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/getopt.h b/src/apps/bin/diffutils/lib/getopt.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/getopt.h
rename to src/apps/bin/diffutils/lib/getopt.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/getopt1.c b/src/apps/bin/diffutils/lib/getopt1.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/getopt1.c
rename to src/apps/bin/diffutils/lib/getopt1.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/gettext.h b/src/apps/bin/diffutils/lib/gettext.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/gettext.h
rename to src/apps/bin/diffutils/lib/gettext.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/hard-locale.c b/src/apps/bin/diffutils/lib/hard-locale.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/hard-locale.c
rename to src/apps/bin/diffutils/lib/hard-locale.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/hard-locale.h b/src/apps/bin/diffutils/lib/hard-locale.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/hard-locale.h
rename to src/apps/bin/diffutils/lib/hard-locale.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/imaxtostr.c b/src/apps/bin/diffutils/lib/imaxtostr.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/imaxtostr.c
rename to src/apps/bin/diffutils/lib/imaxtostr.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/inttostr.c b/src/apps/bin/diffutils/lib/inttostr.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/inttostr.c
rename to src/apps/bin/diffutils/lib/inttostr.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/inttostr.h b/src/apps/bin/diffutils/lib/inttostr.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/inttostr.h
rename to src/apps/bin/diffutils/lib/inttostr.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/malloc.c b/src/apps/bin/diffutils/lib/malloc.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/malloc.c
rename to src/apps/bin/diffutils/lib/malloc.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/memchr.c b/src/apps/bin/diffutils/lib/memchr.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/memchr.c
rename to src/apps/bin/diffutils/lib/memchr.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/mkstemp.c b/src/apps/bin/diffutils/lib/mkstemp.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/mkstemp.c
rename to src/apps/bin/diffutils/lib/mkstemp.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/offtostr.c b/src/apps/bin/diffutils/lib/offtostr.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/offtostr.c
rename to src/apps/bin/diffutils/lib/offtostr.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/posixver.c b/src/apps/bin/diffutils/lib/posixver.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/posixver.c
rename to src/apps/bin/diffutils/lib/posixver.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/posixver.h b/src/apps/bin/diffutils/lib/posixver.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/posixver.h
rename to src/apps/bin/diffutils/lib/posixver.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/prepargs.c b/src/apps/bin/diffutils/lib/prepargs.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/prepargs.c
rename to src/apps/bin/diffutils/lib/prepargs.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/prepargs.h b/src/apps/bin/diffutils/lib/prepargs.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/prepargs.h
rename to src/apps/bin/diffutils/lib/prepargs.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/quotesys.c b/src/apps/bin/diffutils/lib/quotesys.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/quotesys.c
rename to src/apps/bin/diffutils/lib/quotesys.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/quotesys.h b/src/apps/bin/diffutils/lib/quotesys.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/quotesys.h
rename to src/apps/bin/diffutils/lib/quotesys.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/realloc.c b/src/apps/bin/diffutils/lib/realloc.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/realloc.c
rename to src/apps/bin/diffutils/lib/realloc.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/regex.c b/src/apps/bin/diffutils/lib/regex.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/regex.c
rename to src/apps/bin/diffutils/lib/regex.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/regex.h b/src/apps/bin/diffutils/lib/regex.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/regex.h
rename to src/apps/bin/diffutils/lib/regex.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/regex.hin b/src/apps/bin/diffutils/lib/regex.hin
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/regex.hin
rename to src/apps/bin/diffutils/lib/regex.hin
diff --git a/src/apps/bin/diffutils-2.8.1/lib/setmode.c b/src/apps/bin/diffutils/lib/setmode.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/setmode.c
rename to src/apps/bin/diffutils/lib/setmode.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/setmode.h b/src/apps/bin/diffutils/lib/setmode.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/setmode.h
rename to src/apps/bin/diffutils/lib/setmode.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/strcasecmp.c b/src/apps/bin/diffutils/lib/strcasecmp.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/strcasecmp.c
rename to src/apps/bin/diffutils/lib/strcasecmp.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/strftime.c b/src/apps/bin/diffutils/lib/strftime.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/strftime.c
rename to src/apps/bin/diffutils/lib/strftime.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/strtoimax.c b/src/apps/bin/diffutils/lib/strtoimax.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/strtoimax.c
rename to src/apps/bin/diffutils/lib/strtoimax.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/strtol.c b/src/apps/bin/diffutils/lib/strtol.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/strtol.c
rename to src/apps/bin/diffutils/lib/strtol.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/strtoul.c b/src/apps/bin/diffutils/lib/strtoul.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/strtoul.c
rename to src/apps/bin/diffutils/lib/strtoul.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/strtoull.c b/src/apps/bin/diffutils/lib/strtoull.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/strtoull.c
rename to src/apps/bin/diffutils/lib/strtoull.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/strtoumax.c b/src/apps/bin/diffutils/lib/strtoumax.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/strtoumax.c
rename to src/apps/bin/diffutils/lib/strtoumax.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/tempname.c b/src/apps/bin/diffutils/lib/tempname.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/tempname.c
rename to src/apps/bin/diffutils/lib/tempname.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/umaxtostr.c b/src/apps/bin/diffutils/lib/umaxtostr.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/umaxtostr.c
rename to src/apps/bin/diffutils/lib/umaxtostr.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/unlocked-io.h b/src/apps/bin/diffutils/lib/unlocked-io.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/unlocked-io.h
rename to src/apps/bin/diffutils/lib/unlocked-io.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/waitpid.c b/src/apps/bin/diffutils/lib/waitpid.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/waitpid.c
rename to src/apps/bin/diffutils/lib/waitpid.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/xalloc.h b/src/apps/bin/diffutils/lib/xalloc.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/xalloc.h
rename to src/apps/bin/diffutils/lib/xalloc.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/xmalloc.c b/src/apps/bin/diffutils/lib/xmalloc.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/xmalloc.c
rename to src/apps/bin/diffutils/lib/xmalloc.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/xstrtol.c b/src/apps/bin/diffutils/lib/xstrtol.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/xstrtol.c
rename to src/apps/bin/diffutils/lib/xstrtol.c
diff --git a/src/apps/bin/diffutils-2.8.1/lib/xstrtol.h b/src/apps/bin/diffutils/lib/xstrtol.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/xstrtol.h
rename to src/apps/bin/diffutils/lib/xstrtol.h
diff --git a/src/apps/bin/diffutils-2.8.1/lib/xstrtoumax.c b/src/apps/bin/diffutils/lib/xstrtoumax.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/lib/xstrtoumax.c
rename to src/apps/bin/diffutils/lib/xstrtoumax.c
diff --git a/src/apps/bin/diffutils-2.8.1/m4/Makefile b/src/apps/bin/diffutils/m4/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/Makefile
rename to src/apps/bin/diffutils/m4/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/m4/Makefile.am b/src/apps/bin/diffutils/m4/Makefile.am
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/Makefile.am
rename to src/apps/bin/diffutils/m4/Makefile.am
diff --git a/src/apps/bin/diffutils-2.8.1/m4/Makefile.am.in b/src/apps/bin/diffutils/m4/Makefile.am.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/Makefile.am.in
rename to src/apps/bin/diffutils/m4/Makefile.am.in
diff --git a/src/apps/bin/diffutils-2.8.1/m4/Makefile.in b/src/apps/bin/diffutils/m4/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/Makefile.in
rename to src/apps/bin/diffutils/m4/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/m4/README b/src/apps/bin/diffutils/m4/README
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/README
rename to src/apps/bin/diffutils/m4/README
diff --git a/src/apps/bin/diffutils-2.8.1/m4/c-bs-a.m4 b/src/apps/bin/diffutils/m4/c-bs-a.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/c-bs-a.m4
rename to src/apps/bin/diffutils/m4/c-bs-a.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/c-stack.m4 b/src/apps/bin/diffutils/m4/c-stack.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/c-stack.m4
rename to src/apps/bin/diffutils/m4/c-stack.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/check-decl.m4 b/src/apps/bin/diffutils/m4/check-decl.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/check-decl.m4
rename to src/apps/bin/diffutils/m4/check-decl.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/codeset.m4 b/src/apps/bin/diffutils/m4/codeset.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/codeset.m4
rename to src/apps/bin/diffutils/m4/codeset.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/dos.m4 b/src/apps/bin/diffutils/m4/dos.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/dos.m4
rename to src/apps/bin/diffutils/m4/dos.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/error.m4 b/src/apps/bin/diffutils/m4/error.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/error.m4
rename to src/apps/bin/diffutils/m4/error.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/fnmatch.m4 b/src/apps/bin/diffutils/m4/fnmatch.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/fnmatch.m4
rename to src/apps/bin/diffutils/m4/fnmatch.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/gettext.m4 b/src/apps/bin/diffutils/m4/gettext.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/gettext.m4
rename to src/apps/bin/diffutils/m4/gettext.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/glibc21.m4 b/src/apps/bin/diffutils/m4/glibc21.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/glibc21.m4
rename to src/apps/bin/diffutils/m4/glibc21.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/gnu-source.m4 b/src/apps/bin/diffutils/m4/gnu-source.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/gnu-source.m4
rename to src/apps/bin/diffutils/m4/gnu-source.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/iconv.m4 b/src/apps/bin/diffutils/m4/iconv.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/iconv.m4
rename to src/apps/bin/diffutils/m4/iconv.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/inttypes.m4 b/src/apps/bin/diffutils/m4/inttypes.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/inttypes.m4
rename to src/apps/bin/diffutils/m4/inttypes.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/jm-glibc-io.m4 b/src/apps/bin/diffutils/m4/jm-glibc-io.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/jm-glibc-io.m4
rename to src/apps/bin/diffutils/m4/jm-glibc-io.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/lcmessage.m4 b/src/apps/bin/diffutils/m4/lcmessage.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/lcmessage.m4
rename to src/apps/bin/diffutils/m4/lcmessage.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/lib-ld.m4 b/src/apps/bin/diffutils/m4/lib-ld.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/lib-ld.m4
rename to src/apps/bin/diffutils/m4/lib-ld.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/lib-link.m4 b/src/apps/bin/diffutils/m4/lib-link.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/lib-link.m4
rename to src/apps/bin/diffutils/m4/lib-link.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/lib-prefix.m4 b/src/apps/bin/diffutils/m4/lib-prefix.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/lib-prefix.m4
rename to src/apps/bin/diffutils/m4/lib-prefix.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/longlong.m4 b/src/apps/bin/diffutils/m4/longlong.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/longlong.m4
rename to src/apps/bin/diffutils/m4/longlong.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/malloc.m4 b/src/apps/bin/diffutils/m4/malloc.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/malloc.m4
rename to src/apps/bin/diffutils/m4/malloc.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/mbrtowc.m4 b/src/apps/bin/diffutils/m4/mbrtowc.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/mbrtowc.m4
rename to src/apps/bin/diffutils/m4/mbrtowc.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/mbstate_t.m4 b/src/apps/bin/diffutils/m4/mbstate_t.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/mbstate_t.m4
rename to src/apps/bin/diffutils/m4/mbstate_t.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/prereq.m4 b/src/apps/bin/diffutils/m4/prereq.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/prereq.m4
rename to src/apps/bin/diffutils/m4/prereq.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/progtest.m4 b/src/apps/bin/diffutils/m4/progtest.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/progtest.m4
rename to src/apps/bin/diffutils/m4/progtest.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/realloc.m4 b/src/apps/bin/diffutils/m4/realloc.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/realloc.m4
rename to src/apps/bin/diffutils/m4/realloc.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/regex.m4 b/src/apps/bin/diffutils/m4/regex.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/regex.m4
rename to src/apps/bin/diffutils/m4/regex.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/setmode.m4 b/src/apps/bin/diffutils/m4/setmode.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/setmode.m4
rename to src/apps/bin/diffutils/m4/setmode.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/st_mtim.m4 b/src/apps/bin/diffutils/m4/st_mtim.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/st_mtim.m4
rename to src/apps/bin/diffutils/m4/st_mtim.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/stdbool.m4 b/src/apps/bin/diffutils/m4/stdbool.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/stdbool.m4
rename to src/apps/bin/diffutils/m4/stdbool.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/strftime.m4 b/src/apps/bin/diffutils/m4/strftime.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/strftime.m4
rename to src/apps/bin/diffutils/m4/strftime.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/vararrays.m4 b/src/apps/bin/diffutils/m4/vararrays.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/vararrays.m4
rename to src/apps/bin/diffutils/m4/vararrays.m4
diff --git a/src/apps/bin/diffutils-2.8.1/m4/xstrtoumax.m4 b/src/apps/bin/diffutils/m4/xstrtoumax.m4
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/m4/xstrtoumax.m4
rename to src/apps/bin/diffutils/m4/xstrtoumax.m4
diff --git a/src/apps/bin/diffutils-2.8.1/man/Makefile b/src/apps/bin/diffutils/man/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/man/Makefile
rename to src/apps/bin/diffutils/man/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/man/Makefile.am b/src/apps/bin/diffutils/man/Makefile.am
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/man/Makefile.am
rename to src/apps/bin/diffutils/man/Makefile.am
diff --git a/src/apps/bin/diffutils-2.8.1/man/Makefile.in b/src/apps/bin/diffutils/man/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/man/Makefile.in
rename to src/apps/bin/diffutils/man/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/man/cmp.1 b/src/apps/bin/diffutils/man/cmp.1
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/man/cmp.1
rename to src/apps/bin/diffutils/man/cmp.1
diff --git a/src/apps/bin/diffutils-2.8.1/man/diff.1 b/src/apps/bin/diffutils/man/diff.1
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/man/diff.1
rename to src/apps/bin/diffutils/man/diff.1
diff --git a/src/apps/bin/diffutils-2.8.1/man/diff3.1 b/src/apps/bin/diffutils/man/diff3.1
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/man/diff3.1
rename to src/apps/bin/diffutils/man/diff3.1
diff --git a/src/apps/bin/diffutils-2.8.1/man/sdiff.1 b/src/apps/bin/diffutils/man/sdiff.1
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/man/sdiff.1
rename to src/apps/bin/diffutils/man/sdiff.1
diff --git a/src/apps/bin/diffutils-2.8.1/ms/Makefile b/src/apps/bin/diffutils/ms/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ms/Makefile
rename to src/apps/bin/diffutils/ms/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/ms/Makefile.am b/src/apps/bin/diffutils/ms/Makefile.am
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ms/Makefile.am
rename to src/apps/bin/diffutils/ms/Makefile.am
diff --git a/src/apps/bin/diffutils-2.8.1/ms/Makefile.in b/src/apps/bin/diffutils/ms/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ms/Makefile.in
rename to src/apps/bin/diffutils/ms/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/ms/README b/src/apps/bin/diffutils/ms/README
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ms/README
rename to src/apps/bin/diffutils/ms/README
diff --git a/src/apps/bin/diffutils-2.8.1/ms/config.bat b/src/apps/bin/diffutils/ms/config.bat
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ms/config.bat
rename to src/apps/bin/diffutils/ms/config.bat
diff --git a/src/apps/bin/diffutils-2.8.1/ms/config.sed b/src/apps/bin/diffutils/ms/config.sed
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ms/config.sed
rename to src/apps/bin/diffutils/ms/config.sed
diff --git a/src/apps/bin/diffutils-2.8.1/ms/config.site b/src/apps/bin/diffutils/ms/config.site
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/ms/config.site
rename to src/apps/bin/diffutils/ms/config.site
diff --git a/src/apps/bin/diffutils-2.8.1/po/LINGUAS b/src/apps/bin/diffutils/po/LINGUAS
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/LINGUAS
rename to src/apps/bin/diffutils/po/LINGUAS
diff --git a/src/apps/bin/diffutils-2.8.1/po/Makefile b/src/apps/bin/diffutils/po/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/Makefile
rename to src/apps/bin/diffutils/po/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/po/Makefile.in b/src/apps/bin/diffutils/po/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/Makefile.in
rename to src/apps/bin/diffutils/po/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/po/Makefile.in.in b/src/apps/bin/diffutils/po/Makefile.in.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/Makefile.in.in
rename to src/apps/bin/diffutils/po/Makefile.in.in
diff --git a/src/apps/bin/diffutils-2.8.1/po/Makevars b/src/apps/bin/diffutils/po/Makevars
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/Makevars
rename to src/apps/bin/diffutils/po/Makevars
diff --git a/src/apps/bin/diffutils-2.8.1/po/POTFILES b/src/apps/bin/diffutils/po/POTFILES
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/POTFILES
rename to src/apps/bin/diffutils/po/POTFILES
diff --git a/src/apps/bin/diffutils-2.8.1/po/POTFILES.in b/src/apps/bin/diffutils/po/POTFILES.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/POTFILES.in
rename to src/apps/bin/diffutils/po/POTFILES.in
diff --git a/src/apps/bin/diffutils-2.8.1/po/Rules-quot b/src/apps/bin/diffutils/po/Rules-quot
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/Rules-quot
rename to src/apps/bin/diffutils/po/Rules-quot
diff --git a/src/apps/bin/diffutils-2.8.1/po/boldquot.sed b/src/apps/bin/diffutils/po/boldquot.sed
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/boldquot.sed
rename to src/apps/bin/diffutils/po/boldquot.sed
diff --git a/src/apps/bin/diffutils-2.8.1/po/cs.gmo b/src/apps/bin/diffutils/po/cs.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/cs.gmo
rename to src/apps/bin/diffutils/po/cs.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/cs.po b/src/apps/bin/diffutils/po/cs.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/cs.po
rename to src/apps/bin/diffutils/po/cs.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/da.gmo b/src/apps/bin/diffutils/po/da.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/da.gmo
rename to src/apps/bin/diffutils/po/da.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/da.po b/src/apps/bin/diffutils/po/da.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/da.po
rename to src/apps/bin/diffutils/po/da.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/de.gmo b/src/apps/bin/diffutils/po/de.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/de.gmo
rename to src/apps/bin/diffutils/po/de.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/de.po b/src/apps/bin/diffutils/po/de.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/de.po
rename to src/apps/bin/diffutils/po/de.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/diffutils.pot b/src/apps/bin/diffutils/po/diffutils.pot
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/diffutils.pot
rename to src/apps/bin/diffutils/po/diffutils.pot
diff --git a/src/apps/bin/diffutils-2.8.1/po/en@boldquot.header b/src/apps/bin/diffutils/po/en@boldquot.header
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/en@boldquot.header
rename to src/apps/bin/diffutils/po/en@boldquot.header
diff --git a/src/apps/bin/diffutils-2.8.1/po/en@quot.header b/src/apps/bin/diffutils/po/en@quot.header
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/en@quot.header
rename to src/apps/bin/diffutils/po/en@quot.header
diff --git a/src/apps/bin/diffutils-2.8.1/po/en_GB.gmo b/src/apps/bin/diffutils/po/en_GB.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/en_GB.gmo
rename to src/apps/bin/diffutils/po/en_GB.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/en_GB.po b/src/apps/bin/diffutils/po/en_GB.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/en_GB.po
rename to src/apps/bin/diffutils/po/en_GB.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/eo.gmo b/src/apps/bin/diffutils/po/eo.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/eo.gmo
rename to src/apps/bin/diffutils/po/eo.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/eo.po b/src/apps/bin/diffutils/po/eo.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/eo.po
rename to src/apps/bin/diffutils/po/eo.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/es.gmo b/src/apps/bin/diffutils/po/es.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/es.gmo
rename to src/apps/bin/diffutils/po/es.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/es.po b/src/apps/bin/diffutils/po/es.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/es.po
rename to src/apps/bin/diffutils/po/es.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/fr.gmo b/src/apps/bin/diffutils/po/fr.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/fr.gmo
rename to src/apps/bin/diffutils/po/fr.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/fr.po b/src/apps/bin/diffutils/po/fr.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/fr.po
rename to src/apps/bin/diffutils/po/fr.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/gl.gmo b/src/apps/bin/diffutils/po/gl.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/gl.gmo
rename to src/apps/bin/diffutils/po/gl.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/gl.po b/src/apps/bin/diffutils/po/gl.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/gl.po
rename to src/apps/bin/diffutils/po/gl.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/he.gmo b/src/apps/bin/diffutils/po/he.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/he.gmo
rename to src/apps/bin/diffutils/po/he.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/he.po b/src/apps/bin/diffutils/po/he.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/he.po
rename to src/apps/bin/diffutils/po/he.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/id.gmo b/src/apps/bin/diffutils/po/id.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/id.gmo
rename to src/apps/bin/diffutils/po/id.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/id.po b/src/apps/bin/diffutils/po/id.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/id.po
rename to src/apps/bin/diffutils/po/id.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/insert-header.sin b/src/apps/bin/diffutils/po/insert-header.sin
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/insert-header.sin
rename to src/apps/bin/diffutils/po/insert-header.sin
diff --git a/src/apps/bin/diffutils-2.8.1/po/ja.gmo b/src/apps/bin/diffutils/po/ja.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/ja.gmo
rename to src/apps/bin/diffutils/po/ja.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/ja.po b/src/apps/bin/diffutils/po/ja.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/ja.po
rename to src/apps/bin/diffutils/po/ja.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/pl.gmo b/src/apps/bin/diffutils/po/pl.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/pl.gmo
rename to src/apps/bin/diffutils/po/pl.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/pl.po b/src/apps/bin/diffutils/po/pl.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/pl.po
rename to src/apps/bin/diffutils/po/pl.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/quot.sed b/src/apps/bin/diffutils/po/quot.sed
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/quot.sed
rename to src/apps/bin/diffutils/po/quot.sed
diff --git a/src/apps/bin/diffutils-2.8.1/po/remove-potcdate.sin b/src/apps/bin/diffutils/po/remove-potcdate.sin
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/remove-potcdate.sin
rename to src/apps/bin/diffutils/po/remove-potcdate.sin
diff --git a/src/apps/bin/diffutils-2.8.1/po/ru.gmo b/src/apps/bin/diffutils/po/ru.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/ru.gmo
rename to src/apps/bin/diffutils/po/ru.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/ru.po b/src/apps/bin/diffutils/po/ru.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/ru.po
rename to src/apps/bin/diffutils/po/ru.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/sv.gmo b/src/apps/bin/diffutils/po/sv.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/sv.gmo
rename to src/apps/bin/diffutils/po/sv.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/sv.po b/src/apps/bin/diffutils/po/sv.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/sv.po
rename to src/apps/bin/diffutils/po/sv.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/tr.gmo b/src/apps/bin/diffutils/po/tr.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/tr.gmo
rename to src/apps/bin/diffutils/po/tr.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/tr.po b/src/apps/bin/diffutils/po/tr.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/tr.po
rename to src/apps/bin/diffutils/po/tr.po
diff --git a/src/apps/bin/diffutils-2.8.1/po/zh_TW.gmo b/src/apps/bin/diffutils/po/zh_TW.gmo
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/zh_TW.gmo
rename to src/apps/bin/diffutils/po/zh_TW.gmo
diff --git a/src/apps/bin/diffutils-2.8.1/po/zh_TW.po b/src/apps/bin/diffutils/po/zh_TW.po
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/po/zh_TW.po
rename to src/apps/bin/diffutils/po/zh_TW.po
diff --git a/src/apps/bin/diffutils-2.8.1/src/Jamfile b/src/apps/bin/diffutils/src/Jamfile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/Jamfile
rename to src/apps/bin/diffutils/src/Jamfile
diff --git a/src/apps/bin/diffutils-2.8.1/src/Makefile b/src/apps/bin/diffutils/src/Makefile
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/Makefile
rename to src/apps/bin/diffutils/src/Makefile
diff --git a/src/apps/bin/diffutils-2.8.1/src/Makefile.am b/src/apps/bin/diffutils/src/Makefile.am
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/Makefile.am
rename to src/apps/bin/diffutils/src/Makefile.am
diff --git a/src/apps/bin/diffutils-2.8.1/src/Makefile.in b/src/apps/bin/diffutils/src/Makefile.in
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/Makefile.in
rename to src/apps/bin/diffutils/src/Makefile.in
diff --git a/src/apps/bin/diffutils-2.8.1/src/analyze.c b/src/apps/bin/diffutils/src/analyze.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/analyze.c
rename to src/apps/bin/diffutils/src/analyze.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/cmp.c b/src/apps/bin/diffutils/src/cmp.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/cmp.c
rename to src/apps/bin/diffutils/src/cmp.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/context.c b/src/apps/bin/diffutils/src/context.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/context.c
rename to src/apps/bin/diffutils/src/context.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/diff.c b/src/apps/bin/diffutils/src/diff.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/diff.c
rename to src/apps/bin/diffutils/src/diff.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/diff.h b/src/apps/bin/diffutils/src/diff.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/diff.h
rename to src/apps/bin/diffutils/src/diff.h
diff --git a/src/apps/bin/diffutils-2.8.1/src/diff3.c b/src/apps/bin/diffutils/src/diff3.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/diff3.c
rename to src/apps/bin/diffutils/src/diff3.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/diffutils.rdef b/src/apps/bin/diffutils/src/diffutils.rdef
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/diffutils.rdef
rename to src/apps/bin/diffutils/src/diffutils.rdef
diff --git a/src/apps/bin/diffutils-2.8.1/src/dir.c b/src/apps/bin/diffutils/src/dir.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/dir.c
rename to src/apps/bin/diffutils/src/dir.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/ed.c b/src/apps/bin/diffutils/src/ed.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/ed.c
rename to src/apps/bin/diffutils/src/ed.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/ifdef.c b/src/apps/bin/diffutils/src/ifdef.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/ifdef.c
rename to src/apps/bin/diffutils/src/ifdef.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/io.c b/src/apps/bin/diffutils/src/io.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/io.c
rename to src/apps/bin/diffutils/src/io.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/normal.c b/src/apps/bin/diffutils/src/normal.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/normal.c
rename to src/apps/bin/diffutils/src/normal.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/sdiff.c b/src/apps/bin/diffutils/src/sdiff.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/sdiff.c
rename to src/apps/bin/diffutils/src/sdiff.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/side.c b/src/apps/bin/diffutils/src/side.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/side.c
rename to src/apps/bin/diffutils/src/side.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/system.h b/src/apps/bin/diffutils/src/system.h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/system.h
rename to src/apps/bin/diffutils/src/system.h
diff --git a/src/apps/bin/diffutils-2.8.1/src/util.c b/src/apps/bin/diffutils/src/util.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/util.c
rename to src/apps/bin/diffutils/src/util.c
diff --git a/src/apps/bin/diffutils-2.8.1/src/version.c b/src/apps/bin/diffutils/src/version.c
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/src/version.c
rename to src/apps/bin/diffutils/src/version.c
diff --git a/src/apps/bin/diffutils-2.8.1/stamp-h b/src/apps/bin/diffutils/stamp-h
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/stamp-h
rename to src/apps/bin/diffutils/stamp-h
diff --git a/src/apps/bin/diffutils-2.8.1/stamp-h1 b/src/apps/bin/diffutils/stamp-h1
similarity index 100%
rename from src/apps/bin/diffutils-2.8.1/stamp-h1
rename to src/apps/bin/diffutils/stamp-h1