diff --git a/src/apps/bin/Jamfile b/src/apps/bin/Jamfile
index d79ab9d6f6..3ad71b03b5 100644
--- a/src/apps/bin/Jamfile
+++ b/src/apps/bin/Jamfile
@@ -102,16 +102,16 @@ SubInclude OBOS_TOP src apps bin bc ;
 SubInclude OBOS_TOP src apps bin bison ;
 SubInclude OBOS_TOP src apps bin chkbfs ;
 SubInclude OBOS_TOP src apps bin compress ;
-SubInclude OBOS_TOP src apps bin coreutils-5.0 ;
+SubInclude OBOS_TOP src apps bin coreutils ;
 SubInclude OBOS_TOP src apps bin desklink ;
-SubInclude OBOS_TOP src apps bin diffutils-2.8.1 ;
+SubInclude OBOS_TOP src apps bin diffutils ;
 SubInclude OBOS_TOP src apps bin findutils ;
 SubInclude OBOS_TOP src apps bin flex ;
 SubInclude OBOS_TOP src apps bin gawk ;
 #SubInclude OBOS_TOP src apps bin gnu ;
-SubInclude OBOS_TOP src apps bin grep-2.5 ;
+SubInclude OBOS_TOP src apps bin grep ;
 SubInclude OBOS_TOP src apps bin keymap ;
-SubInclude OBOS_TOP src apps bin less-381 ;
+SubInclude OBOS_TOP src apps bin less ;
 SubInclude OBOS_TOP src apps bin listdev ;
 SubInclude OBOS_TOP src apps bin make ;
 SubInclude OBOS_TOP src apps bin makeudfimage ;
@@ -119,8 +119,8 @@ SubInclude OBOS_TOP src apps bin mkdos ;
 SubInclude OBOS_TOP src apps bin patch ;
 SubInclude OBOS_TOP src apps bin pc ;
 #SubInclude OBOS_TOP src apps bin sed ;
-SubInclude OBOS_TOP src apps bin sed-4.0.9 ;
-SubInclude OBOS_TOP src apps bin sharutils-4.2.1 ;
+SubInclude OBOS_TOP src apps bin sed ;
+SubInclude OBOS_TOP src apps bin sharutils ;
 SubInclude OBOS_TOP src apps bin strace ;
 SubInclude OBOS_TOP src apps bin vim ;
 SubInclude OBOS_TOP src apps bin zic ;
diff --git a/src/apps/bin/coreutils/Jamfile b/src/apps/bin/coreutils/Jamfile
index b2035b135f..e51cf59627 100644
--- a/src/apps/bin/coreutils/Jamfile
+++ b/src/apps/bin/coreutils/Jamfile
@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin coreutils-5.0 ;
+SubDir OBOS_TOP src apps bin coreutils ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin coreutils-5.0 lib ;
-SubInclude OBOS_TOP src apps bin coreutils-5.0 src ; 
+SubInclude OBOS_TOP src apps bin coreutils lib ;
+SubInclude OBOS_TOP src apps bin coreutils src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/apps/bin/coreutils/lib/Jamfile b/src/apps/bin/coreutils/lib/Jamfile
index 81b5bdf120..1fc21ba6dd 100644
--- a/src/apps/bin/coreutils/lib/Jamfile
+++ b/src/apps/bin/coreutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin coreutils-5.0 lib ;
+SubDir OBOS_TOP src apps bin coreutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/apps/bin/coreutils/src/Jamfile b/src/apps/bin/coreutils/src/Jamfile
index bf0c53f8e9..c9c9b368e7 100644
--- a/src/apps/bin/coreutils/src/Jamfile
+++ b/src/apps/bin/coreutils/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin coreutils-5.0 src ;
+SubDir OBOS_TOP src apps bin coreutils src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/apps/bin/diffutils/Jamfile b/src/apps/bin/diffutils/Jamfile
index b7ddb0688b..b572ec2c8e 100644
--- a/src/apps/bin/diffutils/Jamfile
+++ b/src/apps/bin/diffutils/Jamfile
@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin diffutils-2.8.1 ;
+SubDir OBOS_TOP src apps bin diffutils ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin diffutils-2.8.1 lib ;
-SubInclude OBOS_TOP src apps bin diffutils-2.8.1 src ; 
+SubInclude OBOS_TOP src apps bin diffutils lib ;
+SubInclude OBOS_TOP src apps bin diffutils src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/apps/bin/diffutils/lib/Jamfile b/src/apps/bin/diffutils/lib/Jamfile
index f01bd83e5a..61f221abcd 100644
--- a/src/apps/bin/diffutils/lib/Jamfile
+++ b/src/apps/bin/diffutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin diffutils-2.8.1 lib ;
+SubDir OBOS_TOP src apps bin diffutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/apps/bin/diffutils/src/Jamfile b/src/apps/bin/diffutils/src/Jamfile
index 2cf6b8f01f..1e5e5d1285 100644
--- a/src/apps/bin/diffutils/src/Jamfile
+++ b/src/apps/bin/diffutils/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin diffutils-2.8.1 src ;
+SubDir OBOS_TOP src apps bin diffutils src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' -DPR_PROGRAM=\'\"/bin/pr\"\' -DDEFAULT_DIFF_PROGRAM=\'\"diff\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/apps/bin/grep/Jamfile b/src/apps/bin/grep/Jamfile
index 7433ae6848..5344242757 100644
--- a/src/apps/bin/grep/Jamfile
+++ b/src/apps/bin/grep/Jamfile
@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin grep-2.5 ;
+SubDir OBOS_TOP src apps bin grep ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin grep-2.5 lib ;
-SubInclude OBOS_TOP src apps bin grep-2.5 src ; 
+SubInclude OBOS_TOP src apps bin grep lib ;
+SubInclude OBOS_TOP src apps bin grep src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/apps/bin/grep/lib/Jamfile b/src/apps/bin/grep/lib/Jamfile
index 3c47672a1d..fe27ed5610 100644
--- a/src/apps/bin/grep/lib/Jamfile
+++ b/src/apps/bin/grep/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin grep-2.5 lib ;
+SubDir OBOS_TOP src apps bin grep lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/apps/bin/grep/src/Jamfile b/src/apps/bin/grep/src/Jamfile
index 8714f42c4e..248c398c44 100644
--- a/src/apps/bin/grep/src/Jamfile
+++ b/src/apps/bin/grep/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin grep-2.5 src ;
+SubDir OBOS_TOP src apps bin grep src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR='\"/boot/beos/share/locale\"' ;
 
diff --git a/src/apps/bin/less-381/COPYING b/src/apps/bin/less/COPYING
similarity index 100%
rename from src/apps/bin/less-381/COPYING
rename to src/apps/bin/less/COPYING
diff --git a/src/apps/bin/less-381/INSTALL b/src/apps/bin/less/INSTALL
similarity index 100%
rename from src/apps/bin/less-381/INSTALL
rename to src/apps/bin/less/INSTALL
diff --git a/src/apps/bin/less-381/Jamfile b/src/apps/bin/less/Jamfile
similarity index 94%
rename from src/apps/bin/less-381/Jamfile
rename to src/apps/bin/less/Jamfile
index 1bb428d577..01d5f71863 100644
--- a/src/apps/bin/less-381/Jamfile
+++ b/src/apps/bin/less/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin less-381 ;
+SubDir OBOS_TOP src apps bin less ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
diff --git a/src/apps/bin/less-381/LICENSE b/src/apps/bin/less/LICENSE
similarity index 100%
rename from src/apps/bin/less-381/LICENSE
rename to src/apps/bin/less/LICENSE
diff --git a/src/apps/bin/less-381/Makefile b/src/apps/bin/less/Makefile
similarity index 100%
rename from src/apps/bin/less-381/Makefile
rename to src/apps/bin/less/Makefile
diff --git a/src/apps/bin/less-381/Makefile.aut b/src/apps/bin/less/Makefile.aut
similarity index 100%
rename from src/apps/bin/less-381/Makefile.aut
rename to src/apps/bin/less/Makefile.aut
diff --git a/src/apps/bin/less-381/Makefile.dsb b/src/apps/bin/less/Makefile.dsb
similarity index 100%
rename from src/apps/bin/less-381/Makefile.dsb
rename to src/apps/bin/less/Makefile.dsb
diff --git a/src/apps/bin/less-381/Makefile.dsg b/src/apps/bin/less/Makefile.dsg
similarity index 100%
rename from src/apps/bin/less-381/Makefile.dsg
rename to src/apps/bin/less/Makefile.dsg
diff --git a/src/apps/bin/less-381/Makefile.dsu b/src/apps/bin/less/Makefile.dsu
similarity index 100%
rename from src/apps/bin/less-381/Makefile.dsu
rename to src/apps/bin/less/Makefile.dsu
diff --git a/src/apps/bin/less-381/Makefile.in b/src/apps/bin/less/Makefile.in
similarity index 100%
rename from src/apps/bin/less-381/Makefile.in
rename to src/apps/bin/less/Makefile.in
diff --git a/src/apps/bin/less-381/Makefile.o2e b/src/apps/bin/less/Makefile.o2e
similarity index 100%
rename from src/apps/bin/less-381/Makefile.o2e
rename to src/apps/bin/less/Makefile.o2e
diff --git a/src/apps/bin/less-381/Makefile.o9c b/src/apps/bin/less/Makefile.o9c
similarity index 100%
rename from src/apps/bin/less-381/Makefile.o9c
rename to src/apps/bin/less/Makefile.o9c
diff --git a/src/apps/bin/less-381/Makefile.o9u b/src/apps/bin/less/Makefile.o9u
similarity index 100%
rename from src/apps/bin/less-381/Makefile.o9u
rename to src/apps/bin/less/Makefile.o9u
diff --git a/src/apps/bin/less-381/Makefile.wnb b/src/apps/bin/less/Makefile.wnb
similarity index 100%
rename from src/apps/bin/less-381/Makefile.wnb
rename to src/apps/bin/less/Makefile.wnb
diff --git a/src/apps/bin/less-381/Makefile.wnm b/src/apps/bin/less/Makefile.wnm
similarity index 100%
rename from src/apps/bin/less-381/Makefile.wnm
rename to src/apps/bin/less/Makefile.wnm
diff --git a/src/apps/bin/less-381/NEWS b/src/apps/bin/less/NEWS
similarity index 100%
rename from src/apps/bin/less-381/NEWS
rename to src/apps/bin/less/NEWS
diff --git a/src/apps/bin/less-381/README b/src/apps/bin/less/README
similarity index 100%
rename from src/apps/bin/less-381/README
rename to src/apps/bin/less/README
diff --git a/src/apps/bin/less-381/brac.c b/src/apps/bin/less/brac.c
similarity index 100%
rename from src/apps/bin/less-381/brac.c
rename to src/apps/bin/less/brac.c
diff --git a/src/apps/bin/less-381/ch.c b/src/apps/bin/less/ch.c
similarity index 100%
rename from src/apps/bin/less-381/ch.c
rename to src/apps/bin/less/ch.c
diff --git a/src/apps/bin/less-381/charset.c b/src/apps/bin/less/charset.c
similarity index 100%
rename from src/apps/bin/less-381/charset.c
rename to src/apps/bin/less/charset.c
diff --git a/src/apps/bin/less-381/cmd.h b/src/apps/bin/less/cmd.h
similarity index 100%
rename from src/apps/bin/less-381/cmd.h
rename to src/apps/bin/less/cmd.h
diff --git a/src/apps/bin/less-381/cmdbuf.c b/src/apps/bin/less/cmdbuf.c
similarity index 100%
rename from src/apps/bin/less-381/cmdbuf.c
rename to src/apps/bin/less/cmdbuf.c
diff --git a/src/apps/bin/less-381/command.c b/src/apps/bin/less/command.c
similarity index 100%
rename from src/apps/bin/less-381/command.c
rename to src/apps/bin/less/command.c
diff --git a/src/apps/bin/less-381/configure b/src/apps/bin/less/configure
similarity index 100%
rename from src/apps/bin/less-381/configure
rename to src/apps/bin/less/configure
diff --git a/src/apps/bin/less-381/configure.ac b/src/apps/bin/less/configure.ac
similarity index 100%
rename from src/apps/bin/less-381/configure.ac
rename to src/apps/bin/less/configure.ac
diff --git a/src/apps/bin/less-381/decode.c b/src/apps/bin/less/decode.c
similarity index 100%
rename from src/apps/bin/less-381/decode.c
rename to src/apps/bin/less/decode.c
diff --git a/src/apps/bin/less-381/defines.ds b/src/apps/bin/less/defines.ds
similarity index 100%
rename from src/apps/bin/less-381/defines.ds
rename to src/apps/bin/less/defines.ds
diff --git a/src/apps/bin/less-381/defines.h b/src/apps/bin/less/defines.h
similarity index 100%
rename from src/apps/bin/less-381/defines.h
rename to src/apps/bin/less/defines.h
diff --git a/src/apps/bin/less-381/defines.h.in b/src/apps/bin/less/defines.h.in
similarity index 100%
rename from src/apps/bin/less-381/defines.h.in
rename to src/apps/bin/less/defines.h.in
diff --git a/src/apps/bin/less-381/defines.o2 b/src/apps/bin/less/defines.o2
similarity index 100%
rename from src/apps/bin/less-381/defines.o2
rename to src/apps/bin/less/defines.o2
diff --git a/src/apps/bin/less-381/defines.o9 b/src/apps/bin/less/defines.o9
similarity index 100%
rename from src/apps/bin/less-381/defines.o9
rename to src/apps/bin/less/defines.o9
diff --git a/src/apps/bin/less-381/defines.wn b/src/apps/bin/less/defines.wn
similarity index 100%
rename from src/apps/bin/less-381/defines.wn
rename to src/apps/bin/less/defines.wn
diff --git a/src/apps/bin/less-381/edit.c b/src/apps/bin/less/edit.c
similarity index 100%
rename from src/apps/bin/less-381/edit.c
rename to src/apps/bin/less/edit.c
diff --git a/src/apps/bin/less-381/filename.c b/src/apps/bin/less/filename.c
similarity index 100%
rename from src/apps/bin/less-381/filename.c
rename to src/apps/bin/less/filename.c
diff --git a/src/apps/bin/less-381/forwback.c b/src/apps/bin/less/forwback.c
similarity index 100%
rename from src/apps/bin/less-381/forwback.c
rename to src/apps/bin/less/forwback.c
diff --git a/src/apps/bin/less-381/funcs.h b/src/apps/bin/less/funcs.h
similarity index 100%
rename from src/apps/bin/less-381/funcs.h
rename to src/apps/bin/less/funcs.h
diff --git a/src/apps/bin/less-381/help.c b/src/apps/bin/less/help.c
similarity index 100%
rename from src/apps/bin/less-381/help.c
rename to src/apps/bin/less/help.c
diff --git a/src/apps/bin/less-381/ifile.c b/src/apps/bin/less/ifile.c
similarity index 100%
rename from src/apps/bin/less-381/ifile.c
rename to src/apps/bin/less/ifile.c
diff --git a/src/apps/bin/less-381/input.c b/src/apps/bin/less/input.c
similarity index 100%
rename from src/apps/bin/less-381/input.c
rename to src/apps/bin/less/input.c
diff --git a/src/apps/bin/less-381/install.sh b/src/apps/bin/less/install.sh
similarity index 100%
rename from src/apps/bin/less-381/install.sh
rename to src/apps/bin/less/install.sh
diff --git a/src/apps/bin/less-381/jump.c b/src/apps/bin/less/jump.c
similarity index 100%
rename from src/apps/bin/less-381/jump.c
rename to src/apps/bin/less/jump.c
diff --git a/src/apps/bin/less-381/less.h b/src/apps/bin/less/less.h
similarity index 100%
rename from src/apps/bin/less-381/less.h
rename to src/apps/bin/less/less.h
diff --git a/src/apps/bin/less-381/less.hlp b/src/apps/bin/less/less.hlp
similarity index 100%
rename from src/apps/bin/less-381/less.hlp
rename to src/apps/bin/less/less.hlp
diff --git a/src/apps/bin/less-381/less.man b/src/apps/bin/less/less.man
similarity index 100%
rename from src/apps/bin/less-381/less.man
rename to src/apps/bin/less/less.man
diff --git a/src/apps/bin/less-381/less.nro b/src/apps/bin/less/less.nro
similarity index 100%
rename from src/apps/bin/less-381/less.nro
rename to src/apps/bin/less/less.nro
diff --git a/src/apps/bin/less-381/less.rdef b/src/apps/bin/less/less.rdef
similarity index 100%
rename from src/apps/bin/less-381/less.rdef
rename to src/apps/bin/less/less.rdef
diff --git a/src/apps/bin/less-381/lessecho.c b/src/apps/bin/less/lessecho.c
similarity index 100%
rename from src/apps/bin/less-381/lessecho.c
rename to src/apps/bin/less/lessecho.c
diff --git a/src/apps/bin/less-381/lesskey.c b/src/apps/bin/less/lesskey.c
similarity index 100%
rename from src/apps/bin/less-381/lesskey.c
rename to src/apps/bin/less/lesskey.c
diff --git a/src/apps/bin/less-381/lesskey.h b/src/apps/bin/less/lesskey.h
similarity index 100%
rename from src/apps/bin/less-381/lesskey.h
rename to src/apps/bin/less/lesskey.h
diff --git a/src/apps/bin/less-381/lesskey.man b/src/apps/bin/less/lesskey.man
similarity index 100%
rename from src/apps/bin/less-381/lesskey.man
rename to src/apps/bin/less/lesskey.man
diff --git a/src/apps/bin/less-381/lesskey.nro b/src/apps/bin/less/lesskey.nro
similarity index 100%
rename from src/apps/bin/less-381/lesskey.nro
rename to src/apps/bin/less/lesskey.nro
diff --git a/src/apps/bin/less-381/lglob.h b/src/apps/bin/less/lglob.h
similarity index 100%
rename from src/apps/bin/less-381/lglob.h
rename to src/apps/bin/less/lglob.h
diff --git a/src/apps/bin/less-381/line.c b/src/apps/bin/less/line.c
similarity index 100%
rename from src/apps/bin/less-381/line.c
rename to src/apps/bin/less/line.c
diff --git a/src/apps/bin/less-381/linenum.c b/src/apps/bin/less/linenum.c
similarity index 100%
rename from src/apps/bin/less-381/linenum.c
rename to src/apps/bin/less/linenum.c
diff --git a/src/apps/bin/less-381/lsystem.c b/src/apps/bin/less/lsystem.c
similarity index 100%
rename from src/apps/bin/less-381/lsystem.c
rename to src/apps/bin/less/lsystem.c
diff --git a/src/apps/bin/less-381/main.c b/src/apps/bin/less/main.c
similarity index 100%
rename from src/apps/bin/less-381/main.c
rename to src/apps/bin/less/main.c
diff --git a/src/apps/bin/less-381/mark.c b/src/apps/bin/less/mark.c
similarity index 100%
rename from src/apps/bin/less-381/mark.c
rename to src/apps/bin/less/mark.c
diff --git a/src/apps/bin/less-381/mkfuncs.awk b/src/apps/bin/less/mkfuncs.awk
similarity index 100%
rename from src/apps/bin/less-381/mkfuncs.awk
rename to src/apps/bin/less/mkfuncs.awk
diff --git a/src/apps/bin/less-381/mkhelp.c b/src/apps/bin/less/mkhelp.c
similarity index 100%
rename from src/apps/bin/less-381/mkhelp.c
rename to src/apps/bin/less/mkhelp.c
diff --git a/src/apps/bin/less-381/mkinstalldirs b/src/apps/bin/less/mkinstalldirs
similarity index 100%
rename from src/apps/bin/less-381/mkinstalldirs
rename to src/apps/bin/less/mkinstalldirs
diff --git a/src/apps/bin/less-381/optfunc.c b/src/apps/bin/less/optfunc.c
similarity index 100%
rename from src/apps/bin/less-381/optfunc.c
rename to src/apps/bin/less/optfunc.c
diff --git a/src/apps/bin/less-381/option.c b/src/apps/bin/less/option.c
similarity index 100%
rename from src/apps/bin/less-381/option.c
rename to src/apps/bin/less/option.c
diff --git a/src/apps/bin/less-381/option.h b/src/apps/bin/less/option.h
similarity index 100%
rename from src/apps/bin/less-381/option.h
rename to src/apps/bin/less/option.h
diff --git a/src/apps/bin/less-381/opttbl.c b/src/apps/bin/less/opttbl.c
similarity index 100%
rename from src/apps/bin/less-381/opttbl.c
rename to src/apps/bin/less/opttbl.c
diff --git a/src/apps/bin/less-381/os.c b/src/apps/bin/less/os.c
similarity index 100%
rename from src/apps/bin/less-381/os.c
rename to src/apps/bin/less/os.c
diff --git a/src/apps/bin/less-381/output.c b/src/apps/bin/less/output.c
similarity index 100%
rename from src/apps/bin/less-381/output.c
rename to src/apps/bin/less/output.c
diff --git a/src/apps/bin/less-381/pckeys.h b/src/apps/bin/less/pckeys.h
similarity index 100%
rename from src/apps/bin/less-381/pckeys.h
rename to src/apps/bin/less/pckeys.h
diff --git a/src/apps/bin/less-381/position.c b/src/apps/bin/less/position.c
similarity index 100%
rename from src/apps/bin/less-381/position.c
rename to src/apps/bin/less/position.c
diff --git a/src/apps/bin/less-381/position.h b/src/apps/bin/less/position.h
similarity index 100%
rename from src/apps/bin/less-381/position.h
rename to src/apps/bin/less/position.h
diff --git a/src/apps/bin/less-381/prompt.c b/src/apps/bin/less/prompt.c
similarity index 100%
rename from src/apps/bin/less-381/prompt.c
rename to src/apps/bin/less/prompt.c
diff --git a/src/apps/bin/less-381/regexp.c b/src/apps/bin/less/regexp.c
similarity index 100%
rename from src/apps/bin/less-381/regexp.c
rename to src/apps/bin/less/regexp.c
diff --git a/src/apps/bin/less-381/regexp.h b/src/apps/bin/less/regexp.h
similarity index 100%
rename from src/apps/bin/less-381/regexp.h
rename to src/apps/bin/less/regexp.h
diff --git a/src/apps/bin/less-381/screen.c b/src/apps/bin/less/screen.c
similarity index 100%
rename from src/apps/bin/less-381/screen.c
rename to src/apps/bin/less/screen.c
diff --git a/src/apps/bin/less-381/scrsize.c b/src/apps/bin/less/scrsize.c
similarity index 100%
rename from src/apps/bin/less-381/scrsize.c
rename to src/apps/bin/less/scrsize.c
diff --git a/src/apps/bin/less-381/search.c b/src/apps/bin/less/search.c
similarity index 100%
rename from src/apps/bin/less-381/search.c
rename to src/apps/bin/less/search.c
diff --git a/src/apps/bin/less-381/signal.c b/src/apps/bin/less/signal.c
similarity index 100%
rename from src/apps/bin/less-381/signal.c
rename to src/apps/bin/less/signal.c
diff --git a/src/apps/bin/less-381/tags.c b/src/apps/bin/less/tags.c
similarity index 100%
rename from src/apps/bin/less-381/tags.c
rename to src/apps/bin/less/tags.c
diff --git a/src/apps/bin/less-381/ttyin.c b/src/apps/bin/less/ttyin.c
similarity index 100%
rename from src/apps/bin/less-381/ttyin.c
rename to src/apps/bin/less/ttyin.c
diff --git a/src/apps/bin/less-381/version.c b/src/apps/bin/less/version.c
similarity index 100%
rename from src/apps/bin/less-381/version.c
rename to src/apps/bin/less/version.c
diff --git a/src/apps/bin/sed/Jamfile b/src/apps/bin/sed/Jamfile
index 4ae9f4883d..30884aa1cf 100644
--- a/src/apps/bin/sed/Jamfile
+++ b/src/apps/bin/sed/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed-4.0.9 ;
+SubDir OBOS_TOP src apps bin sed ;
 
-SubInclude OBOS_TOP src apps bin sed-4.0.9 lib ;
-SubInclude OBOS_TOP src apps bin sed-4.0.9 sed ; 
+SubInclude OBOS_TOP src apps bin sed lib ;
+SubInclude OBOS_TOP src apps bin sed sed ; 
diff --git a/src/apps/bin/sed/lib/Jamfile b/src/apps/bin/sed/lib/Jamfile
index aee3d45662..f5454cb316 100644
--- a/src/apps/bin/sed/lib/Jamfile
+++ b/src/apps/bin/sed/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed-4.0.9 lib ;
+SubDir OBOS_TOP src apps bin sed lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -w ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/apps/bin/sed/sed/Jamfile b/src/apps/bin/sed/sed/Jamfile
index a48262ceb2..f477331220 100644
--- a/src/apps/bin/sed/sed/Jamfile
+++ b/src/apps/bin/sed/sed/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed-4.0.9 sed ;
+SubDir OBOS_TOP src apps bin sed sed ;
 
 SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' -w ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/apps/bin/sharutils/Jamfile b/src/apps/bin/sharutils/Jamfile
index b3976f87a2..267a53f2a1 100644
--- a/src/apps/bin/sharutils/Jamfile
+++ b/src/apps/bin/sharutils/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils-4.2.1 ;
+SubDir OBOS_TOP src apps bin sharutils ;
 
-SubInclude OBOS_TOP src apps bin sharutils-4.2.1 lib ;
-SubInclude OBOS_TOP src apps bin sharutils-4.2.1 src ; 
+SubInclude OBOS_TOP src apps bin sharutils lib ;
+SubInclude OBOS_TOP src apps bin sharutils src ; 
diff --git a/src/apps/bin/sharutils/lib/Jamfile b/src/apps/bin/sharutils/lib/Jamfile
index 25b01935ac..15645e911c 100644
--- a/src/apps/bin/sharutils/lib/Jamfile
+++ b/src/apps/bin/sharutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils-4.2.1 lib ;
+SubDir OBOS_TOP src apps bin sharutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/apps/bin/sharutils/src/Jamfile b/src/apps/bin/sharutils/src/Jamfile
index b36de89af2..975989f235 100644
--- a/src/apps/bin/sharutils/src/Jamfile
+++ b/src/apps/bin/sharutils/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils-4.2.1 src ;
+SubDir OBOS_TOP src apps bin sharutils src ;
 
 SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;