directory, this is being done now. We will live with two trees until the "formal" switch over by changing src/gnu/usr.bin/Makefile.