391 files changed, 14 insertions, 48 deletions

diff --git a/src/clean.bash b/src/clean.bash
index 15a46a76a..e67fe1403 100755
--- a/src/clean.bash
+++ b/src/clean.bash
@@ -5,7 +5,7 @@
 
 rm -rf $GOROOT/pkg/[0-9a-zA-Z_]*
 rm -f $GOROOT/lib/*.[6a]
-for i in lib9 libbio libmach_amd64 libregexp cmd lib
+for i in lib9 libbio libmach_amd64 libregexp cmd pkg
 do
 	cd $i
 	case $i in
diff --git a/src/cmd/gobuild/gobuild.go b/src/cmd/gobuild/gobuild.go
index c84c7e927..d7e9de8ff 100644
--- a/src/cmd/gobuild/gobuild.go
+++ b/src/cmd/gobuild/gobuild.go
@@ -103,14 +103,14 @@ func (a FileArray) Swap(i, j int) {
 	a[i], a[j] = a[j], a[i]
 }
 
-// If current directory is under $GOROOT/src/lib, return the
+// If current directory is under $GOROOT/src/pkg, return the
 // path relative to there.  Otherwise return "".
 func PkgDir() string {
 	goroot, err := os.Getenv("GOROOT");
 	if err != nil || goroot == "" {
 		return ""
 	}
-	srcroot := path.Clean(goroot + "/src/lib/");
+	srcroot := path.Clean(goroot + "/src/pkg/");
 	pwd, err1 := os.Getenv("PWD");	// TODO(rsc): real pwd
 	if err1 != nil || pwd == "" {
 		return ""
diff --git a/src/lib/syscall/types_darwin_386.c b/src/lib/syscall/types_darwin_386.c
deleted file mode 100644
index 71f98e413..000000000
--- a/src/lib/syscall/types_darwin_386.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here.
diff --git a/src/lib/syscall/types_darwin_amd64.c b/src/lib/syscall/types_darwin_amd64.c
deleted file mode 100644
index 71f98e413..000000000
--- a/src/lib/syscall/types_darwin_amd64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here.
diff --git a/src/lib/syscall/types_linux_386.c b/src/lib/syscall/types_linux_386.c
deleted file mode 100644
index 37ce7d76e..000000000
--- a/src/lib/syscall/types_linux_386.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here
diff --git a/src/lib/syscall/types_linux_amd64.c b/src/lib/syscall/types_linux_amd64.c
deleted file mode 100644
index 37ce7d76e..000000000
--- a/src/lib/syscall/types_linux_amd64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Nothing to see here
diff --git a/src/make.bash b/src/make.bash
index f6ee91ad0..841a136c7 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -18,7 +18,7 @@ rm -f $HOME/bin/quietgcc
 cp quietgcc.bash $HOME/bin/quietgcc
 chmod +x $HOME/bin/quietgcc
 
-for i in lib9 libbio libmach_amd64 libregexp cmd lib cmd/gobuild
+for i in lib9 libbio libmach_amd64 libregexp cmd pkg cmd/gobuild
 do
 	echo; echo; echo %%%% making $i %%%%; echo
 	cd $i
diff --git a/src/lib/Make.deps b/src/pkg/Make.deps
index dd83e8b1c..dd83e8b1c 100644
--- a/src/lib/Make.deps
+++ b/src/pkg/Make.deps
diff --git a/src/lib/Makefile b/src/pkg/Makefile
index 036a82e38..036a82e38 100644
--- a/src/lib/Makefile
+++ b/src/pkg/Makefile
diff --git a/src/lib/archive/tar/Makefile b/src/pkg/archive/tar/Makefile
index 579ed4c35..579ed4c35 100644
--- a/src/lib/archive/tar/Makefile
+++ b/src/pkg/archive/tar/Makefile
diff --git a/src/lib/archive/tar/testdata/small.txt b/src/pkg/archive/tar/testdata/small.txt
index b249bfc51..b249bfc51 100644
--- a/src/lib/archive/tar/testdata/small.txt
+++ b/src/pkg/archive/tar/testdata/small.txt
diff --git a/src/lib/archive/tar/testdata/small2.txt b/src/pkg/archive/tar/testdata/small2.txt
index 394ee3ecd..394ee3ecd 100644
--- a/src/lib/archive/tar/testdata/small2.txt
+++ b/src/pkg/archive/tar/testdata/small2.txt
diff --git a/src/lib/archive/tar/testdata/test.tar b/src/pkg/archive/tar/testdata/test.tar
index fc899dc8d..fc899dc8d 100644
--- a/src/lib/archive/tar/testdata/test.tar
+++ b/src/pkg/archive/tar/testdata/test.tar
diff --git a/src/lib/archive/tar/untar.go b/src/pkg/archive/tar/untar.go
index 300c0f932..300c0f932 100644
--- a/src/lib/archive/tar/untar.go
+++ b/src/pkg/archive/tar/untar.go
diff --git a/src/lib/archive/tar/untar_test.go b/src/pkg/archive/tar/untar_test.go
index a9c92dbf0..a9c92dbf0 100644
--- a/src/lib/archive/tar/untar_test.go
+++ b/src/pkg/archive/tar/untar_test.go
diff --git a/src/lib/bignum/Makefile b/src/pkg/bignum/Makefile
index 098b90975..098b90975 100644
--- a/src/lib/bignum/Makefile
+++ b/src/pkg/bignum/Makefile
diff --git a/src/lib/bignum/bignum.go b/src/pkg/bignum/bignum.go
index b9ea66587..b9ea66587 100755
--- a/src/lib/bignum/bignum.go
+++ b/src/pkg/bignum/bignum.go
diff --git a/src/lib/bignum/bignum_test.go b/src/pkg/bignum/bignum_test.go
index 9351c2ebf..9351c2ebf 100644
--- a/src/lib/bignum/bignum_test.go
+++ b/src/pkg/bignum/bignum_test.go
diff --git a/src/lib/bufio/Makefile b/src/pkg/bufio/Makefile
index abb826e7f..abb826e7f 100644
--- a/src/lib/bufio/Makefile
+++ b/src/pkg/bufio/Makefile
diff --git a/src/lib/bufio/bufio.go b/src/pkg/bufio/bufio.go
index 7bfbb089f..7bfbb089f 100644
--- a/src/lib/bufio/bufio.go
+++ b/src/pkg/bufio/bufio.go
diff --git a/src/lib/bufio/bufio_test.go b/src/pkg/bufio/bufio_test.go
index 6e5135df7..6e5135df7 100644
--- a/src/lib/bufio/bufio_test.go
+++ b/src/pkg/bufio/bufio_test.go
diff --git a/src/lib/bytes/Makefile b/src/pkg/bytes/Makefile
index 5220d2880..5220d2880 100644
--- a/src/lib/bytes/Makefile
+++ b/src/pkg/bytes/Makefile
diff --git a/src/lib/bytes/bytes.go b/src/pkg/bytes/bytes.go
index dd299a82e..dd299a82e 100644
--- a/src/lib/bytes/bytes.go
+++ b/src/pkg/bytes/bytes.go
diff --git a/src/lib/bytes/bytes_test.go b/src/pkg/bytes/bytes_test.go
index 4e7cdfad6..4e7cdfad6 100644
--- a/src/lib/bytes/bytes_test.go
+++ b/src/pkg/bytes/bytes_test.go
diff --git a/src/lib/compress/flate/Makefile b/src/pkg/compress/flate/Makefile
index 3f73a1932..3f73a1932 100644
--- a/src/lib/compress/flate/Makefile
+++ b/src/pkg/compress/flate/Makefile
diff --git a/src/lib/compress/flate/flate_test.go b/src/pkg/compress/flate/flate_test.go
index 309606ecb..309606ecb 100644
--- a/src/lib/compress/flate/flate_test.go
+++ b/src/pkg/compress/flate/flate_test.go
diff --git a/src/lib/compress/flate/inflate.go b/src/pkg/compress/flate/inflate.go
index c07c94c6e..c07c94c6e 100644
--- a/src/lib/compress/flate/inflate.go
+++ b/src/pkg/compress/flate/inflate.go
diff --git a/src/lib/compress/gzip/Makefile b/src/pkg/compress/gzip/Makefile
index 514118ae0..514118ae0 100644
--- a/src/lib/compress/gzip/Makefile
+++ b/src/pkg/compress/gzip/Makefile
diff --git a/src/lib/compress/gzip/gunzip.go b/src/pkg/compress/gzip/gunzip.go
index 32cc3ecb0..32cc3ecb0 100644
--- a/src/lib/compress/gzip/gunzip.go
+++ b/src/pkg/compress/gzip/gunzip.go
diff --git a/src/lib/compress/gzip/gunzip_test.go b/src/pkg/compress/gzip/gunzip_test.go
index a481de927..a481de927 100644
--- a/src/lib/compress/gzip/gunzip_test.go
+++ b/src/pkg/compress/gzip/gunzip_test.go
diff --git a/src/lib/container/list/Makefile b/src/pkg/container/list/Makefile
index 2a647eb2a..2a647eb2a 100644
--- a/src/lib/container/list/Makefile
+++ b/src/pkg/container/list/Makefile
diff --git a/src/lib/container/list/list.go b/src/pkg/container/list/list.go
index 7e8daa65a..7e8daa65a 100755
--- a/src/lib/container/list/list.go
+++ b/src/pkg/container/list/list.go
diff --git a/src/lib/container/list/list_test.go b/src/pkg/container/list/list_test.go
index d5b2672e0..d5b2672e0 100755
--- a/src/lib/container/list/list_test.go
+++ b/src/pkg/container/list/list_test.go
diff --git a/src/lib/container/vector/Makefile b/src/pkg/container/vector/Makefile
index 20490549d..20490549d 100644
--- a/src/lib/container/vector/Makefile
+++ b/src/pkg/container/vector/Makefile
diff --git a/src/lib/container/vector/intvector.go b/src/pkg/container/vector/intvector.go
index c3b62f256..c3b62f256 100644
--- a/src/lib/container/vector/intvector.go
+++ b/src/pkg/container/vector/intvector.go
diff --git a/src/lib/container/vector/stringvector.go b/src/pkg/container/vector/stringvector.go
index 18ca11a3f..18ca11a3f 100644
--- a/src/lib/container/vector/stringvector.go
+++ b/src/pkg/container/vector/stringvector.go
diff --git a/src/lib/container/vector/vector.go b/src/pkg/container/vector/vector.go
index 5b5cad21c..5b5cad21c 100644
--- a/src/lib/container/vector/vector.go
+++ b/src/pkg/container/vector/vector.go
diff --git a/src/lib/container/vector/vector_test.go b/src/pkg/container/vector/vector_test.go
index 2a9819394..2a9819394 100644
--- a/src/lib/container/vector/vector_test.go
+++ b/src/pkg/container/vector/vector_test.go
diff --git a/src/lib/crypto/aes/Makefile b/src/pkg/crypto/aes/Makefile
index c62275b3c..c62275b3c 100644
--- a/src/lib/crypto/aes/Makefile
+++ b/src/pkg/crypto/aes/Makefile
diff --git a/src/lib/crypto/aes/aes_test.go b/src/pkg/crypto/aes/aes_test.go
index 2f6cb4a92..2f6cb4a92 100644
--- a/src/lib/crypto/aes/aes_test.go
+++ b/src/pkg/crypto/aes/aes_test.go
diff --git a/src/lib/crypto/aes/block.go b/src/pkg/crypto/aes/block.go
index 3c67d1c3c..3c67d1c3c 100644
--- a/src/lib/crypto/aes/block.go
+++ b/src/pkg/crypto/aes/block.go
diff --git a/src/lib/crypto/aes/cipher.go b/src/pkg/crypto/aes/cipher.go
index fd8e43e16..fd8e43e16 100644
--- a/src/lib/crypto/aes/cipher.go
+++ b/src/pkg/crypto/aes/cipher.go
diff --git a/src/lib/crypto/aes/const.go b/src/pkg/crypto/aes/const.go
index 9167d602d..9167d602d 100644
--- a/src/lib/crypto/aes/const.go
+++ b/src/pkg/crypto/aes/const.go
diff --git a/src/lib/crypto/block/Makefile b/src/pkg/crypto/block/Makefile
index e8bc8e907..e8bc8e907 100644
--- a/src/lib/crypto/block/Makefile
+++ b/src/pkg/crypto/block/Makefile
diff --git a/src/lib/crypto/block/cbc.go b/src/pkg/crypto/block/cbc.go
index 85a746b72..85a746b72 100644
--- a/src/lib/crypto/block/cbc.go
+++ b/src/pkg/crypto/block/cbc.go
diff --git a/src/lib/crypto/block/cbc_aes_test.go b/src/pkg/crypto/block/cbc_aes_test.go
index 4681c1c07..4681c1c07 100644
--- a/src/lib/crypto/block/cbc_aes_test.go
+++ b/src/pkg/crypto/block/cbc_aes_test.go
diff --git a/src/lib/crypto/block/cfb.go b/src/pkg/crypto/block/cfb.go
index 5c4c09a1b..5c4c09a1b 100644
--- a/src/lib/crypto/block/cfb.go
+++ b/src/pkg/crypto/block/cfb.go
diff --git a/src/lib/crypto/block/cfb_aes_test.go b/src/pkg/crypto/block/cfb_aes_test.go
index 6c793dba8..6c793dba8 100644
--- a/src/lib/crypto/block/cfb_aes_test.go
+++ b/src/pkg/crypto/block/cfb_aes_test.go
diff --git a/src/lib/crypto/block/cipher.go b/src/pkg/crypto/block/cipher.go
index 7ea035db9..7ea035db9 100644
--- a/src/lib/crypto/block/cipher.go
+++ b/src/pkg/crypto/block/cipher.go
diff --git a/src/lib/crypto/block/cmac.go b/src/pkg/crypto/block/cmac.go
index 40697cabd..40697cabd 100644
--- a/src/lib/crypto/block/cmac.go
+++ b/src/pkg/crypto/block/cmac.go
diff --git a/src/lib/crypto/block/cmac_aes_test.go b/src/pkg/crypto/block/cmac_aes_test.go
index 9284ac40a..9284ac40a 100644
--- a/src/lib/crypto/block/cmac_aes_test.go
+++ b/src/pkg/crypto/block/cmac_aes_test.go
diff --git a/src/lib/crypto/block/ctr.go b/src/pkg/crypto/block/ctr.go
index eecb615ad..eecb615ad 100644
--- a/src/lib/crypto/block/ctr.go
+++ b/src/pkg/crypto/block/ctr.go
diff --git a/src/lib/crypto/block/ctr_aes_test.go b/src/pkg/crypto/block/ctr_aes_test.go
index a3da1b5bf..a3da1b5bf 100644
--- a/src/lib/crypto/block/ctr_aes_test.go
+++ b/src/pkg/crypto/block/ctr_aes_test.go
diff --git a/src/lib/crypto/block/eax.go b/src/pkg/crypto/block/eax.go
index 7e1d7475c..7e1d7475c 100644
--- a/src/lib/crypto/block/eax.go
+++ b/src/pkg/crypto/block/eax.go
diff --git a/src/lib/crypto/block/eax_aes_test.go b/src/pkg/crypto/block/eax_aes_test.go
index f0453be80..f0453be80 100644
--- a/src/lib/crypto/block/eax_aes_test.go
+++ b/src/pkg/crypto/block/eax_aes_test.go
diff --git a/src/lib/crypto/block/ecb.go b/src/pkg/crypto/block/ecb.go
index 141d38cc8..141d38cc8 100644
--- a/src/lib/crypto/block/ecb.go
+++ b/src/pkg/crypto/block/ecb.go
diff --git a/src/lib/crypto/block/ecb_aes_test.go b/src/pkg/crypto/block/ecb_aes_test.go
index de8a624b9..de8a624b9 100644
--- a/src/lib/crypto/block/ecb_aes_test.go
+++ b/src/pkg/crypto/block/ecb_aes_test.go
diff --git a/src/lib/crypto/block/ecb_test.go b/src/pkg/crypto/block/ecb_test.go
index 968893a9b..968893a9b 100644
--- a/src/lib/crypto/block/ecb_test.go
+++ b/src/pkg/crypto/block/ecb_test.go
diff --git a/src/lib/crypto/block/ofb.go b/src/pkg/crypto/block/ofb.go
index 084274a08..084274a08 100644
--- a/src/lib/crypto/block/ofb.go
+++ b/src/pkg/crypto/block/ofb.go
diff --git a/src/lib/crypto/block/ofb_aes_test.go b/src/pkg/crypto/block/ofb_aes_test.go
index 3f5f9f482..3f5f9f482 100644
--- a/src/lib/crypto/block/ofb_aes_test.go
+++ b/src/pkg/crypto/block/ofb_aes_test.go
diff --git a/src/lib/crypto/block/xor.go b/src/pkg/crypto/block/xor.go
index 63229dbb4..63229dbb4 100644
--- a/src/lib/crypto/block/xor.go
+++ b/src/pkg/crypto/block/xor.go
diff --git a/src/lib/crypto/block/xor_test.go b/src/pkg/crypto/block/xor_test.go
index 6e6d1a3ce..6e6d1a3ce 100644
--- a/src/lib/crypto/block/xor_test.go
+++ b/src/pkg/crypto/block/xor_test.go
diff --git a/src/lib/crypto/hmac/Makefile b/src/pkg/crypto/hmac/Makefile
index 1da3f58dd..1da3f58dd 100644
--- a/src/lib/crypto/hmac/Makefile
+++ b/src/pkg/crypto/hmac/Makefile
diff --git a/src/lib/crypto/hmac/hmac.go b/src/pkg/crypto/hmac/hmac.go
index a3f47ccc9..a3f47ccc9 100644
--- a/src/lib/crypto/hmac/hmac.go
+++ b/src/pkg/crypto/hmac/hmac.go
diff --git a/src/lib/crypto/hmac/hmac_test.go b/src/pkg/crypto/hmac/hmac_test.go
index 01e532d9f..01e532d9f 100644
--- a/src/lib/crypto/hmac/hmac_test.go
+++ b/src/pkg/crypto/hmac/hmac_test.go
diff --git a/src/lib/crypto/md5/Makefile b/src/pkg/crypto/md5/Makefile
index b6c88d45a..b6c88d45a 100644
--- a/src/lib/crypto/md5/Makefile
+++ b/src/pkg/crypto/md5/Makefile
diff --git a/src/lib/crypto/md5/md5.go b/src/pkg/crypto/md5/md5.go
index cbc007f01..cbc007f01 100644
--- a/src/lib/crypto/md5/md5.go
+++ b/src/pkg/crypto/md5/md5.go
diff --git a/src/lib/crypto/md5/md5_test.go b/src/pkg/crypto/md5/md5_test.go
index f610f1143..f610f1143 100644
--- a/src/lib/crypto/md5/md5_test.go
+++ b/src/pkg/crypto/md5/md5_test.go
diff --git a/src/lib/crypto/md5/md5block.go b/src/pkg/crypto/md5/md5block.go
index 2776c8795..2776c8795 100644
--- a/src/lib/crypto/md5/md5block.go
+++ b/src/pkg/crypto/md5/md5block.go
diff --git a/src/lib/crypto/sha1/Makefile b/src/pkg/crypto/sha1/Makefile
index 03ffe4fd7..03ffe4fd7 100644
--- a/src/lib/crypto/sha1/Makefile
+++ b/src/pkg/crypto/sha1/Makefile
diff --git a/src/lib/crypto/sha1/sha1.go b/src/pkg/crypto/sha1/sha1.go
index a4cccd7a3..a4cccd7a3 100644
--- a/src/lib/crypto/sha1/sha1.go
+++ b/src/pkg/crypto/sha1/sha1.go
diff --git a/src/lib/crypto/sha1/sha1_test.go b/src/pkg/crypto/sha1/sha1_test.go
index 381cc76ee..381cc76ee 100644
--- a/src/lib/crypto/sha1/sha1_test.go
+++ b/src/pkg/crypto/sha1/sha1_test.go
diff --git a/src/lib/crypto/sha1/sha1block.go b/src/pkg/crypto/sha1/sha1block.go
index 01ddd9506..01ddd9506 100644
--- a/src/lib/crypto/sha1/sha1block.go
+++ b/src/pkg/crypto/sha1/sha1block.go
diff --git a/src/lib/datafmt/Makefile b/src/pkg/datafmt/Makefile
index 1546faf7e..1546faf7e 100644
--- a/src/lib/datafmt/Makefile
+++ b/src/pkg/datafmt/Makefile
diff --git a/src/lib/datafmt/datafmt.go b/src/pkg/datafmt/datafmt.go
index 0aedbbbb0..0aedbbbb0 100644
--- a/src/lib/datafmt/datafmt.go
+++ b/src/pkg/datafmt/datafmt.go
diff --git a/src/lib/datafmt/datafmt_test.go b/src/pkg/datafmt/datafmt_test.go
index 788c013c6..788c013c6 100644
--- a/src/lib/datafmt/datafmt_test.go
+++ b/src/pkg/datafmt/datafmt_test.go
diff --git a/src/lib/datafmt/parser.go b/src/pkg/datafmt/parser.go
index 0d597dcb5..0d597dcb5 100644
--- a/src/lib/datafmt/parser.go
+++ b/src/pkg/datafmt/parser.go
diff --git a/src/lib/exec/Makefile b/src/pkg/exec/Makefile
index 679cc39c0..679cc39c0 100644
--- a/src/lib/exec/Makefile
+++ b/src/pkg/exec/Makefile
diff --git a/src/lib/exec/exec.go b/src/pkg/exec/exec.go
index c2b7bdd59..c2b7bdd59 100644
--- a/src/lib/exec/exec.go
+++ b/src/pkg/exec/exec.go
diff --git a/src/lib/exec/exec_test.go b/src/pkg/exec/exec_test.go
index a1bb1f50e..a1bb1f50e 100644
--- a/src/lib/exec/exec_test.go
+++ b/src/pkg/exec/exec_test.go
diff --git a/src/lib/exvar/Makefile b/src/pkg/exvar/Makefile
index a65a1ee6b..a65a1ee6b 100644
--- a/src/lib/exvar/Makefile
+++ b/src/pkg/exvar/Makefile
diff --git a/src/lib/exvar/exvar.go b/src/pkg/exvar/exvar.go
index 6473f7af6..6473f7af6 100644
--- a/src/lib/exvar/exvar.go
+++ b/src/pkg/exvar/exvar.go
diff --git a/src/lib/exvar/exvar_test.go b/src/pkg/exvar/exvar_test.go
index 8b028bccb..8b028bccb 100644
--- a/src/lib/exvar/exvar_test.go
+++ b/src/pkg/exvar/exvar_test.go
diff --git a/src/lib/flag/Makefile b/src/pkg/flag/Makefile
index 466e19564..466e19564 100644
--- a/src/lib/flag/Makefile
+++ b/src/pkg/flag/Makefile
diff --git a/src/lib/flag/flag.go b/src/pkg/flag/flag.go
index 63d649a9b..63d649a9b 100644
--- a/src/lib/flag/flag.go
+++ b/src/pkg/flag/flag.go
diff --git a/src/lib/flag/flag_test.go b/src/pkg/flag/flag_test.go
index 0d83fcf81..0d83fcf81 100644
--- a/src/lib/flag/flag_test.go
+++ b/src/pkg/flag/flag_test.go
diff --git a/src/lib/fmt/Makefile b/src/pkg/fmt/Makefile
index 5d0281a0c..5d0281a0c 100644
--- a/src/lib/fmt/Makefile
+++ b/src/pkg/fmt/Makefile
diff --git a/src/lib/fmt/fmt_test.go b/src/pkg/fmt/fmt_test.go
index e8abc2f0d..e8abc2f0d 100644
--- a/src/lib/fmt/fmt_test.go
+++ b/src/pkg/fmt/fmt_test.go
diff --git a/src/lib/fmt/format.go b/src/pkg/fmt/format.go
index 3cd492980..3cd492980 100644
--- a/src/lib/fmt/format.go
+++ b/src/pkg/fmt/format.go
diff --git a/src/lib/fmt/print.go b/src/pkg/fmt/print.go
index 66174c74b..66174c74b 100644
--- a/src/lib/fmt/print.go
+++ b/src/pkg/fmt/print.go
diff --git a/src/lib/go/ast/Makefile b/src/pkg/go/ast/Makefile
index 1fd22ae71..1fd22ae71 100644
--- a/src/lib/go/ast/Makefile
+++ b/src/pkg/go/ast/Makefile
diff --git a/src/lib/go/ast/ast.go b/src/pkg/go/ast/ast.go
index 6cac8ea1a..6cac8ea1a 100644
--- a/src/lib/go/ast/ast.go
+++ b/src/pkg/go/ast/ast.go
diff --git a/src/lib/go/ast/format.go b/src/pkg/go/ast/format.go
index caeca19aa..caeca19aa 100644
--- a/src/lib/go/ast/format.go
+++ b/src/pkg/go/ast/format.go
diff --git a/src/lib/go/doc/Makefile b/src/pkg/go/doc/Makefile
index d7c6acaac..d7c6acaac 100644
--- a/src/lib/go/doc/Makefile
+++ b/src/pkg/go/doc/Makefile
diff --git a/src/lib/go/doc/comment.go b/src/pkg/go/doc/comment.go
index 19a65a227..19a65a227 100644
--- a/src/lib/go/doc/comment.go
+++ b/src/pkg/go/doc/comment.go
diff --git a/src/lib/go/doc/doc.go b/src/pkg/go/doc/doc.go
index 03872fd14..03872fd14 100644
--- a/src/lib/go/doc/doc.go
+++ b/src/pkg/go/doc/doc.go
diff --git a/src/lib/go/parser/Makefile b/src/pkg/go/parser/Makefile
index 08d83646f..08d83646f 100644
--- a/src/lib/go/parser/Makefile
+++ b/src/pkg/go/parser/Makefile
diff --git a/src/lib/go/parser/parser.go b/src/pkg/go/parser/parser.go
index 056868695..056868695 100644
--- a/src/lib/go/parser/parser.go
+++ b/src/pkg/go/parser/parser.go
diff --git a/src/lib/go/parser/parser_test.go b/src/pkg/go/parser/parser_test.go
index 887fcf80f..887fcf80f 100644
--- a/src/lib/go/parser/parser_test.go
+++ b/src/pkg/go/parser/parser_test.go
diff --git a/src/lib/go/scanner/Makefile b/src/pkg/go/scanner/Makefile
index d47fecb7c..d47fecb7c 100644
--- a/src/lib/go/scanner/Makefile
+++ b/src/pkg/go/scanner/Makefile
diff --git a/src/lib/go/scanner/scanner.go b/src/pkg/go/scanner/scanner.go
index a90e6f259..a90e6f259 100644
--- a/src/lib/go/scanner/scanner.go
+++ b/src/pkg/go/scanner/scanner.go
diff --git a/src/lib/go/scanner/scanner_test.go b/src/pkg/go/scanner/scanner_test.go
index 0defece8b..0defece8b 100644
--- a/src/lib/go/scanner/scanner_test.go
+++ b/src/pkg/go/scanner/scanner_test.go
diff --git a/src/lib/go/token/Makefile b/src/pkg/go/token/Makefile
index 12ef2a4aa..12ef2a4aa 100644
--- a/src/lib/go/token/Makefile
+++ b/src/pkg/go/token/Makefile
diff --git a/src/lib/go/token/token.go b/src/pkg/go/token/token.go
index a70a75a54..a70a75a54 100644
--- a/src/lib/go/token/token.go
+++ b/src/pkg/go/token/token.go
diff --git a/src/lib/hash/Makefile b/src/pkg/hash/Makefile
index bdbb6f347..bdbb6f347 100644
--- a/src/lib/hash/Makefile
+++ b/src/pkg/hash/Makefile
diff --git a/src/lib/hash/adler32/Makefile b/src/pkg/hash/adler32/Makefile
index 134131259..134131259 100644
--- a/src/lib/hash/adler32/Makefile
+++ b/src/pkg/hash/adler32/Makefile
diff --git a/src/lib/hash/adler32/adler32.go b/src/pkg/hash/adler32/adler32.go
index fbf9177f8..fbf9177f8 100644
--- a/src/lib/hash/adler32/adler32.go
+++ b/src/pkg/hash/adler32/adler32.go
diff --git a/src/lib/hash/adler32/adler32_test.go b/src/pkg/hash/adler32/adler32_test.go
index ce49a110b..ce49a110b 100644
--- a/src/lib/hash/adler32/adler32_test.go
+++ b/src/pkg/hash/adler32/adler32_test.go
diff --git a/src/lib/hash/crc32/Makefile b/src/pkg/hash/crc32/Makefile
index 08d4f5e4e..08d4f5e4e 100644
--- a/src/lib/hash/crc32/Makefile
+++ b/src/pkg/hash/crc32/Makefile
diff --git a/src/lib/hash/crc32/crc32.go b/src/pkg/hash/crc32/crc32.go
index 22a0f68f6..22a0f68f6 100644
--- a/src/lib/hash/crc32/crc32.go
+++ b/src/pkg/hash/crc32/crc32.go
diff --git a/src/lib/hash/crc32/crc32_test.go b/src/pkg/hash/crc32/crc32_test.go
index c037da600..c037da600 100644
--- a/src/lib/hash/crc32/crc32_test.go
+++ b/src/pkg/hash/crc32/crc32_test.go
diff --git a/src/lib/hash/hash.go b/src/pkg/hash/hash.go
index a7c08cfed..a7c08cfed 100644
--- a/src/lib/hash/hash.go
+++ b/src/pkg/hash/hash.go
diff --git a/src/lib/hash/test_cases.txt b/src/pkg/hash/test_cases.txt
index 26d3ccc05..26d3ccc05 100644
--- a/src/lib/hash/test_cases.txt
+++ b/src/pkg/hash/test_cases.txt
diff --git a/src/lib/hash/test_gen.awk b/src/pkg/hash/test_gen.awk
index 804f78679..804f78679 100644
--- a/src/lib/hash/test_gen.awk
+++ b/src/pkg/hash/test_gen.awk
diff --git a/src/lib/http/Makefile b/src/pkg/http/Makefile
index 0a029497c..0a029497c 100644
--- a/src/lib/http/Makefile
+++ b/src/pkg/http/Makefile
diff --git a/src/lib/http/fs.go b/src/pkg/http/fs.go
index 108734c47..108734c47 100644
--- a/src/lib/http/fs.go
+++ b/src/pkg/http/fs.go
diff --git a/src/lib/http/request.go b/src/pkg/http/request.go
index 76dd6f30c..76dd6f30c 100644
--- a/src/lib/http/request.go
+++ b/src/pkg/http/request.go
diff --git a/src/lib/http/server.go b/src/pkg/http/server.go
index c1de5de78..c1de5de78 100644
--- a/src/lib/http/server.go
+++ b/src/pkg/http/server.go
diff --git a/src/lib/http/status.go b/src/pkg/http/status.go
index 6d1c5ab28..6d1c5ab28 100644
--- a/src/lib/http/status.go
+++ b/src/pkg/http/status.go
diff --git a/src/lib/http/triv.go b/src/pkg/http/triv.go
index fc9501769..fc9501769 100644
--- a/src/lib/http/triv.go
+++ b/src/pkg/http/triv.go
diff --git a/src/lib/http/url.go b/src/pkg/http/url.go
index 0325b04ee..0325b04ee 100644
--- a/src/lib/http/url.go
+++ b/src/pkg/http/url.go
diff --git a/src/lib/http/url_test.go b/src/pkg/http/url_test.go
index 8d8fabad5..8d8fabad5 100644
--- a/src/lib/http/url_test.go
+++ b/src/pkg/http/url_test.go
diff --git a/src/lib/io/Makefile b/src/pkg/io/Makefile
index 219ea776b..219ea776b 100644
--- a/src/lib/io/Makefile
+++ b/src/pkg/io/Makefile
diff --git a/src/lib/io/bytebuffer.go b/src/pkg/io/bytebuffer.go
index 921ddb17a..921ddb17a 100644
--- a/src/lib/io/bytebuffer.go
+++ b/src/pkg/io/bytebuffer.go
diff --git a/src/lib/io/bytebuffer_test.go b/src/pkg/io/bytebuffer_test.go
index 5a5432223..5a5432223 100644
--- a/src/lib/io/bytebuffer_test.go
+++ b/src/pkg/io/bytebuffer_test.go
diff --git a/src/lib/io/io.go b/src/pkg/io/io.go
index ba0449ac1..ba0449ac1 100644
--- a/src/lib/io/io.go
+++ b/src/pkg/io/io.go
diff --git a/src/lib/io/pipe.go b/src/pkg/io/pipe.go
index 1a443ddce..1a443ddce 100644
--- a/src/lib/io/pipe.go
+++ b/src/pkg/io/pipe.go
diff --git a/src/lib/io/pipe_test.go b/src/pkg/io/pipe_test.go
index 277f44525..277f44525 100644
--- a/src/lib/io/pipe_test.go
+++ b/src/pkg/io/pipe_test.go
diff --git a/src/lib/io/utils.go b/src/pkg/io/utils.go
index a4cbb2d9a..a4cbb2d9a 100644
--- a/src/lib/io/utils.go
+++ b/src/pkg/io/utils.go
diff --git a/src/lib/io/utils_test.go b/src/pkg/io/utils_test.go
index f35dad60c..f35dad60c 100644
--- a/src/lib/io/utils_test.go
+++ b/src/pkg/io/utils_test.go
diff --git a/src/lib/json/Makefile b/src/pkg/json/Makefile
index 2d70c2cf8..2d70c2cf8 100644
--- a/src/lib/json/Makefile
+++ b/src/pkg/json/Makefile
diff --git a/src/lib/json/generic.go b/src/pkg/json/generic.go
index e3194eb17..e3194eb17 100644
--- a/src/lib/json/generic.go
+++ b/src/pkg/json/generic.go
diff --git a/src/lib/json/generic_test.go b/src/pkg/json/generic_test.go
index 68868d7a5..68868d7a5 100644
--- a/src/lib/json/generic_test.go
+++ b/src/pkg/json/generic_test.go
diff --git a/src/lib/json/parse.go b/src/pkg/json/parse.go
index e33b9dbc1..e33b9dbc1 100644
--- a/src/lib/json/parse.go
+++ b/src/pkg/json/parse.go
diff --git a/src/lib/json/struct.go b/src/pkg/json/struct.go
index ac2689557..ac2689557 100644
--- a/src/lib/json/struct.go
+++ b/src/pkg/json/struct.go
diff --git a/src/lib/json/struct_test.go b/src/pkg/json/struct_test.go
index 88d9e9ec4..88d9e9ec4 100644
--- a/src/lib/json/struct_test.go
+++ b/src/pkg/json/struct_test.go
diff --git a/src/lib/log/Makefile b/src/pkg/log/Makefile
index 4b1c4b5a2..4b1c4b5a2 100644
--- a/src/lib/log/Makefile
+++ b/src/pkg/log/Makefile
diff --git a/src/lib/log/log.go b/src/pkg/log/log.go
index 8fcd73190..8fcd73190 100644
--- a/src/lib/log/log.go
+++ b/src/pkg/log/log.go
diff --git a/src/lib/log/log_test.go b/src/pkg/log/log_test.go
index 0cfb2e36f..0cfb2e36f 100644
--- a/src/lib/log/log_test.go
+++ b/src/pkg/log/log_test.go
diff --git a/src/lib/malloc/Makefile b/src/pkg/malloc/Makefile
index 61894f71f..61894f71f 100644
--- a/src/lib/malloc/Makefile
+++ b/src/pkg/malloc/Makefile
diff --git a/src/lib/malloc/malloc.go b/src/pkg/malloc/malloc.go
index fec53f08f..fec53f08f 100644
--- a/src/lib/malloc/malloc.go
+++ b/src/pkg/malloc/malloc.go
diff --git a/src/lib/math/Makefile b/src/pkg/math/Makefile
index 058049072..058049072 100644
--- a/src/lib/math/Makefile
+++ b/src/pkg/math/Makefile
diff --git a/src/lib/math/all_test.go b/src/pkg/math/all_test.go
index c5d5c01c4..c5d5c01c4 100644
--- a/src/lib/math/all_test.go
+++ b/src/pkg/math/all_test.go
diff --git a/src/lib/math/asin.go b/src/pkg/math/asin.go
index 23c9a1069..23c9a1069 100644
--- a/src/lib/math/asin.go
+++ b/src/pkg/math/asin.go
diff --git a/src/lib/math/atan.go b/src/pkg/math/atan.go
index 4b18f76aa..4b18f76aa 100644
--- a/src/lib/math/atan.go
+++ b/src/pkg/math/atan.go
diff --git a/src/lib/math/atan2.go b/src/pkg/math/atan2.go
index 72f2117b3..72f2117b3 100644
--- a/src/lib/math/atan2.go
+++ b/src/pkg/math/atan2.go
diff --git a/src/lib/math/const.go b/src/pkg/math/const.go
index 259660fea..259660fea 100644
--- a/src/lib/math/const.go
+++ b/src/pkg/math/const.go
diff --git a/src/lib/math/exp.go b/src/pkg/math/exp.go
index a32c7e1d5..a32c7e1d5 100644
--- a/src/lib/math/exp.go
+++ b/src/pkg/math/exp.go
diff --git a/src/lib/math/fabs.go b/src/pkg/math/fabs.go
index 9427c5726..9427c5726 100644
--- a/src/lib/math/fabs.go
+++ b/src/pkg/math/fabs.go
diff --git a/src/lib/math/floor.go b/src/pkg/math/floor.go
index 48a1003f0..48a1003f0 100644
--- a/src/lib/math/floor.go
+++ b/src/pkg/math/floor.go
diff --git a/src/lib/math/fmod.go b/src/pkg/math/fmod.go
index 617f5408b..617f5408b 100644
--- a/src/lib/math/fmod.go
+++ b/src/pkg/math/fmod.go
diff --git a/src/lib/math/hypot.go b/src/pkg/math/hypot.go
index 411f74e4f..411f74e4f 100644
--- a/src/lib/math/hypot.go
+++ b/src/pkg/math/hypot.go
diff --git a/src/lib/math/log.go b/src/pkg/math/log.go
index b24175b63..b24175b63 100644
--- a/src/lib/math/log.go
+++ b/src/pkg/math/log.go
diff --git a/src/lib/math/pow.go b/src/pkg/math/pow.go
index 920d210b5..920d210b5 100644
--- a/src/lib/math/pow.go
+++ b/src/pkg/math/pow.go
diff --git a/src/lib/math/pow10.go b/src/pkg/math/pow10.go
index fcdd6e0a1..fcdd6e0a1 100644
--- a/src/lib/math/pow10.go
+++ b/src/pkg/math/pow10.go
diff --git a/src/lib/math/runtime.go b/src/pkg/math/runtime.go
index 69d333825..69d333825 100644
--- a/src/lib/math/runtime.go
+++ b/src/pkg/math/runtime.go
diff --git a/src/lib/math/sin.go b/src/pkg/math/sin.go
index 9fc69606c..9fc69606c 100644
--- a/src/lib/math/sin.go
+++ b/src/pkg/math/sin.go
diff --git a/src/lib/math/sinh.go b/src/pkg/math/sinh.go
index ef70989fb..ef70989fb 100644
--- a/src/lib/math/sinh.go
+++ b/src/pkg/math/sinh.go
diff --git a/src/lib/math/sqrt.go b/src/pkg/math/sqrt.go
index 79384f648..79384f648 100644
--- a/src/lib/math/sqrt.go
+++ b/src/pkg/math/sqrt.go
diff --git a/src/lib/math/tan.go b/src/pkg/math/tan.go
index 2d4a044b8..2d4a044b8 100644
--- a/src/lib/math/tan.go
+++ b/src/pkg/math/tan.go
diff --git a/src/lib/math/tanh.go b/src/pkg/math/tanh.go
index 18d38ae8f..18d38ae8f 100644
--- a/src/lib/math/tanh.go
+++ b/src/pkg/math/tanh.go
diff --git a/src/lib/net/Makefile b/src/pkg/net/Makefile
index 61c872089..61c872089 100644
--- a/src/lib/net/Makefile
+++ b/src/pkg/net/Makefile
diff --git a/src/lib/net/dialgoogle_test.go b/src/pkg/net/dialgoogle_test.go
index 1e0c0aaf0..1e0c0aaf0 100644
--- a/src/lib/net/dialgoogle_test.go
+++ b/src/pkg/net/dialgoogle_test.go
diff --git a/src/lib/net/dnsclient.go b/src/pkg/net/dnsclient.go
index cfd67eabe..cfd67eabe 100644
--- a/src/lib/net/dnsclient.go
+++ b/src/pkg/net/dnsclient.go
diff --git a/src/lib/net/dnsconfig.go b/src/pkg/net/dnsconfig.go
index e56d964f2..e56d964f2 100644
--- a/src/lib/net/dnsconfig.go
+++ b/src/pkg/net/dnsconfig.go
diff --git a/src/lib/net/dnsmsg.go b/src/pkg/net/dnsmsg.go
index d7a467fc6..d7a467fc6 100644
--- a/src/lib/net/dnsmsg.go
+++ b/src/pkg/net/dnsmsg.go
diff --git a/src/lib/net/fd.go b/src/pkg/net/fd.go
index 9404ed0bd..9404ed0bd 100644
--- a/src/lib/net/fd.go
+++ b/src/pkg/net/fd.go
diff --git a/src/lib/net/fd_darwin.go b/src/pkg/net/fd_darwin.go
index 42bf51221..42bf51221 100644
--- a/src/lib/net/fd_darwin.go
+++ b/src/pkg/net/fd_darwin.go
diff --git a/src/lib/net/fd_linux.go b/src/pkg/net/fd_linux.go
index bd822589e..bd822589e 100644
--- a/src/lib/net/fd_linux.go
+++ b/src/pkg/net/fd_linux.go
diff --git a/src/lib/net/ip.go b/src/pkg/net/ip.go
index 774f048ca..774f048ca 100644
--- a/src/lib/net/ip.go
+++ b/src/pkg/net/ip.go
diff --git a/src/lib/net/ip_test.go b/src/pkg/net/ip_test.go
index fb2ae8216..fb2ae8216 100644
--- a/src/lib/net/ip_test.go
+++ b/src/pkg/net/ip_test.go
diff --git a/src/lib/net/net.go b/src/pkg/net/net.go
index 5c442e6a4..5c442e6a4 100644
--- a/src/lib/net/net.go
+++ b/src/pkg/net/net.go
diff --git a/src/lib/net/parse.go b/src/pkg/net/parse.go
index de47cb812..de47cb812 100644
--- a/src/lib/net/parse.go
+++ b/src/pkg/net/parse.go
diff --git a/src/lib/net/parse_test.go b/src/pkg/net/parse_test.go
index ce0bb4709..ce0bb4709 100644
--- a/src/lib/net/parse_test.go
+++ b/src/pkg/net/parse_test.go
diff --git a/src/lib/net/port.go b/src/pkg/net/port.go
index 21e3b48aa..21e3b48aa 100644
--- a/src/lib/net/port.go
+++ b/src/pkg/net/port.go
diff --git a/src/lib/net/port_test.go b/src/pkg/net/port_test.go
index c535d4caa..c535d4caa 100644
--- a/src/lib/net/port_test.go
+++ b/src/pkg/net/port_test.go
diff --git a/src/lib/net/server_test.go b/src/pkg/net/server_test.go
index 586b55365..586b55365 100644
--- a/src/lib/net/server_test.go
+++ b/src/pkg/net/server_test.go
diff --git a/src/lib/net/timeout_test.go b/src/pkg/net/timeout_test.go
index e08ce88ce..e08ce88ce 100644
--- a/src/lib/net/timeout_test.go
+++ b/src/pkg/net/timeout_test.go
diff --git a/src/lib/once/Makefile b/src/pkg/once/Makefile
index 6350402c2..6350402c2 100644
--- a/src/lib/once/Makefile
+++ b/src/pkg/once/Makefile
diff --git a/src/lib/once/once.go b/src/pkg/once/once.go
index 6047df236..6047df236 100644
--- a/src/lib/once/once.go
+++ b/src/pkg/once/once.go
diff --git a/src/lib/once/once_test.go b/src/pkg/once/once_test.go
index 9506ff3d7..9506ff3d7 100644
--- a/src/lib/once/once_test.go
+++ b/src/pkg/once/once_test.go
diff --git a/src/lib/os/Makefile b/src/pkg/os/Makefile
index c5f790f15..c5f790f15 100644
--- a/src/lib/os/Makefile
+++ b/src/pkg/os/Makefile
diff --git a/src/lib/os/dir_darwin_386.go b/src/pkg/os/dir_darwin_386.go
index 2803ecee2..2803ecee2 100644
--- a/src/lib/os/dir_darwin_386.go
+++ b/src/pkg/os/dir_darwin_386.go
diff --git a/src/lib/os/dir_darwin_amd64.go b/src/pkg/os/dir_darwin_amd64.go
index 2803ecee2..2803ecee2 100644
--- a/src/lib/os/dir_darwin_amd64.go
+++ b/src/pkg/os/dir_darwin_amd64.go
diff --git a/src/lib/os/dir_linux_386.go b/src/pkg/os/dir_linux_386.go
index c4594a52d..c4594a52d 100644
--- a/src/lib/os/dir_linux_386.go
+++ b/src/pkg/os/dir_linux_386.go
diff --git a/src/lib/os/dir_linux_amd64.go b/src/pkg/os/dir_linux_amd64.go
index 05b3d4c65..05b3d4c65 100644
--- a/src/lib/os/dir_linux_amd64.go
+++ b/src/pkg/os/dir_linux_amd64.go
diff --git a/src/lib/os/env.go b/src/pkg/os/env.go
index 748750413..748750413 100644
--- a/src/lib/os/env.go
+++ b/src/pkg/os/env.go
diff --git a/src/lib/os/error.go b/src/pkg/os/error.go
index 718499b21..718499b21 100644
--- a/src/lib/os/error.go
+++ b/src/pkg/os/error.go
diff --git a/src/lib/os/exec.go b/src/pkg/os/exec.go
index d283c7267..d283c7267 100644
--- a/src/lib/os/exec.go
+++ b/src/pkg/os/exec.go
diff --git a/src/lib/os/file.go b/src/pkg/os/file.go
index 1562b1b0e..1562b1b0e 100644
--- a/src/lib/os/file.go
+++ b/src/pkg/os/file.go
diff --git a/src/lib/os/getwd.go b/src/pkg/os/getwd.go
index 2d7b754b5..2d7b754b5 100644
--- a/src/lib/os/getwd.go
+++ b/src/pkg/os/getwd.go
diff --git a/src/lib/os/os_test.go b/src/pkg/os/os_test.go
index 9f3e833f3..9f3e833f3 100644
--- a/src/lib/os/os_test.go
+++ b/src/pkg/os/os_test.go
diff --git a/src/lib/os/path.go b/src/pkg/os/path.go
index 0b86b8f8b..0b86b8f8b 100644
--- a/src/lib/os/path.go
+++ b/src/pkg/os/path.go
diff --git a/src/lib/os/path_test.go b/src/pkg/os/path_test.go
index bb6148920..bb6148920 100644
--- a/src/lib/os/path_test.go
+++ b/src/pkg/os/path_test.go
diff --git a/src/lib/os/proc.go b/src/pkg/os/proc.go
index d2fd6493e..d2fd6493e 100644
--- a/src/lib/os/proc.go
+++ b/src/pkg/os/proc.go
diff --git a/src/lib/os/proc_linux.go b/src/pkg/os/proc_linux.go
index a802284f3..a802284f3 100644
--- a/src/lib/os/proc_linux.go
+++ b/src/pkg/os/proc_linux.go
diff --git a/src/lib/os/stat_darwin_386.go b/src/pkg/os/stat_darwin_386.go
index a6d7b78d1..a6d7b78d1 100644
--- a/src/lib/os/stat_darwin_386.go
+++ b/src/pkg/os/stat_darwin_386.go
diff --git a/src/lib/os/stat_darwin_amd64.go b/src/pkg/os/stat_darwin_amd64.go
index 1771ca160..1771ca160 100644
--- a/src/lib/os/stat_darwin_amd64.go
+++ b/src/pkg/os/stat_darwin_amd64.go
diff --git a/src/lib/os/stat_linux_386.go b/src/pkg/os/stat_linux_386.go
index 13ee942c9..13ee942c9 100644
--- a/src/lib/os/stat_linux_386.go
+++ b/src/pkg/os/stat_linux_386.go
diff --git a/src/lib/os/stat_linux_amd64.go b/src/pkg/os/stat_linux_amd64.go
index 9b3018178..9b3018178 100644
--- a/src/lib/os/stat_linux_amd64.go
+++ b/src/pkg/os/stat_linux_amd64.go
diff --git a/src/lib/os/time.go b/src/pkg/os/time.go
index 3eee243cc..3eee243cc 100644
--- a/src/lib/os/time.go
+++ b/src/pkg/os/time.go
diff --git a/src/lib/os/types.go b/src/pkg/os/types.go
index b5db86660..b5db86660 100644
--- a/src/lib/os/types.go
+++ b/src/pkg/os/types.go
diff --git a/src/lib/path/Makefile b/src/pkg/path/Makefile
index d9f9fd562..d9f9fd562 100644
--- a/src/lib/path/Makefile
+++ b/src/pkg/path/Makefile
diff --git a/src/lib/path/path.go b/src/pkg/path/path.go
index a7e2c26c3..a7e2c26c3 100644
--- a/src/lib/path/path.go
+++ b/src/pkg/path/path.go
diff --git a/src/lib/path/path_test.go b/src/pkg/path/path_test.go
index 1238ac1cd..1238ac1cd 100644
--- a/src/lib/path/path_test.go
+++ b/src/pkg/path/path_test.go
diff --git a/src/lib/rand/Makefile b/src/pkg/rand/Makefile
index 63d26ac99..63d26ac99 100644
--- a/src/lib/rand/Makefile
+++ b/src/pkg/rand/Makefile
diff --git a/src/lib/rand/rand.go b/src/pkg/rand/rand.go
index bc986cbcf..bc986cbcf 100644
--- a/src/lib/rand/rand.go
+++ b/src/pkg/rand/rand.go
diff --git a/src/lib/reflect/Makefile b/src/pkg/reflect/Makefile
index d622ffd51..d622ffd51 100644
--- a/src/lib/reflect/Makefile
+++ b/src/pkg/reflect/Makefile
diff --git a/src/lib/reflect/all_test.go b/src/pkg/reflect/all_test.go
index 903b0f526..903b0f526 100644
--- a/src/lib/reflect/all_test.go
+++ b/src/pkg/reflect/all_test.go
diff --git a/src/lib/reflect/deepequal.go b/src/pkg/reflect/deepequal.go
index 57b52485f..57b52485f 100644
--- a/src/lib/reflect/deepequal.go
+++ b/src/pkg/reflect/deepequal.go
diff --git a/src/lib/reflect/tostring.go b/src/pkg/reflect/tostring.go
index 43be4b9e8..43be4b9e8 100644
--- a/src/lib/reflect/tostring.go
+++ b/src/pkg/reflect/tostring.go
diff --git a/src/lib/reflect/type.go b/src/pkg/reflect/type.go
index c8542183a..c8542183a 100644
--- a/src/lib/reflect/type.go
+++ b/src/pkg/reflect/type.go
diff --git a/src/lib/reflect/typestring.c b/src/pkg/reflect/typestring.c
index 667037bb1..667037bb1 100644
--- a/src/lib/reflect/typestring.c
+++ b/src/pkg/reflect/typestring.c
diff --git a/src/lib/reflect/value.go b/src/pkg/reflect/value.go
index d4783d546..d4783d546 100644
--- a/src/lib/reflect/value.go
+++ b/src/pkg/reflect/value.go
diff --git a/src/lib/regexp/Makefile b/src/pkg/regexp/Makefile
index 0312d510e..0312d510e 100644
--- a/src/lib/regexp/Makefile
+++ b/src/pkg/regexp/Makefile
diff --git a/src/lib/regexp/all_test.go b/src/pkg/regexp/all_test.go
index a9f275893..a9f275893 100644
--- a/src/lib/regexp/all_test.go
+++ b/src/pkg/regexp/all_test.go
diff --git a/src/lib/regexp/regexp.go b/src/pkg/regexp/regexp.go
index b79800dd9..b79800dd9 100644
--- a/src/lib/regexp/regexp.go
+++ b/src/pkg/regexp/regexp.go
diff --git a/src/lib/runtime/386/asm.s b/src/pkg/runtime/386/asm.s
index 5d3c4261a..5d3c4261a 100644
--- a/src/lib/runtime/386/asm.s
+++ b/src/pkg/runtime/386/asm.s
diff --git a/src/lib/runtime/386/closure.c b/src/pkg/runtime/386/closure.c
index 6ccbe3b8b..6ccbe3b8b 100644
--- a/src/lib/runtime/386/closure.c
+++ b/src/pkg/runtime/386/closure.c
diff --git a/src/lib/runtime/386/traceback.c b/src/pkg/runtime/386/traceback.c
index 05724d9ac..05724d9ac 100644
--- a/src/lib/runtime/386/traceback.c
+++ b/src/pkg/runtime/386/traceback.c
diff --git a/src/lib/runtime/386/vlop.s b/src/pkg/runtime/386/vlop.s
index 803276ce2..803276ce2 100755
--- a/src/lib/runtime/386/vlop.s
+++ b/src/pkg/runtime/386/vlop.s
diff --git a/src/lib/runtime/386/vlrt.c b/src/pkg/runtime/386/vlrt.c
index 093cca70d..093cca70d 100755
--- a/src/lib/runtime/386/vlrt.c
+++ b/src/pkg/runtime/386/vlrt.c
diff --git a/src/lib/runtime/Makefile b/src/pkg/runtime/Makefile
index 5a5ace9c5..5a5ace9c5 100644
--- a/src/lib/runtime/Makefile
+++ b/src/pkg/runtime/Makefile
diff --git a/src/lib/runtime/amd64/asm.s b/src/pkg/runtime/amd64/asm.s
index 6fc01bbc9..6fc01bbc9 100644
--- a/src/lib/runtime/amd64/asm.s
+++ b/src/pkg/runtime/amd64/asm.s
diff --git a/src/lib/runtime/amd64/closure.c b/src/pkg/runtime/amd64/closure.c
index 5717d3c5e..5717d3c5e 100644
--- a/src/lib/runtime/amd64/closure.c
+++ b/src/pkg/runtime/amd64/closure.c
diff --git a/src/lib/runtime/amd64/traceback.c b/src/pkg/runtime/amd64/traceback.c
index 16d7bed72..16d7bed72 100644
--- a/src/lib/runtime/amd64/traceback.c
+++ b/src/pkg/runtime/amd64/traceback.c
diff --git a/src/lib/runtime/arm/asm.s b/src/pkg/runtime/arm/asm.s
index 232ab4ddf..232ab4ddf 100644
--- a/src/lib/runtime/arm/asm.s
+++ b/src/pkg/runtime/arm/asm.s
diff --git a/src/lib/runtime/arm/closure.c b/src/pkg/runtime/arm/closure.c
index 024018d5a..bfa9df67f 100644
--- a/src/lib/runtime/arm/closure.c
+++ b/src/pkg/runtime/arm/closure.c
@@ -1,4 +1,3 @@
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-
diff --git a/src/lib/runtime/arm/traceback.s b/src/pkg/runtime/arm/traceback.s
index e69de29bb..e69de29bb 100644
--- a/src/lib/runtime/arm/traceback.s
+++ b/src/pkg/runtime/arm/traceback.s
diff --git a/src/lib/runtime/array.c b/src/pkg/runtime/array.c
index bbd57b03e..bbd57b03e 100644
--- a/src/lib/runtime/array.c
+++ b/src/pkg/runtime/array.c
diff --git a/src/lib/runtime/cgo2c.c b/src/pkg/runtime/cgo2c.c
index 3905f7e6d..3905f7e6d 100644
--- a/src/lib/runtime/cgo2c.c
+++ b/src/pkg/runtime/cgo2c.c
diff --git a/src/lib/runtime/chan.c b/src/pkg/runtime/chan.c
index be65bcbc1..be65bcbc1 100644
--- a/src/lib/runtime/chan.c
+++ b/src/pkg/runtime/chan.c
diff --git a/src/lib/runtime/darwin/386/defs.h b/src/pkg/runtime/darwin/386/defs.h
index b66a5d8b4..b66a5d8b4 100644
--- a/src/lib/runtime/darwin/386/defs.h
+++ b/src/pkg/runtime/darwin/386/defs.h
diff --git a/src/lib/runtime/darwin/386/rt0.s b/src/pkg/runtime/darwin/386/rt0.s
index 5b52e912c..5b52e912c 100755
--- a/src/lib/runtime/darwin/386/rt0.s
+++ b/src/pkg/runtime/darwin/386/rt0.s
diff --git a/src/lib/runtime/darwin/386/signal.c b/src/pkg/runtime/darwin/386/signal.c
index 3a63c4b38..3a63c4b38 100644
--- a/src/lib/runtime/darwin/386/signal.c
+++ b/src/pkg/runtime/darwin/386/signal.c
diff --git a/src/lib/runtime/darwin/386/sys.s b/src/pkg/runtime/darwin/386/sys.s
index bbcb622d5..bbcb622d5 100644
--- a/src/lib/runtime/darwin/386/sys.s
+++ b/src/pkg/runtime/darwin/386/sys.s
diff --git a/src/lib/runtime/darwin/amd64/defs.h b/src/pkg/runtime/darwin/amd64/defs.h
index 1076e4c10..1076e4c10 100644
--- a/src/lib/runtime/darwin/amd64/defs.h
+++ b/src/pkg/runtime/darwin/amd64/defs.h
diff --git a/src/lib/runtime/darwin/amd64/rt0.s b/src/pkg/runtime/darwin/amd64/rt0.s
index 0a0011781..0a0011781 100644
--- a/src/lib/runtime/darwin/amd64/rt0.s
+++ b/src/pkg/runtime/darwin/amd64/rt0.s
diff --git a/src/lib/runtime/darwin/amd64/signal.c b/src/pkg/runtime/darwin/amd64/signal.c
index 45e5e8d47..45e5e8d47 100644
--- a/src/lib/runtime/darwin/amd64/signal.c
+++ b/src/pkg/runtime/darwin/amd64/signal.c
diff --git a/src/lib/runtime/darwin/amd64/sys.s b/src/pkg/runtime/darwin/amd64/sys.s
index b46c823ae..b46c823ae 100644
--- a/src/lib/runtime/darwin/amd64/sys.s
+++ b/src/pkg/runtime/darwin/amd64/sys.s
diff --git a/src/lib/runtime/darwin/defs.c b/src/pkg/runtime/darwin/defs.c
index 1ed662957..1ed662957 100644
--- a/src/lib/runtime/darwin/defs.c
+++ b/src/pkg/runtime/darwin/defs.c
diff --git a/src/lib/runtime/darwin/os.h b/src/pkg/runtime/darwin/os.h
index 2a3ca87bd..2a3ca87bd 100644
--- a/src/lib/runtime/darwin/os.h
+++ b/src/pkg/runtime/darwin/os.h
diff --git a/src/lib/runtime/darwin/signals.h b/src/pkg/runtime/darwin/signals.h
index 4051dc4dc..8cca361f7 100644
--- a/src/lib/runtime/darwin/signals.h
+++ b/src/pkg/runtime/darwin/signals.h
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-
 #define C SigCatch
 #define I SigIgnore
 #define R SigRestart
diff --git a/src/lib/runtime/darwin/thread.c b/src/pkg/runtime/darwin/thread.c
index 3a982471a..3a982471a 100644
--- a/src/lib/runtime/darwin/thread.c
+++ b/src/pkg/runtime/darwin/thread.c
diff --git a/src/lib/runtime/extern.go b/src/pkg/runtime/extern.go
index 6fb5756d6..6fb5756d6 100644
--- a/src/lib/runtime/extern.go
+++ b/src/pkg/runtime/extern.go
diff --git a/src/lib/runtime/float.c b/src/pkg/runtime/float.c
index 5122f359a..5122f359a 100644
--- a/src/lib/runtime/float.c
+++ b/src/pkg/runtime/float.c
diff --git a/src/lib/runtime/float_go.cgo b/src/pkg/runtime/float_go.cgo
index 518d55950..518d55950 100644
--- a/src/lib/runtime/float_go.cgo
+++ b/src/pkg/runtime/float_go.cgo
diff --git a/src/lib/runtime/hashmap.c b/src/pkg/runtime/hashmap.c
index b3022ca14..b3022ca14 100644
--- a/src/lib/runtime/hashmap.c
+++ b/src/pkg/runtime/hashmap.c
diff --git a/src/lib/runtime/hashmap.h b/src/pkg/runtime/hashmap.h
index ff93e9ee3..e8bcfab29 100644
--- a/src/lib/runtime/hashmap.h
+++ b/src/pkg/runtime/hashmap.h
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-
 /* A hash table.
    Example, hashing nul-terminated char*s:
 	hash_hash_t str_hash (void *v) {
diff --git a/src/lib/runtime/iface.c b/src/pkg/runtime/iface.c
index 6c933b1b2..6c933b1b2 100644
--- a/src/lib/runtime/iface.c
+++ b/src/pkg/runtime/iface.c
diff --git a/src/lib/runtime/linux/386/defs.h b/src/pkg/runtime/linux/386/defs.h
index 112fc7b09..112fc7b09 100755
--- a/src/lib/runtime/linux/386/defs.h
+++ b/src/pkg/runtime/linux/386/defs.h
diff --git a/src/lib/runtime/linux/386/rt0.s b/src/pkg/runtime/linux/386/rt0.s
index 7717c37e8..7717c37e8 100755
--- a/src/lib/runtime/linux/386/rt0.s
+++ b/src/pkg/runtime/linux/386/rt0.s
diff --git a/src/lib/runtime/linux/386/signal.c b/src/pkg/runtime/linux/386/signal.c
index 7dfca6bb4..7dfca6bb4 100644
--- a/src/lib/runtime/linux/386/signal.c
+++ b/src/pkg/runtime/linux/386/signal.c
diff --git a/src/lib/runtime/linux/386/sys.s b/src/pkg/runtime/linux/386/sys.s
index 419973a5c..419973a5c 100755
--- a/src/lib/runtime/linux/386/sys.s
+++ b/src/pkg/runtime/linux/386/sys.s
diff --git a/src/lib/runtime/linux/amd64/defs.h b/src/pkg/runtime/linux/amd64/defs.h
index 43b047523..43b047523 100644
--- a/src/lib/runtime/linux/amd64/defs.h
+++ b/src/pkg/runtime/linux/amd64/defs.h
diff --git a/src/lib/runtime/linux/amd64/rt0.s b/src/pkg/runtime/linux/amd64/rt0.s
index 55be5bcee..55be5bcee 100644
--- a/src/lib/runtime/linux/amd64/rt0.s
+++ b/src/pkg/runtime/linux/amd64/rt0.s
diff --git a/src/lib/runtime/linux/amd64/signal.c b/src/pkg/runtime/linux/amd64/signal.c
index 55215176d..55215176d 100644
--- a/src/lib/runtime/linux/amd64/signal.c
+++ b/src/pkg/runtime/linux/amd64/signal.c
diff --git a/src/lib/runtime/linux/amd64/sys.s b/src/pkg/runtime/linux/amd64/sys.s
index f90c704fa..f90c704fa 100644
--- a/src/lib/runtime/linux/amd64/sys.s
+++ b/src/pkg/runtime/linux/amd64/sys.s
diff --git a/src/lib/runtime/linux/arm/defs.h b/src/pkg/runtime/linux/arm/defs.h
index caad66989..caad66989 100644
--- a/src/lib/runtime/linux/arm/defs.h
+++ b/src/pkg/runtime/linux/arm/defs.h
diff --git a/src/lib/runtime/linux/arm/rt0.s b/src/pkg/runtime/linux/arm/rt0.s
index 024547ddd..024547ddd 100644
--- a/src/lib/runtime/linux/arm/rt0.s
+++ b/src/pkg/runtime/linux/arm/rt0.s
diff --git a/src/lib/runtime/linux/arm/signal.c b/src/pkg/runtime/linux/arm/signal.c
index 024018d5a..024018d5a 100644
--- a/src/lib/runtime/linux/arm/signal.c
+++ b/src/pkg/runtime/linux/arm/signal.c
diff --git a/src/lib/runtime/linux/arm/sys.s b/src/pkg/runtime/linux/arm/sys.s
index f5db32305..f5db32305 100644
--- a/src/lib/runtime/linux/arm/sys.s
+++ b/src/pkg/runtime/linux/arm/sys.s
diff --git a/src/lib/runtime/linux/defs.c b/src/pkg/runtime/linux/defs.c
index 35fa02953..35fa02953 100644
--- a/src/lib/runtime/linux/defs.c
+++ b/src/pkg/runtime/linux/defs.c
diff --git a/src/lib/runtime/linux/defs1.c b/src/pkg/runtime/linux/defs1.c
index 0fe3506ad..0fe3506ad 100644
--- a/src/lib/runtime/linux/defs1.c
+++ b/src/pkg/runtime/linux/defs1.c
diff --git a/src/lib/runtime/linux/defs2.c b/src/pkg/runtime/linux/defs2.c
index aa0331a37..aa0331a37 100644
--- a/src/lib/runtime/linux/defs2.c
+++ b/src/pkg/runtime/linux/defs2.c
diff --git a/src/lib/runtime/linux/defs_arm.c b/src/pkg/runtime/linux/defs_arm.c
index eaec05154..eaec05154 100644
--- a/src/lib/runtime/linux/defs_arm.c
+++ b/src/pkg/runtime/linux/defs_arm.c
diff --git a/src/lib/runtime/linux/os.h b/src/pkg/runtime/linux/os.h
index c61619367..c61619367 100644
--- a/src/lib/runtime/linux/os.h
+++ b/src/pkg/runtime/linux/os.h
diff --git a/src/lib/runtime/linux/signals.h b/src/pkg/runtime/linux/signals.h
index 1fb49c513..8f1112b99 100644
--- a/src/lib/runtime/linux/signals.h
+++ b/src/pkg/runtime/linux/signals.h
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-
 #define C SigCatch
 #define I SigIgnore
 #define R SigRestart
diff --git a/src/lib/runtime/linux/thread.c b/src/pkg/runtime/linux/thread.c
index cc9ba161b..cc9ba161b 100644
--- a/src/lib/runtime/linux/thread.c
+++ b/src/pkg/runtime/linux/thread.c
diff --git a/src/lib/runtime/malloc.c b/src/pkg/runtime/malloc.c
index 81cdfb300..81cdfb300 100644
--- a/src/lib/runtime/malloc.c
+++ b/src/pkg/runtime/malloc.c
diff --git a/src/lib/runtime/malloc.h b/src/pkg/runtime/malloc.h
index 9b3d6b811..5b657a495 100644
--- a/src/lib/runtime/malloc.h
+++ b/src/pkg/runtime/malloc.h
@@ -155,7 +155,7 @@ void	FixAlloc_Free(FixAlloc *f, void *p);
 
 
 // Statistics.
-// Shared with Go: if you edit this structure, also edit ../lib/malloc.go.
+// Shared with Go: if you edit this structure, also edit ../malloc/malloc.go.
 struct MStats
 {
 	uint64	alloc;
diff --git a/src/lib/runtime/malloc_go.cgo b/src/pkg/runtime/malloc_go.cgo
index 6dcdaece2..6dcdaece2 100644
--- a/src/lib/runtime/malloc_go.cgo
+++ b/src/pkg/runtime/malloc_go.cgo
diff --git a/src/lib/runtime/mcache.c b/src/pkg/runtime/mcache.c
index ae2594023..ae2594023 100644
--- a/src/lib/runtime/mcache.c
+++ b/src/pkg/runtime/mcache.c
diff --git a/src/lib/runtime/mcentral.c b/src/pkg/runtime/mcentral.c
index 5c9f720c0..5c9f720c0 100644
--- a/src/lib/runtime/mcentral.c
+++ b/src/pkg/runtime/mcentral.c
diff --git a/src/lib/runtime/mem.c b/src/pkg/runtime/mem.c
index 7ed299eb0..7ed299eb0 100644
--- a/src/lib/runtime/mem.c
+++ b/src/pkg/runtime/mem.c
diff --git a/src/lib/runtime/mfixalloc.c b/src/pkg/runtime/mfixalloc.c
index dd4f3f251..dd4f3f251 100644
--- a/src/lib/runtime/mfixalloc.c
+++ b/src/pkg/runtime/mfixalloc.c
diff --git a/src/lib/runtime/mgc0.c b/src/pkg/runtime/mgc0.c
index d58d6ce44..d58d6ce44 100644
--- a/src/lib/runtime/mgc0.c
+++ b/src/pkg/runtime/mgc0.c
diff --git a/src/lib/runtime/mheap.c b/src/pkg/runtime/mheap.c
index d0cf2237b..d0cf2237b 100644
--- a/src/lib/runtime/mheap.c
+++ b/src/pkg/runtime/mheap.c
diff --git a/src/lib/runtime/mheapmap32.c b/src/pkg/runtime/mheapmap32.c
index 420ca2d83..420ca2d83 100644
--- a/src/lib/runtime/mheapmap32.c
+++ b/src/pkg/runtime/mheapmap32.c
diff --git a/src/lib/runtime/mheapmap32.h b/src/pkg/runtime/mheapmap32.h
index 0a16ccd10..0a16ccd10 100644
--- a/src/lib/runtime/mheapmap32.h
+++ b/src/pkg/runtime/mheapmap32.h
diff --git a/src/lib/runtime/mheapmap64.c b/src/pkg/runtime/mheapmap64.c
index 1886ba529..1886ba529 100644
--- a/src/lib/runtime/mheapmap64.c
+++ b/src/pkg/runtime/mheapmap64.c
diff --git a/src/lib/runtime/mheapmap64.h b/src/pkg/runtime/mheapmap64.h
index 127b773f7..127b773f7 100644
--- a/src/lib/runtime/mheapmap64.h
+++ b/src/pkg/runtime/mheapmap64.h
diff --git a/src/lib/runtime/msize.c b/src/pkg/runtime/msize.c
index 25e22637d..25e22637d 100644
--- a/src/lib/runtime/msize.c
+++ b/src/pkg/runtime/msize.c
diff --git a/src/lib/runtime/print.c b/src/pkg/runtime/print.c
index 5295e338d..5295e338d 100644
--- a/src/lib/runtime/print.c
+++ b/src/pkg/runtime/print.c
diff --git a/src/lib/runtime/proc.c b/src/pkg/runtime/proc.c
index 1d065e6d2..1d065e6d2 100644
--- a/src/lib/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
diff --git a/src/lib/runtime/rune.c b/src/pkg/runtime/rune.c
index ca4f9ac6a..652ccdfa6 100644
--- a/src/lib/runtime/rune.c
+++ b/src/pkg/runtime/rune.c
@@ -14,20 +14,6 @@
  */
 
 /*
- * The authors of this software are Rob Pike and Ken Thompson.
- *              Copyright (c) 2002 by Lucent Technologies.
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- */
-
-/*
  * This code is copied, with slight editing due to type differences,
  * from a subset of ../lib9/utf/rune.c
  */
@@ -71,7 +57,7 @@ enum
  * Modified by Wei-Hwa Huang, Google Inc., on 2004-09-24
  * This is a slower but "safe" version of the old chartorune
  * that works on strings that are not necessarily null-terminated.
- * 
+ *
  * If you know for sure that your string is null-terminated,
  * chartorune will be a bit faster.
  *
diff --git a/src/lib/runtime/runtime.c b/src/pkg/runtime/runtime.c
index c5ba3e6a5..c5ba3e6a5 100644
--- a/src/lib/runtime/runtime.c
+++ b/src/pkg/runtime/runtime.c
diff --git a/src/lib/runtime/runtime.h b/src/pkg/runtime/runtime.h
index 749364f95..749364f95 100644
--- a/src/lib/runtime/runtime.h
+++ b/src/pkg/runtime/runtime.h
diff --git a/src/lib/runtime/sema.c b/src/pkg/runtime/sema.c
index 5e5b07aa6..5e5b07aa6 100644
--- a/src/lib/runtime/sema.c
+++ b/src/pkg/runtime/sema.c
diff --git a/src/lib/runtime/sema_go.cgo b/src/pkg/runtime/sema_go.cgo
index eb4082a0d..eb4082a0d 100644
--- a/src/lib/runtime/sema_go.cgo
+++ b/src/pkg/runtime/sema_go.cgo
diff --git a/src/lib/runtime/string.c b/src/pkg/runtime/string.c
index 5bfe8196f..5bfe8196f 100644
--- a/src/lib/runtime/string.c
+++ b/src/pkg/runtime/string.c
diff --git a/src/lib/runtime/symtab.c b/src/pkg/runtime/symtab.c
index b4802715e..b4802715e 100644
--- a/src/lib/runtime/symtab.c
+++ b/src/pkg/runtime/symtab.c
diff --git a/src/lib/sort/Makefile b/src/pkg/sort/Makefile
index 4d193f859..4d193f859 100644
--- a/src/lib/sort/Makefile
+++ b/src/pkg/sort/Makefile
diff --git a/src/lib/sort/sort.go b/src/pkg/sort/sort.go
index 99ba0a0ef..99ba0a0ef 100644
--- a/src/lib/sort/sort.go
+++ b/src/pkg/sort/sort.go
diff --git a/src/lib/sort/sort_test.go b/src/pkg/sort/sort_test.go
index 1747daca6..1747daca6 100644
--- a/src/lib/sort/sort_test.go
+++ b/src/pkg/sort/sort_test.go
diff --git a/src/lib/strconv/Makefile b/src/pkg/strconv/Makefile
index 499f8c1c1..499f8c1c1 100644
--- a/src/lib/strconv/Makefile
+++ b/src/pkg/strconv/Makefile
diff --git a/src/lib/strconv/atof.go b/src/pkg/strconv/atof.go
index c257b2a33..c257b2a33 100644
--- a/src/lib/strconv/atof.go
+++ b/src/pkg/strconv/atof.go
diff --git a/src/lib/strconv/atof_test.go b/src/pkg/strconv/atof_test.go
index 6782f274a..6782f274a 100644
--- a/src/lib/strconv/atof_test.go
+++ b/src/pkg/strconv/atof_test.go
diff --git a/src/lib/strconv/atoi.go b/src/pkg/strconv/atoi.go
index a5d896a05..a5d896a05 100644
--- a/src/lib/strconv/atoi.go
+++ b/src/pkg/strconv/atoi.go
diff --git a/src/lib/strconv/atoi_test.go b/src/pkg/strconv/atoi_test.go
index e4a9f955d..e4a9f955d 100644
--- a/src/lib/strconv/atoi_test.go
+++ b/src/pkg/strconv/atoi_test.go
diff --git a/src/lib/strconv/decimal.go b/src/pkg/strconv/decimal.go
index 38d9c47fb..38d9c47fb 100644
--- a/src/lib/strconv/decimal.go
+++ b/src/pkg/strconv/decimal.go
diff --git a/src/lib/strconv/decimal_test.go b/src/pkg/strconv/decimal_test.go
index bc82861bd..bc82861bd 100644
--- a/src/lib/strconv/decimal_test.go
+++ b/src/pkg/strconv/decimal_test.go
diff --git a/src/lib/strconv/fp_test.go b/src/pkg/strconv/fp_test.go
index 60d7ce6cf..60d7ce6cf 100644
--- a/src/lib/strconv/fp_test.go
+++ b/src/pkg/strconv/fp_test.go
diff --git a/src/lib/strconv/ftoa.go b/src/pkg/strconv/ftoa.go
index b17115175..b17115175 100644
--- a/src/lib/strconv/ftoa.go
+++ b/src/pkg/strconv/ftoa.go
diff --git a/src/lib/strconv/ftoa_test.go b/src/pkg/strconv/ftoa_test.go
index 0f0baa514..0f0baa514 100644
--- a/src/lib/strconv/ftoa_test.go
+++ b/src/pkg/strconv/ftoa_test.go
diff --git a/src/lib/strconv/itoa.go b/src/pkg/strconv/itoa.go
index 7f693ea8c..7f693ea8c 100644
--- a/src/lib/strconv/itoa.go
+++ b/src/pkg/strconv/itoa.go
diff --git a/src/lib/strconv/itoa_test.go b/src/pkg/strconv/itoa_test.go
index 34caf9a32..34caf9a32 100644
--- a/src/lib/strconv/itoa_test.go
+++ b/src/pkg/strconv/itoa_test.go
diff --git a/src/lib/strconv/quote.go b/src/pkg/strconv/quote.go
index 8d7900d1d..8d7900d1d 100644
--- a/src/lib/strconv/quote.go
+++ b/src/pkg/strconv/quote.go
diff --git a/src/lib/strconv/quote_test.go b/src/pkg/strconv/quote_test.go
index 0fc01ebae..0fc01ebae 100644
--- a/src/lib/strconv/quote_test.go
+++ b/src/pkg/strconv/quote_test.go
diff --git a/src/lib/strconv/testfp.txt b/src/pkg/strconv/testfp.txt
index 08d3c4ef0..08d3c4ef0 100644
--- a/src/lib/strconv/testfp.txt
+++ b/src/pkg/strconv/testfp.txt
diff --git a/src/lib/strings/Makefile b/src/pkg/strings/Makefile
index b6660cfc7..b6660cfc7 100644
--- a/src/lib/strings/Makefile
+++ b/src/pkg/strings/Makefile
diff --git a/src/lib/strings/strings.go b/src/pkg/strings/strings.go
index 2e3dc0215..2e3dc0215 100644
--- a/src/lib/strings/strings.go
+++ b/src/pkg/strings/strings.go
diff --git a/src/lib/strings/strings_test.go b/src/pkg/strings/strings_test.go
index 05e662032..05e662032 100644
--- a/src/lib/strings/strings_test.go
+++ b/src/pkg/strings/strings_test.go
diff --git a/src/lib/sync/Makefile b/src/pkg/sync/Makefile
index 566853d57..566853d57 100644
--- a/src/lib/sync/Makefile
+++ b/src/pkg/sync/Makefile
diff --git a/src/lib/sync/asm_386.s b/src/pkg/sync/asm_386.s
index f71182b75..f71182b75 100644
--- a/src/lib/sync/asm_386.s
+++ b/src/pkg/sync/asm_386.s
diff --git a/src/lib/sync/asm_amd64.s b/src/pkg/sync/asm_amd64.s
index 07389dd3b..07389dd3b 100644
--- a/src/lib/sync/asm_amd64.s
+++ b/src/pkg/sync/asm_amd64.s
diff --git a/src/lib/sync/mutex.go b/src/pkg/sync/mutex.go
index 5a6311a83..5a6311a83 100644
--- a/src/lib/sync/mutex.go
+++ b/src/pkg/sync/mutex.go
diff --git a/src/lib/sync/mutex_test.go b/src/pkg/sync/mutex_test.go
index 819dbb9de..819dbb9de 100644
--- a/src/lib/sync/mutex_test.go
+++ b/src/pkg/sync/mutex_test.go
diff --git a/src/lib/syscall/Makefile b/src/pkg/syscall/Makefile
index a5cc042d7..a5cc042d7 100644
--- a/src/lib/syscall/Makefile
+++ b/src/pkg/syscall/Makefile
diff --git a/src/lib/syscall/PORT b/src/pkg/syscall/PORT
index f3addcdb0..f3addcdb0 100755
--- a/src/lib/syscall/PORT
+++ b/src/pkg/syscall/PORT
diff --git a/src/lib/syscall/asm_darwin_386.s b/src/pkg/syscall/asm_darwin_386.s
index a8ec5b00c..a8ec5b00c 100644
--- a/src/lib/syscall/asm_darwin_386.s
+++ b/src/pkg/syscall/asm_darwin_386.s
diff --git a/src/lib/syscall/asm_darwin_amd64.s b/src/pkg/syscall/asm_darwin_amd64.s
index e1527977f..e1527977f 100644
--- a/src/lib/syscall/asm_darwin_amd64.s
+++ b/src/pkg/syscall/asm_darwin_amd64.s
diff --git a/src/lib/syscall/asm_linux_386.s b/src/pkg/syscall/asm_linux_386.s
index c6b01792d..c6b01792d 100644
--- a/src/lib/syscall/asm_linux_386.s
+++ b/src/pkg/syscall/asm_linux_386.s
diff --git a/src/lib/syscall/asm_linux_amd64.s b/src/pkg/syscall/asm_linux_amd64.s
index cb93b481a..cb93b481a 100644
--- a/src/lib/syscall/asm_linux_amd64.s
+++ b/src/pkg/syscall/asm_linux_amd64.s
diff --git a/src/lib/syscall/errstr.go b/src/pkg/syscall/errstr.go
index 67a529d34..67a529d34 100644
--- a/src/lib/syscall/errstr.go
+++ b/src/pkg/syscall/errstr.go
diff --git a/src/lib/syscall/exec.go b/src/pkg/syscall/exec.go
index 58fb05863..58fb05863 100644
--- a/src/lib/syscall/exec.go
+++ b/src/pkg/syscall/exec.go
diff --git a/src/lib/syscall/mkerrors b/src/pkg/syscall/mkerrors
index 015f02145..015f02145 100755
--- a/src/lib/syscall/mkerrors
+++ b/src/pkg/syscall/mkerrors
diff --git a/src/lib/syscall/mksyscall b/src/pkg/syscall/mksyscall
index 850fc1e3f..850fc1e3f 100755
--- a/src/lib/syscall/mksyscall
+++ b/src/pkg/syscall/mksyscall
diff --git a/src/lib/syscall/mksysnum_darwin b/src/pkg/syscall/mksysnum_darwin
index 74e2dfde9..74e2dfde9 100755
--- a/src/lib/syscall/mksysnum_darwin
+++ b/src/pkg/syscall/mksysnum_darwin
diff --git a/src/lib/syscall/mksysnum_linux b/src/pkg/syscall/mksysnum_linux
index 2252bfd7c..2252bfd7c 100755
--- a/src/lib/syscall/mksysnum_linux
+++ b/src/pkg/syscall/mksysnum_linux
diff --git a/src/lib/syscall/syscall.go b/src/pkg/syscall/syscall.go
index 5ee44e3e8..5ee44e3e8 100644
--- a/src/lib/syscall/syscall.go
+++ b/src/pkg/syscall/syscall.go
diff --git a/src/lib/syscall/syscall_darwin.go b/src/pkg/syscall/syscall_darwin.go
index 011fc7a0f..011fc7a0f 100644
--- a/src/lib/syscall/syscall_darwin.go
+++ b/src/pkg/syscall/syscall_darwin.go
diff --git a/src/lib/syscall/syscall_darwin_386.go b/src/pkg/syscall/syscall_darwin_386.go
index 5633d7c03..5633d7c03 100644
--- a/src/lib/syscall/syscall_darwin_386.go
+++ b/src/pkg/syscall/syscall_darwin_386.go
diff --git a/src/lib/syscall/syscall_darwin_amd64.go b/src/pkg/syscall/syscall_darwin_amd64.go
index f7a93f121..f7a93f121 100644
--- a/src/lib/syscall/syscall_darwin_amd64.go
+++ b/src/pkg/syscall/syscall_darwin_amd64.go
diff --git a/src/lib/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index 50f3938d7..50f3938d7 100644
--- a/src/lib/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
diff --git a/src/lib/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go
index 9bf3f9cf0..9bf3f9cf0 100644
--- a/src/lib/syscall/syscall_linux_386.go
+++ b/src/pkg/syscall/syscall_linux_386.go
diff --git a/src/lib/syscall/syscall_linux_amd64.go b/src/pkg/syscall/syscall_linux_amd64.go
index a2a58c35b..a2a58c35b 100644
--- a/src/lib/syscall/syscall_linux_amd64.go
+++ b/src/pkg/syscall/syscall_linux_amd64.go
diff --git a/src/lib/syscall/types_darwin.c b/src/pkg/syscall/types_darwin.c
index 65afd6ca6..65afd6ca6 100644
--- a/src/lib/syscall/types_darwin.c
+++ b/src/pkg/syscall/types_darwin.c
diff --git a/src/pkg/syscall/types_darwin_386.c b/src/pkg/syscall/types_darwin_386.c
new file mode 100644
index 000000000..dd5356944
--- /dev/null
+++ b/src/pkg/syscall/types_darwin_386.c
@@ -0,0 +1 @@
+// Nothing to see here.
diff --git a/src/pkg/syscall/types_darwin_amd64.c b/src/pkg/syscall/types_darwin_amd64.c
new file mode 100644
index 000000000..dd5356944
--- /dev/null
+++ b/src/pkg/syscall/types_darwin_amd64.c
@@ -0,0 +1 @@
+// Nothing to see here.
diff --git a/src/lib/syscall/types_linux.c b/src/pkg/syscall/types_linux.c
index 261772eac..261772eac 100644
--- a/src/lib/syscall/types_linux.c
+++ b/src/pkg/syscall/types_linux.c
diff --git a/src/pkg/syscall/types_linux_386.c b/src/pkg/syscall/types_linux_386.c
new file mode 100644
index 000000000..3b5481af4
--- /dev/null
+++ b/src/pkg/syscall/types_linux_386.c
@@ -0,0 +1 @@
+// Nothing to see here
diff --git a/src/pkg/syscall/types_linux_amd64.c b/src/pkg/syscall/types_linux_amd64.c
new file mode 100644
index 000000000..3b5481af4
--- /dev/null
+++ b/src/pkg/syscall/types_linux_amd64.c
@@ -0,0 +1 @@
+// Nothing to see here
diff --git a/src/lib/syscall/zerrors_darwin_386.go b/src/pkg/syscall/zerrors_darwin_386.go
index bc2d17656..bc2d17656 100644
--- a/src/lib/syscall/zerrors_darwin_386.go
+++ b/src/pkg/syscall/zerrors_darwin_386.go
diff --git a/src/lib/syscall/zerrors_darwin_amd64.go b/src/pkg/syscall/zerrors_darwin_amd64.go
index bc2d17656..bc2d17656 100644
--- a/src/lib/syscall/zerrors_darwin_amd64.go
+++ b/src/pkg/syscall/zerrors_darwin_amd64.go
diff --git a/src/lib/syscall/zerrors_linux_386.go b/src/pkg/syscall/zerrors_linux_386.go
index f1e7e011d..f1e7e011d 100644
--- a/src/lib/syscall/zerrors_linux_386.go
+++ b/src/pkg/syscall/zerrors_linux_386.go
diff --git a/src/lib/syscall/zerrors_linux_amd64.go b/src/pkg/syscall/zerrors_linux_amd64.go
index f1e7e011d..f1e7e011d 100644
--- a/src/lib/syscall/zerrors_linux_amd64.go
+++ b/src/pkg/syscall/zerrors_linux_amd64.go
diff --git a/src/lib/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go
index 61f7c01db..61f7c01db 100644
--- a/src/lib/syscall/zsyscall_darwin_386.go
+++ b/src/pkg/syscall/zsyscall_darwin_386.go
diff --git a/src/lib/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go
index c8a0b10a7..c8a0b10a7 100644
--- a/src/lib/syscall/zsyscall_darwin_amd64.go
+++ b/src/pkg/syscall/zsyscall_darwin_amd64.go
diff --git a/src/lib/syscall/zsyscall_linux_386.go b/src/pkg/syscall/zsyscall_linux_386.go
index ef323b088..ef323b088 100644
--- a/src/lib/syscall/zsyscall_linux_386.go
+++ b/src/pkg/syscall/zsyscall_linux_386.go
diff --git a/src/lib/syscall/zsyscall_linux_amd64.go b/src/pkg/syscall/zsyscall_linux_amd64.go
index 490ffc392..490ffc392 100644
--- a/src/lib/syscall/zsyscall_linux_amd64.go
+++ b/src/pkg/syscall/zsyscall_linux_amd64.go
diff --git a/src/lib/syscall/zsysnum_darwin_386.go b/src/pkg/syscall/zsysnum_darwin_386.go
index c4c48c2a2..c4c48c2a2 100644
--- a/src/lib/syscall/zsysnum_darwin_386.go
+++ b/src/pkg/syscall/zsysnum_darwin_386.go
diff --git a/src/lib/syscall/zsysnum_darwin_amd64.go b/src/pkg/syscall/zsysnum_darwin_amd64.go
index c4c48c2a2..c4c48c2a2 100644
--- a/src/lib/syscall/zsysnum_darwin_amd64.go
+++ b/src/pkg/syscall/zsysnum_darwin_amd64.go
diff --git a/src/lib/syscall/zsysnum_linux_386.go b/src/pkg/syscall/zsysnum_linux_386.go
index 46c1112f8..46c1112f8 100644
--- a/src/lib/syscall/zsysnum_linux_386.go
+++ b/src/pkg/syscall/zsysnum_linux_386.go
diff --git a/src/lib/syscall/zsysnum_linux_amd64.go b/src/pkg/syscall/zsysnum_linux_amd64.go
index 94424f3f3..94424f3f3 100644
--- a/src/lib/syscall/zsysnum_linux_amd64.go
+++ b/src/pkg/syscall/zsysnum_linux_amd64.go
diff --git a/src/lib/syscall/ztypes_darwin_386.go b/src/pkg/syscall/ztypes_darwin_386.go
index 29d0d9676..29d0d9676 100644
--- a/src/lib/syscall/ztypes_darwin_386.go
+++ b/src/pkg/syscall/ztypes_darwin_386.go
diff --git a/src/lib/syscall/ztypes_darwin_amd64.go b/src/pkg/syscall/ztypes_darwin_amd64.go
index 0523c50a4..0523c50a4 100644
--- a/src/lib/syscall/ztypes_darwin_amd64.go
+++ b/src/pkg/syscall/ztypes_darwin_amd64.go
diff --git a/src/lib/syscall/ztypes_linux_386.go b/src/pkg/syscall/ztypes_linux_386.go
index c3a083762..c3a083762 100644
--- a/src/lib/syscall/ztypes_linux_386.go
+++ b/src/pkg/syscall/ztypes_linux_386.go
diff --git a/src/lib/syscall/ztypes_linux_amd64.go b/src/pkg/syscall/ztypes_linux_amd64.go
index f17ebe139..f17ebe139 100644
--- a/src/lib/syscall/ztypes_linux_amd64.go
+++ b/src/pkg/syscall/ztypes_linux_amd64.go
diff --git a/src/lib/tabwriter/Makefile b/src/pkg/tabwriter/Makefile
index 1c4518066..1c4518066 100644
--- a/src/lib/tabwriter/Makefile
+++ b/src/pkg/tabwriter/Makefile
diff --git a/src/lib/tabwriter/tabwriter.go b/src/pkg/tabwriter/tabwriter.go
index 6799f72d1..6799f72d1 100644
--- a/src/lib/tabwriter/tabwriter.go
+++ b/src/pkg/tabwriter/tabwriter.go
diff --git a/src/lib/tabwriter/tabwriter_test.go b/src/pkg/tabwriter/tabwriter_test.go
index 7026446e6..7026446e6 100644
--- a/src/lib/tabwriter/tabwriter_test.go
+++ b/src/pkg/tabwriter/tabwriter_test.go
diff --git a/src/lib/template/Makefile b/src/pkg/template/Makefile
index e91c08818..e91c08818 100644
--- a/src/lib/template/Makefile
+++ b/src/pkg/template/Makefile
diff --git a/src/lib/template/format.go b/src/pkg/template/format.go
index 4fb5393b9..4fb5393b9 100644
--- a/src/lib/template/format.go
+++ b/src/pkg/template/format.go
diff --git a/src/lib/template/template.go b/src/pkg/template/template.go
index a5e9b0c7d..a5e9b0c7d 100644
--- a/src/lib/template/template.go
+++ b/src/pkg/template/template.go
diff --git a/src/lib/template/template_test.go b/src/pkg/template/template_test.go
index 9a81d274c..9a81d274c 100644
--- a/src/lib/template/template_test.go
+++ b/src/pkg/template/template_test.go
diff --git a/src/lib/testing/Makefile b/src/pkg/testing/Makefile
index 493eba6f2..493eba6f2 100644
--- a/src/lib/testing/Makefile
+++ b/src/pkg/testing/Makefile
diff --git a/src/lib/testing/iotest/Makefile b/src/pkg/testing/iotest/Makefile
index 1d01041f5..1d01041f5 100644
--- a/src/lib/testing/iotest/Makefile
+++ b/src/pkg/testing/iotest/Makefile
diff --git a/src/lib/testing/iotest/logger.go b/src/pkg/testing/iotest/logger.go
index 8ee574080..8ee574080 100644
--- a/src/lib/testing/iotest/logger.go
+++ b/src/pkg/testing/iotest/logger.go
diff --git a/src/lib/testing/iotest/reader.go b/src/pkg/testing/iotest/reader.go
index 0bb863338..0bb863338 100644
--- a/src/lib/testing/iotest/reader.go
+++ b/src/pkg/testing/iotest/reader.go
diff --git a/src/lib/testing/testing.go b/src/pkg/testing/testing.go
index 330fadd3a..330fadd3a 100644
--- a/src/lib/testing/testing.go
+++ b/src/pkg/testing/testing.go
diff --git a/src/lib/time/Makefile b/src/pkg/time/Makefile
index 8d3c3b65f..8d3c3b65f 100644
--- a/src/lib/time/Makefile
+++ b/src/pkg/time/Makefile
diff --git a/src/lib/time/sleep.go b/src/pkg/time/sleep.go
index 3bb76cf47..3bb76cf47 100644
--- a/src/lib/time/sleep.go
+++ b/src/pkg/time/sleep.go
diff --git a/src/lib/time/tick.go b/src/pkg/time/tick.go
index 53e2234f8..53e2234f8 100644
--- a/src/lib/time/tick.go
+++ b/src/pkg/time/tick.go
diff --git a/src/lib/time/tick_test.go b/src/pkg/time/tick_test.go
index 0667be679..0667be679 100644
--- a/src/lib/time/tick_test.go
+++ b/src/pkg/time/tick_test.go
diff --git a/src/lib/time/time.go b/src/pkg/time/time.go
index ea9b66cbc..ea9b66cbc 100644
--- a/src/lib/time/time.go
+++ b/src/pkg/time/time.go
diff --git a/src/lib/time/time_test.go b/src/pkg/time/time_test.go
index 41e6736e8..41e6736e8 100644
--- a/src/lib/time/time_test.go
+++ b/src/pkg/time/time_test.go
diff --git a/src/lib/time/zoneinfo.go b/src/pkg/time/zoneinfo.go
index 751afc931..751afc931 100644
--- a/src/lib/time/zoneinfo.go
+++ b/src/pkg/time/zoneinfo.go
diff --git a/src/lib/unicode/Makefile b/src/pkg/unicode/Makefile
index de1677b8d..de1677b8d 100644
--- a/src/lib/unicode/Makefile
+++ b/src/pkg/unicode/Makefile
diff --git a/src/lib/unicode/decimaldigit.go b/src/pkg/unicode/decimaldigit.go
index 1165e3ae1..1165e3ae1 100644
--- a/src/lib/unicode/decimaldigit.go
+++ b/src/pkg/unicode/decimaldigit.go
diff --git a/src/lib/unicode/decimaldigit_test.go b/src/pkg/unicode/decimaldigit_test.go
index f7b470c67..f7b470c67 100644
--- a/src/lib/unicode/decimaldigit_test.go
+++ b/src/pkg/unicode/decimaldigit_test.go
diff --git a/src/lib/unicode/letter.go b/src/pkg/unicode/letter.go
index d7aa678c9..d7aa678c9 100644
--- a/src/lib/unicode/letter.go
+++ b/src/pkg/unicode/letter.go
diff --git a/src/lib/unicode/letter_test.go b/src/pkg/unicode/letter_test.go
index d39d74e6b..d39d74e6b 100644
--- a/src/lib/unicode/letter_test.go
+++ b/src/pkg/unicode/letter_test.go
diff --git a/src/lib/unsafe/unsafe.go b/src/pkg/unsafe/unsafe.go
index b19af405b..b19af405b 100644
--- a/src/lib/unsafe/unsafe.go
+++ b/src/pkg/unsafe/unsafe.go
diff --git a/src/lib/utf8/Makefile b/src/pkg/utf8/Makefile
index b5ad083b2..b5ad083b2 100644
--- a/src/lib/utf8/Makefile
+++ b/src/pkg/utf8/Makefile
diff --git a/src/lib/utf8/utf8.go b/src/pkg/utf8/utf8.go
index 9c2ac790d..9c2ac790d 100644
--- a/src/lib/utf8/utf8.go
+++ b/src/pkg/utf8/utf8.go
diff --git a/src/lib/utf8/utf8_test.go b/src/pkg/utf8/utf8_test.go
index f60b0b17e..f60b0b17e 100644
--- a/src/lib/utf8/utf8_test.go
+++ b/src/pkg/utf8/utf8_test.go
diff --git a/src/lib/xml/xml.go b/src/pkg/xml/xml.go
index bd944337e..bd944337e 100644
--- a/src/lib/xml/xml.go
+++ b/src/pkg/xml/xml.go
diff --git a/src/run.bash b/src/run.bash
index 85bd28655..1de6aafc2 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -24,13 +24,13 @@ maketest() {
 }
 
 maketest \
-	lib \
+	pkg \
 
 # all of these are subtly different
 # from what maketest does.
 
 
-(xcd lib/sync;
+(xcd pkg/sync;
 make clean;
 time make
 GOMAXPROCS=10 make test
diff --git a/usr/gri/pretty/astprinter.go b/usr/gri/pretty/astprinter.go
index 9c1fe7439..867a84034 100644
--- a/usr/gri/pretty/astprinter.go
+++ b/usr/gri/pretty/astprinter.go
@@ -475,7 +475,7 @@ func (P *Printer) HtmlPackageName(pos token.Position, name string) {
 	if P.html {
 		sname := name[1 : len(name)-1];  // strip quotes  TODO do this elsewhere eventually
 		// TODO CAPITAL HACK BELOW FIX THIS
-		P.TaggedString(pos, `"<a href="/src/lib/` + sname + `.go">`, sname, `</a>"`);
+		P.TaggedString(pos, `"<a href="/src/pkg/` + sname + `.go">`, sname, `</a>"`);
 	} else {
 		P.String(pos, name);
 	}
diff --git a/usr/gri/pretty/godoc.go b/usr/gri/pretty/godoc.go
index 97e18952f..f2d66079a 100644
--- a/usr/gri/pretty/godoc.go
+++ b/usr/gri/pretty/godoc.go
@@ -80,7 +80,7 @@ var (
 
 	// file system roots
 	goroot string;
-	pkgroot = flag.String("pkgroot", "src/lib", "root package source directory (if unrooted, relative to goroot)");
+	pkgroot = flag.String("pkgroot", "src/pkg", "root package source directory (if unrooted, relative to goroot)");
 	tmplroot = flag.String("tmplroot", "usr/gri/pretty", "root template directory (if unrooted, relative to goroot)");
 
 	// periodic sync