diff --git a/src/apps/bin/sharutils-4.2.1/ABOUT-NLS b/src/apps/bin/sharutils/ABOUT-NLS
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/ABOUT-NLS
rename to src/apps/bin/sharutils/ABOUT-NLS
diff --git a/src/apps/bin/sharutils-4.2.1/AUTHORS b/src/apps/bin/sharutils/AUTHORS
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/AUTHORS
rename to src/apps/bin/sharutils/AUTHORS
diff --git a/src/apps/bin/sharutils-4.2.1/BACKLOG b/src/apps/bin/sharutils/BACKLOG
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/BACKLOG
rename to src/apps/bin/sharutils/BACKLOG
diff --git a/src/apps/bin/sharutils-4.2.1/COPYING b/src/apps/bin/sharutils/COPYING
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/COPYING
rename to src/apps/bin/sharutils/COPYING
diff --git a/src/apps/bin/sharutils-4.2.1/ChangeLog b/src/apps/bin/sharutils/ChangeLog
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/ChangeLog
rename to src/apps/bin/sharutils/ChangeLog
diff --git a/src/apps/bin/sharutils-4.2.1/ChangeLog.OLD b/src/apps/bin/sharutils/ChangeLog.OLD
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/ChangeLog.OLD
rename to src/apps/bin/sharutils/ChangeLog.OLD
diff --git a/src/apps/bin/sharutils-4.2.1/INSTALL b/src/apps/bin/sharutils/INSTALL
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/INSTALL
rename to src/apps/bin/sharutils/INSTALL
diff --git a/src/apps/bin/sharutils-4.2.1/Jamfile b/src/apps/bin/sharutils/Jamfile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/Jamfile
rename to src/apps/bin/sharutils/Jamfile
diff --git a/src/apps/bin/sharutils-4.2.1/Makefile b/src/apps/bin/sharutils/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/Makefile
rename to src/apps/bin/sharutils/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/Makefile.in b/src/apps/bin/sharutils/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/Makefile.in
rename to src/apps/bin/sharutils/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/NEWS b/src/apps/bin/sharutils/NEWS
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/NEWS
rename to src/apps/bin/sharutils/NEWS
diff --git a/src/apps/bin/sharutils-4.2.1/README b/src/apps/bin/sharutils/README
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/README
rename to src/apps/bin/sharutils/README
diff --git a/src/apps/bin/sharutils-4.2.1/README.OLD b/src/apps/bin/sharutils/README.OLD
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/README.OLD
rename to src/apps/bin/sharutils/README.OLD
diff --git a/src/apps/bin/sharutils-4.2.1/THANKS b/src/apps/bin/sharutils/THANKS
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/THANKS
rename to src/apps/bin/sharutils/THANKS
diff --git a/src/apps/bin/sharutils-4.2.1/TODO b/src/apps/bin/sharutils/TODO
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/TODO
rename to src/apps/bin/sharutils/TODO
diff --git a/src/apps/bin/sharutils-4.2.1/acconfig.h b/src/apps/bin/sharutils/acconfig.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/acconfig.h
rename to src/apps/bin/sharutils/acconfig.h
diff --git a/src/apps/bin/sharutils-4.2.1/aclocal.m4 b/src/apps/bin/sharutils/aclocal.m4
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/aclocal.m4
rename to src/apps/bin/sharutils/aclocal.m4
diff --git a/src/apps/bin/sharutils-4.2.1/checks/ChangeLog b/src/apps/bin/sharutils/checks/ChangeLog
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/checks/ChangeLog
rename to src/apps/bin/sharutils/checks/ChangeLog
diff --git a/src/apps/bin/sharutils-4.2.1/checks/Makefile b/src/apps/bin/sharutils/checks/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/checks/Makefile
rename to src/apps/bin/sharutils/checks/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/checks/Makefile.in b/src/apps/bin/sharutils/checks/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/checks/Makefile.in
rename to src/apps/bin/sharutils/checks/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/checks/testdata b/src/apps/bin/sharutils/checks/testdata
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/checks/testdata
rename to src/apps/bin/sharutils/checks/testdata
diff --git a/src/apps/bin/sharutils-4.2.1/config.cache b/src/apps/bin/sharutils/config.cache
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/config.cache
rename to src/apps/bin/sharutils/config.cache
diff --git a/src/apps/bin/sharutils-4.2.1/config.h b/src/apps/bin/sharutils/config.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/config.h
rename to src/apps/bin/sharutils/config.h
diff --git a/src/apps/bin/sharutils-4.2.1/config.h.in b/src/apps/bin/sharutils/config.h.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/config.h.in
rename to src/apps/bin/sharutils/config.h.in
diff --git a/src/apps/bin/sharutils-4.2.1/config.log b/src/apps/bin/sharutils/config.log
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/config.log
rename to src/apps/bin/sharutils/config.log
diff --git a/src/apps/bin/sharutils-4.2.1/config.status b/src/apps/bin/sharutils/config.status
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/config.status
rename to src/apps/bin/sharutils/config.status
diff --git a/src/apps/bin/sharutils-4.2.1/configure b/src/apps/bin/sharutils/configure
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/configure
rename to src/apps/bin/sharutils/configure
diff --git a/src/apps/bin/sharutils-4.2.1/configure.in b/src/apps/bin/sharutils/configure.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/configure.in
rename to src/apps/bin/sharutils/configure.in
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/Makefile b/src/apps/bin/sharutils/contrib/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/Makefile
rename to src/apps/bin/sharutils/contrib/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/Makefile.in b/src/apps/bin/sharutils/contrib/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/Makefile.in
rename to src/apps/bin/sharutils/contrib/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/bas-README b/src/apps/bin/sharutils/contrib/bas-README
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/bas-README
rename to src/apps/bin/sharutils/contrib/bas-README
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/pas-R.Marks b/src/apps/bin/sharutils/contrib/pas-R.Marks
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/pas-R.Marks
rename to src/apps/bin/sharutils/contrib/pas-R.Marks
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/pas-README b/src/apps/bin/sharutils/contrib/pas-README
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/pas-README
rename to src/apps/bin/sharutils/contrib/pas-README
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/pas-diffs b/src/apps/bin/sharutils/contrib/pas-diffs
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/pas-diffs
rename to src/apps/bin/sharutils/contrib/pas-diffs
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/shar.sh b/src/apps/bin/sharutils/contrib/shar.sh
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/shar.sh
rename to src/apps/bin/sharutils/contrib/shar.sh
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/shar2.sh b/src/apps/bin/sharutils/contrib/shar2.sh
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/shar2.sh
rename to src/apps/bin/sharutils/contrib/shar2.sh
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/uudecode.bas b/src/apps/bin/sharutils/contrib/uudecode.bas
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/uudecode.bas
rename to src/apps/bin/sharutils/contrib/uudecode.bas
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/uudecode.pas b/src/apps/bin/sharutils/contrib/uudecode.pas
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/uudecode.pas
rename to src/apps/bin/sharutils/contrib/uudecode.pas
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/uudecode.pl b/src/apps/bin/sharutils/contrib/uudecode.pl
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/uudecode.pl
rename to src/apps/bin/sharutils/contrib/uudecode.pl
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/uuencode.pas b/src/apps/bin/sharutils/contrib/uuencode.pas
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/uuencode.pas
rename to src/apps/bin/sharutils/contrib/uuencode.pas
diff --git a/src/apps/bin/sharutils-4.2.1/contrib/uuencode.pl b/src/apps/bin/sharutils/contrib/uuencode.pl
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/contrib/uuencode.pl
rename to src/apps/bin/sharutils/contrib/uuencode.pl
diff --git a/src/apps/bin/sharutils-4.2.1/doc/ChangeLog b/src/apps/bin/sharutils/doc/ChangeLog
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/ChangeLog
rename to src/apps/bin/sharutils/doc/ChangeLog
diff --git a/src/apps/bin/sharutils-4.2.1/doc/Makefile b/src/apps/bin/sharutils/doc/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/Makefile
rename to src/apps/bin/sharutils/doc/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/doc/Makefile.in b/src/apps/bin/sharutils/doc/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/Makefile.in
rename to src/apps/bin/sharutils/doc/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/doc/mdate-sh b/src/apps/bin/sharutils/doc/mdate-sh
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/mdate-sh
rename to src/apps/bin/sharutils/doc/mdate-sh
diff --git a/src/apps/bin/sharutils-4.2.1/doc/remsync.info b/src/apps/bin/sharutils/doc/remsync.info
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/remsync.info
rename to src/apps/bin/sharutils/doc/remsync.info
diff --git a/src/apps/bin/sharutils-4.2.1/doc/remsync.texi b/src/apps/bin/sharutils/doc/remsync.texi
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/remsync.texi
rename to src/apps/bin/sharutils/doc/remsync.texi
diff --git a/src/apps/bin/sharutils-4.2.1/doc/shar.1 b/src/apps/bin/sharutils/doc/shar.1
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/shar.1
rename to src/apps/bin/sharutils/doc/shar.1
diff --git a/src/apps/bin/sharutils-4.2.1/doc/sharutils.info b/src/apps/bin/sharutils/doc/sharutils.info
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/sharutils.info
rename to src/apps/bin/sharutils/doc/sharutils.info
diff --git a/src/apps/bin/sharutils-4.2.1/doc/sharutils.texi b/src/apps/bin/sharutils/doc/sharutils.texi
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/sharutils.texi
rename to src/apps/bin/sharutils/doc/sharutils.texi
diff --git a/src/apps/bin/sharutils-4.2.1/doc/stamp-vti b/src/apps/bin/sharutils/doc/stamp-vti
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/stamp-vti
rename to src/apps/bin/sharutils/doc/stamp-vti
diff --git a/src/apps/bin/sharutils-4.2.1/doc/texinfo.tex b/src/apps/bin/sharutils/doc/texinfo.tex
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/texinfo.tex
rename to src/apps/bin/sharutils/doc/texinfo.tex
diff --git a/src/apps/bin/sharutils-4.2.1/doc/unshar.1 b/src/apps/bin/sharutils/doc/unshar.1
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/unshar.1
rename to src/apps/bin/sharutils/doc/unshar.1
diff --git a/src/apps/bin/sharutils-4.2.1/doc/uuencode.1 b/src/apps/bin/sharutils/doc/uuencode.1
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/uuencode.1
rename to src/apps/bin/sharutils/doc/uuencode.1
diff --git a/src/apps/bin/sharutils-4.2.1/doc/uuencode.5 b/src/apps/bin/sharutils/doc/uuencode.5
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/uuencode.5
rename to src/apps/bin/sharutils/doc/uuencode.5
diff --git a/src/apps/bin/sharutils-4.2.1/doc/version.texi b/src/apps/bin/sharutils/doc/version.texi
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/doc/version.texi
rename to src/apps/bin/sharutils/doc/version.texi
diff --git a/src/apps/bin/sharutils-4.2.1/install-sh b/src/apps/bin/sharutils/install-sh
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/install-sh
rename to src/apps/bin/sharutils/install-sh
diff --git a/src/apps/bin/sharutils-4.2.1/intl/ChangeLog b/src/apps/bin/sharutils/intl/ChangeLog
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/ChangeLog
rename to src/apps/bin/sharutils/intl/ChangeLog
diff --git a/src/apps/bin/sharutils-4.2.1/intl/Makefile b/src/apps/bin/sharutils/intl/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/Makefile
rename to src/apps/bin/sharutils/intl/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/intl/Makefile.in b/src/apps/bin/sharutils/intl/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/Makefile.in
rename to src/apps/bin/sharutils/intl/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/intl/VERSION b/src/apps/bin/sharutils/intl/VERSION
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/VERSION
rename to src/apps/bin/sharutils/intl/VERSION
diff --git a/src/apps/bin/sharutils-4.2.1/intl/bindtextdom.c b/src/apps/bin/sharutils/intl/bindtextdom.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/bindtextdom.c
rename to src/apps/bin/sharutils/intl/bindtextdom.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/cat-compat.c b/src/apps/bin/sharutils/intl/cat-compat.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/cat-compat.c
rename to src/apps/bin/sharutils/intl/cat-compat.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/dcgettext.c b/src/apps/bin/sharutils/intl/dcgettext.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/dcgettext.c
rename to src/apps/bin/sharutils/intl/dcgettext.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/dgettext.c b/src/apps/bin/sharutils/intl/dgettext.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/dgettext.c
rename to src/apps/bin/sharutils/intl/dgettext.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/finddomain.c b/src/apps/bin/sharutils/intl/finddomain.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/finddomain.c
rename to src/apps/bin/sharutils/intl/finddomain.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/gettext.c b/src/apps/bin/sharutils/intl/gettext.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/gettext.c
rename to src/apps/bin/sharutils/intl/gettext.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/gettext.h b/src/apps/bin/sharutils/intl/gettext.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/gettext.h
rename to src/apps/bin/sharutils/intl/gettext.h
diff --git a/src/apps/bin/sharutils-4.2.1/intl/gettextP.h b/src/apps/bin/sharutils/intl/gettextP.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/gettextP.h
rename to src/apps/bin/sharutils/intl/gettextP.h
diff --git a/src/apps/bin/sharutils-4.2.1/intl/hash-string.h b/src/apps/bin/sharutils/intl/hash-string.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/hash-string.h
rename to src/apps/bin/sharutils/intl/hash-string.h
diff --git a/src/apps/bin/sharutils-4.2.1/intl/intl-compat.c b/src/apps/bin/sharutils/intl/intl-compat.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/intl-compat.c
rename to src/apps/bin/sharutils/intl/intl-compat.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/libgettext.h b/src/apps/bin/sharutils/intl/libgettext.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/libgettext.h
rename to src/apps/bin/sharutils/intl/libgettext.h
diff --git a/src/apps/bin/sharutils-4.2.1/intl/libintl.h b/src/apps/bin/sharutils/intl/libintl.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/libintl.h
rename to src/apps/bin/sharutils/intl/libintl.h
diff --git a/src/apps/bin/sharutils-4.2.1/intl/linux-msg.sed b/src/apps/bin/sharutils/intl/linux-msg.sed
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/linux-msg.sed
rename to src/apps/bin/sharutils/intl/linux-msg.sed
diff --git a/src/apps/bin/sharutils-4.2.1/intl/loadmsgcat.c b/src/apps/bin/sharutils/intl/loadmsgcat.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/loadmsgcat.c
rename to src/apps/bin/sharutils/intl/loadmsgcat.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/localealias.c b/src/apps/bin/sharutils/intl/localealias.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/localealias.c
rename to src/apps/bin/sharutils/intl/localealias.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/po2tbl.sed b/src/apps/bin/sharutils/intl/po2tbl.sed
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/po2tbl.sed
rename to src/apps/bin/sharutils/intl/po2tbl.sed
diff --git a/src/apps/bin/sharutils-4.2.1/intl/po2tbl.sed.in b/src/apps/bin/sharutils/intl/po2tbl.sed.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/po2tbl.sed.in
rename to src/apps/bin/sharutils/intl/po2tbl.sed.in
diff --git a/src/apps/bin/sharutils-4.2.1/intl/textdomain.c b/src/apps/bin/sharutils/intl/textdomain.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/textdomain.c
rename to src/apps/bin/sharutils/intl/textdomain.c
diff --git a/src/apps/bin/sharutils-4.2.1/intl/xopen-msg.sed b/src/apps/bin/sharutils/intl/xopen-msg.sed
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/intl/xopen-msg.sed
rename to src/apps/bin/sharutils/intl/xopen-msg.sed
diff --git a/src/apps/bin/sharutils-4.2.1/lib/ChangeLog b/src/apps/bin/sharutils/lib/ChangeLog
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/ChangeLog
rename to src/apps/bin/sharutils/lib/ChangeLog
diff --git a/src/apps/bin/sharutils-4.2.1/lib/Jamfile b/src/apps/bin/sharutils/lib/Jamfile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/Jamfile
rename to src/apps/bin/sharutils/lib/Jamfile
diff --git a/src/apps/bin/sharutils-4.2.1/lib/Makefile b/src/apps/bin/sharutils/lib/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/Makefile
rename to src/apps/bin/sharutils/lib/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/lib/Makefile.in b/src/apps/bin/sharutils/lib/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/Makefile.in
rename to src/apps/bin/sharutils/lib/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/lib/alloca.c b/src/apps/bin/sharutils/lib/alloca.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/alloca.c
rename to src/apps/bin/sharutils/lib/alloca.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/basename.c b/src/apps/bin/sharutils/lib/basename.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/basename.c
rename to src/apps/bin/sharutils/lib/basename.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/error.c b/src/apps/bin/sharutils/lib/error.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/error.c
rename to src/apps/bin/sharutils/lib/error.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/getopt.c b/src/apps/bin/sharutils/lib/getopt.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/getopt.c
rename to src/apps/bin/sharutils/lib/getopt.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/getopt.h b/src/apps/bin/sharutils/lib/getopt.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/getopt.h
rename to src/apps/bin/sharutils/lib/getopt.h
diff --git a/src/apps/bin/sharutils-4.2.1/lib/getopt1.c b/src/apps/bin/sharutils/lib/getopt1.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/getopt1.c
rename to src/apps/bin/sharutils/lib/getopt1.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/md5.c b/src/apps/bin/sharutils/lib/md5.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/md5.c
rename to src/apps/bin/sharutils/lib/md5.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/md5.h b/src/apps/bin/sharutils/lib/md5.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/md5.h
rename to src/apps/bin/sharutils/lib/md5.h
diff --git a/src/apps/bin/sharutils-4.2.1/lib/memset.c b/src/apps/bin/sharutils/lib/memset.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/memset.c
rename to src/apps/bin/sharutils/lib/memset.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/mktime.c b/src/apps/bin/sharutils/lib/mktime.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/mktime.c
rename to src/apps/bin/sharutils/lib/mktime.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/pathmax.h b/src/apps/bin/sharutils/lib/pathmax.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/pathmax.h
rename to src/apps/bin/sharutils/lib/pathmax.h
diff --git a/src/apps/bin/sharutils-4.2.1/lib/stpcpy.c b/src/apps/bin/sharutils/lib/stpcpy.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/stpcpy.c
rename to src/apps/bin/sharutils/lib/stpcpy.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/strftime.c b/src/apps/bin/sharutils/lib/strftime.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/strftime.c
rename to src/apps/bin/sharutils/lib/strftime.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/system.h b/src/apps/bin/sharutils/lib/system.h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/system.h
rename to src/apps/bin/sharutils/lib/system.h
diff --git a/src/apps/bin/sharutils-4.2.1/lib/whoami.c b/src/apps/bin/sharutils/lib/whoami.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/whoami.c
rename to src/apps/bin/sharutils/lib/whoami.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/xgetcwd.c b/src/apps/bin/sharutils/lib/xgetcwd.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/xgetcwd.c
rename to src/apps/bin/sharutils/lib/xgetcwd.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/xmalloc.c b/src/apps/bin/sharutils/lib/xmalloc.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/xmalloc.c
rename to src/apps/bin/sharutils/lib/xmalloc.c
diff --git a/src/apps/bin/sharutils-4.2.1/lib/xstrdup.c b/src/apps/bin/sharutils/lib/xstrdup.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/lib/xstrdup.c
rename to src/apps/bin/sharutils/lib/xstrdup.c
diff --git a/src/apps/bin/sharutils-4.2.1/mkinstalldirs b/src/apps/bin/sharutils/mkinstalldirs
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/mkinstalldirs
rename to src/apps/bin/sharutils/mkinstalldirs
diff --git a/src/apps/bin/sharutils-4.2.1/po/ChangeLog b/src/apps/bin/sharutils/po/ChangeLog
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/ChangeLog
rename to src/apps/bin/sharutils/po/ChangeLog
diff --git a/src/apps/bin/sharutils-4.2.1/po/Makefile b/src/apps/bin/sharutils/po/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/Makefile
rename to src/apps/bin/sharutils/po/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/po/Makefile.in b/src/apps/bin/sharutils/po/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/Makefile.in
rename to src/apps/bin/sharutils/po/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/po/Makefile.in.in b/src/apps/bin/sharutils/po/Makefile.in.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/Makefile.in.in
rename to src/apps/bin/sharutils/po/Makefile.in.in
diff --git a/src/apps/bin/sharutils-4.2.1/po/POTFILES b/src/apps/bin/sharutils/po/POTFILES
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/POTFILES
rename to src/apps/bin/sharutils/po/POTFILES
diff --git a/src/apps/bin/sharutils-4.2.1/po/POTFILES.in b/src/apps/bin/sharutils/po/POTFILES.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/POTFILES.in
rename to src/apps/bin/sharutils/po/POTFILES.in
diff --git a/src/apps/bin/sharutils-4.2.1/po/cat-id-tbl.c b/src/apps/bin/sharutils/po/cat-id-tbl.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/cat-id-tbl.c
rename to src/apps/bin/sharutils/po/cat-id-tbl.c
diff --git a/src/apps/bin/sharutils-4.2.1/po/de.gmo b/src/apps/bin/sharutils/po/de.gmo
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/de.gmo
rename to src/apps/bin/sharutils/po/de.gmo
diff --git a/src/apps/bin/sharutils-4.2.1/po/de.po b/src/apps/bin/sharutils/po/de.po
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/de.po
rename to src/apps/bin/sharutils/po/de.po
diff --git a/src/apps/bin/sharutils-4.2.1/po/fr.gmo b/src/apps/bin/sharutils/po/fr.gmo
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/fr.gmo
rename to src/apps/bin/sharutils/po/fr.gmo
diff --git a/src/apps/bin/sharutils-4.2.1/po/fr.po b/src/apps/bin/sharutils/po/fr.po
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/fr.po
rename to src/apps/bin/sharutils/po/fr.po
diff --git a/src/apps/bin/sharutils-4.2.1/po/ja_JP.EUC.gmo b/src/apps/bin/sharutils/po/ja_JP.EUC.gmo
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/ja_JP.EUC.gmo
rename to src/apps/bin/sharutils/po/ja_JP.EUC.gmo
diff --git a/src/apps/bin/sharutils-4.2.1/po/ja_JP.EUC.po b/src/apps/bin/sharutils/po/ja_JP.EUC.po
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/ja_JP.EUC.po
rename to src/apps/bin/sharutils/po/ja_JP.EUC.po
diff --git a/src/apps/bin/sharutils-4.2.1/po/nl.gmo b/src/apps/bin/sharutils/po/nl.gmo
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/nl.gmo
rename to src/apps/bin/sharutils/po/nl.gmo
diff --git a/src/apps/bin/sharutils-4.2.1/po/nl.po b/src/apps/bin/sharutils/po/nl.po
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/nl.po
rename to src/apps/bin/sharutils/po/nl.po
diff --git a/src/apps/bin/sharutils-4.2.1/po/pt.gmo b/src/apps/bin/sharutils/po/pt.gmo
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/pt.gmo
rename to src/apps/bin/sharutils/po/pt.gmo
diff --git a/src/apps/bin/sharutils-4.2.1/po/pt.po b/src/apps/bin/sharutils/po/pt.po
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/pt.po
rename to src/apps/bin/sharutils/po/pt.po
diff --git a/src/apps/bin/sharutils-4.2.1/po/sharutils.pot b/src/apps/bin/sharutils/po/sharutils.pot
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/sharutils.pot
rename to src/apps/bin/sharutils/po/sharutils.pot
diff --git a/src/apps/bin/sharutils-4.2.1/po/stamp-cat-id b/src/apps/bin/sharutils/po/stamp-cat-id
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/stamp-cat-id
rename to src/apps/bin/sharutils/po/stamp-cat-id
diff --git a/src/apps/bin/sharutils-4.2.1/po/sv.gmo b/src/apps/bin/sharutils/po/sv.gmo
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/sv.gmo
rename to src/apps/bin/sharutils/po/sv.gmo
diff --git a/src/apps/bin/sharutils-4.2.1/po/sv.po b/src/apps/bin/sharutils/po/sv.po
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/po/sv.po
rename to src/apps/bin/sharutils/po/sv.po
diff --git a/src/apps/bin/sharutils-4.2.1/src/ChangeLog b/src/apps/bin/sharutils/src/ChangeLog
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/ChangeLog
rename to src/apps/bin/sharutils/src/ChangeLog
diff --git a/src/apps/bin/sharutils-4.2.1/src/Jamfile b/src/apps/bin/sharutils/src/Jamfile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/Jamfile
rename to src/apps/bin/sharutils/src/Jamfile
diff --git a/src/apps/bin/sharutils-4.2.1/src/Makefile b/src/apps/bin/sharutils/src/Makefile
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/Makefile
rename to src/apps/bin/sharutils/src/Makefile
diff --git a/src/apps/bin/sharutils-4.2.1/src/Makefile.in b/src/apps/bin/sharutils/src/Makefile.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/Makefile.in
rename to src/apps/bin/sharutils/src/Makefile.in
diff --git a/src/apps/bin/sharutils-4.2.1/src/encode.c b/src/apps/bin/sharutils/src/encode.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/encode.c
rename to src/apps/bin/sharutils/src/encode.c
diff --git a/src/apps/bin/sharutils-4.2.1/src/mail-files b/src/apps/bin/sharutils/src/mail-files
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/mail-files
rename to src/apps/bin/sharutils/src/mail-files
diff --git a/src/apps/bin/sharutils-4.2.1/src/mail-files.in b/src/apps/bin/sharutils/src/mail-files.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/mail-files.in
rename to src/apps/bin/sharutils/src/mail-files.in
diff --git a/src/apps/bin/sharutils-4.2.1/src/mailshar b/src/apps/bin/sharutils/src/mailshar
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/mailshar
rename to src/apps/bin/sharutils/src/mailshar
diff --git a/src/apps/bin/sharutils-4.2.1/src/mailshar.in b/src/apps/bin/sharutils/src/mailshar.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/mailshar.in
rename to src/apps/bin/sharutils/src/mailshar.in
diff --git a/src/apps/bin/sharutils-4.2.1/src/remsync b/src/apps/bin/sharutils/src/remsync
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/remsync
rename to src/apps/bin/sharutils/src/remsync
diff --git a/src/apps/bin/sharutils-4.2.1/src/remsync.in b/src/apps/bin/sharutils/src/remsync.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/remsync.in
rename to src/apps/bin/sharutils/src/remsync.in
diff --git a/src/apps/bin/sharutils-4.2.1/src/shar.c b/src/apps/bin/sharutils/src/shar.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/shar.c
rename to src/apps/bin/sharutils/src/shar.c
diff --git a/src/apps/bin/sharutils-4.2.1/src/sharutils.rdef b/src/apps/bin/sharutils/src/sharutils.rdef
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/sharutils.rdef
rename to src/apps/bin/sharutils/src/sharutils.rdef
diff --git a/src/apps/bin/sharutils-4.2.1/src/unshar.c b/src/apps/bin/sharutils/src/unshar.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/unshar.c
rename to src/apps/bin/sharutils/src/unshar.c
diff --git a/src/apps/bin/sharutils-4.2.1/src/uudecode.c b/src/apps/bin/sharutils/src/uudecode.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/uudecode.c
rename to src/apps/bin/sharutils/src/uudecode.c
diff --git a/src/apps/bin/sharutils-4.2.1/src/uuencode.c b/src/apps/bin/sharutils/src/uuencode.c
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/src/uuencode.c
rename to src/apps/bin/sharutils/src/uuencode.c
diff --git a/src/apps/bin/sharutils-4.2.1/stamp-h b/src/apps/bin/sharutils/stamp-h
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/stamp-h
rename to src/apps/bin/sharutils/stamp-h
diff --git a/src/apps/bin/sharutils-4.2.1/stamp-h.in b/src/apps/bin/sharutils/stamp-h.in
similarity index 100%
rename from src/apps/bin/sharutils-4.2.1/stamp-h.in
rename to src/apps/bin/sharutils/stamp-h.in