169 files changed, 9 insertions, 12 deletions
diff --git a/bld.proj b/bld.proj
index 920db6b..2cb5ff9 100644
--- a/bld.proj
+++ b/bld.proj
@@ -1,9 +1,6 @@
 sub =
 	mbld
-	libstd
-	libbio
-	libregex
-	libcryptohash
+	lib
 	test
 ;;
 
diff --git a/libbio/bio.myr b/lib/bio/bio.myr
index 3ad9760..3ad9760 100644
--- a/libbio/bio.myr
+++ b/lib/bio/bio.myr
diff --git a/libbio/bld.sub b/lib/bio/bld.sub
index a1a9d6a..ad2e04d 100644
--- a/libbio/bld.sub
+++ b/lib/bio/bld.sub
@@ -3,5 +3,5 @@ lib bio =
 	geti.myr
 	puti.myr
 
-        lib ../libstd:std
+        lib ../std:std
 ;;
diff --git a/libbio/configure b/lib/bio/configure
index 37fe623..37fe623 100755
--- a/libbio/configure
+++ b/lib/bio/configure
diff --git a/libbio/geti.myr b/lib/bio/geti.myr
index 48de2bc..48de2bc 100644
--- a/libbio/geti.myr
+++ b/lib/bio/geti.myr
diff --git a/libbio/puti.myr b/lib/bio/puti.myr
index 16f014a..16f014a 100644
--- a/libbio/puti.myr
+++ b/lib/bio/puti.myr
diff --git a/libbio/test/Makefile b/lib/bio/test/Makefile
index e559327..e559327 100644
--- a/libbio/test/Makefile
+++ b/lib/bio/test/Makefile
diff --git a/libbio/test/bio-create.myr b/lib/bio/test/bio-create.myr
index 6954e32..6954e32 100644
--- a/libbio/test/bio-create.myr
+++ b/lib/bio/test/bio-create.myr
diff --git a/libbio/test/bio-delim.myr b/lib/bio/test/bio-delim.myr
index 231c469..231c469 100644
--- a/libbio/test/bio-delim.myr
+++ b/lib/bio/test/bio-delim.myr
diff --git a/libbio/test/bio-endianrd.myr b/lib/bio/test/bio-endianrd.myr
index 53743d8..53743d8 100644
--- a/libbio/test/bio-endianrd.myr
+++ b/lib/bio/test/bio-endianrd.myr
diff --git a/libbio/test/bio-endianwr.myr b/lib/bio/test/bio-endianwr.myr
index e44db49..e44db49 100644
--- a/libbio/test/bio-endianwr.myr
+++ b/lib/bio/test/bio-endianwr.myr
diff --git a/libbio/test/bio-peek.myr b/lib/bio/test/bio-peek.myr
index 2125c9b..2125c9b 100644
--- a/libbio/test/bio-peek.myr
+++ b/lib/bio/test/bio-peek.myr
diff --git a/libbio/test/bio-read.myr b/lib/bio/test/bio-read.myr
index eafdb4a..eafdb4a 100644
--- a/libbio/test/bio-read.myr
+++ b/lib/bio/test/bio-read.myr
diff --git a/libbio/test/bio-unitwr.myr b/lib/bio/test/bio-unitwr.myr
index 8a1774c..8a1774c 100644
--- a/libbio/test/bio-unitwr.myr
+++ b/lib/bio/test/bio-unitwr.myr
diff --git a/libbio/test/bio-write.myr b/lib/bio/test/bio-write.myr
index cbe7441..cbe7441 100644
--- a/libbio/test/bio-write.myr
+++ b/lib/bio/test/bio-write.myr
diff --git a/libbio/test/data/bio-create-expected b/lib/bio/test/data/bio-create-expected
index e69de29..e69de29 100644
--- a/libbio/test/data/bio-create-expected
+++ b/lib/bio/test/data/bio-create-expected
diff --git a/libbio/test/data/bio-delim-expected b/lib/bio/test/data/bio-delim-expected
index b90f595..b90f595 100644
--- a/libbio/test/data/bio-delim-expected
+++ b/lib/bio/test/data/bio-delim-expected
diff --git a/libbio/test/data/bio-endianrd-expected b/lib/bio/test/data/bio-endianrd-expected
index cd9a251..cd9a251 100644
--- a/libbio/test/data/bio-endianrd-expected
+++ b/lib/bio/test/data/bio-endianrd-expected
diff --git a/libbio/test/data/bio-endianwr-expected b/lib/bio/test/data/bio-endianwr-expected
index 8baa404..8baa404 100755
--- a/libbio/test/data/bio-endianwr-expected
+++ b/lib/bio/test/data/bio-endianwr-expected
diff --git a/libbio/test/data/bio-peek-expected b/lib/bio/test/data/bio-peek-expected
index 153efdb..153efdb 100644
--- a/libbio/test/data/bio-peek-expected
+++ b/lib/bio/test/data/bio-peek-expected
diff --git a/libbio/test/data/bio-read-expected b/lib/bio/test/data/bio-read-expected
index 9bf4703..9bf4703 100644
--- a/libbio/test/data/bio-read-expected
+++ b/lib/bio/test/data/bio-read-expected
diff --git a/libbio/test/data/bio-unitwr-expected b/lib/bio/test/data/bio-unitwr-expected
index 581c0f6..581c0f6 100644
--- a/libbio/test/data/bio-unitwr-expected
+++ b/lib/bio/test/data/bio-unitwr-expected
diff --git a/libbio/test/data/bio-write-expected b/lib/bio/test/data/bio-write-expected
index ced6c96..ced6c96 100755
--- a/libbio/test/data/bio-write-expected
+++ b/lib/bio/test/data/bio-write-expected
diff --git a/libbio/test/data/datafile b/lib/bio/test/data/datafile
index 52a47f6..52a47f6 100644
--- a/libbio/test/data/datafile
+++ b/lib/bio/test/data/datafile
diff --git a/libbio/test/data/lines b/lib/bio/test/data/lines
index 781db66..781db66 100644
--- a/libbio/test/data/lines
+++ b/lib/bio/test/data/lines
diff --git a/libbio/test/runtest.sh b/lib/bio/test/runtest.sh
index 95f548f..95f548f 100755
--- a/libbio/test/runtest.sh
+++ b/lib/bio/test/runtest.sh
diff --git a/libbio/test/tests b/lib/bio/test/tests
index 81c1087..81c1087 100644
--- a/libbio/test/tests
+++ b/lib/bio/test/tests
diff --git a/libcryptohash/bld.sub b/lib/cryptohash/bld.sub
index b6056f7..b6056f7 100644
--- a/libcryptohash/bld.sub
+++ b/lib/cryptohash/bld.sub
diff --git a/libcryptohash/md5.myr b/lib/cryptohash/md5.myr
index 5f4b600..5f4b600 100644
--- a/libcryptohash/md5.myr
+++ b/lib/cryptohash/md5.myr
diff --git a/libcryptohash/sha1.myr b/lib/cryptohash/sha1.myr
index ecf0ec3..ecf0ec3 100644
--- a/libcryptohash/sha1.myr
+++ b/lib/cryptohash/sha1.myr
diff --git a/libcryptohash/sha256.myr b/lib/cryptohash/sha256.myr
index 5939fa8..5939fa8 100644
--- a/libcryptohash/sha256.myr
+++ b/lib/cryptohash/sha256.myr
diff --git a/libcryptohash/sha512.myr b/lib/cryptohash/sha512.myr
index e5d9543..e5d9543 100644
--- a/libcryptohash/sha512.myr
+++ b/lib/cryptohash/sha512.myr
diff --git a/libcryptohash/test/md5.myr b/lib/cryptohash/test/md5.myr
index 42d1089..42d1089 100644
--- a/libcryptohash/test/md5.myr
+++ b/lib/cryptohash/test/md5.myr
diff --git a/libcryptohash/test/sha1.myr b/lib/cryptohash/test/sha1.myr
index d2ccfb8..d2ccfb8 100644
--- a/libcryptohash/test/sha1.myr
+++ b/lib/cryptohash/test/sha1.myr
diff --git a/libcryptohash/test/sha256.myr b/lib/cryptohash/test/sha256.myr
index e3981b4..e3981b4 100644
--- a/libcryptohash/test/sha256.myr
+++ b/lib/cryptohash/test/sha256.myr
diff --git a/libcryptohash/test/sha512.myr b/lib/cryptohash/test/sha512.myr
index f58f96e..f58f96e 100644
--- a/libcryptohash/test/sha512.myr
+++ b/lib/cryptohash/test/sha512.myr
diff --git a/libcryptohash/test/util.myr b/lib/cryptohash/test/util.myr
index ceb411c..ceb411c 100644
--- a/libcryptohash/test/util.myr
+++ b/lib/cryptohash/test/util.myr
diff --git a/libregex/bld.sub b/lib/regex/bld.sub
index 70592a6..0078d09 100644
--- a/libregex/bld.sub
+++ b/lib/regex/bld.sub
@@ -4,13 +4,13 @@ lib regex =
 	ranges.myr
 	types.myr
 
-        lib ../libstd:std
+        lib ../std:std
 ;;
 
 bin redump {noinst} =
 	redump.myr
-        lib ../libstd:std
-        lib ../libbio:bio
+        lib ../std:std
+        lib ../bio:bio
         lib regex
 ;;
 
diff --git a/libregex/compile.myr b/lib/regex/compile.myr
index 28d7ce8..28d7ce8 100644
--- a/libregex/compile.myr
+++ b/lib/regex/compile.myr
diff --git a/libregex/configure b/lib/regex/configure
index 37fe623..37fe623 100755
--- a/libregex/configure
+++ b/lib/regex/configure
diff --git a/libregex/doc/Makefile b/lib/regex/doc/Makefile
index c1749d3..c1749d3 100644
--- a/libregex/doc/Makefile
+++ b/lib/regex/doc/Makefile
diff --git a/libregex/doc/myr-regex.3 b/lib/regex/doc/myr-regex.3
index c0d0da0..c0d0da0 100644
--- a/libregex/doc/myr-regex.3
+++ b/lib/regex/doc/myr-regex.3
diff --git a/libregex/interp.myr b/lib/regex/interp.myr
index fc179c0..fc179c0 100644
--- a/libregex/interp.myr
+++ b/lib/regex/interp.myr
diff --git a/libregex/ranges.myr b/lib/regex/ranges.myr
index 3efae43..3efae43 100644
--- a/libregex/ranges.myr
+++ b/lib/regex/ranges.myr
diff --git a/libregex/redump.myr b/lib/regex/redump.myr
index 7233864..7233864 100644
--- a/libregex/redump.myr
+++ b/lib/regex/redump.myr
diff --git a/libregex/test/basic.myr b/lib/regex/test/basic.myr
index 168b547..168b547 100644
--- a/libregex/test/basic.myr
+++ b/lib/regex/test/basic.myr
diff --git a/libregex/test/bld.sub b/lib/regex/test/bld.sub
index 12f8056..12f8056 100644
--- a/libregex/test/bld.sub
+++ b/lib/regex/test/bld.sub
diff --git a/libregex/test/boundaries.myr b/lib/regex/test/boundaries.myr
index 196d197..196d197 100644
--- a/libregex/test/boundaries.myr
+++ b/lib/regex/test/boundaries.myr
diff --git a/libregex/test/capture.myr b/lib/regex/test/capture.myr
index f270428..f270428 100644
--- a/libregex/test/capture.myr
+++ b/lib/regex/test/capture.myr
diff --git a/libregex/test/class.myr b/lib/regex/test/class.myr
index 284f440..284f440 100644
--- a/libregex/test/class.myr
+++ b/lib/regex/test/class.myr
diff --git a/libregex/test/failmatch.myr b/lib/regex/test/failmatch.myr
index c501d00..c501d00 100644
--- a/libregex/test/failmatch.myr
+++ b/lib/regex/test/failmatch.myr
diff --git a/libregex/test/negclass.myr b/lib/regex/test/negclass.myr
index 19404fa..19404fa 100644
--- a/libregex/test/negclass.myr
+++ b/lib/regex/test/negclass.myr
diff --git a/libregex/test/runtest.sh b/lib/regex/test/runtest.sh
index 95f548f..95f548f 100755
--- a/libregex/test/runtest.sh
+++ b/lib/regex/test/runtest.sh
diff --git a/libregex/test/testmatch.myr b/lib/regex/test/testmatch.myr
index 4600410..4600410 100644
--- a/libregex/test/testmatch.myr
+++ b/lib/regex/test/testmatch.myr
diff --git a/libregex/test/tests b/lib/regex/test/tests
index a5f70f7..a5f70f7 100644
--- a/libregex/test/tests
+++ b/lib/regex/test/tests
diff --git a/libregex/test/unicode.myr b/lib/regex/test/unicode.myr
index 5916a1c..5916a1c 100644
--- a/libregex/test/unicode.myr
+++ b/lib/regex/test/unicode.myr
diff --git a/libregex/types.myr b/lib/regex/types.myr
index b283d2a..b283d2a 100644
--- a/libregex/types.myr
+++ b/lib/regex/types.myr
diff --git a/libstd/alloc.myr b/lib/std/alloc.myr
index ed3b023..ed3b023 100644
--- a/libstd/alloc.myr
+++ b/lib/std/alloc.myr
diff --git a/libstd/bigint.myr b/lib/std/bigint.myr
index 719fd69..719fd69 100644
--- a/libstd/bigint.myr
+++ b/lib/std/bigint.myr
diff --git a/libstd/bitset.myr b/lib/std/bitset.myr
index 7843c7d..7843c7d 100644
--- a/libstd/bitset.myr
+++ b/lib/std/bitset.myr
diff --git a/libstd/blat.myr b/lib/std/blat.myr
index 90c0f94..90c0f94 100644
--- a/libstd/blat.myr
+++ b/lib/std/blat.myr
diff --git a/libstd/bld.sub b/lib/std/bld.sub
index b84be64..b84be64 100644
--- a/libstd/bld.sub
+++ b/lib/std/bld.sub
diff --git a/libstd/build.sh b/lib/std/build.sh
index 3c1aa99..3c1aa99 100755
--- a/libstd/build.sh
+++ b/lib/std/build.sh
diff --git a/libstd/chartype.myr b/lib/std/chartype.myr
index fe59202..fe59202 100644
--- a/libstd/chartype.myr
+++ b/lib/std/chartype.myr
diff --git a/libstd/clear.myr b/lib/std/clear.myr
index c16c851..c16c851 100644
--- a/libstd/clear.myr
+++ b/lib/std/clear.myr
diff --git a/libstd/cmp.myr b/lib/std/cmp.myr
index edc5fe3..edc5fe3 100644
--- a/libstd/cmp.myr
+++ b/lib/std/cmp.myr
diff --git a/libstd/cstrconv.myr b/lib/std/cstrconv.myr
index fa9e0bf..fa9e0bf 100644
--- a/libstd/cstrconv.myr
+++ b/lib/std/cstrconv.myr
diff --git a/libstd/dial+plan9.myr b/lib/std/dial+plan9.myr
index 35d97e9..35d97e9 100644
--- a/libstd/dial+plan9.myr
+++ b/lib/std/dial+plan9.myr
diff --git a/libstd/dial+posixy.myr b/lib/std/dial+posixy.myr
index 13f0257..13f0257 100644
--- a/libstd/dial+posixy.myr
+++ b/lib/std/dial+posixy.myr
diff --git a/libstd/die.myr b/lib/std/die.myr
index 87135f1..87135f1 100644
--- a/libstd/die.myr
+++ b/lib/std/die.myr
diff --git a/libstd/dir+freebsd.myr b/lib/std/dir+freebsd.myr
index e69de29..e69de29 100644
--- a/libstd/dir+freebsd.myr
+++ b/lib/std/dir+freebsd.myr
diff --git a/libstd/dir+linux.myr b/lib/std/dir+linux.myr
index 60ef6f9..60ef6f9 100644
--- a/libstd/dir+linux.myr
+++ b/lib/std/dir+linux.myr
diff --git a/libstd/dir+osx.myr b/lib/std/dir+osx.myr
index 28ef26b..28ef26b 100644
--- a/libstd/dir+osx.myr
+++ b/lib/std/dir+osx.myr
diff --git a/libstd/dir+plan9.myr b/lib/std/dir+plan9.myr
index 41a579f..41a579f 100644
--- a/libstd/dir+plan9.myr
+++ b/lib/std/dir+plan9.myr
diff --git a/libstd/dirname.myr b/lib/std/dirname.myr
index 5e80771..5e80771 100644
--- a/libstd/dirname.myr
+++ b/lib/std/dirname.myr
diff --git a/libstd/endian.myr b/lib/std/endian.myr
index 8bac74f..8bac74f 100644
--- a/libstd/endian.myr
+++ b/lib/std/endian.myr
diff --git a/libstd/env+plan9.myr b/lib/std/env+plan9.myr
index 4a95ed7..4a95ed7 100644
--- a/libstd/env+plan9.myr
+++ b/lib/std/env+plan9.myr
diff --git a/libstd/env+posixy.myr b/lib/std/env+posixy.myr
index d7b0e5e..d7b0e5e 100644
--- a/libstd/env+posixy.myr
+++ b/lib/std/env+posixy.myr
diff --git a/libstd/errno+plan9.myr b/lib/std/errno+plan9.myr
index c911349..c911349 100644
--- a/libstd/errno+plan9.myr
+++ b/lib/std/errno+plan9.myr
diff --git a/libstd/errno.myr b/lib/std/errno.myr
index c14c469..c14c469 100644
--- a/libstd/errno.myr
+++ b/lib/std/errno.myr
diff --git a/libstd/execvp.myr b/lib/std/execvp.myr
index 38d9fc5..38d9fc5 100644
--- a/libstd/execvp.myr
+++ b/lib/std/execvp.myr
diff --git a/libstd/extremum.myr b/lib/std/extremum.myr
index 9675915..9675915 100644
--- a/libstd/extremum.myr
+++ b/lib/std/extremum.myr
diff --git a/libstd/fltbits.myr b/lib/std/fltbits.myr
index 2f77ee9..2f77ee9 100644
--- a/libstd/fltbits.myr
+++ b/lib/std/fltbits.myr
diff --git a/libstd/fltfmt.myr b/lib/std/fltfmt.myr
index 395ade4..395ade4 100644
--- a/libstd/fltfmt.myr
+++ b/lib/std/fltfmt.myr
diff --git a/libstd/fmt.myr b/lib/std/fmt.myr
index b786e98..b786e98 100644
--- a/libstd/fmt.myr
+++ b/lib/std/fmt.myr
diff --git a/libstd/fmtfuncs.myr b/lib/std/fmtfuncs.myr
index abe5e75..abe5e75 100644
--- a/libstd/fmtfuncs.myr
+++ b/lib/std/fmtfuncs.myr
diff --git a/libstd/getcwd.myr b/lib/std/getcwd.myr
index c9dbbea..c9dbbea 100644
--- a/libstd/getcwd.myr
+++ b/lib/std/getcwd.myr
diff --git a/libstd/getint.myr b/lib/std/getint.myr
index cd3d50b..cd3d50b 100644
--- a/libstd/getint.myr
+++ b/lib/std/getint.myr
diff --git a/libstd/hashfuncs.myr b/lib/std/hashfuncs.myr
index 00c44c4..00c44c4 100644
--- a/libstd/hashfuncs.myr
+++ b/lib/std/hashfuncs.myr
diff --git a/libstd/hasprefix.myr b/lib/std/hasprefix.myr
index c9749f6..c9749f6 100644
--- a/libstd/hasprefix.myr
+++ b/lib/std/hasprefix.myr
diff --git a/libstd/hassuffix.myr b/lib/std/hassuffix.myr
index 87369af..87369af 100644
--- a/libstd/hassuffix.myr
+++ b/lib/std/hassuffix.myr
diff --git a/libstd/htab.myr b/lib/std/htab.myr
index ac2e7aa..ac2e7aa 100644
--- a/libstd/htab.myr
+++ b/lib/std/htab.myr
diff --git a/libstd/ifreq+freebsd.myr b/lib/std/ifreq+freebsd.myr
index e69de29..e69de29 100644
--- a/libstd/ifreq+freebsd.myr
+++ b/lib/std/ifreq+freebsd.myr
diff --git a/libstd/ifreq+linux.myr b/lib/std/ifreq+linux.myr
index 62be8ee..62be8ee 100644
--- a/libstd/ifreq+linux.myr
+++ b/lib/std/ifreq+linux.myr
diff --git a/libstd/ifreq+osx.myr b/lib/std/ifreq+osx.myr
index f5205bf..f5205bf 100644
--- a/libstd/ifreq+osx.myr
+++ b/lib/std/ifreq+osx.myr
diff --git a/libstd/ifreq+plan9.myr b/lib/std/ifreq+plan9.myr
index ef73843..ef73843 100644
--- a/libstd/ifreq+plan9.myr
+++ b/lib/std/ifreq+plan9.myr
diff --git a/libstd/intparse.myr b/lib/std/intparse.myr
index 4180f8c..4180f8c 100644
--- a/libstd/intparse.myr
+++ b/lib/std/intparse.myr
diff --git a/libstd/introspect.myr b/lib/std/introspect.myr
index 1da7af0..1da7af0 100644
--- a/libstd/introspect.myr
+++ b/lib/std/introspect.myr
diff --git a/libstd/ipparse.myr b/lib/std/ipparse.myr
index 17bc6f0..17bc6f0 100644
--- a/libstd/ipparse.myr
+++ b/lib/std/ipparse.myr
diff --git a/libstd/mk.myr b/lib/std/mk.myr
index 19b46d2..19b46d2 100644
--- a/libstd/mk.myr
+++ b/lib/std/mk.myr
diff --git a/libstd/mkfile b/lib/std/mkfile
index 36c6bb2..36c6bb2 100644
--- a/libstd/mkfile
+++ b/lib/std/mkfile
diff --git a/libstd/mkpath.myr b/lib/std/mkpath.myr
index b7e8e24..b7e8e24 100644
--- a/libstd/mkpath.myr
+++ b/lib/std/mkpath.myr
diff --git a/libstd/now.myr b/lib/std/now.myr
index 5f6d8d1..5f6d8d1 100644
--- a/libstd/now.myr
+++ b/lib/std/now.myr
diff --git a/libstd/option.myr b/lib/std/option.myr
index 271355d..271355d 100644
--- a/libstd/option.myr
+++ b/lib/std/option.myr
diff --git a/libstd/optparse.myr b/lib/std/optparse.myr
index ae65b77..ae65b77 100644
--- a/libstd/optparse.myr
+++ b/lib/std/optparse.myr
diff --git a/libstd/pathjoin.myr b/lib/std/pathjoin.myr
index f9df8aa..f9df8aa 100644
--- a/libstd/pathjoin.myr
+++ b/lib/std/pathjoin.myr
diff --git a/libstd/putint.myr b/lib/std/putint.myr
index 711001d..711001d 100644
--- a/libstd/putint.myr
+++ b/lib/std/putint.myr
diff --git a/libstd/rand.myr b/lib/std/rand.myr
index 2e8c73e..2e8c73e 100644
--- a/libstd/rand.myr
+++ b/lib/std/rand.myr
diff --git a/libstd/resolve+plan9.myr b/lib/std/resolve+plan9.myr
index ef73843..ef73843 100644
--- a/libstd/resolve+plan9.myr
+++ b/lib/std/resolve+plan9.myr
diff --git a/libstd/resolve+posixy.myr b/lib/std/resolve+posixy.myr
index 185c9d7..185c9d7 100644
--- a/libstd/resolve+posixy.myr
+++ b/lib/std/resolve+posixy.myr
diff --git a/libstd/result.myr b/lib/std/result.myr
index 58ef45b..58ef45b 100644
--- a/libstd/result.myr
+++ b/lib/std/result.myr
diff --git a/libstd/search.myr b/lib/std/search.myr
index 725e419..725e419 100644
--- a/libstd/search.myr
+++ b/lib/std/search.myr
diff --git a/libstd/slcp.myr b/lib/std/slcp.myr
index 1035a29..1035a29 100644
--- a/libstd/slcp.myr
+++ b/lib/std/slcp.myr
diff --git a/libstd/sldup.myr b/lib/std/sldup.myr
index 70cbee4..70cbee4 100644
--- a/libstd/sldup.myr
+++ b/lib/std/sldup.myr
diff --git a/libstd/sleq.myr b/lib/std/sleq.myr
index cfc60b4..cfc60b4 100644
--- a/libstd/sleq.myr
+++ b/lib/std/sleq.myr
diff --git a/libstd/slfill.myr b/lib/std/slfill.myr
index d90e8f5..d90e8f5 100644
--- a/libstd/slfill.myr
+++ b/lib/std/slfill.myr
diff --git a/libstd/sljoin.myr b/lib/std/sljoin.myr
index f1fe58a..f1fe58a 100644
--- a/libstd/sljoin.myr
+++ b/lib/std/sljoin.myr
diff --git a/libstd/slpush.myr b/lib/std/slpush.myr
index b30b1e2..b30b1e2 100644
--- a/libstd/slpush.myr
+++ b/lib/std/slpush.myr
diff --git a/libstd/slput.myr b/lib/std/slput.myr
index 88dc875..88dc875 100644
--- a/libstd/slput.myr
+++ b/lib/std/slput.myr
diff --git a/libstd/slurp.myr b/lib/std/slurp.myr
index 8636f40..8636f40 100644
--- a/libstd/slurp.myr
+++ b/lib/std/slurp.myr
diff --git a/libstd/sort.myr b/lib/std/sort.myr
index dbf48d3..dbf48d3 100644
--- a/libstd/sort.myr
+++ b/lib/std/sort.myr
diff --git a/libstd/spork.myr b/lib/std/spork.myr
index 64e8fce..64e8fce 100644
--- a/libstd/spork.myr
+++ b/lib/std/spork.myr
diff --git a/libstd/strbuf.myr b/lib/std/strbuf.myr
index 097d1ce..097d1ce 100644
--- a/libstd/strbuf.myr
+++ b/lib/std/strbuf.myr
diff --git a/libstd/strfind.myr b/lib/std/strfind.myr
index 0ec0e85..0ec0e85 100644
--- a/libstd/strfind.myr
+++ b/lib/std/strfind.myr
diff --git a/libstd/strjoin.myr b/lib/std/strjoin.myr
index 518a4dc..518a4dc 100644
--- a/libstd/strjoin.myr
+++ b/lib/std/strjoin.myr
diff --git a/libstd/strsplit.myr b/lib/std/strsplit.myr
index e64d907..e64d907 100644
--- a/libstd/strsplit.myr
+++ b/lib/std/strsplit.myr
diff --git a/libstd/strstrip.myr b/lib/std/strstrip.myr
index a3d54fa..a3d54fa 100644
--- a/libstd/strstrip.myr
+++ b/lib/std/strstrip.myr
diff --git a/libstd/swap.myr b/lib/std/swap.myr
index e3923c9..e3923c9 100644
--- a/libstd/swap.myr
+++ b/lib/std/swap.myr
diff --git a/libstd/sys+freebsd-x64.myr b/lib/std/sys+freebsd-x64.myr
index 279d360..279d360 100644
--- a/libstd/sys+freebsd-x64.myr
+++ b/lib/std/sys+freebsd-x64.myr
diff --git a/libstd/sys+linux-x64.myr b/lib/std/sys+linux-x64.myr
index 4860120..4860120 100644
--- a/libstd/sys+linux-x64.myr
+++ b/lib/std/sys+linux-x64.myr
diff --git a/libstd/sys+osx-x64.myr b/lib/std/sys+osx-x64.myr
index ca2a63a..ca2a63a 100644
--- a/libstd/sys+osx-x64.myr
+++ b/lib/std/sys+osx-x64.myr
diff --git a/libstd/sys+plan9-x64.myr b/lib/std/sys+plan9-x64.myr
index f183dc2..f183dc2 100644
--- a/libstd/sys+plan9-x64.myr
+++ b/lib/std/sys+plan9-x64.myr
diff --git a/libstd/syscall+freebsd-x64.s b/lib/std/syscall+freebsd-x64.s
index 8002099..8002099 100644
--- a/libstd/syscall+freebsd-x64.s
+++ b/lib/std/syscall+freebsd-x64.s
diff --git a/libstd/syscall+linux-x64.s b/lib/std/syscall+linux-x64.s
index f7c020d..f7c020d 100644
--- a/libstd/syscall+linux-x64.s
+++ b/lib/std/syscall+linux-x64.s
diff --git a/libstd/syscall+osx-x64.s b/lib/std/syscall+osx-x64.s
index 5984c24..5984c24 100644
--- a/libstd/syscall+osx-x64.s
+++ b/lib/std/syscall+osx-x64.s
diff --git a/libstd/syscall+plan9-x64.s b/lib/std/syscall+plan9-x64.s
index 4de6502..4de6502 100644
--- a/libstd/syscall+plan9-x64.s
+++ b/lib/std/syscall+plan9-x64.s
diff --git a/libstd/syserrno+linux.myr b/lib/std/syserrno+linux.myr
index 18a3fc2..18a3fc2 100644
--- a/libstd/syserrno+linux.myr
+++ b/lib/std/syserrno+linux.myr
diff --git a/libstd/syserrno+osx.myr b/lib/std/syserrno+osx.myr
index 7b5d888..7b5d888 100644
--- a/libstd/syserrno+osx.myr
+++ b/lib/std/syserrno+osx.myr
diff --git a/libstd/syserrno+plan9.myr b/lib/std/syserrno+plan9.myr
index 18a3fc2..18a3fc2 100644
--- a/libstd/syserrno+plan9.myr
+++ b/lib/std/syserrno+plan9.myr
diff --git a/libstd/systypes.myr b/lib/std/systypes.myr
index e39f279..e39f279 100644
--- a/libstd/systypes.myr
+++ b/lib/std/systypes.myr
diff --git a/libstd/syswrap+plan9-x6.myr b/lib/std/syswrap+plan9-x6.myr
index 2559263..2559263 100644
--- a/libstd/syswrap+plan9-x6.myr
+++ b/lib/std/syswrap+plan9-x6.myr
diff --git a/libstd/syswrap+plan9.myr b/lib/std/syswrap+plan9.myr
index b18b8da..b18b8da 100644
--- a/libstd/syswrap+plan9.myr
+++ b/lib/std/syswrap+plan9.myr
diff --git a/libstd/syswrap+posixy.myr b/lib/std/syswrap+posixy.myr
index 31d98b5..31d98b5 100644
--- a/libstd/syswrap+posixy.myr
+++ b/lib/std/syswrap+posixy.myr
diff --git a/libstd/syswrap-ss+linux.myr b/lib/std/syswrap-ss+linux.myr
index 1982e54..1982e54 100644
--- a/libstd/syswrap-ss+linux.myr
+++ b/lib/std/syswrap-ss+linux.myr
diff --git a/libstd/syswrap-ss+osx.myr b/lib/std/syswrap-ss+osx.myr
index 5e7f001..5e7f001 100644
--- a/libstd/syswrap-ss+osx.myr
+++ b/lib/std/syswrap-ss+osx.myr
diff --git a/libstd/syswrap-ss+plan9.myr b/lib/std/syswrap-ss+plan9.myr
index 9615a6e..9615a6e 100644
--- a/libstd/syswrap-ss+plan9.myr
+++ b/lib/std/syswrap-ss+plan9.myr
diff --git a/libstd/test/bigint.myr b/lib/std/test/bigint.myr
index 582fe60..582fe60 100644
--- a/libstd/test/bigint.myr
+++ b/lib/std/test/bigint.myr
diff --git a/libstd/test/bytebuf.myr b/lib/std/test/bytebuf.myr
index 48f6715..48f6715 100644
--- a/libstd/test/bytebuf.myr
+++ b/lib/std/test/bytebuf.myr
diff --git a/libstd/test/chartype.myr b/lib/std/test/chartype.myr
index d0df1d2..d0df1d2 100644
--- a/libstd/test/chartype.myr
+++ b/lib/std/test/chartype.myr
diff --git a/libstd/test/fmt.myr b/lib/std/test/fmt.myr
index 8de3890..8de3890 100644
--- a/libstd/test/fmt.myr
+++ b/lib/std/test/fmt.myr
diff --git a/libstd/test/htab.myr b/lib/std/test/htab.myr
index 1801d76..1801d76 100644
--- a/libstd/test/htab.myr
+++ b/lib/std/test/htab.myr
diff --git a/libstd/test/ipparse.myr b/lib/std/test/ipparse.myr
index bbf56e3..bbf56e3 100644
--- a/libstd/test/ipparse.myr
+++ b/lib/std/test/ipparse.myr
diff --git a/libstd/test/option.myr b/lib/std/test/option.myr
index fa8c5c0..fa8c5c0 100644
--- a/libstd/test/option.myr
+++ b/lib/std/test/option.myr
diff --git a/libstd/test/pathjoin.myr b/lib/std/test/pathjoin.myr
index 9cdc064..9cdc064 100644
--- a/libstd/test/pathjoin.myr
+++ b/lib/std/test/pathjoin.myr
diff --git a/libstd/test/search.myr b/lib/std/test/search.myr
index 342a406..342a406 100644
--- a/libstd/test/search.myr
+++ b/lib/std/test/search.myr
diff --git a/libstd/test/slcp.myr b/lib/std/test/slcp.myr
index 67c8298..67c8298 100644
--- a/libstd/test/slcp.myr
+++ b/lib/std/test/slcp.myr
diff --git a/libstd/test/sort.myr b/lib/std/test/sort.myr
index e814623..e814623 100644
--- a/libstd/test/sort.myr
+++ b/lib/std/test/sort.myr
diff --git a/libstd/test/strbuf.myr b/lib/std/test/strbuf.myr
index 2643da5..2643da5 100644
--- a/libstd/test/strbuf.myr
+++ b/lib/std/test/strbuf.myr
diff --git a/libstd/test/try.myr b/lib/std/test/try.myr
index 525b95c..525b95c 100644
--- a/libstd/test/try.myr
+++ b/lib/std/test/try.myr
diff --git a/libstd/try.myr b/lib/std/try.myr
index da960ac..da960ac 100644
--- a/libstd/try.myr
+++ b/lib/std/try.myr
diff --git a/libstd/types.myr b/lib/std/types.myr
index 5ecf42c..5ecf42c 100644
--- a/libstd/types.myr
+++ b/lib/std/types.myr
diff --git a/libstd/units.myr b/lib/std/units.myr
index f1a99e9..f1a99e9 100644
--- a/libstd/units.myr
+++ b/lib/std/units.myr
diff --git a/libstd/utf.myr b/lib/std/utf.myr
index 03cc8bb..03cc8bb 100644
--- a/libstd/utf.myr
+++ b/lib/std/utf.myr
diff --git a/libstd/util+plan9-x64.s b/lib/std/util+plan9-x64.s
index f4b8586..f4b8586 100644
--- a/libstd/util+plan9-x64.s
+++ b/lib/std/util+plan9-x64.s
diff --git a/libstd/util+posixy-x64.s b/lib/std/util+posixy-x64.s
index d44ab79..d44ab79 100644
--- a/libstd/util+posixy-x64.s
+++ b/lib/std/util+posixy-x64.s
diff --git a/libstd/varargs.myr b/lib/std/varargs.myr
index c2ed1b2..c2ed1b2 100644
--- a/libstd/varargs.myr
+++ b/lib/std/varargs.myr
diff --git a/libstd/wait+plan9.myr b/lib/std/wait+plan9.myr
index efe1a1c..efe1a1c 100644
--- a/libstd/wait+plan9.myr
+++ b/lib/std/wait+plan9.myr
diff --git a/libstd/wait+posixy.myr b/lib/std/wait+posixy.myr
index a690feb..a690feb 100644
--- a/libstd/wait+posixy.myr
+++ b/lib/std/wait+posixy.myr
diff --git a/mbld/bld.sub b/mbld/bld.sub
index d655cf1..20792ec 100644
--- a/mbld/bld.sub
+++ b/mbld/bld.sub
@@ -17,10 +17,10 @@ bin mbld =
 	# Currently, mbld doesn't add all deps transitively.
 	# Until this gets fixed, we need to list all dependent
 	# libraries here explicitly.
-	lib ../libstd:sys
-	lib ../libstd:std
-	lib ../libbio:bio
-	lib ../libregex:regex
+	lib @/lib/std:sys
+	lib @/lib/std:std
+	lib @/lib/bio:bio
+	lib @/lib/regex:regex
 ;;
 
 man = mbld.1;;