diff --git a/src/Jamfile b/src/Jamfile
index 785e7119e2..a19ad5b2de 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -1,9 +1,10 @@
 SubDir OBOS_TOP src ;
 
-SubInclude OBOS_TOP src kernel ;
 SubInclude OBOS_TOP src add-ons ;
 SubInclude OBOS_TOP src apps ;
+SubInclude OBOS_TOP src bin ;
 SubInclude OBOS_TOP src data ;
+SubInclude OBOS_TOP src kernel ;
 SubInclude OBOS_TOP src kits ;
 SubInclude OBOS_TOP src libs ;
 SubInclude OBOS_TOP src prefs ;
diff --git a/src/apps/Jamfile b/src/apps/Jamfile
index 5dfc27e935..0e7727b3c0 100644
--- a/src/apps/Jamfile
+++ b/src/apps/Jamfile
@@ -1,6 +1,5 @@
 SubDir OBOS_TOP src apps ;
 
-SubInclude OBOS_TOP src apps bin ;
 SubInclude OBOS_TOP src apps bemail ;
 SubInclude OBOS_TOP src apps cdplayer ;
 SubInclude OBOS_TOP src apps clock ;
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index a7d1655e4c..0a9a3e7ccc 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ;
+SubDir OBOS_TOP src bin ;
 
 UsePrivateHeaders kernel ;
 UsePrivateHeaders shared ;
@@ -96,48 +96,48 @@ StdBinCommands
 	: be tracker stdc++.r4 libmail.so
 	;
 
-SubInclude OBOS_TOP src apps bin addattr ;
-SubInclude OBOS_TOP src apps bin bash ;
-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 ;
-SubInclude OBOS_TOP src apps bin desklink ;
-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 grep ;
-SubInclude OBOS_TOP src apps bin keymap ;
-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 ;
-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 sharutils ;
-SubInclude OBOS_TOP src apps bin strace ;
-SubInclude OBOS_TOP src apps bin vim ;
-SubInclude OBOS_TOP src apps bin zic ;
+SubInclude OBOS_TOP src bin addattr ;
+SubInclude OBOS_TOP src bin bash ;
+SubInclude OBOS_TOP src bin bc ;
+SubInclude OBOS_TOP src bin bison ;
+SubInclude OBOS_TOP src bin chkbfs ;
+SubInclude OBOS_TOP src bin compress ;
+SubInclude OBOS_TOP src bin coreutils ;
+SubInclude OBOS_TOP src bin desklink ;
+SubInclude OBOS_TOP src bin diffutils ;
+SubInclude OBOS_TOP src bin findutils ;
+SubInclude OBOS_TOP src bin flex ;
+SubInclude OBOS_TOP src bin gawk ;
+SubInclude OBOS_TOP src bin grep ;
+SubInclude OBOS_TOP src bin keymap ;
+SubInclude OBOS_TOP src bin less ;
+SubInclude OBOS_TOP src bin listdev ;
+SubInclude OBOS_TOP src bin make ;
+SubInclude OBOS_TOP src bin makeudfimage ;
+SubInclude OBOS_TOP src bin mkdos ;
+SubInclude OBOS_TOP src bin patch ;
+SubInclude OBOS_TOP src bin pc ;
+SubInclude OBOS_TOP src bin sed ;
+SubInclude OBOS_TOP src bin sharutils ;
+SubInclude OBOS_TOP src bin strace ;
+SubInclude OBOS_TOP src bin vim ;
+SubInclude OBOS_TOP src bin zic ;
 
 # RCS commands
-SubInclude OBOS_TOP src apps bin rcs ;
+SubInclude OBOS_TOP src bin rcs ;
 
 # Network command line tools
-SubInclude OBOS_TOP src apps bin arp ;
-SubInclude OBOS_TOP src apps bin ifconfig ;
-SubInclude OBOS_TOP src apps bin ppp_up ;
-SubInclude OBOS_TOP src apps bin pppconfig ;
-SubInclude OBOS_TOP src apps bin ping ;
-SubInclude OBOS_TOP src apps bin route ;
-SubInclude OBOS_TOP src apps bin traceroute ;
+SubInclude OBOS_TOP src bin arp ;
+SubInclude OBOS_TOP src bin ifconfig ;
+SubInclude OBOS_TOP src bin ppp_up ;
+SubInclude OBOS_TOP src bin pppconfig ;
+SubInclude OBOS_TOP src bin ping ;
+SubInclude OBOS_TOP src bin route ;
+SubInclude OBOS_TOP src bin traceroute ;
 
 # Compression command line tools
-SubInclude OBOS_TOP src apps bin unzip ;
-SubInclude OBOS_TOP src apps bin zip ;
-SubInclude OBOS_TOP src apps bin gzip ;
-SubInclude OBOS_TOP src apps bin bzip2 ;
-SubInclude OBOS_TOP src apps bin tar ;
+SubInclude OBOS_TOP src bin unzip ;
+SubInclude OBOS_TOP src bin zip ;
+SubInclude OBOS_TOP src bin gzip ;
+SubInclude OBOS_TOP src bin bzip2 ;
+SubInclude OBOS_TOP src bin tar ;
diff --git a/src/bin/addattr/Jamfile b/src/bin/addattr/Jamfile
index aa2ee60824..48db310d41 100644
--- a/src/bin/addattr/Jamfile
+++ b/src/bin/addattr/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin addattr ;
+SubDir OBOS_TOP src bin addattr ;
 
 BinCommand addattr :
 	main.cpp
diff --git a/src/bin/arp/Jamfile b/src/bin/arp/Jamfile
index 192363638a..77d9a535cd 100644
--- a/src/bin/arp/Jamfile
+++ b/src/bin/arp/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin arp ;
+SubDir OBOS_TOP src bin arp ;
 
 UsePrivateHeaders net ;
 
diff --git a/src/bin/bash/Jamfile b/src/bin/bash/Jamfile
index 3ed1c39c6b..8f7aba56d6 100644
--- a/src/bin/bash/Jamfile
+++ b/src/bin/bash/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash ;
+SubDir OBOS_TOP src bin bash ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"sh\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ;
 
@@ -72,8 +72,8 @@ Includes [ FGristFiles trap.c ] : <bash>signames.h ;
 # some sources include the generated builtext.h
 Includes [ FGristFiles execute_cmd.c nojobs.c parse.c ] : <bash>builtext.h ;
 
-SubInclude OBOS_TOP src apps bin bash lib ;
-SubInclude OBOS_TOP src apps bin bash builtins ;
+SubInclude OBOS_TOP src bin bash lib ;
+SubInclude OBOS_TOP src bin bash builtins ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/bash/builtins/Jamfile b/src/bin/bash/builtins/Jamfile
index 7eb53ff412..0e5357bbb0 100644
--- a/src/bin/bash/builtins/Jamfile
+++ b/src/bin/bash/builtins/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash builtins ;
+SubDir OBOS_TOP src bin bash builtins ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 
diff --git a/src/bin/bash/lib/Jamfile b/src/bin/bash/lib/Jamfile
index affab5bd05..fd6bdc9e6d 100644
--- a/src/bin/bash/lib/Jamfile
+++ b/src/bin/bash/lib/Jamfile
@@ -1,6 +1,6 @@
-SubDir OBOS_TOP src apps bin bash lib ;
+SubDir OBOS_TOP src bin bash lib ;
 
-SubInclude OBOS_TOP src apps bin bash lib glob ;
-SubInclude OBOS_TOP src apps bin bash lib readline ;
-SubInclude OBOS_TOP src apps bin bash lib sh ;
-SubInclude OBOS_TOP src apps bin bash lib tilde ;
+SubInclude OBOS_TOP src bin bash lib glob ;
+SubInclude OBOS_TOP src bin bash lib readline ;
+SubInclude OBOS_TOP src bin bash lib sh ;
+SubInclude OBOS_TOP src bin bash lib tilde ;
diff --git a/src/bin/bash/lib/glob/Jamfile b/src/bin/bash/lib/glob/Jamfile
index 1577d1d0de..7a52f7d295 100644
--- a/src/bin/bash/lib/glob/Jamfile
+++ b/src/bin/bash/lib/glob/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib glob ;
+SubDir OBOS_TOP src bin bash lib glob ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 
diff --git a/src/bin/bash/lib/readline/Jamfile b/src/bin/bash/lib/readline/Jamfile
index e588e828da..6323b047a0 100644
--- a/src/bin/bash/lib/readline/Jamfile
+++ b/src/bin/bash/lib/readline/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib readline ;
+SubDir OBOS_TOP src bin bash lib readline ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 
diff --git a/src/bin/bash/lib/sh/Jamfile b/src/bin/bash/lib/sh/Jamfile
index fe445c7930..0367fa5c2b 100644
--- a/src/bin/bash/lib/sh/Jamfile
+++ b/src/bin/bash/lib/sh/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib sh ;
+SubDir OBOS_TOP src bin bash lib sh ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 
diff --git a/src/bin/bash/lib/tilde/Jamfile b/src/bin/bash/lib/tilde/Jamfile
index 88833b8223..deb3d765b1 100644
--- a/src/bin/bash/lib/tilde/Jamfile
+++ b/src/bin/bash/lib/tilde/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib tilde ;
+SubDir OBOS_TOP src bin bash lib tilde ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 
diff --git a/src/bin/bc/Jamfile b/src/bin/bc/Jamfile
index 413addff6a..d6bc349ee4 100644
--- a/src/bin/bc/Jamfile
+++ b/src/bin/bc/Jamfile
@@ -1,5 +1,5 @@
-SubDir OBOS_TOP src apps bin bc ;
+SubDir OBOS_TOP src bin bc ;
 
-SubInclude OBOS_TOP src apps bin bc lib ;
-SubInclude OBOS_TOP src apps bin bc bc ; 
-SubInclude OBOS_TOP src apps bin bc dc ; 
+SubInclude OBOS_TOP src bin bc lib ;
+SubInclude OBOS_TOP src bin bc bc ; 
+SubInclude OBOS_TOP src bin bc dc ; 
diff --git a/src/bin/bc/bc/Jamfile b/src/bin/bc/bc/Jamfile
index 246b0268a3..4a29ba8992 100644
--- a/src/bin/bc/bc/Jamfile
+++ b/src/bin/bc/bc/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bc bc ;
+SubDir OBOS_TOP src bin bc bc ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/bin/bc/dc/Jamfile b/src/bin/bc/dc/Jamfile
index 9346ca66fb..10c1d7e175 100644
--- a/src/bin/bc/dc/Jamfile
+++ b/src/bin/bc/dc/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bc dc ;
+SubDir OBOS_TOP src bin bc dc ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/bin/bc/lib/Jamfile b/src/bin/bc/lib/Jamfile
index 6adff3a330..3e39fe65b2 100644
--- a/src/bin/bc/lib/Jamfile
+++ b/src/bin/bc/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bc lib ;
+SubDir OBOS_TOP src bin bc lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/bin/bison/Jamfile b/src/bin/bison/Jamfile
index 64b89bc6c4..d454a526ac 100644
--- a/src/bin/bison/Jamfile
+++ b/src/bin/bison/Jamfile
@@ -1,5 +1,5 @@
-SubDir OBOS_TOP src apps bin bison ;
+SubDir OBOS_TOP src bin bison ;
 
-SubInclude OBOS_TOP src apps bin bison data ;
-SubInclude OBOS_TOP src apps bin bison lib ;
-SubInclude OBOS_TOP src apps bin bison src ;
+SubInclude OBOS_TOP src bin bison data ;
+SubInclude OBOS_TOP src bin bison lib ;
+SubInclude OBOS_TOP src bin bison src ;
diff --git a/src/bin/bison/data/Jamfile b/src/bin/bison/data/Jamfile
index 8db983a4b8..a834c7e179 100644
--- a/src/bin/bison/data/Jamfile
+++ b/src/bin/bison/data/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bison data ;
+SubDir OBOS_TOP src bin bison data ;
 
 MakeLocate <etc>c.m4 : $(OBOS_ETC_DIR) ;
 File <etc>c.m4 : c.m4 ;
diff --git a/src/bin/bison/lib/Jamfile b/src/bin/bison/lib/Jamfile
index 79bc77295e..e3f5196daf 100644
--- a/src/bin/bison/lib/Jamfile
+++ b/src/bin/bison/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bison lib ;
+SubDir OBOS_TOP src bin bison lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/bin/bison/src/Jamfile b/src/bin/bison/src/Jamfile
index 87c55b891d..08e1c75c4c 100644
--- a/src/bin/bison/src/Jamfile
+++ b/src/bin/bison/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bison src ;
+SubDir OBOS_TOP src bin bison src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H   -DPKGDATADIR=\'\"/etc\"\' -DLOCALEDIR=\'\"/etc/locale\"\' ;
 
diff --git a/src/bin/bzip2/Jamfile b/src/bin/bzip2/Jamfile
index 9c75d60548..30fddbbc76 100644
--- a/src/bin/bzip2/Jamfile
+++ b/src/bin/bzip2/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bzip2 ;
+SubDir OBOS_TOP src bin bzip2 ;
 
 # set some additional defines
 {
diff --git a/src/bin/chkbfs/Jamfile b/src/bin/chkbfs/Jamfile
index b817cf64e4..bd7cfdc865 100644
--- a/src/bin/chkbfs/Jamfile
+++ b/src/bin/chkbfs/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin chkbfs ;
+SubDir OBOS_TOP src bin chkbfs ;
 
 SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
 UsePrivateHeaders kernel ;
diff --git a/src/bin/compress/Jamfile b/src/bin/compress/Jamfile
index d25cf39ff4..79c92a1219 100644
--- a/src/bin/compress/Jamfile
+++ b/src/bin/compress/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin compress ;
+SubDir OBOS_TOP src bin compress ;
 
 SubDirCcFlags -DSACREDMEM=256000 -D_FPOS_T -DUSERMEM=2097152 -DBEOS=1 -w ;
 
diff --git a/src/bin/coreutils/Jamfile b/src/bin/coreutils/Jamfile
index e51cf59627..6b1d0c633b 100644
--- a/src/bin/coreutils/Jamfile
+++ b/src/bin/coreutils/Jamfile
@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin coreutils ;
+SubDir OBOS_TOP src 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 lib ;
-SubInclude OBOS_TOP src apps bin coreutils src ; 
+SubInclude OBOS_TOP src bin coreutils lib ;
+SubInclude OBOS_TOP src bin coreutils src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/coreutils/lib/Jamfile b/src/bin/coreutils/lib/Jamfile
index 1fc21ba6dd..a69db5b827 100644
--- a/src/bin/coreutils/lib/Jamfile
+++ b/src/bin/coreutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin coreutils lib ;
+SubDir OBOS_TOP src bin coreutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/bin/coreutils/src/Jamfile b/src/bin/coreutils/src/Jamfile
index c9c9b368e7..792d880566 100644
--- a/src/bin/coreutils/src/Jamfile
+++ b/src/bin/coreutils/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin coreutils src ;
+SubDir OBOS_TOP src bin coreutils src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/bin/desklink/Jamfile b/src/bin/desklink/Jamfile
index 3c457e7bae..dfc86d479d 100644
--- a/src/bin/desklink/Jamfile
+++ b/src/bin/desklink/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin desklink ;
+SubDir OBOS_TOP src bin desklink ;
 
 AddResources desklink : desklink.rsrc ;
 
diff --git a/src/bin/diffutils/Jamfile b/src/bin/diffutils/Jamfile
index b572ec2c8e..83009f4ac4 100644
--- a/src/bin/diffutils/Jamfile
+++ b/src/bin/diffutils/Jamfile
@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin diffutils ;
+SubDir OBOS_TOP src 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 lib ;
-SubInclude OBOS_TOP src apps bin diffutils src ; 
+SubInclude OBOS_TOP src bin diffutils lib ;
+SubInclude OBOS_TOP src bin diffutils src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/diffutils/lib/Jamfile b/src/bin/diffutils/lib/Jamfile
index 61f221abcd..eab60caa4f 100644
--- a/src/bin/diffutils/lib/Jamfile
+++ b/src/bin/diffutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin diffutils lib ;
+SubDir OBOS_TOP src bin diffutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/bin/diffutils/src/Jamfile b/src/bin/diffutils/src/Jamfile
index 1e5e5d1285..1f0150c6d0 100644
--- a/src/bin/diffutils/src/Jamfile
+++ b/src/bin/diffutils/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin diffutils src ;
+SubDir OBOS_TOP src 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/bin/findutils/Jamfile b/src/bin/findutils/Jamfile
index 8028aa6df7..c9b65a6d84 100644
--- a/src/bin/findutils/Jamfile
+++ b/src/bin/findutils/Jamfile
@@ -1,13 +1,13 @@
-SubDir OBOS_TOP src apps bin findutils ;
+SubDir OBOS_TOP src bin findutils ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin findutils lib ;
-SubInclude OBOS_TOP src apps bin findutils find ;
-SubInclude OBOS_TOP src apps bin findutils locate ;
-SubInclude OBOS_TOP src apps bin findutils xargs ;
+SubInclude OBOS_TOP src bin findutils lib ;
+SubInclude OBOS_TOP src bin findutils find ;
+SubInclude OBOS_TOP src bin findutils locate ;
+SubInclude OBOS_TOP src bin findutils xargs ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/findutils/find/Jamfile b/src/bin/findutils/find/Jamfile
index 2721b7829b..5765427861 100644
--- a/src/bin/findutils/find/Jamfile
+++ b/src/bin/findutils/find/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils find ;
+SubDir OBOS_TOP src bin findutils find ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/bin/findutils/lib/Jamfile b/src/bin/findutils/lib/Jamfile
index dfb3d4b1fd..fcbb116da6 100644
--- a/src/bin/findutils/lib/Jamfile
+++ b/src/bin/findutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils lib ;
+SubDir OBOS_TOP src bin findutils lib ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
diff --git a/src/bin/findutils/locate/Jamfile b/src/bin/findutils/locate/Jamfile
index 6e5c5adb60..d52d2af534 100644
--- a/src/bin/findutils/locate/Jamfile
+++ b/src/bin/findutils/locate/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils locate ;
+SubDir OBOS_TOP src bin findutils locate ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/bin/findutils/xargs/Jamfile b/src/bin/findutils/xargs/Jamfile
index e19687ad83..f775eff333 100644
--- a/src/bin/findutils/xargs/Jamfile
+++ b/src/bin/findutils/xargs/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils xargs ;
+SubDir OBOS_TOP src bin findutils xargs ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/bin/flex/Jamfile b/src/bin/flex/Jamfile
index a7f9435654..842f1e167a 100644
--- a/src/bin/flex/Jamfile
+++ b/src/bin/flex/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin flex ;
+SubDir OBOS_TOP src bin flex ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/bin/gawk/Jamfile b/src/bin/gawk/Jamfile
index 2b7db1dbe1..7c1c29d291 100644
--- a/src/bin/gawk/Jamfile
+++ b/src/bin/gawk/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin gawk ;
+SubDir OBOS_TOP src bin gawk ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
@@ -35,7 +35,7 @@ RelSymLink awk : gawk ;
 MakeLocate igawk : $(OBOS_BIN_DIR) ;
 RelSymLink igawk : gawk ;
 
-SubInclude OBOS_TOP src apps bin gawk intl ;
+SubInclude OBOS_TOP src bin gawk intl ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/gawk/intl/Jamfile b/src/bin/gawk/intl/Jamfile
index 6369dacb57..a5165f0431 100644
--- a/src/bin/gawk/intl/Jamfile
+++ b/src/bin/gawk/intl/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin gawk intl ;
+SubDir OBOS_TOP src bin gawk intl ;
 
 SubDirCcFlags -DLOCALEDIR='\"/share/locale\"' -DLOCALE_ALIAS_PATH='\"/share/locale\"' -DLIBDIR='\"/usr/local/lib\"' -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR='\"/usr/local/lib\"' -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H ;
 
diff --git a/src/bin/grep/Jamfile b/src/bin/grep/Jamfile
index 5344242757..ae794502ff 100644
--- a/src/bin/grep/Jamfile
+++ b/src/bin/grep/Jamfile
@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin grep ;
+SubDir OBOS_TOP src 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 lib ;
-SubInclude OBOS_TOP src apps bin grep src ; 
+SubInclude OBOS_TOP src bin grep lib ;
+SubInclude OBOS_TOP src bin grep src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/grep/lib/Jamfile b/src/bin/grep/lib/Jamfile
index fe27ed5610..72f430116e 100644
--- a/src/bin/grep/lib/Jamfile
+++ b/src/bin/grep/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin grep lib ;
+SubDir OBOS_TOP src bin grep lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/bin/grep/src/Jamfile b/src/bin/grep/src/Jamfile
index 248c398c44..c0fbf6f74a 100644
--- a/src/bin/grep/src/Jamfile
+++ b/src/bin/grep/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin grep src ;
+SubDir OBOS_TOP src bin grep src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR='\"/boot/beos/share/locale\"' ;
 
diff --git a/src/bin/gzip/Jamfile b/src/bin/gzip/Jamfile
index c3adfae7dd..0d9822e744 100644
--- a/src/bin/gzip/Jamfile
+++ b/src/bin/gzip/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin gzip ;
+SubDir OBOS_TOP src bin gzip ;
 
 SubDirCcFlags -w ;
 
diff --git a/src/bin/ifconfig/Jamfile b/src/bin/ifconfig/Jamfile
index 1e7d757f34..62dcf1e8cf 100644
--- a/src/bin/ifconfig/Jamfile
+++ b/src/bin/ifconfig/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ifconfig ;
+SubDir OBOS_TOP src bin ifconfig ;
 
 UsePrivateHeaders net ;
 
diff --git a/src/bin/keymap/Jamfile b/src/bin/keymap/Jamfile
index 86507b342a..34ae62604f 100644
--- a/src/bin/keymap/Jamfile
+++ b/src/bin/keymap/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin keymap ;
+SubDir OBOS_TOP src bin keymap ;
 
 BinCommand keymap :
 	key_map.cpp
diff --git a/src/bin/less/Jamfile b/src/bin/less/Jamfile
index 01d5f71863..1c4df55d43 100644
--- a/src/bin/less/Jamfile
+++ b/src/bin/less/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin less ;
+SubDir OBOS_TOP src bin less ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
diff --git a/src/bin/listdev/Jamfile b/src/bin/listdev/Jamfile
index ac35a74d7e..ae54f711d5 100644
--- a/src/bin/listdev/Jamfile
+++ b/src/bin/listdev/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin listdev ;
+SubDir OBOS_TOP src bin listdev ;
 
 BinCommand listdev :
 	cm_wrapper.c
diff --git a/src/bin/make/Jamfile b/src/bin/make/Jamfile
index fc4f0e1cd8..52f71a0189 100644
--- a/src/bin/make/Jamfile
+++ b/src/bin/make/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin make ;
+SubDir OBOS_TOP src bin make ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
@@ -35,7 +35,7 @@ BinCommand make :
 	vpath.c
 : <make>libglob.a : make.rdef ;
 
-SubInclude OBOS_TOP src apps bin make glob ;
+SubInclude OBOS_TOP src bin make glob ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/make/glob/Jamfile b/src/bin/make/glob/Jamfile
index 39dcad9cfb..afd4d354a7 100644
--- a/src/bin/make/glob/Jamfile
+++ b/src/bin/make/glob/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin make glob ;
+SubDir OBOS_TOP src bin make glob ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
diff --git a/src/bin/makeudfimage/Jamfile b/src/bin/makeudfimage/Jamfile
index fdc91779b1..3ec3b63834 100644
--- a/src/bin/makeudfimage/Jamfile
+++ b/src/bin/makeudfimage/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin makeudfimage ;
+SubDir OBOS_TOP src bin makeudfimage ;
 
 UsePrivateHeaders [ FDirName kernel util ] ;	# For kernel_cpp.h
 SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
diff --git a/src/bin/mkdos/Jamfile b/src/bin/mkdos/Jamfile
index bd5a738f9c..b143988bf9 100644
--- a/src/bin/mkdos/Jamfile
+++ b/src/bin/mkdos/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin mkdos ;
+SubDir OBOS_TOP src bin mkdos ;
 
 BinCommand mkdos :
 	mkdos.cpp
diff --git a/src/bin/patch/Jamfile b/src/bin/patch/Jamfile
index aa022a4f77..521db5eea1 100644
--- a/src/bin/patch/Jamfile
+++ b/src/bin/patch/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin patch ;
+SubDir OBOS_TOP src bin patch ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -Ded_PROGRAM='\"ed\"' -w ;
 
diff --git a/src/bin/pc/Jamfile b/src/bin/pc/Jamfile
index 5aba8967c3..db60f5ad44 100644
--- a/src/bin/pc/Jamfile
+++ b/src/bin/pc/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin pc ;
+SubDir OBOS_TOP src bin pc ;
 
 BinCommand pc :
 	pc.c
diff --git a/src/bin/ping/Jamfile b/src/bin/ping/Jamfile
index f29fc33cf7..61399b46b6 100644
--- a/src/bin/ping/Jamfile
+++ b/src/bin/ping/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ping ;
+SubDir OBOS_TOP src bin ping ;
 
 UsePrivateHeaders net ;
 
diff --git a/src/bin/ppp_up/Jamfile b/src/bin/ppp_up/Jamfile
index 2605c559c2..e7dd53e6a2 100644
--- a/src/bin/ppp_up/Jamfile
+++ b/src/bin/ppp_up/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ppp_up ;
+SubDir OBOS_TOP src bin ppp_up ;
 
 UsePrivateHeaders net ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libppp headers ] ;
diff --git a/src/bin/pppconfig/Jamfile b/src/bin/pppconfig/Jamfile
index ab1662f416..77780ecb58 100644
--- a/src/bin/pppconfig/Jamfile
+++ b/src/bin/pppconfig/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin pppconfig ;
+SubDir OBOS_TOP src bin pppconfig ;
 
 UsePrivateHeaders net ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libppp headers ] ;
diff --git a/src/bin/rcs/Jamfile b/src/bin/rcs/Jamfile
index 41d59c03e0..b8ea3937e0 100644
--- a/src/bin/rcs/Jamfile
+++ b/src/bin/rcs/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin rcs ;
+SubDir OBOS_TOP src bin rcs ;
 
 SubDirCcFlags -w ;
 
diff --git a/src/bin/route/Jamfile b/src/bin/route/Jamfile
index e095561311..26cb0927e8 100644
--- a/src/bin/route/Jamfile
+++ b/src/bin/route/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin route ;
+SubDir OBOS_TOP src bin route ;
 
 UsePrivateHeaders net ;
 
diff --git a/src/bin/sed/Jamfile b/src/bin/sed/Jamfile
index 30884aa1cf..3ec73b45e6 100644
--- a/src/bin/sed/Jamfile
+++ b/src/bin/sed/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed ;
+SubDir OBOS_TOP src bin sed ;
 
-SubInclude OBOS_TOP src apps bin sed lib ;
-SubInclude OBOS_TOP src apps bin sed sed ; 
+SubInclude OBOS_TOP src bin sed lib ;
+SubInclude OBOS_TOP src bin sed sed ; 
diff --git a/src/bin/sed/lib/Jamfile b/src/bin/sed/lib/Jamfile
index f5454cb316..b97d0a7db7 100644
--- a/src/bin/sed/lib/Jamfile
+++ b/src/bin/sed/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed lib ;
+SubDir OBOS_TOP src bin sed lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -w ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/bin/sed/sed/Jamfile b/src/bin/sed/sed/Jamfile
index f477331220..8193fea257 100644
--- a/src/bin/sed/sed/Jamfile
+++ b/src/bin/sed/sed/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed sed ;
+SubDir OBOS_TOP src bin sed sed ;
 
 SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' -w ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/bin/sharutils/Jamfile b/src/bin/sharutils/Jamfile
index 267a53f2a1..1eeaaa19d6 100644
--- a/src/bin/sharutils/Jamfile
+++ b/src/bin/sharutils/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils ;
+SubDir OBOS_TOP src bin sharutils ;
 
-SubInclude OBOS_TOP src apps bin sharutils lib ;
-SubInclude OBOS_TOP src apps bin sharutils src ; 
+SubInclude OBOS_TOP src bin sharutils lib ;
+SubInclude OBOS_TOP src bin sharutils src ; 
diff --git a/src/bin/sharutils/lib/Jamfile b/src/bin/sharutils/lib/Jamfile
index 15645e911c..50fbe560e4 100644
--- a/src/bin/sharutils/lib/Jamfile
+++ b/src/bin/sharutils/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils lib ;
+SubDir OBOS_TOP src bin sharutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/bin/sharutils/src/Jamfile b/src/bin/sharutils/src/Jamfile
index 975989f235..fec9a1177b 100644
--- a/src/bin/sharutils/src/Jamfile
+++ b/src/bin/sharutils/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils src ;
+SubDir OBOS_TOP src bin sharutils src ;
 
 SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
diff --git a/src/bin/strace/Jamfile b/src/bin/strace/Jamfile
index 34fcfbe427..e1586c378e 100644
--- a/src/bin/strace/Jamfile
+++ b/src/bin/strace/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin strace ;
+SubDir OBOS_TOP src bin strace ;
 
 # We need our objects dir in the include paths.
 SetupObjectsDir ;
diff --git a/src/bin/tar/Jamfile b/src/bin/tar/Jamfile
index 1c566a220d..82552857b3 100644
--- a/src/bin/tar/Jamfile
+++ b/src/bin/tar/Jamfile
@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin tar ;
+SubDir OBOS_TOP src bin tar ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin tar lib ;
-SubInclude OBOS_TOP src apps bin tar src ;
+SubInclude OBOS_TOP src bin tar lib ;
+SubInclude OBOS_TOP src bin tar src ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/tar/lib/Jamfile b/src/bin/tar/lib/Jamfile
index fd534fb103..a0de62c718 100644
--- a/src/bin/tar/lib/Jamfile
+++ b/src/bin/tar/lib/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin tar lib ;
+SubDir OBOS_TOP src bin tar lib ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
diff --git a/src/bin/tar/src/Jamfile b/src/bin/tar/src/Jamfile
index e7e541969c..fd268aa20a 100644
--- a/src/bin/tar/src/Jamfile
+++ b/src/bin/tar/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin tar src ;
+SubDir OBOS_TOP src bin tar src ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
diff --git a/src/bin/traceroute/Jamfile b/src/bin/traceroute/Jamfile
index d3c8147de8..6c9bb8b261 100644
--- a/src/bin/traceroute/Jamfile
+++ b/src/bin/traceroute/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin traceroute ;
+SubDir OBOS_TOP src bin traceroute ;
 
 UsePrivateHeaders net ;
 
diff --git a/src/bin/unzip/Jamfile b/src/bin/unzip/Jamfile
index f7038a94ec..cdc89045b7 100644
--- a/src/bin/unzip/Jamfile
+++ b/src/bin/unzip/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin unzip ;
+SubDir OBOS_TOP src bin unzip ;
 
 StaticLibrary unzip : 
 	crc32.c
diff --git a/src/bin/vim/Jamfile b/src/bin/vim/Jamfile
index fb044345d1..3a52fa5123 100644
--- a/src/bin/vim/Jamfile
+++ b/src/bin/vim/Jamfile
@@ -1,10 +1,10 @@
-SubDir OBOS_TOP src apps bin vim ;
+SubDir OBOS_TOP src bin vim ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin vim src ;
+SubInclude OBOS_TOP src bin vim src ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;
diff --git a/src/bin/vim/runtime/Jamfile b/src/bin/vim/runtime/Jamfile
index eae52c84c7..c46453a986 100644
--- a/src/bin/vim/runtime/Jamfile
+++ b/src/bin/vim/runtime/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin vim runtime ;
+SubDir OBOS_TOP src bin vim runtime ;
 
 # rules difference and glob-tree come from boost project
 #  (C) Copyright David Abrahams and Carlos Pinto Coelho 2001. Permission to 
diff --git a/src/bin/vim/src/Jamfile b/src/bin/vim/src/Jamfile
index 68c6ab97d1..ae98dfbf06 100644
--- a/src/bin/vim/src/Jamfile
+++ b/src/bin/vim/src/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin vim src ;
+SubDir OBOS_TOP src bin vim src ;
 
 SubDirHdrs [ FDirName $(SUBDIR) proto ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ] ;
diff --git a/src/bin/zic/Jamfile b/src/bin/zic/Jamfile
index 8045a670cc..517b4fe64b 100644
--- a/src/bin/zic/Jamfile
+++ b/src/bin/zic/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin zic ;
+SubDir OBOS_TOP src bin zic ;
 
 SubDirCcFlags -DNOID ;
 
diff --git a/src/bin/zip/Jamfile b/src/bin/zip/Jamfile
index d3b0a02b40..ad54468d5d 100644
--- a/src/bin/zip/Jamfile
+++ b/src/bin/zip/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin zip ;
+SubDir OBOS_TOP src bin zip ;
 
 local zip_rsrc = [ FGristFiles zip.rsrc ] ;
 ResComp $(zip_rsrc) : [ FGristFiles zip.rdef ] ;