From 220a6de47eced55956eb8af8d643d4f5b67fd634 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 8 Sep 2014 00:06:45 -0400 Subject: [PATCH 1/4] build: adjustments for move from src/pkg to src This CL adjusts code referring to src/pkg to refer to src. Immediately after submitting this CL, I will submit a change doing 'hg mv src/pkg/* src'. That change will be too large to review with Rietveld but will contain only the 'hg mv'. This CL will break the build. The followup 'hg mv' will fix it. For more about the move, see golang.org/s/go14nopkg. LGTM=r R=r CC=golang-codereviews https://golang.org/cl/134570043 --- .hgignore | 12 +- doc/articles/go_command.html | 2 +- doc/articles/race_detector.html | 24 ++-- doc/contribute.html | 16 +-- doc/debugging_with_gdb.html | 50 +++---- doc/effective_go.html | 4 +- doc/gccgo_contribute.html | 2 +- doc/go_faq.html | 4 +- misc/android/go_android_exec.go | 2 +- misc/makerelease/makerelease.go | 4 +- src/androidtest.bash | 3 +- src/cmd/5a/a.y | 2 +- src/cmd/5a/y.tab.c | 2 +- src/cmd/5c/cgen.c | 2 +- src/cmd/5g/cgen.c | 2 +- src/cmd/5g/ggen.c | 2 +- src/cmd/5g/gsubr.c | 4 +- src/cmd/6a/a.y | 2 +- src/cmd/6a/y.tab.c | 2 +- src/cmd/6c/cgen.c | 2 +- src/cmd/6c/sgen.c | 2 +- src/cmd/6g/cgen.c | 2 +- src/cmd/6g/ggen.c | 2 +- src/cmd/6g/gsubr.c | 4 +- src/cmd/8a/a.y | 2 +- src/cmd/8a/y.tab.c | 2 +- src/cmd/8c/cgen.c | 2 +- src/cmd/8g/cgen.c | 2 +- src/cmd/8g/ggen.c | 2 +- src/cmd/8g/gsubr.c | 4 +- src/cmd/api/goapi.go | 2 +- src/cmd/api/goapi_test.go | 4 +- src/cmd/cc/pgen.c | 2 +- src/cmd/cgo/ast.go | 2 +- src/cmd/dist/build.c | 208 +++++++++++++++------------- src/cmd/dist/buildruntime.c | 2 +- src/cmd/dist/windows.c | 2 +- src/cmd/fix/fix.go | 2 +- src/cmd/gc/md5.c | 2 +- src/cmd/gc/pgen.c | 4 +- src/cmd/gc/plive.c | 4 +- src/cmd/gc/reflect.c | 38 ++--- src/cmd/gc/select.c | 2 +- src/cmd/gc/subr.c | 2 +- src/cmd/gc/walk.c | 4 +- src/cmd/go/build.go | 15 +- src/cmd/go/main.go | 4 +- src/cmd/go/pkg.go | 15 +- src/cmd/go/test.bash | 6 +- src/cmd/gofmt/doc.go | 2 +- src/cmd/ld/data.c | 2 +- src/cmd/ld/decodesym.c | 4 +- src/cmd/ld/dwarf.c | 2 +- src/cmd/ld/lib.c | 6 +- src/cmd/ld/pcln.c | 2 +- src/cmd/nm/nm_test.go | 2 +- src/liblink/asm5.c | 2 +- src/liblink/asm6.c | 2 +- src/liblink/asm8.c | 2 +- src/liblink/obj5.c | 2 +- src/liblink/obj6.c | 2 +- src/liblink/obj8.c | 2 +- src/liblink/sym.c | 2 +- src/make.bash | 2 +- src/make.rc | 2 +- src/pkg/go/build/build.go | 23 +-- src/pkg/math/sqrt.go | 2 +- src/pkg/net/http/httptest/server.go | 2 +- src/pkg/net/smtp/smtp_test.go | 2 +- src/pkg/reflect/type.go | 2 +- src/pkg/reflect/value.go | 2 +- src/pkg/runtime/Makefile | 2 +- src/pkg/runtime/debug/stack_test.go | 18 +-- src/pkg/runtime/pprof/pprof_test.go | 42 +++--- src/pkg/runtime/race/race.go | 2 +- src/pkg/runtime/runtime_test.go | 2 +- src/pkg/sync/atomic/race.s | 2 +- test/bench/garbage/parser.go | 2 +- test/stress/parsego.go | 2 +- 79 files changed, 309 insertions(+), 321 deletions(-) diff --git a/.hgignore b/.hgignore index 72d82910d9..c89b2d9ad0 100644 --- a/.hgignore +++ b/.hgignore @@ -42,12 +42,12 @@ src/cmd/gc/mkbuiltin1 src/cmd/gc/opnames.h src/cmd/gc/y.output src/cmd/go/zdefaultcc.go -src/pkg/go/doc/headscan -src/pkg/runtime/goc2c -src/pkg/runtime/mkversion -src/pkg/runtime/z* -src/pkg/unicode/maketables -src/pkg/*.*/ +src/go/doc/headscan +src/runtime/goc2c +src/runtime/mkversion +src/runtime/z* +src/unicode/maketables +src/*.*/ test/pass.out test/run.out test/times.out diff --git a/doc/articles/go_command.html b/doc/articles/go_command.html index fddca41e23..246b8c956d 100644 --- a/doc/articles/go_command.html +++ b/doc/articles/go_command.html @@ -99,7 +99,7 @@ deduce where to obtain the source code.

in a known way from the import path. Specifically, the first choice is $GOPATH/src/<import-path>. If $GOPATH is unset, the go command will fall back to storing source code alongside the -standard Go packages, in $GOROOT/src/pkg/<import-path>. +standard Go packages, in $GOROOT/src/<import-path>. If $GOPATH is set to a list of paths, the go command tries <dir>/src/<import-path> for each of the directories in that list.

diff --git a/doc/articles/race_detector.html b/doc/articles/race_detector.html index 32ad61de87..6defd98f96 100644 --- a/doc/articles/race_detector.html +++ b/doc/articles/race_detector.html @@ -57,35 +57,35 @@ Here is an example: WARNING: DATA RACE Read by goroutine 185: net.(*pollServer).AddFD() - src/pkg/net/fd_unix.go:89 +0x398 + src/net/fd_unix.go:89 +0x398 net.(*pollServer).WaitWrite() - src/pkg/net/fd_unix.go:247 +0x45 + src/net/fd_unix.go:247 +0x45 net.(*netFD).Write() - src/pkg/net/fd_unix.go:540 +0x4d4 + src/net/fd_unix.go:540 +0x4d4 net.(*conn).Write() - src/pkg/net/net.go:129 +0x101 + src/net/net.go:129 +0x101 net.func·060() - src/pkg/net/timeout_test.go:603 +0xaf + src/net/timeout_test.go:603 +0xaf Previous write by goroutine 184: net.setWriteDeadline() - src/pkg/net/sockopt_posix.go:135 +0xdf + src/net/sockopt_posix.go:135 +0xdf net.setDeadline() - src/pkg/net/sockopt_posix.go:144 +0x9c + src/net/sockopt_posix.go:144 +0x9c net.(*conn).SetDeadline() - src/pkg/net/net.go:161 +0xe3 + src/net/net.go:161 +0xe3 net.func·061() - src/pkg/net/timeout_test.go:616 +0x3ed + src/net/timeout_test.go:616 +0x3ed Goroutine 185 (running) created at: net.func·061() - src/pkg/net/timeout_test.go:609 +0x288 + src/net/timeout_test.go:609 +0x288 Goroutine 184 (running) created at: net.TestProlongTimeout() - src/pkg/net/timeout_test.go:618 +0x298 + src/net/timeout_test.go:618 +0x298 testing.tRunner() - src/pkg/testing/testing.go:301 +0xe8 + src/testing/testing.go:301 +0xe8

Options

diff --git a/doc/contribute.html b/doc/contribute.html index 849c1e4763..90c3f10a1d 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -234,9 +234,9 @@ Description: <enter description here> Files: - src/pkg/math/sin.go - src/pkg/math/tan.go - src/pkg/regexp/regexp.go + src/math/sin.go + src/math/tan.go + src/regexp/regexp.go

@@ -287,8 +287,8 @@ Description: Fixes issue 159. Files: - src/pkg/math/sin.go - src/pkg/math/tan.go + src/math/sin.go + src/math/tan.go

@@ -457,11 +457,11 @@ adding changesets adding manifests adding file changes added 1 changeset with 2 changes to 2 files -getting src/pkg/flag/flag.go +getting src/flag/flag.go couldn't find merge tool hgmerge -merging src/pkg/flag/flag_test.go +merging src/flag/flag_test.go warning: conflicts during merge. -merging src/pkg/flag/flag_test.go failed! +merging src/flag/flag_test.go failed! 1 file updated, 0 files merged, 0 files removed, 1 file unresolved use 'hg resolve' to retry unresolved file merges $ diff --git a/doc/debugging_with_gdb.html b/doc/debugging_with_gdb.html index afaedf74ca..8368164195 100644 --- a/doc/debugging_with_gdb.html +++ b/doc/debugging_with_gdb.html @@ -120,7 +120,7 @@ For example:

If you'd like to see how this works, or want to extend it, take a look at src/pkg/runtime/runtime-gdb.py in +href="/src/runtime/runtime-gdb.py">src/runtime/runtime-gdb.py in the Go source distribution. It depends on some special magic types (hash<T,U>) and variables (runtime.m and runtime.g) that the linker @@ -153,7 +153,7 @@ the form pkg.(*MyType).Meth.

In this tutorial we will inspect the binary of the regexp package's unit tests. To build the binary, -change to $GOROOT/src/pkg/regexp and run go test -c. +change to $GOROOT/src/regexp and run go test -c. This should produce an executable file named regexp.test.

@@ -172,7 +172,7 @@ License GPLv 3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.htm Type "show copying" and "show warranty" for licensing/warranty details. This GDB was configured as "x86_64-linux". -Reading symbols from /home/user/go/src/pkg/regexp/regexp.test... +Reading symbols from /home/user/go/src/regexp/regexp.test... done. Loading Go Runtime support. (gdb) @@ -180,7 +180,7 @@ Loading Go Runtime support.

The message "Loading Go Runtime support" means that GDB loaded the -extension from $GOROOT/src/pkg/runtime/runtime-gdb.py. +extension from $GOROOT/src/runtime/runtime-gdb.py.

@@ -199,7 +199,7 @@ it by hand by telling gdb (assuming you have the go sources in 

-(gdb) source ~/go/src/pkg/runtime/runtime-gdb.py
+(gdb) source ~/go/src/runtime/runtime-gdb.py
 Loading Go Runtime support.
@@ -259,7 +259,7 @@ Set a breakpoint at the TestFind function: 
 (gdb) b 'regexp.TestFind'
-Breakpoint 1 at 0x424908: file /home/user/go/src/pkg/regexp/find_test.go, line 148.
+Breakpoint 1 at 0x424908: file /home/user/go/src/regexp/find_test.go, line 148.

@@ -268,9 +268,9 @@ Run the program: 

 (gdb) run
-Starting program: /home/user/go/src/pkg/regexp/regexp.test
+Starting program: /home/user/go/src/regexp/regexp.test
 
-Breakpoint 1, regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/pkg/regexp/find_test.go:148
+Breakpoint 1, regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/regexp/find_test.go:148
 148	func TestFind(t *testing.T) {
@@ -297,9 +297,9 @@ Look at the stack trace for where we’ve paused the program: 
 (gdb) bt  # backtrace
-#0  regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/pkg/regexp/find_test.go:148
-#1  0x000000000042f60b in testing.tRunner (t=0xf8404a89c0, test=0x573720) at /home/user/go/src/pkg/testing/testing.go:156
-#2  0x000000000040df64 in runtime.initdone () at /home/user/go/src/pkg/runtime/proc.c:242
+#0  regexp.TestFind (t=0xf8404a89c0) at /home/user/go/src/regexp/find_test.go:148
+#1  0x000000000042f60b in testing.tRunner (t=0xf8404a89c0, test=0x573720) at /home/user/go/src/testing/testing.go:156
+#2  0x000000000040df64 in runtime.initdone () at /home/user/go/src/runtime/proc.c:242
 #3  0x000000f8404a89c0 in ?? ()
 #4  0x0000000000573720 in ?? ()
 #5  0x0000000000000000 in ?? ()
@@ -311,18 +311,18 @@ The other goroutine, number 1, is stuck in runtime.gosched, blocked
 
 
 (gdb) goroutine 1 bt
-#0  0x000000000040facb in runtime.gosched () at /home/user/go/src/pkg/runtime/proc.c:873
+#0  0x000000000040facb in runtime.gosched () at /home/user/go/src/runtime/proc.c:873
 #1  0x00000000004031c9 in runtime.chanrecv (c=void, ep=void, selected=void, received=void)
- at  /home/user/go/src/pkg/runtime/chan.c:342
-#2  0x0000000000403299 in runtime.chanrecv1 (t=void, c=void) at/home/user/go/src/pkg/runtime/chan.c:423
+ at  /home/user/go/src/runtime/chan.c:342
+#2  0x0000000000403299 in runtime.chanrecv1 (t=void, c=void) at/home/user/go/src/runtime/chan.c:423
 #3  0x000000000043075b in testing.RunTests (matchString={void (struct string, struct string, bool *, error *)}
- 0x7ffff7f9ef60, tests=  []testing.InternalTest = {...}) at /home/user/go/src/pkg/testing/testing.go:201
+ 0x7ffff7f9ef60, tests=  []testing.InternalTest = {...}) at /home/user/go/src/testing/testing.go:201
 #4  0x00000000004302b1 in testing.Main (matchString={void (struct string, struct string, bool *, error *)} 
  0x7ffff7f9ef80, tests= []testing.InternalTest = {...}, benchmarks= []testing.InternalBenchmark = {...})
-at /home/user/go/src/pkg/testing/testing.go:168
-#5  0x0000000000400dc1 in main.main () at /home/user/go/src/pkg/regexp/_testmain.go:98
-#6  0x00000000004022e7 in runtime.mainstart () at /home/user/go/src/pkg/runtime/amd64/asm.s:78
-#7  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/pkg/runtime/proc.c:243
+at /home/user/go/src/testing/testing.go:168
+#5  0x0000000000400dc1 in main.main () at /home/user/go/src/regexp/_testmain.go:98
+#6  0x00000000004022e7 in runtime.mainstart () at /home/user/go/src/runtime/amd64/asm.s:78
+#7  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/runtime/proc.c:243
 #8  0x0000000000000000 in ?? ()
 

 
@@ -333,7 +333,7 @@ The stack frame shows we’re currently executing the regexp.TestFind
 (gdb) info frame
 Stack level 0, frame at 0x7ffff7f9ff88:
- rip = 0x425530 in regexp.TestFind (/home/user/go/src/pkg/regexp/find_test.go:148); 
+ rip = 0x425530 in regexp.TestFind (/home/user/go/src/regexp/find_test.go:148); 
     saved rip 0x430233
  called by frame at 0x7ffff7f9ffa8
  source language minimal.
@@ -410,7 +410,7 @@ We can step into the Stringfunction call with "s":
 
 
 (gdb) s
-regexp.(*Regexp).String (re=0xf84068d070, noname=void) at /home/user/go/src/pkg/regexp/regexp.go:97
+regexp.(*Regexp).String (re=0xf84068d070, noname=void) at /home/user/go/src/regexp/regexp.go:97
 97      func (re *Regexp) String() string {
 

 
@@ -421,12 +421,12 @@ Get a stack trace to see where we are:
 
 (gdb) bt
 #0  regexp.(*Regexp).String (re=0xf84068d070, noname=void)
-    at /home/user/go/src/pkg/regexp/regexp.go:97
+    at /home/user/go/src/regexp/regexp.go:97
 #1  0x0000000000425615 in regexp.TestFind (t=0xf840688b60)
-    at /home/user/go/src/pkg/regexp/find_test.go:151
+    at /home/user/go/src/regexp/find_test.go:151
 #2  0x0000000000430233 in testing.tRunner (t=0xf840688b60, test=0x5747b8)
-    at /home/user/go/src/pkg/testing/testing.go:156
-#3  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/pkg/runtime/proc.c:243
+    at /home/user/go/src/testing/testing.go:156
+#3  0x000000000040ea6f in runtime.initdone () at /home/user/go/src/runtime/proc.c:243
 ....
 

 
diff --git a/doc/effective_go.html b/doc/effective_go.html
index c1e310796b..4dd1a3e017 100644
--- a/doc/effective_go.html
+++ b/doc/effective_go.html
@@ -37,7 +37,7 @@ should read first.
 
Examples

 
 

-The Go package sources
+The Go package sources
 are intended to serve not
 only as the core library but also as examples of how to
 use the language.
@@ -344,7 +344,7 @@ determines just which package is being used.
 

 Another convention is that the package name is the base name of
 its source directory;
-the package in src/pkg/encoding/base64
+the package in src/encoding/base64
 is imported as "encoding/base64" but has name base64,
 not encoding_base64 and not encodingBase64.
 

diff --git a/doc/gccgo_contribute.html b/doc/gccgo_contribute.html
index 9dd6ecb852..db7d1ab0eb 100644
--- a/doc/gccgo_contribute.html
+++ b/doc/gccgo_contribute.html
@@ -73,7 +73,7 @@ script libgo/merge.sh.  Accordingly, most library changes
 should be made in the main Go repository.  The files outside
 of libgo/go are gccgo-specific; that said, some of the
 files in libgo/runtime are based on files
-in src/pkg/runtime in the main Go repository.
+in src/runtime in the main Go repository.
 

 
 
Testing

diff --git a/doc/go_faq.html b/doc/go_faq.html
index f2082ef5b2..4e90d3907e 100644
--- a/doc/go_faq.html
+++ b/doc/go_faq.html
@@ -971,7 +971,7 @@ It is a handy reference for people doing code reviews for Go projects.
 How do I submit patches to the Go libraries?
 
 

-The library sources are in go/src/pkg.
+The library sources are in go/src.
 If you want to make a significant change, please discuss on the mailing list before embarking.
 

 
@@ -1571,7 +1571,7 @@ table-driven, iterating over a list of inputs and outputs defined
 in a data structure (Go has excellent support for data structure literals).
 The work to write a good test and good error messages will then be amortized over many
 test cases. The standard Go library is full of illustrative examples, such as in
-the formatting tests for the fmt package.
+the formatting tests for the fmt package.
 

 
 
diff --git a/misc/android/go_android_exec.go b/misc/android/go_android_exec.go
index 065b624376..e32a805a8c 100644
--- a/misc/android/go_android_exec.go
+++ b/misc/android/go_android_exec.go
@@ -38,7 +38,7 @@ func main() {
 
 	// Determine thepackage by examining the current working
 	// directory, which will look something like
-	// "$GOROOT/src/pkg/mime/multipart". We extract everything
+	// "$GOROOT/src/mime/multipart". We extract everything
 	// after the $GOROOT to run on the same relative directory
 	// on the target device.
 	//
diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go
index 369ab5cb0b..3094856dd4 100644
--- a/misc/makerelease/makerelease.go
+++ b/misc/makerelease/makerelease.go
@@ -74,8 +74,8 @@ var preBuildCleanFiles = []string{
 	"misc/dashboard/godashboard",
 	"src/cmd/cov",
 	"src/cmd/prof",
-	"src/pkg/exp",
-	"src/pkg/old",
+	"src/exp",
+	"src/old",
 }
 
 var cleanFiles = []string{
diff --git a/src/androidtest.bash b/src/androidtest.bash
index 43a93a141b..2acfbd815a 100755
--- a/src/androidtest.bash
+++ b/src/androidtest.bash
@@ -43,8 +43,7 @@ GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH go build \
 export ANDROID_PRODUCT_OUT=/tmp/androidtest-$$
 FAKE_GOROOT=$ANDROID_PRODUCT_OUT/data/local/tmp/goroot
 mkdir -p $FAKE_GOROOT/src
-ln -s $GOROOT/src/cmd $FAKE_GOROOT/src/cmd
-ln -s $GOROOT/src/pkg $FAKE_GOROOT/src/pkg
+ln -s $GOROOT/src $FAKE_GOROOT/src
 ln -s $GOROOT/test $FAKE_GOROOT/test
 ln -s $GOROOT/lib $FAKE_GOROOT/lib
 echo '# Syncing test files to android device'
diff --git a/src/cmd/5a/a.y b/src/cmd/5a/a.y
index 56d0c563db..ad647606ef 100644
--- a/src/cmd/5a/a.y
+++ b/src/cmd/5a/a.y
@@ -33,7 +33,7 @@
 #include 	/* if we don't, bison will, and a.h re-#defines getc */
 #include 
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 %}
 %union
 {
diff --git a/src/cmd/5a/y.tab.c b/src/cmd/5a/y.tab.c
index 0bc8c34e10..a6251b8352 100644
--- a/src/cmd/5a/y.tab.c
+++ b/src/cmd/5a/y.tab.c
@@ -69,7 +69,7 @@
 #include 	/* if we don't, bison will, and a.h re-#defines getc */
 #include 
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 /* Line 371 of yacc.c  */
 #line 76 "y.tab.c"
diff --git a/src/cmd/5c/cgen.c b/src/cmd/5c/cgen.c
index 5ea8eea073..9be10bf452 100644
--- a/src/cmd/5c/cgen.c
+++ b/src/cmd/5c/cgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 void
 _cgen(Node *n, Node *nn, int inrel)
diff --git a/src/cmd/5g/cgen.c b/src/cmd/5g/cgen.c
index 5fae7a564c..c535cfbefb 100644
--- a/src/cmd/5g/cgen.c
+++ b/src/cmd/5g/cgen.c
@@ -1522,7 +1522,7 @@ sgen(Node *n, Node *res, int64 w)
 		f = sysfunc("duffcopy");
 		p = gins(ADUFFCOPY, N, f);
 		afunclit(&p->to, f);
-		// 8 and 128 = magic constants: see ../../pkg/runtime/asm_arm.s
+		// 8 and 128 = magic constants: see ../../runtime/asm_arm.s
 		p->to.offset = 8*(128-c);
 
 		regfree(&tmp);
diff --git a/src/cmd/5g/ggen.c b/src/cmd/5g/ggen.c
index cc951df5db..6174e760c4 100644
--- a/src/cmd/5g/ggen.c
+++ b/src/cmd/5g/ggen.c
@@ -910,7 +910,7 @@ clearfat(Node *nl)
 		f = sysfunc("duffzero");
 		p = gins(ADUFFZERO, N, f);
 		afunclit(&p->to, f);
-		// 4 and 128 = magic constants: see ../../pkg/runtime/asm_arm.s
+		// 4 and 128 = magic constants: see ../../runtime/asm_arm.s
 		p->to.offset = 4*(128-q);
 	} else
 	while(q > 0) {
diff --git a/src/cmd/5g/gsubr.c b/src/cmd/5g/gsubr.c
index 5a70fcddaf..ebd2c70a05 100644
--- a/src/cmd/5g/gsubr.c
+++ b/src/cmd/5g/gsubr.c
@@ -31,11 +31,11 @@
 #include 
 #include 
 #include "gg.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 5l for all GOOS.
-// At the same time, can raise StackBig in ../../pkg/runtime/stack.h.
+// At the same time, can raise StackBig in ../../runtime/stack.h.
 long unmappedzero = 4096;
 
 void
diff --git a/src/cmd/6a/a.y b/src/cmd/6a/a.y
index 6fd4910673..1089d4061c 100644
--- a/src/cmd/6a/a.y
+++ b/src/cmd/6a/a.y
@@ -33,7 +33,7 @@
 #include 	/* if we don't, bison will, and a.h re-#defines getc */
 #include 
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 %}
 %union	{
 	Sym	*sym;
diff --git a/src/cmd/6a/y.tab.c b/src/cmd/6a/y.tab.c
index a4f0f74cca..b69fd95b53 100644
--- a/src/cmd/6a/y.tab.c
+++ b/src/cmd/6a/y.tab.c
@@ -150,7 +150,7 @@
 #include 	/* if we don't, bison will, and a.h re-#defines getc */
 #include 
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 
 /* Enabling traces.  */
diff --git a/src/cmd/6c/cgen.c b/src/cmd/6c/cgen.c
index b66c6add3e..bb09ec05d3 100644
--- a/src/cmd/6c/cgen.c
+++ b/src/cmd/6c/cgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 /* ,x/^(print|prtree)\(/i/\/\/ */
 int castup(Type*, Type*);
diff --git a/src/cmd/6c/sgen.c b/src/cmd/6c/sgen.c
index d99510185e..fceb332b25 100644
--- a/src/cmd/6c/sgen.c
+++ b/src/cmd/6c/sgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 Prog*
 gtext(Sym *s, int32 stkoff)
diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c
index 592e81542c..d13c98dad9 100644
--- a/src/cmd/6g/cgen.c
+++ b/src/cmd/6g/cgen.c
@@ -1451,7 +1451,7 @@ sgen(Node *n, Node *ns, int64 w)
 			p = gins(ADUFFCOPY, N, N);
 			p->to.type = D_ADDR;
 			p->to.sym = linksym(pkglookup("duffcopy", runtimepkg));
-			// 14 and 128 = magic constants: see ../../pkg/runtime/asm_amd64.s
+			// 14 and 128 = magic constants: see ../../runtime/asm_amd64.s
 			p->to.offset = 14*(128-q);
 		} else
 		while(q > 0) {
diff --git a/src/cmd/6g/ggen.c b/src/cmd/6g/ggen.c
index 9665d831b3..5a9b8418c4 100644
--- a/src/cmd/6g/ggen.c
+++ b/src/cmd/6g/ggen.c
@@ -1135,7 +1135,7 @@ clearfat(Node *nl)
 		p = gins(ADUFFZERO, N, N);
 		p->to.type = D_ADDR;
 		p->to.sym = linksym(pkglookup("duffzero", runtimepkg));
-		// 2 and 128 = magic constants: see ../../pkg/runtime/asm_amd64.s
+		// 2 and 128 = magic constants: see ../../runtime/asm_amd64.s
 		p->to.offset = 2*(128-q);
 	} else
 	while(q > 0) {
diff --git a/src/cmd/6g/gsubr.c b/src/cmd/6g/gsubr.c
index a451d7d624..e1ed3b3b86 100644
--- a/src/cmd/6g/gsubr.c
+++ b/src/cmd/6g/gsubr.c
@@ -31,11 +31,11 @@
 #include 
 #include 
 #include "gg.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 6l for all GOOS.
-// At the same time, can raise StackBig in ../../pkg/runtime/stack.h.
+// At the same time, can raise StackBig in ../../runtime/stack.h.
 vlong unmappedzero = 4096;
 
 void
diff --git a/src/cmd/8a/a.y b/src/cmd/8a/a.y
index d7ff623da2..6bcf1313bf 100644
--- a/src/cmd/8a/a.y
+++ b/src/cmd/8a/a.y
@@ -33,7 +33,7 @@
 #include 	/* if we don't, bison will, and a.h re-#defines getc */
 #include 
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 %}
 %union	{
 	Sym	*sym;
diff --git a/src/cmd/8a/y.tab.c b/src/cmd/8a/y.tab.c
index f48c9fe1f8..85279c21f9 100644
--- a/src/cmd/8a/y.tab.c
+++ b/src/cmd/8a/y.tab.c
@@ -146,7 +146,7 @@
 #include 	/* if we don't, bison will, and a.h re-#defines getc */
 #include 
 #include "a.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 
 /* Enabling traces.  */
diff --git a/src/cmd/8c/cgen.c b/src/cmd/8c/cgen.c
index 8ac8e36009..6f0f7c97fe 100644
--- a/src/cmd/8c/cgen.c
+++ b/src/cmd/8c/cgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 /* ,x/^(print|prtree)\(/i/\/\/ */
 
diff --git a/src/cmd/8g/cgen.c b/src/cmd/8g/cgen.c
index f3093bc26e..2735fb6a56 100644
--- a/src/cmd/8g/cgen.c
+++ b/src/cmd/8g/cgen.c
@@ -1326,7 +1326,7 @@ sgen(Node *n, Node *res, int64 w)
 			p = gins(ADUFFCOPY, N, N);
 			p->to.type = D_ADDR;
 			p->to.sym = linksym(pkglookup("duffcopy", runtimepkg));
-			// 10 and 128 = magic constants: see ../../pkg/runtime/asm_386.s
+			// 10 and 128 = magic constants: see ../../runtime/asm_386.s
 			p->to.offset = 10*(128-q);
 		} else
 		while(q > 0) {
diff --git a/src/cmd/8g/ggen.c b/src/cmd/8g/ggen.c
index 5e31404806..6038731f7b 100644
--- a/src/cmd/8g/ggen.c
+++ b/src/cmd/8g/ggen.c
@@ -184,7 +184,7 @@ clearfat(Node *nl)
 		p = gins(ADUFFZERO, N, N);
 		p->to.type = D_ADDR;
 		p->to.sym = linksym(pkglookup("duffzero", runtimepkg));
-		// 1 and 128 = magic constants: see ../../pkg/runtime/asm_386.s
+		// 1 and 128 = magic constants: see ../../runtime/asm_386.s
 		p->to.offset = 1*(128-q);
 	} else
 	while(q > 0) {
diff --git a/src/cmd/8g/gsubr.c b/src/cmd/8g/gsubr.c
index 9ee418cb78..9f923cc9aa 100644
--- a/src/cmd/8g/gsubr.c
+++ b/src/cmd/8g/gsubr.c
@@ -31,11 +31,11 @@
 #include 
 #include 
 #include "gg.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 // TODO(rsc): Can make this bigger if we move
 // the text segment up higher in 8l for all GOOS.
-// At the same time, can raise StackBig in ../../pkg/runtime/stack.h.
+// At the same time, can raise StackBig in ../../runtime/stack.h.
 uint32 unmappedzero = 4096;
 
 #define	CASE(a,b)	(((a)<<16)|((b)<<0))
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index 7e8f858483..fb0e984f72 100644
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -143,7 +143,7 @@ func main() {
 
 	var featureCtx = make(map[string]map[string]bool) // feature -> context name -> true
 	for _, context := range contexts {
-		w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src/pkg"))
+		w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src"))
 
 		for _, name := range pkgNames {
 			// - Package "unsafe" contains special signatures requiring
diff --git a/src/cmd/api/goapi_test.go b/src/cmd/api/goapi_test.go
index cb68769c8f..f4fb7d319a 100644
--- a/src/cmd/api/goapi_test.go
+++ b/src/cmd/api/goapi_test.go
@@ -38,7 +38,7 @@ func TestGolden(t *testing.T) {
 			continue
 		}
 
-		goldenFile := filepath.Join("testdata", "src", "pkg", fi.Name(), "golden.txt")
+		goldenFile := filepath.Join("testdata", "src", fi.Name(), "golden.txt")
 		w := NewWalker(nil, "testdata/src/pkg")
 		w.export(w.Import(fi.Name()))
 
@@ -176,7 +176,7 @@ func BenchmarkAll(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		for _, context := range contexts {
-			w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src/pkg"))
+			w := NewWalker(context, filepath.Join(build.Default.GOROOT, "src"))
 			for _, name := range pkgNames {
 				if name != "unsafe" && !strings.HasPrefix(name, "cmd/") {
 					w.export(w.Import(name))
diff --git a/src/cmd/cc/pgen.c b/src/cmd/cc/pgen.c
index 99128d4005..4265b1b5ee 100644
--- a/src/cmd/cc/pgen.c
+++ b/src/cmd/cc/pgen.c
@@ -29,7 +29,7 @@
 // THE SOFTWARE.
 
 #include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
 
 enum { BitsPerPointer = 2 };
 
diff --git a/src/cmd/cgo/ast.go b/src/cmd/cgo/ast.go
index 7757efa1bc..6c5a160866 100644
--- a/src/cmd/cgo/ast.go
+++ b/src/cmd/cgo/ast.go
@@ -272,7 +272,7 @@ func (f *File) walk(x interface{}, context string, visit func(*File, interface{}
 
 	case nil:
 
-	// These are ordered and grouped to match ../../pkg/go/ast/ast.go
+	// These are ordered and grouped to match ../../go/ast/ast.go
 	case *ast.Field:
 		if len(n.Names) == 0 && context == "field" {
 			f.walk(&n.Type, "embed-type", visit)
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 1c18c5932d..e4dc9ba56c 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -366,8 +366,8 @@ static char *oldtool[] = {
 // not be in release branches.
 static char *unreleased[] = {
 	"src/cmd/link",
-	"src/pkg/debug/goobj",
-	"src/pkg/old",
+	"src/debug/goobj",
+	"src/old",
 };
 
 // setup sets up the tree for the initial build.
@@ -590,7 +590,7 @@ static struct {
 		"$GOROOT/pkg/obj/$GOHOSTOS_$GOHOSTARCH/libbio.a",
 		"$GOROOT/pkg/obj/$GOHOSTOS_$GOHOSTARCH/lib9.a",
 	}},
-	{"pkg/runtime", {
+	{"runtime", {
 		"zaexperiment.h", // must sort above zasm
 		"zasm_$GOOS_$GOARCH.h",
 		"zsys_$GOOS_$GOARCH.s",
@@ -706,7 +706,7 @@ install(char *dir)
 	}
 
 	islib = hasprefix(dir, "lib") || streq(dir, "cmd/cc") || streq(dir, "cmd/gc");
-	ispkg = hasprefix(dir, "pkg");
+	ispkg = !islib && !hasprefix(dir, "cmd/");
 	isgo = ispkg || streq(dir, "cmd/go") || streq(dir, "cmd/cgo");
 
 	exe = "";
@@ -732,11 +732,11 @@ install(char *dir)
 		// Go library (package).
 		ispackcmd = 1;
 		vadd(&link, "pack"); // program name - unused here, but all the other cases record one
-		p = bprintf(&b, "%s/pkg/%s_%s/%s", goroot, goos, goarch, dir+4);
+		p = bprintf(&b, "%s/pkg/%s_%s/%s", goroot, goos, goarch, dir);
 		*xstrrchr(p, '/') = '\0';
 		xmkdirall(p);
 		targ = link.len;
-		vadd(&link, bpathf(&b, "%s/pkg/%s_%s/%s.a", goroot, goos, goarch, dir+4));
+		vadd(&link, bpathf(&b, "%s/pkg/%s_%s/%s.a", goroot, goos, goarch, dir));
 	} else if(streq(dir, "cmd/go") || streq(dir, "cmd/cgo")) {
 		// Go command.
 		vadd(&link, bpathf(&b, "%s/%sl", tooldir, gochar));
@@ -883,7 +883,7 @@ install(char *dir)
 		goto out;
 
 	// For package runtime, copy some files into the work space.
-	if(streq(dir, "pkg/runtime")) {
+	if(streq(dir, "runtime")) {
 		copyfile(bpathf(&b, "%s/arch_GOARCH.h", workdir),
 			bpathf(&b1, "%s/arch_%s.h", bstr(&path), goarch), 0);
 		copyfile(bpathf(&b, "%s/defs_GOOS_GOARCH.h", workdir),
@@ -911,7 +911,7 @@ install(char *dir)
 					errprintf("generate %s\n", p);
 				gentab[j].gen(bstr(&path), p);
 				// Do not add generated file to clean list.
-				// In pkg/runtime, we want to be able to
+				// In runtime, we want to be able to
 				// build the package with the go tool,
 				// and it assumes these generated files already
 				// exist (it does not know how to build them).
@@ -929,7 +929,7 @@ install(char *dir)
 	// One more copy for package runtime.
 	// The last batch was required for the generators.
 	// This one is generated.
-	if(streq(dir, "pkg/runtime")) {
+	if(streq(dir, "runtime")) {
 		copyfile(bpathf(&b, "%s/zasm_GOOS_GOARCH.h", workdir),
 			bpathf(&b1, "%s/zasm_%s_%s.h", bstr(&path), goos, goarch), 0);
 	}
@@ -1074,7 +1074,7 @@ install(char *dir)
 		else
 			vadd(&compile, "main");
 
-		if(streq(dir, "pkg/runtime"))
+		if(streq(dir, "runtime"))
 			vadd(&compile, "-+");
 
 		vcopy(&compile, go.p, go.len);
@@ -1103,11 +1103,11 @@ install(char *dir)
 nobuild:
 	// In package runtime, we install runtime.h and cgocall.h too,
 	// for use by cgo compilation.
-	if(streq(dir, "pkg/runtime")) {
+	if(streq(dir, "runtime")) {
 		copyfile(bpathf(&b, "%s/pkg/%s_%s/cgocall.h", goroot, goos, goarch),
-			bpathf(&b1, "%s/src/pkg/runtime/cgocall.h", goroot), 0);
+			bpathf(&b1, "%s/src/runtime/cgocall.h", goroot), 0);
 		copyfile(bpathf(&b, "%s/pkg/%s_%s/runtime.h", goroot, goos, goarch),
-			bpathf(&b1, "%s/src/pkg/runtime/runtime.h", goroot), 0);
+			bpathf(&b1, "%s/src/runtime/runtime.h", goroot), 0);
 	}
 
 
@@ -1304,47 +1304,47 @@ static char *buildorder[] = {
 	// back when there were build scripts.  Will have to
 	// be maintained by hand, but shouldn't change very
 	// often.
-	"pkg/runtime",
-	"pkg/errors",
-	"pkg/sync/atomic",
-	"pkg/sync",
-	"pkg/io",
-	"pkg/unicode",
-	"pkg/unicode/utf8",
-	"pkg/unicode/utf16",
-	"pkg/bytes",
-	"pkg/math",
-	"pkg/strings",
-	"pkg/strconv",
-	"pkg/bufio",
-	"pkg/sort",
-	"pkg/container/heap",
-	"pkg/encoding/base64",
-	"pkg/syscall",
-	"pkg/time",
-	"pkg/os",
-	"pkg/reflect",
-	"pkg/fmt",
-	"pkg/encoding",
-	"pkg/encoding/json",
-	"pkg/flag",
-	"pkg/path/filepath",
-	"pkg/path",
-	"pkg/io/ioutil",
-	"pkg/log",
-	"pkg/regexp/syntax",
-	"pkg/regexp",
-	"pkg/go/token",
-	"pkg/go/scanner",
-	"pkg/go/ast",
-	"pkg/go/parser",
-	"pkg/os/exec",
-	"pkg/os/signal",
-	"pkg/net/url",
-	"pkg/text/template/parse",
-	"pkg/text/template",
-	"pkg/go/doc",
-	"pkg/go/build",
+	"runtime",
+	"errors",
+	"sync/atomic",
+	"sync",
+	"io",
+	"unicode",
+	"unicode/utf8",
+	"unicode/utf16",
+	"bytes",
+	"math",
+	"strings",
+	"strconv",
+	"bufio",
+	"sort",
+	"container/heap",
+	"encoding/base64",
+	"syscall",
+	"time",
+	"os",
+	"reflect",
+	"fmt",
+	"encoding",
+	"encoding/json",
+	"flag",
+	"path/filepath",
+	"path",
+	"io/ioutil",
+	"log",
+	"regexp/syntax",
+	"regexp",
+	"go/token",
+	"go/scanner",
+	"go/ast",
+	"go/parser",
+	"os/exec",
+	"os/signal",
+	"net/url",
+	"text/template/parse",
+	"text/template",
+	"go/doc",
+	"go/build",
 	"cmd/go",
 };
 
@@ -1352,6 +1352,7 @@ static char *buildorder[] = {
 // It is bigger than the buildorder because we clean all the
 // compilers but build only the $GOARCH ones.
 static char *cleantab[] = {
+	// Commands and C libraries.
 	"cmd/5a",
 	"cmd/5c",
 	"cmd/5g",
@@ -1370,46 +1371,48 @@ static char *cleantab[] = {
 	"lib9",
 	"libbio",
 	"liblink",
-	"pkg/bufio",
-	"pkg/bytes",
-	"pkg/container/heap",
-	"pkg/encoding",
-	"pkg/encoding/base64",
-	"pkg/encoding/json",
-	"pkg/errors",
-	"pkg/flag",
-	"pkg/fmt",
-	"pkg/go/ast",
-	"pkg/go/build",
-	"pkg/go/doc",
-	"pkg/go/parser",
-	"pkg/go/scanner",
-	"pkg/go/token",
-	"pkg/io",
-	"pkg/io/ioutil",
-	"pkg/log",
-	"pkg/math",
-	"pkg/net/url",
-	"pkg/os",
-	"pkg/os/exec",
-	"pkg/path",
-	"pkg/path/filepath",
-	"pkg/reflect",
-	"pkg/regexp",
-	"pkg/regexp/syntax",
-	"pkg/runtime",
-	"pkg/sort",
-	"pkg/strconv",
-	"pkg/strings",
-	"pkg/sync",
-	"pkg/sync/atomic",
-	"pkg/syscall",
-	"pkg/text/template",
-	"pkg/text/template/parse",
-	"pkg/time",
-	"pkg/unicode",
-	"pkg/unicode/utf16",
-	"pkg/unicode/utf8",
+
+	// Go packages.
+	"bufio",
+	"bytes",
+	"container/heap",
+	"encoding",
+	"encoding/base64",
+	"encoding/json",
+	"errors",
+	"flag",
+	"fmt",
+	"go/ast",
+	"go/build",
+	"go/doc",
+	"go/parser",
+	"go/scanner",
+	"go/token",
+	"io",
+	"io/ioutil",
+	"log",
+	"math",
+	"net/url",
+	"os",
+	"os/exec",
+	"path",
+	"path/filepath",
+	"reflect",
+	"regexp",
+	"regexp/syntax",
+	"runtime",
+	"sort",
+	"strconv",
+	"strings",
+	"sync",
+	"sync/atomic",
+	"syscall",
+	"text/template",
+	"text/template/parse",
+	"time",
+	"unicode",
+	"unicode/utf16",
+	"unicode/utf8",
 };
 
 static void
@@ -1438,9 +1441,9 @@ clean(void)
 			xremove(bpathf(&b, "%s/%s", bstr(&path), cleantab[i]+4));
 	}
 
-	// remove src/pkg/runtime/z* unconditionally
+	// remove src/runtime/z* unconditionally
 	vreset(&dir);
-	bpathf(&path, "%s/src/pkg/runtime", goroot);
+	bpathf(&path, "%s/src/runtime", goroot);
 	xreaddir(&dir, bstr(&path));
 	for(j=0; j 0)
 		usage();
 
+	if(isdir(bpathf(&b, "%s/src/pkg", goroot))) {
+		fatal("\n\n"
+			"The Go package sources have moved to $GOROOT/src.\n"
+			"*** %s still exists. ***\n"
+			"It probably contains stale files that may confuse the build.\n"
+			"Please (check what's there and) remove it and try again.\n"
+			"See http://golang.org/s/go14nopkg\n", bpathf(&b, "%s/src/pkg", goroot));
+	}
+	
 	if(rebuildall)
 		clean();
 	goversion = findgoversion();
@@ -1607,9 +1619,9 @@ cmdbootstrap(int argc, char **argv)
 	xsetenv("GOARCH", goarch);
 	xsetenv("GOOS", goos);
 
-	// Build pkg/runtime for actual goos/goarch too.
+	// Build runtime for actual goos/goarch too.
 	if(!streq(goos, gohostos) || !streq(goarch, gohostarch))
-		install("pkg/runtime");
+		install("runtime");
 
 	bfree(&b);
 }
diff --git a/src/cmd/dist/buildruntime.c b/src/cmd/dist/buildruntime.c
index 246bd2710d..6e87029e7c 100644
--- a/src/cmd/dist/buildruntime.c
+++ b/src/cmd/dist/buildruntime.c
@@ -5,7 +5,7 @@
 #include "a.h"
 
 /*
- * Helpers for building pkg/runtime.
+ * Helpers for building runtime.
  */
 
 // mkzversion writes zversion.go:
diff --git a/src/cmd/dist/windows.c b/src/cmd/dist/windows.c
index 1102adff5e..ff1a273512 100644
--- a/src/cmd/dist/windows.c
+++ b/src/cmd/dist/windows.c
@@ -929,7 +929,7 @@ xsamefile(char *f1, char *f2)
 		return 1;
 	
 	torune(&ru, f1);
-	// refer to ../../pkg/os/stat_windows.go:/sameFile
+	// refer to ../../os/stat_windows.go:/sameFile
 	fd1 = CreateFileW(ru, 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0);
 	xfree(ru);
 	if(fd1 == INVALID_HANDLE_VALUE)
diff --git a/src/cmd/fix/fix.go b/src/cmd/fix/fix.go
index a100be794e..a07bbac790 100644
--- a/src/cmd/fix/fix.go
+++ b/src/cmd/fix/fix.go
@@ -101,7 +101,7 @@ func walkBeforeAfter(x interface{}, before, after func(interface{})) {
 	case *[]ast.Stmt:
 		walkBeforeAfter(*n, before, after)
 
-	// These are ordered and grouped to match ../../pkg/go/ast/ast.go
+	// These are ordered and grouped to match ../../go/ast/ast.go
 	case *ast.Field:
 		walkBeforeAfter(&n.Names, before, after)
 		walkBeforeAfter(&n.Type, before, after)
diff --git a/src/cmd/gc/md5.c b/src/cmd/gc/md5.c
index fa6606719f..46cb6b712d 100644
--- a/src/cmd/gc/md5.c
+++ b/src/cmd/gc/md5.c
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // 64-bit MD5 (does full MD5 but returns 64 bits only).
-// Translation of ../../pkg/crypto/md5/md5*.go.
+// Translation of ../../crypto/md5/md5*.go.
 
 #include 
 #include 
diff --git a/src/cmd/gc/pgen.c b/src/cmd/gc/pgen.c
index cabba6824e..ec50ada5b6 100644
--- a/src/cmd/gc/pgen.c
+++ b/src/cmd/gc/pgen.c
@@ -11,7 +11,7 @@
 #include	"md5.h"
 #include	"gg.h"
 #include	"opt.h"
-#include	"../../pkg/runtime/funcdata.h"
+#include	"../../runtime/funcdata.h"
 
 static void allocauto(Prog* p);
 
@@ -233,7 +233,7 @@ compile(Node *fn)
 		ptxt->TEXTFLAG |= NOSPLIT;
 
 	// Clumsy but important.
-	// See test/recover.go for test cases and src/pkg/reflect/value.go
+	// See test/recover.go for test cases and src/reflect/value.go
 	// for the actual functions being considered.
 	if(myimportpath != nil && strcmp(myimportpath, "reflect") == 0) {
 		if(strcmp(curfn->nname->sym->name, "callReflect") == 0 || strcmp(curfn->nname->sym->name, "callMethod") == 0)
diff --git a/src/cmd/gc/plive.c b/src/cmd/gc/plive.c
index 0ad700e82f..d2f384b2dd 100644
--- a/src/cmd/gc/plive.c
+++ b/src/cmd/gc/plive.c
@@ -18,8 +18,8 @@
 #include "gg.h"
 #include "opt.h"
 #include "../ld/textflag.h"
-#include "../../pkg/runtime/funcdata.h"
-#include "../../pkg/runtime/mgc0.h"
+#include "../../runtime/funcdata.h"
+#include "../../runtime/mgc0.h"
 
 enum {
 	UNVISITED = 0,
diff --git a/src/cmd/gc/reflect.c b/src/cmd/gc/reflect.c
index f227054caf..31e449e760 100644
--- a/src/cmd/gc/reflect.c
+++ b/src/cmd/gc/reflect.c
@@ -6,8 +6,8 @@
 #include 
 #include "go.h"
 #include "../ld/textflag.h"
-#include "../../pkg/runtime/mgc0.h"
-#include "../../pkg/runtime/typekind.h"
+#include "../../runtime/mgc0.h"
+#include "../../runtime/typekind.h"
 
 /*
  * runtime interface and reflection data structures
@@ -109,7 +109,7 @@ lsort(Sig *l, int(*f)(Sig*, Sig*))
 // the given map type.  This type is not visible to users -
 // we include only enough information to generate a correct GC
 // program for it.
-// Make sure this stays in sync with ../../pkg/runtime/hashmap.c!
+// Make sure this stays in sync with ../../runtime/hashmap.c!
 enum {
 	BUCKETSIZE = 8,
 	MAXKEYSIZE = 128,
@@ -192,7 +192,7 @@ mapbucket(Type *t)
 // the given map type.  This type is not visible to users -
 // we include only enough information to generate a correct GC
 // program for it.
-// Make sure this stays in sync with ../../pkg/runtime/hashmap.go!
+// Make sure this stays in sync with ../../runtime/hashmap.go!
 static Type*
 hmap(Type *t)
 {
@@ -261,7 +261,7 @@ hiter(Type *t)
 	//    bptr *Bucket
 	//    other [4]uintptr
 	// }
-	// must match ../../pkg/runtime/hashmap.c:hash_iter.
+	// must match ../../runtime/hashmap.c:hash_iter.
 	field[0] = typ(TFIELD);
 	field[0]->type = ptrto(t->down);
 	field[0]->sym = mal(sizeof(Sym));
@@ -550,7 +550,7 @@ dgopkgpath(Sym *s, int ot, Pkg *pkg)
 
 /*
  * uncommonType
- * ../../pkg/runtime/type.go:/uncommonType
+ * ../../runtime/type.go:/uncommonType
  */
 static int
 dextratype(Sym *sym, int off, Type *t, int ptroff)
@@ -594,7 +594,7 @@ dextratype(Sym *sym, int off, Type *t, int ptroff)
 	// methods
 	for(a=m; a; a=a->link) {
 		// method
-		// ../../pkg/runtime/type.go:/method
+		// ../../runtime/type.go:/method
 		ot = dgostringptr(s, ot, a->name);
 		ot = dgopkgpath(s, ot, a->pkg);
 		ot = dsymptr(s, ot, dtypesym(a->mtype), 0);
@@ -710,7 +710,7 @@ haspointers(Type *t)
 
 /*
  * commonType
- * ../../pkg/runtime/type.go:/commonType
+ * ../../runtime/type.go:/commonType
  */
 static int
 dcommontype(Sym *s, int ot, Type *t)
@@ -992,7 +992,7 @@ ok:
 
 	case TARRAY:
 		if(t->bound >= 0) {
-			// ../../pkg/runtime/type.go:/ArrayType
+			// ../../runtime/type.go:/ArrayType
 			s1 = dtypesym(t->type);
 			t2 = typ(TARRAY);
 			t2->type = t->type;
@@ -1004,7 +1004,7 @@ ok:
 			ot = dsymptr(s, ot, s2, 0);
 			ot = duintptr(s, ot, t->bound);
 		} else {
-			// ../../pkg/runtime/type.go:/SliceType
+			// ../../runtime/type.go:/SliceType
 			s1 = dtypesym(t->type);
 			ot = dcommontype(s, ot, t);
 			xt = ot - 3*widthptr;
@@ -1013,7 +1013,7 @@ ok:
 		break;
 
 	case TCHAN:
-		// ../../pkg/runtime/type.go:/ChanType
+		// ../../runtime/type.go:/ChanType
 		s1 = dtypesym(t->type);
 		ot = dcommontype(s, ot, t);
 		xt = ot - 3*widthptr;
@@ -1063,14 +1063,14 @@ ok:
 			n++;
 		}
 
-		// ../../pkg/runtime/type.go:/InterfaceType
+		// ../../runtime/type.go:/InterfaceType
 		ot = dcommontype(s, ot, t);
 		xt = ot - 3*widthptr;
 		ot = dsymptr(s, ot, s, ot+widthptr+2*widthint);
 		ot = duintxx(s, ot, n, widthint);
 		ot = duintxx(s, ot, n, widthint);
 		for(a=m; a; a=a->link) {
-			// ../../pkg/runtime/type.go:/imethod
+			// ../../runtime/type.go:/imethod
 			ot = dgostringptr(s, ot, a->name);
 			ot = dgopkgpath(s, ot, a->pkg);
 			ot = dsymptr(s, ot, dtypesym(a->type), 0);
@@ -1078,7 +1078,7 @@ ok:
 		break;
 
 	case TMAP:
-		// ../../pkg/runtime/type.go:/MapType
+		// ../../runtime/type.go:/MapType
 		s1 = dtypesym(t->down);
 		s2 = dtypesym(t->type);
 		s3 = dtypesym(mapbucket(t));
@@ -1109,11 +1109,11 @@ ok:
 	case TPTR32:
 	case TPTR64:
 		if(t->type->etype == TANY) {
-			// ../../pkg/runtime/type.go:/UnsafePointerType
+			// ../../runtime/type.go:/UnsafePointerType
 			ot = dcommontype(s, ot, t);
 			break;
 		}
-		// ../../pkg/runtime/type.go:/PtrType
+		// ../../runtime/type.go:/PtrType
 		s1 = dtypesym(t->type);
 		ot = dcommontype(s, ot, t);
 		xt = ot - 3*widthptr;
@@ -1121,7 +1121,7 @@ ok:
 		break;
 
 	case TSTRUCT:
-		// ../../pkg/runtime/type.go:/StructType
+		// ../../runtime/type.go:/StructType
 		// for security, only the exported fields.
 		n = 0;
 		for(t1=t->type; t1!=T; t1=t1->down) {
@@ -1134,7 +1134,7 @@ ok:
 		ot = duintxx(s, ot, n, widthint);
 		ot = duintxx(s, ot, n, widthint);
 		for(t1=t->type; t1!=T; t1=t1->down) {
-			// ../../pkg/runtime/type.go:/structField
+			// ../../runtime/type.go:/structField
 			if(t1->sym && !t1->embedded) {
 				ot = dgostringptr(s, ot, t1->sym->name);
 				if(exportname(t1->sym->name))
@@ -1260,7 +1260,7 @@ dalgsym(Type *t)
 	dsymptr(eqfunc, 0, eq, 0);
 	ggloblsym(eqfunc, widthptr, DUPOK|RODATA);
 
-	// ../../pkg/runtime/alg.go:/typeAlg
+	// ../../runtime/alg.go:/typeAlg
 	ot = 0;
 	ot = dsymptr(s, ot, hashfunc, 0);
 	ot = dsymptr(s, ot, eqfunc, 0);
diff --git a/src/cmd/gc/select.c b/src/cmd/gc/select.c
index ed23e4318b..965ad277fa 100644
--- a/src/cmd/gc/select.c
+++ b/src/cmd/gc/select.c
@@ -325,7 +325,7 @@ out:
 	lineno = lno;
 }
 
-// Keep in sync with src/pkg/runtime/chan.h.
+// Keep in sync with src/runtime/chan.h.
 static Type*
 selecttype(int32 size)
 {
diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index d62d55e773..93600c688b 100644
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -3641,7 +3641,7 @@ ngotype(Node *n)
  * users if we escape that as little as possible.
  *
  * If you edit this, edit ../ld/lib.c:/^pathtoprefix too.
- * If you edit this, edit ../../pkg/debug/goobj/read.go:/importPathToPrefix too.
+ * If you edit this, edit ../../debug/goobj/read.go:/importPathToPrefix too.
  */
 static char*
 pathtoprefix(char *s)
diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index 0de37b87fb..5f24db2b0b 100644
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -688,7 +688,7 @@ walkexpr(Node **np, NodeList **init)
 		walkexpr(&r->right, init);
 		t = r->left->type;
 		p = nil;
-		if(t->type->width <= 128) { // Check ../../pkg/runtime/hashmap.c:MAXVALUESIZE before changing.
+		if(t->type->width <= 128) { // Check ../../runtime/hashmap.c:MAXVALUESIZE before changing.
 			switch(simsimtype(t->down)) {
 			case TINT32:
 			case TUINT32:
@@ -1083,7 +1083,7 @@ walkexpr(Node **np, NodeList **init)
 
 		t = n->left->type;
 		p = nil;
-		if(t->type->width <= 128) {  // Check ../../pkg/runtime/hashmap.c:MAXVALUESIZE before changing.
+		if(t->type->width <= 128) {  // Check ../../runtime/hashmap.c:MAXVALUESIZE before changing.
 			switch(simsimtype(t->down)) {
 			case TINT32:
 			case TUINT32:
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index fd92ca2783..45b5bc3233 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -433,12 +433,11 @@ const (
 )
 
 var (
-	goroot       = filepath.Clean(runtime.GOROOT())
-	gobin        = os.Getenv("GOBIN")
-	gorootBin    = filepath.Join(goroot, "bin")
-	gorootSrcPkg = filepath.Join(goroot, "src/pkg")
-	gorootPkg    = filepath.Join(goroot, "pkg")
-	gorootSrc    = filepath.Join(goroot, "src")
+	goroot    = filepath.Clean(runtime.GOROOT())
+	gobin     = os.Getenv("GOBIN")
+	gorootBin = filepath.Join(goroot, "bin")
+	gorootPkg = filepath.Join(goroot, "pkg")
+	gorootSrc = filepath.Join(goroot, "src")
 )
 
 func (b *builder) init() {
@@ -1255,7 +1254,7 @@ func (b *builder) showcmd(dir string, format string, args ...interface{}) {
 // the source directory for the package that has failed to build.
 // showOutput rewrites mentions of dir with a relative path to dir
 // when the relative path is shorter.  This is usually more pleasant.
-// For example, if fmt doesn't compile and we are in src/pkg/html,
+// For example, if fmt doesn't compile and we are in src/html,
 // the output is
 //
 //	$ go build
@@ -1267,7 +1266,7 @@ func (b *builder) showcmd(dir string, format string, args ...interface{}) {
 //
 //	$ go build
 //	# fmt
-//	/usr/gopher/go/src/pkg/fmt/print.go:1090: undefined: asdf
+//	/usr/gopher/go/src/fmt/print.go:1090: undefined: asdf
 //	$
 //
 // showOutput also replaces references to the work directory with $WORK.
diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index eb69606def..9691f39c76 100644
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -537,7 +537,7 @@ func matchPackages(pattern string) []string {
 	})
 
 	for _, src := range buildContext.SrcDirs() {
-		if pattern == "std" && src != gorootSrcPkg {
+		if pattern == "std" && src != gorootSrc {
 			continue
 		}
 		src = filepath.Clean(src) + string(filepath.Separator)
@@ -619,7 +619,7 @@ func matchPackagesInFS(pattern string) []string {
 			// The initial case is not Cleaned, though, so we do this explicitly.
 			//
 			// This converts a path like "./io/" to "io". Without this step, running
-			// "cd $GOROOT/src/pkg; go list ./io/..." would incorrectly skip the io
+			// "cd $GOROOT/src; go list ./io/..." would incorrectly skip the io
 			// package, because prepending the prefix "./" to the unclean path would
 			// result in "././io", and match("././io") returns false.
 			path = filepath.Clean(path)
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index 1af33f037a..63875aed5a 100644
--- a/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go
@@ -218,7 +218,7 @@ func dirToImportPath(dir string) string {
 }
 
 func makeImportValid(r rune) rune {
-	// Should match Go spec, compilers, and ../../pkg/go/parser/parser.go:/isValidImport.
+	// Should match Go spec, compilers, and ../../go/parser/parser.go:/isValidImport.
 	const illegalChars = `!"#$%&'()*,:;<=>?[\]^{|}` + "`\uFFFD"
 	if !unicode.IsGraphic(r) || unicode.IsSpace(r) || strings.ContainsRune(illegalChars, r) {
 		return '_'
@@ -783,24 +783,13 @@ func loadPackage(arg string, stk *importStack) *Package {
 			arg = sub
 		}
 	}
-	if strings.HasPrefix(arg, "cmd/") {
+	if strings.HasPrefix(arg, "cmd/") && !strings.Contains(arg[4:], "/") {
 		if p := cmdCache[arg]; p != nil {
 			return p
 		}
 		stk.push(arg)
 		defer stk.pop()
 
-		if strings.Contains(arg[4:], "/") {
-			p := &Package{
-				Error: &PackageError{
-					ImportStack: stk.copy(),
-					Err:         fmt.Sprintf("invalid import path: cmd/... is reserved for Go commands"),
-					hard:        true,
-				},
-			}
-			return p
-		}
-
 		bp, err := buildContext.ImportDir(filepath.Join(gorootSrc, arg), 0)
 		bp.ImportPath = arg
 		bp.Goroot = true
diff --git a/src/cmd/go/test.bash b/src/cmd/go/test.bash
index 24640e2723..13886e158b 100755
--- a/src/cmd/go/test.bash
+++ b/src/cmd/go/test.bash
@@ -430,7 +430,7 @@ fi
 # Test that without GOPATH set, go get should fail
 TEST without GOPATH, go get fails
 d=$(mktemp -d -t testgoXXX)
-mkdir -p $d/src/pkg
+mkdir -p $d/src
 if GOPATH= GOROOT=$d ./testgo get -d code.google.com/p/go.codereview/cmd/hgpatch ; then 
 	echo 'go get code.google.com/p/go.codereview/cmd/hgpatch should not succeed with $GOPATH unset'
 	ok=false
@@ -440,7 +440,7 @@ rm -rf $d
 # Test that with GOPATH=$GOROOT, go get should fail
 TEST with GOPATH=GOROOT, go get fails
 d=$(mktemp -d -t testgoXXX)
-mkdir -p $d/src/pkg
+mkdir -p $d/src
 if GOPATH=$d GOROOT=$d ./testgo get -d code.google.com/p/go.codereview/cmd/hgpatch ; then
         echo 'go get code.google.com/p/go.codereview/cmd/hgpatch should not succeed with GOPATH=$GOROOT'
         ok=false
@@ -595,7 +595,7 @@ export GOPATH=$(pwd)/testdata/shadow/root1:$(pwd)/testdata/shadow/root2
 
 # The math in root1 is not "math" because the standard math is.
 cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root1/src/math)
-if [ "$cdir" != "(_$(pwd)/testdata/shadow/root1/src/math) ($GOROOT/src/pkg/math)" ]; then
+if [ "$cdir" != "(_$(pwd)/testdata/shadow/root1/src/math) ($GOROOT/src/math)" ]; then
 	echo shadowed math is not shadowed: "$cdir"
 	ok=false
 fi
diff --git a/src/cmd/gofmt/doc.go b/src/cmd/gofmt/doc.go
index 8f73ef5b9d..3fc0439548 100644
--- a/src/cmd/gofmt/doc.go
+++ b/src/cmd/gofmt/doc.go
@@ -67,7 +67,7 @@ To remove the parentheses:
 
 To convert the package tree from explicit slice upper bounds to implicit ones:
 
-	gofmt -r 'α[β:len(α)] -> α[β:]' -w $GOROOT/src/pkg
+	gofmt -r 'α[β:len(α)] -> α[β:]' -w $GOROOT/src
 
 The simplify command
 
diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c
index 098403a743..71624c3304 100644
--- a/src/cmd/ld/data.c
+++ b/src/cmd/ld/data.c
@@ -35,7 +35,7 @@
 #include	"../ld/elf.h"
 #include	"../ld/macho.h"
 #include	"../ld/pe.h"
-#include	"../../pkg/runtime/mgc0.h"
+#include	"../../runtime/mgc0.h"
 
 void	dynreloc(void);
 
diff --git a/src/cmd/ld/decodesym.c b/src/cmd/ld/decodesym.c
index b5fe47ce9f..c530669425 100644
--- a/src/cmd/ld/decodesym.c
+++ b/src/cmd/ld/decodesym.c
@@ -4,10 +4,10 @@
 
 #include	"l.h"
 #include	"lib.h"
-#include	"../../pkg/runtime/typekind.h"
+#include	"../../runtime/typekind.h"
 
 // Decoding the type.* symbols.	 This has to be in sync with
-// ../../pkg/runtime/type.go, or more specificaly, with what
+// ../../runtime/type.go, or more specificaly, with what
 // ../gc/reflect.c stuffs in these.
 
 static Reloc*
diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c
index 3f93f58184..4efb0ed537 100644
--- a/src/cmd/ld/dwarf.c
+++ b/src/cmd/ld/dwarf.c
@@ -19,7 +19,7 @@
 #include	"../ld/elf.h"
 #include	"../ld/macho.h"
 #include	"../ld/pe.h"
-#include	"../../pkg/runtime/typekind.h"
+#include	"../../runtime/typekind.h"
 
 /*
  * Offsets and sizes of the debug_* sections in the cout file.
diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c
index 51e10bb99d..651705a2e6 100644
--- a/src/cmd/ld/lib.c
+++ b/src/cmd/ld/lib.c
@@ -33,8 +33,8 @@
 #include	"lib.h"
 #include	"../ld/elf.h"
 #include	"../ld/dwarf.h"
-#include	"../../pkg/runtime/stack.h"
-#include	"../../pkg/runtime/funcdata.h"
+#include	"../../runtime/stack.h"
+#include	"../../runtime/funcdata.h"
 
 #include	
 #if !(defined(_WIN32) || defined(PLAN9))
@@ -899,7 +899,7 @@ unmal(void *v, uint32 n)
  * escaping are %, ., and ", but we escape all control characters too.
  *
  * If you edit this, edit ../gc/subr.c:/^pathtoprefix too.
- * If you edit this, edit ../../pkg/debug/goobj/read.go:/importPathToPrefix too.
+ * If you edit this, edit ../../debug/goobj/read.go:/importPathToPrefix too.
  */
 static char*
 pathtoprefix(char *s)
diff --git a/src/cmd/ld/pcln.c b/src/cmd/ld/pcln.c
index 3cd9e65dad..69671c0fc9 100644
--- a/src/cmd/ld/pcln.c
+++ b/src/cmd/ld/pcln.c
@@ -4,7 +4,7 @@
 
 #include	"l.h"
 #include	"lib.h"
-#include	"../../pkg/runtime/funcdata.h"
+#include	"../../runtime/funcdata.h"
 
 static void
 addvarint(Pcdata *d, uint32 val)
diff --git a/src/cmd/nm/nm_test.go b/src/cmd/nm/nm_test.go
index f447e8e491..cb555d8273 100644
--- a/src/cmd/nm/nm_test.go
+++ b/src/cmd/nm/nm_test.go
@@ -83,7 +83,7 @@ func TestNM(t *testing.T) {
 		"plan9obj/testdata/386-plan9-exec",
 	}
 	for _, f := range testfiles {
-		exepath := filepath.Join(runtime.GOROOT(), "src", "pkg", "debug", f)
+		exepath := filepath.Join(runtime.GOROOT(), "src", "debug", f)
 		cmd := exec.Command(testnmpath, exepath)
 		out, err := cmd.CombinedOutput()
 		if err != nil {
diff --git a/src/liblink/asm5.c b/src/liblink/asm5.c
index 65c4ca199a..96df9f7919 100644
--- a/src/liblink/asm5.c
+++ b/src/liblink/asm5.c
@@ -35,7 +35,7 @@
 #include 
 #include 
 #include "../cmd/5l/5.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 typedef	struct	Optab	Optab;
 typedef	struct	Oprang	Oprang;
diff --git a/src/liblink/asm6.c b/src/liblink/asm6.c
index 999507650d..428eb9442b 100644
--- a/src/liblink/asm6.c
+++ b/src/liblink/asm6.c
@@ -35,7 +35,7 @@
 #include 
 #include 
 #include "../cmd/6l/6.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 enum
 {
diff --git a/src/liblink/asm8.c b/src/liblink/asm8.c
index 6035017b2c..b6627d5fd7 100644
--- a/src/liblink/asm8.c
+++ b/src/liblink/asm8.c
@@ -35,7 +35,7 @@
 #include 
 #include 
 #include "../cmd/8l/8.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 enum
 {
diff --git a/src/liblink/obj5.c b/src/liblink/obj5.c
index 0b6b8deb5f..6630a59231 100644
--- a/src/liblink/obj5.c
+++ b/src/liblink/obj5.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 #include "../cmd/5l/5.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 static Prog zprg = {
 	.as = AGOK,
diff --git a/src/liblink/obj6.c b/src/liblink/obj6.c
index 3c62470be9..6a7ff48b0a 100644
--- a/src/liblink/obj6.c
+++ b/src/liblink/obj6.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 #include "../cmd/6l/6.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 static Prog zprg = {
 	.back = 2,
diff --git a/src/liblink/obj8.c b/src/liblink/obj8.c
index fa1e1ca243..03f12462e8 100644
--- a/src/liblink/obj8.c
+++ b/src/liblink/obj8.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 #include "../cmd/8l/8.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
 
 static Prog zprg = {
 	.back = 2,
diff --git a/src/liblink/sym.c b/src/liblink/sym.c
index ec07957f47..bd85518467 100644
--- a/src/liblink/sym.c
+++ b/src/liblink/sym.c
@@ -163,7 +163,7 @@ linknew(LinkArch *arch)
 	case Hdarwin:
 		/*
 		 * OS X system constants - offset from 0(GS) to our TLS.
-		 * Explained in ../../pkg/runtime/cgo/gcc_darwin_*.c.
+		 * Explained in ../../runtime/cgo/gcc_darwin_*.c.
 		 */
 		switch(ctxt->arch->thechar) {
 		default:
diff --git a/src/make.bash b/src/make.bash
index d7b63ff093..fbc6f5d89d 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -106,7 +106,7 @@ if [ "$(uname -s)" == "GNU/kFreeBSD" ]; then
 fi
 
 # Clean old generated file that will cause problems in the build.
-rm -f ./pkg/runtime/runtime_defs.go
+rm -f ./runtime/runtime_defs.go
 
 # Finally!  Run the build.
 
diff --git a/src/make.rc b/src/make.rc
index ab152c0db1..7a62d6af00 100755
--- a/src/make.rc
+++ b/src/make.rc
@@ -40,7 +40,7 @@ if(! test -f run.rc){
 ../include/plan9/mklibc.rc > ../include/plan9/libc_plan9.h
 
 # Clean old generated file that will cause problems in the build.
-rm -f ./pkg/runtime/runtime_defs.go
+rm -f ./runtime/runtime_defs.go
 
 # Determine the host compiler toolchain.
 eval `{grep '^(CC|LD|O)=' /$objtype/mkfile}
diff --git a/src/pkg/go/build/build.go b/src/pkg/go/build/build.go
index 1a133041e8..69cb4b2f6b 100644
--- a/src/pkg/go/build/build.go
+++ b/src/pkg/go/build/build.go
@@ -207,9 +207,7 @@ func (ctxt *Context) gopath() []string {
 		if p == "" || p == ctxt.GOROOT {
 			// Empty paths are uninteresting.
 			// If the path is the GOROOT, ignore it.
-			// People sometimes set GOPATH=$GOROOT, which is useless
-			// but would cause us to find packages with import paths
-			// like "pkg/math".
+			// People sometimes set GOPATH=$GOROOT.
 			// Do not get confused by this common mistake.
 			continue
 		}
@@ -239,7 +237,7 @@ func (ctxt *Context) gopath() []string {
 func (ctxt *Context) SrcDirs() []string {
 	var all []string
 	if ctxt.GOROOT != "" {
-		dir := ctxt.joinPath(ctxt.GOROOT, "src", "pkg")
+		dir := ctxt.joinPath(ctxt.GOROOT, "src")
 		if ctxt.isDir(dir) {
 			all = append(all, dir)
 		}
@@ -479,7 +477,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 		}
 		// Determine canonical import path, if any.
 		if ctxt.GOROOT != "" {
-			root := ctxt.joinPath(ctxt.GOROOT, "src", "pkg")
+			root := ctxt.joinPath(ctxt.GOROOT, "src")
 			if sub, ok := ctxt.hasSubdir(root, p.Dir); ok {
 				p.Goroot = true
 				p.ImportPath = sub
@@ -495,7 +493,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 				// but check that using it wouldn't find something
 				// else first.
 				if ctxt.GOROOT != "" {
-					if dir := ctxt.joinPath(ctxt.GOROOT, "src", "pkg", sub); ctxt.isDir(dir) {
+					if dir := ctxt.joinPath(ctxt.GOROOT, "src", sub); ctxt.isDir(dir) {
 						p.ConflictDir = dir
 						goto Found
 					}
@@ -529,12 +527,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 
 		// Determine directory from import path.
 		if ctxt.GOROOT != "" {
-			var dir string
-			if strings.HasPrefix(path, "cmd/") {
-				dir = ctxt.joinPath(ctxt.GOROOT, "src", path)
-			} else {
-				dir = ctxt.joinPath(ctxt.GOROOT, "src", "pkg", path)
-			}
+			dir := ctxt.joinPath(ctxt.GOROOT, "src", path)
 			isDir := ctxt.isDir(dir)
 			binaryOnly = !isDir && mode&AllowBinary != 0 && pkga != "" && ctxt.isFile(ctxt.joinPath(ctxt.GOROOT, pkga))
 			if isDir || binaryOnly {
@@ -580,11 +573,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa
 
 Found:
 	if p.Root != "" {
-		if p.Goroot {
-			p.SrcRoot = ctxt.joinPath(p.Root, "src", "pkg")
-		} else {
-			p.SrcRoot = ctxt.joinPath(p.Root, "src")
-		}
+		p.SrcRoot = ctxt.joinPath(p.Root, "src")
 		p.PkgRoot = ctxt.joinPath(p.Root, "pkg")
 		p.BinDir = ctxt.joinPath(p.Root, "bin")
 		if pkga != "" {
diff --git a/src/pkg/math/sqrt.go b/src/pkg/math/sqrt.go
index 1bd4437f15..fdc869992e 100644
--- a/src/pkg/math/sqrt.go
+++ b/src/pkg/math/sqrt.go
@@ -80,7 +80,7 @@ package math
 //
 //
 // Notes:  Rounding mode detection omitted.  The constants "mask", "shift",
-// and "bias" are found in src/pkg/math/bits.go
+// and "bias" are found in src/math/bits.go
 
 // Sqrt returns the square root of x.
 //
diff --git a/src/pkg/net/http/httptest/server.go b/src/pkg/net/http/httptest/server.go
index 7f265552f5..789e7bf41e 100644
--- a/src/pkg/net/http/httptest/server.go
+++ b/src/pkg/net/http/httptest/server.go
@@ -203,7 +203,7 @@ func (h *waitGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 // localhostCert is a PEM-encoded TLS cert with SAN IPs
 // "127.0.0.1" and "[::1]", expiring at the last second of 2049 (the end
 // of ASN.1 time).
-// generated from src/pkg/crypto/tls:
+// generated from src/crypto/tls:
 // go run generate_cert.go  --rsa-bits 512 --host 127.0.0.1,::1,example.com --ca --start-date "Jan 1 00:00:00 1970" --duration=1000000h
 var localhostCert = []byte(`-----BEGIN CERTIFICATE-----
 MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwEjEQMA4GA1UEChMHQWNtZSBD
diff --git a/src/pkg/net/smtp/smtp_test.go b/src/pkg/net/smtp/smtp_test.go
index 3fba1ea5ae..5c659e8a09 100644
--- a/src/pkg/net/smtp/smtp_test.go
+++ b/src/pkg/net/smtp/smtp_test.go
@@ -669,7 +669,7 @@ func sendMail(hostPort string) error {
 // localhostCert is a PEM-encoded TLS cert with SAN IPs
 // "127.0.0.1" and "[::1]", expiring at the last second of 2049 (the end
 // of ASN.1 time).
-// generated from src/pkg/crypto/tls:
+// generated from src/crypto/tls:
 // go run generate_cert.go  --rsa-bits 512 --host 127.0.0.1,::1,example.com --ca --start-date "Jan 1 00:00:00 1970" --duration=1000000h
 var localhostCert = []byte(`-----BEGIN CERTIFICATE-----
 MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwEjEQMA4GA1UEChMHQWNtZSBD
diff --git a/src/pkg/reflect/type.go b/src/pkg/reflect/type.go
index 47aecd0023..6817cd74d7 100644
--- a/src/pkg/reflect/type.go
+++ b/src/pkg/reflect/type.go
@@ -1563,7 +1563,7 @@ const (
 	bitsPointer = 2
 )
 
-// Make sure these routines stay in sync with ../../pkg/runtime/hashmap.go!
+// Make sure these routines stay in sync with ../../runtime/hashmap.go!
 // These types exist only for GC, so we only fill out GC relevant info.
 // Currently, that's just size and the GC program.  We also fill in string
 // for possible debugging use.
diff --git a/src/pkg/reflect/value.go b/src/pkg/reflect/value.go
index adaafab9c9..368116a507 100644
--- a/src/pkg/reflect/value.go
+++ b/src/pkg/reflect/value.go
@@ -2679,7 +2679,7 @@ func cvtI2I(v Value, typ Type) Value {
 	return cvtT2I(v.Elem(), typ)
 }
 
-// implemented in ../pkg/runtime
+// implemented in ../runtime
 func chancap(ch unsafe.Pointer) int
 func chanclose(ch unsafe.Pointer)
 func chanlen(ch unsafe.Pointer) int
diff --git a/src/pkg/runtime/Makefile b/src/pkg/runtime/Makefile
index 5827ce134c..55087def04 100644
--- a/src/pkg/runtime/Makefile
+++ b/src/pkg/runtime/Makefile
@@ -2,4 +2,4 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.dist
+include ../Make.dist
diff --git a/src/pkg/runtime/debug/stack_test.go b/src/pkg/runtime/debug/stack_test.go
index bbd662618f..28691ee4d5 100644
--- a/src/pkg/runtime/debug/stack_test.go
+++ b/src/pkg/runtime/debug/stack_test.go
@@ -22,15 +22,15 @@ func (t T) method() []byte {
 	The traceback should look something like this, modulo line numbers and hex constants.
 	Don't worry much about the base levels, but check the ones in our own package.
 
-		/Users/r/go/src/pkg/runtime/debug/stack_test.go:15 (0x13878)
+		/Users/r/go/src/runtime/debug/stack_test.go:15 (0x13878)
 			(*T).ptrmethod: return Stack()
-		/Users/r/go/src/pkg/runtime/debug/stack_test.go:18 (0x138dd)
+		/Users/r/go/src/runtime/debug/stack_test.go:18 (0x138dd)
 			T.method: return t.ptrmethod()
-		/Users/r/go/src/pkg/runtime/debug/stack_test.go:23 (0x13920)
+		/Users/r/go/src/runtime/debug/stack_test.go:23 (0x13920)
 			TestStack: b := T(0).method()
-		/Users/r/go/src/pkg/testing/testing.go:132 (0x14a7a)
+		/Users/r/go/src/testing/testing.go:132 (0x14a7a)
 			tRunner: test.F(t)
-		/Users/r/go/src/pkg/runtime/proc.c:145 (0xc970)
+		/Users/r/go/src/runtime/proc.c:145 (0xc970)
 			???: runtime·unlock(&runtime·sched);
 */
 func TestStack(t *testing.T) {
@@ -49,10 +49,10 @@ func TestStack(t *testing.T) {
 			n++
 		}
 	}
-	frame("src/pkg/runtime/debug/stack_test.go", "\t(*T).ptrmethod: return Stack()")
-	frame("src/pkg/runtime/debug/stack_test.go", "\tT.method: return t.ptrmethod()")
-	frame("src/pkg/runtime/debug/stack_test.go", "\tTestStack: b := T(0).method()")
-	frame("src/pkg/testing/testing.go", "")
+	frame("src/runtime/debug/stack_test.go", "\t(*T).ptrmethod: return Stack()")
+	frame("src/runtime/debug/stack_test.go", "\tT.method: return t.ptrmethod()")
+	frame("src/runtime/debug/stack_test.go", "\tTestStack: b := T(0).method()")
+	frame("src/testing/testing.go", "")
 }
 
 func check(t *testing.T, line, has string) {
diff --git a/src/pkg/runtime/pprof/pprof_test.go b/src/pkg/runtime/pprof/pprof_test.go
index df271273ce..54f93f8610 100644
--- a/src/pkg/runtime/pprof/pprof_test.go
+++ b/src/pkg/runtime/pprof/pprof_test.go
@@ -310,45 +310,45 @@ func TestBlockProfile(t *testing.T) {
 	tests := [...]TestCase{
 		{"chan recv", blockChanRecv, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/pkg/runtime/chan.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanRecv\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/runtime/chan.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanRecv\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"chan send", blockChanSend, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.chansend1\+0x[0-9,a-f]+	.*/src/pkg/runtime/chan.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanSend\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.chansend1\+0x[0-9,a-f]+	.*/src/runtime/chan.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanSend\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"chan close", blockChanClose, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/pkg/runtime/chan.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanClose\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.chanrecv1\+0x[0-9,a-f]+	.*/src/runtime/chan.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockChanClose\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"select recv async", blockSelectRecvAsync, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/pkg/runtime/select.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectRecvAsync\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/runtime/select.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectRecvAsync\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"select send sync", blockSelectSendSync, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/pkg/runtime/select.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectSendSync\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime\.selectgo\+0x[0-9,a-f]+	.*/src/runtime/select.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockSelectSendSync\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"mutex", blockMutex, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	sync\.\(\*Mutex\)\.Lock\+0x[0-9,a-f]+	.*/src/pkg/sync/mutex\.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockMutex\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	sync\.\(\*Mutex\)\.Lock\+0x[0-9,a-f]+	.*/src/sync/mutex\.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockMutex\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 		{"cond", blockCond, `
 [0-9]+ [0-9]+ @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-#	0x[0-9,a-f]+	sync\.\(\*Cond\)\.Wait\+0x[0-9,a-f]+	.*/src/pkg/sync/cond\.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.blockCond\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
-#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/pkg/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	sync\.\(\*Cond\)\.Wait\+0x[0-9,a-f]+	.*/src/sync/cond\.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.blockCond\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
+#	0x[0-9,a-f]+	runtime/pprof_test\.TestBlockProfile\+0x[0-9,a-f]+	.*/src/runtime/pprof/pprof_test.go:[0-9]+
 `},
 	}
 
diff --git a/src/pkg/runtime/race/race.go b/src/pkg/runtime/race/race.go
index 3c297e84b2..31deedd73d 100644
--- a/src/pkg/runtime/race/race.go
+++ b/src/pkg/runtime/race/race.go
@@ -9,7 +9,7 @@ package race
 // This file merely ensures that we link in runtime/cgo in race build,
 // this is turn ensures that runtime uses pthread_create to create threads.
 // The prebuilt race runtime lives in race_GOOS_GOARCH.syso.
-// Calls to the runtime are done directly from src/pkg/runtime/race.c.
+// Calls to the runtime are done directly from src/runtime/race.c.
 
 // void __race_unused_func(void);
 import "C"
diff --git a/src/pkg/runtime/runtime_test.go b/src/pkg/runtime/runtime_test.go
index 5e24e2570c..cffc9f7d35 100644
--- a/src/pkg/runtime/runtime_test.go
+++ b/src/pkg/runtime/runtime_test.go
@@ -106,7 +106,7 @@ func TestRuntimeGogoBytes(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	out, err := exec.Command("go", "build", "-o", dir+"/hello", "../../../test/helloworld.go").CombinedOutput()
+	out, err := exec.Command("go", "build", "-o", dir+"/hello", "../../test/helloworld.go").CombinedOutput()
 	if err != nil {
 		t.Fatalf("building hello world: %v\n%s", err, out)
 	}
diff --git a/src/pkg/sync/atomic/race.s b/src/pkg/sync/atomic/race.s
index 4dadc9ed7e..bdce7668bc 100644
--- a/src/pkg/sync/atomic/race.s
+++ b/src/pkg/sync/atomic/race.s
@@ -5,4 +5,4 @@
 // +build race
 
 // This file is here only to allow external functions.
-// The operations are implemented in src/pkg/runtime/race_amd64.s
+// The operations are implemented in src/runtime/race_amd64.s
diff --git a/test/bench/garbage/parser.go b/test/bench/garbage/parser.go
index d85110b63d..a685507c5e 100644
--- a/test/bench/garbage/parser.go
+++ b/test/bench/garbage/parser.go
@@ -85,7 +85,7 @@ func main() {
 	var t0 time.Time
 	var numGC uint32
 	var pauseTotalNs uint64
-	pkgroot := runtime.GOROOT() + "/src/pkg/"
+	pkgroot := runtime.GOROOT() + "/src/"
 	for pass := 0; pass < 2; pass++ {
 		// Once the heap is grown to full size, reset counters.
 		// This hides the start-up pauses, which are much smaller
diff --git a/test/stress/parsego.go b/test/stress/parsego.go
index a781f19937..a5856dd80a 100644
--- a/test/stress/parsego.go
+++ b/test/stress/parsego.go
@@ -64,7 +64,7 @@ func parseDir(dirpath string) map[string]*ast.Package {
 }
 
 func stressParseGo() {
-	pkgroot := runtime.GOROOT() + "/src/pkg/"
+	pkgroot := runtime.GOROOT() + "/src/"
 	for {
 		m := make(map[string]map[string]*ast.Package)
 		for _, pkg := range packages {

From c007ce824d9a4fccb148f9204e04c23ed2984b71 Mon Sep 17 00:00:00 2001
From: Russ Cox 
Date: Mon, 8 Sep 2014 00:08:51 -0400
Subject: [PATCH 2/4] build: move package sources from src/pkg to src

Preparation was in CL 134570043.
This CL contains only the effect of 'hg mv src/pkg/* src'.
For more about the move, see golang.org/s/go14nopkg.
---
 src/{pkg => }/archive/tar/common.go                 |   0
 src/{pkg => }/archive/tar/example_test.go           |   0
 src/{pkg => }/archive/tar/reader.go                 |   0
 src/{pkg => }/archive/tar/reader_test.go            |   0
 src/{pkg => }/archive/tar/stat_atim.go              |   0
 src/{pkg => }/archive/tar/stat_atimespec.go         |   0
 src/{pkg => }/archive/tar/stat_unix.go              |   0
 src/{pkg => }/archive/tar/tar_test.go               |   0
 src/{pkg => }/archive/tar/testdata/gnu.tar          | Bin
 src/{pkg => }/archive/tar/testdata/nil-uid.tar      | Bin
 src/{pkg => }/archive/tar/testdata/pax.tar          | Bin
 src/{pkg => }/archive/tar/testdata/small.txt        |   0
 src/{pkg => }/archive/tar/testdata/small2.txt       |   0
 .../archive/tar/testdata/sparse-formats.tar         | Bin
 src/{pkg => }/archive/tar/testdata/star.tar         | Bin
 src/{pkg => }/archive/tar/testdata/ustar.tar        | Bin
 src/{pkg => }/archive/tar/testdata/v7.tar           | Bin
 .../archive/tar/testdata/writer-big-long.tar        | Bin
 src/{pkg => }/archive/tar/testdata/writer-big.tar   | Bin
 src/{pkg => }/archive/tar/testdata/writer.tar       | Bin
 src/{pkg => }/archive/tar/testdata/xattrs.tar       | Bin
 src/{pkg => }/archive/tar/writer.go                 |   0
 src/{pkg => }/archive/tar/writer_test.go            |   0
 src/{pkg => }/archive/zip/example_test.go           |   0
 src/{pkg => }/archive/zip/reader.go                 |   0
 src/{pkg => }/archive/zip/reader_test.go            |   0
 src/{pkg => }/archive/zip/register.go               |   0
 src/{pkg => }/archive/zip/struct.go                 |   0
 .../archive/zip/testdata/crc32-not-streamed.zip     | Bin
 src/{pkg => }/archive/zip/testdata/dd.zip           | Bin
 .../archive/zip/testdata/go-no-datadesc-sig.zip     | Bin
 .../archive/zip/testdata/go-with-datadesc-sig.zip   | Bin
 .../archive/zip/testdata/gophercolor16x16.png       | Bin
 src/{pkg => }/archive/zip/testdata/readme.notzip    | Bin
 src/{pkg => }/archive/zip/testdata/readme.zip       | Bin
 src/{pkg => }/archive/zip/testdata/symlink.zip      | Bin
 .../archive/zip/testdata/test-trailing-junk.zip     | Bin
 src/{pkg => }/archive/zip/testdata/test.zip         | Bin
 src/{pkg => }/archive/zip/testdata/unix.zip         | Bin
 src/{pkg => }/archive/zip/testdata/winxp.zip        | Bin
 src/{pkg => }/archive/zip/testdata/zip64-2.zip      | Bin
 src/{pkg => }/archive/zip/testdata/zip64.zip        | Bin
 src/{pkg => }/archive/zip/writer.go                 |   0
 src/{pkg => }/archive/zip/writer_test.go            |   0
 src/{pkg => }/archive/zip/zip_test.go               |   0
 src/{pkg => }/bufio/bufio.go                        |   0
 src/{pkg => }/bufio/bufio_test.go                   |   0
 src/{pkg => }/bufio/example_test.go                 |   0
 src/{pkg => }/bufio/export_test.go                  |   0
 src/{pkg => }/bufio/scan.go                         |   0
 src/{pkg => }/bufio/scan_test.go                    |   0
 src/{pkg => }/builtin/builtin.go                    |   0
 src/{pkg => }/bytes/buffer.go                       |   0
 src/{pkg => }/bytes/buffer_test.go                  |   0
 src/{pkg => }/bytes/bytes.go                        |   0
 src/{pkg => }/bytes/bytes.s                         |   0
 src/{pkg => }/bytes/bytes_decl.go                   |   0
 src/{pkg => }/bytes/bytes_test.go                   |   0
 src/{pkg => }/bytes/compare_test.go                 |   0
 src/{pkg => }/bytes/equal_test.go                   |   0
 src/{pkg => }/bytes/example_test.go                 |   0
 src/{pkg => }/bytes/export_test.go                  |   0
 src/{pkg => }/bytes/reader.go                       |   0
 src/{pkg => }/bytes/reader_test.go                  |   0
 src/{pkg => }/compress/bzip2/bit_reader.go          |   0
 src/{pkg => }/compress/bzip2/bzip2.go               |   0
 src/{pkg => }/compress/bzip2/bzip2_test.go          |   0
 src/{pkg => }/compress/bzip2/huffman.go             |   0
 src/{pkg => }/compress/bzip2/move_to_front.go       |   0
 .../bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2    | Bin
 src/{pkg => }/compress/bzip2/testdata/e.txt.bz2     | Bin
 src/{pkg => }/compress/flate/copy.go                |   0
 src/{pkg => }/compress/flate/copy_test.go           |   0
 src/{pkg => }/compress/flate/deflate.go             |   0
 src/{pkg => }/compress/flate/deflate_test.go        |   0
 src/{pkg => }/compress/flate/fixedhuff.go           |   0
 src/{pkg => }/compress/flate/flate_test.go          |   0
 src/{pkg => }/compress/flate/gen.go                 |   0
 src/{pkg => }/compress/flate/huffman_bit_writer.go  |   0
 src/{pkg => }/compress/flate/huffman_code.go        |   0
 src/{pkg => }/compress/flate/inflate.go             |   0
 src/{pkg => }/compress/flate/reader_test.go         |   0
 src/{pkg => }/compress/flate/reverse_bits.go        |   0
 src/{pkg => }/compress/flate/token.go               |   0
 src/{pkg => }/compress/flate/writer_test.go         |   0
 src/{pkg => }/compress/gzip/gunzip.go               |   0
 src/{pkg => }/compress/gzip/gunzip_test.go          |   0
 src/{pkg => }/compress/gzip/gzip.go                 |   0
 src/{pkg => }/compress/gzip/gzip_test.go            |   0
 src/{pkg => }/compress/gzip/testdata/issue6550.gz   | Bin
 src/{pkg => }/compress/lzw/reader.go                |   0
 src/{pkg => }/compress/lzw/reader_test.go           |   0
 src/{pkg => }/compress/lzw/writer.go                |   0
 src/{pkg => }/compress/lzw/writer_test.go           |   0
 .../compress/testdata/Mark.Twain-Tom.Sawyer.txt     |   0
 src/{pkg => }/compress/testdata/e.txt               |   0
 src/{pkg => }/compress/testdata/pi.txt              |   0
 src/{pkg => }/compress/zlib/example_test.go         |   0
 src/{pkg => }/compress/zlib/reader.go               |   0
 src/{pkg => }/compress/zlib/reader_test.go          |   0
 src/{pkg => }/compress/zlib/writer.go               |   0
 src/{pkg => }/compress/zlib/writer_test.go          |   0
 .../container/heap/example_intheap_test.go          |   0
 src/{pkg => }/container/heap/example_pq_test.go     |   0
 src/{pkg => }/container/heap/heap.go                |   0
 src/{pkg => }/container/heap/heap_test.go           |   0
 src/{pkg => }/container/list/example_test.go        |   0
 src/{pkg => }/container/list/list.go                |   0
 src/{pkg => }/container/list/list_test.go           |   0
 src/{pkg => }/container/ring/ring.go                |   0
 src/{pkg => }/container/ring/ring_test.go           |   0
 src/{pkg => }/crypto/aes/aes_test.go                |   0
 src/{pkg => }/crypto/aes/asm_amd64.s                |   0
 src/{pkg => }/crypto/aes/block.go                   |   0
 src/{pkg => }/crypto/aes/cipher.go                  |   0
 src/{pkg => }/crypto/aes/cipher_asm.go              |   0
 src/{pkg => }/crypto/aes/cipher_generic.go          |   0
 src/{pkg => }/crypto/aes/const.go                   |   0
 src/{pkg => }/crypto/cipher/benchmark_test.go       |   0
 src/{pkg => }/crypto/cipher/cbc.go                  |   0
 src/{pkg => }/crypto/cipher/cbc_aes_test.go         |   0
 src/{pkg => }/crypto/cipher/cfb.go                  |   0
 src/{pkg => }/crypto/cipher/cfb_test.go             |   0
 src/{pkg => }/crypto/cipher/cipher.go               |   0
 src/{pkg => }/crypto/cipher/cipher_test.go          |   0
 src/{pkg => }/crypto/cipher/common_test.go          |   0
 src/{pkg => }/crypto/cipher/ctr.go                  |   0
 src/{pkg => }/crypto/cipher/ctr_aes_test.go         |   0
 src/{pkg => }/crypto/cipher/example_test.go         |   0
 src/{pkg => }/crypto/cipher/gcm.go                  |   0
 src/{pkg => }/crypto/cipher/gcm_test.go             |   0
 src/{pkg => }/crypto/cipher/io.go                   |   0
 src/{pkg => }/crypto/cipher/ofb.go                  |   0
 src/{pkg => }/crypto/cipher/ofb_test.go             |   0
 src/{pkg => }/crypto/cipher/xor.go                  |   0
 src/{pkg => }/crypto/cipher/xor_test.go             |   0
 src/{pkg => }/crypto/crypto.go                      |   0
 src/{pkg => }/crypto/des/block.go                   |   0
 src/{pkg => }/crypto/des/cipher.go                  |   0
 src/{pkg => }/crypto/des/const.go                   |   0
 src/{pkg => }/crypto/des/des_test.go                |   0
 src/{pkg => }/crypto/des/example_test.go            |   0
 src/{pkg => }/crypto/dsa/dsa.go                     |   0
 src/{pkg => }/crypto/dsa/dsa_test.go                |   0
 src/{pkg => }/crypto/ecdsa/ecdsa.go                 |   0
 src/{pkg => }/crypto/ecdsa/ecdsa_test.go            |   0
 src/{pkg => }/crypto/ecdsa/testdata/SigVer.rsp.bz2  | Bin
 src/{pkg => }/crypto/elliptic/elliptic.go           |   0
 src/{pkg => }/crypto/elliptic/elliptic_test.go      |   0
 src/{pkg => }/crypto/elliptic/p224.go               |   0
 src/{pkg => }/crypto/elliptic/p224_test.go          |   0
 src/{pkg => }/crypto/elliptic/p256.go               |   0
 src/{pkg => }/crypto/hmac/hmac.go                   |   0
 src/{pkg => }/crypto/hmac/hmac_test.go              |   0
 src/{pkg => }/crypto/md5/example_test.go            |   0
 src/{pkg => }/crypto/md5/gen.go                     |   0
 src/{pkg => }/crypto/md5/md5.go                     |   0
 src/{pkg => }/crypto/md5/md5_test.go                |   0
 src/{pkg => }/crypto/md5/md5block.go                |   0
 src/{pkg => }/crypto/md5/md5block_386.s             |   0
 src/{pkg => }/crypto/md5/md5block_amd64.s           |   0
 src/{pkg => }/crypto/md5/md5block_amd64p32.s        |   0
 src/{pkg => }/crypto/md5/md5block_arm.s             |   0
 src/{pkg => }/crypto/md5/md5block_decl.go           |   0
 src/{pkg => }/crypto/md5/md5block_generic.go        |   0
 src/{pkg => }/crypto/rand/example_test.go           |   0
 src/{pkg => }/crypto/rand/rand.go                   |   0
 src/{pkg => }/crypto/rand/rand_linux.go             |   0
 src/{pkg => }/crypto/rand/rand_test.go              |   0
 src/{pkg => }/crypto/rand/rand_unix.go              |   0
 src/{pkg => }/crypto/rand/rand_windows.go           |   0
 src/{pkg => }/crypto/rand/util.go                   |   0
 src/{pkg => }/crypto/rand/util_test.go              |   0
 src/{pkg => }/crypto/rc4/rc4.go                     |   0
 src/{pkg => }/crypto/rc4/rc4_386.s                  |   0
 src/{pkg => }/crypto/rc4/rc4_amd64.s                |   0
 src/{pkg => }/crypto/rc4/rc4_amd64p32.s             |   0
 src/{pkg => }/crypto/rc4/rc4_arm.s                  |   0
 src/{pkg => }/crypto/rc4/rc4_asm.go                 |   0
 src/{pkg => }/crypto/rc4/rc4_ref.go                 |   0
 src/{pkg => }/crypto/rc4/rc4_test.go                |   0
 src/{pkg => }/crypto/rsa/pkcs1v15.go                |   0
 src/{pkg => }/crypto/rsa/pkcs1v15_test.go           |   0
 src/{pkg => }/crypto/rsa/pss.go                     |   0
 src/{pkg => }/crypto/rsa/pss_test.go                |   0
 src/{pkg => }/crypto/rsa/rsa.go                     |   0
 src/{pkg => }/crypto/rsa/rsa_test.go                |   0
 src/{pkg => }/crypto/rsa/testdata/pss-vect.txt.bz2  | Bin
 src/{pkg => }/crypto/sha1/example_test.go           |   0
 src/{pkg => }/crypto/sha1/sha1.go                   |   0
 src/{pkg => }/crypto/sha1/sha1_test.go              |   0
 src/{pkg => }/crypto/sha1/sha1block.go              |   0
 src/{pkg => }/crypto/sha1/sha1block_386.s           |   0
 src/{pkg => }/crypto/sha1/sha1block_amd64.s         |   0
 src/{pkg => }/crypto/sha1/sha1block_amd64p32.s      |   0
 src/{pkg => }/crypto/sha1/sha1block_arm.s           |   0
 src/{pkg => }/crypto/sha1/sha1block_decl.go         |   0
 src/{pkg => }/crypto/sha1/sha1block_generic.go      |   0
 src/{pkg => }/crypto/sha256/sha256.go               |   0
 src/{pkg => }/crypto/sha256/sha256_test.go          |   0
 src/{pkg => }/crypto/sha256/sha256block.go          |   0
 src/{pkg => }/crypto/sha256/sha256block_386.s       |   0
 src/{pkg => }/crypto/sha256/sha256block_amd64.s     |   0
 src/{pkg => }/crypto/sha256/sha256block_decl.go     |   0
 src/{pkg => }/crypto/sha512/sha512.go               |   0
 src/{pkg => }/crypto/sha512/sha512_test.go          |   0
 src/{pkg => }/crypto/sha512/sha512block.go          |   0
 src/{pkg => }/crypto/sha512/sha512block_amd64.s     |   0
 src/{pkg => }/crypto/sha512/sha512block_decl.go     |   0
 src/{pkg => }/crypto/subtle/constant_time.go        |   0
 src/{pkg => }/crypto/subtle/constant_time_test.go   |   0
 src/{pkg => }/crypto/tls/alert.go                   |   0
 src/{pkg => }/crypto/tls/cipher_suites.go           |   0
 src/{pkg => }/crypto/tls/common.go                  |   0
 src/{pkg => }/crypto/tls/conn.go                    |   0
 src/{pkg => }/crypto/tls/conn_test.go               |   0
 src/{pkg => }/crypto/tls/example_test.go            |   0
 src/{pkg => }/crypto/tls/generate_cert.go           |   0
 src/{pkg => }/crypto/tls/handshake_client.go        |   0
 src/{pkg => }/crypto/tls/handshake_client_test.go   |   0
 src/{pkg => }/crypto/tls/handshake_messages.go      |   0
 src/{pkg => }/crypto/tls/handshake_messages_test.go |   0
 src/{pkg => }/crypto/tls/handshake_server.go        |   0
 src/{pkg => }/crypto/tls/handshake_server_test.go   |   0
 src/{pkg => }/crypto/tls/handshake_test.go          |   0
 src/{pkg => }/crypto/tls/key_agreement.go           |   0
 src/{pkg => }/crypto/tls/prf.go                     |   0
 src/{pkg => }/crypto/tls/prf_test.go                |   0
 .../testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA   |   0
 .../tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA |   0
 .../tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA |   0
 .../tls/testdata/Client-TLSv10-ClientCert-RSA-RSA   |   0
 .../tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES      |   0
 .../crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES |   0
 .../crypto/tls/testdata/Client-TLSv10-RSA-RC4       |   0
 .../tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES      |   0
 .../crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES |   0
 .../crypto/tls/testdata/Client-TLSv11-RSA-RC4       |   0
 .../crypto/tls/testdata/Client-TLSv12-ALPN          |   0
 .../crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch  |   0
 .../testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA   |   0
 .../tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA |   0
 .../tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA |   0
 .../tls/testdata/Client-TLSv12-ClientCert-RSA-RSA   |   0
 .../tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES      |   0
 .../tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM  |   0
 .../crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES |   0
 .../crypto/tls/testdata/Client-TLSv12-RSA-RC4       |   0
 .../crypto/tls/testdata/Server-SSLv3-RSA-3DES       |   0
 .../crypto/tls/testdata/Server-SSLv3-RSA-AES        |   0
 .../crypto/tls/testdata/Server-SSLv3-RSA-RC4        |   0
 .../tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES      |   0
 .../crypto/tls/testdata/Server-TLSv10-RSA-3DES      |   0
 .../crypto/tls/testdata/Server-TLSv10-RSA-AES       |   0
 .../crypto/tls/testdata/Server-TLSv10-RSA-RC4       |   0
 .../crypto/tls/testdata/Server-TLSv11-RSA-RC4       |   0
 .../crypto/tls/testdata/Server-TLSv12-ALPN          |   0
 .../crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch  |   0
 .../Server-TLSv12-CipherSuiteCertPreferenceECDSA    |   0
 .../Server-TLSv12-CipherSuiteCertPreferenceRSA      |   0
 .../Server-TLSv12-ClientAuthRequestedAndECDSAGiven  |   0
 .../Server-TLSv12-ClientAuthRequestedAndGiven       |   0
 .../Server-TLSv12-ClientAuthRequestedNotGiven       |   0
 .../tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES      |   0
 .../crypto/tls/testdata/Server-TLSv12-IssueTicket   |   0
 .../crypto/tls/testdata/Server-TLSv12-RSA-3DES      |   0
 .../crypto/tls/testdata/Server-TLSv12-RSA-AES       |   0
 .../crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM   |   0
 .../crypto/tls/testdata/Server-TLSv12-RSA-RC4       |   0
 .../crypto/tls/testdata/Server-TLSv12-Resume        |   0
 src/{pkg => }/crypto/tls/testdata/Server-TLSv12-SNI |   0
 src/{pkg => }/crypto/tls/ticket.go                  |   0
 src/{pkg => }/crypto/tls/tls.go                     |   0
 src/{pkg => }/crypto/tls/tls_test.go                |   0
 src/{pkg => }/crypto/x509/cert_pool.go              |   0
 src/{pkg => }/crypto/x509/example_test.go           |   0
 src/{pkg => }/crypto/x509/pem_decrypt.go            |   0
 src/{pkg => }/crypto/x509/pem_decrypt_test.go       |   0
 src/{pkg => }/crypto/x509/pkcs1.go                  |   0
 src/{pkg => }/crypto/x509/pkcs8.go                  |   0
 src/{pkg => }/crypto/x509/pkcs8_test.go             |   0
 src/{pkg => }/crypto/x509/pkix/pkix.go              |   0
 src/{pkg => }/crypto/x509/root.go                   |   0
 src/{pkg => }/crypto/x509/root_cgo_darwin.go        |   0
 src/{pkg => }/crypto/x509/root_darwin.go            |   0
 src/{pkg => }/crypto/x509/root_darwin_test.go       |   0
 src/{pkg => }/crypto/x509/root_nocgo_darwin.go      |   0
 src/{pkg => }/crypto/x509/root_plan9.go             |   0
 src/{pkg => }/crypto/x509/root_unix.go              |   0
 src/{pkg => }/crypto/x509/root_windows.go           |   0
 src/{pkg => }/crypto/x509/sec1.go                   |   0
 src/{pkg => }/crypto/x509/sec1_test.go              |   0
 src/{pkg => }/crypto/x509/verify.go                 |   0
 src/{pkg => }/crypto/x509/verify_test.go            |   0
 src/{pkg => }/crypto/x509/x509.go                   |   0
 src/{pkg => }/crypto/x509/x509_test.go              |   0
 src/{pkg => }/crypto/x509/x509_test_import.go       |   0
 src/{pkg => }/database/sql/convert.go               |   0
 src/{pkg => }/database/sql/convert_test.go          |   0
 src/{pkg => }/database/sql/doc.txt                  |   0
 src/{pkg => }/database/sql/driver/driver.go         |   0
 src/{pkg => }/database/sql/driver/types.go          |   0
 src/{pkg => }/database/sql/driver/types_test.go     |   0
 src/{pkg => }/database/sql/example_test.go          |   0
 src/{pkg => }/database/sql/fakedb_test.go           |   0
 src/{pkg => }/database/sql/sql.go                   |   0
 src/{pkg => }/database/sql/sql_test.go              |   0
 src/{pkg => }/debug/dwarf/buf.go                    |   0
 src/{pkg => }/debug/dwarf/const.go                  |   0
 src/{pkg => }/debug/dwarf/entry.go                  |   0
 src/{pkg => }/debug/dwarf/open.go                   |   0
 src/{pkg => }/debug/dwarf/testdata/typedef.c        |   0
 src/{pkg => }/debug/dwarf/testdata/typedef.elf      | Bin
 src/{pkg => }/debug/dwarf/testdata/typedef.elf4     | Bin
 src/{pkg => }/debug/dwarf/testdata/typedef.macho    | Bin
 src/{pkg => }/debug/dwarf/type.go                   |   0
 src/{pkg => }/debug/dwarf/type_test.go              |   0
 src/{pkg => }/debug/dwarf/typeunit.go               |   0
 src/{pkg => }/debug/dwarf/unit.go                   |   0
 src/{pkg => }/debug/elf/elf.go                      |   0
 src/{pkg => }/debug/elf/elf_test.go                 |   0
 src/{pkg => }/debug/elf/file.go                     |   0
 src/{pkg => }/debug/elf/file_test.go                |   0
 src/{pkg => }/debug/elf/symbols_test.go             |   0
 .../debug/elf/testdata/gcc-386-freebsd-exec         | Bin
 .../debug/elf/testdata/gcc-amd64-linux-exec         | Bin
 .../testdata/gcc-amd64-openbsd-debug-with-rela.obj  | Bin
 .../elf/testdata/go-relocation-test-clang-x86.obj   | Bin
 .../testdata/go-relocation-test-gcc424-x86-64.obj   | Bin
 .../testdata/go-relocation-test-gcc441-x86-64.obj   | Bin
 .../elf/testdata/go-relocation-test-gcc441-x86.obj  | Bin
 .../testdata/go-relocation-test-gcc482-aarch64.obj  | Bin
 .../debug/elf/testdata/hello-world-core.gz          | Bin
 src/{pkg => }/debug/elf/testdata/hello.c            |   0
 src/{pkg => }/debug/goobj/read.go                   |   0
 src/{pkg => }/debug/goobj/read_test.go              |   0
 src/{pkg => }/debug/gosym/pclinetest.asm            |   0
 src/{pkg => }/debug/gosym/pclinetest.h              |   0
 src/{pkg => }/debug/gosym/pclntab.go                |   0
 src/{pkg => }/debug/gosym/pclntab_test.go           |   0
 src/{pkg => }/debug/gosym/symtab.go                 |   0
 src/{pkg => }/debug/macho/fat.go                    |   0
 src/{pkg => }/debug/macho/file.go                   |   0
 src/{pkg => }/debug/macho/file_test.go              |   0
 src/{pkg => }/debug/macho/macho.go                  |   0
 .../macho/testdata/fat-gcc-386-amd64-darwin-exec    | Bin
 .../debug/macho/testdata/gcc-386-darwin-exec        | Bin
 .../debug/macho/testdata/gcc-amd64-darwin-exec      | Bin
 .../macho/testdata/gcc-amd64-darwin-exec-debug      | Bin
 src/{pkg => }/debug/macho/testdata/hello.c          |   0
 src/{pkg => }/debug/pe/file.go                      |   0
 src/{pkg => }/debug/pe/file_test.go                 |   0
 src/{pkg => }/debug/pe/pe.go                        |   0
 src/{pkg => }/debug/pe/testdata/gcc-386-mingw-exec  | Bin
 src/{pkg => }/debug/pe/testdata/gcc-386-mingw-obj   | Bin
 .../debug/pe/testdata/gcc-amd64-mingw-exec          | Bin
 src/{pkg => }/debug/pe/testdata/gcc-amd64-mingw-obj | Bin
 src/{pkg => }/debug/pe/testdata/hello.c             |   0
 src/{pkg => }/debug/plan9obj/file.go                |   0
 src/{pkg => }/debug/plan9obj/file_test.go           |   0
 src/{pkg => }/debug/plan9obj/plan9obj.go            |   0
 .../debug/plan9obj/testdata/386-plan9-exec          | Bin
 .../debug/plan9obj/testdata/amd64-plan9-exec        | Bin
 src/{pkg => }/debug/plan9obj/testdata/hello.c       |   0
 src/{pkg => }/encoding/ascii85/ascii85.go           |   0
 src/{pkg => }/encoding/ascii85/ascii85_test.go      |   0
 src/{pkg => }/encoding/asn1/asn1.go                 |   0
 src/{pkg => }/encoding/asn1/asn1_test.go            |   0
 src/{pkg => }/encoding/asn1/common.go               |   0
 src/{pkg => }/encoding/asn1/marshal.go              |   0
 src/{pkg => }/encoding/asn1/marshal_test.go         |   0
 src/{pkg => }/encoding/base32/base32.go             |   0
 src/{pkg => }/encoding/base32/base32_test.go        |   0
 src/{pkg => }/encoding/base32/example_test.go       |   0
 src/{pkg => }/encoding/base64/base64.go             |   0
 src/{pkg => }/encoding/base64/base64_test.go        |   0
 src/{pkg => }/encoding/base64/example_test.go       |   0
 src/{pkg => }/encoding/binary/binary.go             |   0
 src/{pkg => }/encoding/binary/binary_test.go        |   0
 src/{pkg => }/encoding/binary/example_test.go       |   0
 src/{pkg => }/encoding/binary/varint.go             |   0
 src/{pkg => }/encoding/binary/varint_test.go        |   0
 src/{pkg => }/encoding/csv/reader.go                |   0
 src/{pkg => }/encoding/csv/reader_test.go           |   0
 src/{pkg => }/encoding/csv/writer.go                |   0
 src/{pkg => }/encoding/csv/writer_test.go           |   0
 src/{pkg => }/encoding/encoding.go                  |   0
 src/{pkg => }/encoding/gob/codec_test.go            |   0
 src/{pkg => }/encoding/gob/debug.go                 |   0
 src/{pkg => }/encoding/gob/decode.go                |   0
 src/{pkg => }/encoding/gob/decoder.go               |   0
 src/{pkg => }/encoding/gob/doc.go                   |   0
 src/{pkg => }/encoding/gob/dump.go                  |   0
 src/{pkg => }/encoding/gob/encode.go                |   0
 src/{pkg => }/encoding/gob/encoder.go               |   0
 src/{pkg => }/encoding/gob/encoder_test.go          |   0
 src/{pkg => }/encoding/gob/error.go                 |   0
 src/{pkg => }/encoding/gob/example_encdec_test.go   |   0
 .../encoding/gob/example_interface_test.go          |   0
 src/{pkg => }/encoding/gob/example_test.go          |   0
 src/{pkg => }/encoding/gob/gobencdec_test.go        |   0
 src/{pkg => }/encoding/gob/timing_test.go           |   0
 src/{pkg => }/encoding/gob/type.go                  |   0
 src/{pkg => }/encoding/gob/type_test.go             |   0
 src/{pkg => }/encoding/hex/hex.go                   |   0
 src/{pkg => }/encoding/hex/hex_test.go              |   0
 src/{pkg => }/encoding/json/bench_test.go           |   0
 src/{pkg => }/encoding/json/decode.go               |   0
 src/{pkg => }/encoding/json/decode_test.go          |   0
 src/{pkg => }/encoding/json/encode.go               |   0
 src/{pkg => }/encoding/json/encode_test.go          |   0
 src/{pkg => }/encoding/json/example_test.go         |   0
 src/{pkg => }/encoding/json/fold.go                 |   0
 src/{pkg => }/encoding/json/fold_test.go            |   0
 src/{pkg => }/encoding/json/indent.go               |   0
 src/{pkg => }/encoding/json/scanner.go              |   0
 src/{pkg => }/encoding/json/scanner_test.go         |   0
 src/{pkg => }/encoding/json/stream.go               |   0
 src/{pkg => }/encoding/json/stream_test.go          |   0
 src/{pkg => }/encoding/json/tagkey_test.go          |   0
 src/{pkg => }/encoding/json/tags.go                 |   0
 src/{pkg => }/encoding/json/tags_test.go            |   0
 src/{pkg => }/encoding/json/testdata/code.json.gz   | Bin
 src/{pkg => }/encoding/pem/pem.go                   |   0
 src/{pkg => }/encoding/pem/pem_test.go              |   0
 src/{pkg => }/encoding/xml/atom_test.go             |   0
 src/{pkg => }/encoding/xml/example_test.go          |   0
 src/{pkg => }/encoding/xml/marshal.go               |   0
 src/{pkg => }/encoding/xml/marshal_test.go          |   0
 src/{pkg => }/encoding/xml/read.go                  |   0
 src/{pkg => }/encoding/xml/read_test.go             |   0
 src/{pkg => }/encoding/xml/typeinfo.go              |   0
 src/{pkg => }/encoding/xml/xml.go                   |   0
 src/{pkg => }/encoding/xml/xml_test.go              |   0
 src/{pkg => }/errors/errors.go                      |   0
 src/{pkg => }/errors/errors_test.go                 |   0
 src/{pkg => }/errors/example_test.go                |   0
 src/{pkg => }/expvar/expvar.go                      |   0
 src/{pkg => }/expvar/expvar_test.go                 |   0
 src/{pkg => }/flag/example_test.go                  |   0
 src/{pkg => }/flag/export_test.go                   |   0
 src/{pkg => }/flag/flag.go                          |   0
 src/{pkg => }/flag/flag_test.go                     |   0
 src/{pkg => }/fmt/doc.go                            |   0
 src/{pkg => }/fmt/export_test.go                    |   0
 src/{pkg => }/fmt/fmt_test.go                       |   0
 src/{pkg => }/fmt/format.go                         |   0
 src/{pkg => }/fmt/print.go                          |   0
 src/{pkg => }/fmt/scan.go                           |   0
 src/{pkg => }/fmt/scan_test.go                      |   0
 src/{pkg => }/fmt/stringer_test.go                  |   0
 src/{pkg => }/go/ast/ast.go                         |   0
 src/{pkg => }/go/ast/ast_test.go                    |   0
 src/{pkg => }/go/ast/commentmap.go                  |   0
 src/{pkg => }/go/ast/commentmap_test.go             |   0
 src/{pkg => }/go/ast/example_test.go                |   0
 src/{pkg => }/go/ast/filter.go                      |   0
 src/{pkg => }/go/ast/filter_test.go                 |   0
 src/{pkg => }/go/ast/import.go                      |   0
 src/{pkg => }/go/ast/print.go                       |   0
 src/{pkg => }/go/ast/print_test.go                  |   0
 src/{pkg => }/go/ast/resolve.go                     |   0
 src/{pkg => }/go/ast/scope.go                       |   0
 src/{pkg => }/go/ast/walk.go                        |   0
 src/{pkg => }/go/build/build.go                     |   0
 src/{pkg => }/go/build/build_test.go                |   0
 src/{pkg => }/go/build/deps_test.go                 |   0
 src/{pkg => }/go/build/doc.go                       |   0
 src/{pkg => }/go/build/read.go                      |   0
 src/{pkg => }/go/build/read_test.go                 |   0
 src/{pkg => }/go/build/syslist.go                   |   0
 src/{pkg => }/go/build/syslist_test.go              |   0
 src/{pkg => }/go/build/testdata/other/file/file.go  |   0
 src/{pkg => }/go/build/testdata/other/main.go       |   0
 src/{pkg => }/go/doc/Makefile                       |   0
 src/{pkg => }/go/doc/comment.go                     |   0
 src/{pkg => }/go/doc/comment_test.go                |   0
 src/{pkg => }/go/doc/doc.go                         |   0
 src/{pkg => }/go/doc/doc_test.go                    |   0
 src/{pkg => }/go/doc/example.go                     |   0
 src/{pkg => }/go/doc/example_test.go                |   0
 src/{pkg => }/go/doc/exports.go                     |   0
 src/{pkg => }/go/doc/filter.go                      |   0
 src/{pkg => }/go/doc/headscan.go                    |   0
 src/{pkg => }/go/doc/reader.go                      |   0
 src/{pkg => }/go/doc/synopsis.go                    |   0
 src/{pkg => }/go/doc/synopsis_test.go               |   0
 src/{pkg => }/go/doc/testdata/a.0.golden            |   0
 src/{pkg => }/go/doc/testdata/a.1.golden            |   0
 src/{pkg => }/go/doc/testdata/a.2.golden            |   0
 src/{pkg => }/go/doc/testdata/a0.go                 |   0
 src/{pkg => }/go/doc/testdata/a1.go                 |   0
 src/{pkg => }/go/doc/testdata/b.0.golden            |   0
 src/{pkg => }/go/doc/testdata/b.1.golden            |   0
 src/{pkg => }/go/doc/testdata/b.2.golden            |   0
 src/{pkg => }/go/doc/testdata/b.go                  |   0
 src/{pkg => }/go/doc/testdata/benchmark.go          |   0
 src/{pkg => }/go/doc/testdata/bugpara.0.golden      |   0
 src/{pkg => }/go/doc/testdata/bugpara.1.golden      |   0
 src/{pkg => }/go/doc/testdata/bugpara.2.golden      |   0
 src/{pkg => }/go/doc/testdata/bugpara.go            |   0
 src/{pkg => }/go/doc/testdata/c.0.golden            |   0
 src/{pkg => }/go/doc/testdata/c.1.golden            |   0
 src/{pkg => }/go/doc/testdata/c.2.golden            |   0
 src/{pkg => }/go/doc/testdata/c.go                  |   0
 src/{pkg => }/go/doc/testdata/d.0.golden            |   0
 src/{pkg => }/go/doc/testdata/d.1.golden            |   0
 src/{pkg => }/go/doc/testdata/d.2.golden            |   0
 src/{pkg => }/go/doc/testdata/d1.go                 |   0
 src/{pkg => }/go/doc/testdata/d2.go                 |   0
 src/{pkg => }/go/doc/testdata/e.0.golden            |   0
 src/{pkg => }/go/doc/testdata/e.1.golden            |   0
 src/{pkg => }/go/doc/testdata/e.2.golden            |   0
 src/{pkg => }/go/doc/testdata/e.go                  |   0
 src/{pkg => }/go/doc/testdata/error1.0.golden       |   0
 src/{pkg => }/go/doc/testdata/error1.1.golden       |   0
 src/{pkg => }/go/doc/testdata/error1.2.golden       |   0
 src/{pkg => }/go/doc/testdata/error1.go             |   0
 src/{pkg => }/go/doc/testdata/error2.0.golden       |   0
 src/{pkg => }/go/doc/testdata/error2.1.golden       |   0
 src/{pkg => }/go/doc/testdata/error2.2.golden       |   0
 src/{pkg => }/go/doc/testdata/error2.go             |   0
 src/{pkg => }/go/doc/testdata/example.go            |   0
 src/{pkg => }/go/doc/testdata/f.0.golden            |   0
 src/{pkg => }/go/doc/testdata/f.1.golden            |   0
 src/{pkg => }/go/doc/testdata/f.2.golden            |   0
 src/{pkg => }/go/doc/testdata/f.go                  |   0
 src/{pkg => }/go/doc/testdata/template.txt          |   0
 src/{pkg => }/go/doc/testdata/testing.0.golden      |   0
 src/{pkg => }/go/doc/testdata/testing.1.golden      |   0
 src/{pkg => }/go/doc/testdata/testing.2.golden      |   0
 src/{pkg => }/go/doc/testdata/testing.go            |   0
 src/{pkg => }/go/format/format.go                   |   0
 src/{pkg => }/go/format/format_test.go              |   0
 src/{pkg => }/go/parser/error_test.go               |   0
 src/{pkg => }/go/parser/example_test.go             |   0
 src/{pkg => }/go/parser/interface.go                |   0
 src/{pkg => }/go/parser/parser.go                   |   0
 src/{pkg => }/go/parser/parser_test.go              |   0
 src/{pkg => }/go/parser/performance_test.go         |   0
 src/{pkg => }/go/parser/short_test.go               |   0
 src/{pkg => }/go/parser/testdata/commas.src         |   0
 src/{pkg => }/go/parser/testdata/issue3106.src      |   0
 src/{pkg => }/go/printer/example_test.go            |   0
 src/{pkg => }/go/printer/nodes.go                   |   0
 src/{pkg => }/go/printer/performance_test.go        |   0
 src/{pkg => }/go/printer/printer.go                 |   0
 src/{pkg => }/go/printer/printer_test.go            |   0
 src/{pkg => }/go/printer/testdata/comments.golden   |   0
 src/{pkg => }/go/printer/testdata/comments.input    |   0
 src/{pkg => }/go/printer/testdata/comments.x        |   0
 src/{pkg => }/go/printer/testdata/comments2.golden  |   0
 src/{pkg => }/go/printer/testdata/comments2.input   |   0
 .../go/printer/testdata/declarations.golden         |   0
 .../go/printer/testdata/declarations.input          |   0
 src/{pkg => }/go/printer/testdata/empty.golden      |   0
 src/{pkg => }/go/printer/testdata/empty.input       |   0
 .../go/printer/testdata/expressions.golden          |   0
 src/{pkg => }/go/printer/testdata/expressions.input |   0
 src/{pkg => }/go/printer/testdata/expressions.raw   |   0
 src/{pkg => }/go/printer/testdata/linebreaks.golden |   0
 src/{pkg => }/go/printer/testdata/linebreaks.input  |   0
 src/{pkg => }/go/printer/testdata/parser.go         |   0
 src/{pkg => }/go/printer/testdata/slow.golden       |   0
 src/{pkg => }/go/printer/testdata/slow.input        |   0
 src/{pkg => }/go/printer/testdata/statements.golden |   0
 src/{pkg => }/go/printer/testdata/statements.input  |   0
 src/{pkg => }/go/scanner/errors.go                  |   0
 src/{pkg => }/go/scanner/example_test.go            |   0
 src/{pkg => }/go/scanner/scanner.go                 |   0
 src/{pkg => }/go/scanner/scanner_test.go            |   0
 src/{pkg => }/go/token/position.go                  |   0
 src/{pkg => }/go/token/position_test.go             |   0
 src/{pkg => }/go/token/serialize.go                 |   0
 src/{pkg => }/go/token/serialize_test.go            |   0
 src/{pkg => }/go/token/token.go                     |   0
 src/{pkg => }/hash/adler32/adler32.go               |   0
 src/{pkg => }/hash/adler32/adler32_test.go          |   0
 src/{pkg => }/hash/crc32/crc32.go                   |   0
 src/{pkg => }/hash/crc32/crc32_amd64.s              |   0
 src/{pkg => }/hash/crc32/crc32_amd64p32.s           |   0
 src/{pkg => }/hash/crc32/crc32_amd64x.go            |   0
 src/{pkg => }/hash/crc32/crc32_generic.go           |   0
 src/{pkg => }/hash/crc32/crc32_test.go              |   0
 src/{pkg => }/hash/crc64/crc64.go                   |   0
 src/{pkg => }/hash/crc64/crc64_test.go              |   0
 src/{pkg => }/hash/fnv/fnv.go                       |   0
 src/{pkg => }/hash/fnv/fnv_test.go                  |   0
 src/{pkg => }/hash/hash.go                          |   0
 src/{pkg => }/hash/test_cases.txt                   |   0
 src/{pkg => }/hash/test_gen.awk                     |   0
 src/{pkg => }/html/entity.go                        |   0
 src/{pkg => }/html/entity_test.go                   |   0
 src/{pkg => }/html/escape.go                        |   0
 src/{pkg => }/html/escape_test.go                   |   0
 src/{pkg => }/html/template/attr.go                 |   0
 src/{pkg => }/html/template/clone_test.go           |   0
 src/{pkg => }/html/template/content.go              |   0
 src/{pkg => }/html/template/content_test.go         |   0
 src/{pkg => }/html/template/context.go              |   0
 src/{pkg => }/html/template/css.go                  |   0
 src/{pkg => }/html/template/css_test.go             |   0
 src/{pkg => }/html/template/doc.go                  |   0
 src/{pkg => }/html/template/error.go                |   0
 src/{pkg => }/html/template/escape.go               |   0
 src/{pkg => }/html/template/escape_test.go          |   0
 src/{pkg => }/html/template/html.go                 |   0
 src/{pkg => }/html/template/html_test.go            |   0
 src/{pkg => }/html/template/js.go                   |   0
 src/{pkg => }/html/template/js_test.go              |   0
 src/{pkg => }/html/template/template.go             |   0
 src/{pkg => }/html/template/transition.go           |   0
 src/{pkg => }/html/template/url.go                  |   0
 src/{pkg => }/html/template/url_test.go             |   0
 src/{pkg => }/image/color/color.go                  |   0
 src/{pkg => }/image/color/palette/gen.go            |   0
 src/{pkg => }/image/color/palette/generate.go       |   0
 src/{pkg => }/image/color/palette/palette.go        |   0
 src/{pkg => }/image/color/ycbcr.go                  |   0
 src/{pkg => }/image/color/ycbcr_test.go             |   0
 src/{pkg => }/image/decode_example_test.go          |   0
 src/{pkg => }/image/decode_test.go                  |   0
 src/{pkg => }/image/draw/bench_test.go              |   0
 src/{pkg => }/image/draw/clip_test.go               |   0
 src/{pkg => }/image/draw/draw.go                    |   0
 src/{pkg => }/image/draw/draw_test.go               |   0
 src/{pkg => }/image/format.go                       |   0
 src/{pkg => }/image/geom.go                         |   0
 src/{pkg => }/image/gif/reader.go                   |   0
 src/{pkg => }/image/gif/reader_test.go              |   0
 src/{pkg => }/image/gif/writer.go                   |   0
 src/{pkg => }/image/gif/writer_test.go              |   0
 src/{pkg => }/image/image.go                        |   0
 src/{pkg => }/image/image_test.go                   |   0
 src/{pkg => }/image/jpeg/dct_test.go                |   0
 src/{pkg => }/image/jpeg/fdct.go                    |   0
 src/{pkg => }/image/jpeg/huffman.go                 |   0
 src/{pkg => }/image/jpeg/idct.go                    |   0
 src/{pkg => }/image/jpeg/reader.go                  |   0
 src/{pkg => }/image/jpeg/reader_test.go             |   0
 src/{pkg => }/image/jpeg/scan.go                    |   0
 src/{pkg => }/image/jpeg/writer.go                  |   0
 src/{pkg => }/image/jpeg/writer_test.go             |   0
 src/{pkg => }/image/names.go                        |   0
 src/{pkg => }/image/png/paeth.go                    |   0
 src/{pkg => }/image/png/paeth_test.go               |   0
 src/{pkg => }/image/png/reader.go                   |   0
 src/{pkg => }/image/png/reader_test.go              |   0
 src/{pkg => }/image/png/testdata/benchGray.png      | Bin
 .../image/png/testdata/benchNRGBA-gradient.png      | Bin
 .../image/png/testdata/benchNRGBA-opaque.png        | Bin
 src/{pkg => }/image/png/testdata/benchPaletted.png  | Bin
 .../image/png/testdata/benchRGB-interlace.png       | Bin
 src/{pkg => }/image/png/testdata/benchRGB.png       | Bin
 src/{pkg => }/image/png/testdata/invalid-crc32.png  | Bin
 src/{pkg => }/image/png/testdata/invalid-noend.png  | Bin
 src/{pkg => }/image/png/testdata/invalid-trunc.png  | Bin
 src/{pkg => }/image/png/testdata/invalid-zlib.png   | Bin
 src/{pkg => }/image/png/testdata/pngsuite/README    |   0
 .../image/png/testdata/pngsuite/README.original     |   0
 .../image/png/testdata/pngsuite/basn0g01-30.png     | Bin
 .../image/png/testdata/pngsuite/basn0g01-30.sng     |   0
 .../image/png/testdata/pngsuite/basn0g01.png        | Bin
 .../image/png/testdata/pngsuite/basn0g01.sng        |   0
 .../image/png/testdata/pngsuite/basn0g02-29.png     | Bin
 .../image/png/testdata/pngsuite/basn0g02-29.sng     |   0
 .../image/png/testdata/pngsuite/basn0g02.png        | Bin
 .../image/png/testdata/pngsuite/basn0g02.sng        |   0
 .../image/png/testdata/pngsuite/basn0g04-31.png     | Bin
 .../image/png/testdata/pngsuite/basn0g04-31.sng     |   0
 .../image/png/testdata/pngsuite/basn0g04.png        | Bin
 .../image/png/testdata/pngsuite/basn0g04.sng        |   0
 .../image/png/testdata/pngsuite/basn0g08.png        | Bin
 .../image/png/testdata/pngsuite/basn0g08.sng        |   0
 .../image/png/testdata/pngsuite/basn0g16.png        | Bin
 .../image/png/testdata/pngsuite/basn0g16.sng        |   0
 .../image/png/testdata/pngsuite/basn2c08.png        | Bin
 .../image/png/testdata/pngsuite/basn2c08.sng        |   0
 .../image/png/testdata/pngsuite/basn2c16.png        | Bin
 .../image/png/testdata/pngsuite/basn2c16.sng        |   0
 .../image/png/testdata/pngsuite/basn3p01.png        | Bin
 .../image/png/testdata/pngsuite/basn3p01.sng        |   0
 .../image/png/testdata/pngsuite/basn3p02.png        | Bin
 .../image/png/testdata/pngsuite/basn3p02.sng        |   0
 .../image/png/testdata/pngsuite/basn3p04-31i.png    | Bin
 .../image/png/testdata/pngsuite/basn3p04-31i.sng    |   0
 .../image/png/testdata/pngsuite/basn3p04.png        | Bin
 .../image/png/testdata/pngsuite/basn3p04.sng        |   0
 .../image/png/testdata/pngsuite/basn3p08-trns.png   | Bin
 .../image/png/testdata/pngsuite/basn3p08-trns.sng   |   0
 .../image/png/testdata/pngsuite/basn3p08.png        | Bin
 .../image/png/testdata/pngsuite/basn3p08.sng        |   0
 .../image/png/testdata/pngsuite/basn4a08.png        | Bin
 .../image/png/testdata/pngsuite/basn4a08.sng        |   0
 .../image/png/testdata/pngsuite/basn4a16.png        | Bin
 .../image/png/testdata/pngsuite/basn4a16.sng        |   0
 .../image/png/testdata/pngsuite/basn6a08.png        | Bin
 .../image/png/testdata/pngsuite/basn6a08.sng        |   0
 .../image/png/testdata/pngsuite/basn6a16.png        | Bin
 .../image/png/testdata/pngsuite/basn6a16.sng        |   0
 src/{pkg => }/image/png/writer.go                   |   0
 src/{pkg => }/image/png/writer_test.go              |   0
 src/{pkg => }/image/testdata/video-001.5bpp.gif     | Bin
 src/{pkg => }/image/testdata/video-001.gif          | Bin
 .../image/testdata/video-001.interlaced.gif         | Bin
 src/{pkg => }/image/testdata/video-001.jpeg         | Bin
 src/{pkg => }/image/testdata/video-001.png          | Bin
 .../image/testdata/video-001.progressive.jpeg       | Bin
 src/{pkg => }/image/testdata/video-001.q50.420.jpeg | Bin
 .../testdata/video-001.q50.420.progressive.jpeg     | Bin
 src/{pkg => }/image/testdata/video-001.q50.422.jpeg | Bin
 .../testdata/video-001.q50.422.progressive.jpeg     | Bin
 src/{pkg => }/image/testdata/video-001.q50.440.jpeg | Bin
 .../testdata/video-001.q50.440.progressive.jpeg     | Bin
 src/{pkg => }/image/testdata/video-001.q50.444.jpeg | Bin
 .../testdata/video-001.q50.444.progressive.jpeg     | Bin
 .../testdata/video-001.separate.dc.progression.jpeg | Bin
 ...deo-001.separate.dc.progression.progressive.jpeg | Bin
 src/{pkg => }/image/testdata/video-005.gray.gif     | Bin
 src/{pkg => }/image/testdata/video-005.gray.jpeg    | Bin
 src/{pkg => }/image/testdata/video-005.gray.png     | Bin
 .../image/testdata/video-005.gray.q50.2x2.jpeg      | Bin
 .../video-005.gray.q50.2x2.progressive.jpeg         | Bin
 .../image/testdata/video-005.gray.q50.jpeg          | Bin
 .../testdata/video-005.gray.q50.progressive.jpeg    | Bin
 src/{pkg => }/image/ycbcr.go                        |   0
 src/{pkg => }/image/ycbcr_test.go                   |   0
 src/{pkg => }/index/suffixarray/qsufsort.go         |   0
 src/{pkg => }/index/suffixarray/suffixarray.go      |   0
 src/{pkg => }/index/suffixarray/suffixarray_test.go |   0
 src/{pkg => }/internal/syscall/getrandom_linux.go   |   0
 src/{pkg => }/io/io.go                              |   0
 src/{pkg => }/io/io_test.go                         |   0
 src/{pkg => }/io/ioutil/ioutil.go                   |   0
 src/{pkg => }/io/ioutil/ioutil_test.go              |   0
 src/{pkg => }/io/ioutil/tempfile.go                 |   0
 src/{pkg => }/io/ioutil/tempfile_test.go            |   0
 src/{pkg => }/io/multi.go                           |   0
 src/{pkg => }/io/multi_test.go                      |   0
 src/{pkg => }/io/pipe.go                            |   0
 src/{pkg => }/io/pipe_test.go                       |   0
 src/{pkg => }/log/example_test.go                   |   0
 src/{pkg => }/log/log.go                            |   0
 src/{pkg => }/log/log_test.go                       |   0
 src/{pkg => }/log/syslog/syslog.go                  |   0
 src/{pkg => }/log/syslog/syslog_plan9.go            |   0
 src/{pkg => }/log/syslog/syslog_test.go             |   0
 src/{pkg => }/log/syslog/syslog_unix.go             |   0
 src/{pkg => }/log/syslog/syslog_windows.go          |   0
 src/{pkg => }/math/abs.go                           |   0
 src/{pkg => }/math/abs_386.s                        |   0
 src/{pkg => }/math/abs_amd64.s                      |   0
 src/{pkg => }/math/abs_amd64p32.s                   |   0
 src/{pkg => }/math/abs_arm.s                        |   0
 src/{pkg => }/math/acosh.go                         |   0
 src/{pkg => }/math/all_test.go                      |   0
 src/{pkg => }/math/asin.go                          |   0
 src/{pkg => }/math/asin_386.s                       |   0
 src/{pkg => }/math/asin_amd64.s                     |   0
 src/{pkg => }/math/asin_amd64p32.s                  |   0
 src/{pkg => }/math/asin_arm.s                       |   0
 src/{pkg => }/math/asinh.go                         |   0
 src/{pkg => }/math/atan.go                          |   0
 src/{pkg => }/math/atan2.go                         |   0
 src/{pkg => }/math/atan2_386.s                      |   0
 src/{pkg => }/math/atan2_amd64.s                    |   0
 src/{pkg => }/math/atan2_amd64p32.s                 |   0
 src/{pkg => }/math/atan2_arm.s                      |   0
 src/{pkg => }/math/atan_386.s                       |   0
 src/{pkg => }/math/atan_amd64.s                     |   0
 src/{pkg => }/math/atan_amd64p32.s                  |   0
 src/{pkg => }/math/atan_arm.s                       |   0
 src/{pkg => }/math/atanh.go                         |   0
 src/{pkg => }/math/big/arith.go                     |   0
 src/{pkg => }/math/big/arith_386.s                  |   0
 src/{pkg => }/math/big/arith_amd64.s                |   0
 src/{pkg => }/math/big/arith_amd64p32.s             |   0
 src/{pkg => }/math/big/arith_arm.s                  |   0
 src/{pkg => }/math/big/arith_decl.go                |   0
 src/{pkg => }/math/big/arith_test.go                |   0
 src/{pkg => }/math/big/calibrate_test.go            |   0
 src/{pkg => }/math/big/example_test.go              |   0
 src/{pkg => }/math/big/gcd_test.go                  |   0
 src/{pkg => }/math/big/hilbert_test.go              |   0
 src/{pkg => }/math/big/int.go                       |   0
 src/{pkg => }/math/big/int_test.go                  |   0
 src/{pkg => }/math/big/nat.go                       |   0
 src/{pkg => }/math/big/nat_test.go                  |   0
 src/{pkg => }/math/big/rat.go                       |   0
 src/{pkg => }/math/big/rat_test.go                  |   0
 src/{pkg => }/math/bits.go                          |   0
 src/{pkg => }/math/cbrt.go                          |   0
 src/{pkg => }/math/cmplx/abs.go                     |   0
 src/{pkg => }/math/cmplx/asin.go                    |   0
 src/{pkg => }/math/cmplx/cmath_test.go              |   0
 src/{pkg => }/math/cmplx/conj.go                    |   0
 src/{pkg => }/math/cmplx/exp.go                     |   0
 src/{pkg => }/math/cmplx/isinf.go                   |   0
 src/{pkg => }/math/cmplx/isnan.go                   |   0
 src/{pkg => }/math/cmplx/log.go                     |   0
 src/{pkg => }/math/cmplx/phase.go                   |   0
 src/{pkg => }/math/cmplx/polar.go                   |   0
 src/{pkg => }/math/cmplx/pow.go                     |   0
 src/{pkg => }/math/cmplx/rect.go                    |   0
 src/{pkg => }/math/cmplx/sin.go                     |   0
 src/{pkg => }/math/cmplx/sqrt.go                    |   0
 src/{pkg => }/math/cmplx/tan.go                     |   0
 src/{pkg => }/math/const.go                         |   0
 src/{pkg => }/math/copysign.go                      |   0
 src/{pkg => }/math/dim.go                           |   0
 src/{pkg => }/math/dim_386.s                        |   0
 src/{pkg => }/math/dim_amd64.s                      |   0
 src/{pkg => }/math/dim_amd64p32.s                   |   0
 src/{pkg => }/math/dim_arm.s                        |   0
 src/{pkg => }/math/erf.go                           |   0
 src/{pkg => }/math/exp.go                           |   0
 src/{pkg => }/math/exp2_386.s                       |   0
 src/{pkg => }/math/exp2_amd64.s                     |   0
 src/{pkg => }/math/exp2_amd64p32.s                  |   0
 src/{pkg => }/math/exp2_arm.s                       |   0
 src/{pkg => }/math/exp_386.s                        |   0
 src/{pkg => }/math/exp_amd64.s                      |   0
 src/{pkg => }/math/exp_amd64p32.s                   |   0
 src/{pkg => }/math/exp_arm.s                        |   0
 src/{pkg => }/math/expm1.go                         |   0
 src/{pkg => }/math/expm1_386.s                      |   0
 src/{pkg => }/math/expm1_amd64.s                    |   0
 src/{pkg => }/math/expm1_amd64p32.s                 |   0
 src/{pkg => }/math/expm1_arm.s                      |   0
 src/{pkg => }/math/export_test.go                   |   0
 src/{pkg => }/math/floor.go                         |   0
 src/{pkg => }/math/floor_386.s                      |   0
 src/{pkg => }/math/floor_amd64.s                    |   0
 src/{pkg => }/math/floor_amd64p32.s                 |   0
 src/{pkg => }/math/floor_arm.s                      |   0
 src/{pkg => }/math/frexp.go                         |   0
 src/{pkg => }/math/frexp_386.s                      |   0
 src/{pkg => }/math/frexp_amd64.s                    |   0
 src/{pkg => }/math/frexp_amd64p32.s                 |   0
 src/{pkg => }/math/frexp_arm.s                      |   0
 src/{pkg => }/math/gamma.go                         |   0
 src/{pkg => }/math/hypot.go                         |   0
 src/{pkg => }/math/hypot_386.s                      |   0
 src/{pkg => }/math/hypot_amd64.s                    |   0
 src/{pkg => }/math/hypot_amd64p32.s                 |   0
 src/{pkg => }/math/hypot_arm.s                      |   0
 src/{pkg => }/math/j0.go                            |   0
 src/{pkg => }/math/j1.go                            |   0
 src/{pkg => }/math/jn.go                            |   0
 src/{pkg => }/math/ldexp.go                         |   0
 src/{pkg => }/math/ldexp_386.s                      |   0
 src/{pkg => }/math/ldexp_amd64.s                    |   0
 src/{pkg => }/math/ldexp_amd64p32.s                 |   0
 src/{pkg => }/math/ldexp_arm.s                      |   0
 src/{pkg => }/math/lgamma.go                        |   0
 src/{pkg => }/math/log.go                           |   0
 src/{pkg => }/math/log10.go                         |   0
 src/{pkg => }/math/log10_386.s                      |   0
 src/{pkg => }/math/log10_amd64.s                    |   0
 src/{pkg => }/math/log10_amd64p32.s                 |   0
 src/{pkg => }/math/log10_arm.s                      |   0
 src/{pkg => }/math/log1p.go                         |   0
 src/{pkg => }/math/log1p_386.s                      |   0
 src/{pkg => }/math/log1p_amd64.s                    |   0
 src/{pkg => }/math/log1p_amd64p32.s                 |   0
 src/{pkg => }/math/log1p_arm.s                      |   0
 src/{pkg => }/math/log_386.s                        |   0
 src/{pkg => }/math/log_amd64.s                      |   0
 src/{pkg => }/math/log_amd64p32.s                   |   0
 src/{pkg => }/math/log_arm.s                        |   0
 src/{pkg => }/math/logb.go                          |   0
 src/{pkg => }/math/mod.go                           |   0
 src/{pkg => }/math/mod_386.s                        |   0
 src/{pkg => }/math/mod_amd64.s                      |   0
 src/{pkg => }/math/mod_amd64p32.s                   |   0
 src/{pkg => }/math/mod_arm.s                        |   0
 src/{pkg => }/math/modf.go                          |   0
 src/{pkg => }/math/modf_386.s                       |   0
 src/{pkg => }/math/modf_amd64.s                     |   0
 src/{pkg => }/math/modf_amd64p32.s                  |   0
 src/{pkg => }/math/modf_arm.s                       |   0
 src/{pkg => }/math/nextafter.go                     |   0
 src/{pkg => }/math/pow.go                           |   0
 src/{pkg => }/math/pow10.go                         |   0
 src/{pkg => }/math/rand/example_test.go             |   0
 src/{pkg => }/math/rand/exp.go                      |   0
 src/{pkg => }/math/rand/normal.go                   |   0
 src/{pkg => }/math/rand/rand.go                     |   0
 src/{pkg => }/math/rand/rand_test.go                |   0
 src/{pkg => }/math/rand/regress_test.go             |   0
 src/{pkg => }/math/rand/rng.go                      |   0
 src/{pkg => }/math/rand/zipf.go                     |   0
 src/{pkg => }/math/remainder.go                     |   0
 src/{pkg => }/math/remainder_386.s                  |   0
 src/{pkg => }/math/remainder_amd64.s                |   0
 src/{pkg => }/math/remainder_amd64p32.s             |   0
 src/{pkg => }/math/remainder_arm.s                  |   0
 src/{pkg => }/math/signbit.go                       |   0
 src/{pkg => }/math/sin.go                           |   0
 src/{pkg => }/math/sin_386.s                        |   0
 src/{pkg => }/math/sin_amd64.s                      |   0
 src/{pkg => }/math/sin_amd64p32.s                   |   0
 src/{pkg => }/math/sin_arm.s                        |   0
 src/{pkg => }/math/sincos.go                        |   0
 src/{pkg => }/math/sincos_386.s                     |   0
 src/{pkg => }/math/sincos_amd64.s                   |   0
 src/{pkg => }/math/sincos_amd64p32.s                |   0
 src/{pkg => }/math/sincos_arm.s                     |   0
 src/{pkg => }/math/sinh.go                          |   0
 src/{pkg => }/math/sqrt.go                          |   0
 src/{pkg => }/math/sqrt_386.s                       |   0
 src/{pkg => }/math/sqrt_amd64.s                     |   0
 src/{pkg => }/math/sqrt_amd64p32.s                  |   0
 src/{pkg => }/math/sqrt_arm.s                       |   0
 src/{pkg => }/math/tan.go                           |   0
 src/{pkg => }/math/tan_386.s                        |   0
 src/{pkg => }/math/tan_amd64.s                      |   0
 src/{pkg => }/math/tan_amd64p32.s                   |   0
 src/{pkg => }/math/tan_arm.s                        |   0
 src/{pkg => }/math/tanh.go                          |   0
 src/{pkg => }/math/unsafe.go                        |   0
 src/{pkg => }/mime/grammar.go                       |   0
 src/{pkg => }/mime/mediatype.go                     |   0
 src/{pkg => }/mime/mediatype_test.go                |   0
 src/{pkg => }/mime/multipart/example_test.go        |   0
 src/{pkg => }/mime/multipart/formdata.go            |   0
 src/{pkg => }/mime/multipart/formdata_test.go       |   0
 src/{pkg => }/mime/multipart/multipart.go           |   0
 src/{pkg => }/mime/multipart/multipart_test.go      |   0
 src/{pkg => }/mime/multipart/quotedprintable.go     |   0
 .../mime/multipart/quotedprintable_test.go          |   0
 src/{pkg => }/mime/multipart/testdata/nested-mime   |   0
 src/{pkg => }/mime/multipart/writer.go              |   0
 src/{pkg => }/mime/multipart/writer_test.go         |   0
 src/{pkg => }/mime/testdata/test.types              |   0
 src/{pkg => }/mime/testdata/test.types.plan9        |   0
 src/{pkg => }/mime/type.go                          |   0
 src/{pkg => }/mime/type_plan9.go                    |   0
 src/{pkg => }/mime/type_test.go                     |   0
 src/{pkg => }/mime/type_unix.go                     |   0
 src/{pkg => }/mime/type_windows.go                  |   0
 src/{pkg => }/net/cgo_android.go                    |   0
 src/{pkg => }/net/cgo_bsd.go                        |   0
 src/{pkg => }/net/cgo_linux.go                      |   0
 src/{pkg => }/net/cgo_netbsd.go                     |   0
 src/{pkg => }/net/cgo_openbsd.go                    |   0
 src/{pkg => }/net/cgo_stub.go                       |   0
 src/{pkg => }/net/cgo_unix.go                       |   0
 src/{pkg => }/net/cgo_unix_test.go                  |   0
 src/{pkg => }/net/conn_test.go                      |   0
 src/{pkg => }/net/dial.go                           |   0
 src/{pkg => }/net/dial_gen.go                       |   0
 src/{pkg => }/net/dial_gen_test.go                  |   0
 src/{pkg => }/net/dial_test.go                      |   0
 src/{pkg => }/net/dialgoogle_test.go                |   0
 src/{pkg => }/net/dnsclient.go                      |   0
 src/{pkg => }/net/dnsclient_test.go                 |   0
 src/{pkg => }/net/dnsclient_unix.go                 |   0
 src/{pkg => }/net/dnsclient_unix_test.go            |   0
 src/{pkg => }/net/dnsconfig_unix.go                 |   0
 src/{pkg => }/net/dnsconfig_unix_test.go            |   0
 src/{pkg => }/net/dnsmsg.go                         |   0
 src/{pkg => }/net/dnsmsg_test.go                    |   0
 src/{pkg => }/net/dnsname_test.go                   |   0
 src/{pkg => }/net/empty.c                           |   0
 src/{pkg => }/net/example_test.go                   |   0
 src/{pkg => }/net/fd_mutex.go                       |   0
 src/{pkg => }/net/fd_mutex_test.go                  |   0
 src/{pkg => }/net/fd_plan9.go                       |   0
 src/{pkg => }/net/fd_poll_nacl.go                   |   0
 src/{pkg => }/net/fd_poll_runtime.go                |   0
 src/{pkg => }/net/fd_unix.go                        |   0
 src/{pkg => }/net/fd_unix_test.go                   |   0
 src/{pkg => }/net/fd_windows.go                     |   0
 src/{pkg => }/net/file_plan9.go                     |   0
 src/{pkg => }/net/file_test.go                      |   0
 src/{pkg => }/net/file_unix.go                      |   0
 src/{pkg => }/net/file_windows.go                   |   0
 src/{pkg => }/net/hosts.go                          |   0
 src/{pkg => }/net/hosts_test.go                     |   0
 src/{pkg => }/net/http/cgi/child.go                 |   0
 src/{pkg => }/net/http/cgi/child_test.go            |   0
 src/{pkg => }/net/http/cgi/host.go                  |   0
 src/{pkg => }/net/http/cgi/host_test.go             |   0
 src/{pkg => }/net/http/cgi/matryoshka_test.go       |   0
 src/{pkg => }/net/http/cgi/plan9_test.go            |   0
 src/{pkg => }/net/http/cgi/posix_test.go            |   0
 src/{pkg => }/net/http/cgi/testdata/test.cgi        |   0
 src/{pkg => }/net/http/client.go                    |   0
 src/{pkg => }/net/http/client_test.go               |   0
 src/{pkg => }/net/http/cookie.go                    |   0
 src/{pkg => }/net/http/cookie_test.go               |   0
 src/{pkg => }/net/http/cookiejar/jar.go             |   0
 src/{pkg => }/net/http/cookiejar/jar_test.go        |   0
 src/{pkg => }/net/http/cookiejar/punycode.go        |   0
 src/{pkg => }/net/http/cookiejar/punycode_test.go   |   0
 src/{pkg => }/net/http/doc.go                       |   0
 src/{pkg => }/net/http/example_test.go              |   0
 src/{pkg => }/net/http/export_test.go               |   0
 src/{pkg => }/net/http/fcgi/child.go                |   0
 src/{pkg => }/net/http/fcgi/fcgi.go                 |   0
 src/{pkg => }/net/http/fcgi/fcgi_test.go            |   0
 src/{pkg => }/net/http/filetransport.go             |   0
 src/{pkg => }/net/http/filetransport_test.go        |   0
 src/{pkg => }/net/http/fs.go                        |   0
 src/{pkg => }/net/http/fs_test.go                   |   0
 src/{pkg => }/net/http/header.go                    |   0
 src/{pkg => }/net/http/header_test.go               |   0
 src/{pkg => }/net/http/httptest/example_test.go     |   0
 src/{pkg => }/net/http/httptest/recorder.go         |   0
 src/{pkg => }/net/http/httptest/recorder_test.go    |   0
 src/{pkg => }/net/http/httptest/server.go           |   0
 src/{pkg => }/net/http/httptest/server_test.go      |   0
 src/{pkg => }/net/http/httputil/dump.go             |   0
 src/{pkg => }/net/http/httputil/dump_test.go        |   0
 src/{pkg => }/net/http/httputil/httputil.go         |   0
 src/{pkg => }/net/http/httputil/persist.go          |   0
 src/{pkg => }/net/http/httputil/reverseproxy.go     |   0
 .../net/http/httputil/reverseproxy_test.go          |   0
 src/{pkg => }/net/http/internal/chunked.go          |   0
 src/{pkg => }/net/http/internal/chunked_test.go     |   0
 src/{pkg => }/net/http/jar.go                       |   0
 src/{pkg => }/net/http/lex.go                       |   0
 src/{pkg => }/net/http/lex_test.go                  |   0
 src/{pkg => }/net/http/npn_test.go                  |   0
 src/{pkg => }/net/http/pprof/pprof.go               |   0
 src/{pkg => }/net/http/proxy_test.go                |   0
 src/{pkg => }/net/http/race.go                      |   0
 src/{pkg => }/net/http/range_test.go                |   0
 src/{pkg => }/net/http/readrequest_test.go          |   0
 src/{pkg => }/net/http/request.go                   |   0
 src/{pkg => }/net/http/request_test.go              |   0
 src/{pkg => }/net/http/requestwrite_test.go         |   0
 src/{pkg => }/net/http/response.go                  |   0
 src/{pkg => }/net/http/response_test.go             |   0
 src/{pkg => }/net/http/responsewrite_test.go        |   0
 src/{pkg => }/net/http/serve_test.go                |   0
 src/{pkg => }/net/http/server.go                    |   0
 src/{pkg => }/net/http/sniff.go                     |   0
 src/{pkg => }/net/http/sniff_test.go                |   0
 src/{pkg => }/net/http/status.go                    |   0
 src/{pkg => }/net/http/testdata/file                |   0
 src/{pkg => }/net/http/testdata/index.html          |   0
 src/{pkg => }/net/http/testdata/style.css           |   0
 src/{pkg => }/net/http/transfer.go                  |   0
 src/{pkg => }/net/http/transfer_test.go             |   0
 src/{pkg => }/net/http/transport.go                 |   0
 src/{pkg => }/net/http/transport_test.go            |   0
 src/{pkg => }/net/http/triv.go                      |   0
 src/{pkg => }/net/http/z_last_test.go               |   0
 src/{pkg => }/net/interface.go                      |   0
 src/{pkg => }/net/interface_bsd.go                  |   0
 src/{pkg => }/net/interface_bsd_test.go             |   0
 src/{pkg => }/net/interface_darwin.go               |   0
 src/{pkg => }/net/interface_dragonfly.go            |   0
 src/{pkg => }/net/interface_freebsd.go              |   0
 src/{pkg => }/net/interface_linux.go                |   0
 src/{pkg => }/net/interface_linux_test.go           |   0
 src/{pkg => }/net/interface_netbsd.go               |   0
 src/{pkg => }/net/interface_openbsd.go              |   0
 src/{pkg => }/net/interface_stub.go                 |   0
 src/{pkg => }/net/interface_test.go                 |   0
 src/{pkg => }/net/interface_unix_test.go            |   0
 src/{pkg => }/net/interface_windows.go              |   0
 src/{pkg => }/net/ip.go                             |   0
 src/{pkg => }/net/ip_test.go                        |   0
 src/{pkg => }/net/ipraw_test.go                     |   0
 src/{pkg => }/net/iprawsock.go                      |   0
 src/{pkg => }/net/iprawsock_plan9.go                |   0
 src/{pkg => }/net/iprawsock_posix.go                |   0
 src/{pkg => }/net/ipsock.go                         |   0
 src/{pkg => }/net/ipsock_plan9.go                   |   0
 src/{pkg => }/net/ipsock_posix.go                   |   0
 src/{pkg => }/net/ipsock_test.go                    |   0
 src/{pkg => }/net/lookup.go                         |   0
 src/{pkg => }/net/lookup_plan9.go                   |   0
 src/{pkg => }/net/lookup_test.go                    |   0
 src/{pkg => }/net/lookup_unix.go                    |   0
 src/{pkg => }/net/lookup_windows.go                 |   0
 src/{pkg => }/net/lookup_windows_test.go            |   0
 src/{pkg => }/net/mac.go                            |   0
 src/{pkg => }/net/mac_test.go                       |   0
 src/{pkg => }/net/mail/message.go                   |   0
 src/{pkg => }/net/mail/message_test.go              |   0
 src/{pkg => }/net/mockicmp_test.go                  |   0
 src/{pkg => }/net/mockserver_test.go                |   0
 src/{pkg => }/net/multicast_test.go                 |   0
 src/{pkg => }/net/net.go                            |   0
 src/{pkg => }/net/net_test.go                       |   0
 src/{pkg => }/net/net_windows_test.go               |   0
 src/{pkg => }/net/netgo_unix_test.go                |   0
 src/{pkg => }/net/packetconn_test.go                |   0
 src/{pkg => }/net/parse.go                          |   0
 src/{pkg => }/net/parse_test.go                     |   0
 src/{pkg => }/net/pipe.go                           |   0
 src/{pkg => }/net/pipe_test.go                      |   0
 src/{pkg => }/net/port.go                           |   0
 src/{pkg => }/net/port_test.go                      |   0
 src/{pkg => }/net/port_unix.go                      |   0
 src/{pkg => }/net/protoconn_test.go                 |   0
 src/{pkg => }/net/race.go                           |   0
 src/{pkg => }/net/race0.go                          |   0
 src/{pkg => }/net/rpc/client.go                     |   0
 src/{pkg => }/net/rpc/client_test.go                |   0
 src/{pkg => }/net/rpc/debug.go                      |   0
 src/{pkg => }/net/rpc/jsonrpc/all_test.go           |   0
 src/{pkg => }/net/rpc/jsonrpc/client.go             |   0
 src/{pkg => }/net/rpc/jsonrpc/server.go             |   0
 src/{pkg => }/net/rpc/server.go                     |   0
 src/{pkg => }/net/rpc/server_test.go                |   0
 src/{pkg => }/net/sendfile_dragonfly.go             |   0
 src/{pkg => }/net/sendfile_freebsd.go               |   0
 src/{pkg => }/net/sendfile_linux.go                 |   0
 src/{pkg => }/net/sendfile_stub.go                  |   0
 src/{pkg => }/net/sendfile_windows.go               |   0
 src/{pkg => }/net/server_test.go                    |   0
 src/{pkg => }/net/singleflight.go                   |   0
 src/{pkg => }/net/smtp/auth.go                      |   0
 src/{pkg => }/net/smtp/example_test.go              |   0
 src/{pkg => }/net/smtp/smtp.go                      |   0
 src/{pkg => }/net/smtp/smtp_test.go                 |   0
 src/{pkg => }/net/sock_bsd.go                       |   0
 src/{pkg => }/net/sock_cloexec.go                   |   0
 src/{pkg => }/net/sock_linux.go                     |   0
 src/{pkg => }/net/sock_plan9.go                     |   0
 src/{pkg => }/net/sock_posix.go                     |   0
 src/{pkg => }/net/sock_solaris.go                   |   0
 src/{pkg => }/net/sock_windows.go                   |   0
 src/{pkg => }/net/sockopt_bsd.go                    |   0
 src/{pkg => }/net/sockopt_linux.go                  |   0
 src/{pkg => }/net/sockopt_plan9.go                  |   0
 src/{pkg => }/net/sockopt_posix.go                  |   0
 src/{pkg => }/net/sockopt_solaris.go                |   0
 src/{pkg => }/net/sockopt_windows.go                |   0
 src/{pkg => }/net/sockoptip_bsd.go                  |   0
 src/{pkg => }/net/sockoptip_linux.go                |   0
 src/{pkg => }/net/sockoptip_posix.go                |   0
 src/{pkg => }/net/sockoptip_stub.go                 |   0
 src/{pkg => }/net/sockoptip_windows.go              |   0
 src/{pkg => }/net/sys_cloexec.go                    |   0
 src/{pkg => }/net/tcp_test.go                       |   0
 src/{pkg => }/net/tcpsock.go                        |   0
 src/{pkg => }/net/tcpsock_plan9.go                  |   0
 src/{pkg => }/net/tcpsock_posix.go                  |   0
 src/{pkg => }/net/tcpsockopt_darwin.go              |   0
 src/{pkg => }/net/tcpsockopt_dragonfly.go           |   0
 src/{pkg => }/net/tcpsockopt_openbsd.go             |   0
 src/{pkg => }/net/tcpsockopt_plan9.go               |   0
 src/{pkg => }/net/tcpsockopt_posix.go               |   0
 src/{pkg => }/net/tcpsockopt_solaris.go             |   0
 src/{pkg => }/net/tcpsockopt_unix.go                |   0
 src/{pkg => }/net/tcpsockopt_windows.go             |   0
 src/{pkg => }/net/testdata/domain-resolv.conf       |   0
 src/{pkg => }/net/testdata/empty-resolv.conf        |   0
 src/{pkg => }/net/testdata/hosts                    |   0
 src/{pkg => }/net/testdata/hosts_singleline         |   0
 src/{pkg => }/net/testdata/igmp                     |   0
 src/{pkg => }/net/testdata/igmp6                    |   0
 src/{pkg => }/net/testdata/resolv.conf              |   0
 src/{pkg => }/net/testdata/search-resolv.conf       |   0
 src/{pkg => }/net/textproto/header.go               |   0
 src/{pkg => }/net/textproto/pipeline.go             |   0
 src/{pkg => }/net/textproto/reader.go               |   0
 src/{pkg => }/net/textproto/reader_test.go          |   0
 src/{pkg => }/net/textproto/textproto.go            |   0
 src/{pkg => }/net/textproto/writer.go               |   0
 src/{pkg => }/net/textproto/writer_test.go          |   0
 src/{pkg => }/net/timeout_test.go                   |   0
 src/{pkg => }/net/udp_test.go                       |   0
 src/{pkg => }/net/udpsock.go                        |   0
 src/{pkg => }/net/udpsock_plan9.go                  |   0
 src/{pkg => }/net/udpsock_posix.go                  |   0
 src/{pkg => }/net/unicast_posix_test.go             |   0
 src/{pkg => }/net/unix_test.go                      |   0
 src/{pkg => }/net/unixsock.go                       |   0
 src/{pkg => }/net/unixsock_plan9.go                 |   0
 src/{pkg => }/net/unixsock_posix.go                 |   0
 src/{pkg => }/net/url/example_test.go               |   0
 src/{pkg => }/net/url/url.go                        |   0
 src/{pkg => }/net/url/url_test.go                   |   0
 src/{pkg => }/net/z_last_test.go                    |   0
 src/{pkg => }/os/dir_plan9.go                       |   0
 src/{pkg => }/os/dir_unix.go                        |   0
 src/{pkg => }/os/dir_windows.go                     |   0
 src/{pkg => }/os/doc.go                             |   0
 src/{pkg => }/os/env.go                             |   0
 src/{pkg => }/os/env_test.go                        |   0
 src/{pkg => }/os/env_unix_test.go                   |   0
 src/{pkg => }/os/error.go                           |   0
 src/{pkg => }/os/error_plan9.go                     |   0
 src/{pkg => }/os/error_test.go                      |   0
 src/{pkg => }/os/error_unix.go                      |   0
 src/{pkg => }/os/error_windows.go                   |   0
 src/{pkg => }/os/error_windows_test.go              |   0
 src/{pkg => }/os/exec.go                            |   0
 src/{pkg => }/os/exec/example_test.go               |   0
 src/{pkg => }/os/exec/exec.go                       |   0
 src/{pkg => }/os/exec/exec_test.go                  |   0
 src/{pkg => }/os/exec/lp_plan9.go                   |   0
 src/{pkg => }/os/exec/lp_test.go                    |   0
 src/{pkg => }/os/exec/lp_unix.go                    |   0
 src/{pkg => }/os/exec/lp_unix_test.go               |   0
 src/{pkg => }/os/exec/lp_windows.go                 |   0
 src/{pkg => }/os/exec/lp_windows_test.go            |   0
 src/{pkg => }/os/exec_plan9.go                      |   0
 src/{pkg => }/os/exec_posix.go                      |   0
 src/{pkg => }/os/exec_unix.go                       |   0
 src/{pkg => }/os/exec_windows.go                    |   0
 src/{pkg => }/os/export_test.go                     |   0
 src/{pkg => }/os/file.go                            |   0
 src/{pkg => }/os/file_plan9.go                      |   0
 src/{pkg => }/os/file_posix.go                      |   0
 src/{pkg => }/os/file_unix.go                       |   0
 src/{pkg => }/os/file_windows.go                    |   0
 src/{pkg => }/os/getwd.go                           |   0
 src/{pkg => }/os/getwd_darwin.go                    |   0
 src/{pkg => }/os/os_test.go                         |   0
 src/{pkg => }/os/os_unix_test.go                    |   0
 src/{pkg => }/os/os_windows_test.go                 |   0
 src/{pkg => }/os/path.go                            |   0
 src/{pkg => }/os/path_plan9.go                      |   0
 src/{pkg => }/os/path_test.go                       |   0
 src/{pkg => }/os/path_unix.go                       |   0
 src/{pkg => }/os/path_windows.go                    |   0
 src/{pkg => }/os/pipe_bsd.go                        |   0
 src/{pkg => }/os/pipe_linux.go                      |   0
 src/{pkg => }/os/proc.go                            |   0
 src/{pkg => }/os/signal/example_test.go             |   0
 src/{pkg => }/os/signal/sig.s                       |   0
 src/{pkg => }/os/signal/signal.go                   |   0
 src/{pkg => }/os/signal/signal_stub.go              |   0
 src/{pkg => }/os/signal/signal_test.go              |   0
 src/{pkg => }/os/signal/signal_unix.go              |   0
 src/{pkg => }/os/signal/signal_windows_test.go      |   0
 src/{pkg => }/os/stat_darwin.go                     |   0
 src/{pkg => }/os/stat_dragonfly.go                  |   0
 src/{pkg => }/os/stat_freebsd.go                    |   0
 src/{pkg => }/os/stat_linux.go                      |   0
 src/{pkg => }/os/stat_nacl.go                       |   0
 src/{pkg => }/os/stat_netbsd.go                     |   0
 src/{pkg => }/os/stat_openbsd.go                    |   0
 src/{pkg => }/os/stat_plan9.go                      |   0
 src/{pkg => }/os/stat_solaris.go                    |   0
 src/{pkg => }/os/stat_windows.go                    |   0
 src/{pkg => }/os/str.go                             |   0
 src/{pkg => }/os/sys_bsd.go                         |   0
 src/{pkg => }/os/sys_darwin.go                      |   0
 src/{pkg => }/os/sys_freebsd.go                     |   0
 src/{pkg => }/os/sys_linux.go                       |   0
 src/{pkg => }/os/sys_nacl.go                        |   0
 src/{pkg => }/os/sys_plan9.go                       |   0
 src/{pkg => }/os/sys_solaris.go                     |   0
 src/{pkg => }/os/sys_unix.go                        |   0
 src/{pkg => }/os/sys_windows.go                     |   0
 src/{pkg => }/os/types.go                           |   0
 src/{pkg => }/os/types_notwin.go                    |   0
 src/{pkg => }/os/types_windows.go                   |   0
 src/{pkg => }/os/user/lookup.go                     |   0
 src/{pkg => }/os/user/lookup_plan9.go               |   0
 src/{pkg => }/os/user/lookup_stubs.go               |   0
 src/{pkg => }/os/user/lookup_unix.go                |   0
 src/{pkg => }/os/user/lookup_windows.go             |   0
 src/{pkg => }/os/user/user.go                       |   0
 src/{pkg => }/os/user/user_test.go                  |   0
 src/{pkg => }/path/example_test.go                  |   0
 src/{pkg => }/path/filepath/example_unix_test.go    |   0
 src/{pkg => }/path/filepath/export_test.go          |   0
 src/{pkg => }/path/filepath/match.go                |   0
 src/{pkg => }/path/filepath/match_test.go           |   0
 src/{pkg => }/path/filepath/path.go                 |   0
 src/{pkg => }/path/filepath/path_plan9.go           |   0
 src/{pkg => }/path/filepath/path_test.go            |   0
 src/{pkg => }/path/filepath/path_unix.go            |   0
 src/{pkg => }/path/filepath/path_windows.go         |   0
 src/{pkg => }/path/filepath/path_windows_test.go    |   0
 src/{pkg => }/path/filepath/symlink.go              |   0
 src/{pkg => }/path/filepath/symlink_unix.go         |   0
 src/{pkg => }/path/filepath/symlink_windows.go      |   0
 src/{pkg => }/path/match.go                         |   0
 src/{pkg => }/path/match_test.go                    |   0
 src/{pkg => }/path/path.go                          |   0
 src/{pkg => }/path/path_test.go                     |   0
 src/{pkg => }/reflect/all_test.go                   |   0
 src/{pkg => }/reflect/asm_386.s                     |   0
 src/{pkg => }/reflect/asm_amd64.s                   |   0
 src/{pkg => }/reflect/asm_amd64p32.s                |   0
 src/{pkg => }/reflect/asm_arm.s                     |   0
 src/{pkg => }/reflect/deepequal.go                  |   0
 src/{pkg => }/reflect/example_test.go               |   0
 src/{pkg => }/reflect/export_test.go                |   0
 src/{pkg => }/reflect/makefunc.go                   |   0
 src/{pkg => }/reflect/set_test.go                   |   0
 src/{pkg => }/reflect/tostring_test.go              |   0
 src/{pkg => }/reflect/type.go                       |   0
 src/{pkg => }/reflect/value.go                      |   0
 src/{pkg => }/regexp/all_test.go                    |   0
 src/{pkg => }/regexp/example_test.go                |   0
 src/{pkg => }/regexp/exec.go                        |   0
 src/{pkg => }/regexp/exec2_test.go                  |   0
 src/{pkg => }/regexp/exec_test.go                   |   0
 src/{pkg => }/regexp/find_test.go                   |   0
 src/{pkg => }/regexp/onepass.go                     |   0
 src/{pkg => }/regexp/onepass_test.go                |   0
 src/{pkg => }/regexp/regexp.go                      |   0
 src/{pkg => }/regexp/syntax/compile.go              |   0
 src/{pkg => }/regexp/syntax/doc.go                  |   0
 src/{pkg => }/regexp/syntax/make_perl_groups.pl     |   0
 src/{pkg => }/regexp/syntax/parse.go                |   0
 src/{pkg => }/regexp/syntax/parse_test.go           |   0
 src/{pkg => }/regexp/syntax/perl_groups.go          |   0
 src/{pkg => }/regexp/syntax/prog.go                 |   0
 src/{pkg => }/regexp/syntax/prog_test.go            |   0
 src/{pkg => }/regexp/syntax/regexp.go               |   0
 src/{pkg => }/regexp/syntax/simplify.go             |   0
 src/{pkg => }/regexp/syntax/simplify_test.go        |   0
 src/{pkg => }/regexp/testdata/README                |   0
 src/{pkg => }/regexp/testdata/basic.dat             |   0
 src/{pkg => }/regexp/testdata/nullsubexpr.dat       |   0
 .../regexp/testdata/re2-exhaustive.txt.bz2          | Bin
 src/{pkg => }/regexp/testdata/re2-search.txt        |   0
 src/{pkg => }/regexp/testdata/repetition.dat        |   0
 src/{pkg => }/regexp/testdata/testregex.c           |   0
 src/{pkg => }/runtime/Makefile                      |   0
 src/{pkg => }/runtime/alg.go                        |   0
 src/{pkg => }/runtime/append_test.go                |   0
 src/{pkg => }/runtime/arch_386.go                   |   0
 src/{pkg => }/runtime/arch_386.h                    |   0
 src/{pkg => }/runtime/arch_amd64.go                 |   0
 src/{pkg => }/runtime/arch_amd64.h                  |   0
 src/{pkg => }/runtime/arch_amd64p32.go              |   0
 src/{pkg => }/runtime/arch_amd64p32.h               |   0
 src/{pkg => }/runtime/arch_arm.go                   |   0
 src/{pkg => }/runtime/arch_arm.h                    |   0
 src/{pkg => }/runtime/asm_386.s                     |   0
 src/{pkg => }/runtime/asm_amd64.s                   |   0
 src/{pkg => }/runtime/asm_amd64p32.s                |   0
 src/{pkg => }/runtime/asm_arm.s                     |   0
 src/{pkg => }/runtime/atomic.go                     |   0
 src/{pkg => }/runtime/atomic_386.c                  |   0
 src/{pkg => }/runtime/atomic_amd64x.c               |   0
 src/{pkg => }/runtime/atomic_arm.go                 |   0
 src/{pkg => }/runtime/cgo/asm_386.s                 |   0
 src/{pkg => }/runtime/cgo/asm_amd64.s               |   0
 src/{pkg => }/runtime/cgo/asm_arm.s                 |   0
 src/{pkg => }/runtime/cgo/asm_nacl_amd64p32.s       |   0
 src/{pkg => }/runtime/cgo/callbacks.c               |   0
 src/{pkg => }/runtime/cgo/cgo.go                    |   0
 src/{pkg => }/runtime/cgo/dragonfly.c               |   0
 src/{pkg => }/runtime/cgo/freebsd.c                 |   0
 src/{pkg => }/runtime/cgo/gcc_386.S                 |   0
 src/{pkg => }/runtime/cgo/gcc_amd64.S               |   0
 src/{pkg => }/runtime/cgo/gcc_android.c             |   0
 src/{pkg => }/runtime/cgo/gcc_android_arm.c         |   0
 src/{pkg => }/runtime/cgo/gcc_arm.S                 |   0
 src/{pkg => }/runtime/cgo/gcc_darwin_386.c          |   0
 src/{pkg => }/runtime/cgo/gcc_darwin_amd64.c        |   0
 src/{pkg => }/runtime/cgo/gcc_dragonfly_386.c       |   0
 src/{pkg => }/runtime/cgo/gcc_dragonfly_amd64.c     |   0
 src/{pkg => }/runtime/cgo/gcc_fatalf.c              |   0
 src/{pkg => }/runtime/cgo/gcc_freebsd_386.c         |   0
 src/{pkg => }/runtime/cgo/gcc_freebsd_amd64.c       |   0
 src/{pkg => }/runtime/cgo/gcc_freebsd_arm.c         |   0
 src/{pkg => }/runtime/cgo/gcc_linux_386.c           |   0
 src/{pkg => }/runtime/cgo/gcc_linux_amd64.c         |   0
 src/{pkg => }/runtime/cgo/gcc_linux_arm.c           |   0
 src/{pkg => }/runtime/cgo/gcc_netbsd_386.c          |   0
 src/{pkg => }/runtime/cgo/gcc_netbsd_amd64.c        |   0
 src/{pkg => }/runtime/cgo/gcc_netbsd_arm.c          |   0
 src/{pkg => }/runtime/cgo/gcc_openbsd_386.c         |   0
 src/{pkg => }/runtime/cgo/gcc_openbsd_amd64.c       |   0
 src/{pkg => }/runtime/cgo/gcc_setenv.c              |   0
 src/{pkg => }/runtime/cgo/gcc_util.c                |   0
 src/{pkg => }/runtime/cgo/gcc_windows_386.c         |   0
 src/{pkg => }/runtime/cgo/gcc_windows_amd64.c       |   0
 src/{pkg => }/runtime/cgo/iscgo.c                   |   0
 src/{pkg => }/runtime/cgo/libcgo.h                  |   0
 src/{pkg => }/runtime/cgo/netbsd.c                  |   0
 src/{pkg => }/runtime/cgo/openbsd.c                 |   0
 src/{pkg => }/runtime/cgo/setenv.c                  |   0
 src/{pkg => }/runtime/cgocall.go                    |   0
 src/{pkg => }/runtime/cgocall.h                     |   0
 src/{pkg => }/runtime/chan.go                       |   0
 src/{pkg => }/runtime/chan.h                        |   0
 src/{pkg => }/runtime/chan_test.go                  |   0
 src/{pkg => }/runtime/closure_test.go               |   0
 src/{pkg => }/runtime/compiler.go                   |   0
 src/{pkg => }/runtime/complex.go                    |   0
 src/{pkg => }/runtime/complex_test.go               |   0
 src/{pkg => }/runtime/cpuprof.go                    |   0
 src/{pkg => }/runtime/crash_cgo_test.go             |   0
 src/{pkg => }/runtime/crash_test.go                 |   0
 src/{pkg => }/runtime/debug.go                      |   0
 src/{pkg => }/runtime/debug/debug.c                 |   0
 src/{pkg => }/runtime/debug/garbage.go              |   0
 src/{pkg => }/runtime/debug/garbage_test.go         |   0
 src/{pkg => }/runtime/debug/heapdump_test.go        |   0
 src/{pkg => }/runtime/debug/stack.go                |   0
 src/{pkg => }/runtime/debug/stack_test.go           |   0
 src/{pkg => }/runtime/debug/stubs.go                |   0
 src/{pkg => }/runtime/debug/stubs.s                 |   0
 src/{pkg => }/runtime/defs.c                        |   0
 src/{pkg => }/runtime/defs1_linux.go                |   0
 src/{pkg => }/runtime/defs2_linux.go                |   0
 src/{pkg => }/runtime/defs_android_arm.h            |   0
 src/{pkg => }/runtime/defs_arm_linux.go             |   0
 src/{pkg => }/runtime/defs_darwin.go                |   0
 src/{pkg => }/runtime/defs_darwin_386.h             |   0
 src/{pkg => }/runtime/defs_darwin_amd64.h           |   0
 src/{pkg => }/runtime/defs_dragonfly.go             |   0
 src/{pkg => }/runtime/defs_dragonfly_386.h          |   0
 src/{pkg => }/runtime/defs_dragonfly_amd64.h        |   0
 src/{pkg => }/runtime/defs_freebsd.go               |   0
 src/{pkg => }/runtime/defs_freebsd_386.h            |   0
 src/{pkg => }/runtime/defs_freebsd_amd64.h          |   0
 src/{pkg => }/runtime/defs_freebsd_arm.h            |   0
 src/{pkg => }/runtime/defs_linux.go                 |   0
 src/{pkg => }/runtime/defs_linux_386.h              |   0
 src/{pkg => }/runtime/defs_linux_amd64.h            |   0
 src/{pkg => }/runtime/defs_linux_arm.h              |   0
 src/{pkg => }/runtime/defs_nacl_386.h               |   0
 src/{pkg => }/runtime/defs_nacl_amd64p32.h          |   0
 src/{pkg => }/runtime/defs_nacl_arm.h               |   0
 src/{pkg => }/runtime/defs_netbsd.go                |   0
 src/{pkg => }/runtime/defs_netbsd_386.go            |   0
 src/{pkg => }/runtime/defs_netbsd_386.h             |   0
 src/{pkg => }/runtime/defs_netbsd_amd64.go          |   0
 src/{pkg => }/runtime/defs_netbsd_amd64.h           |   0
 src/{pkg => }/runtime/defs_netbsd_arm.go            |   0
 src/{pkg => }/runtime/defs_netbsd_arm.h             |   0
 src/{pkg => }/runtime/defs_openbsd.go               |   0
 src/{pkg => }/runtime/defs_openbsd_386.h            |   0
 src/{pkg => }/runtime/defs_openbsd_amd64.h          |   0
 src/{pkg => }/runtime/defs_plan9_386.h              |   0
 src/{pkg => }/runtime/defs_plan9_amd64.h            |   0
 src/{pkg => }/runtime/defs_solaris.go               |   0
 src/{pkg => }/runtime/defs_solaris_amd64.go         |   0
 src/{pkg => }/runtime/defs_solaris_amd64.h          |   0
 src/{pkg => }/runtime/defs_windows.go               |   0
 src/{pkg => }/runtime/defs_windows_386.h            |   0
 src/{pkg => }/runtime/defs_windows_amd64.h          |   0
 src/{pkg => }/runtime/env_plan9.go                  |   0
 src/{pkg => }/runtime/env_posix.go                  |   0
 src/{pkg => }/runtime/error.go                      |   0
 src/{pkg => }/runtime/export_futex_test.go          |   0
 src/{pkg => }/runtime/export_test.go                |   0
 src/{pkg => }/runtime/extern.go                     |   0
 src/{pkg => }/runtime/float.c                       |   0
 src/{pkg => }/runtime/funcdata.h                    |   0
 src/{pkg => }/runtime/futex_test.go                 |   0
 src/{pkg => }/runtime/gc_test.go                    |   0
 src/{pkg => }/runtime/gcinfo_test.go                |   0
 src/{pkg => }/runtime/hash_test.go                  |   0
 src/{pkg => }/runtime/hashmap.go                    |   0
 src/{pkg => }/runtime/hashmap_fast.go               |   0
 src/{pkg => }/runtime/heapdump.c                    |   0
 src/{pkg => }/runtime/iface.go                      |   0
 src/{pkg => }/runtime/iface_test.go                 |   0
 src/{pkg => }/runtime/lfstack.c                     |   0
 src/{pkg => }/runtime/lfstack_test.go               |   0
 src/{pkg => }/runtime/lock_futex.go                 |   0
 src/{pkg => }/runtime/lock_sema.go                  |   0
 src/{pkg => }/runtime/malloc.c                      |   0
 src/{pkg => }/runtime/malloc.go                     |   0
 src/{pkg => }/runtime/malloc.h                      |   0
 src/{pkg => }/runtime/malloc_test.go                |   0
 src/{pkg => }/runtime/map_test.go                   |   0
 src/{pkg => }/runtime/mapspeed_test.go              |   0
 src/{pkg => }/runtime/mcache.c                      |   0
 src/{pkg => }/runtime/mcentral.c                    |   0
 src/{pkg => }/runtime/mem.go                        |   0
 src/{pkg => }/runtime/mem_darwin.c                  |   0
 src/{pkg => }/runtime/mem_dragonfly.c               |   0
 src/{pkg => }/runtime/mem_freebsd.c                 |   0
 src/{pkg => }/runtime/mem_linux.c                   |   0
 src/{pkg => }/runtime/mem_nacl.c                    |   0
 src/{pkg => }/runtime/mem_netbsd.c                  |   0
 src/{pkg => }/runtime/mem_openbsd.c                 |   0
 src/{pkg => }/runtime/mem_plan9.c                   |   0
 src/{pkg => }/runtime/mem_solaris.c                 |   0
 src/{pkg => }/runtime/mem_windows.c                 |   0
 src/{pkg => }/runtime/memclr_386.s                  |   0
 src/{pkg => }/runtime/memclr_amd64.s                |   0
 src/{pkg => }/runtime/memclr_arm.s                  |   0
 src/{pkg => }/runtime/memclr_plan9_386.s            |   0
 src/{pkg => }/runtime/memclr_plan9_amd64.s          |   0
 src/{pkg => }/runtime/memmove_386.s                 |   0
 src/{pkg => }/runtime/memmove_amd64.s               |   0
 src/{pkg => }/runtime/memmove_arm.s                 |   0
 src/{pkg => }/runtime/memmove_linux_amd64_test.go   |   0
 src/{pkg => }/runtime/memmove_nacl_amd64p32.s       |   0
 src/{pkg => }/runtime/memmove_plan9_386.s           |   0
 src/{pkg => }/runtime/memmove_plan9_amd64.s         |   0
 src/{pkg => }/runtime/memmove_test.go               |   0
 src/{pkg => }/runtime/mfinal_test.go                |   0
 src/{pkg => }/runtime/mfixalloc.c                   |   0
 src/{pkg => }/runtime/mgc0.c                        |   0
 src/{pkg => }/runtime/mgc0.go                       |   0
 src/{pkg => }/runtime/mgc0.h                        |   0
 src/{pkg => }/runtime/mheap.c                       |   0
 src/{pkg => }/runtime/mknacl.sh                     |   0
 src/{pkg => }/runtime/mprof.go                      |   0
 src/{pkg => }/runtime/msize.c                       |   0
 src/{pkg => }/runtime/netpoll.go                    |   0
 src/{pkg => }/runtime/netpoll_epoll.go              |   0
 src/{pkg => }/runtime/netpoll_kqueue.go             |   0
 src/{pkg => }/runtime/netpoll_nacl.go               |   0
 src/{pkg => }/runtime/netpoll_solaris.c             |   0
 src/{pkg => }/runtime/netpoll_stub.c                |   0
 src/{pkg => }/runtime/netpoll_windows.c             |   0
 src/{pkg => }/runtime/noasm_arm.go                  |   0
 src/{pkg => }/runtime/norace_test.go                |   0
 src/{pkg => }/runtime/os_android.c                  |   0
 src/{pkg => }/runtime/os_android.h                  |   0
 src/{pkg => }/runtime/os_darwin.c                   |   0
 src/{pkg => }/runtime/os_darwin.go                  |   0
 src/{pkg => }/runtime/os_darwin.h                   |   0
 src/{pkg => }/runtime/os_dragonfly.c                |   0
 src/{pkg => }/runtime/os_dragonfly.go               |   0
 src/{pkg => }/runtime/os_dragonfly.h                |   0
 src/{pkg => }/runtime/os_freebsd.c                  |   0
 src/{pkg => }/runtime/os_freebsd.go                 |   0
 src/{pkg => }/runtime/os_freebsd.h                  |   0
 src/{pkg => }/runtime/os_freebsd_arm.c              |   0
 src/{pkg => }/runtime/os_linux.c                    |   0
 src/{pkg => }/runtime/os_linux.go                   |   0
 src/{pkg => }/runtime/os_linux.h                    |   0
 src/{pkg => }/runtime/os_linux_386.c                |   0
 src/{pkg => }/runtime/os_linux_arm.c                |   0
 src/{pkg => }/runtime/os_nacl.c                     |   0
 src/{pkg => }/runtime/os_nacl.go                    |   0
 src/{pkg => }/runtime/os_nacl.h                     |   0
 src/{pkg => }/runtime/os_nacl_arm.c                 |   0
 src/{pkg => }/runtime/os_netbsd.c                   |   0
 src/{pkg => }/runtime/os_netbsd.go                  |   0
 src/{pkg => }/runtime/os_netbsd.h                   |   0
 src/{pkg => }/runtime/os_netbsd_386.c               |   0
 src/{pkg => }/runtime/os_netbsd_amd64.c             |   0
 src/{pkg => }/runtime/os_netbsd_arm.c               |   0
 src/{pkg => }/runtime/os_openbsd.c                  |   0
 src/{pkg => }/runtime/os_openbsd.go                 |   0
 src/{pkg => }/runtime/os_openbsd.h                  |   0
 src/{pkg => }/runtime/os_plan9.c                    |   0
 src/{pkg => }/runtime/os_plan9.go                   |   0
 src/{pkg => }/runtime/os_plan9.h                    |   0
 src/{pkg => }/runtime/os_plan9_386.c                |   0
 src/{pkg => }/runtime/os_plan9_amd64.c              |   0
 src/{pkg => }/runtime/os_solaris.c                  |   0
 src/{pkg => }/runtime/os_solaris.go                 |   0
 src/{pkg => }/runtime/os_solaris.h                  |   0
 src/{pkg => }/runtime/os_windows.c                  |   0
 src/{pkg => }/runtime/os_windows.go                 |   0
 src/{pkg => }/runtime/os_windows.h                  |   0
 src/{pkg => }/runtime/os_windows_386.c              |   0
 src/{pkg => }/runtime/os_windows_386.go             |   0
 src/{pkg => }/runtime/os_windows_amd64.c            |   0
 src/{pkg => }/runtime/os_windows_amd64.go           |   0
 src/{pkg => }/runtime/panic.c                       |   0
 src/{pkg => }/runtime/panic.go                      |   0
 src/{pkg => }/runtime/panic1.go                     |   0
 src/{pkg => }/runtime/parfor.c                      |   0
 src/{pkg => }/runtime/parfor_test.go                |   0
 src/{pkg => }/runtime/pprof/pprof.go                |   0
 src/{pkg => }/runtime/pprof/pprof_test.go           |   0
 src/{pkg => }/runtime/print1.go                     |   0
 src/{pkg => }/runtime/proc.c                        |   0
 src/{pkg => }/runtime/proc.go                       |   0
 src/{pkg => }/runtime/proc_test.go                  |   0
 src/{pkg => }/runtime/race.c                        |   0
 src/{pkg => }/runtime/race.go                       |   0
 src/{pkg => }/runtime/race.h                        |   0
 src/{pkg => }/runtime/race/README                   |   0
 src/{pkg => }/runtime/race/doc.go                   |   0
 src/{pkg => }/runtime/race/output_test.go           |   0
 src/{pkg => }/runtime/race/race.go                  |   0
 src/{pkg => }/runtime/race/race_darwin_amd64.syso   | Bin
 src/{pkg => }/runtime/race/race_freebsd_amd64.syso  | Bin
 src/{pkg => }/runtime/race/race_linux_amd64.syso    | Bin
 src/{pkg => }/runtime/race/race_test.go             |   0
 src/{pkg => }/runtime/race/race_windows_amd64.syso  | Bin
 src/{pkg => }/runtime/race/testdata/atomic_test.go  |   0
 src/{pkg => }/runtime/race/testdata/cgo_test.go     |   0
 .../runtime/race/testdata/cgo_test_main.go          |   0
 src/{pkg => }/runtime/race/testdata/chan_test.go    |   0
 src/{pkg => }/runtime/race/testdata/comp_test.go    |   0
 .../runtime/race/testdata/finalizer_test.go         |   0
 src/{pkg => }/runtime/race/testdata/io_test.go      |   0
 src/{pkg => }/runtime/race/testdata/map_test.go     |   0
 src/{pkg => }/runtime/race/testdata/mop_test.go     |   0
 src/{pkg => }/runtime/race/testdata/mutex_test.go   |   0
 .../runtime/race/testdata/regression_test.go        |   0
 src/{pkg => }/runtime/race/testdata/rwmutex_test.go |   0
 src/{pkg => }/runtime/race/testdata/select_test.go  |   0
 src/{pkg => }/runtime/race/testdata/slice_test.go   |   0
 src/{pkg => }/runtime/race/testdata/sync_test.go    |   0
 .../runtime/race/testdata/waitgroup_test.go         |   0
 src/{pkg => }/runtime/race0.go                      |   0
 src/{pkg => }/runtime/race_amd64.s                  |   0
 src/{pkg => }/runtime/rdebug.go                     |   0
 src/{pkg => }/runtime/rt0_android_arm.s             |   0
 src/{pkg => }/runtime/rt0_darwin_386.s              |   0
 src/{pkg => }/runtime/rt0_darwin_amd64.s            |   0
 src/{pkg => }/runtime/rt0_dragonfly_386.s           |   0
 src/{pkg => }/runtime/rt0_dragonfly_amd64.s         |   0
 src/{pkg => }/runtime/rt0_freebsd_386.s             |   0
 src/{pkg => }/runtime/rt0_freebsd_amd64.s           |   0
 src/{pkg => }/runtime/rt0_freebsd_arm.s             |   0
 src/{pkg => }/runtime/rt0_linux_386.s               |   0
 src/{pkg => }/runtime/rt0_linux_amd64.s             |   0
 src/{pkg => }/runtime/rt0_linux_arm.s               |   0
 src/{pkg => }/runtime/rt0_nacl_386.s                |   0
 src/{pkg => }/runtime/rt0_nacl_amd64p32.s           |   0
 src/{pkg => }/runtime/rt0_nacl_arm.s                |   0
 src/{pkg => }/runtime/rt0_netbsd_386.s              |   0
 src/{pkg => }/runtime/rt0_netbsd_amd64.s            |   0
 src/{pkg => }/runtime/rt0_netbsd_arm.s              |   0
 src/{pkg => }/runtime/rt0_openbsd_386.s             |   0
 src/{pkg => }/runtime/rt0_openbsd_amd64.s           |   0
 src/{pkg => }/runtime/rt0_plan9_386.s               |   0
 src/{pkg => }/runtime/rt0_plan9_amd64.s             |   0
 src/{pkg => }/runtime/rt0_solaris_amd64.s           |   0
 src/{pkg => }/runtime/rt0_windows_386.s             |   0
 src/{pkg => }/runtime/rt0_windows_amd64.s           |   0
 src/{pkg => }/runtime/rune.go                       |   0
 src/{pkg => }/runtime/runtime-gdb.py                |   0
 src/{pkg => }/runtime/runtime.c                     |   0
 src/{pkg => }/runtime/runtime.go                    |   0
 src/{pkg => }/runtime/runtime.h                     |   0
 src/{pkg => }/runtime/runtime_linux_test.go         |   0
 src/{pkg => }/runtime/runtime_test.go               |   0
 src/{pkg => }/runtime/runtime_unix_test.go          |   0
 src/{pkg => }/runtime/select.go                     |   0
 src/{pkg => }/runtime/sema.go                       |   0
 src/{pkg => }/runtime/signal.c                      |   0
 src/{pkg => }/runtime/signal_386.c                  |   0
 src/{pkg => }/runtime/signal_amd64x.c               |   0
 src/{pkg => }/runtime/signal_android_386.h          |   0
 src/{pkg => }/runtime/signal_android_arm.h          |   0
 src/{pkg => }/runtime/signal_arm.c                  |   0
 src/{pkg => }/runtime/signal_darwin_386.h           |   0
 src/{pkg => }/runtime/signal_darwin_amd64.h         |   0
 src/{pkg => }/runtime/signal_dragonfly_386.h        |   0
 src/{pkg => }/runtime/signal_dragonfly_amd64.h      |   0
 src/{pkg => }/runtime/signal_freebsd_386.h          |   0
 src/{pkg => }/runtime/signal_freebsd_amd64.h        |   0
 src/{pkg => }/runtime/signal_freebsd_arm.h          |   0
 src/{pkg => }/runtime/signal_linux_386.h            |   0
 src/{pkg => }/runtime/signal_linux_amd64.h          |   0
 src/{pkg => }/runtime/signal_linux_arm.h            |   0
 src/{pkg => }/runtime/signal_nacl_386.h             |   0
 src/{pkg => }/runtime/signal_nacl_amd64p32.h        |   0
 src/{pkg => }/runtime/signal_nacl_arm.h             |   0
 src/{pkg => }/runtime/signal_netbsd_386.h           |   0
 src/{pkg => }/runtime/signal_netbsd_amd64.h         |   0
 src/{pkg => }/runtime/signal_netbsd_arm.h           |   0
 src/{pkg => }/runtime/signal_openbsd_386.h          |   0
 src/{pkg => }/runtime/signal_openbsd_amd64.h        |   0
 src/{pkg => }/runtime/signal_solaris_amd64.h        |   0
 src/{pkg => }/runtime/signal_unix.c                 |   0
 src/{pkg => }/runtime/signal_unix.go                |   0
 src/{pkg => }/runtime/signal_unix.h                 |   0
 src/{pkg => }/runtime/signals_android.h             |   0
 src/{pkg => }/runtime/signals_darwin.h              |   0
 src/{pkg => }/runtime/signals_dragonfly.h           |   0
 src/{pkg => }/runtime/signals_freebsd.h             |   0
 src/{pkg => }/runtime/signals_linux.h               |   0
 src/{pkg => }/runtime/signals_nacl.h                |   0
 src/{pkg => }/runtime/signals_netbsd.h              |   0
 src/{pkg => }/runtime/signals_openbsd.h             |   0
 src/{pkg => }/runtime/signals_plan9.h               |   0
 src/{pkg => }/runtime/signals_solaris.h             |   0
 src/{pkg => }/runtime/signals_windows.h             |   0
 src/{pkg => }/runtime/sigqueue.go                   |   0
 src/{pkg => }/runtime/slice.go                      |   0
 src/{pkg => }/runtime/softfloat64.go                |   0
 src/{pkg => }/runtime/softfloat64_test.go           |   0
 src/{pkg => }/runtime/softfloat_arm.c               |   0
 src/{pkg => }/runtime/sqrt.go                       |   0
 src/{pkg => }/runtime/stack.c                       |   0
 src/{pkg => }/runtime/stack.go                      |   0
 src/{pkg => }/runtime/stack.h                       |   0
 src/{pkg => }/runtime/stack_gen_test.go             |   0
 src/{pkg => }/runtime/stack_test.go                 |   0
 src/{pkg => }/runtime/string.c                      |   0
 src/{pkg => }/runtime/string.go                     |   0
 src/{pkg => }/runtime/string_test.go                |   0
 src/{pkg => }/runtime/stubs.go                      |   0
 src/{pkg => }/runtime/symtab.go                     |   0
 src/{pkg => }/runtime/symtab_test.go                |   0
 src/{pkg => }/runtime/sys_arm.c                     |   0
 src/{pkg => }/runtime/sys_darwin_386.s              |   0
 src/{pkg => }/runtime/sys_darwin_amd64.s            |   0
 src/{pkg => }/runtime/sys_dragonfly_386.s           |   0
 src/{pkg => }/runtime/sys_dragonfly_amd64.s         |   0
 src/{pkg => }/runtime/sys_freebsd_386.s             |   0
 src/{pkg => }/runtime/sys_freebsd_amd64.s           |   0
 src/{pkg => }/runtime/sys_freebsd_arm.s             |   0
 src/{pkg => }/runtime/sys_linux_386.s               |   0
 src/{pkg => }/runtime/sys_linux_amd64.s             |   0
 src/{pkg => }/runtime/sys_linux_arm.s               |   0
 src/{pkg => }/runtime/sys_nacl_386.s                |   0
 src/{pkg => }/runtime/sys_nacl_amd64p32.s           |   0
 src/{pkg => }/runtime/sys_nacl_arm.s                |   0
 src/{pkg => }/runtime/sys_netbsd_386.s              |   0
 src/{pkg => }/runtime/sys_netbsd_amd64.s            |   0
 src/{pkg => }/runtime/sys_netbsd_arm.s              |   0
 src/{pkg => }/runtime/sys_openbsd_386.s             |   0
 src/{pkg => }/runtime/sys_openbsd_amd64.s           |   0
 src/{pkg => }/runtime/sys_plan9_386.s               |   0
 src/{pkg => }/runtime/sys_plan9_amd64.s             |   0
 src/{pkg => }/runtime/sys_solaris_amd64.s           |   0
 src/{pkg => }/runtime/sys_windows_386.s             |   0
 src/{pkg => }/runtime/sys_windows_amd64.s           |   0
 src/{pkg => }/runtime/sys_x86.c                     |   0
 src/{pkg => }/runtime/syscall_nacl.h                |   0
 src/{pkg => }/runtime/syscall_solaris.c             |   0
 src/{pkg => }/runtime/syscall_solaris.go            |   0
 src/{pkg => }/runtime/syscall_windows.c             |   0
 src/{pkg => }/runtime/syscall_windows.go            |   0
 src/{pkg => }/runtime/syscall_windows_test.go       |   0
 src/{pkg => }/runtime/thunk.s                       |   0
 src/{pkg => }/runtime/thunk_solaris_amd64.s         |   0
 src/{pkg => }/runtime/time.go                       |   0
 src/{pkg => }/runtime/tls_arm.s                     |   0
 src/{pkg => }/runtime/traceback.go                  |   0
 src/{pkg => }/runtime/traceback_windows.go          |   0
 src/{pkg => }/runtime/type.h                        |   0
 src/{pkg => }/runtime/typekind.go                   |   0
 src/{pkg => }/runtime/typekind.h                    |   0
 src/{pkg => }/runtime/vdso_linux_amd64.c            |   0
 src/{pkg => }/runtime/vlop_386.s                    |   0
 src/{pkg => }/runtime/vlop_arm.s                    |   0
 src/{pkg => }/runtime/vlop_arm_test.go              |   0
 src/{pkg => }/runtime/vlrt.c                        |   0
 src/{pkg => }/runtime/vlrt.go                       |   0
 src/{pkg => }/sort/example_interface_test.go        |   0
 src/{pkg => }/sort/example_keys_test.go             |   0
 src/{pkg => }/sort/example_multi_test.go            |   0
 src/{pkg => }/sort/example_test.go                  |   0
 src/{pkg => }/sort/example_wrapper_test.go          |   0
 src/{pkg => }/sort/export_test.go                   |   0
 src/{pkg => }/sort/search.go                        |   0
 src/{pkg => }/sort/search_test.go                   |   0
 src/{pkg => }/sort/sort.go                          |   0
 src/{pkg => }/sort/sort_test.go                     |   0
 src/{pkg => }/strconv/atob.go                       |   0
 src/{pkg => }/strconv/atob_test.go                  |   0
 src/{pkg => }/strconv/atof.go                       |   0
 src/{pkg => }/strconv/atof_test.go                  |   0
 src/{pkg => }/strconv/atoi.go                       |   0
 src/{pkg => }/strconv/atoi_test.go                  |   0
 src/{pkg => }/strconv/decimal.go                    |   0
 src/{pkg => }/strconv/decimal_test.go               |   0
 src/{pkg => }/strconv/extfloat.go                   |   0
 src/{pkg => }/strconv/fp_test.go                    |   0
 src/{pkg => }/strconv/ftoa.go                       |   0
 src/{pkg => }/strconv/ftoa_test.go                  |   0
 src/{pkg => }/strconv/internal_test.go              |   0
 src/{pkg => }/strconv/isprint.go                    |   0
 src/{pkg => }/strconv/itoa.go                       |   0
 src/{pkg => }/strconv/itoa_test.go                  |   0
 src/{pkg => }/strconv/makeisprint.go                |   0
 src/{pkg => }/strconv/quote.go                      |   0
 src/{pkg => }/strconv/quote_example_test.go         |   0
 src/{pkg => }/strconv/quote_test.go                 |   0
 src/{pkg => }/strconv/strconv_test.go               |   0
 src/{pkg => }/strconv/testdata/testfp.txt           |   0
 src/{pkg => }/strings/example_test.go               |   0
 src/{pkg => }/strings/export_test.go                |   0
 src/{pkg => }/strings/reader.go                     |   0
 src/{pkg => }/strings/reader_test.go                |   0
 src/{pkg => }/strings/replace.go                    |   0
 src/{pkg => }/strings/replace_test.go               |   0
 src/{pkg => }/strings/search.go                     |   0
 src/{pkg => }/strings/search_test.go                |   0
 src/{pkg => }/strings/strings.go                    |   0
 src/{pkg => }/strings/strings.s                     |   0
 src/{pkg => }/strings/strings_decl.go               |   0
 src/{pkg => }/strings/strings_test.go               |   0
 src/{pkg => }/sync/atomic/64bit_arm.go              |   0
 src/{pkg => }/sync/atomic/asm_386.s                 |   0
 src/{pkg => }/sync/atomic/asm_amd64.s               |   0
 src/{pkg => }/sync/atomic/asm_amd64p32.s            |   0
 src/{pkg => }/sync/atomic/asm_arm.s                 |   0
 src/{pkg => }/sync/atomic/asm_freebsd_arm.s         |   0
 src/{pkg => }/sync/atomic/asm_linux_arm.s           |   0
 src/{pkg => }/sync/atomic/asm_nacl_arm.s            |   0
 src/{pkg => }/sync/atomic/asm_netbsd_arm.s          |   0
 src/{pkg => }/sync/atomic/atomic_linux_arm_test.go  |   0
 src/{pkg => }/sync/atomic/atomic_test.go            |   0
 src/{pkg => }/sync/atomic/doc.go                    |   0
 src/{pkg => }/sync/atomic/export_linux_arm_test.go  |   0
 src/{pkg => }/sync/atomic/race.s                    |   0
 src/{pkg => }/sync/cond.go                          |   0
 src/{pkg => }/sync/cond_test.go                     |   0
 src/{pkg => }/sync/example_test.go                  |   0
 src/{pkg => }/sync/export_test.go                   |   0
 src/{pkg => }/sync/mutex.go                         |   0
 src/{pkg => }/sync/mutex_test.go                    |   0
 src/{pkg => }/sync/once.go                          |   0
 src/{pkg => }/sync/once_test.go                     |   0
 src/{pkg => }/sync/pool.go                          |   0
 src/{pkg => }/sync/pool_test.go                     |   0
 src/{pkg => }/sync/race.go                          |   0
 src/{pkg => }/sync/race0.go                         |   0
 src/{pkg => }/sync/runtime.go                       |   0
 src/{pkg => }/sync/runtime_sema_test.go             |   0
 src/{pkg => }/sync/rwmutex.go                       |   0
 src/{pkg => }/sync/rwmutex_test.go                  |   0
 src/{pkg => }/sync/waitgroup.go                     |   0
 src/{pkg => }/sync/waitgroup_test.go                |   0
 src/{pkg => }/syscall/asm_darwin_386.s              |   0
 src/{pkg => }/syscall/asm_darwin_amd64.s            |   0
 src/{pkg => }/syscall/asm_dragonfly_386.s           |   0
 src/{pkg => }/syscall/asm_dragonfly_amd64.s         |   0
 src/{pkg => }/syscall/asm_freebsd_386.s             |   0
 src/{pkg => }/syscall/asm_freebsd_amd64.s           |   0
 src/{pkg => }/syscall/asm_freebsd_arm.s             |   0
 src/{pkg => }/syscall/asm_linux_386.s               |   0
 src/{pkg => }/syscall/asm_linux_amd64.s             |   0
 src/{pkg => }/syscall/asm_linux_arm.s               |   0
 src/{pkg => }/syscall/asm_nacl_386.s                |   0
 src/{pkg => }/syscall/asm_nacl_amd64p32.s           |   0
 src/{pkg => }/syscall/asm_nacl_arm.s                |   0
 src/{pkg => }/syscall/asm_netbsd_386.s              |   0
 src/{pkg => }/syscall/asm_netbsd_amd64.s            |   0
 src/{pkg => }/syscall/asm_netbsd_arm.s              |   0
 src/{pkg => }/syscall/asm_openbsd_386.s             |   0
 src/{pkg => }/syscall/asm_openbsd_amd64.s           |   0
 src/{pkg => }/syscall/asm_plan9_386.s               |   0
 src/{pkg => }/syscall/asm_plan9_amd64.s             |   0
 src/{pkg => }/syscall/asm_solaris_amd64.s           |   0
 src/{pkg => }/syscall/asm_windows.s                 |   0
 src/{pkg => }/syscall/bpf_bsd.go                    |   0
 src/{pkg => }/syscall/creds_test.go                 |   0
 src/{pkg => }/syscall/dir_plan9.go                  |   0
 src/{pkg => }/syscall/dll_windows.go                |   0
 src/{pkg => }/syscall/env_plan9.go                  |   0
 src/{pkg => }/syscall/env_unix.go                   |   0
 src/{pkg => }/syscall/env_windows.go                |   0
 src/{pkg => }/syscall/exec_bsd.go                   |   0
 src/{pkg => }/syscall/exec_linux.go                 |   0
 src/{pkg => }/syscall/exec_plan9.go                 |   0
 src/{pkg => }/syscall/exec_solaris.go               |   0
 src/{pkg => }/syscall/exec_unix.go                  |   0
 src/{pkg => }/syscall/exec_windows.go               |   0
 src/{pkg => }/syscall/fd_nacl.go                    |   0
 src/{pkg => }/syscall/flock.go                      |   0
 src/{pkg => }/syscall/flock_linux_32bit.go          |   0
 src/{pkg => }/syscall/fs_nacl.go                    |   0
 src/{pkg => }/syscall/lsf_linux.go                  |   0
 src/{pkg => }/syscall/mkall.sh                      |   0
 src/{pkg => }/syscall/mkall_windows.bat             |   0
 src/{pkg => }/syscall/mkerrors.sh                   |   0
 src/{pkg => }/syscall/mksyscall.pl                  |   0
 src/{pkg => }/syscall/mksyscall_solaris.pl          |   0
 src/{pkg => }/syscall/mksyscall_windows.go          |   0
 src/{pkg => }/syscall/mksysctl_openbsd.pl           |   0
 src/{pkg => }/syscall/mksysnum_darwin.pl            |   0
 src/{pkg => }/syscall/mksysnum_dragonfly.pl         |   0
 src/{pkg => }/syscall/mksysnum_freebsd.pl           |   0
 src/{pkg => }/syscall/mksysnum_linux.pl             |   0
 src/{pkg => }/syscall/mksysnum_netbsd.pl            |   0
 src/{pkg => }/syscall/mksysnum_openbsd.pl           |   0
 src/{pkg => }/syscall/mksysnum_plan9.sh             |   0
 src/{pkg => }/syscall/mmap_unix_test.go             |   0
 src/{pkg => }/syscall/net_nacl.go                   |   0
 src/{pkg => }/syscall/netlink_linux.go              |   0
 src/{pkg => }/syscall/race.go                       |   0
 src/{pkg => }/syscall/race0.go                      |   0
 src/{pkg => }/syscall/route_bsd.go                  |   0
 src/{pkg => }/syscall/route_darwin.go               |   0
 src/{pkg => }/syscall/route_dragonfly.go            |   0
 src/{pkg => }/syscall/route_freebsd.go              |   0
 src/{pkg => }/syscall/route_freebsd_32bit.go        |   0
 src/{pkg => }/syscall/route_freebsd_64bit.go        |   0
 src/{pkg => }/syscall/route_netbsd.go               |   0
 src/{pkg => }/syscall/route_openbsd.go              |   0
 src/{pkg => }/syscall/security_windows.go           |   0
 src/{pkg => }/syscall/so_solaris.go                 |   0
 src/{pkg => }/syscall/sockcmsg_linux.go             |   0
 src/{pkg => }/syscall/sockcmsg_unix.go              |   0
 src/{pkg => }/syscall/srpc_nacl.go                  |   0
 src/{pkg => }/syscall/str.go                        |   0
 src/{pkg => }/syscall/syscall.go                    |   0
 src/{pkg => }/syscall/syscall_bsd.go                |   0
 src/{pkg => }/syscall/syscall_bsd_test.go           |   0
 src/{pkg => }/syscall/syscall_darwin.go             |   0
 src/{pkg => }/syscall/syscall_darwin_386.go         |   0
 src/{pkg => }/syscall/syscall_darwin_amd64.go       |   0
 src/{pkg => }/syscall/syscall_dragonfly.go          |   0
 src/{pkg => }/syscall/syscall_dragonfly_386.go      |   0
 src/{pkg => }/syscall/syscall_dragonfly_amd64.go    |   0
 src/{pkg => }/syscall/syscall_freebsd.go            |   0
 src/{pkg => }/syscall/syscall_freebsd_386.go        |   0
 src/{pkg => }/syscall/syscall_freebsd_amd64.go      |   0
 src/{pkg => }/syscall/syscall_freebsd_arm.go        |   0
 src/{pkg => }/syscall/syscall_linux.go              |   0
 src/{pkg => }/syscall/syscall_linux_386.go          |   0
 src/{pkg => }/syscall/syscall_linux_amd64.go        |   0
 src/{pkg => }/syscall/syscall_linux_arm.go          |   0
 src/{pkg => }/syscall/syscall_nacl.go               |   0
 src/{pkg => }/syscall/syscall_nacl_386.go           |   0
 src/{pkg => }/syscall/syscall_nacl_amd64p32.go      |   0
 src/{pkg => }/syscall/syscall_nacl_arm.go           |   0
 src/{pkg => }/syscall/syscall_netbsd.go             |   0
 src/{pkg => }/syscall/syscall_netbsd_386.go         |   0
 src/{pkg => }/syscall/syscall_netbsd_amd64.go       |   0
 src/{pkg => }/syscall/syscall_netbsd_arm.go         |   0
 src/{pkg => }/syscall/syscall_no_getwd.go           |   0
 src/{pkg => }/syscall/syscall_openbsd.go            |   0
 src/{pkg => }/syscall/syscall_openbsd_386.go        |   0
 src/{pkg => }/syscall/syscall_openbsd_amd64.go      |   0
 src/{pkg => }/syscall/syscall_plan9.go              |   0
 src/{pkg => }/syscall/syscall_solaris.go            |   0
 src/{pkg => }/syscall/syscall_solaris_amd64.go      |   0
 src/{pkg => }/syscall/syscall_test.go               |   0
 src/{pkg => }/syscall/syscall_unix.go               |   0
 src/{pkg => }/syscall/syscall_unix_test.go          |   0
 src/{pkg => }/syscall/syscall_windows.go            |   0
 src/{pkg => }/syscall/syscall_windows_386.go        |   0
 src/{pkg => }/syscall/syscall_windows_amd64.go      |   0
 src/{pkg => }/syscall/syscall_windows_test.go       |   0
 src/{pkg => }/syscall/tables_nacl.go                |   0
 src/{pkg => }/syscall/time_nacl_386.s               |   0
 src/{pkg => }/syscall/time_nacl_amd64p32.s          |   0
 src/{pkg => }/syscall/time_nacl_arm.s               |   0
 src/{pkg => }/syscall/types_darwin.go               |   0
 src/{pkg => }/syscall/types_dragonfly.go            |   0
 src/{pkg => }/syscall/types_freebsd.go              |   0
 src/{pkg => }/syscall/types_linux.go                |   0
 src/{pkg => }/syscall/types_netbsd.go               |   0
 src/{pkg => }/syscall/types_openbsd.go              |   0
 src/{pkg => }/syscall/types_plan9.c                 |   0
 src/{pkg => }/syscall/types_solaris.go              |   0
 src/{pkg => }/syscall/unzip_nacl.go                 |   0
 src/{pkg => }/syscall/zerrors_darwin_386.go         |   0
 src/{pkg => }/syscall/zerrors_darwin_amd64.go       |   0
 src/{pkg => }/syscall/zerrors_dragonfly_386.go      |   0
 src/{pkg => }/syscall/zerrors_dragonfly_amd64.go    |   0
 src/{pkg => }/syscall/zerrors_freebsd_386.go        |   0
 src/{pkg => }/syscall/zerrors_freebsd_amd64.go      |   0
 src/{pkg => }/syscall/zerrors_freebsd_arm.go        |   0
 src/{pkg => }/syscall/zerrors_linux_386.go          |   0
 src/{pkg => }/syscall/zerrors_linux_amd64.go        |   0
 src/{pkg => }/syscall/zerrors_linux_arm.go          |   0
 src/{pkg => }/syscall/zerrors_netbsd_386.go         |   0
 src/{pkg => }/syscall/zerrors_netbsd_amd64.go       |   0
 src/{pkg => }/syscall/zerrors_netbsd_arm.go         |   0
 src/{pkg => }/syscall/zerrors_openbsd_386.go        |   0
 src/{pkg => }/syscall/zerrors_openbsd_amd64.go      |   0
 src/{pkg => }/syscall/zerrors_plan9_386.go          |   0
 src/{pkg => }/syscall/zerrors_plan9_amd64.go        |   0
 src/{pkg => }/syscall/zerrors_solaris_amd64.go      |   0
 src/{pkg => }/syscall/zerrors_windows.go            |   0
 src/{pkg => }/syscall/zerrors_windows_386.go        |   0
 src/{pkg => }/syscall/zerrors_windows_amd64.go      |   0
 src/{pkg => }/syscall/zsyscall_darwin_386.go        |   0
 src/{pkg => }/syscall/zsyscall_darwin_amd64.go      |   0
 src/{pkg => }/syscall/zsyscall_dragonfly_386.go     |   0
 src/{pkg => }/syscall/zsyscall_dragonfly_amd64.go   |   0
 src/{pkg => }/syscall/zsyscall_freebsd_386.go       |   0
 src/{pkg => }/syscall/zsyscall_freebsd_amd64.go     |   0
 src/{pkg => }/syscall/zsyscall_freebsd_arm.go       |   0
 src/{pkg => }/syscall/zsyscall_linux_386.go         |   0
 src/{pkg => }/syscall/zsyscall_linux_amd64.go       |   0
 src/{pkg => }/syscall/zsyscall_linux_arm.go         |   0
 src/{pkg => }/syscall/zsyscall_nacl_386.go          |   0
 src/{pkg => }/syscall/zsyscall_nacl_amd64p32.go     |   0
 src/{pkg => }/syscall/zsyscall_nacl_arm.go          |   0
 src/{pkg => }/syscall/zsyscall_netbsd_386.go        |   0
 src/{pkg => }/syscall/zsyscall_netbsd_amd64.go      |   0
 src/{pkg => }/syscall/zsyscall_netbsd_arm.go        |   0
 src/{pkg => }/syscall/zsyscall_openbsd_386.go       |   0
 src/{pkg => }/syscall/zsyscall_openbsd_amd64.go     |   0
 src/{pkg => }/syscall/zsyscall_plan9_386.go         |   0
 src/{pkg => }/syscall/zsyscall_plan9_amd64.go       |   0
 src/{pkg => }/syscall/zsyscall_solaris_amd64.go     |   0
 src/{pkg => }/syscall/zsyscall_windows.go           |   0
 src/{pkg => }/syscall/zsysctl_openbsd.go            |   0
 src/{pkg => }/syscall/zsysnum_darwin_386.go         |   0
 src/{pkg => }/syscall/zsysnum_darwin_amd64.go       |   0
 src/{pkg => }/syscall/zsysnum_dragonfly_386.go      |   0
 src/{pkg => }/syscall/zsysnum_dragonfly_amd64.go    |   0
 src/{pkg => }/syscall/zsysnum_freebsd_386.go        |   0
 src/{pkg => }/syscall/zsysnum_freebsd_amd64.go      |   0
 src/{pkg => }/syscall/zsysnum_freebsd_arm.go        |   0
 src/{pkg => }/syscall/zsysnum_linux_386.go          |   0
 src/{pkg => }/syscall/zsysnum_linux_amd64.go        |   0
 src/{pkg => }/syscall/zsysnum_linux_arm.go          |   0
 src/{pkg => }/syscall/zsysnum_netbsd_386.go         |   0
 src/{pkg => }/syscall/zsysnum_netbsd_amd64.go       |   0
 src/{pkg => }/syscall/zsysnum_netbsd_arm.go         |   0
 src/{pkg => }/syscall/zsysnum_openbsd_386.go        |   0
 src/{pkg => }/syscall/zsysnum_openbsd_amd64.go      |   0
 src/{pkg => }/syscall/zsysnum_plan9_386.go          |   0
 src/{pkg => }/syscall/zsysnum_plan9_amd64.go        |   0
 src/{pkg => }/syscall/zsysnum_solaris_amd64.go      |   0
 src/{pkg => }/syscall/zsysnum_windows_386.go        |   0
 src/{pkg => }/syscall/zsysnum_windows_amd64.go      |   0
 src/{pkg => }/syscall/ztypes_darwin_386.go          |   0
 src/{pkg => }/syscall/ztypes_darwin_amd64.go        |   0
 src/{pkg => }/syscall/ztypes_dragonfly_386.go       |   0
 src/{pkg => }/syscall/ztypes_dragonfly_amd64.go     |   0
 src/{pkg => }/syscall/ztypes_freebsd_386.go         |   0
 src/{pkg => }/syscall/ztypes_freebsd_amd64.go       |   0
 src/{pkg => }/syscall/ztypes_freebsd_arm.go         |   0
 src/{pkg => }/syscall/ztypes_linux_386.go           |   0
 src/{pkg => }/syscall/ztypes_linux_amd64.go         |   0
 src/{pkg => }/syscall/ztypes_linux_arm.go           |   0
 src/{pkg => }/syscall/ztypes_netbsd_386.go          |   0
 src/{pkg => }/syscall/ztypes_netbsd_amd64.go        |   0
 src/{pkg => }/syscall/ztypes_netbsd_arm.go          |   0
 src/{pkg => }/syscall/ztypes_openbsd_386.go         |   0
 src/{pkg => }/syscall/ztypes_openbsd_amd64.go       |   0
 src/{pkg => }/syscall/ztypes_plan9_386.go           |   0
 src/{pkg => }/syscall/ztypes_plan9_amd64.go         |   0
 src/{pkg => }/syscall/ztypes_solaris_amd64.go       |   0
 src/{pkg => }/syscall/ztypes_windows.go             |   0
 src/{pkg => }/syscall/ztypes_windows_386.go         |   0
 src/{pkg => }/syscall/ztypes_windows_amd64.go       |   0
 src/{pkg => }/testing/allocs.go                     |   0
 src/{pkg => }/testing/benchmark.go                  |   0
 src/{pkg => }/testing/benchmark_test.go             |   0
 src/{pkg => }/testing/cover.go                      |   0
 src/{pkg => }/testing/example.go                    |   0
 src/{pkg => }/testing/export_test.go                |   0
 src/{pkg => }/testing/iotest/logger.go              |   0
 src/{pkg => }/testing/iotest/reader.go              |   0
 src/{pkg => }/testing/iotest/writer.go              |   0
 src/{pkg => }/testing/quick/quick.go                |   0
 src/{pkg => }/testing/quick/quick_test.go           |   0
 src/{pkg => }/testing/testing.go                    |   0
 src/{pkg => }/text/scanner/scanner.go               |   0
 src/{pkg => }/text/scanner/scanner_test.go          |   0
 src/{pkg => }/text/tabwriter/example_test.go        |   0
 src/{pkg => }/text/tabwriter/tabwriter.go           |   0
 src/{pkg => }/text/tabwriter/tabwriter_test.go      |   0
 src/{pkg => }/text/template/doc.go                  |   0
 src/{pkg => }/text/template/example_test.go         |   0
 src/{pkg => }/text/template/examplefiles_test.go    |   0
 src/{pkg => }/text/template/examplefunc_test.go     |   0
 src/{pkg => }/text/template/exec.go                 |   0
 src/{pkg => }/text/template/exec_test.go            |   0
 src/{pkg => }/text/template/funcs.go                |   0
 src/{pkg => }/text/template/helper.go               |   0
 src/{pkg => }/text/template/multi_test.go           |   0
 src/{pkg => }/text/template/parse/lex.go            |   0
 src/{pkg => }/text/template/parse/lex_test.go       |   0
 src/{pkg => }/text/template/parse/node.go           |   0
 src/{pkg => }/text/template/parse/parse.go          |   0
 src/{pkg => }/text/template/parse/parse_test.go     |   0
 src/{pkg => }/text/template/template.go             |   0
 src/{pkg => }/text/template/testdata/file1.tmpl     |   0
 src/{pkg => }/text/template/testdata/file2.tmpl     |   0
 src/{pkg => }/text/template/testdata/tmpl1.tmpl     |   0
 src/{pkg => }/text/template/testdata/tmpl2.tmpl     |   0
 src/{pkg => }/time/example_test.go                  |   0
 src/{pkg => }/time/export_test.go                   |   0
 src/{pkg => }/time/export_windows_test.go           |   0
 src/{pkg => }/time/format.go                        |   0
 src/{pkg => }/time/format_test.go                   |   0
 src/{pkg => }/time/genzabbrs.go                     |   0
 src/{pkg => }/time/internal_test.go                 |   0
 src/{pkg => }/time/sleep.go                         |   0
 src/{pkg => }/time/sleep_test.go                    |   0
 src/{pkg => }/time/sys_plan9.go                     |   0
 src/{pkg => }/time/sys_unix.go                      |   0
 src/{pkg => }/time/sys_windows.go                   |   0
 src/{pkg => }/time/tick.go                          |   0
 src/{pkg => }/time/tick_test.go                     |   0
 src/{pkg => }/time/time.go                          |   0
 src/{pkg => }/time/time_test.go                     |   0
 src/{pkg => }/time/zoneinfo.go                      |   0
 src/{pkg => }/time/zoneinfo_abbrs_windows.go        |   0
 src/{pkg => }/time/zoneinfo_plan9.go                |   0
 src/{pkg => }/time/zoneinfo_read.go                 |   0
 src/{pkg => }/time/zoneinfo_test.go                 |   0
 src/{pkg => }/time/zoneinfo_unix.go                 |   0
 src/{pkg => }/time/zoneinfo_windows.go              |   0
 src/{pkg => }/time/zoneinfo_windows_test.go         |   0
 src/{pkg => }/unicode/casetables.go                 |   0
 src/{pkg => }/unicode/digit.go                      |   0
 src/{pkg => }/unicode/digit_test.go                 |   0
 src/{pkg => }/unicode/graphic.go                    |   0
 src/{pkg => }/unicode/graphic_test.go               |   0
 src/{pkg => }/unicode/letter.go                     |   0
 src/{pkg => }/unicode/letter_test.go                |   0
 src/{pkg => }/unicode/maketables.go                 |   0
 src/{pkg => }/unicode/script_test.go                |   0
 src/{pkg => }/unicode/tables.go                     |   0
 src/{pkg => }/unicode/utf16/export_test.go          |   0
 src/{pkg => }/unicode/utf16/utf16.go                |   0
 src/{pkg => }/unicode/utf16/utf16_test.go           |   0
 src/{pkg => }/unicode/utf8/example_test.go          |   0
 src/{pkg => }/unicode/utf8/utf8.go                  |   0
 src/{pkg => }/unicode/utf8/utf8_test.go             |   0
 src/{pkg => }/unsafe/unsafe.go                      |   0
 2097 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{pkg => }/archive/tar/common.go (100%)
 rename src/{pkg => }/archive/tar/example_test.go (100%)
 rename src/{pkg => }/archive/tar/reader.go (100%)
 rename src/{pkg => }/archive/tar/reader_test.go (100%)
 rename src/{pkg => }/archive/tar/stat_atim.go (100%)
 rename src/{pkg => }/archive/tar/stat_atimespec.go (100%)
 rename src/{pkg => }/archive/tar/stat_unix.go (100%)
 rename src/{pkg => }/archive/tar/tar_test.go (100%)
 rename src/{pkg => }/archive/tar/testdata/gnu.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/nil-uid.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/pax.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/small.txt (100%)
 rename src/{pkg => }/archive/tar/testdata/small2.txt (100%)
 rename src/{pkg => }/archive/tar/testdata/sparse-formats.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/star.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/ustar.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/v7.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/writer-big-long.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/writer-big.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/writer.tar (100%)
 rename src/{pkg => }/archive/tar/testdata/xattrs.tar (100%)
 rename src/{pkg => }/archive/tar/writer.go (100%)
 rename src/{pkg => }/archive/tar/writer_test.go (100%)
 rename src/{pkg => }/archive/zip/example_test.go (100%)
 rename src/{pkg => }/archive/zip/reader.go (100%)
 rename src/{pkg => }/archive/zip/reader_test.go (100%)
 rename src/{pkg => }/archive/zip/register.go (100%)
 rename src/{pkg => }/archive/zip/struct.go (100%)
 rename src/{pkg => }/archive/zip/testdata/crc32-not-streamed.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/dd.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/go-no-datadesc-sig.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/go-with-datadesc-sig.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/gophercolor16x16.png (100%)
 rename src/{pkg => }/archive/zip/testdata/readme.notzip (100%)
 rename src/{pkg => }/archive/zip/testdata/readme.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/symlink.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/test-trailing-junk.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/test.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/unix.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/winxp.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/zip64-2.zip (100%)
 rename src/{pkg => }/archive/zip/testdata/zip64.zip (100%)
 rename src/{pkg => }/archive/zip/writer.go (100%)
 rename src/{pkg => }/archive/zip/writer_test.go (100%)
 rename src/{pkg => }/archive/zip/zip_test.go (100%)
 rename src/{pkg => }/bufio/bufio.go (100%)
 rename src/{pkg => }/bufio/bufio_test.go (100%)
 rename src/{pkg => }/bufio/example_test.go (100%)
 rename src/{pkg => }/bufio/export_test.go (100%)
 rename src/{pkg => }/bufio/scan.go (100%)
 rename src/{pkg => }/bufio/scan_test.go (100%)
 rename src/{pkg => }/builtin/builtin.go (100%)
 rename src/{pkg => }/bytes/buffer.go (100%)
 rename src/{pkg => }/bytes/buffer_test.go (100%)
 rename src/{pkg => }/bytes/bytes.go (100%)
 rename src/{pkg => }/bytes/bytes.s (100%)
 rename src/{pkg => }/bytes/bytes_decl.go (100%)
 rename src/{pkg => }/bytes/bytes_test.go (100%)
 rename src/{pkg => }/bytes/compare_test.go (100%)
 rename src/{pkg => }/bytes/equal_test.go (100%)
 rename src/{pkg => }/bytes/example_test.go (100%)
 rename src/{pkg => }/bytes/export_test.go (100%)
 rename src/{pkg => }/bytes/reader.go (100%)
 rename src/{pkg => }/bytes/reader_test.go (100%)
 rename src/{pkg => }/compress/bzip2/bit_reader.go (100%)
 rename src/{pkg => }/compress/bzip2/bzip2.go (100%)
 rename src/{pkg => }/compress/bzip2/bzip2_test.go (100%)
 rename src/{pkg => }/compress/bzip2/huffman.go (100%)
 rename src/{pkg => }/compress/bzip2/move_to_front.go (100%)
 rename src/{pkg => }/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2 (100%)
 rename src/{pkg => }/compress/bzip2/testdata/e.txt.bz2 (100%)
 rename src/{pkg => }/compress/flate/copy.go (100%)
 rename src/{pkg => }/compress/flate/copy_test.go (100%)
 rename src/{pkg => }/compress/flate/deflate.go (100%)
 rename src/{pkg => }/compress/flate/deflate_test.go (100%)
 rename src/{pkg => }/compress/flate/fixedhuff.go (100%)
 rename src/{pkg => }/compress/flate/flate_test.go (100%)
 rename src/{pkg => }/compress/flate/gen.go (100%)
 rename src/{pkg => }/compress/flate/huffman_bit_writer.go (100%)
 rename src/{pkg => }/compress/flate/huffman_code.go (100%)
 rename src/{pkg => }/compress/flate/inflate.go (100%)
 rename src/{pkg => }/compress/flate/reader_test.go (100%)
 rename src/{pkg => }/compress/flate/reverse_bits.go (100%)
 rename src/{pkg => }/compress/flate/token.go (100%)
 rename src/{pkg => }/compress/flate/writer_test.go (100%)
 rename src/{pkg => }/compress/gzip/gunzip.go (100%)
 rename src/{pkg => }/compress/gzip/gunzip_test.go (100%)
 rename src/{pkg => }/compress/gzip/gzip.go (100%)
 rename src/{pkg => }/compress/gzip/gzip_test.go (100%)
 rename src/{pkg => }/compress/gzip/testdata/issue6550.gz (100%)
 rename src/{pkg => }/compress/lzw/reader.go (100%)
 rename src/{pkg => }/compress/lzw/reader_test.go (100%)
 rename src/{pkg => }/compress/lzw/writer.go (100%)
 rename src/{pkg => }/compress/lzw/writer_test.go (100%)
 rename src/{pkg => }/compress/testdata/Mark.Twain-Tom.Sawyer.txt (100%)
 rename src/{pkg => }/compress/testdata/e.txt (100%)
 rename src/{pkg => }/compress/testdata/pi.txt (100%)
 rename src/{pkg => }/compress/zlib/example_test.go (100%)
 rename src/{pkg => }/compress/zlib/reader.go (100%)
 rename src/{pkg => }/compress/zlib/reader_test.go (100%)
 rename src/{pkg => }/compress/zlib/writer.go (100%)
 rename src/{pkg => }/compress/zlib/writer_test.go (100%)
 rename src/{pkg => }/container/heap/example_intheap_test.go (100%)
 rename src/{pkg => }/container/heap/example_pq_test.go (100%)
 rename src/{pkg => }/container/heap/heap.go (100%)
 rename src/{pkg => }/container/heap/heap_test.go (100%)
 rename src/{pkg => }/container/list/example_test.go (100%)
 rename src/{pkg => }/container/list/list.go (100%)
 rename src/{pkg => }/container/list/list_test.go (100%)
 rename src/{pkg => }/container/ring/ring.go (100%)
 rename src/{pkg => }/container/ring/ring_test.go (100%)
 rename src/{pkg => }/crypto/aes/aes_test.go (100%)
 rename src/{pkg => }/crypto/aes/asm_amd64.s (100%)
 rename src/{pkg => }/crypto/aes/block.go (100%)
 rename src/{pkg => }/crypto/aes/cipher.go (100%)
 rename src/{pkg => }/crypto/aes/cipher_asm.go (100%)
 rename src/{pkg => }/crypto/aes/cipher_generic.go (100%)
 rename src/{pkg => }/crypto/aes/const.go (100%)
 rename src/{pkg => }/crypto/cipher/benchmark_test.go (100%)
 rename src/{pkg => }/crypto/cipher/cbc.go (100%)
 rename src/{pkg => }/crypto/cipher/cbc_aes_test.go (100%)
 rename src/{pkg => }/crypto/cipher/cfb.go (100%)
 rename src/{pkg => }/crypto/cipher/cfb_test.go (100%)
 rename src/{pkg => }/crypto/cipher/cipher.go (100%)
 rename src/{pkg => }/crypto/cipher/cipher_test.go (100%)
 rename src/{pkg => }/crypto/cipher/common_test.go (100%)
 rename src/{pkg => }/crypto/cipher/ctr.go (100%)
 rename src/{pkg => }/crypto/cipher/ctr_aes_test.go (100%)
 rename src/{pkg => }/crypto/cipher/example_test.go (100%)
 rename src/{pkg => }/crypto/cipher/gcm.go (100%)
 rename src/{pkg => }/crypto/cipher/gcm_test.go (100%)
 rename src/{pkg => }/crypto/cipher/io.go (100%)
 rename src/{pkg => }/crypto/cipher/ofb.go (100%)
 rename src/{pkg => }/crypto/cipher/ofb_test.go (100%)
 rename src/{pkg => }/crypto/cipher/xor.go (100%)
 rename src/{pkg => }/crypto/cipher/xor_test.go (100%)
 rename src/{pkg => }/crypto/crypto.go (100%)
 rename src/{pkg => }/crypto/des/block.go (100%)
 rename src/{pkg => }/crypto/des/cipher.go (100%)
 rename src/{pkg => }/crypto/des/const.go (100%)
 rename src/{pkg => }/crypto/des/des_test.go (100%)
 rename src/{pkg => }/crypto/des/example_test.go (100%)
 rename src/{pkg => }/crypto/dsa/dsa.go (100%)
 rename src/{pkg => }/crypto/dsa/dsa_test.go (100%)
 rename src/{pkg => }/crypto/ecdsa/ecdsa.go (100%)
 rename src/{pkg => }/crypto/ecdsa/ecdsa_test.go (100%)
 rename src/{pkg => }/crypto/ecdsa/testdata/SigVer.rsp.bz2 (100%)
 rename src/{pkg => }/crypto/elliptic/elliptic.go (100%)
 rename src/{pkg => }/crypto/elliptic/elliptic_test.go (100%)
 rename src/{pkg => }/crypto/elliptic/p224.go (100%)
 rename src/{pkg => }/crypto/elliptic/p224_test.go (100%)
 rename src/{pkg => }/crypto/elliptic/p256.go (100%)
 rename src/{pkg => }/crypto/hmac/hmac.go (100%)
 rename src/{pkg => }/crypto/hmac/hmac_test.go (100%)
 rename src/{pkg => }/crypto/md5/example_test.go (100%)
 rename src/{pkg => }/crypto/md5/gen.go (100%)
 rename src/{pkg => }/crypto/md5/md5.go (100%)
 rename src/{pkg => }/crypto/md5/md5_test.go (100%)
 rename src/{pkg => }/crypto/md5/md5block.go (100%)
 rename src/{pkg => }/crypto/md5/md5block_386.s (100%)
 rename src/{pkg => }/crypto/md5/md5block_amd64.s (100%)
 rename src/{pkg => }/crypto/md5/md5block_amd64p32.s (100%)
 rename src/{pkg => }/crypto/md5/md5block_arm.s (100%)
 rename src/{pkg => }/crypto/md5/md5block_decl.go (100%)
 rename src/{pkg => }/crypto/md5/md5block_generic.go (100%)
 rename src/{pkg => }/crypto/rand/example_test.go (100%)
 rename src/{pkg => }/crypto/rand/rand.go (100%)
 rename src/{pkg => }/crypto/rand/rand_linux.go (100%)
 rename src/{pkg => }/crypto/rand/rand_test.go (100%)
 rename src/{pkg => }/crypto/rand/rand_unix.go (100%)
 rename src/{pkg => }/crypto/rand/rand_windows.go (100%)
 rename src/{pkg => }/crypto/rand/util.go (100%)
 rename src/{pkg => }/crypto/rand/util_test.go (100%)
 rename src/{pkg => }/crypto/rc4/rc4.go (100%)
 rename src/{pkg => }/crypto/rc4/rc4_386.s (100%)
 rename src/{pkg => }/crypto/rc4/rc4_amd64.s (100%)
 rename src/{pkg => }/crypto/rc4/rc4_amd64p32.s (100%)
 rename src/{pkg => }/crypto/rc4/rc4_arm.s (100%)
 rename src/{pkg => }/crypto/rc4/rc4_asm.go (100%)
 rename src/{pkg => }/crypto/rc4/rc4_ref.go (100%)
 rename src/{pkg => }/crypto/rc4/rc4_test.go (100%)
 rename src/{pkg => }/crypto/rsa/pkcs1v15.go (100%)
 rename src/{pkg => }/crypto/rsa/pkcs1v15_test.go (100%)
 rename src/{pkg => }/crypto/rsa/pss.go (100%)
 rename src/{pkg => }/crypto/rsa/pss_test.go (100%)
 rename src/{pkg => }/crypto/rsa/rsa.go (100%)
 rename src/{pkg => }/crypto/rsa/rsa_test.go (100%)
 rename src/{pkg => }/crypto/rsa/testdata/pss-vect.txt.bz2 (100%)
 rename src/{pkg => }/crypto/sha1/example_test.go (100%)
 rename src/{pkg => }/crypto/sha1/sha1.go (100%)
 rename src/{pkg => }/crypto/sha1/sha1_test.go (100%)
 rename src/{pkg => }/crypto/sha1/sha1block.go (100%)
 rename src/{pkg => }/crypto/sha1/sha1block_386.s (100%)
 rename src/{pkg => }/crypto/sha1/sha1block_amd64.s (100%)
 rename src/{pkg => }/crypto/sha1/sha1block_amd64p32.s (100%)
 rename src/{pkg => }/crypto/sha1/sha1block_arm.s (100%)
 rename src/{pkg => }/crypto/sha1/sha1block_decl.go (100%)
 rename src/{pkg => }/crypto/sha1/sha1block_generic.go (100%)
 rename src/{pkg => }/crypto/sha256/sha256.go (100%)
 rename src/{pkg => }/crypto/sha256/sha256_test.go (100%)
 rename src/{pkg => }/crypto/sha256/sha256block.go (100%)
 rename src/{pkg => }/crypto/sha256/sha256block_386.s (100%)
 rename src/{pkg => }/crypto/sha256/sha256block_amd64.s (100%)
 rename src/{pkg => }/crypto/sha256/sha256block_decl.go (100%)
 rename src/{pkg => }/crypto/sha512/sha512.go (100%)
 rename src/{pkg => }/crypto/sha512/sha512_test.go (100%)
 rename src/{pkg => }/crypto/sha512/sha512block.go (100%)
 rename src/{pkg => }/crypto/sha512/sha512block_amd64.s (100%)
 rename src/{pkg => }/crypto/sha512/sha512block_decl.go (100%)
 rename src/{pkg => }/crypto/subtle/constant_time.go (100%)
 rename src/{pkg => }/crypto/subtle/constant_time_test.go (100%)
 rename src/{pkg => }/crypto/tls/alert.go (100%)
 rename src/{pkg => }/crypto/tls/cipher_suites.go (100%)
 rename src/{pkg => }/crypto/tls/common.go (100%)
 rename src/{pkg => }/crypto/tls/conn.go (100%)
 rename src/{pkg => }/crypto/tls/conn_test.go (100%)
 rename src/{pkg => }/crypto/tls/example_test.go (100%)
 rename src/{pkg => }/crypto/tls/generate_cert.go (100%)
 rename src/{pkg => }/crypto/tls/handshake_client.go (100%)
 rename src/{pkg => }/crypto/tls/handshake_client_test.go (100%)
 rename src/{pkg => }/crypto/tls/handshake_messages.go (100%)
 rename src/{pkg => }/crypto/tls/handshake_messages_test.go (100%)
 rename src/{pkg => }/crypto/tls/handshake_server.go (100%)
 rename src/{pkg => }/crypto/tls/handshake_server_test.go (100%)
 rename src/{pkg => }/crypto/tls/handshake_test.go (100%)
 rename src/{pkg => }/crypto/tls/key_agreement.go (100%)
 rename src/{pkg => }/crypto/tls/prf.go (100%)
 rename src/{pkg => }/crypto/tls/prf_test.go (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv10-RSA-RC4 (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv11-RSA-RC4 (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ALPN (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Client-TLSv12-RSA-RC4 (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-SSLv3-RSA-3DES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-SSLv3-RSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-SSLv3-RSA-RC4 (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv10-RSA-3DES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv10-RSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv10-RSA-RC4 (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv11-RSA-RC4 (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-ALPN (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-IssueTicket (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-RSA-3DES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-RSA-AES (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-RSA-RC4 (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-Resume (100%)
 rename src/{pkg => }/crypto/tls/testdata/Server-TLSv12-SNI (100%)
 rename src/{pkg => }/crypto/tls/ticket.go (100%)
 rename src/{pkg => }/crypto/tls/tls.go (100%)
 rename src/{pkg => }/crypto/tls/tls_test.go (100%)
 rename src/{pkg => }/crypto/x509/cert_pool.go (100%)
 rename src/{pkg => }/crypto/x509/example_test.go (100%)
 rename src/{pkg => }/crypto/x509/pem_decrypt.go (100%)
 rename src/{pkg => }/crypto/x509/pem_decrypt_test.go (100%)
 rename src/{pkg => }/crypto/x509/pkcs1.go (100%)
 rename src/{pkg => }/crypto/x509/pkcs8.go (100%)
 rename src/{pkg => }/crypto/x509/pkcs8_test.go (100%)
 rename src/{pkg => }/crypto/x509/pkix/pkix.go (100%)
 rename src/{pkg => }/crypto/x509/root.go (100%)
 rename src/{pkg => }/crypto/x509/root_cgo_darwin.go (100%)
 rename src/{pkg => }/crypto/x509/root_darwin.go (100%)
 rename src/{pkg => }/crypto/x509/root_darwin_test.go (100%)
 rename src/{pkg => }/crypto/x509/root_nocgo_darwin.go (100%)
 rename src/{pkg => }/crypto/x509/root_plan9.go (100%)
 rename src/{pkg => }/crypto/x509/root_unix.go (100%)
 rename src/{pkg => }/crypto/x509/root_windows.go (100%)
 rename src/{pkg => }/crypto/x509/sec1.go (100%)
 rename src/{pkg => }/crypto/x509/sec1_test.go (100%)
 rename src/{pkg => }/crypto/x509/verify.go (100%)
 rename src/{pkg => }/crypto/x509/verify_test.go (100%)
 rename src/{pkg => }/crypto/x509/x509.go (100%)
 rename src/{pkg => }/crypto/x509/x509_test.go (100%)
 rename src/{pkg => }/crypto/x509/x509_test_import.go (100%)
 rename src/{pkg => }/database/sql/convert.go (100%)
 rename src/{pkg => }/database/sql/convert_test.go (100%)
 rename src/{pkg => }/database/sql/doc.txt (100%)
 rename src/{pkg => }/database/sql/driver/driver.go (100%)
 rename src/{pkg => }/database/sql/driver/types.go (100%)
 rename src/{pkg => }/database/sql/driver/types_test.go (100%)
 rename src/{pkg => }/database/sql/example_test.go (100%)
 rename src/{pkg => }/database/sql/fakedb_test.go (100%)
 rename src/{pkg => }/database/sql/sql.go (100%)
 rename src/{pkg => }/database/sql/sql_test.go (100%)
 rename src/{pkg => }/debug/dwarf/buf.go (100%)
 rename src/{pkg => }/debug/dwarf/const.go (100%)
 rename src/{pkg => }/debug/dwarf/entry.go (100%)
 rename src/{pkg => }/debug/dwarf/open.go (100%)
 rename src/{pkg => }/debug/dwarf/testdata/typedef.c (100%)
 rename src/{pkg => }/debug/dwarf/testdata/typedef.elf (100%)
 rename src/{pkg => }/debug/dwarf/testdata/typedef.elf4 (100%)
 rename src/{pkg => }/debug/dwarf/testdata/typedef.macho (100%)
 rename src/{pkg => }/debug/dwarf/type.go (100%)
 rename src/{pkg => }/debug/dwarf/type_test.go (100%)
 rename src/{pkg => }/debug/dwarf/typeunit.go (100%)
 rename src/{pkg => }/debug/dwarf/unit.go (100%)
 rename src/{pkg => }/debug/elf/elf.go (100%)
 rename src/{pkg => }/debug/elf/elf_test.go (100%)
 rename src/{pkg => }/debug/elf/file.go (100%)
 rename src/{pkg => }/debug/elf/file_test.go (100%)
 rename src/{pkg => }/debug/elf/symbols_test.go (100%)
 rename src/{pkg => }/debug/elf/testdata/gcc-386-freebsd-exec (100%)
 rename src/{pkg => }/debug/elf/testdata/gcc-amd64-linux-exec (100%)
 rename src/{pkg => }/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj (100%)
 rename src/{pkg => }/debug/elf/testdata/go-relocation-test-clang-x86.obj (100%)
 rename src/{pkg => }/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj (100%)
 rename src/{pkg => }/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj (100%)
 rename src/{pkg => }/debug/elf/testdata/go-relocation-test-gcc441-x86.obj (100%)
 rename src/{pkg => }/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj (100%)
 rename src/{pkg => }/debug/elf/testdata/hello-world-core.gz (100%)
 rename src/{pkg => }/debug/elf/testdata/hello.c (100%)
 rename src/{pkg => }/debug/goobj/read.go (100%)
 rename src/{pkg => }/debug/goobj/read_test.go (100%)
 rename src/{pkg => }/debug/gosym/pclinetest.asm (100%)
 rename src/{pkg => }/debug/gosym/pclinetest.h (100%)
 rename src/{pkg => }/debug/gosym/pclntab.go (100%)
 rename src/{pkg => }/debug/gosym/pclntab_test.go (100%)
 rename src/{pkg => }/debug/gosym/symtab.go (100%)
 rename src/{pkg => }/debug/macho/fat.go (100%)
 rename src/{pkg => }/debug/macho/file.go (100%)
 rename src/{pkg => }/debug/macho/file_test.go (100%)
 rename src/{pkg => }/debug/macho/macho.go (100%)
 rename src/{pkg => }/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec (100%)
 rename src/{pkg => }/debug/macho/testdata/gcc-386-darwin-exec (100%)
 rename src/{pkg => }/debug/macho/testdata/gcc-amd64-darwin-exec (100%)
 rename src/{pkg => }/debug/macho/testdata/gcc-amd64-darwin-exec-debug (100%)
 rename src/{pkg => }/debug/macho/testdata/hello.c (100%)
 rename src/{pkg => }/debug/pe/file.go (100%)
 rename src/{pkg => }/debug/pe/file_test.go (100%)
 rename src/{pkg => }/debug/pe/pe.go (100%)
 rename src/{pkg => }/debug/pe/testdata/gcc-386-mingw-exec (100%)
 rename src/{pkg => }/debug/pe/testdata/gcc-386-mingw-obj (100%)
 rename src/{pkg => }/debug/pe/testdata/gcc-amd64-mingw-exec (100%)
 rename src/{pkg => }/debug/pe/testdata/gcc-amd64-mingw-obj (100%)
 rename src/{pkg => }/debug/pe/testdata/hello.c (100%)
 rename src/{pkg => }/debug/plan9obj/file.go (100%)
 rename src/{pkg => }/debug/plan9obj/file_test.go (100%)
 rename src/{pkg => }/debug/plan9obj/plan9obj.go (100%)
 rename src/{pkg => }/debug/plan9obj/testdata/386-plan9-exec (100%)
 rename src/{pkg => }/debug/plan9obj/testdata/amd64-plan9-exec (100%)
 rename src/{pkg => }/debug/plan9obj/testdata/hello.c (100%)
 rename src/{pkg => }/encoding/ascii85/ascii85.go (100%)
 rename src/{pkg => }/encoding/ascii85/ascii85_test.go (100%)
 rename src/{pkg => }/encoding/asn1/asn1.go (100%)
 rename src/{pkg => }/encoding/asn1/asn1_test.go (100%)
 rename src/{pkg => }/encoding/asn1/common.go (100%)
 rename src/{pkg => }/encoding/asn1/marshal.go (100%)
 rename src/{pkg => }/encoding/asn1/marshal_test.go (100%)
 rename src/{pkg => }/encoding/base32/base32.go (100%)
 rename src/{pkg => }/encoding/base32/base32_test.go (100%)
 rename src/{pkg => }/encoding/base32/example_test.go (100%)
 rename src/{pkg => }/encoding/base64/base64.go (100%)
 rename src/{pkg => }/encoding/base64/base64_test.go (100%)
 rename src/{pkg => }/encoding/base64/example_test.go (100%)
 rename src/{pkg => }/encoding/binary/binary.go (100%)
 rename src/{pkg => }/encoding/binary/binary_test.go (100%)
 rename src/{pkg => }/encoding/binary/example_test.go (100%)
 rename src/{pkg => }/encoding/binary/varint.go (100%)
 rename src/{pkg => }/encoding/binary/varint_test.go (100%)
 rename src/{pkg => }/encoding/csv/reader.go (100%)
 rename src/{pkg => }/encoding/csv/reader_test.go (100%)
 rename src/{pkg => }/encoding/csv/writer.go (100%)
 rename src/{pkg => }/encoding/csv/writer_test.go (100%)
 rename src/{pkg => }/encoding/encoding.go (100%)
 rename src/{pkg => }/encoding/gob/codec_test.go (100%)
 rename src/{pkg => }/encoding/gob/debug.go (100%)
 rename src/{pkg => }/encoding/gob/decode.go (100%)
 rename src/{pkg => }/encoding/gob/decoder.go (100%)
 rename src/{pkg => }/encoding/gob/doc.go (100%)
 rename src/{pkg => }/encoding/gob/dump.go (100%)
 rename src/{pkg => }/encoding/gob/encode.go (100%)
 rename src/{pkg => }/encoding/gob/encoder.go (100%)
 rename src/{pkg => }/encoding/gob/encoder_test.go (100%)
 rename src/{pkg => }/encoding/gob/error.go (100%)
 rename src/{pkg => }/encoding/gob/example_encdec_test.go (100%)
 rename src/{pkg => }/encoding/gob/example_interface_test.go (100%)
 rename src/{pkg => }/encoding/gob/example_test.go (100%)
 rename src/{pkg => }/encoding/gob/gobencdec_test.go (100%)
 rename src/{pkg => }/encoding/gob/timing_test.go (100%)
 rename src/{pkg => }/encoding/gob/type.go (100%)
 rename src/{pkg => }/encoding/gob/type_test.go (100%)
 rename src/{pkg => }/encoding/hex/hex.go (100%)
 rename src/{pkg => }/encoding/hex/hex_test.go (100%)
 rename src/{pkg => }/encoding/json/bench_test.go (100%)
 rename src/{pkg => }/encoding/json/decode.go (100%)
 rename src/{pkg => }/encoding/json/decode_test.go (100%)
 rename src/{pkg => }/encoding/json/encode.go (100%)
 rename src/{pkg => }/encoding/json/encode_test.go (100%)
 rename src/{pkg => }/encoding/json/example_test.go (100%)
 rename src/{pkg => }/encoding/json/fold.go (100%)
 rename src/{pkg => }/encoding/json/fold_test.go (100%)
 rename src/{pkg => }/encoding/json/indent.go (100%)
 rename src/{pkg => }/encoding/json/scanner.go (100%)
 rename src/{pkg => }/encoding/json/scanner_test.go (100%)
 rename src/{pkg => }/encoding/json/stream.go (100%)
 rename src/{pkg => }/encoding/json/stream_test.go (100%)
 rename src/{pkg => }/encoding/json/tagkey_test.go (100%)
 rename src/{pkg => }/encoding/json/tags.go (100%)
 rename src/{pkg => }/encoding/json/tags_test.go (100%)
 rename src/{pkg => }/encoding/json/testdata/code.json.gz (100%)
 rename src/{pkg => }/encoding/pem/pem.go (100%)
 rename src/{pkg => }/encoding/pem/pem_test.go (100%)
 rename src/{pkg => }/encoding/xml/atom_test.go (100%)
 rename src/{pkg => }/encoding/xml/example_test.go (100%)
 rename src/{pkg => }/encoding/xml/marshal.go (100%)
 rename src/{pkg => }/encoding/xml/marshal_test.go (100%)
 rename src/{pkg => }/encoding/xml/read.go (100%)
 rename src/{pkg => }/encoding/xml/read_test.go (100%)
 rename src/{pkg => }/encoding/xml/typeinfo.go (100%)
 rename src/{pkg => }/encoding/xml/xml.go (100%)
 rename src/{pkg => }/encoding/xml/xml_test.go (100%)
 rename src/{pkg => }/errors/errors.go (100%)
 rename src/{pkg => }/errors/errors_test.go (100%)
 rename src/{pkg => }/errors/example_test.go (100%)
 rename src/{pkg => }/expvar/expvar.go (100%)
 rename src/{pkg => }/expvar/expvar_test.go (100%)
 rename src/{pkg => }/flag/example_test.go (100%)
 rename src/{pkg => }/flag/export_test.go (100%)
 rename src/{pkg => }/flag/flag.go (100%)
 rename src/{pkg => }/flag/flag_test.go (100%)
 rename src/{pkg => }/fmt/doc.go (100%)
 rename src/{pkg => }/fmt/export_test.go (100%)
 rename src/{pkg => }/fmt/fmt_test.go (100%)
 rename src/{pkg => }/fmt/format.go (100%)
 rename src/{pkg => }/fmt/print.go (100%)
 rename src/{pkg => }/fmt/scan.go (100%)
 rename src/{pkg => }/fmt/scan_test.go (100%)
 rename src/{pkg => }/fmt/stringer_test.go (100%)
 rename src/{pkg => }/go/ast/ast.go (100%)
 rename src/{pkg => }/go/ast/ast_test.go (100%)
 rename src/{pkg => }/go/ast/commentmap.go (100%)
 rename src/{pkg => }/go/ast/commentmap_test.go (100%)
 rename src/{pkg => }/go/ast/example_test.go (100%)
 rename src/{pkg => }/go/ast/filter.go (100%)
 rename src/{pkg => }/go/ast/filter_test.go (100%)
 rename src/{pkg => }/go/ast/import.go (100%)
 rename src/{pkg => }/go/ast/print.go (100%)
 rename src/{pkg => }/go/ast/print_test.go (100%)
 rename src/{pkg => }/go/ast/resolve.go (100%)
 rename src/{pkg => }/go/ast/scope.go (100%)
 rename src/{pkg => }/go/ast/walk.go (100%)
 rename src/{pkg => }/go/build/build.go (100%)
 rename src/{pkg => }/go/build/build_test.go (100%)
 rename src/{pkg => }/go/build/deps_test.go (100%)
 rename src/{pkg => }/go/build/doc.go (100%)
 rename src/{pkg => }/go/build/read.go (100%)
 rename src/{pkg => }/go/build/read_test.go (100%)
 rename src/{pkg => }/go/build/syslist.go (100%)
 rename src/{pkg => }/go/build/syslist_test.go (100%)
 rename src/{pkg => }/go/build/testdata/other/file/file.go (100%)
 rename src/{pkg => }/go/build/testdata/other/main.go (100%)
 rename src/{pkg => }/go/doc/Makefile (100%)
 rename src/{pkg => }/go/doc/comment.go (100%)
 rename src/{pkg => }/go/doc/comment_test.go (100%)
 rename src/{pkg => }/go/doc/doc.go (100%)
 rename src/{pkg => }/go/doc/doc_test.go (100%)
 rename src/{pkg => }/go/doc/example.go (100%)
 rename src/{pkg => }/go/doc/example_test.go (100%)
 rename src/{pkg => }/go/doc/exports.go (100%)
 rename src/{pkg => }/go/doc/filter.go (100%)
 rename src/{pkg => }/go/doc/headscan.go (100%)
 rename src/{pkg => }/go/doc/reader.go (100%)
 rename src/{pkg => }/go/doc/synopsis.go (100%)
 rename src/{pkg => }/go/doc/synopsis_test.go (100%)
 rename src/{pkg => }/go/doc/testdata/a.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/a.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/a.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/a0.go (100%)
 rename src/{pkg => }/go/doc/testdata/a1.go (100%)
 rename src/{pkg => }/go/doc/testdata/b.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/b.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/b.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/b.go (100%)
 rename src/{pkg => }/go/doc/testdata/benchmark.go (100%)
 rename src/{pkg => }/go/doc/testdata/bugpara.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/bugpara.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/bugpara.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/bugpara.go (100%)
 rename src/{pkg => }/go/doc/testdata/c.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/c.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/c.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/c.go (100%)
 rename src/{pkg => }/go/doc/testdata/d.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/d.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/d.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/d1.go (100%)
 rename src/{pkg => }/go/doc/testdata/d2.go (100%)
 rename src/{pkg => }/go/doc/testdata/e.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/e.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/e.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/e.go (100%)
 rename src/{pkg => }/go/doc/testdata/error1.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/error1.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/error1.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/error1.go (100%)
 rename src/{pkg => }/go/doc/testdata/error2.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/error2.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/error2.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/error2.go (100%)
 rename src/{pkg => }/go/doc/testdata/example.go (100%)
 rename src/{pkg => }/go/doc/testdata/f.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/f.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/f.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/f.go (100%)
 rename src/{pkg => }/go/doc/testdata/template.txt (100%)
 rename src/{pkg => }/go/doc/testdata/testing.0.golden (100%)
 rename src/{pkg => }/go/doc/testdata/testing.1.golden (100%)
 rename src/{pkg => }/go/doc/testdata/testing.2.golden (100%)
 rename src/{pkg => }/go/doc/testdata/testing.go (100%)
 rename src/{pkg => }/go/format/format.go (100%)
 rename src/{pkg => }/go/format/format_test.go (100%)
 rename src/{pkg => }/go/parser/error_test.go (100%)
 rename src/{pkg => }/go/parser/example_test.go (100%)
 rename src/{pkg => }/go/parser/interface.go (100%)
 rename src/{pkg => }/go/parser/parser.go (100%)
 rename src/{pkg => }/go/parser/parser_test.go (100%)
 rename src/{pkg => }/go/parser/performance_test.go (100%)
 rename src/{pkg => }/go/parser/short_test.go (100%)
 rename src/{pkg => }/go/parser/testdata/commas.src (100%)
 rename src/{pkg => }/go/parser/testdata/issue3106.src (100%)
 rename src/{pkg => }/go/printer/example_test.go (100%)
 rename src/{pkg => }/go/printer/nodes.go (100%)
 rename src/{pkg => }/go/printer/performance_test.go (100%)
 rename src/{pkg => }/go/printer/printer.go (100%)
 rename src/{pkg => }/go/printer/printer_test.go (100%)
 rename src/{pkg => }/go/printer/testdata/comments.golden (100%)
 rename src/{pkg => }/go/printer/testdata/comments.input (100%)
 rename src/{pkg => }/go/printer/testdata/comments.x (100%)
 rename src/{pkg => }/go/printer/testdata/comments2.golden (100%)
 rename src/{pkg => }/go/printer/testdata/comments2.input (100%)
 rename src/{pkg => }/go/printer/testdata/declarations.golden (100%)
 rename src/{pkg => }/go/printer/testdata/declarations.input (100%)
 rename src/{pkg => }/go/printer/testdata/empty.golden (100%)
 rename src/{pkg => }/go/printer/testdata/empty.input (100%)
 rename src/{pkg => }/go/printer/testdata/expressions.golden (100%)
 rename src/{pkg => }/go/printer/testdata/expressions.input (100%)
 rename src/{pkg => }/go/printer/testdata/expressions.raw (100%)
 rename src/{pkg => }/go/printer/testdata/linebreaks.golden (100%)
 rename src/{pkg => }/go/printer/testdata/linebreaks.input (100%)
 rename src/{pkg => }/go/printer/testdata/parser.go (100%)
 rename src/{pkg => }/go/printer/testdata/slow.golden (100%)
 rename src/{pkg => }/go/printer/testdata/slow.input (100%)
 rename src/{pkg => }/go/printer/testdata/statements.golden (100%)
 rename src/{pkg => }/go/printer/testdata/statements.input (100%)
 rename src/{pkg => }/go/scanner/errors.go (100%)
 rename src/{pkg => }/go/scanner/example_test.go (100%)
 rename src/{pkg => }/go/scanner/scanner.go (100%)
 rename src/{pkg => }/go/scanner/scanner_test.go (100%)
 rename src/{pkg => }/go/token/position.go (100%)
 rename src/{pkg => }/go/token/position_test.go (100%)
 rename src/{pkg => }/go/token/serialize.go (100%)
 rename src/{pkg => }/go/token/serialize_test.go (100%)
 rename src/{pkg => }/go/token/token.go (100%)
 rename src/{pkg => }/hash/adler32/adler32.go (100%)
 rename src/{pkg => }/hash/adler32/adler32_test.go (100%)
 rename src/{pkg => }/hash/crc32/crc32.go (100%)
 rename src/{pkg => }/hash/crc32/crc32_amd64.s (100%)
 rename src/{pkg => }/hash/crc32/crc32_amd64p32.s (100%)
 rename src/{pkg => }/hash/crc32/crc32_amd64x.go (100%)
 rename src/{pkg => }/hash/crc32/crc32_generic.go (100%)
 rename src/{pkg => }/hash/crc32/crc32_test.go (100%)
 rename src/{pkg => }/hash/crc64/crc64.go (100%)
 rename src/{pkg => }/hash/crc64/crc64_test.go (100%)
 rename src/{pkg => }/hash/fnv/fnv.go (100%)
 rename src/{pkg => }/hash/fnv/fnv_test.go (100%)
 rename src/{pkg => }/hash/hash.go (100%)
 rename src/{pkg => }/hash/test_cases.txt (100%)
 rename src/{pkg => }/hash/test_gen.awk (100%)
 rename src/{pkg => }/html/entity.go (100%)
 rename src/{pkg => }/html/entity_test.go (100%)
 rename src/{pkg => }/html/escape.go (100%)
 rename src/{pkg => }/html/escape_test.go (100%)
 rename src/{pkg => }/html/template/attr.go (100%)
 rename src/{pkg => }/html/template/clone_test.go (100%)
 rename src/{pkg => }/html/template/content.go (100%)
 rename src/{pkg => }/html/template/content_test.go (100%)
 rename src/{pkg => }/html/template/context.go (100%)
 rename src/{pkg => }/html/template/css.go (100%)
 rename src/{pkg => }/html/template/css_test.go (100%)
 rename src/{pkg => }/html/template/doc.go (100%)
 rename src/{pkg => }/html/template/error.go (100%)
 rename src/{pkg => }/html/template/escape.go (100%)
 rename src/{pkg => }/html/template/escape_test.go (100%)
 rename src/{pkg => }/html/template/html.go (100%)
 rename src/{pkg => }/html/template/html_test.go (100%)
 rename src/{pkg => }/html/template/js.go (100%)
 rename src/{pkg => }/html/template/js_test.go (100%)
 rename src/{pkg => }/html/template/template.go (100%)
 rename src/{pkg => }/html/template/transition.go (100%)
 rename src/{pkg => }/html/template/url.go (100%)
 rename src/{pkg => }/html/template/url_test.go (100%)
 rename src/{pkg => }/image/color/color.go (100%)
 rename src/{pkg => }/image/color/palette/gen.go (100%)
 rename src/{pkg => }/image/color/palette/generate.go (100%)
 rename src/{pkg => }/image/color/palette/palette.go (100%)
 rename src/{pkg => }/image/color/ycbcr.go (100%)
 rename src/{pkg => }/image/color/ycbcr_test.go (100%)
 rename src/{pkg => }/image/decode_example_test.go (100%)
 rename src/{pkg => }/image/decode_test.go (100%)
 rename src/{pkg => }/image/draw/bench_test.go (100%)
 rename src/{pkg => }/image/draw/clip_test.go (100%)
 rename src/{pkg => }/image/draw/draw.go (100%)
 rename src/{pkg => }/image/draw/draw_test.go (100%)
 rename src/{pkg => }/image/format.go (100%)
 rename src/{pkg => }/image/geom.go (100%)
 rename src/{pkg => }/image/gif/reader.go (100%)
 rename src/{pkg => }/image/gif/reader_test.go (100%)
 rename src/{pkg => }/image/gif/writer.go (100%)
 rename src/{pkg => }/image/gif/writer_test.go (100%)
 rename src/{pkg => }/image/image.go (100%)
 rename src/{pkg => }/image/image_test.go (100%)
 rename src/{pkg => }/image/jpeg/dct_test.go (100%)
 rename src/{pkg => }/image/jpeg/fdct.go (100%)
 rename src/{pkg => }/image/jpeg/huffman.go (100%)
 rename src/{pkg => }/image/jpeg/idct.go (100%)
 rename src/{pkg => }/image/jpeg/reader.go (100%)
 rename src/{pkg => }/image/jpeg/reader_test.go (100%)
 rename src/{pkg => }/image/jpeg/scan.go (100%)
 rename src/{pkg => }/image/jpeg/writer.go (100%)
 rename src/{pkg => }/image/jpeg/writer_test.go (100%)
 rename src/{pkg => }/image/names.go (100%)
 rename src/{pkg => }/image/png/paeth.go (100%)
 rename src/{pkg => }/image/png/paeth_test.go (100%)
 rename src/{pkg => }/image/png/reader.go (100%)
 rename src/{pkg => }/image/png/reader_test.go (100%)
 rename src/{pkg => }/image/png/testdata/benchGray.png (100%)
 rename src/{pkg => }/image/png/testdata/benchNRGBA-gradient.png (100%)
 rename src/{pkg => }/image/png/testdata/benchNRGBA-opaque.png (100%)
 rename src/{pkg => }/image/png/testdata/benchPaletted.png (100%)
 rename src/{pkg => }/image/png/testdata/benchRGB-interlace.png (100%)
 rename src/{pkg => }/image/png/testdata/benchRGB.png (100%)
 rename src/{pkg => }/image/png/testdata/invalid-crc32.png (100%)
 rename src/{pkg => }/image/png/testdata/invalid-noend.png (100%)
 rename src/{pkg => }/image/png/testdata/invalid-trunc.png (100%)
 rename src/{pkg => }/image/png/testdata/invalid-zlib.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/README (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/README.original (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g01-30.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g01-30.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g01.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g01.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g02-29.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g02-29.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g02.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g02.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g04-31.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g04-31.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g04.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g04.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g08.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g08.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g16.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn0g16.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn2c08.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn2c08.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn2c16.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn2c16.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p01.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p01.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p02.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p02.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p04-31i.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p04-31i.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p04.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p04.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p08-trns.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p08-trns.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p08.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn3p08.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn4a08.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn4a08.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn4a16.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn4a16.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn6a08.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn6a08.sng (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn6a16.png (100%)
 rename src/{pkg => }/image/png/testdata/pngsuite/basn6a16.sng (100%)
 rename src/{pkg => }/image/png/writer.go (100%)
 rename src/{pkg => }/image/png/writer_test.go (100%)
 rename src/{pkg => }/image/testdata/video-001.5bpp.gif (100%)
 rename src/{pkg => }/image/testdata/video-001.gif (100%)
 rename src/{pkg => }/image/testdata/video-001.interlaced.gif (100%)
 rename src/{pkg => }/image/testdata/video-001.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.png (100%)
 rename src/{pkg => }/image/testdata/video-001.progressive.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.420.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.420.progressive.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.422.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.422.progressive.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.440.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.440.progressive.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.444.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.q50.444.progressive.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.separate.dc.progression.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-001.separate.dc.progression.progressive.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-005.gray.gif (100%)
 rename src/{pkg => }/image/testdata/video-005.gray.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-005.gray.png (100%)
 rename src/{pkg => }/image/testdata/video-005.gray.q50.2x2.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-005.gray.q50.2x2.progressive.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-005.gray.q50.jpeg (100%)
 rename src/{pkg => }/image/testdata/video-005.gray.q50.progressive.jpeg (100%)
 rename src/{pkg => }/image/ycbcr.go (100%)
 rename src/{pkg => }/image/ycbcr_test.go (100%)
 rename src/{pkg => }/index/suffixarray/qsufsort.go (100%)
 rename src/{pkg => }/index/suffixarray/suffixarray.go (100%)
 rename src/{pkg => }/index/suffixarray/suffixarray_test.go (100%)
 rename src/{pkg => }/internal/syscall/getrandom_linux.go (100%)
 rename src/{pkg => }/io/io.go (100%)
 rename src/{pkg => }/io/io_test.go (100%)
 rename src/{pkg => }/io/ioutil/ioutil.go (100%)
 rename src/{pkg => }/io/ioutil/ioutil_test.go (100%)
 rename src/{pkg => }/io/ioutil/tempfile.go (100%)
 rename src/{pkg => }/io/ioutil/tempfile_test.go (100%)
 rename src/{pkg => }/io/multi.go (100%)
 rename src/{pkg => }/io/multi_test.go (100%)
 rename src/{pkg => }/io/pipe.go (100%)
 rename src/{pkg => }/io/pipe_test.go (100%)
 rename src/{pkg => }/log/example_test.go (100%)
 rename src/{pkg => }/log/log.go (100%)
 rename src/{pkg => }/log/log_test.go (100%)
 rename src/{pkg => }/log/syslog/syslog.go (100%)
 rename src/{pkg => }/log/syslog/syslog_plan9.go (100%)
 rename src/{pkg => }/log/syslog/syslog_test.go (100%)
 rename src/{pkg => }/log/syslog/syslog_unix.go (100%)
 rename src/{pkg => }/log/syslog/syslog_windows.go (100%)
 rename src/{pkg => }/math/abs.go (100%)
 rename src/{pkg => }/math/abs_386.s (100%)
 rename src/{pkg => }/math/abs_amd64.s (100%)
 rename src/{pkg => }/math/abs_amd64p32.s (100%)
 rename src/{pkg => }/math/abs_arm.s (100%)
 rename src/{pkg => }/math/acosh.go (100%)
 rename src/{pkg => }/math/all_test.go (100%)
 rename src/{pkg => }/math/asin.go (100%)
 rename src/{pkg => }/math/asin_386.s (100%)
 rename src/{pkg => }/math/asin_amd64.s (100%)
 rename src/{pkg => }/math/asin_amd64p32.s (100%)
 rename src/{pkg => }/math/asin_arm.s (100%)
 rename src/{pkg => }/math/asinh.go (100%)
 rename src/{pkg => }/math/atan.go (100%)
 rename src/{pkg => }/math/atan2.go (100%)
 rename src/{pkg => }/math/atan2_386.s (100%)
 rename src/{pkg => }/math/atan2_amd64.s (100%)
 rename src/{pkg => }/math/atan2_amd64p32.s (100%)
 rename src/{pkg => }/math/atan2_arm.s (100%)
 rename src/{pkg => }/math/atan_386.s (100%)
 rename src/{pkg => }/math/atan_amd64.s (100%)
 rename src/{pkg => }/math/atan_amd64p32.s (100%)
 rename src/{pkg => }/math/atan_arm.s (100%)
 rename src/{pkg => }/math/atanh.go (100%)
 rename src/{pkg => }/math/big/arith.go (100%)
 rename src/{pkg => }/math/big/arith_386.s (100%)
 rename src/{pkg => }/math/big/arith_amd64.s (100%)
 rename src/{pkg => }/math/big/arith_amd64p32.s (100%)
 rename src/{pkg => }/math/big/arith_arm.s (100%)
 rename src/{pkg => }/math/big/arith_decl.go (100%)
 rename src/{pkg => }/math/big/arith_test.go (100%)
 rename src/{pkg => }/math/big/calibrate_test.go (100%)
 rename src/{pkg => }/math/big/example_test.go (100%)
 rename src/{pkg => }/math/big/gcd_test.go (100%)
 rename src/{pkg => }/math/big/hilbert_test.go (100%)
 rename src/{pkg => }/math/big/int.go (100%)
 rename src/{pkg => }/math/big/int_test.go (100%)
 rename src/{pkg => }/math/big/nat.go (100%)
 rename src/{pkg => }/math/big/nat_test.go (100%)
 rename src/{pkg => }/math/big/rat.go (100%)
 rename src/{pkg => }/math/big/rat_test.go (100%)
 rename src/{pkg => }/math/bits.go (100%)
 rename src/{pkg => }/math/cbrt.go (100%)
 rename src/{pkg => }/math/cmplx/abs.go (100%)
 rename src/{pkg => }/math/cmplx/asin.go (100%)
 rename src/{pkg => }/math/cmplx/cmath_test.go (100%)
 rename src/{pkg => }/math/cmplx/conj.go (100%)
 rename src/{pkg => }/math/cmplx/exp.go (100%)
 rename src/{pkg => }/math/cmplx/isinf.go (100%)
 rename src/{pkg => }/math/cmplx/isnan.go (100%)
 rename src/{pkg => }/math/cmplx/log.go (100%)
 rename src/{pkg => }/math/cmplx/phase.go (100%)
 rename src/{pkg => }/math/cmplx/polar.go (100%)
 rename src/{pkg => }/math/cmplx/pow.go (100%)
 rename src/{pkg => }/math/cmplx/rect.go (100%)
 rename src/{pkg => }/math/cmplx/sin.go (100%)
 rename src/{pkg => }/math/cmplx/sqrt.go (100%)
 rename src/{pkg => }/math/cmplx/tan.go (100%)
 rename src/{pkg => }/math/const.go (100%)
 rename src/{pkg => }/math/copysign.go (100%)
 rename src/{pkg => }/math/dim.go (100%)
 rename src/{pkg => }/math/dim_386.s (100%)
 rename src/{pkg => }/math/dim_amd64.s (100%)
 rename src/{pkg => }/math/dim_amd64p32.s (100%)
 rename src/{pkg => }/math/dim_arm.s (100%)
 rename src/{pkg => }/math/erf.go (100%)
 rename src/{pkg => }/math/exp.go (100%)
 rename src/{pkg => }/math/exp2_386.s (100%)
 rename src/{pkg => }/math/exp2_amd64.s (100%)
 rename src/{pkg => }/math/exp2_amd64p32.s (100%)
 rename src/{pkg => }/math/exp2_arm.s (100%)
 rename src/{pkg => }/math/exp_386.s (100%)
 rename src/{pkg => }/math/exp_amd64.s (100%)
 rename src/{pkg => }/math/exp_amd64p32.s (100%)
 rename src/{pkg => }/math/exp_arm.s (100%)
 rename src/{pkg => }/math/expm1.go (100%)
 rename src/{pkg => }/math/expm1_386.s (100%)
 rename src/{pkg => }/math/expm1_amd64.s (100%)
 rename src/{pkg => }/math/expm1_amd64p32.s (100%)
 rename src/{pkg => }/math/expm1_arm.s (100%)
 rename src/{pkg => }/math/export_test.go (100%)
 rename src/{pkg => }/math/floor.go (100%)
 rename src/{pkg => }/math/floor_386.s (100%)
 rename src/{pkg => }/math/floor_amd64.s (100%)
 rename src/{pkg => }/math/floor_amd64p32.s (100%)
 rename src/{pkg => }/math/floor_arm.s (100%)
 rename src/{pkg => }/math/frexp.go (100%)
 rename src/{pkg => }/math/frexp_386.s (100%)
 rename src/{pkg => }/math/frexp_amd64.s (100%)
 rename src/{pkg => }/math/frexp_amd64p32.s (100%)
 rename src/{pkg => }/math/frexp_arm.s (100%)
 rename src/{pkg => }/math/gamma.go (100%)
 rename src/{pkg => }/math/hypot.go (100%)
 rename src/{pkg => }/math/hypot_386.s (100%)
 rename src/{pkg => }/math/hypot_amd64.s (100%)
 rename src/{pkg => }/math/hypot_amd64p32.s (100%)
 rename src/{pkg => }/math/hypot_arm.s (100%)
 rename src/{pkg => }/math/j0.go (100%)
 rename src/{pkg => }/math/j1.go (100%)
 rename src/{pkg => }/math/jn.go (100%)
 rename src/{pkg => }/math/ldexp.go (100%)
 rename src/{pkg => }/math/ldexp_386.s (100%)
 rename src/{pkg => }/math/ldexp_amd64.s (100%)
 rename src/{pkg => }/math/ldexp_amd64p32.s (100%)
 rename src/{pkg => }/math/ldexp_arm.s (100%)
 rename src/{pkg => }/math/lgamma.go (100%)
 rename src/{pkg => }/math/log.go (100%)
 rename src/{pkg => }/math/log10.go (100%)
 rename src/{pkg => }/math/log10_386.s (100%)
 rename src/{pkg => }/math/log10_amd64.s (100%)
 rename src/{pkg => }/math/log10_amd64p32.s (100%)
 rename src/{pkg => }/math/log10_arm.s (100%)
 rename src/{pkg => }/math/log1p.go (100%)
 rename src/{pkg => }/math/log1p_386.s (100%)
 rename src/{pkg => }/math/log1p_amd64.s (100%)
 rename src/{pkg => }/math/log1p_amd64p32.s (100%)
 rename src/{pkg => }/math/log1p_arm.s (100%)
 rename src/{pkg => }/math/log_386.s (100%)
 rename src/{pkg => }/math/log_amd64.s (100%)
 rename src/{pkg => }/math/log_amd64p32.s (100%)
 rename src/{pkg => }/math/log_arm.s (100%)
 rename src/{pkg => }/math/logb.go (100%)
 rename src/{pkg => }/math/mod.go (100%)
 rename src/{pkg => }/math/mod_386.s (100%)
 rename src/{pkg => }/math/mod_amd64.s (100%)
 rename src/{pkg => }/math/mod_amd64p32.s (100%)
 rename src/{pkg => }/math/mod_arm.s (100%)
 rename src/{pkg => }/math/modf.go (100%)
 rename src/{pkg => }/math/modf_386.s (100%)
 rename src/{pkg => }/math/modf_amd64.s (100%)
 rename src/{pkg => }/math/modf_amd64p32.s (100%)
 rename src/{pkg => }/math/modf_arm.s (100%)
 rename src/{pkg => }/math/nextafter.go (100%)
 rename src/{pkg => }/math/pow.go (100%)
 rename src/{pkg => }/math/pow10.go (100%)
 rename src/{pkg => }/math/rand/example_test.go (100%)
 rename src/{pkg => }/math/rand/exp.go (100%)
 rename src/{pkg => }/math/rand/normal.go (100%)
 rename src/{pkg => }/math/rand/rand.go (100%)
 rename src/{pkg => }/math/rand/rand_test.go (100%)
 rename src/{pkg => }/math/rand/regress_test.go (100%)
 rename src/{pkg => }/math/rand/rng.go (100%)
 rename src/{pkg => }/math/rand/zipf.go (100%)
 rename src/{pkg => }/math/remainder.go (100%)
 rename src/{pkg => }/math/remainder_386.s (100%)
 rename src/{pkg => }/math/remainder_amd64.s (100%)
 rename src/{pkg => }/math/remainder_amd64p32.s (100%)
 rename src/{pkg => }/math/remainder_arm.s (100%)
 rename src/{pkg => }/math/signbit.go (100%)
 rename src/{pkg => }/math/sin.go (100%)
 rename src/{pkg => }/math/sin_386.s (100%)
 rename src/{pkg => }/math/sin_amd64.s (100%)
 rename src/{pkg => }/math/sin_amd64p32.s (100%)
 rename src/{pkg => }/math/sin_arm.s (100%)
 rename src/{pkg => }/math/sincos.go (100%)
 rename src/{pkg => }/math/sincos_386.s (100%)
 rename src/{pkg => }/math/sincos_amd64.s (100%)
 rename src/{pkg => }/math/sincos_amd64p32.s (100%)
 rename src/{pkg => }/math/sincos_arm.s (100%)
 rename src/{pkg => }/math/sinh.go (100%)
 rename src/{pkg => }/math/sqrt.go (100%)
 rename src/{pkg => }/math/sqrt_386.s (100%)
 rename src/{pkg => }/math/sqrt_amd64.s (100%)
 rename src/{pkg => }/math/sqrt_amd64p32.s (100%)
 rename src/{pkg => }/math/sqrt_arm.s (100%)
 rename src/{pkg => }/math/tan.go (100%)
 rename src/{pkg => }/math/tan_386.s (100%)
 rename src/{pkg => }/math/tan_amd64.s (100%)
 rename src/{pkg => }/math/tan_amd64p32.s (100%)
 rename src/{pkg => }/math/tan_arm.s (100%)
 rename src/{pkg => }/math/tanh.go (100%)
 rename src/{pkg => }/math/unsafe.go (100%)
 rename src/{pkg => }/mime/grammar.go (100%)
 rename src/{pkg => }/mime/mediatype.go (100%)
 rename src/{pkg => }/mime/mediatype_test.go (100%)
 rename src/{pkg => }/mime/multipart/example_test.go (100%)
 rename src/{pkg => }/mime/multipart/formdata.go (100%)
 rename src/{pkg => }/mime/multipart/formdata_test.go (100%)
 rename src/{pkg => }/mime/multipart/multipart.go (100%)
 rename src/{pkg => }/mime/multipart/multipart_test.go (100%)
 rename src/{pkg => }/mime/multipart/quotedprintable.go (100%)
 rename src/{pkg => }/mime/multipart/quotedprintable_test.go (100%)
 rename src/{pkg => }/mime/multipart/testdata/nested-mime (100%)
 rename src/{pkg => }/mime/multipart/writer.go (100%)
 rename src/{pkg => }/mime/multipart/writer_test.go (100%)
 rename src/{pkg => }/mime/testdata/test.types (100%)
 rename src/{pkg => }/mime/testdata/test.types.plan9 (100%)
 rename src/{pkg => }/mime/type.go (100%)
 rename src/{pkg => }/mime/type_plan9.go (100%)
 rename src/{pkg => }/mime/type_test.go (100%)
 rename src/{pkg => }/mime/type_unix.go (100%)
 rename src/{pkg => }/mime/type_windows.go (100%)
 rename src/{pkg => }/net/cgo_android.go (100%)
 rename src/{pkg => }/net/cgo_bsd.go (100%)
 rename src/{pkg => }/net/cgo_linux.go (100%)
 rename src/{pkg => }/net/cgo_netbsd.go (100%)
 rename src/{pkg => }/net/cgo_openbsd.go (100%)
 rename src/{pkg => }/net/cgo_stub.go (100%)
 rename src/{pkg => }/net/cgo_unix.go (100%)
 rename src/{pkg => }/net/cgo_unix_test.go (100%)
 rename src/{pkg => }/net/conn_test.go (100%)
 rename src/{pkg => }/net/dial.go (100%)
 rename src/{pkg => }/net/dial_gen.go (100%)
 rename src/{pkg => }/net/dial_gen_test.go (100%)
 rename src/{pkg => }/net/dial_test.go (100%)
 rename src/{pkg => }/net/dialgoogle_test.go (100%)
 rename src/{pkg => }/net/dnsclient.go (100%)
 rename src/{pkg => }/net/dnsclient_test.go (100%)
 rename src/{pkg => }/net/dnsclient_unix.go (100%)
 rename src/{pkg => }/net/dnsclient_unix_test.go (100%)
 rename src/{pkg => }/net/dnsconfig_unix.go (100%)
 rename src/{pkg => }/net/dnsconfig_unix_test.go (100%)
 rename src/{pkg => }/net/dnsmsg.go (100%)
 rename src/{pkg => }/net/dnsmsg_test.go (100%)
 rename src/{pkg => }/net/dnsname_test.go (100%)
 rename src/{pkg => }/net/empty.c (100%)
 rename src/{pkg => }/net/example_test.go (100%)
 rename src/{pkg => }/net/fd_mutex.go (100%)
 rename src/{pkg => }/net/fd_mutex_test.go (100%)
 rename src/{pkg => }/net/fd_plan9.go (100%)
 rename src/{pkg => }/net/fd_poll_nacl.go (100%)
 rename src/{pkg => }/net/fd_poll_runtime.go (100%)
 rename src/{pkg => }/net/fd_unix.go (100%)
 rename src/{pkg => }/net/fd_unix_test.go (100%)
 rename src/{pkg => }/net/fd_windows.go (100%)
 rename src/{pkg => }/net/file_plan9.go (100%)
 rename src/{pkg => }/net/file_test.go (100%)
 rename src/{pkg => }/net/file_unix.go (100%)
 rename src/{pkg => }/net/file_windows.go (100%)
 rename src/{pkg => }/net/hosts.go (100%)
 rename src/{pkg => }/net/hosts_test.go (100%)
 rename src/{pkg => }/net/http/cgi/child.go (100%)
 rename src/{pkg => }/net/http/cgi/child_test.go (100%)
 rename src/{pkg => }/net/http/cgi/host.go (100%)
 rename src/{pkg => }/net/http/cgi/host_test.go (100%)
 rename src/{pkg => }/net/http/cgi/matryoshka_test.go (100%)
 rename src/{pkg => }/net/http/cgi/plan9_test.go (100%)
 rename src/{pkg => }/net/http/cgi/posix_test.go (100%)
 rename src/{pkg => }/net/http/cgi/testdata/test.cgi (100%)
 rename src/{pkg => }/net/http/client.go (100%)
 rename src/{pkg => }/net/http/client_test.go (100%)
 rename src/{pkg => }/net/http/cookie.go (100%)
 rename src/{pkg => }/net/http/cookie_test.go (100%)
 rename src/{pkg => }/net/http/cookiejar/jar.go (100%)
 rename src/{pkg => }/net/http/cookiejar/jar_test.go (100%)
 rename src/{pkg => }/net/http/cookiejar/punycode.go (100%)
 rename src/{pkg => }/net/http/cookiejar/punycode_test.go (100%)
 rename src/{pkg => }/net/http/doc.go (100%)
 rename src/{pkg => }/net/http/example_test.go (100%)
 rename src/{pkg => }/net/http/export_test.go (100%)
 rename src/{pkg => }/net/http/fcgi/child.go (100%)
 rename src/{pkg => }/net/http/fcgi/fcgi.go (100%)
 rename src/{pkg => }/net/http/fcgi/fcgi_test.go (100%)
 rename src/{pkg => }/net/http/filetransport.go (100%)
 rename src/{pkg => }/net/http/filetransport_test.go (100%)
 rename src/{pkg => }/net/http/fs.go (100%)
 rename src/{pkg => }/net/http/fs_test.go (100%)
 rename src/{pkg => }/net/http/header.go (100%)
 rename src/{pkg => }/net/http/header_test.go (100%)
 rename src/{pkg => }/net/http/httptest/example_test.go (100%)
 rename src/{pkg => }/net/http/httptest/recorder.go (100%)
 rename src/{pkg => }/net/http/httptest/recorder_test.go (100%)
 rename src/{pkg => }/net/http/httptest/server.go (100%)
 rename src/{pkg => }/net/http/httptest/server_test.go (100%)
 rename src/{pkg => }/net/http/httputil/dump.go (100%)
 rename src/{pkg => }/net/http/httputil/dump_test.go (100%)
 rename src/{pkg => }/net/http/httputil/httputil.go (100%)
 rename src/{pkg => }/net/http/httputil/persist.go (100%)
 rename src/{pkg => }/net/http/httputil/reverseproxy.go (100%)
 rename src/{pkg => }/net/http/httputil/reverseproxy_test.go (100%)
 rename src/{pkg => }/net/http/internal/chunked.go (100%)
 rename src/{pkg => }/net/http/internal/chunked_test.go (100%)
 rename src/{pkg => }/net/http/jar.go (100%)
 rename src/{pkg => }/net/http/lex.go (100%)
 rename src/{pkg => }/net/http/lex_test.go (100%)
 rename src/{pkg => }/net/http/npn_test.go (100%)
 rename src/{pkg => }/net/http/pprof/pprof.go (100%)
 rename src/{pkg => }/net/http/proxy_test.go (100%)
 rename src/{pkg => }/net/http/race.go (100%)
 rename src/{pkg => }/net/http/range_test.go (100%)
 rename src/{pkg => }/net/http/readrequest_test.go (100%)
 rename src/{pkg => }/net/http/request.go (100%)
 rename src/{pkg => }/net/http/request_test.go (100%)
 rename src/{pkg => }/net/http/requestwrite_test.go (100%)
 rename src/{pkg => }/net/http/response.go (100%)
 rename src/{pkg => }/net/http/response_test.go (100%)
 rename src/{pkg => }/net/http/responsewrite_test.go (100%)
 rename src/{pkg => }/net/http/serve_test.go (100%)
 rename src/{pkg => }/net/http/server.go (100%)
 rename src/{pkg => }/net/http/sniff.go (100%)
 rename src/{pkg => }/net/http/sniff_test.go (100%)
 rename src/{pkg => }/net/http/status.go (100%)
 rename src/{pkg => }/net/http/testdata/file (100%)
 rename src/{pkg => }/net/http/testdata/index.html (100%)
 rename src/{pkg => }/net/http/testdata/style.css (100%)
 rename src/{pkg => }/net/http/transfer.go (100%)
 rename src/{pkg => }/net/http/transfer_test.go (100%)
 rename src/{pkg => }/net/http/transport.go (100%)
 rename src/{pkg => }/net/http/transport_test.go (100%)
 rename src/{pkg => }/net/http/triv.go (100%)
 rename src/{pkg => }/net/http/z_last_test.go (100%)
 rename src/{pkg => }/net/interface.go (100%)
 rename src/{pkg => }/net/interface_bsd.go (100%)
 rename src/{pkg => }/net/interface_bsd_test.go (100%)
 rename src/{pkg => }/net/interface_darwin.go (100%)
 rename src/{pkg => }/net/interface_dragonfly.go (100%)
 rename src/{pkg => }/net/interface_freebsd.go (100%)
 rename src/{pkg => }/net/interface_linux.go (100%)
 rename src/{pkg => }/net/interface_linux_test.go (100%)
 rename src/{pkg => }/net/interface_netbsd.go (100%)
 rename src/{pkg => }/net/interface_openbsd.go (100%)
 rename src/{pkg => }/net/interface_stub.go (100%)
 rename src/{pkg => }/net/interface_test.go (100%)
 rename src/{pkg => }/net/interface_unix_test.go (100%)
 rename src/{pkg => }/net/interface_windows.go (100%)
 rename src/{pkg => }/net/ip.go (100%)
 rename src/{pkg => }/net/ip_test.go (100%)
 rename src/{pkg => }/net/ipraw_test.go (100%)
 rename src/{pkg => }/net/iprawsock.go (100%)
 rename src/{pkg => }/net/iprawsock_plan9.go (100%)
 rename src/{pkg => }/net/iprawsock_posix.go (100%)
 rename src/{pkg => }/net/ipsock.go (100%)
 rename src/{pkg => }/net/ipsock_plan9.go (100%)
 rename src/{pkg => }/net/ipsock_posix.go (100%)
 rename src/{pkg => }/net/ipsock_test.go (100%)
 rename src/{pkg => }/net/lookup.go (100%)
 rename src/{pkg => }/net/lookup_plan9.go (100%)
 rename src/{pkg => }/net/lookup_test.go (100%)
 rename src/{pkg => }/net/lookup_unix.go (100%)
 rename src/{pkg => }/net/lookup_windows.go (100%)
 rename src/{pkg => }/net/lookup_windows_test.go (100%)
 rename src/{pkg => }/net/mac.go (100%)
 rename src/{pkg => }/net/mac_test.go (100%)
 rename src/{pkg => }/net/mail/message.go (100%)
 rename src/{pkg => }/net/mail/message_test.go (100%)
 rename src/{pkg => }/net/mockicmp_test.go (100%)
 rename src/{pkg => }/net/mockserver_test.go (100%)
 rename src/{pkg => }/net/multicast_test.go (100%)
 rename src/{pkg => }/net/net.go (100%)
 rename src/{pkg => }/net/net_test.go (100%)
 rename src/{pkg => }/net/net_windows_test.go (100%)
 rename src/{pkg => }/net/netgo_unix_test.go (100%)
 rename src/{pkg => }/net/packetconn_test.go (100%)
 rename src/{pkg => }/net/parse.go (100%)
 rename src/{pkg => }/net/parse_test.go (100%)
 rename src/{pkg => }/net/pipe.go (100%)
 rename src/{pkg => }/net/pipe_test.go (100%)
 rename src/{pkg => }/net/port.go (100%)
 rename src/{pkg => }/net/port_test.go (100%)
 rename src/{pkg => }/net/port_unix.go (100%)
 rename src/{pkg => }/net/protoconn_test.go (100%)
 rename src/{pkg => }/net/race.go (100%)
 rename src/{pkg => }/net/race0.go (100%)
 rename src/{pkg => }/net/rpc/client.go (100%)
 rename src/{pkg => }/net/rpc/client_test.go (100%)
 rename src/{pkg => }/net/rpc/debug.go (100%)
 rename src/{pkg => }/net/rpc/jsonrpc/all_test.go (100%)
 rename src/{pkg => }/net/rpc/jsonrpc/client.go (100%)
 rename src/{pkg => }/net/rpc/jsonrpc/server.go (100%)
 rename src/{pkg => }/net/rpc/server.go (100%)
 rename src/{pkg => }/net/rpc/server_test.go (100%)
 rename src/{pkg => }/net/sendfile_dragonfly.go (100%)
 rename src/{pkg => }/net/sendfile_freebsd.go (100%)
 rename src/{pkg => }/net/sendfile_linux.go (100%)
 rename src/{pkg => }/net/sendfile_stub.go (100%)
 rename src/{pkg => }/net/sendfile_windows.go (100%)
 rename src/{pkg => }/net/server_test.go (100%)
 rename src/{pkg => }/net/singleflight.go (100%)
 rename src/{pkg => }/net/smtp/auth.go (100%)
 rename src/{pkg => }/net/smtp/example_test.go (100%)
 rename src/{pkg => }/net/smtp/smtp.go (100%)
 rename src/{pkg => }/net/smtp/smtp_test.go (100%)
 rename src/{pkg => }/net/sock_bsd.go (100%)
 rename src/{pkg => }/net/sock_cloexec.go (100%)
 rename src/{pkg => }/net/sock_linux.go (100%)
 rename src/{pkg => }/net/sock_plan9.go (100%)
 rename src/{pkg => }/net/sock_posix.go (100%)
 rename src/{pkg => }/net/sock_solaris.go (100%)
 rename src/{pkg => }/net/sock_windows.go (100%)
 rename src/{pkg => }/net/sockopt_bsd.go (100%)
 rename src/{pkg => }/net/sockopt_linux.go (100%)
 rename src/{pkg => }/net/sockopt_plan9.go (100%)
 rename src/{pkg => }/net/sockopt_posix.go (100%)
 rename src/{pkg => }/net/sockopt_solaris.go (100%)
 rename src/{pkg => }/net/sockopt_windows.go (100%)
 rename src/{pkg => }/net/sockoptip_bsd.go (100%)
 rename src/{pkg => }/net/sockoptip_linux.go (100%)
 rename src/{pkg => }/net/sockoptip_posix.go (100%)
 rename src/{pkg => }/net/sockoptip_stub.go (100%)
 rename src/{pkg => }/net/sockoptip_windows.go (100%)
 rename src/{pkg => }/net/sys_cloexec.go (100%)
 rename src/{pkg => }/net/tcp_test.go (100%)
 rename src/{pkg => }/net/tcpsock.go (100%)
 rename src/{pkg => }/net/tcpsock_plan9.go (100%)
 rename src/{pkg => }/net/tcpsock_posix.go (100%)
 rename src/{pkg => }/net/tcpsockopt_darwin.go (100%)
 rename src/{pkg => }/net/tcpsockopt_dragonfly.go (100%)
 rename src/{pkg => }/net/tcpsockopt_openbsd.go (100%)
 rename src/{pkg => }/net/tcpsockopt_plan9.go (100%)
 rename src/{pkg => }/net/tcpsockopt_posix.go (100%)
 rename src/{pkg => }/net/tcpsockopt_solaris.go (100%)
 rename src/{pkg => }/net/tcpsockopt_unix.go (100%)
 rename src/{pkg => }/net/tcpsockopt_windows.go (100%)
 rename src/{pkg => }/net/testdata/domain-resolv.conf (100%)
 rename src/{pkg => }/net/testdata/empty-resolv.conf (100%)
 rename src/{pkg => }/net/testdata/hosts (100%)
 rename src/{pkg => }/net/testdata/hosts_singleline (100%)
 rename src/{pkg => }/net/testdata/igmp (100%)
 rename src/{pkg => }/net/testdata/igmp6 (100%)
 rename src/{pkg => }/net/testdata/resolv.conf (100%)
 rename src/{pkg => }/net/testdata/search-resolv.conf (100%)
 rename src/{pkg => }/net/textproto/header.go (100%)
 rename src/{pkg => }/net/textproto/pipeline.go (100%)
 rename src/{pkg => }/net/textproto/reader.go (100%)
 rename src/{pkg => }/net/textproto/reader_test.go (100%)
 rename src/{pkg => }/net/textproto/textproto.go (100%)
 rename src/{pkg => }/net/textproto/writer.go (100%)
 rename src/{pkg => }/net/textproto/writer_test.go (100%)
 rename src/{pkg => }/net/timeout_test.go (100%)
 rename src/{pkg => }/net/udp_test.go (100%)
 rename src/{pkg => }/net/udpsock.go (100%)
 rename src/{pkg => }/net/udpsock_plan9.go (100%)
 rename src/{pkg => }/net/udpsock_posix.go (100%)
 rename src/{pkg => }/net/unicast_posix_test.go (100%)
 rename src/{pkg => }/net/unix_test.go (100%)
 rename src/{pkg => }/net/unixsock.go (100%)
 rename src/{pkg => }/net/unixsock_plan9.go (100%)
 rename src/{pkg => }/net/unixsock_posix.go (100%)
 rename src/{pkg => }/net/url/example_test.go (100%)
 rename src/{pkg => }/net/url/url.go (100%)
 rename src/{pkg => }/net/url/url_test.go (100%)
 rename src/{pkg => }/net/z_last_test.go (100%)
 rename src/{pkg => }/os/dir_plan9.go (100%)
 rename src/{pkg => }/os/dir_unix.go (100%)
 rename src/{pkg => }/os/dir_windows.go (100%)
 rename src/{pkg => }/os/doc.go (100%)
 rename src/{pkg => }/os/env.go (100%)
 rename src/{pkg => }/os/env_test.go (100%)
 rename src/{pkg => }/os/env_unix_test.go (100%)
 rename src/{pkg => }/os/error.go (100%)
 rename src/{pkg => }/os/error_plan9.go (100%)
 rename src/{pkg => }/os/error_test.go (100%)
 rename src/{pkg => }/os/error_unix.go (100%)
 rename src/{pkg => }/os/error_windows.go (100%)
 rename src/{pkg => }/os/error_windows_test.go (100%)
 rename src/{pkg => }/os/exec.go (100%)
 rename src/{pkg => }/os/exec/example_test.go (100%)
 rename src/{pkg => }/os/exec/exec.go (100%)
 rename src/{pkg => }/os/exec/exec_test.go (100%)
 rename src/{pkg => }/os/exec/lp_plan9.go (100%)
 rename src/{pkg => }/os/exec/lp_test.go (100%)
 rename src/{pkg => }/os/exec/lp_unix.go (100%)
 rename src/{pkg => }/os/exec/lp_unix_test.go (100%)
 rename src/{pkg => }/os/exec/lp_windows.go (100%)
 rename src/{pkg => }/os/exec/lp_windows_test.go (100%)
 rename src/{pkg => }/os/exec_plan9.go (100%)
 rename src/{pkg => }/os/exec_posix.go (100%)
 rename src/{pkg => }/os/exec_unix.go (100%)
 rename src/{pkg => }/os/exec_windows.go (100%)
 rename src/{pkg => }/os/export_test.go (100%)
 rename src/{pkg => }/os/file.go (100%)
 rename src/{pkg => }/os/file_plan9.go (100%)
 rename src/{pkg => }/os/file_posix.go (100%)
 rename src/{pkg => }/os/file_unix.go (100%)
 rename src/{pkg => }/os/file_windows.go (100%)
 rename src/{pkg => }/os/getwd.go (100%)
 rename src/{pkg => }/os/getwd_darwin.go (100%)
 rename src/{pkg => }/os/os_test.go (100%)
 rename src/{pkg => }/os/os_unix_test.go (100%)
 rename src/{pkg => }/os/os_windows_test.go (100%)
 rename src/{pkg => }/os/path.go (100%)
 rename src/{pkg => }/os/path_plan9.go (100%)
 rename src/{pkg => }/os/path_test.go (100%)
 rename src/{pkg => }/os/path_unix.go (100%)
 rename src/{pkg => }/os/path_windows.go (100%)
 rename src/{pkg => }/os/pipe_bsd.go (100%)
 rename src/{pkg => }/os/pipe_linux.go (100%)
 rename src/{pkg => }/os/proc.go (100%)
 rename src/{pkg => }/os/signal/example_test.go (100%)
 rename src/{pkg => }/os/signal/sig.s (100%)
 rename src/{pkg => }/os/signal/signal.go (100%)
 rename src/{pkg => }/os/signal/signal_stub.go (100%)
 rename src/{pkg => }/os/signal/signal_test.go (100%)
 rename src/{pkg => }/os/signal/signal_unix.go (100%)
 rename src/{pkg => }/os/signal/signal_windows_test.go (100%)
 rename src/{pkg => }/os/stat_darwin.go (100%)
 rename src/{pkg => }/os/stat_dragonfly.go (100%)
 rename src/{pkg => }/os/stat_freebsd.go (100%)
 rename src/{pkg => }/os/stat_linux.go (100%)
 rename src/{pkg => }/os/stat_nacl.go (100%)
 rename src/{pkg => }/os/stat_netbsd.go (100%)
 rename src/{pkg => }/os/stat_openbsd.go (100%)
 rename src/{pkg => }/os/stat_plan9.go (100%)
 rename src/{pkg => }/os/stat_solaris.go (100%)
 rename src/{pkg => }/os/stat_windows.go (100%)
 rename src/{pkg => }/os/str.go (100%)
 rename src/{pkg => }/os/sys_bsd.go (100%)
 rename src/{pkg => }/os/sys_darwin.go (100%)
 rename src/{pkg => }/os/sys_freebsd.go (100%)
 rename src/{pkg => }/os/sys_linux.go (100%)
 rename src/{pkg => }/os/sys_nacl.go (100%)
 rename src/{pkg => }/os/sys_plan9.go (100%)
 rename src/{pkg => }/os/sys_solaris.go (100%)
 rename src/{pkg => }/os/sys_unix.go (100%)
 rename src/{pkg => }/os/sys_windows.go (100%)
 rename src/{pkg => }/os/types.go (100%)
 rename src/{pkg => }/os/types_notwin.go (100%)
 rename src/{pkg => }/os/types_windows.go (100%)
 rename src/{pkg => }/os/user/lookup.go (100%)
 rename src/{pkg => }/os/user/lookup_plan9.go (100%)
 rename src/{pkg => }/os/user/lookup_stubs.go (100%)
 rename src/{pkg => }/os/user/lookup_unix.go (100%)
 rename src/{pkg => }/os/user/lookup_windows.go (100%)
 rename src/{pkg => }/os/user/user.go (100%)
 rename src/{pkg => }/os/user/user_test.go (100%)
 rename src/{pkg => }/path/example_test.go (100%)
 rename src/{pkg => }/path/filepath/example_unix_test.go (100%)
 rename src/{pkg => }/path/filepath/export_test.go (100%)
 rename src/{pkg => }/path/filepath/match.go (100%)
 rename src/{pkg => }/path/filepath/match_test.go (100%)
 rename src/{pkg => }/path/filepath/path.go (100%)
 rename src/{pkg => }/path/filepath/path_plan9.go (100%)
 rename src/{pkg => }/path/filepath/path_test.go (100%)
 rename src/{pkg => }/path/filepath/path_unix.go (100%)
 rename src/{pkg => }/path/filepath/path_windows.go (100%)
 rename src/{pkg => }/path/filepath/path_windows_test.go (100%)
 rename src/{pkg => }/path/filepath/symlink.go (100%)
 rename src/{pkg => }/path/filepath/symlink_unix.go (100%)
 rename src/{pkg => }/path/filepath/symlink_windows.go (100%)
 rename src/{pkg => }/path/match.go (100%)
 rename src/{pkg => }/path/match_test.go (100%)
 rename src/{pkg => }/path/path.go (100%)
 rename src/{pkg => }/path/path_test.go (100%)
 rename src/{pkg => }/reflect/all_test.go (100%)
 rename src/{pkg => }/reflect/asm_386.s (100%)
 rename src/{pkg => }/reflect/asm_amd64.s (100%)
 rename src/{pkg => }/reflect/asm_amd64p32.s (100%)
 rename src/{pkg => }/reflect/asm_arm.s (100%)
 rename src/{pkg => }/reflect/deepequal.go (100%)
 rename src/{pkg => }/reflect/example_test.go (100%)
 rename src/{pkg => }/reflect/export_test.go (100%)
 rename src/{pkg => }/reflect/makefunc.go (100%)
 rename src/{pkg => }/reflect/set_test.go (100%)
 rename src/{pkg => }/reflect/tostring_test.go (100%)
 rename src/{pkg => }/reflect/type.go (100%)
 rename src/{pkg => }/reflect/value.go (100%)
 rename src/{pkg => }/regexp/all_test.go (100%)
 rename src/{pkg => }/regexp/example_test.go (100%)
 rename src/{pkg => }/regexp/exec.go (100%)
 rename src/{pkg => }/regexp/exec2_test.go (100%)
 rename src/{pkg => }/regexp/exec_test.go (100%)
 rename src/{pkg => }/regexp/find_test.go (100%)
 rename src/{pkg => }/regexp/onepass.go (100%)
 rename src/{pkg => }/regexp/onepass_test.go (100%)
 rename src/{pkg => }/regexp/regexp.go (100%)
 rename src/{pkg => }/regexp/syntax/compile.go (100%)
 rename src/{pkg => }/regexp/syntax/doc.go (100%)
 rename src/{pkg => }/regexp/syntax/make_perl_groups.pl (100%)
 rename src/{pkg => }/regexp/syntax/parse.go (100%)
 rename src/{pkg => }/regexp/syntax/parse_test.go (100%)
 rename src/{pkg => }/regexp/syntax/perl_groups.go (100%)
 rename src/{pkg => }/regexp/syntax/prog.go (100%)
 rename src/{pkg => }/regexp/syntax/prog_test.go (100%)
 rename src/{pkg => }/regexp/syntax/regexp.go (100%)
 rename src/{pkg => }/regexp/syntax/simplify.go (100%)
 rename src/{pkg => }/regexp/syntax/simplify_test.go (100%)
 rename src/{pkg => }/regexp/testdata/README (100%)
 rename src/{pkg => }/regexp/testdata/basic.dat (100%)
 rename src/{pkg => }/regexp/testdata/nullsubexpr.dat (100%)
 rename src/{pkg => }/regexp/testdata/re2-exhaustive.txt.bz2 (100%)
 rename src/{pkg => }/regexp/testdata/re2-search.txt (100%)
 rename src/{pkg => }/regexp/testdata/repetition.dat (100%)
 rename src/{pkg => }/regexp/testdata/testregex.c (100%)
 rename src/{pkg => }/runtime/Makefile (100%)
 rename src/{pkg => }/runtime/alg.go (100%)
 rename src/{pkg => }/runtime/append_test.go (100%)
 rename src/{pkg => }/runtime/arch_386.go (100%)
 rename src/{pkg => }/runtime/arch_386.h (100%)
 rename src/{pkg => }/runtime/arch_amd64.go (100%)
 rename src/{pkg => }/runtime/arch_amd64.h (100%)
 rename src/{pkg => }/runtime/arch_amd64p32.go (100%)
 rename src/{pkg => }/runtime/arch_amd64p32.h (100%)
 rename src/{pkg => }/runtime/arch_arm.go (100%)
 rename src/{pkg => }/runtime/arch_arm.h (100%)
 rename src/{pkg => }/runtime/asm_386.s (100%)
 rename src/{pkg => }/runtime/asm_amd64.s (100%)
 rename src/{pkg => }/runtime/asm_amd64p32.s (100%)
 rename src/{pkg => }/runtime/asm_arm.s (100%)
 rename src/{pkg => }/runtime/atomic.go (100%)
 rename src/{pkg => }/runtime/atomic_386.c (100%)
 rename src/{pkg => }/runtime/atomic_amd64x.c (100%)
 rename src/{pkg => }/runtime/atomic_arm.go (100%)
 rename src/{pkg => }/runtime/cgo/asm_386.s (100%)
 rename src/{pkg => }/runtime/cgo/asm_amd64.s (100%)
 rename src/{pkg => }/runtime/cgo/asm_arm.s (100%)
 rename src/{pkg => }/runtime/cgo/asm_nacl_amd64p32.s (100%)
 rename src/{pkg => }/runtime/cgo/callbacks.c (100%)
 rename src/{pkg => }/runtime/cgo/cgo.go (100%)
 rename src/{pkg => }/runtime/cgo/dragonfly.c (100%)
 rename src/{pkg => }/runtime/cgo/freebsd.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_386.S (100%)
 rename src/{pkg => }/runtime/cgo/gcc_amd64.S (100%)
 rename src/{pkg => }/runtime/cgo/gcc_android.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_android_arm.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_arm.S (100%)
 rename src/{pkg => }/runtime/cgo/gcc_darwin_386.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_darwin_amd64.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_dragonfly_386.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_dragonfly_amd64.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_fatalf.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_freebsd_386.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_freebsd_amd64.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_freebsd_arm.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_linux_386.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_linux_amd64.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_linux_arm.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_netbsd_386.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_netbsd_amd64.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_netbsd_arm.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_openbsd_386.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_openbsd_amd64.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_setenv.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_util.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_windows_386.c (100%)
 rename src/{pkg => }/runtime/cgo/gcc_windows_amd64.c (100%)
 rename src/{pkg => }/runtime/cgo/iscgo.c (100%)
 rename src/{pkg => }/runtime/cgo/libcgo.h (100%)
 rename src/{pkg => }/runtime/cgo/netbsd.c (100%)
 rename src/{pkg => }/runtime/cgo/openbsd.c (100%)
 rename src/{pkg => }/runtime/cgo/setenv.c (100%)
 rename src/{pkg => }/runtime/cgocall.go (100%)
 rename src/{pkg => }/runtime/cgocall.h (100%)
 rename src/{pkg => }/runtime/chan.go (100%)
 rename src/{pkg => }/runtime/chan.h (100%)
 rename src/{pkg => }/runtime/chan_test.go (100%)
 rename src/{pkg => }/runtime/closure_test.go (100%)
 rename src/{pkg => }/runtime/compiler.go (100%)
 rename src/{pkg => }/runtime/complex.go (100%)
 rename src/{pkg => }/runtime/complex_test.go (100%)
 rename src/{pkg => }/runtime/cpuprof.go (100%)
 rename src/{pkg => }/runtime/crash_cgo_test.go (100%)
 rename src/{pkg => }/runtime/crash_test.go (100%)
 rename src/{pkg => }/runtime/debug.go (100%)
 rename src/{pkg => }/runtime/debug/debug.c (100%)
 rename src/{pkg => }/runtime/debug/garbage.go (100%)
 rename src/{pkg => }/runtime/debug/garbage_test.go (100%)
 rename src/{pkg => }/runtime/debug/heapdump_test.go (100%)
 rename src/{pkg => }/runtime/debug/stack.go (100%)
 rename src/{pkg => }/runtime/debug/stack_test.go (100%)
 rename src/{pkg => }/runtime/debug/stubs.go (100%)
 rename src/{pkg => }/runtime/debug/stubs.s (100%)
 rename src/{pkg => }/runtime/defs.c (100%)
 rename src/{pkg => }/runtime/defs1_linux.go (100%)
 rename src/{pkg => }/runtime/defs2_linux.go (100%)
 rename src/{pkg => }/runtime/defs_android_arm.h (100%)
 rename src/{pkg => }/runtime/defs_arm_linux.go (100%)
 rename src/{pkg => }/runtime/defs_darwin.go (100%)
 rename src/{pkg => }/runtime/defs_darwin_386.h (100%)
 rename src/{pkg => }/runtime/defs_darwin_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_dragonfly.go (100%)
 rename src/{pkg => }/runtime/defs_dragonfly_386.h (100%)
 rename src/{pkg => }/runtime/defs_dragonfly_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_freebsd.go (100%)
 rename src/{pkg => }/runtime/defs_freebsd_386.h (100%)
 rename src/{pkg => }/runtime/defs_freebsd_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_freebsd_arm.h (100%)
 rename src/{pkg => }/runtime/defs_linux.go (100%)
 rename src/{pkg => }/runtime/defs_linux_386.h (100%)
 rename src/{pkg => }/runtime/defs_linux_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_linux_arm.h (100%)
 rename src/{pkg => }/runtime/defs_nacl_386.h (100%)
 rename src/{pkg => }/runtime/defs_nacl_amd64p32.h (100%)
 rename src/{pkg => }/runtime/defs_nacl_arm.h (100%)
 rename src/{pkg => }/runtime/defs_netbsd.go (100%)
 rename src/{pkg => }/runtime/defs_netbsd_386.go (100%)
 rename src/{pkg => }/runtime/defs_netbsd_386.h (100%)
 rename src/{pkg => }/runtime/defs_netbsd_amd64.go (100%)
 rename src/{pkg => }/runtime/defs_netbsd_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_netbsd_arm.go (100%)
 rename src/{pkg => }/runtime/defs_netbsd_arm.h (100%)
 rename src/{pkg => }/runtime/defs_openbsd.go (100%)
 rename src/{pkg => }/runtime/defs_openbsd_386.h (100%)
 rename src/{pkg => }/runtime/defs_openbsd_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_plan9_386.h (100%)
 rename src/{pkg => }/runtime/defs_plan9_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_solaris.go (100%)
 rename src/{pkg => }/runtime/defs_solaris_amd64.go (100%)
 rename src/{pkg => }/runtime/defs_solaris_amd64.h (100%)
 rename src/{pkg => }/runtime/defs_windows.go (100%)
 rename src/{pkg => }/runtime/defs_windows_386.h (100%)
 rename src/{pkg => }/runtime/defs_windows_amd64.h (100%)
 rename src/{pkg => }/runtime/env_plan9.go (100%)
 rename src/{pkg => }/runtime/env_posix.go (100%)
 rename src/{pkg => }/runtime/error.go (100%)
 rename src/{pkg => }/runtime/export_futex_test.go (100%)
 rename src/{pkg => }/runtime/export_test.go (100%)
 rename src/{pkg => }/runtime/extern.go (100%)
 rename src/{pkg => }/runtime/float.c (100%)
 rename src/{pkg => }/runtime/funcdata.h (100%)
 rename src/{pkg => }/runtime/futex_test.go (100%)
 rename src/{pkg => }/runtime/gc_test.go (100%)
 rename src/{pkg => }/runtime/gcinfo_test.go (100%)
 rename src/{pkg => }/runtime/hash_test.go (100%)
 rename src/{pkg => }/runtime/hashmap.go (100%)
 rename src/{pkg => }/runtime/hashmap_fast.go (100%)
 rename src/{pkg => }/runtime/heapdump.c (100%)
 rename src/{pkg => }/runtime/iface.go (100%)
 rename src/{pkg => }/runtime/iface_test.go (100%)
 rename src/{pkg => }/runtime/lfstack.c (100%)
 rename src/{pkg => }/runtime/lfstack_test.go (100%)
 rename src/{pkg => }/runtime/lock_futex.go (100%)
 rename src/{pkg => }/runtime/lock_sema.go (100%)
 rename src/{pkg => }/runtime/malloc.c (100%)
 rename src/{pkg => }/runtime/malloc.go (100%)
 rename src/{pkg => }/runtime/malloc.h (100%)
 rename src/{pkg => }/runtime/malloc_test.go (100%)
 rename src/{pkg => }/runtime/map_test.go (100%)
 rename src/{pkg => }/runtime/mapspeed_test.go (100%)
 rename src/{pkg => }/runtime/mcache.c (100%)
 rename src/{pkg => }/runtime/mcentral.c (100%)
 rename src/{pkg => }/runtime/mem.go (100%)
 rename src/{pkg => }/runtime/mem_darwin.c (100%)
 rename src/{pkg => }/runtime/mem_dragonfly.c (100%)
 rename src/{pkg => }/runtime/mem_freebsd.c (100%)
 rename src/{pkg => }/runtime/mem_linux.c (100%)
 rename src/{pkg => }/runtime/mem_nacl.c (100%)
 rename src/{pkg => }/runtime/mem_netbsd.c (100%)
 rename src/{pkg => }/runtime/mem_openbsd.c (100%)
 rename src/{pkg => }/runtime/mem_plan9.c (100%)
 rename src/{pkg => }/runtime/mem_solaris.c (100%)
 rename src/{pkg => }/runtime/mem_windows.c (100%)
 rename src/{pkg => }/runtime/memclr_386.s (100%)
 rename src/{pkg => }/runtime/memclr_amd64.s (100%)
 rename src/{pkg => }/runtime/memclr_arm.s (100%)
 rename src/{pkg => }/runtime/memclr_plan9_386.s (100%)
 rename src/{pkg => }/runtime/memclr_plan9_amd64.s (100%)
 rename src/{pkg => }/runtime/memmove_386.s (100%)
 rename src/{pkg => }/runtime/memmove_amd64.s (100%)
 rename src/{pkg => }/runtime/memmove_arm.s (100%)
 rename src/{pkg => }/runtime/memmove_linux_amd64_test.go (100%)
 rename src/{pkg => }/runtime/memmove_nacl_amd64p32.s (100%)
 rename src/{pkg => }/runtime/memmove_plan9_386.s (100%)
 rename src/{pkg => }/runtime/memmove_plan9_amd64.s (100%)
 rename src/{pkg => }/runtime/memmove_test.go (100%)
 rename src/{pkg => }/runtime/mfinal_test.go (100%)
 rename src/{pkg => }/runtime/mfixalloc.c (100%)
 rename src/{pkg => }/runtime/mgc0.c (100%)
 rename src/{pkg => }/runtime/mgc0.go (100%)
 rename src/{pkg => }/runtime/mgc0.h (100%)
 rename src/{pkg => }/runtime/mheap.c (100%)
 rename src/{pkg => }/runtime/mknacl.sh (100%)
 rename src/{pkg => }/runtime/mprof.go (100%)
 rename src/{pkg => }/runtime/msize.c (100%)
 rename src/{pkg => }/runtime/netpoll.go (100%)
 rename src/{pkg => }/runtime/netpoll_epoll.go (100%)
 rename src/{pkg => }/runtime/netpoll_kqueue.go (100%)
 rename src/{pkg => }/runtime/netpoll_nacl.go (100%)
 rename src/{pkg => }/runtime/netpoll_solaris.c (100%)
 rename src/{pkg => }/runtime/netpoll_stub.c (100%)
 rename src/{pkg => }/runtime/netpoll_windows.c (100%)
 rename src/{pkg => }/runtime/noasm_arm.go (100%)
 rename src/{pkg => }/runtime/norace_test.go (100%)
 rename src/{pkg => }/runtime/os_android.c (100%)
 rename src/{pkg => }/runtime/os_android.h (100%)
 rename src/{pkg => }/runtime/os_darwin.c (100%)
 rename src/{pkg => }/runtime/os_darwin.go (100%)
 rename src/{pkg => }/runtime/os_darwin.h (100%)
 rename src/{pkg => }/runtime/os_dragonfly.c (100%)
 rename src/{pkg => }/runtime/os_dragonfly.go (100%)
 rename src/{pkg => }/runtime/os_dragonfly.h (100%)
 rename src/{pkg => }/runtime/os_freebsd.c (100%)
 rename src/{pkg => }/runtime/os_freebsd.go (100%)
 rename src/{pkg => }/runtime/os_freebsd.h (100%)
 rename src/{pkg => }/runtime/os_freebsd_arm.c (100%)
 rename src/{pkg => }/runtime/os_linux.c (100%)
 rename src/{pkg => }/runtime/os_linux.go (100%)
 rename src/{pkg => }/runtime/os_linux.h (100%)
 rename src/{pkg => }/runtime/os_linux_386.c (100%)
 rename src/{pkg => }/runtime/os_linux_arm.c (100%)
 rename src/{pkg => }/runtime/os_nacl.c (100%)
 rename src/{pkg => }/runtime/os_nacl.go (100%)
 rename src/{pkg => }/runtime/os_nacl.h (100%)
 rename src/{pkg => }/runtime/os_nacl_arm.c (100%)
 rename src/{pkg => }/runtime/os_netbsd.c (100%)
 rename src/{pkg => }/runtime/os_netbsd.go (100%)
 rename src/{pkg => }/runtime/os_netbsd.h (100%)
 rename src/{pkg => }/runtime/os_netbsd_386.c (100%)
 rename src/{pkg => }/runtime/os_netbsd_amd64.c (100%)
 rename src/{pkg => }/runtime/os_netbsd_arm.c (100%)
 rename src/{pkg => }/runtime/os_openbsd.c (100%)
 rename src/{pkg => }/runtime/os_openbsd.go (100%)
 rename src/{pkg => }/runtime/os_openbsd.h (100%)
 rename src/{pkg => }/runtime/os_plan9.c (100%)
 rename src/{pkg => }/runtime/os_plan9.go (100%)
 rename src/{pkg => }/runtime/os_plan9.h (100%)
 rename src/{pkg => }/runtime/os_plan9_386.c (100%)
 rename src/{pkg => }/runtime/os_plan9_amd64.c (100%)
 rename src/{pkg => }/runtime/os_solaris.c (100%)
 rename src/{pkg => }/runtime/os_solaris.go (100%)
 rename src/{pkg => }/runtime/os_solaris.h (100%)
 rename src/{pkg => }/runtime/os_windows.c (100%)
 rename src/{pkg => }/runtime/os_windows.go (100%)
 rename src/{pkg => }/runtime/os_windows.h (100%)
 rename src/{pkg => }/runtime/os_windows_386.c (100%)
 rename src/{pkg => }/runtime/os_windows_386.go (100%)
 rename src/{pkg => }/runtime/os_windows_amd64.c (100%)
 rename src/{pkg => }/runtime/os_windows_amd64.go (100%)
 rename src/{pkg => }/runtime/panic.c (100%)
 rename src/{pkg => }/runtime/panic.go (100%)
 rename src/{pkg => }/runtime/panic1.go (100%)
 rename src/{pkg => }/runtime/parfor.c (100%)
 rename src/{pkg => }/runtime/parfor_test.go (100%)
 rename src/{pkg => }/runtime/pprof/pprof.go (100%)
 rename src/{pkg => }/runtime/pprof/pprof_test.go (100%)
 rename src/{pkg => }/runtime/print1.go (100%)
 rename src/{pkg => }/runtime/proc.c (100%)
 rename src/{pkg => }/runtime/proc.go (100%)
 rename src/{pkg => }/runtime/proc_test.go (100%)
 rename src/{pkg => }/runtime/race.c (100%)
 rename src/{pkg => }/runtime/race.go (100%)
 rename src/{pkg => }/runtime/race.h (100%)
 rename src/{pkg => }/runtime/race/README (100%)
 rename src/{pkg => }/runtime/race/doc.go (100%)
 rename src/{pkg => }/runtime/race/output_test.go (100%)
 rename src/{pkg => }/runtime/race/race.go (100%)
 rename src/{pkg => }/runtime/race/race_darwin_amd64.syso (100%)
 rename src/{pkg => }/runtime/race/race_freebsd_amd64.syso (100%)
 rename src/{pkg => }/runtime/race/race_linux_amd64.syso (100%)
 rename src/{pkg => }/runtime/race/race_test.go (100%)
 rename src/{pkg => }/runtime/race/race_windows_amd64.syso (100%)
 rename src/{pkg => }/runtime/race/testdata/atomic_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/cgo_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/cgo_test_main.go (100%)
 rename src/{pkg => }/runtime/race/testdata/chan_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/comp_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/finalizer_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/io_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/map_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/mop_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/mutex_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/regression_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/rwmutex_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/select_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/slice_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/sync_test.go (100%)
 rename src/{pkg => }/runtime/race/testdata/waitgroup_test.go (100%)
 rename src/{pkg => }/runtime/race0.go (100%)
 rename src/{pkg => }/runtime/race_amd64.s (100%)
 rename src/{pkg => }/runtime/rdebug.go (100%)
 rename src/{pkg => }/runtime/rt0_android_arm.s (100%)
 rename src/{pkg => }/runtime/rt0_darwin_386.s (100%)
 rename src/{pkg => }/runtime/rt0_darwin_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_dragonfly_386.s (100%)
 rename src/{pkg => }/runtime/rt0_dragonfly_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_freebsd_386.s (100%)
 rename src/{pkg => }/runtime/rt0_freebsd_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_freebsd_arm.s (100%)
 rename src/{pkg => }/runtime/rt0_linux_386.s (100%)
 rename src/{pkg => }/runtime/rt0_linux_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_linux_arm.s (100%)
 rename src/{pkg => }/runtime/rt0_nacl_386.s (100%)
 rename src/{pkg => }/runtime/rt0_nacl_amd64p32.s (100%)
 rename src/{pkg => }/runtime/rt0_nacl_arm.s (100%)
 rename src/{pkg => }/runtime/rt0_netbsd_386.s (100%)
 rename src/{pkg => }/runtime/rt0_netbsd_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_netbsd_arm.s (100%)
 rename src/{pkg => }/runtime/rt0_openbsd_386.s (100%)
 rename src/{pkg => }/runtime/rt0_openbsd_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_plan9_386.s (100%)
 rename src/{pkg => }/runtime/rt0_plan9_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_solaris_amd64.s (100%)
 rename src/{pkg => }/runtime/rt0_windows_386.s (100%)
 rename src/{pkg => }/runtime/rt0_windows_amd64.s (100%)
 rename src/{pkg => }/runtime/rune.go (100%)
 rename src/{pkg => }/runtime/runtime-gdb.py (100%)
 rename src/{pkg => }/runtime/runtime.c (100%)
 rename src/{pkg => }/runtime/runtime.go (100%)
 rename src/{pkg => }/runtime/runtime.h (100%)
 rename src/{pkg => }/runtime/runtime_linux_test.go (100%)
 rename src/{pkg => }/runtime/runtime_test.go (100%)
 rename src/{pkg => }/runtime/runtime_unix_test.go (100%)
 rename src/{pkg => }/runtime/select.go (100%)
 rename src/{pkg => }/runtime/sema.go (100%)
 rename src/{pkg => }/runtime/signal.c (100%)
 rename src/{pkg => }/runtime/signal_386.c (100%)
 rename src/{pkg => }/runtime/signal_amd64x.c (100%)
 rename src/{pkg => }/runtime/signal_android_386.h (100%)
 rename src/{pkg => }/runtime/signal_android_arm.h (100%)
 rename src/{pkg => }/runtime/signal_arm.c (100%)
 rename src/{pkg => }/runtime/signal_darwin_386.h (100%)
 rename src/{pkg => }/runtime/signal_darwin_amd64.h (100%)
 rename src/{pkg => }/runtime/signal_dragonfly_386.h (100%)
 rename src/{pkg => }/runtime/signal_dragonfly_amd64.h (100%)
 rename src/{pkg => }/runtime/signal_freebsd_386.h (100%)
 rename src/{pkg => }/runtime/signal_freebsd_amd64.h (100%)
 rename src/{pkg => }/runtime/signal_freebsd_arm.h (100%)
 rename src/{pkg => }/runtime/signal_linux_386.h (100%)
 rename src/{pkg => }/runtime/signal_linux_amd64.h (100%)
 rename src/{pkg => }/runtime/signal_linux_arm.h (100%)
 rename src/{pkg => }/runtime/signal_nacl_386.h (100%)
 rename src/{pkg => }/runtime/signal_nacl_amd64p32.h (100%)
 rename src/{pkg => }/runtime/signal_nacl_arm.h (100%)
 rename src/{pkg => }/runtime/signal_netbsd_386.h (100%)
 rename src/{pkg => }/runtime/signal_netbsd_amd64.h (100%)
 rename src/{pkg => }/runtime/signal_netbsd_arm.h (100%)
 rename src/{pkg => }/runtime/signal_openbsd_386.h (100%)
 rename src/{pkg => }/runtime/signal_openbsd_amd64.h (100%)
 rename src/{pkg => }/runtime/signal_solaris_amd64.h (100%)
 rename src/{pkg => }/runtime/signal_unix.c (100%)
 rename src/{pkg => }/runtime/signal_unix.go (100%)
 rename src/{pkg => }/runtime/signal_unix.h (100%)
 rename src/{pkg => }/runtime/signals_android.h (100%)
 rename src/{pkg => }/runtime/signals_darwin.h (100%)
 rename src/{pkg => }/runtime/signals_dragonfly.h (100%)
 rename src/{pkg => }/runtime/signals_freebsd.h (100%)
 rename src/{pkg => }/runtime/signals_linux.h (100%)
 rename src/{pkg => }/runtime/signals_nacl.h (100%)
 rename src/{pkg => }/runtime/signals_netbsd.h (100%)
 rename src/{pkg => }/runtime/signals_openbsd.h (100%)
 rename src/{pkg => }/runtime/signals_plan9.h (100%)
 rename src/{pkg => }/runtime/signals_solaris.h (100%)
 rename src/{pkg => }/runtime/signals_windows.h (100%)
 rename src/{pkg => }/runtime/sigqueue.go (100%)
 rename src/{pkg => }/runtime/slice.go (100%)
 rename src/{pkg => }/runtime/softfloat64.go (100%)
 rename src/{pkg => }/runtime/softfloat64_test.go (100%)
 rename src/{pkg => }/runtime/softfloat_arm.c (100%)
 rename src/{pkg => }/runtime/sqrt.go (100%)
 rename src/{pkg => }/runtime/stack.c (100%)
 rename src/{pkg => }/runtime/stack.go (100%)
 rename src/{pkg => }/runtime/stack.h (100%)
 rename src/{pkg => }/runtime/stack_gen_test.go (100%)
 rename src/{pkg => }/runtime/stack_test.go (100%)
 rename src/{pkg => }/runtime/string.c (100%)
 rename src/{pkg => }/runtime/string.go (100%)
 rename src/{pkg => }/runtime/string_test.go (100%)
 rename src/{pkg => }/runtime/stubs.go (100%)
 rename src/{pkg => }/runtime/symtab.go (100%)
 rename src/{pkg => }/runtime/symtab_test.go (100%)
 rename src/{pkg => }/runtime/sys_arm.c (100%)
 rename src/{pkg => }/runtime/sys_darwin_386.s (100%)
 rename src/{pkg => }/runtime/sys_darwin_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_dragonfly_386.s (100%)
 rename src/{pkg => }/runtime/sys_dragonfly_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_freebsd_386.s (100%)
 rename src/{pkg => }/runtime/sys_freebsd_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_freebsd_arm.s (100%)
 rename src/{pkg => }/runtime/sys_linux_386.s (100%)
 rename src/{pkg => }/runtime/sys_linux_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_linux_arm.s (100%)
 rename src/{pkg => }/runtime/sys_nacl_386.s (100%)
 rename src/{pkg => }/runtime/sys_nacl_amd64p32.s (100%)
 rename src/{pkg => }/runtime/sys_nacl_arm.s (100%)
 rename src/{pkg => }/runtime/sys_netbsd_386.s (100%)
 rename src/{pkg => }/runtime/sys_netbsd_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_netbsd_arm.s (100%)
 rename src/{pkg => }/runtime/sys_openbsd_386.s (100%)
 rename src/{pkg => }/runtime/sys_openbsd_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_plan9_386.s (100%)
 rename src/{pkg => }/runtime/sys_plan9_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_solaris_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_windows_386.s (100%)
 rename src/{pkg => }/runtime/sys_windows_amd64.s (100%)
 rename src/{pkg => }/runtime/sys_x86.c (100%)
 rename src/{pkg => }/runtime/syscall_nacl.h (100%)
 rename src/{pkg => }/runtime/syscall_solaris.c (100%)
 rename src/{pkg => }/runtime/syscall_solaris.go (100%)
 rename src/{pkg => }/runtime/syscall_windows.c (100%)
 rename src/{pkg => }/runtime/syscall_windows.go (100%)
 rename src/{pkg => }/runtime/syscall_windows_test.go (100%)
 rename src/{pkg => }/runtime/thunk.s (100%)
 rename src/{pkg => }/runtime/thunk_solaris_amd64.s (100%)
 rename src/{pkg => }/runtime/time.go (100%)
 rename src/{pkg => }/runtime/tls_arm.s (100%)
 rename src/{pkg => }/runtime/traceback.go (100%)
 rename src/{pkg => }/runtime/traceback_windows.go (100%)
 rename src/{pkg => }/runtime/type.h (100%)
 rename src/{pkg => }/runtime/typekind.go (100%)
 rename src/{pkg => }/runtime/typekind.h (100%)
 rename src/{pkg => }/runtime/vdso_linux_amd64.c (100%)
 rename src/{pkg => }/runtime/vlop_386.s (100%)
 rename src/{pkg => }/runtime/vlop_arm.s (100%)
 rename src/{pkg => }/runtime/vlop_arm_test.go (100%)
 rename src/{pkg => }/runtime/vlrt.c (100%)
 rename src/{pkg => }/runtime/vlrt.go (100%)
 rename src/{pkg => }/sort/example_interface_test.go (100%)
 rename src/{pkg => }/sort/example_keys_test.go (100%)
 rename src/{pkg => }/sort/example_multi_test.go (100%)
 rename src/{pkg => }/sort/example_test.go (100%)
 rename src/{pkg => }/sort/example_wrapper_test.go (100%)
 rename src/{pkg => }/sort/export_test.go (100%)
 rename src/{pkg => }/sort/search.go (100%)
 rename src/{pkg => }/sort/search_test.go (100%)
 rename src/{pkg => }/sort/sort.go (100%)
 rename src/{pkg => }/sort/sort_test.go (100%)
 rename src/{pkg => }/strconv/atob.go (100%)
 rename src/{pkg => }/strconv/atob_test.go (100%)
 rename src/{pkg => }/strconv/atof.go (100%)
 rename src/{pkg => }/strconv/atof_test.go (100%)
 rename src/{pkg => }/strconv/atoi.go (100%)
 rename src/{pkg => }/strconv/atoi_test.go (100%)
 rename src/{pkg => }/strconv/decimal.go (100%)
 rename src/{pkg => }/strconv/decimal_test.go (100%)
 rename src/{pkg => }/strconv/extfloat.go (100%)
 rename src/{pkg => }/strconv/fp_test.go (100%)
 rename src/{pkg => }/strconv/ftoa.go (100%)
 rename src/{pkg => }/strconv/ftoa_test.go (100%)
 rename src/{pkg => }/strconv/internal_test.go (100%)
 rename src/{pkg => }/strconv/isprint.go (100%)
 rename src/{pkg => }/strconv/itoa.go (100%)
 rename src/{pkg => }/strconv/itoa_test.go (100%)
 rename src/{pkg => }/strconv/makeisprint.go (100%)
 rename src/{pkg => }/strconv/quote.go (100%)
 rename src/{pkg => }/strconv/quote_example_test.go (100%)
 rename src/{pkg => }/strconv/quote_test.go (100%)
 rename src/{pkg => }/strconv/strconv_test.go (100%)
 rename src/{pkg => }/strconv/testdata/testfp.txt (100%)
 rename src/{pkg => }/strings/example_test.go (100%)
 rename src/{pkg => }/strings/export_test.go (100%)
 rename src/{pkg => }/strings/reader.go (100%)
 rename src/{pkg => }/strings/reader_test.go (100%)
 rename src/{pkg => }/strings/replace.go (100%)
 rename src/{pkg => }/strings/replace_test.go (100%)
 rename src/{pkg => }/strings/search.go (100%)
 rename src/{pkg => }/strings/search_test.go (100%)
 rename src/{pkg => }/strings/strings.go (100%)
 rename src/{pkg => }/strings/strings.s (100%)
 rename src/{pkg => }/strings/strings_decl.go (100%)
 rename src/{pkg => }/strings/strings_test.go (100%)
 rename src/{pkg => }/sync/atomic/64bit_arm.go (100%)
 rename src/{pkg => }/sync/atomic/asm_386.s (100%)
 rename src/{pkg => }/sync/atomic/asm_amd64.s (100%)
 rename src/{pkg => }/sync/atomic/asm_amd64p32.s (100%)
 rename src/{pkg => }/sync/atomic/asm_arm.s (100%)
 rename src/{pkg => }/sync/atomic/asm_freebsd_arm.s (100%)
 rename src/{pkg => }/sync/atomic/asm_linux_arm.s (100%)
 rename src/{pkg => }/sync/atomic/asm_nacl_arm.s (100%)
 rename src/{pkg => }/sync/atomic/asm_netbsd_arm.s (100%)
 rename src/{pkg => }/sync/atomic/atomic_linux_arm_test.go (100%)
 rename src/{pkg => }/sync/atomic/atomic_test.go (100%)
 rename src/{pkg => }/sync/atomic/doc.go (100%)
 rename src/{pkg => }/sync/atomic/export_linux_arm_test.go (100%)
 rename src/{pkg => }/sync/atomic/race.s (100%)
 rename src/{pkg => }/sync/cond.go (100%)
 rename src/{pkg => }/sync/cond_test.go (100%)
 rename src/{pkg => }/sync/example_test.go (100%)
 rename src/{pkg => }/sync/export_test.go (100%)
 rename src/{pkg => }/sync/mutex.go (100%)
 rename src/{pkg => }/sync/mutex_test.go (100%)
 rename src/{pkg => }/sync/once.go (100%)
 rename src/{pkg => }/sync/once_test.go (100%)
 rename src/{pkg => }/sync/pool.go (100%)
 rename src/{pkg => }/sync/pool_test.go (100%)
 rename src/{pkg => }/sync/race.go (100%)
 rename src/{pkg => }/sync/race0.go (100%)
 rename src/{pkg => }/sync/runtime.go (100%)
 rename src/{pkg => }/sync/runtime_sema_test.go (100%)
 rename src/{pkg => }/sync/rwmutex.go (100%)
 rename src/{pkg => }/sync/rwmutex_test.go (100%)
 rename src/{pkg => }/sync/waitgroup.go (100%)
 rename src/{pkg => }/sync/waitgroup_test.go (100%)
 rename src/{pkg => }/syscall/asm_darwin_386.s (100%)
 rename src/{pkg => }/syscall/asm_darwin_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_dragonfly_386.s (100%)
 rename src/{pkg => }/syscall/asm_dragonfly_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_freebsd_386.s (100%)
 rename src/{pkg => }/syscall/asm_freebsd_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_freebsd_arm.s (100%)
 rename src/{pkg => }/syscall/asm_linux_386.s (100%)
 rename src/{pkg => }/syscall/asm_linux_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_linux_arm.s (100%)
 rename src/{pkg => }/syscall/asm_nacl_386.s (100%)
 rename src/{pkg => }/syscall/asm_nacl_amd64p32.s (100%)
 rename src/{pkg => }/syscall/asm_nacl_arm.s (100%)
 rename src/{pkg => }/syscall/asm_netbsd_386.s (100%)
 rename src/{pkg => }/syscall/asm_netbsd_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_netbsd_arm.s (100%)
 rename src/{pkg => }/syscall/asm_openbsd_386.s (100%)
 rename src/{pkg => }/syscall/asm_openbsd_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_plan9_386.s (100%)
 rename src/{pkg => }/syscall/asm_plan9_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_solaris_amd64.s (100%)
 rename src/{pkg => }/syscall/asm_windows.s (100%)
 rename src/{pkg => }/syscall/bpf_bsd.go (100%)
 rename src/{pkg => }/syscall/creds_test.go (100%)
 rename src/{pkg => }/syscall/dir_plan9.go (100%)
 rename src/{pkg => }/syscall/dll_windows.go (100%)
 rename src/{pkg => }/syscall/env_plan9.go (100%)
 rename src/{pkg => }/syscall/env_unix.go (100%)
 rename src/{pkg => }/syscall/env_windows.go (100%)
 rename src/{pkg => }/syscall/exec_bsd.go (100%)
 rename src/{pkg => }/syscall/exec_linux.go (100%)
 rename src/{pkg => }/syscall/exec_plan9.go (100%)
 rename src/{pkg => }/syscall/exec_solaris.go (100%)
 rename src/{pkg => }/syscall/exec_unix.go (100%)
 rename src/{pkg => }/syscall/exec_windows.go (100%)
 rename src/{pkg => }/syscall/fd_nacl.go (100%)
 rename src/{pkg => }/syscall/flock.go (100%)
 rename src/{pkg => }/syscall/flock_linux_32bit.go (100%)
 rename src/{pkg => }/syscall/fs_nacl.go (100%)
 rename src/{pkg => }/syscall/lsf_linux.go (100%)
 rename src/{pkg => }/syscall/mkall.sh (100%)
 rename src/{pkg => }/syscall/mkall_windows.bat (100%)
 rename src/{pkg => }/syscall/mkerrors.sh (100%)
 rename src/{pkg => }/syscall/mksyscall.pl (100%)
 rename src/{pkg => }/syscall/mksyscall_solaris.pl (100%)
 rename src/{pkg => }/syscall/mksyscall_windows.go (100%)
 rename src/{pkg => }/syscall/mksysctl_openbsd.pl (100%)
 rename src/{pkg => }/syscall/mksysnum_darwin.pl (100%)
 rename src/{pkg => }/syscall/mksysnum_dragonfly.pl (100%)
 rename src/{pkg => }/syscall/mksysnum_freebsd.pl (100%)
 rename src/{pkg => }/syscall/mksysnum_linux.pl (100%)
 rename src/{pkg => }/syscall/mksysnum_netbsd.pl (100%)
 rename src/{pkg => }/syscall/mksysnum_openbsd.pl (100%)
 rename src/{pkg => }/syscall/mksysnum_plan9.sh (100%)
 rename src/{pkg => }/syscall/mmap_unix_test.go (100%)
 rename src/{pkg => }/syscall/net_nacl.go (100%)
 rename src/{pkg => }/syscall/netlink_linux.go (100%)
 rename src/{pkg => }/syscall/race.go (100%)
 rename src/{pkg => }/syscall/race0.go (100%)
 rename src/{pkg => }/syscall/route_bsd.go (100%)
 rename src/{pkg => }/syscall/route_darwin.go (100%)
 rename src/{pkg => }/syscall/route_dragonfly.go (100%)
 rename src/{pkg => }/syscall/route_freebsd.go (100%)
 rename src/{pkg => }/syscall/route_freebsd_32bit.go (100%)
 rename src/{pkg => }/syscall/route_freebsd_64bit.go (100%)
 rename src/{pkg => }/syscall/route_netbsd.go (100%)
 rename src/{pkg => }/syscall/route_openbsd.go (100%)
 rename src/{pkg => }/syscall/security_windows.go (100%)
 rename src/{pkg => }/syscall/so_solaris.go (100%)
 rename src/{pkg => }/syscall/sockcmsg_linux.go (100%)
 rename src/{pkg => }/syscall/sockcmsg_unix.go (100%)
 rename src/{pkg => }/syscall/srpc_nacl.go (100%)
 rename src/{pkg => }/syscall/str.go (100%)
 rename src/{pkg => }/syscall/syscall.go (100%)
 rename src/{pkg => }/syscall/syscall_bsd.go (100%)
 rename src/{pkg => }/syscall/syscall_bsd_test.go (100%)
 rename src/{pkg => }/syscall/syscall_darwin.go (100%)
 rename src/{pkg => }/syscall/syscall_darwin_386.go (100%)
 rename src/{pkg => }/syscall/syscall_darwin_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_dragonfly.go (100%)
 rename src/{pkg => }/syscall/syscall_dragonfly_386.go (100%)
 rename src/{pkg => }/syscall/syscall_dragonfly_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_freebsd.go (100%)
 rename src/{pkg => }/syscall/syscall_freebsd_386.go (100%)
 rename src/{pkg => }/syscall/syscall_freebsd_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_freebsd_arm.go (100%)
 rename src/{pkg => }/syscall/syscall_linux.go (100%)
 rename src/{pkg => }/syscall/syscall_linux_386.go (100%)
 rename src/{pkg => }/syscall/syscall_linux_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_linux_arm.go (100%)
 rename src/{pkg => }/syscall/syscall_nacl.go (100%)
 rename src/{pkg => }/syscall/syscall_nacl_386.go (100%)
 rename src/{pkg => }/syscall/syscall_nacl_amd64p32.go (100%)
 rename src/{pkg => }/syscall/syscall_nacl_arm.go (100%)
 rename src/{pkg => }/syscall/syscall_netbsd.go (100%)
 rename src/{pkg => }/syscall/syscall_netbsd_386.go (100%)
 rename src/{pkg => }/syscall/syscall_netbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_netbsd_arm.go (100%)
 rename src/{pkg => }/syscall/syscall_no_getwd.go (100%)
 rename src/{pkg => }/syscall/syscall_openbsd.go (100%)
 rename src/{pkg => }/syscall/syscall_openbsd_386.go (100%)
 rename src/{pkg => }/syscall/syscall_openbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_plan9.go (100%)
 rename src/{pkg => }/syscall/syscall_solaris.go (100%)
 rename src/{pkg => }/syscall/syscall_solaris_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_test.go (100%)
 rename src/{pkg => }/syscall/syscall_unix.go (100%)
 rename src/{pkg => }/syscall/syscall_unix_test.go (100%)
 rename src/{pkg => }/syscall/syscall_windows.go (100%)
 rename src/{pkg => }/syscall/syscall_windows_386.go (100%)
 rename src/{pkg => }/syscall/syscall_windows_amd64.go (100%)
 rename src/{pkg => }/syscall/syscall_windows_test.go (100%)
 rename src/{pkg => }/syscall/tables_nacl.go (100%)
 rename src/{pkg => }/syscall/time_nacl_386.s (100%)
 rename src/{pkg => }/syscall/time_nacl_amd64p32.s (100%)
 rename src/{pkg => }/syscall/time_nacl_arm.s (100%)
 rename src/{pkg => }/syscall/types_darwin.go (100%)
 rename src/{pkg => }/syscall/types_dragonfly.go (100%)
 rename src/{pkg => }/syscall/types_freebsd.go (100%)
 rename src/{pkg => }/syscall/types_linux.go (100%)
 rename src/{pkg => }/syscall/types_netbsd.go (100%)
 rename src/{pkg => }/syscall/types_openbsd.go (100%)
 rename src/{pkg => }/syscall/types_plan9.c (100%)
 rename src/{pkg => }/syscall/types_solaris.go (100%)
 rename src/{pkg => }/syscall/unzip_nacl.go (100%)
 rename src/{pkg => }/syscall/zerrors_darwin_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_darwin_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_dragonfly_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_dragonfly_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_freebsd_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_freebsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_freebsd_arm.go (100%)
 rename src/{pkg => }/syscall/zerrors_linux_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_linux_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_linux_arm.go (100%)
 rename src/{pkg => }/syscall/zerrors_netbsd_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_netbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_netbsd_arm.go (100%)
 rename src/{pkg => }/syscall/zerrors_openbsd_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_openbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_plan9_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_plan9_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_solaris_amd64.go (100%)
 rename src/{pkg => }/syscall/zerrors_windows.go (100%)
 rename src/{pkg => }/syscall/zerrors_windows_386.go (100%)
 rename src/{pkg => }/syscall/zerrors_windows_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_darwin_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_darwin_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_dragonfly_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_dragonfly_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_freebsd_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_freebsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_freebsd_arm.go (100%)
 rename src/{pkg => }/syscall/zsyscall_linux_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_linux_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_linux_arm.go (100%)
 rename src/{pkg => }/syscall/zsyscall_nacl_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_nacl_amd64p32.go (100%)
 rename src/{pkg => }/syscall/zsyscall_nacl_arm.go (100%)
 rename src/{pkg => }/syscall/zsyscall_netbsd_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_netbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_netbsd_arm.go (100%)
 rename src/{pkg => }/syscall/zsyscall_openbsd_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_openbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_plan9_386.go (100%)
 rename src/{pkg => }/syscall/zsyscall_plan9_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_solaris_amd64.go (100%)
 rename src/{pkg => }/syscall/zsyscall_windows.go (100%)
 rename src/{pkg => }/syscall/zsysctl_openbsd.go (100%)
 rename src/{pkg => }/syscall/zsysnum_darwin_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_darwin_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_dragonfly_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_dragonfly_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_freebsd_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_freebsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_freebsd_arm.go (100%)
 rename src/{pkg => }/syscall/zsysnum_linux_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_linux_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_linux_arm.go (100%)
 rename src/{pkg => }/syscall/zsysnum_netbsd_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_netbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_netbsd_arm.go (100%)
 rename src/{pkg => }/syscall/zsysnum_openbsd_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_openbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_plan9_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_plan9_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_solaris_amd64.go (100%)
 rename src/{pkg => }/syscall/zsysnum_windows_386.go (100%)
 rename src/{pkg => }/syscall/zsysnum_windows_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_darwin_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_darwin_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_dragonfly_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_dragonfly_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_freebsd_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_freebsd_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_freebsd_arm.go (100%)
 rename src/{pkg => }/syscall/ztypes_linux_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_linux_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_linux_arm.go (100%)
 rename src/{pkg => }/syscall/ztypes_netbsd_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_netbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_netbsd_arm.go (100%)
 rename src/{pkg => }/syscall/ztypes_openbsd_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_openbsd_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_plan9_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_plan9_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_solaris_amd64.go (100%)
 rename src/{pkg => }/syscall/ztypes_windows.go (100%)
 rename src/{pkg => }/syscall/ztypes_windows_386.go (100%)
 rename src/{pkg => }/syscall/ztypes_windows_amd64.go (100%)
 rename src/{pkg => }/testing/allocs.go (100%)
 rename src/{pkg => }/testing/benchmark.go (100%)
 rename src/{pkg => }/testing/benchmark_test.go (100%)
 rename src/{pkg => }/testing/cover.go (100%)
 rename src/{pkg => }/testing/example.go (100%)
 rename src/{pkg => }/testing/export_test.go (100%)
 rename src/{pkg => }/testing/iotest/logger.go (100%)
 rename src/{pkg => }/testing/iotest/reader.go (100%)
 rename src/{pkg => }/testing/iotest/writer.go (100%)
 rename src/{pkg => }/testing/quick/quick.go (100%)
 rename src/{pkg => }/testing/quick/quick_test.go (100%)
 rename src/{pkg => }/testing/testing.go (100%)
 rename src/{pkg => }/text/scanner/scanner.go (100%)
 rename src/{pkg => }/text/scanner/scanner_test.go (100%)
 rename src/{pkg => }/text/tabwriter/example_test.go (100%)
 rename src/{pkg => }/text/tabwriter/tabwriter.go (100%)
 rename src/{pkg => }/text/tabwriter/tabwriter_test.go (100%)
 rename src/{pkg => }/text/template/doc.go (100%)
 rename src/{pkg => }/text/template/example_test.go (100%)
 rename src/{pkg => }/text/template/examplefiles_test.go (100%)
 rename src/{pkg => }/text/template/examplefunc_test.go (100%)
 rename src/{pkg => }/text/template/exec.go (100%)
 rename src/{pkg => }/text/template/exec_test.go (100%)
 rename src/{pkg => }/text/template/funcs.go (100%)
 rename src/{pkg => }/text/template/helper.go (100%)
 rename src/{pkg => }/text/template/multi_test.go (100%)
 rename src/{pkg => }/text/template/parse/lex.go (100%)
 rename src/{pkg => }/text/template/parse/lex_test.go (100%)
 rename src/{pkg => }/text/template/parse/node.go (100%)
 rename src/{pkg => }/text/template/parse/parse.go (100%)
 rename src/{pkg => }/text/template/parse/parse_test.go (100%)
 rename src/{pkg => }/text/template/template.go (100%)
 rename src/{pkg => }/text/template/testdata/file1.tmpl (100%)
 rename src/{pkg => }/text/template/testdata/file2.tmpl (100%)
 rename src/{pkg => }/text/template/testdata/tmpl1.tmpl (100%)
 rename src/{pkg => }/text/template/testdata/tmpl2.tmpl (100%)
 rename src/{pkg => }/time/example_test.go (100%)
 rename src/{pkg => }/time/export_test.go (100%)
 rename src/{pkg => }/time/export_windows_test.go (100%)
 rename src/{pkg => }/time/format.go (100%)
 rename src/{pkg => }/time/format_test.go (100%)
 rename src/{pkg => }/time/genzabbrs.go (100%)
 rename src/{pkg => }/time/internal_test.go (100%)
 rename src/{pkg => }/time/sleep.go (100%)
 rename src/{pkg => }/time/sleep_test.go (100%)
 rename src/{pkg => }/time/sys_plan9.go (100%)
 rename src/{pkg => }/time/sys_unix.go (100%)
 rename src/{pkg => }/time/sys_windows.go (100%)
 rename src/{pkg => }/time/tick.go (100%)
 rename src/{pkg => }/time/tick_test.go (100%)
 rename src/{pkg => }/time/time.go (100%)
 rename src/{pkg => }/time/time_test.go (100%)
 rename src/{pkg => }/time/zoneinfo.go (100%)
 rename src/{pkg => }/time/zoneinfo_abbrs_windows.go (100%)
 rename src/{pkg => }/time/zoneinfo_plan9.go (100%)
 rename src/{pkg => }/time/zoneinfo_read.go (100%)
 rename src/{pkg => }/time/zoneinfo_test.go (100%)
 rename src/{pkg => }/time/zoneinfo_unix.go (100%)
 rename src/{pkg => }/time/zoneinfo_windows.go (100%)
 rename src/{pkg => }/time/zoneinfo_windows_test.go (100%)
 rename src/{pkg => }/unicode/casetables.go (100%)
 rename src/{pkg => }/unicode/digit.go (100%)
 rename src/{pkg => }/unicode/digit_test.go (100%)
 rename src/{pkg => }/unicode/graphic.go (100%)
 rename src/{pkg => }/unicode/graphic_test.go (100%)
 rename src/{pkg => }/unicode/letter.go (100%)
 rename src/{pkg => }/unicode/letter_test.go (100%)
 rename src/{pkg => }/unicode/maketables.go (100%)
 rename src/{pkg => }/unicode/script_test.go (100%)
 rename src/{pkg => }/unicode/tables.go (100%)
 rename src/{pkg => }/unicode/utf16/export_test.go (100%)
 rename src/{pkg => }/unicode/utf16/utf16.go (100%)
 rename src/{pkg => }/unicode/utf16/utf16_test.go (100%)
 rename src/{pkg => }/unicode/utf8/example_test.go (100%)
 rename src/{pkg => }/unicode/utf8/utf8.go (100%)
 rename src/{pkg => }/unicode/utf8/utf8_test.go (100%)
 rename src/{pkg => }/unsafe/unsafe.go (100%)

diff --git a/src/pkg/archive/tar/common.go b/src/archive/tar/common.go
similarity index 100%
rename from src/pkg/archive/tar/common.go
rename to src/archive/tar/common.go
diff --git a/src/pkg/archive/tar/example_test.go b/src/archive/tar/example_test.go
similarity index 100%
rename from src/pkg/archive/tar/example_test.go
rename to src/archive/tar/example_test.go
diff --git a/src/pkg/archive/tar/reader.go b/src/archive/tar/reader.go
similarity index 100%
rename from src/pkg/archive/tar/reader.go
rename to src/archive/tar/reader.go
diff --git a/src/pkg/archive/tar/reader_test.go b/src/archive/tar/reader_test.go
similarity index 100%
rename from src/pkg/archive/tar/reader_test.go
rename to src/archive/tar/reader_test.go
diff --git a/src/pkg/archive/tar/stat_atim.go b/src/archive/tar/stat_atim.go
similarity index 100%
rename from src/pkg/archive/tar/stat_atim.go
rename to src/archive/tar/stat_atim.go
diff --git a/src/pkg/archive/tar/stat_atimespec.go b/src/archive/tar/stat_atimespec.go
similarity index 100%
rename from src/pkg/archive/tar/stat_atimespec.go
rename to src/archive/tar/stat_atimespec.go
diff --git a/src/pkg/archive/tar/stat_unix.go b/src/archive/tar/stat_unix.go
similarity index 100%
rename from src/pkg/archive/tar/stat_unix.go
rename to src/archive/tar/stat_unix.go
diff --git a/src/pkg/archive/tar/tar_test.go b/src/archive/tar/tar_test.go
similarity index 100%
rename from src/pkg/archive/tar/tar_test.go
rename to src/archive/tar/tar_test.go
diff --git a/src/pkg/archive/tar/testdata/gnu.tar b/src/archive/tar/testdata/gnu.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/gnu.tar
rename to src/archive/tar/testdata/gnu.tar
diff --git a/src/pkg/archive/tar/testdata/nil-uid.tar b/src/archive/tar/testdata/nil-uid.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/nil-uid.tar
rename to src/archive/tar/testdata/nil-uid.tar
diff --git a/src/pkg/archive/tar/testdata/pax.tar b/src/archive/tar/testdata/pax.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/pax.tar
rename to src/archive/tar/testdata/pax.tar
diff --git a/src/pkg/archive/tar/testdata/small.txt b/src/archive/tar/testdata/small.txt
similarity index 100%
rename from src/pkg/archive/tar/testdata/small.txt
rename to src/archive/tar/testdata/small.txt
diff --git a/src/pkg/archive/tar/testdata/small2.txt b/src/archive/tar/testdata/small2.txt
similarity index 100%
rename from src/pkg/archive/tar/testdata/small2.txt
rename to src/archive/tar/testdata/small2.txt
diff --git a/src/pkg/archive/tar/testdata/sparse-formats.tar b/src/archive/tar/testdata/sparse-formats.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/sparse-formats.tar
rename to src/archive/tar/testdata/sparse-formats.tar
diff --git a/src/pkg/archive/tar/testdata/star.tar b/src/archive/tar/testdata/star.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/star.tar
rename to src/archive/tar/testdata/star.tar
diff --git a/src/pkg/archive/tar/testdata/ustar.tar b/src/archive/tar/testdata/ustar.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/ustar.tar
rename to src/archive/tar/testdata/ustar.tar
diff --git a/src/pkg/archive/tar/testdata/v7.tar b/src/archive/tar/testdata/v7.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/v7.tar
rename to src/archive/tar/testdata/v7.tar
diff --git a/src/pkg/archive/tar/testdata/writer-big-long.tar b/src/archive/tar/testdata/writer-big-long.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/writer-big-long.tar
rename to src/archive/tar/testdata/writer-big-long.tar
diff --git a/src/pkg/archive/tar/testdata/writer-big.tar b/src/archive/tar/testdata/writer-big.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/writer-big.tar
rename to src/archive/tar/testdata/writer-big.tar
diff --git a/src/pkg/archive/tar/testdata/writer.tar b/src/archive/tar/testdata/writer.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/writer.tar
rename to src/archive/tar/testdata/writer.tar
diff --git a/src/pkg/archive/tar/testdata/xattrs.tar b/src/archive/tar/testdata/xattrs.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/xattrs.tar
rename to src/archive/tar/testdata/xattrs.tar
diff --git a/src/pkg/archive/tar/writer.go b/src/archive/tar/writer.go
similarity index 100%
rename from src/pkg/archive/tar/writer.go
rename to src/archive/tar/writer.go
diff --git a/src/pkg/archive/tar/writer_test.go b/src/archive/tar/writer_test.go
similarity index 100%
rename from src/pkg/archive/tar/writer_test.go
rename to src/archive/tar/writer_test.go
diff --git a/src/pkg/archive/zip/example_test.go b/src/archive/zip/example_test.go
similarity index 100%
rename from src/pkg/archive/zip/example_test.go
rename to src/archive/zip/example_test.go
diff --git a/src/pkg/archive/zip/reader.go b/src/archive/zip/reader.go
similarity index 100%
rename from src/pkg/archive/zip/reader.go
rename to src/archive/zip/reader.go
diff --git a/src/pkg/archive/zip/reader_test.go b/src/archive/zip/reader_test.go
similarity index 100%
rename from src/pkg/archive/zip/reader_test.go
rename to src/archive/zip/reader_test.go
diff --git a/src/pkg/archive/zip/register.go b/src/archive/zip/register.go
similarity index 100%
rename from src/pkg/archive/zip/register.go
rename to src/archive/zip/register.go
diff --git a/src/pkg/archive/zip/struct.go b/src/archive/zip/struct.go
similarity index 100%
rename from src/pkg/archive/zip/struct.go
rename to src/archive/zip/struct.go
diff --git a/src/pkg/archive/zip/testdata/crc32-not-streamed.zip b/src/archive/zip/testdata/crc32-not-streamed.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/crc32-not-streamed.zip
rename to src/archive/zip/testdata/crc32-not-streamed.zip
diff --git a/src/pkg/archive/zip/testdata/dd.zip b/src/archive/zip/testdata/dd.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/dd.zip
rename to src/archive/zip/testdata/dd.zip
diff --git a/src/pkg/archive/zip/testdata/go-no-datadesc-sig.zip b/src/archive/zip/testdata/go-no-datadesc-sig.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/go-no-datadesc-sig.zip
rename to src/archive/zip/testdata/go-no-datadesc-sig.zip
diff --git a/src/pkg/archive/zip/testdata/go-with-datadesc-sig.zip b/src/archive/zip/testdata/go-with-datadesc-sig.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/go-with-datadesc-sig.zip
rename to src/archive/zip/testdata/go-with-datadesc-sig.zip
diff --git a/src/pkg/archive/zip/testdata/gophercolor16x16.png b/src/archive/zip/testdata/gophercolor16x16.png
similarity index 100%
rename from src/pkg/archive/zip/testdata/gophercolor16x16.png
rename to src/archive/zip/testdata/gophercolor16x16.png
diff --git a/src/pkg/archive/zip/testdata/readme.notzip b/src/archive/zip/testdata/readme.notzip
similarity index 100%
rename from src/pkg/archive/zip/testdata/readme.notzip
rename to src/archive/zip/testdata/readme.notzip
diff --git a/src/pkg/archive/zip/testdata/readme.zip b/src/archive/zip/testdata/readme.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/readme.zip
rename to src/archive/zip/testdata/readme.zip
diff --git a/src/pkg/archive/zip/testdata/symlink.zip b/src/archive/zip/testdata/symlink.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/symlink.zip
rename to src/archive/zip/testdata/symlink.zip
diff --git a/src/pkg/archive/zip/testdata/test-trailing-junk.zip b/src/archive/zip/testdata/test-trailing-junk.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/test-trailing-junk.zip
rename to src/archive/zip/testdata/test-trailing-junk.zip
diff --git a/src/pkg/archive/zip/testdata/test.zip b/src/archive/zip/testdata/test.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/test.zip
rename to src/archive/zip/testdata/test.zip
diff --git a/src/pkg/archive/zip/testdata/unix.zip b/src/archive/zip/testdata/unix.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/unix.zip
rename to src/archive/zip/testdata/unix.zip
diff --git a/src/pkg/archive/zip/testdata/winxp.zip b/src/archive/zip/testdata/winxp.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/winxp.zip
rename to src/archive/zip/testdata/winxp.zip
diff --git a/src/pkg/archive/zip/testdata/zip64-2.zip b/src/archive/zip/testdata/zip64-2.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/zip64-2.zip
rename to src/archive/zip/testdata/zip64-2.zip
diff --git a/src/pkg/archive/zip/testdata/zip64.zip b/src/archive/zip/testdata/zip64.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/zip64.zip
rename to src/archive/zip/testdata/zip64.zip
diff --git a/src/pkg/archive/zip/writer.go b/src/archive/zip/writer.go
similarity index 100%
rename from src/pkg/archive/zip/writer.go
rename to src/archive/zip/writer.go
diff --git a/src/pkg/archive/zip/writer_test.go b/src/archive/zip/writer_test.go
similarity index 100%
rename from src/pkg/archive/zip/writer_test.go
rename to src/archive/zip/writer_test.go
diff --git a/src/pkg/archive/zip/zip_test.go b/src/archive/zip/zip_test.go
similarity index 100%
rename from src/pkg/archive/zip/zip_test.go
rename to src/archive/zip/zip_test.go
diff --git a/src/pkg/bufio/bufio.go b/src/bufio/bufio.go
similarity index 100%
rename from src/pkg/bufio/bufio.go
rename to src/bufio/bufio.go
diff --git a/src/pkg/bufio/bufio_test.go b/src/bufio/bufio_test.go
similarity index 100%
rename from src/pkg/bufio/bufio_test.go
rename to src/bufio/bufio_test.go
diff --git a/src/pkg/bufio/example_test.go b/src/bufio/example_test.go
similarity index 100%
rename from src/pkg/bufio/example_test.go
rename to src/bufio/example_test.go
diff --git a/src/pkg/bufio/export_test.go b/src/bufio/export_test.go
similarity index 100%
rename from src/pkg/bufio/export_test.go
rename to src/bufio/export_test.go
diff --git a/src/pkg/bufio/scan.go b/src/bufio/scan.go
similarity index 100%
rename from src/pkg/bufio/scan.go
rename to src/bufio/scan.go
diff --git a/src/pkg/bufio/scan_test.go b/src/bufio/scan_test.go
similarity index 100%
rename from src/pkg/bufio/scan_test.go
rename to src/bufio/scan_test.go
diff --git a/src/pkg/builtin/builtin.go b/src/builtin/builtin.go
similarity index 100%
rename from src/pkg/builtin/builtin.go
rename to src/builtin/builtin.go
diff --git a/src/pkg/bytes/buffer.go b/src/bytes/buffer.go
similarity index 100%
rename from src/pkg/bytes/buffer.go
rename to src/bytes/buffer.go
diff --git a/src/pkg/bytes/buffer_test.go b/src/bytes/buffer_test.go
similarity index 100%
rename from src/pkg/bytes/buffer_test.go
rename to src/bytes/buffer_test.go
diff --git a/src/pkg/bytes/bytes.go b/src/bytes/bytes.go
similarity index 100%
rename from src/pkg/bytes/bytes.go
rename to src/bytes/bytes.go
diff --git a/src/pkg/bytes/bytes.s b/src/bytes/bytes.s
similarity index 100%
rename from src/pkg/bytes/bytes.s
rename to src/bytes/bytes.s
diff --git a/src/pkg/bytes/bytes_decl.go b/src/bytes/bytes_decl.go
similarity index 100%
rename from src/pkg/bytes/bytes_decl.go
rename to src/bytes/bytes_decl.go
diff --git a/src/pkg/bytes/bytes_test.go b/src/bytes/bytes_test.go
similarity index 100%
rename from src/pkg/bytes/bytes_test.go
rename to src/bytes/bytes_test.go
diff --git a/src/pkg/bytes/compare_test.go b/src/bytes/compare_test.go
similarity index 100%
rename from src/pkg/bytes/compare_test.go
rename to src/bytes/compare_test.go
diff --git a/src/pkg/bytes/equal_test.go b/src/bytes/equal_test.go
similarity index 100%
rename from src/pkg/bytes/equal_test.go
rename to src/bytes/equal_test.go
diff --git a/src/pkg/bytes/example_test.go b/src/bytes/example_test.go
similarity index 100%
rename from src/pkg/bytes/example_test.go
rename to src/bytes/example_test.go
diff --git a/src/pkg/bytes/export_test.go b/src/bytes/export_test.go
similarity index 100%
rename from src/pkg/bytes/export_test.go
rename to src/bytes/export_test.go
diff --git a/src/pkg/bytes/reader.go b/src/bytes/reader.go
similarity index 100%
rename from src/pkg/bytes/reader.go
rename to src/bytes/reader.go
diff --git a/src/pkg/bytes/reader_test.go b/src/bytes/reader_test.go
similarity index 100%
rename from src/pkg/bytes/reader_test.go
rename to src/bytes/reader_test.go
diff --git a/src/pkg/compress/bzip2/bit_reader.go b/src/compress/bzip2/bit_reader.go
similarity index 100%
rename from src/pkg/compress/bzip2/bit_reader.go
rename to src/compress/bzip2/bit_reader.go
diff --git a/src/pkg/compress/bzip2/bzip2.go b/src/compress/bzip2/bzip2.go
similarity index 100%
rename from src/pkg/compress/bzip2/bzip2.go
rename to src/compress/bzip2/bzip2.go
diff --git a/src/pkg/compress/bzip2/bzip2_test.go b/src/compress/bzip2/bzip2_test.go
similarity index 100%
rename from src/pkg/compress/bzip2/bzip2_test.go
rename to src/compress/bzip2/bzip2_test.go
diff --git a/src/pkg/compress/bzip2/huffman.go b/src/compress/bzip2/huffman.go
similarity index 100%
rename from src/pkg/compress/bzip2/huffman.go
rename to src/compress/bzip2/huffman.go
diff --git a/src/pkg/compress/bzip2/move_to_front.go b/src/compress/bzip2/move_to_front.go
similarity index 100%
rename from src/pkg/compress/bzip2/move_to_front.go
rename to src/compress/bzip2/move_to_front.go
diff --git a/src/pkg/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2 b/src/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
similarity index 100%
rename from src/pkg/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
rename to src/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
diff --git a/src/pkg/compress/bzip2/testdata/e.txt.bz2 b/src/compress/bzip2/testdata/e.txt.bz2
similarity index 100%
rename from src/pkg/compress/bzip2/testdata/e.txt.bz2
rename to src/compress/bzip2/testdata/e.txt.bz2
diff --git a/src/pkg/compress/flate/copy.go b/src/compress/flate/copy.go
similarity index 100%
rename from src/pkg/compress/flate/copy.go
rename to src/compress/flate/copy.go
diff --git a/src/pkg/compress/flate/copy_test.go b/src/compress/flate/copy_test.go
similarity index 100%
rename from src/pkg/compress/flate/copy_test.go
rename to src/compress/flate/copy_test.go
diff --git a/src/pkg/compress/flate/deflate.go b/src/compress/flate/deflate.go
similarity index 100%
rename from src/pkg/compress/flate/deflate.go
rename to src/compress/flate/deflate.go
diff --git a/src/pkg/compress/flate/deflate_test.go b/src/compress/flate/deflate_test.go
similarity index 100%
rename from src/pkg/compress/flate/deflate_test.go
rename to src/compress/flate/deflate_test.go
diff --git a/src/pkg/compress/flate/fixedhuff.go b/src/compress/flate/fixedhuff.go
similarity index 100%
rename from src/pkg/compress/flate/fixedhuff.go
rename to src/compress/flate/fixedhuff.go
diff --git a/src/pkg/compress/flate/flate_test.go b/src/compress/flate/flate_test.go
similarity index 100%
rename from src/pkg/compress/flate/flate_test.go
rename to src/compress/flate/flate_test.go
diff --git a/src/pkg/compress/flate/gen.go b/src/compress/flate/gen.go
similarity index 100%
rename from src/pkg/compress/flate/gen.go
rename to src/compress/flate/gen.go
diff --git a/src/pkg/compress/flate/huffman_bit_writer.go b/src/compress/flate/huffman_bit_writer.go
similarity index 100%
rename from src/pkg/compress/flate/huffman_bit_writer.go
rename to src/compress/flate/huffman_bit_writer.go
diff --git a/src/pkg/compress/flate/huffman_code.go b/src/compress/flate/huffman_code.go
similarity index 100%
rename from src/pkg/compress/flate/huffman_code.go
rename to src/compress/flate/huffman_code.go
diff --git a/src/pkg/compress/flate/inflate.go b/src/compress/flate/inflate.go
similarity index 100%
rename from src/pkg/compress/flate/inflate.go
rename to src/compress/flate/inflate.go
diff --git a/src/pkg/compress/flate/reader_test.go b/src/compress/flate/reader_test.go
similarity index 100%
rename from src/pkg/compress/flate/reader_test.go
rename to src/compress/flate/reader_test.go
diff --git a/src/pkg/compress/flate/reverse_bits.go b/src/compress/flate/reverse_bits.go
similarity index 100%
rename from src/pkg/compress/flate/reverse_bits.go
rename to src/compress/flate/reverse_bits.go
diff --git a/src/pkg/compress/flate/token.go b/src/compress/flate/token.go
similarity index 100%
rename from src/pkg/compress/flate/token.go
rename to src/compress/flate/token.go
diff --git a/src/pkg/compress/flate/writer_test.go b/src/compress/flate/writer_test.go
similarity index 100%
rename from src/pkg/compress/flate/writer_test.go
rename to src/compress/flate/writer_test.go
diff --git a/src/pkg/compress/gzip/gunzip.go b/src/compress/gzip/gunzip.go
similarity index 100%
rename from src/pkg/compress/gzip/gunzip.go
rename to src/compress/gzip/gunzip.go
diff --git a/src/pkg/compress/gzip/gunzip_test.go b/src/compress/gzip/gunzip_test.go
similarity index 100%
rename from src/pkg/compress/gzip/gunzip_test.go
rename to src/compress/gzip/gunzip_test.go
diff --git a/src/pkg/compress/gzip/gzip.go b/src/compress/gzip/gzip.go
similarity index 100%
rename from src/pkg/compress/gzip/gzip.go
rename to src/compress/gzip/gzip.go
diff --git a/src/pkg/compress/gzip/gzip_test.go b/src/compress/gzip/gzip_test.go
similarity index 100%
rename from src/pkg/compress/gzip/gzip_test.go
rename to src/compress/gzip/gzip_test.go
diff --git a/src/pkg/compress/gzip/testdata/issue6550.gz b/src/compress/gzip/testdata/issue6550.gz
similarity index 100%
rename from src/pkg/compress/gzip/testdata/issue6550.gz
rename to src/compress/gzip/testdata/issue6550.gz
diff --git a/src/pkg/compress/lzw/reader.go b/src/compress/lzw/reader.go
similarity index 100%
rename from src/pkg/compress/lzw/reader.go
rename to src/compress/lzw/reader.go
diff --git a/src/pkg/compress/lzw/reader_test.go b/src/compress/lzw/reader_test.go
similarity index 100%
rename from src/pkg/compress/lzw/reader_test.go
rename to src/compress/lzw/reader_test.go
diff --git a/src/pkg/compress/lzw/writer.go b/src/compress/lzw/writer.go
similarity index 100%
rename from src/pkg/compress/lzw/writer.go
rename to src/compress/lzw/writer.go
diff --git a/src/pkg/compress/lzw/writer_test.go b/src/compress/lzw/writer_test.go
similarity index 100%
rename from src/pkg/compress/lzw/writer_test.go
rename to src/compress/lzw/writer_test.go
diff --git a/src/pkg/compress/testdata/Mark.Twain-Tom.Sawyer.txt b/src/compress/testdata/Mark.Twain-Tom.Sawyer.txt
similarity index 100%
rename from src/pkg/compress/testdata/Mark.Twain-Tom.Sawyer.txt
rename to src/compress/testdata/Mark.Twain-Tom.Sawyer.txt
diff --git a/src/pkg/compress/testdata/e.txt b/src/compress/testdata/e.txt
similarity index 100%
rename from src/pkg/compress/testdata/e.txt
rename to src/compress/testdata/e.txt
diff --git a/src/pkg/compress/testdata/pi.txt b/src/compress/testdata/pi.txt
similarity index 100%
rename from src/pkg/compress/testdata/pi.txt
rename to src/compress/testdata/pi.txt
diff --git a/src/pkg/compress/zlib/example_test.go b/src/compress/zlib/example_test.go
similarity index 100%
rename from src/pkg/compress/zlib/example_test.go
rename to src/compress/zlib/example_test.go
diff --git a/src/pkg/compress/zlib/reader.go b/src/compress/zlib/reader.go
similarity index 100%
rename from src/pkg/compress/zlib/reader.go
rename to src/compress/zlib/reader.go
diff --git a/src/pkg/compress/zlib/reader_test.go b/src/compress/zlib/reader_test.go
similarity index 100%
rename from src/pkg/compress/zlib/reader_test.go
rename to src/compress/zlib/reader_test.go
diff --git a/src/pkg/compress/zlib/writer.go b/src/compress/zlib/writer.go
similarity index 100%
rename from src/pkg/compress/zlib/writer.go
rename to src/compress/zlib/writer.go
diff --git a/src/pkg/compress/zlib/writer_test.go b/src/compress/zlib/writer_test.go
similarity index 100%
rename from src/pkg/compress/zlib/writer_test.go
rename to src/compress/zlib/writer_test.go
diff --git a/src/pkg/container/heap/example_intheap_test.go b/src/container/heap/example_intheap_test.go
similarity index 100%
rename from src/pkg/container/heap/example_intheap_test.go
rename to src/container/heap/example_intheap_test.go
diff --git a/src/pkg/container/heap/example_pq_test.go b/src/container/heap/example_pq_test.go
similarity index 100%
rename from src/pkg/container/heap/example_pq_test.go
rename to src/container/heap/example_pq_test.go
diff --git a/src/pkg/container/heap/heap.go b/src/container/heap/heap.go
similarity index 100%
rename from src/pkg/container/heap/heap.go
rename to src/container/heap/heap.go
diff --git a/src/pkg/container/heap/heap_test.go b/src/container/heap/heap_test.go
similarity index 100%
rename from src/pkg/container/heap/heap_test.go
rename to src/container/heap/heap_test.go
diff --git a/src/pkg/container/list/example_test.go b/src/container/list/example_test.go
similarity index 100%
rename from src/pkg/container/list/example_test.go
rename to src/container/list/example_test.go
diff --git a/src/pkg/container/list/list.go b/src/container/list/list.go
similarity index 100%
rename from src/pkg/container/list/list.go
rename to src/container/list/list.go
diff --git a/src/pkg/container/list/list_test.go b/src/container/list/list_test.go
similarity index 100%
rename from src/pkg/container/list/list_test.go
rename to src/container/list/list_test.go
diff --git a/src/pkg/container/ring/ring.go b/src/container/ring/ring.go
similarity index 100%
rename from src/pkg/container/ring/ring.go
rename to src/container/ring/ring.go
diff --git a/src/pkg/container/ring/ring_test.go b/src/container/ring/ring_test.go
similarity index 100%
rename from src/pkg/container/ring/ring_test.go
rename to src/container/ring/ring_test.go
diff --git a/src/pkg/crypto/aes/aes_test.go b/src/crypto/aes/aes_test.go
similarity index 100%
rename from src/pkg/crypto/aes/aes_test.go
rename to src/crypto/aes/aes_test.go
diff --git a/src/pkg/crypto/aes/asm_amd64.s b/src/crypto/aes/asm_amd64.s
similarity index 100%
rename from src/pkg/crypto/aes/asm_amd64.s
rename to src/crypto/aes/asm_amd64.s
diff --git a/src/pkg/crypto/aes/block.go b/src/crypto/aes/block.go
similarity index 100%
rename from src/pkg/crypto/aes/block.go
rename to src/crypto/aes/block.go
diff --git a/src/pkg/crypto/aes/cipher.go b/src/crypto/aes/cipher.go
similarity index 100%
rename from src/pkg/crypto/aes/cipher.go
rename to src/crypto/aes/cipher.go
diff --git a/src/pkg/crypto/aes/cipher_asm.go b/src/crypto/aes/cipher_asm.go
similarity index 100%
rename from src/pkg/crypto/aes/cipher_asm.go
rename to src/crypto/aes/cipher_asm.go
diff --git a/src/pkg/crypto/aes/cipher_generic.go b/src/crypto/aes/cipher_generic.go
similarity index 100%
rename from src/pkg/crypto/aes/cipher_generic.go
rename to src/crypto/aes/cipher_generic.go
diff --git a/src/pkg/crypto/aes/const.go b/src/crypto/aes/const.go
similarity index 100%
rename from src/pkg/crypto/aes/const.go
rename to src/crypto/aes/const.go
diff --git a/src/pkg/crypto/cipher/benchmark_test.go b/src/crypto/cipher/benchmark_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/benchmark_test.go
rename to src/crypto/cipher/benchmark_test.go
diff --git a/src/pkg/crypto/cipher/cbc.go b/src/crypto/cipher/cbc.go
similarity index 100%
rename from src/pkg/crypto/cipher/cbc.go
rename to src/crypto/cipher/cbc.go
diff --git a/src/pkg/crypto/cipher/cbc_aes_test.go b/src/crypto/cipher/cbc_aes_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/cbc_aes_test.go
rename to src/crypto/cipher/cbc_aes_test.go
diff --git a/src/pkg/crypto/cipher/cfb.go b/src/crypto/cipher/cfb.go
similarity index 100%
rename from src/pkg/crypto/cipher/cfb.go
rename to src/crypto/cipher/cfb.go
diff --git a/src/pkg/crypto/cipher/cfb_test.go b/src/crypto/cipher/cfb_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/cfb_test.go
rename to src/crypto/cipher/cfb_test.go
diff --git a/src/pkg/crypto/cipher/cipher.go b/src/crypto/cipher/cipher.go
similarity index 100%
rename from src/pkg/crypto/cipher/cipher.go
rename to src/crypto/cipher/cipher.go
diff --git a/src/pkg/crypto/cipher/cipher_test.go b/src/crypto/cipher/cipher_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/cipher_test.go
rename to src/crypto/cipher/cipher_test.go
diff --git a/src/pkg/crypto/cipher/common_test.go b/src/crypto/cipher/common_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/common_test.go
rename to src/crypto/cipher/common_test.go
diff --git a/src/pkg/crypto/cipher/ctr.go b/src/crypto/cipher/ctr.go
similarity index 100%
rename from src/pkg/crypto/cipher/ctr.go
rename to src/crypto/cipher/ctr.go
diff --git a/src/pkg/crypto/cipher/ctr_aes_test.go b/src/crypto/cipher/ctr_aes_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/ctr_aes_test.go
rename to src/crypto/cipher/ctr_aes_test.go
diff --git a/src/pkg/crypto/cipher/example_test.go b/src/crypto/cipher/example_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/example_test.go
rename to src/crypto/cipher/example_test.go
diff --git a/src/pkg/crypto/cipher/gcm.go b/src/crypto/cipher/gcm.go
similarity index 100%
rename from src/pkg/crypto/cipher/gcm.go
rename to src/crypto/cipher/gcm.go
diff --git a/src/pkg/crypto/cipher/gcm_test.go b/src/crypto/cipher/gcm_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/gcm_test.go
rename to src/crypto/cipher/gcm_test.go
diff --git a/src/pkg/crypto/cipher/io.go b/src/crypto/cipher/io.go
similarity index 100%
rename from src/pkg/crypto/cipher/io.go
rename to src/crypto/cipher/io.go
diff --git a/src/pkg/crypto/cipher/ofb.go b/src/crypto/cipher/ofb.go
similarity index 100%
rename from src/pkg/crypto/cipher/ofb.go
rename to src/crypto/cipher/ofb.go
diff --git a/src/pkg/crypto/cipher/ofb_test.go b/src/crypto/cipher/ofb_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/ofb_test.go
rename to src/crypto/cipher/ofb_test.go
diff --git a/src/pkg/crypto/cipher/xor.go b/src/crypto/cipher/xor.go
similarity index 100%
rename from src/pkg/crypto/cipher/xor.go
rename to src/crypto/cipher/xor.go
diff --git a/src/pkg/crypto/cipher/xor_test.go b/src/crypto/cipher/xor_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/xor_test.go
rename to src/crypto/cipher/xor_test.go
diff --git a/src/pkg/crypto/crypto.go b/src/crypto/crypto.go
similarity index 100%
rename from src/pkg/crypto/crypto.go
rename to src/crypto/crypto.go
diff --git a/src/pkg/crypto/des/block.go b/src/crypto/des/block.go
similarity index 100%
rename from src/pkg/crypto/des/block.go
rename to src/crypto/des/block.go
diff --git a/src/pkg/crypto/des/cipher.go b/src/crypto/des/cipher.go
similarity index 100%
rename from src/pkg/crypto/des/cipher.go
rename to src/crypto/des/cipher.go
diff --git a/src/pkg/crypto/des/const.go b/src/crypto/des/const.go
similarity index 100%
rename from src/pkg/crypto/des/const.go
rename to src/crypto/des/const.go
diff --git a/src/pkg/crypto/des/des_test.go b/src/crypto/des/des_test.go
similarity index 100%
rename from src/pkg/crypto/des/des_test.go
rename to src/crypto/des/des_test.go
diff --git a/src/pkg/crypto/des/example_test.go b/src/crypto/des/example_test.go
similarity index 100%
rename from src/pkg/crypto/des/example_test.go
rename to src/crypto/des/example_test.go
diff --git a/src/pkg/crypto/dsa/dsa.go b/src/crypto/dsa/dsa.go
similarity index 100%
rename from src/pkg/crypto/dsa/dsa.go
rename to src/crypto/dsa/dsa.go
diff --git a/src/pkg/crypto/dsa/dsa_test.go b/src/crypto/dsa/dsa_test.go
similarity index 100%
rename from src/pkg/crypto/dsa/dsa_test.go
rename to src/crypto/dsa/dsa_test.go
diff --git a/src/pkg/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go
similarity index 100%
rename from src/pkg/crypto/ecdsa/ecdsa.go
rename to src/crypto/ecdsa/ecdsa.go
diff --git a/src/pkg/crypto/ecdsa/ecdsa_test.go b/src/crypto/ecdsa/ecdsa_test.go
similarity index 100%
rename from src/pkg/crypto/ecdsa/ecdsa_test.go
rename to src/crypto/ecdsa/ecdsa_test.go
diff --git a/src/pkg/crypto/ecdsa/testdata/SigVer.rsp.bz2 b/src/crypto/ecdsa/testdata/SigVer.rsp.bz2
similarity index 100%
rename from src/pkg/crypto/ecdsa/testdata/SigVer.rsp.bz2
rename to src/crypto/ecdsa/testdata/SigVer.rsp.bz2
diff --git a/src/pkg/crypto/elliptic/elliptic.go b/src/crypto/elliptic/elliptic.go
similarity index 100%
rename from src/pkg/crypto/elliptic/elliptic.go
rename to src/crypto/elliptic/elliptic.go
diff --git a/src/pkg/crypto/elliptic/elliptic_test.go b/src/crypto/elliptic/elliptic_test.go
similarity index 100%
rename from src/pkg/crypto/elliptic/elliptic_test.go
rename to src/crypto/elliptic/elliptic_test.go
diff --git a/src/pkg/crypto/elliptic/p224.go b/src/crypto/elliptic/p224.go
similarity index 100%
rename from src/pkg/crypto/elliptic/p224.go
rename to src/crypto/elliptic/p224.go
diff --git a/src/pkg/crypto/elliptic/p224_test.go b/src/crypto/elliptic/p224_test.go
similarity index 100%
rename from src/pkg/crypto/elliptic/p224_test.go
rename to src/crypto/elliptic/p224_test.go
diff --git a/src/pkg/crypto/elliptic/p256.go b/src/crypto/elliptic/p256.go
similarity index 100%
rename from src/pkg/crypto/elliptic/p256.go
rename to src/crypto/elliptic/p256.go
diff --git a/src/pkg/crypto/hmac/hmac.go b/src/crypto/hmac/hmac.go
similarity index 100%
rename from src/pkg/crypto/hmac/hmac.go
rename to src/crypto/hmac/hmac.go
diff --git a/src/pkg/crypto/hmac/hmac_test.go b/src/crypto/hmac/hmac_test.go
similarity index 100%
rename from src/pkg/crypto/hmac/hmac_test.go
rename to src/crypto/hmac/hmac_test.go
diff --git a/src/pkg/crypto/md5/example_test.go b/src/crypto/md5/example_test.go
similarity index 100%
rename from src/pkg/crypto/md5/example_test.go
rename to src/crypto/md5/example_test.go
diff --git a/src/pkg/crypto/md5/gen.go b/src/crypto/md5/gen.go
similarity index 100%
rename from src/pkg/crypto/md5/gen.go
rename to src/crypto/md5/gen.go
diff --git a/src/pkg/crypto/md5/md5.go b/src/crypto/md5/md5.go
similarity index 100%
rename from src/pkg/crypto/md5/md5.go
rename to src/crypto/md5/md5.go
diff --git a/src/pkg/crypto/md5/md5_test.go b/src/crypto/md5/md5_test.go
similarity index 100%
rename from src/pkg/crypto/md5/md5_test.go
rename to src/crypto/md5/md5_test.go
diff --git a/src/pkg/crypto/md5/md5block.go b/src/crypto/md5/md5block.go
similarity index 100%
rename from src/pkg/crypto/md5/md5block.go
rename to src/crypto/md5/md5block.go
diff --git a/src/pkg/crypto/md5/md5block_386.s b/src/crypto/md5/md5block_386.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_386.s
rename to src/crypto/md5/md5block_386.s
diff --git a/src/pkg/crypto/md5/md5block_amd64.s b/src/crypto/md5/md5block_amd64.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_amd64.s
rename to src/crypto/md5/md5block_amd64.s
diff --git a/src/pkg/crypto/md5/md5block_amd64p32.s b/src/crypto/md5/md5block_amd64p32.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_amd64p32.s
rename to src/crypto/md5/md5block_amd64p32.s
diff --git a/src/pkg/crypto/md5/md5block_arm.s b/src/crypto/md5/md5block_arm.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_arm.s
rename to src/crypto/md5/md5block_arm.s
diff --git a/src/pkg/crypto/md5/md5block_decl.go b/src/crypto/md5/md5block_decl.go
similarity index 100%
rename from src/pkg/crypto/md5/md5block_decl.go
rename to src/crypto/md5/md5block_decl.go
diff --git a/src/pkg/crypto/md5/md5block_generic.go b/src/crypto/md5/md5block_generic.go
similarity index 100%
rename from src/pkg/crypto/md5/md5block_generic.go
rename to src/crypto/md5/md5block_generic.go
diff --git a/src/pkg/crypto/rand/example_test.go b/src/crypto/rand/example_test.go
similarity index 100%
rename from src/pkg/crypto/rand/example_test.go
rename to src/crypto/rand/example_test.go
diff --git a/src/pkg/crypto/rand/rand.go b/src/crypto/rand/rand.go
similarity index 100%
rename from src/pkg/crypto/rand/rand.go
rename to src/crypto/rand/rand.go
diff --git a/src/pkg/crypto/rand/rand_linux.go b/src/crypto/rand/rand_linux.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_linux.go
rename to src/crypto/rand/rand_linux.go
diff --git a/src/pkg/crypto/rand/rand_test.go b/src/crypto/rand/rand_test.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_test.go
rename to src/crypto/rand/rand_test.go
diff --git a/src/pkg/crypto/rand/rand_unix.go b/src/crypto/rand/rand_unix.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_unix.go
rename to src/crypto/rand/rand_unix.go
diff --git a/src/pkg/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_windows.go
rename to src/crypto/rand/rand_windows.go
diff --git a/src/pkg/crypto/rand/util.go b/src/crypto/rand/util.go
similarity index 100%
rename from src/pkg/crypto/rand/util.go
rename to src/crypto/rand/util.go
diff --git a/src/pkg/crypto/rand/util_test.go b/src/crypto/rand/util_test.go
similarity index 100%
rename from src/pkg/crypto/rand/util_test.go
rename to src/crypto/rand/util_test.go
diff --git a/src/pkg/crypto/rc4/rc4.go b/src/crypto/rc4/rc4.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4.go
rename to src/crypto/rc4/rc4.go
diff --git a/src/pkg/crypto/rc4/rc4_386.s b/src/crypto/rc4/rc4_386.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_386.s
rename to src/crypto/rc4/rc4_386.s
diff --git a/src/pkg/crypto/rc4/rc4_amd64.s b/src/crypto/rc4/rc4_amd64.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_amd64.s
rename to src/crypto/rc4/rc4_amd64.s
diff --git a/src/pkg/crypto/rc4/rc4_amd64p32.s b/src/crypto/rc4/rc4_amd64p32.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_amd64p32.s
rename to src/crypto/rc4/rc4_amd64p32.s
diff --git a/src/pkg/crypto/rc4/rc4_arm.s b/src/crypto/rc4/rc4_arm.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_arm.s
rename to src/crypto/rc4/rc4_arm.s
diff --git a/src/pkg/crypto/rc4/rc4_asm.go b/src/crypto/rc4/rc4_asm.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_asm.go
rename to src/crypto/rc4/rc4_asm.go
diff --git a/src/pkg/crypto/rc4/rc4_ref.go b/src/crypto/rc4/rc4_ref.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_ref.go
rename to src/crypto/rc4/rc4_ref.go
diff --git a/src/pkg/crypto/rc4/rc4_test.go b/src/crypto/rc4/rc4_test.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_test.go
rename to src/crypto/rc4/rc4_test.go
diff --git a/src/pkg/crypto/rsa/pkcs1v15.go b/src/crypto/rsa/pkcs1v15.go
similarity index 100%
rename from src/pkg/crypto/rsa/pkcs1v15.go
rename to src/crypto/rsa/pkcs1v15.go
diff --git a/src/pkg/crypto/rsa/pkcs1v15_test.go b/src/crypto/rsa/pkcs1v15_test.go
similarity index 100%
rename from src/pkg/crypto/rsa/pkcs1v15_test.go
rename to src/crypto/rsa/pkcs1v15_test.go
diff --git a/src/pkg/crypto/rsa/pss.go b/src/crypto/rsa/pss.go
similarity index 100%
rename from src/pkg/crypto/rsa/pss.go
rename to src/crypto/rsa/pss.go
diff --git a/src/pkg/crypto/rsa/pss_test.go b/src/crypto/rsa/pss_test.go
similarity index 100%
rename from src/pkg/crypto/rsa/pss_test.go
rename to src/crypto/rsa/pss_test.go
diff --git a/src/pkg/crypto/rsa/rsa.go b/src/crypto/rsa/rsa.go
similarity index 100%
rename from src/pkg/crypto/rsa/rsa.go
rename to src/crypto/rsa/rsa.go
diff --git a/src/pkg/crypto/rsa/rsa_test.go b/src/crypto/rsa/rsa_test.go
similarity index 100%
rename from src/pkg/crypto/rsa/rsa_test.go
rename to src/crypto/rsa/rsa_test.go
diff --git a/src/pkg/crypto/rsa/testdata/pss-vect.txt.bz2 b/src/crypto/rsa/testdata/pss-vect.txt.bz2
similarity index 100%
rename from src/pkg/crypto/rsa/testdata/pss-vect.txt.bz2
rename to src/crypto/rsa/testdata/pss-vect.txt.bz2
diff --git a/src/pkg/crypto/sha1/example_test.go b/src/crypto/sha1/example_test.go
similarity index 100%
rename from src/pkg/crypto/sha1/example_test.go
rename to src/crypto/sha1/example_test.go
diff --git a/src/pkg/crypto/sha1/sha1.go b/src/crypto/sha1/sha1.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1.go
rename to src/crypto/sha1/sha1.go
diff --git a/src/pkg/crypto/sha1/sha1_test.go b/src/crypto/sha1/sha1_test.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1_test.go
rename to src/crypto/sha1/sha1_test.go
diff --git a/src/pkg/crypto/sha1/sha1block.go b/src/crypto/sha1/sha1block.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block.go
rename to src/crypto/sha1/sha1block.go
diff --git a/src/pkg/crypto/sha1/sha1block_386.s b/src/crypto/sha1/sha1block_386.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_386.s
rename to src/crypto/sha1/sha1block_386.s
diff --git a/src/pkg/crypto/sha1/sha1block_amd64.s b/src/crypto/sha1/sha1block_amd64.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_amd64.s
rename to src/crypto/sha1/sha1block_amd64.s
diff --git a/src/pkg/crypto/sha1/sha1block_amd64p32.s b/src/crypto/sha1/sha1block_amd64p32.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_amd64p32.s
rename to src/crypto/sha1/sha1block_amd64p32.s
diff --git a/src/pkg/crypto/sha1/sha1block_arm.s b/src/crypto/sha1/sha1block_arm.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_arm.s
rename to src/crypto/sha1/sha1block_arm.s
diff --git a/src/pkg/crypto/sha1/sha1block_decl.go b/src/crypto/sha1/sha1block_decl.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_decl.go
rename to src/crypto/sha1/sha1block_decl.go
diff --git a/src/pkg/crypto/sha1/sha1block_generic.go b/src/crypto/sha1/sha1block_generic.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_generic.go
rename to src/crypto/sha1/sha1block_generic.go
diff --git a/src/pkg/crypto/sha256/sha256.go b/src/crypto/sha256/sha256.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256.go
rename to src/crypto/sha256/sha256.go
diff --git a/src/pkg/crypto/sha256/sha256_test.go b/src/crypto/sha256/sha256_test.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256_test.go
rename to src/crypto/sha256/sha256_test.go
diff --git a/src/pkg/crypto/sha256/sha256block.go b/src/crypto/sha256/sha256block.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block.go
rename to src/crypto/sha256/sha256block.go
diff --git a/src/pkg/crypto/sha256/sha256block_386.s b/src/crypto/sha256/sha256block_386.s
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block_386.s
rename to src/crypto/sha256/sha256block_386.s
diff --git a/src/pkg/crypto/sha256/sha256block_amd64.s b/src/crypto/sha256/sha256block_amd64.s
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block_amd64.s
rename to src/crypto/sha256/sha256block_amd64.s
diff --git a/src/pkg/crypto/sha256/sha256block_decl.go b/src/crypto/sha256/sha256block_decl.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block_decl.go
rename to src/crypto/sha256/sha256block_decl.go
diff --git a/src/pkg/crypto/sha512/sha512.go b/src/crypto/sha512/sha512.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512.go
rename to src/crypto/sha512/sha512.go
diff --git a/src/pkg/crypto/sha512/sha512_test.go b/src/crypto/sha512/sha512_test.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512_test.go
rename to src/crypto/sha512/sha512_test.go
diff --git a/src/pkg/crypto/sha512/sha512block.go b/src/crypto/sha512/sha512block.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512block.go
rename to src/crypto/sha512/sha512block.go
diff --git a/src/pkg/crypto/sha512/sha512block_amd64.s b/src/crypto/sha512/sha512block_amd64.s
similarity index 100%
rename from src/pkg/crypto/sha512/sha512block_amd64.s
rename to src/crypto/sha512/sha512block_amd64.s
diff --git a/src/pkg/crypto/sha512/sha512block_decl.go b/src/crypto/sha512/sha512block_decl.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512block_decl.go
rename to src/crypto/sha512/sha512block_decl.go
diff --git a/src/pkg/crypto/subtle/constant_time.go b/src/crypto/subtle/constant_time.go
similarity index 100%
rename from src/pkg/crypto/subtle/constant_time.go
rename to src/crypto/subtle/constant_time.go
diff --git a/src/pkg/crypto/subtle/constant_time_test.go b/src/crypto/subtle/constant_time_test.go
similarity index 100%
rename from src/pkg/crypto/subtle/constant_time_test.go
rename to src/crypto/subtle/constant_time_test.go
diff --git a/src/pkg/crypto/tls/alert.go b/src/crypto/tls/alert.go
similarity index 100%
rename from src/pkg/crypto/tls/alert.go
rename to src/crypto/tls/alert.go
diff --git a/src/pkg/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go
similarity index 100%
rename from src/pkg/crypto/tls/cipher_suites.go
rename to src/crypto/tls/cipher_suites.go
diff --git a/src/pkg/crypto/tls/common.go b/src/crypto/tls/common.go
similarity index 100%
rename from src/pkg/crypto/tls/common.go
rename to src/crypto/tls/common.go
diff --git a/src/pkg/crypto/tls/conn.go b/src/crypto/tls/conn.go
similarity index 100%
rename from src/pkg/crypto/tls/conn.go
rename to src/crypto/tls/conn.go
diff --git a/src/pkg/crypto/tls/conn_test.go b/src/crypto/tls/conn_test.go
similarity index 100%
rename from src/pkg/crypto/tls/conn_test.go
rename to src/crypto/tls/conn_test.go
diff --git a/src/pkg/crypto/tls/example_test.go b/src/crypto/tls/example_test.go
similarity index 100%
rename from src/pkg/crypto/tls/example_test.go
rename to src/crypto/tls/example_test.go
diff --git a/src/pkg/crypto/tls/generate_cert.go b/src/crypto/tls/generate_cert.go
similarity index 100%
rename from src/pkg/crypto/tls/generate_cert.go
rename to src/crypto/tls/generate_cert.go
diff --git a/src/pkg/crypto/tls/handshake_client.go b/src/crypto/tls/handshake_client.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_client.go
rename to src/crypto/tls/handshake_client.go
diff --git a/src/pkg/crypto/tls/handshake_client_test.go b/src/crypto/tls/handshake_client_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_client_test.go
rename to src/crypto/tls/handshake_client_test.go
diff --git a/src/pkg/crypto/tls/handshake_messages.go b/src/crypto/tls/handshake_messages.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_messages.go
rename to src/crypto/tls/handshake_messages.go
diff --git a/src/pkg/crypto/tls/handshake_messages_test.go b/src/crypto/tls/handshake_messages_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_messages_test.go
rename to src/crypto/tls/handshake_messages_test.go
diff --git a/src/pkg/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_server.go
rename to src/crypto/tls/handshake_server.go
diff --git a/src/pkg/crypto/tls/handshake_server_test.go b/src/crypto/tls/handshake_server_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_server_test.go
rename to src/crypto/tls/handshake_server_test.go
diff --git a/src/pkg/crypto/tls/handshake_test.go b/src/crypto/tls/handshake_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_test.go
rename to src/crypto/tls/handshake_test.go
diff --git a/src/pkg/crypto/tls/key_agreement.go b/src/crypto/tls/key_agreement.go
similarity index 100%
rename from src/pkg/crypto/tls/key_agreement.go
rename to src/crypto/tls/key_agreement.go
diff --git a/src/pkg/crypto/tls/prf.go b/src/crypto/tls/prf.go
similarity index 100%
rename from src/pkg/crypto/tls/prf.go
rename to src/crypto/tls/prf.go
diff --git a/src/pkg/crypto/tls/prf_test.go b/src/crypto/tls/prf_test.go
similarity index 100%
rename from src/pkg/crypto/tls/prf_test.go
rename to src/crypto/tls/prf_test.go
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
rename to src/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv10-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-RSA-RC4
rename to src/crypto/tls/testdata/Client-TLSv10-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
rename to src/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv11-RSA-RC4
rename to src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN b/src/crypto/tls/testdata/Client-TLSv12-ALPN
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN
rename to src/crypto/tls/testdata/Client-TLSv12-ALPN
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch b/src/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
rename to src/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
rename to src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
rename to src/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv12-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-RSA-RC4
rename to src/crypto/tls/testdata/Client-TLSv12-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-3DES b/src/crypto/tls/testdata/Server-SSLv3-RSA-3DES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-3DES
rename to src/crypto/tls/testdata/Server-SSLv3-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-AES b/src/crypto/tls/testdata/Server-SSLv3-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-AES
rename to src/crypto/tls/testdata/Server-SSLv3-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-RC4 b/src/crypto/tls/testdata/Server-SSLv3-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-RC4
rename to src/crypto/tls/testdata/Server-SSLv3-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-3DES b/src/crypto/tls/testdata/Server-TLSv10-RSA-3DES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-3DES
rename to src/crypto/tls/testdata/Server-TLSv10-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-AES b/src/crypto/tls/testdata/Server-TLSv10-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-AES
rename to src/crypto/tls/testdata/Server-TLSv10-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv10-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-RC4
rename to src/crypto/tls/testdata/Server-TLSv10-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv11-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv11-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv11-RSA-RC4
rename to src/crypto/tls/testdata/Server-TLSv11-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN b/src/crypto/tls/testdata/Server-TLSv12-ALPN
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN
rename to src/crypto/tls/testdata/Server-TLSv12-ALPN
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch b/src/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
rename to src/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
rename to src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
rename to src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
rename to src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
rename to src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
rename to src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-IssueTicket b/src/crypto/tls/testdata/Server-TLSv12-IssueTicket
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-IssueTicket
rename to src/crypto/tls/testdata/Server-TLSv12-IssueTicket
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-3DES b/src/crypto/tls/testdata/Server-TLSv12-RSA-3DES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-3DES
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv12-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-RC4
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-Resume b/src/crypto/tls/testdata/Server-TLSv12-Resume
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-Resume
rename to src/crypto/tls/testdata/Server-TLSv12-Resume
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-SNI b/src/crypto/tls/testdata/Server-TLSv12-SNI
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-SNI
rename to src/crypto/tls/testdata/Server-TLSv12-SNI
diff --git a/src/pkg/crypto/tls/ticket.go b/src/crypto/tls/ticket.go
similarity index 100%
rename from src/pkg/crypto/tls/ticket.go
rename to src/crypto/tls/ticket.go
diff --git a/src/pkg/crypto/tls/tls.go b/src/crypto/tls/tls.go
similarity index 100%
rename from src/pkg/crypto/tls/tls.go
rename to src/crypto/tls/tls.go
diff --git a/src/pkg/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go
similarity index 100%
rename from src/pkg/crypto/tls/tls_test.go
rename to src/crypto/tls/tls_test.go
diff --git a/src/pkg/crypto/x509/cert_pool.go b/src/crypto/x509/cert_pool.go
similarity index 100%
rename from src/pkg/crypto/x509/cert_pool.go
rename to src/crypto/x509/cert_pool.go
diff --git a/src/pkg/crypto/x509/example_test.go b/src/crypto/x509/example_test.go
similarity index 100%
rename from src/pkg/crypto/x509/example_test.go
rename to src/crypto/x509/example_test.go
diff --git a/src/pkg/crypto/x509/pem_decrypt.go b/src/crypto/x509/pem_decrypt.go
similarity index 100%
rename from src/pkg/crypto/x509/pem_decrypt.go
rename to src/crypto/x509/pem_decrypt.go
diff --git a/src/pkg/crypto/x509/pem_decrypt_test.go b/src/crypto/x509/pem_decrypt_test.go
similarity index 100%
rename from src/pkg/crypto/x509/pem_decrypt_test.go
rename to src/crypto/x509/pem_decrypt_test.go
diff --git a/src/pkg/crypto/x509/pkcs1.go b/src/crypto/x509/pkcs1.go
similarity index 100%
rename from src/pkg/crypto/x509/pkcs1.go
rename to src/crypto/x509/pkcs1.go
diff --git a/src/pkg/crypto/x509/pkcs8.go b/src/crypto/x509/pkcs8.go
similarity index 100%
rename from src/pkg/crypto/x509/pkcs8.go
rename to src/crypto/x509/pkcs8.go
diff --git a/src/pkg/crypto/x509/pkcs8_test.go b/src/crypto/x509/pkcs8_test.go
similarity index 100%
rename from src/pkg/crypto/x509/pkcs8_test.go
rename to src/crypto/x509/pkcs8_test.go
diff --git a/src/pkg/crypto/x509/pkix/pkix.go b/src/crypto/x509/pkix/pkix.go
similarity index 100%
rename from src/pkg/crypto/x509/pkix/pkix.go
rename to src/crypto/x509/pkix/pkix.go
diff --git a/src/pkg/crypto/x509/root.go b/src/crypto/x509/root.go
similarity index 100%
rename from src/pkg/crypto/x509/root.go
rename to src/crypto/x509/root.go
diff --git a/src/pkg/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
similarity index 100%
rename from src/pkg/crypto/x509/root_cgo_darwin.go
rename to src/crypto/x509/root_cgo_darwin.go
diff --git a/src/pkg/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
similarity index 100%
rename from src/pkg/crypto/x509/root_darwin.go
rename to src/crypto/x509/root_darwin.go
diff --git a/src/pkg/crypto/x509/root_darwin_test.go b/src/crypto/x509/root_darwin_test.go
similarity index 100%
rename from src/pkg/crypto/x509/root_darwin_test.go
rename to src/crypto/x509/root_darwin_test.go
diff --git a/src/pkg/crypto/x509/root_nocgo_darwin.go b/src/crypto/x509/root_nocgo_darwin.go
similarity index 100%
rename from src/pkg/crypto/x509/root_nocgo_darwin.go
rename to src/crypto/x509/root_nocgo_darwin.go
diff --git a/src/pkg/crypto/x509/root_plan9.go b/src/crypto/x509/root_plan9.go
similarity index 100%
rename from src/pkg/crypto/x509/root_plan9.go
rename to src/crypto/x509/root_plan9.go
diff --git a/src/pkg/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
similarity index 100%
rename from src/pkg/crypto/x509/root_unix.go
rename to src/crypto/x509/root_unix.go
diff --git a/src/pkg/crypto/x509/root_windows.go b/src/crypto/x509/root_windows.go
similarity index 100%
rename from src/pkg/crypto/x509/root_windows.go
rename to src/crypto/x509/root_windows.go
diff --git a/src/pkg/crypto/x509/sec1.go b/src/crypto/x509/sec1.go
similarity index 100%
rename from src/pkg/crypto/x509/sec1.go
rename to src/crypto/x509/sec1.go
diff --git a/src/pkg/crypto/x509/sec1_test.go b/src/crypto/x509/sec1_test.go
similarity index 100%
rename from src/pkg/crypto/x509/sec1_test.go
rename to src/crypto/x509/sec1_test.go
diff --git a/src/pkg/crypto/x509/verify.go b/src/crypto/x509/verify.go
similarity index 100%
rename from src/pkg/crypto/x509/verify.go
rename to src/crypto/x509/verify.go
diff --git a/src/pkg/crypto/x509/verify_test.go b/src/crypto/x509/verify_test.go
similarity index 100%
rename from src/pkg/crypto/x509/verify_test.go
rename to src/crypto/x509/verify_test.go
diff --git a/src/pkg/crypto/x509/x509.go b/src/crypto/x509/x509.go
similarity index 100%
rename from src/pkg/crypto/x509/x509.go
rename to src/crypto/x509/x509.go
diff --git a/src/pkg/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go
similarity index 100%
rename from src/pkg/crypto/x509/x509_test.go
rename to src/crypto/x509/x509_test.go
diff --git a/src/pkg/crypto/x509/x509_test_import.go b/src/crypto/x509/x509_test_import.go
similarity index 100%
rename from src/pkg/crypto/x509/x509_test_import.go
rename to src/crypto/x509/x509_test_import.go
diff --git a/src/pkg/database/sql/convert.go b/src/database/sql/convert.go
similarity index 100%
rename from src/pkg/database/sql/convert.go
rename to src/database/sql/convert.go
diff --git a/src/pkg/database/sql/convert_test.go b/src/database/sql/convert_test.go
similarity index 100%
rename from src/pkg/database/sql/convert_test.go
rename to src/database/sql/convert_test.go
diff --git a/src/pkg/database/sql/doc.txt b/src/database/sql/doc.txt
similarity index 100%
rename from src/pkg/database/sql/doc.txt
rename to src/database/sql/doc.txt
diff --git a/src/pkg/database/sql/driver/driver.go b/src/database/sql/driver/driver.go
similarity index 100%
rename from src/pkg/database/sql/driver/driver.go
rename to src/database/sql/driver/driver.go
diff --git a/src/pkg/database/sql/driver/types.go b/src/database/sql/driver/types.go
similarity index 100%
rename from src/pkg/database/sql/driver/types.go
rename to src/database/sql/driver/types.go
diff --git a/src/pkg/database/sql/driver/types_test.go b/src/database/sql/driver/types_test.go
similarity index 100%
rename from src/pkg/database/sql/driver/types_test.go
rename to src/database/sql/driver/types_test.go
diff --git a/src/pkg/database/sql/example_test.go b/src/database/sql/example_test.go
similarity index 100%
rename from src/pkg/database/sql/example_test.go
rename to src/database/sql/example_test.go
diff --git a/src/pkg/database/sql/fakedb_test.go b/src/database/sql/fakedb_test.go
similarity index 100%
rename from src/pkg/database/sql/fakedb_test.go
rename to src/database/sql/fakedb_test.go
diff --git a/src/pkg/database/sql/sql.go b/src/database/sql/sql.go
similarity index 100%
rename from src/pkg/database/sql/sql.go
rename to src/database/sql/sql.go
diff --git a/src/pkg/database/sql/sql_test.go b/src/database/sql/sql_test.go
similarity index 100%
rename from src/pkg/database/sql/sql_test.go
rename to src/database/sql/sql_test.go
diff --git a/src/pkg/debug/dwarf/buf.go b/src/debug/dwarf/buf.go
similarity index 100%
rename from src/pkg/debug/dwarf/buf.go
rename to src/debug/dwarf/buf.go
diff --git a/src/pkg/debug/dwarf/const.go b/src/debug/dwarf/const.go
similarity index 100%
rename from src/pkg/debug/dwarf/const.go
rename to src/debug/dwarf/const.go
diff --git a/src/pkg/debug/dwarf/entry.go b/src/debug/dwarf/entry.go
similarity index 100%
rename from src/pkg/debug/dwarf/entry.go
rename to src/debug/dwarf/entry.go
diff --git a/src/pkg/debug/dwarf/open.go b/src/debug/dwarf/open.go
similarity index 100%
rename from src/pkg/debug/dwarf/open.go
rename to src/debug/dwarf/open.go
diff --git a/src/pkg/debug/dwarf/testdata/typedef.c b/src/debug/dwarf/testdata/typedef.c
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.c
rename to src/debug/dwarf/testdata/typedef.c
diff --git a/src/pkg/debug/dwarf/testdata/typedef.elf b/src/debug/dwarf/testdata/typedef.elf
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.elf
rename to src/debug/dwarf/testdata/typedef.elf
diff --git a/src/pkg/debug/dwarf/testdata/typedef.elf4 b/src/debug/dwarf/testdata/typedef.elf4
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.elf4
rename to src/debug/dwarf/testdata/typedef.elf4
diff --git a/src/pkg/debug/dwarf/testdata/typedef.macho b/src/debug/dwarf/testdata/typedef.macho
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.macho
rename to src/debug/dwarf/testdata/typedef.macho
diff --git a/src/pkg/debug/dwarf/type.go b/src/debug/dwarf/type.go
similarity index 100%
rename from src/pkg/debug/dwarf/type.go
rename to src/debug/dwarf/type.go
diff --git a/src/pkg/debug/dwarf/type_test.go b/src/debug/dwarf/type_test.go
similarity index 100%
rename from src/pkg/debug/dwarf/type_test.go
rename to src/debug/dwarf/type_test.go
diff --git a/src/pkg/debug/dwarf/typeunit.go b/src/debug/dwarf/typeunit.go
similarity index 100%
rename from src/pkg/debug/dwarf/typeunit.go
rename to src/debug/dwarf/typeunit.go
diff --git a/src/pkg/debug/dwarf/unit.go b/src/debug/dwarf/unit.go
similarity index 100%
rename from src/pkg/debug/dwarf/unit.go
rename to src/debug/dwarf/unit.go
diff --git a/src/pkg/debug/elf/elf.go b/src/debug/elf/elf.go
similarity index 100%
rename from src/pkg/debug/elf/elf.go
rename to src/debug/elf/elf.go
diff --git a/src/pkg/debug/elf/elf_test.go b/src/debug/elf/elf_test.go
similarity index 100%
rename from src/pkg/debug/elf/elf_test.go
rename to src/debug/elf/elf_test.go
diff --git a/src/pkg/debug/elf/file.go b/src/debug/elf/file.go
similarity index 100%
rename from src/pkg/debug/elf/file.go
rename to src/debug/elf/file.go
diff --git a/src/pkg/debug/elf/file_test.go b/src/debug/elf/file_test.go
similarity index 100%
rename from src/pkg/debug/elf/file_test.go
rename to src/debug/elf/file_test.go
diff --git a/src/pkg/debug/elf/symbols_test.go b/src/debug/elf/symbols_test.go
similarity index 100%
rename from src/pkg/debug/elf/symbols_test.go
rename to src/debug/elf/symbols_test.go
diff --git a/src/pkg/debug/elf/testdata/gcc-386-freebsd-exec b/src/debug/elf/testdata/gcc-386-freebsd-exec
similarity index 100%
rename from src/pkg/debug/elf/testdata/gcc-386-freebsd-exec
rename to src/debug/elf/testdata/gcc-386-freebsd-exec
diff --git a/src/pkg/debug/elf/testdata/gcc-amd64-linux-exec b/src/debug/elf/testdata/gcc-amd64-linux-exec
similarity index 100%
rename from src/pkg/debug/elf/testdata/gcc-amd64-linux-exec
rename to src/debug/elf/testdata/gcc-amd64-linux-exec
diff --git a/src/pkg/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj b/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
rename to src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-clang-x86.obj b/src/debug/elf/testdata/go-relocation-test-clang-x86.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-clang-x86.obj
rename to src/debug/elf/testdata/go-relocation-test-clang-x86.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj b/src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj b/src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.obj b/src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj b/src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
diff --git a/src/pkg/debug/elf/testdata/hello-world-core.gz b/src/debug/elf/testdata/hello-world-core.gz
similarity index 100%
rename from src/pkg/debug/elf/testdata/hello-world-core.gz
rename to src/debug/elf/testdata/hello-world-core.gz
diff --git a/src/pkg/debug/elf/testdata/hello.c b/src/debug/elf/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/elf/testdata/hello.c
rename to src/debug/elf/testdata/hello.c
diff --git a/src/pkg/debug/goobj/read.go b/src/debug/goobj/read.go
similarity index 100%
rename from src/pkg/debug/goobj/read.go
rename to src/debug/goobj/read.go
diff --git a/src/pkg/debug/goobj/read_test.go b/src/debug/goobj/read_test.go
similarity index 100%
rename from src/pkg/debug/goobj/read_test.go
rename to src/debug/goobj/read_test.go
diff --git a/src/pkg/debug/gosym/pclinetest.asm b/src/debug/gosym/pclinetest.asm
similarity index 100%
rename from src/pkg/debug/gosym/pclinetest.asm
rename to src/debug/gosym/pclinetest.asm
diff --git a/src/pkg/debug/gosym/pclinetest.h b/src/debug/gosym/pclinetest.h
similarity index 100%
rename from src/pkg/debug/gosym/pclinetest.h
rename to src/debug/gosym/pclinetest.h
diff --git a/src/pkg/debug/gosym/pclntab.go b/src/debug/gosym/pclntab.go
similarity index 100%
rename from src/pkg/debug/gosym/pclntab.go
rename to src/debug/gosym/pclntab.go
diff --git a/src/pkg/debug/gosym/pclntab_test.go b/src/debug/gosym/pclntab_test.go
similarity index 100%
rename from src/pkg/debug/gosym/pclntab_test.go
rename to src/debug/gosym/pclntab_test.go
diff --git a/src/pkg/debug/gosym/symtab.go b/src/debug/gosym/symtab.go
similarity index 100%
rename from src/pkg/debug/gosym/symtab.go
rename to src/debug/gosym/symtab.go
diff --git a/src/pkg/debug/macho/fat.go b/src/debug/macho/fat.go
similarity index 100%
rename from src/pkg/debug/macho/fat.go
rename to src/debug/macho/fat.go
diff --git a/src/pkg/debug/macho/file.go b/src/debug/macho/file.go
similarity index 100%
rename from src/pkg/debug/macho/file.go
rename to src/debug/macho/file.go
diff --git a/src/pkg/debug/macho/file_test.go b/src/debug/macho/file_test.go
similarity index 100%
rename from src/pkg/debug/macho/file_test.go
rename to src/debug/macho/file_test.go
diff --git a/src/pkg/debug/macho/macho.go b/src/debug/macho/macho.go
similarity index 100%
rename from src/pkg/debug/macho/macho.go
rename to src/debug/macho/macho.go
diff --git a/src/pkg/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec b/src/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
similarity index 100%
rename from src/pkg/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
rename to src/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-386-darwin-exec b/src/debug/macho/testdata/gcc-386-darwin-exec
similarity index 100%
rename from src/pkg/debug/macho/testdata/gcc-386-darwin-exec
rename to src/debug/macho/testdata/gcc-386-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec b/src/debug/macho/testdata/gcc-amd64-darwin-exec
similarity index 100%
rename from src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec
rename to src/debug/macho/testdata/gcc-amd64-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec-debug b/src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
similarity index 100%
rename from src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec-debug
rename to src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
diff --git a/src/pkg/debug/macho/testdata/hello.c b/src/debug/macho/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/macho/testdata/hello.c
rename to src/debug/macho/testdata/hello.c
diff --git a/src/pkg/debug/pe/file.go b/src/debug/pe/file.go
similarity index 100%
rename from src/pkg/debug/pe/file.go
rename to src/debug/pe/file.go
diff --git a/src/pkg/debug/pe/file_test.go b/src/debug/pe/file_test.go
similarity index 100%
rename from src/pkg/debug/pe/file_test.go
rename to src/debug/pe/file_test.go
diff --git a/src/pkg/debug/pe/pe.go b/src/debug/pe/pe.go
similarity index 100%
rename from src/pkg/debug/pe/pe.go
rename to src/debug/pe/pe.go
diff --git a/src/pkg/debug/pe/testdata/gcc-386-mingw-exec b/src/debug/pe/testdata/gcc-386-mingw-exec
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-386-mingw-exec
rename to src/debug/pe/testdata/gcc-386-mingw-exec
diff --git a/src/pkg/debug/pe/testdata/gcc-386-mingw-obj b/src/debug/pe/testdata/gcc-386-mingw-obj
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-386-mingw-obj
rename to src/debug/pe/testdata/gcc-386-mingw-obj
diff --git a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-exec b/src/debug/pe/testdata/gcc-amd64-mingw-exec
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-amd64-mingw-exec
rename to src/debug/pe/testdata/gcc-amd64-mingw-exec
diff --git a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-obj b/src/debug/pe/testdata/gcc-amd64-mingw-obj
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-amd64-mingw-obj
rename to src/debug/pe/testdata/gcc-amd64-mingw-obj
diff --git a/src/pkg/debug/pe/testdata/hello.c b/src/debug/pe/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/pe/testdata/hello.c
rename to src/debug/pe/testdata/hello.c
diff --git a/src/pkg/debug/plan9obj/file.go b/src/debug/plan9obj/file.go
similarity index 100%
rename from src/pkg/debug/plan9obj/file.go
rename to src/debug/plan9obj/file.go
diff --git a/src/pkg/debug/plan9obj/file_test.go b/src/debug/plan9obj/file_test.go
similarity index 100%
rename from src/pkg/debug/plan9obj/file_test.go
rename to src/debug/plan9obj/file_test.go
diff --git a/src/pkg/debug/plan9obj/plan9obj.go b/src/debug/plan9obj/plan9obj.go
similarity index 100%
rename from src/pkg/debug/plan9obj/plan9obj.go
rename to src/debug/plan9obj/plan9obj.go
diff --git a/src/pkg/debug/plan9obj/testdata/386-plan9-exec b/src/debug/plan9obj/testdata/386-plan9-exec
similarity index 100%
rename from src/pkg/debug/plan9obj/testdata/386-plan9-exec
rename to src/debug/plan9obj/testdata/386-plan9-exec
diff --git a/src/pkg/debug/plan9obj/testdata/amd64-plan9-exec b/src/debug/plan9obj/testdata/amd64-plan9-exec
similarity index 100%
rename from src/pkg/debug/plan9obj/testdata/amd64-plan9-exec
rename to src/debug/plan9obj/testdata/amd64-plan9-exec
diff --git a/src/pkg/debug/plan9obj/testdata/hello.c b/src/debug/plan9obj/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/plan9obj/testdata/hello.c
rename to src/debug/plan9obj/testdata/hello.c
diff --git a/src/pkg/encoding/ascii85/ascii85.go b/src/encoding/ascii85/ascii85.go
similarity index 100%
rename from src/pkg/encoding/ascii85/ascii85.go
rename to src/encoding/ascii85/ascii85.go
diff --git a/src/pkg/encoding/ascii85/ascii85_test.go b/src/encoding/ascii85/ascii85_test.go
similarity index 100%
rename from src/pkg/encoding/ascii85/ascii85_test.go
rename to src/encoding/ascii85/ascii85_test.go
diff --git a/src/pkg/encoding/asn1/asn1.go b/src/encoding/asn1/asn1.go
similarity index 100%
rename from src/pkg/encoding/asn1/asn1.go
rename to src/encoding/asn1/asn1.go
diff --git a/src/pkg/encoding/asn1/asn1_test.go b/src/encoding/asn1/asn1_test.go
similarity index 100%
rename from src/pkg/encoding/asn1/asn1_test.go
rename to src/encoding/asn1/asn1_test.go
diff --git a/src/pkg/encoding/asn1/common.go b/src/encoding/asn1/common.go
similarity index 100%
rename from src/pkg/encoding/asn1/common.go
rename to src/encoding/asn1/common.go
diff --git a/src/pkg/encoding/asn1/marshal.go b/src/encoding/asn1/marshal.go
similarity index 100%
rename from src/pkg/encoding/asn1/marshal.go
rename to src/encoding/asn1/marshal.go
diff --git a/src/pkg/encoding/asn1/marshal_test.go b/src/encoding/asn1/marshal_test.go
similarity index 100%
rename from src/pkg/encoding/asn1/marshal_test.go
rename to src/encoding/asn1/marshal_test.go
diff --git a/src/pkg/encoding/base32/base32.go b/src/encoding/base32/base32.go
similarity index 100%
rename from src/pkg/encoding/base32/base32.go
rename to src/encoding/base32/base32.go
diff --git a/src/pkg/encoding/base32/base32_test.go b/src/encoding/base32/base32_test.go
similarity index 100%
rename from src/pkg/encoding/base32/base32_test.go
rename to src/encoding/base32/base32_test.go
diff --git a/src/pkg/encoding/base32/example_test.go b/src/encoding/base32/example_test.go
similarity index 100%
rename from src/pkg/encoding/base32/example_test.go
rename to src/encoding/base32/example_test.go
diff --git a/src/pkg/encoding/base64/base64.go b/src/encoding/base64/base64.go
similarity index 100%
rename from src/pkg/encoding/base64/base64.go
rename to src/encoding/base64/base64.go
diff --git a/src/pkg/encoding/base64/base64_test.go b/src/encoding/base64/base64_test.go
similarity index 100%
rename from src/pkg/encoding/base64/base64_test.go
rename to src/encoding/base64/base64_test.go
diff --git a/src/pkg/encoding/base64/example_test.go b/src/encoding/base64/example_test.go
similarity index 100%
rename from src/pkg/encoding/base64/example_test.go
rename to src/encoding/base64/example_test.go
diff --git a/src/pkg/encoding/binary/binary.go b/src/encoding/binary/binary.go
similarity index 100%
rename from src/pkg/encoding/binary/binary.go
rename to src/encoding/binary/binary.go
diff --git a/src/pkg/encoding/binary/binary_test.go b/src/encoding/binary/binary_test.go
similarity index 100%
rename from src/pkg/encoding/binary/binary_test.go
rename to src/encoding/binary/binary_test.go
diff --git a/src/pkg/encoding/binary/example_test.go b/src/encoding/binary/example_test.go
similarity index 100%
rename from src/pkg/encoding/binary/example_test.go
rename to src/encoding/binary/example_test.go
diff --git a/src/pkg/encoding/binary/varint.go b/src/encoding/binary/varint.go
similarity index 100%
rename from src/pkg/encoding/binary/varint.go
rename to src/encoding/binary/varint.go
diff --git a/src/pkg/encoding/binary/varint_test.go b/src/encoding/binary/varint_test.go
similarity index 100%
rename from src/pkg/encoding/binary/varint_test.go
rename to src/encoding/binary/varint_test.go
diff --git a/src/pkg/encoding/csv/reader.go b/src/encoding/csv/reader.go
similarity index 100%
rename from src/pkg/encoding/csv/reader.go
rename to src/encoding/csv/reader.go
diff --git a/src/pkg/encoding/csv/reader_test.go b/src/encoding/csv/reader_test.go
similarity index 100%
rename from src/pkg/encoding/csv/reader_test.go
rename to src/encoding/csv/reader_test.go
diff --git a/src/pkg/encoding/csv/writer.go b/src/encoding/csv/writer.go
similarity index 100%
rename from src/pkg/encoding/csv/writer.go
rename to src/encoding/csv/writer.go
diff --git a/src/pkg/encoding/csv/writer_test.go b/src/encoding/csv/writer_test.go
similarity index 100%
rename from src/pkg/encoding/csv/writer_test.go
rename to src/encoding/csv/writer_test.go
diff --git a/src/pkg/encoding/encoding.go b/src/encoding/encoding.go
similarity index 100%
rename from src/pkg/encoding/encoding.go
rename to src/encoding/encoding.go
diff --git a/src/pkg/encoding/gob/codec_test.go b/src/encoding/gob/codec_test.go
similarity index 100%
rename from src/pkg/encoding/gob/codec_test.go
rename to src/encoding/gob/codec_test.go
diff --git a/src/pkg/encoding/gob/debug.go b/src/encoding/gob/debug.go
similarity index 100%
rename from src/pkg/encoding/gob/debug.go
rename to src/encoding/gob/debug.go
diff --git a/src/pkg/encoding/gob/decode.go b/src/encoding/gob/decode.go
similarity index 100%
rename from src/pkg/encoding/gob/decode.go
rename to src/encoding/gob/decode.go
diff --git a/src/pkg/encoding/gob/decoder.go b/src/encoding/gob/decoder.go
similarity index 100%
rename from src/pkg/encoding/gob/decoder.go
rename to src/encoding/gob/decoder.go
diff --git a/src/pkg/encoding/gob/doc.go b/src/encoding/gob/doc.go
similarity index 100%
rename from src/pkg/encoding/gob/doc.go
rename to src/encoding/gob/doc.go
diff --git a/src/pkg/encoding/gob/dump.go b/src/encoding/gob/dump.go
similarity index 100%
rename from src/pkg/encoding/gob/dump.go
rename to src/encoding/gob/dump.go
diff --git a/src/pkg/encoding/gob/encode.go b/src/encoding/gob/encode.go
similarity index 100%
rename from src/pkg/encoding/gob/encode.go
rename to src/encoding/gob/encode.go
diff --git a/src/pkg/encoding/gob/encoder.go b/src/encoding/gob/encoder.go
similarity index 100%
rename from src/pkg/encoding/gob/encoder.go
rename to src/encoding/gob/encoder.go
diff --git a/src/pkg/encoding/gob/encoder_test.go b/src/encoding/gob/encoder_test.go
similarity index 100%
rename from src/pkg/encoding/gob/encoder_test.go
rename to src/encoding/gob/encoder_test.go
diff --git a/src/pkg/encoding/gob/error.go b/src/encoding/gob/error.go
similarity index 100%
rename from src/pkg/encoding/gob/error.go
rename to src/encoding/gob/error.go
diff --git a/src/pkg/encoding/gob/example_encdec_test.go b/src/encoding/gob/example_encdec_test.go
similarity index 100%
rename from src/pkg/encoding/gob/example_encdec_test.go
rename to src/encoding/gob/example_encdec_test.go
diff --git a/src/pkg/encoding/gob/example_interface_test.go b/src/encoding/gob/example_interface_test.go
similarity index 100%
rename from src/pkg/encoding/gob/example_interface_test.go
rename to src/encoding/gob/example_interface_test.go
diff --git a/src/pkg/encoding/gob/example_test.go b/src/encoding/gob/example_test.go
similarity index 100%
rename from src/pkg/encoding/gob/example_test.go
rename to src/encoding/gob/example_test.go
diff --git a/src/pkg/encoding/gob/gobencdec_test.go b/src/encoding/gob/gobencdec_test.go
similarity index 100%
rename from src/pkg/encoding/gob/gobencdec_test.go
rename to src/encoding/gob/gobencdec_test.go
diff --git a/src/pkg/encoding/gob/timing_test.go b/src/encoding/gob/timing_test.go
similarity index 100%
rename from src/pkg/encoding/gob/timing_test.go
rename to src/encoding/gob/timing_test.go
diff --git a/src/pkg/encoding/gob/type.go b/src/encoding/gob/type.go
similarity index 100%
rename from src/pkg/encoding/gob/type.go
rename to src/encoding/gob/type.go
diff --git a/src/pkg/encoding/gob/type_test.go b/src/encoding/gob/type_test.go
similarity index 100%
rename from src/pkg/encoding/gob/type_test.go
rename to src/encoding/gob/type_test.go
diff --git a/src/pkg/encoding/hex/hex.go b/src/encoding/hex/hex.go
similarity index 100%
rename from src/pkg/encoding/hex/hex.go
rename to src/encoding/hex/hex.go
diff --git a/src/pkg/encoding/hex/hex_test.go b/src/encoding/hex/hex_test.go
similarity index 100%
rename from src/pkg/encoding/hex/hex_test.go
rename to src/encoding/hex/hex_test.go
diff --git a/src/pkg/encoding/json/bench_test.go b/src/encoding/json/bench_test.go
similarity index 100%
rename from src/pkg/encoding/json/bench_test.go
rename to src/encoding/json/bench_test.go
diff --git a/src/pkg/encoding/json/decode.go b/src/encoding/json/decode.go
similarity index 100%
rename from src/pkg/encoding/json/decode.go
rename to src/encoding/json/decode.go
diff --git a/src/pkg/encoding/json/decode_test.go b/src/encoding/json/decode_test.go
similarity index 100%
rename from src/pkg/encoding/json/decode_test.go
rename to src/encoding/json/decode_test.go
diff --git a/src/pkg/encoding/json/encode.go b/src/encoding/json/encode.go
similarity index 100%
rename from src/pkg/encoding/json/encode.go
rename to src/encoding/json/encode.go
diff --git a/src/pkg/encoding/json/encode_test.go b/src/encoding/json/encode_test.go
similarity index 100%
rename from src/pkg/encoding/json/encode_test.go
rename to src/encoding/json/encode_test.go
diff --git a/src/pkg/encoding/json/example_test.go b/src/encoding/json/example_test.go
similarity index 100%
rename from src/pkg/encoding/json/example_test.go
rename to src/encoding/json/example_test.go
diff --git a/src/pkg/encoding/json/fold.go b/src/encoding/json/fold.go
similarity index 100%
rename from src/pkg/encoding/json/fold.go
rename to src/encoding/json/fold.go
diff --git a/src/pkg/encoding/json/fold_test.go b/src/encoding/json/fold_test.go
similarity index 100%
rename from src/pkg/encoding/json/fold_test.go
rename to src/encoding/json/fold_test.go
diff --git a/src/pkg/encoding/json/indent.go b/src/encoding/json/indent.go
similarity index 100%
rename from src/pkg/encoding/json/indent.go
rename to src/encoding/json/indent.go
diff --git a/src/pkg/encoding/json/scanner.go b/src/encoding/json/scanner.go
similarity index 100%
rename from src/pkg/encoding/json/scanner.go
rename to src/encoding/json/scanner.go
diff --git a/src/pkg/encoding/json/scanner_test.go b/src/encoding/json/scanner_test.go
similarity index 100%
rename from src/pkg/encoding/json/scanner_test.go
rename to src/encoding/json/scanner_test.go
diff --git a/src/pkg/encoding/json/stream.go b/src/encoding/json/stream.go
similarity index 100%
rename from src/pkg/encoding/json/stream.go
rename to src/encoding/json/stream.go
diff --git a/src/pkg/encoding/json/stream_test.go b/src/encoding/json/stream_test.go
similarity index 100%
rename from src/pkg/encoding/json/stream_test.go
rename to src/encoding/json/stream_test.go
diff --git a/src/pkg/encoding/json/tagkey_test.go b/src/encoding/json/tagkey_test.go
similarity index 100%
rename from src/pkg/encoding/json/tagkey_test.go
rename to src/encoding/json/tagkey_test.go
diff --git a/src/pkg/encoding/json/tags.go b/src/encoding/json/tags.go
similarity index 100%
rename from src/pkg/encoding/json/tags.go
rename to src/encoding/json/tags.go
diff --git a/src/pkg/encoding/json/tags_test.go b/src/encoding/json/tags_test.go
similarity index 100%
rename from src/pkg/encoding/json/tags_test.go
rename to src/encoding/json/tags_test.go
diff --git a/src/pkg/encoding/json/testdata/code.json.gz b/src/encoding/json/testdata/code.json.gz
similarity index 100%
rename from src/pkg/encoding/json/testdata/code.json.gz
rename to src/encoding/json/testdata/code.json.gz
diff --git a/src/pkg/encoding/pem/pem.go b/src/encoding/pem/pem.go
similarity index 100%
rename from src/pkg/encoding/pem/pem.go
rename to src/encoding/pem/pem.go
diff --git a/src/pkg/encoding/pem/pem_test.go b/src/encoding/pem/pem_test.go
similarity index 100%
rename from src/pkg/encoding/pem/pem_test.go
rename to src/encoding/pem/pem_test.go
diff --git a/src/pkg/encoding/xml/atom_test.go b/src/encoding/xml/atom_test.go
similarity index 100%
rename from src/pkg/encoding/xml/atom_test.go
rename to src/encoding/xml/atom_test.go
diff --git a/src/pkg/encoding/xml/example_test.go b/src/encoding/xml/example_test.go
similarity index 100%
rename from src/pkg/encoding/xml/example_test.go
rename to src/encoding/xml/example_test.go
diff --git a/src/pkg/encoding/xml/marshal.go b/src/encoding/xml/marshal.go
similarity index 100%
rename from src/pkg/encoding/xml/marshal.go
rename to src/encoding/xml/marshal.go
diff --git a/src/pkg/encoding/xml/marshal_test.go b/src/encoding/xml/marshal_test.go
similarity index 100%
rename from src/pkg/encoding/xml/marshal_test.go
rename to src/encoding/xml/marshal_test.go
diff --git a/src/pkg/encoding/xml/read.go b/src/encoding/xml/read.go
similarity index 100%
rename from src/pkg/encoding/xml/read.go
rename to src/encoding/xml/read.go
diff --git a/src/pkg/encoding/xml/read_test.go b/src/encoding/xml/read_test.go
similarity index 100%
rename from src/pkg/encoding/xml/read_test.go
rename to src/encoding/xml/read_test.go
diff --git a/src/pkg/encoding/xml/typeinfo.go b/src/encoding/xml/typeinfo.go
similarity index 100%
rename from src/pkg/encoding/xml/typeinfo.go
rename to src/encoding/xml/typeinfo.go
diff --git a/src/pkg/encoding/xml/xml.go b/src/encoding/xml/xml.go
similarity index 100%
rename from src/pkg/encoding/xml/xml.go
rename to src/encoding/xml/xml.go
diff --git a/src/pkg/encoding/xml/xml_test.go b/src/encoding/xml/xml_test.go
similarity index 100%
rename from src/pkg/encoding/xml/xml_test.go
rename to src/encoding/xml/xml_test.go
diff --git a/src/pkg/errors/errors.go b/src/errors/errors.go
similarity index 100%
rename from src/pkg/errors/errors.go
rename to src/errors/errors.go
diff --git a/src/pkg/errors/errors_test.go b/src/errors/errors_test.go
similarity index 100%
rename from src/pkg/errors/errors_test.go
rename to src/errors/errors_test.go
diff --git a/src/pkg/errors/example_test.go b/src/errors/example_test.go
similarity index 100%
rename from src/pkg/errors/example_test.go
rename to src/errors/example_test.go
diff --git a/src/pkg/expvar/expvar.go b/src/expvar/expvar.go
similarity index 100%
rename from src/pkg/expvar/expvar.go
rename to src/expvar/expvar.go
diff --git a/src/pkg/expvar/expvar_test.go b/src/expvar/expvar_test.go
similarity index 100%
rename from src/pkg/expvar/expvar_test.go
rename to src/expvar/expvar_test.go
diff --git a/src/pkg/flag/example_test.go b/src/flag/example_test.go
similarity index 100%
rename from src/pkg/flag/example_test.go
rename to src/flag/example_test.go
diff --git a/src/pkg/flag/export_test.go b/src/flag/export_test.go
similarity index 100%
rename from src/pkg/flag/export_test.go
rename to src/flag/export_test.go
diff --git a/src/pkg/flag/flag.go b/src/flag/flag.go
similarity index 100%
rename from src/pkg/flag/flag.go
rename to src/flag/flag.go
diff --git a/src/pkg/flag/flag_test.go b/src/flag/flag_test.go
similarity index 100%
rename from src/pkg/flag/flag_test.go
rename to src/flag/flag_test.go
diff --git a/src/pkg/fmt/doc.go b/src/fmt/doc.go
similarity index 100%
rename from src/pkg/fmt/doc.go
rename to src/fmt/doc.go
diff --git a/src/pkg/fmt/export_test.go b/src/fmt/export_test.go
similarity index 100%
rename from src/pkg/fmt/export_test.go
rename to src/fmt/export_test.go
diff --git a/src/pkg/fmt/fmt_test.go b/src/fmt/fmt_test.go
similarity index 100%
rename from src/pkg/fmt/fmt_test.go
rename to src/fmt/fmt_test.go
diff --git a/src/pkg/fmt/format.go b/src/fmt/format.go
similarity index 100%
rename from src/pkg/fmt/format.go
rename to src/fmt/format.go
diff --git a/src/pkg/fmt/print.go b/src/fmt/print.go
similarity index 100%
rename from src/pkg/fmt/print.go
rename to src/fmt/print.go
diff --git a/src/pkg/fmt/scan.go b/src/fmt/scan.go
similarity index 100%
rename from src/pkg/fmt/scan.go
rename to src/fmt/scan.go
diff --git a/src/pkg/fmt/scan_test.go b/src/fmt/scan_test.go
similarity index 100%
rename from src/pkg/fmt/scan_test.go
rename to src/fmt/scan_test.go
diff --git a/src/pkg/fmt/stringer_test.go b/src/fmt/stringer_test.go
similarity index 100%
rename from src/pkg/fmt/stringer_test.go
rename to src/fmt/stringer_test.go
diff --git a/src/pkg/go/ast/ast.go b/src/go/ast/ast.go
similarity index 100%
rename from src/pkg/go/ast/ast.go
rename to src/go/ast/ast.go
diff --git a/src/pkg/go/ast/ast_test.go b/src/go/ast/ast_test.go
similarity index 100%
rename from src/pkg/go/ast/ast_test.go
rename to src/go/ast/ast_test.go
diff --git a/src/pkg/go/ast/commentmap.go b/src/go/ast/commentmap.go
similarity index 100%
rename from src/pkg/go/ast/commentmap.go
rename to src/go/ast/commentmap.go
diff --git a/src/pkg/go/ast/commentmap_test.go b/src/go/ast/commentmap_test.go
similarity index 100%
rename from src/pkg/go/ast/commentmap_test.go
rename to src/go/ast/commentmap_test.go
diff --git a/src/pkg/go/ast/example_test.go b/src/go/ast/example_test.go
similarity index 100%
rename from src/pkg/go/ast/example_test.go
rename to src/go/ast/example_test.go
diff --git a/src/pkg/go/ast/filter.go b/src/go/ast/filter.go
similarity index 100%
rename from src/pkg/go/ast/filter.go
rename to src/go/ast/filter.go
diff --git a/src/pkg/go/ast/filter_test.go b/src/go/ast/filter_test.go
similarity index 100%
rename from src/pkg/go/ast/filter_test.go
rename to src/go/ast/filter_test.go
diff --git a/src/pkg/go/ast/import.go b/src/go/ast/import.go
similarity index 100%
rename from src/pkg/go/ast/import.go
rename to src/go/ast/import.go
diff --git a/src/pkg/go/ast/print.go b/src/go/ast/print.go
similarity index 100%
rename from src/pkg/go/ast/print.go
rename to src/go/ast/print.go
diff --git a/src/pkg/go/ast/print_test.go b/src/go/ast/print_test.go
similarity index 100%
rename from src/pkg/go/ast/print_test.go
rename to src/go/ast/print_test.go
diff --git a/src/pkg/go/ast/resolve.go b/src/go/ast/resolve.go
similarity index 100%
rename from src/pkg/go/ast/resolve.go
rename to src/go/ast/resolve.go
diff --git a/src/pkg/go/ast/scope.go b/src/go/ast/scope.go
similarity index 100%
rename from src/pkg/go/ast/scope.go
rename to src/go/ast/scope.go
diff --git a/src/pkg/go/ast/walk.go b/src/go/ast/walk.go
similarity index 100%
rename from src/pkg/go/ast/walk.go
rename to src/go/ast/walk.go
diff --git a/src/pkg/go/build/build.go b/src/go/build/build.go
similarity index 100%
rename from src/pkg/go/build/build.go
rename to src/go/build/build.go
diff --git a/src/pkg/go/build/build_test.go b/src/go/build/build_test.go
similarity index 100%
rename from src/pkg/go/build/build_test.go
rename to src/go/build/build_test.go
diff --git a/src/pkg/go/build/deps_test.go b/src/go/build/deps_test.go
similarity index 100%
rename from src/pkg/go/build/deps_test.go
rename to src/go/build/deps_test.go
diff --git a/src/pkg/go/build/doc.go b/src/go/build/doc.go
similarity index 100%
rename from src/pkg/go/build/doc.go
rename to src/go/build/doc.go
diff --git a/src/pkg/go/build/read.go b/src/go/build/read.go
similarity index 100%
rename from src/pkg/go/build/read.go
rename to src/go/build/read.go
diff --git a/src/pkg/go/build/read_test.go b/src/go/build/read_test.go
similarity index 100%
rename from src/pkg/go/build/read_test.go
rename to src/go/build/read_test.go
diff --git a/src/pkg/go/build/syslist.go b/src/go/build/syslist.go
similarity index 100%
rename from src/pkg/go/build/syslist.go
rename to src/go/build/syslist.go
diff --git a/src/pkg/go/build/syslist_test.go b/src/go/build/syslist_test.go
similarity index 100%
rename from src/pkg/go/build/syslist_test.go
rename to src/go/build/syslist_test.go
diff --git a/src/pkg/go/build/testdata/other/file/file.go b/src/go/build/testdata/other/file/file.go
similarity index 100%
rename from src/pkg/go/build/testdata/other/file/file.go
rename to src/go/build/testdata/other/file/file.go
diff --git a/src/pkg/go/build/testdata/other/main.go b/src/go/build/testdata/other/main.go
similarity index 100%
rename from src/pkg/go/build/testdata/other/main.go
rename to src/go/build/testdata/other/main.go
diff --git a/src/pkg/go/doc/Makefile b/src/go/doc/Makefile
similarity index 100%
rename from src/pkg/go/doc/Makefile
rename to src/go/doc/Makefile
diff --git a/src/pkg/go/doc/comment.go b/src/go/doc/comment.go
similarity index 100%
rename from src/pkg/go/doc/comment.go
rename to src/go/doc/comment.go
diff --git a/src/pkg/go/doc/comment_test.go b/src/go/doc/comment_test.go
similarity index 100%
rename from src/pkg/go/doc/comment_test.go
rename to src/go/doc/comment_test.go
diff --git a/src/pkg/go/doc/doc.go b/src/go/doc/doc.go
similarity index 100%
rename from src/pkg/go/doc/doc.go
rename to src/go/doc/doc.go
diff --git a/src/pkg/go/doc/doc_test.go b/src/go/doc/doc_test.go
similarity index 100%
rename from src/pkg/go/doc/doc_test.go
rename to src/go/doc/doc_test.go
diff --git a/src/pkg/go/doc/example.go b/src/go/doc/example.go
similarity index 100%
rename from src/pkg/go/doc/example.go
rename to src/go/doc/example.go
diff --git a/src/pkg/go/doc/example_test.go b/src/go/doc/example_test.go
similarity index 100%
rename from src/pkg/go/doc/example_test.go
rename to src/go/doc/example_test.go
diff --git a/src/pkg/go/doc/exports.go b/src/go/doc/exports.go
similarity index 100%
rename from src/pkg/go/doc/exports.go
rename to src/go/doc/exports.go
diff --git a/src/pkg/go/doc/filter.go b/src/go/doc/filter.go
similarity index 100%
rename from src/pkg/go/doc/filter.go
rename to src/go/doc/filter.go
diff --git a/src/pkg/go/doc/headscan.go b/src/go/doc/headscan.go
similarity index 100%
rename from src/pkg/go/doc/headscan.go
rename to src/go/doc/headscan.go
diff --git a/src/pkg/go/doc/reader.go b/src/go/doc/reader.go
similarity index 100%
rename from src/pkg/go/doc/reader.go
rename to src/go/doc/reader.go
diff --git a/src/pkg/go/doc/synopsis.go b/src/go/doc/synopsis.go
similarity index 100%
rename from src/pkg/go/doc/synopsis.go
rename to src/go/doc/synopsis.go
diff --git a/src/pkg/go/doc/synopsis_test.go b/src/go/doc/synopsis_test.go
similarity index 100%
rename from src/pkg/go/doc/synopsis_test.go
rename to src/go/doc/synopsis_test.go
diff --git a/src/pkg/go/doc/testdata/a.0.golden b/src/go/doc/testdata/a.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/a.0.golden
rename to src/go/doc/testdata/a.0.golden
diff --git a/src/pkg/go/doc/testdata/a.1.golden b/src/go/doc/testdata/a.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/a.1.golden
rename to src/go/doc/testdata/a.1.golden
diff --git a/src/pkg/go/doc/testdata/a.2.golden b/src/go/doc/testdata/a.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/a.2.golden
rename to src/go/doc/testdata/a.2.golden
diff --git a/src/pkg/go/doc/testdata/a0.go b/src/go/doc/testdata/a0.go
similarity index 100%
rename from src/pkg/go/doc/testdata/a0.go
rename to src/go/doc/testdata/a0.go
diff --git a/src/pkg/go/doc/testdata/a1.go b/src/go/doc/testdata/a1.go
similarity index 100%
rename from src/pkg/go/doc/testdata/a1.go
rename to src/go/doc/testdata/a1.go
diff --git a/src/pkg/go/doc/testdata/b.0.golden b/src/go/doc/testdata/b.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/b.0.golden
rename to src/go/doc/testdata/b.0.golden
diff --git a/src/pkg/go/doc/testdata/b.1.golden b/src/go/doc/testdata/b.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/b.1.golden
rename to src/go/doc/testdata/b.1.golden
diff --git a/src/pkg/go/doc/testdata/b.2.golden b/src/go/doc/testdata/b.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/b.2.golden
rename to src/go/doc/testdata/b.2.golden
diff --git a/src/pkg/go/doc/testdata/b.go b/src/go/doc/testdata/b.go
similarity index 100%
rename from src/pkg/go/doc/testdata/b.go
rename to src/go/doc/testdata/b.go
diff --git a/src/pkg/go/doc/testdata/benchmark.go b/src/go/doc/testdata/benchmark.go
similarity index 100%
rename from src/pkg/go/doc/testdata/benchmark.go
rename to src/go/doc/testdata/benchmark.go
diff --git a/src/pkg/go/doc/testdata/bugpara.0.golden b/src/go/doc/testdata/bugpara.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.0.golden
rename to src/go/doc/testdata/bugpara.0.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.1.golden b/src/go/doc/testdata/bugpara.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.1.golden
rename to src/go/doc/testdata/bugpara.1.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.2.golden b/src/go/doc/testdata/bugpara.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.2.golden
rename to src/go/doc/testdata/bugpara.2.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.go b/src/go/doc/testdata/bugpara.go
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.go
rename to src/go/doc/testdata/bugpara.go
diff --git a/src/pkg/go/doc/testdata/c.0.golden b/src/go/doc/testdata/c.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/c.0.golden
rename to src/go/doc/testdata/c.0.golden
diff --git a/src/pkg/go/doc/testdata/c.1.golden b/src/go/doc/testdata/c.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/c.1.golden
rename to src/go/doc/testdata/c.1.golden
diff --git a/src/pkg/go/doc/testdata/c.2.golden b/src/go/doc/testdata/c.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/c.2.golden
rename to src/go/doc/testdata/c.2.golden
diff --git a/src/pkg/go/doc/testdata/c.go b/src/go/doc/testdata/c.go
similarity index 100%
rename from src/pkg/go/doc/testdata/c.go
rename to src/go/doc/testdata/c.go
diff --git a/src/pkg/go/doc/testdata/d.0.golden b/src/go/doc/testdata/d.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/d.0.golden
rename to src/go/doc/testdata/d.0.golden
diff --git a/src/pkg/go/doc/testdata/d.1.golden b/src/go/doc/testdata/d.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/d.1.golden
rename to src/go/doc/testdata/d.1.golden
diff --git a/src/pkg/go/doc/testdata/d.2.golden b/src/go/doc/testdata/d.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/d.2.golden
rename to src/go/doc/testdata/d.2.golden
diff --git a/src/pkg/go/doc/testdata/d1.go b/src/go/doc/testdata/d1.go
similarity index 100%
rename from src/pkg/go/doc/testdata/d1.go
rename to src/go/doc/testdata/d1.go
diff --git a/src/pkg/go/doc/testdata/d2.go b/src/go/doc/testdata/d2.go
similarity index 100%
rename from src/pkg/go/doc/testdata/d2.go
rename to src/go/doc/testdata/d2.go
diff --git a/src/pkg/go/doc/testdata/e.0.golden b/src/go/doc/testdata/e.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/e.0.golden
rename to src/go/doc/testdata/e.0.golden
diff --git a/src/pkg/go/doc/testdata/e.1.golden b/src/go/doc/testdata/e.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/e.1.golden
rename to src/go/doc/testdata/e.1.golden
diff --git a/src/pkg/go/doc/testdata/e.2.golden b/src/go/doc/testdata/e.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/e.2.golden
rename to src/go/doc/testdata/e.2.golden
diff --git a/src/pkg/go/doc/testdata/e.go b/src/go/doc/testdata/e.go
similarity index 100%
rename from src/pkg/go/doc/testdata/e.go
rename to src/go/doc/testdata/e.go
diff --git a/src/pkg/go/doc/testdata/error1.0.golden b/src/go/doc/testdata/error1.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.0.golden
rename to src/go/doc/testdata/error1.0.golden
diff --git a/src/pkg/go/doc/testdata/error1.1.golden b/src/go/doc/testdata/error1.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.1.golden
rename to src/go/doc/testdata/error1.1.golden
diff --git a/src/pkg/go/doc/testdata/error1.2.golden b/src/go/doc/testdata/error1.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.2.golden
rename to src/go/doc/testdata/error1.2.golden
diff --git a/src/pkg/go/doc/testdata/error1.go b/src/go/doc/testdata/error1.go
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.go
rename to src/go/doc/testdata/error1.go
diff --git a/src/pkg/go/doc/testdata/error2.0.golden b/src/go/doc/testdata/error2.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.0.golden
rename to src/go/doc/testdata/error2.0.golden
diff --git a/src/pkg/go/doc/testdata/error2.1.golden b/src/go/doc/testdata/error2.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.1.golden
rename to src/go/doc/testdata/error2.1.golden
diff --git a/src/pkg/go/doc/testdata/error2.2.golden b/src/go/doc/testdata/error2.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.2.golden
rename to src/go/doc/testdata/error2.2.golden
diff --git a/src/pkg/go/doc/testdata/error2.go b/src/go/doc/testdata/error2.go
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.go
rename to src/go/doc/testdata/error2.go
diff --git a/src/pkg/go/doc/testdata/example.go b/src/go/doc/testdata/example.go
similarity index 100%
rename from src/pkg/go/doc/testdata/example.go
rename to src/go/doc/testdata/example.go
diff --git a/src/pkg/go/doc/testdata/f.0.golden b/src/go/doc/testdata/f.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/f.0.golden
rename to src/go/doc/testdata/f.0.golden
diff --git a/src/pkg/go/doc/testdata/f.1.golden b/src/go/doc/testdata/f.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/f.1.golden
rename to src/go/doc/testdata/f.1.golden
diff --git a/src/pkg/go/doc/testdata/f.2.golden b/src/go/doc/testdata/f.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/f.2.golden
rename to src/go/doc/testdata/f.2.golden
diff --git a/src/pkg/go/doc/testdata/f.go b/src/go/doc/testdata/f.go
similarity index 100%
rename from src/pkg/go/doc/testdata/f.go
rename to src/go/doc/testdata/f.go
diff --git a/src/pkg/go/doc/testdata/template.txt b/src/go/doc/testdata/template.txt
similarity index 100%
rename from src/pkg/go/doc/testdata/template.txt
rename to src/go/doc/testdata/template.txt
diff --git a/src/pkg/go/doc/testdata/testing.0.golden b/src/go/doc/testdata/testing.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.0.golden
rename to src/go/doc/testdata/testing.0.golden
diff --git a/src/pkg/go/doc/testdata/testing.1.golden b/src/go/doc/testdata/testing.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.1.golden
rename to src/go/doc/testdata/testing.1.golden
diff --git a/src/pkg/go/doc/testdata/testing.2.golden b/src/go/doc/testdata/testing.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.2.golden
rename to src/go/doc/testdata/testing.2.golden
diff --git a/src/pkg/go/doc/testdata/testing.go b/src/go/doc/testdata/testing.go
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.go
rename to src/go/doc/testdata/testing.go
diff --git a/src/pkg/go/format/format.go b/src/go/format/format.go
similarity index 100%
rename from src/pkg/go/format/format.go
rename to src/go/format/format.go
diff --git a/src/pkg/go/format/format_test.go b/src/go/format/format_test.go
similarity index 100%
rename from src/pkg/go/format/format_test.go
rename to src/go/format/format_test.go
diff --git a/src/pkg/go/parser/error_test.go b/src/go/parser/error_test.go
similarity index 100%
rename from src/pkg/go/parser/error_test.go
rename to src/go/parser/error_test.go
diff --git a/src/pkg/go/parser/example_test.go b/src/go/parser/example_test.go
similarity index 100%
rename from src/pkg/go/parser/example_test.go
rename to src/go/parser/example_test.go
diff --git a/src/pkg/go/parser/interface.go b/src/go/parser/interface.go
similarity index 100%
rename from src/pkg/go/parser/interface.go
rename to src/go/parser/interface.go
diff --git a/src/pkg/go/parser/parser.go b/src/go/parser/parser.go
similarity index 100%
rename from src/pkg/go/parser/parser.go
rename to src/go/parser/parser.go
diff --git a/src/pkg/go/parser/parser_test.go b/src/go/parser/parser_test.go
similarity index 100%
rename from src/pkg/go/parser/parser_test.go
rename to src/go/parser/parser_test.go
diff --git a/src/pkg/go/parser/performance_test.go b/src/go/parser/performance_test.go
similarity index 100%
rename from src/pkg/go/parser/performance_test.go
rename to src/go/parser/performance_test.go
diff --git a/src/pkg/go/parser/short_test.go b/src/go/parser/short_test.go
similarity index 100%
rename from src/pkg/go/parser/short_test.go
rename to src/go/parser/short_test.go
diff --git a/src/pkg/go/parser/testdata/commas.src b/src/go/parser/testdata/commas.src
similarity index 100%
rename from src/pkg/go/parser/testdata/commas.src
rename to src/go/parser/testdata/commas.src
diff --git a/src/pkg/go/parser/testdata/issue3106.src b/src/go/parser/testdata/issue3106.src
similarity index 100%
rename from src/pkg/go/parser/testdata/issue3106.src
rename to src/go/parser/testdata/issue3106.src
diff --git a/src/pkg/go/printer/example_test.go b/src/go/printer/example_test.go
similarity index 100%
rename from src/pkg/go/printer/example_test.go
rename to src/go/printer/example_test.go
diff --git a/src/pkg/go/printer/nodes.go b/src/go/printer/nodes.go
similarity index 100%
rename from src/pkg/go/printer/nodes.go
rename to src/go/printer/nodes.go
diff --git a/src/pkg/go/printer/performance_test.go b/src/go/printer/performance_test.go
similarity index 100%
rename from src/pkg/go/printer/performance_test.go
rename to src/go/printer/performance_test.go
diff --git a/src/pkg/go/printer/printer.go b/src/go/printer/printer.go
similarity index 100%
rename from src/pkg/go/printer/printer.go
rename to src/go/printer/printer.go
diff --git a/src/pkg/go/printer/printer_test.go b/src/go/printer/printer_test.go
similarity index 100%
rename from src/pkg/go/printer/printer_test.go
rename to src/go/printer/printer_test.go
diff --git a/src/pkg/go/printer/testdata/comments.golden b/src/go/printer/testdata/comments.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/comments.golden
rename to src/go/printer/testdata/comments.golden
diff --git a/src/pkg/go/printer/testdata/comments.input b/src/go/printer/testdata/comments.input
similarity index 100%
rename from src/pkg/go/printer/testdata/comments.input
rename to src/go/printer/testdata/comments.input
diff --git a/src/pkg/go/printer/testdata/comments.x b/src/go/printer/testdata/comments.x
similarity index 100%
rename from src/pkg/go/printer/testdata/comments.x
rename to src/go/printer/testdata/comments.x
diff --git a/src/pkg/go/printer/testdata/comments2.golden b/src/go/printer/testdata/comments2.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/comments2.golden
rename to src/go/printer/testdata/comments2.golden
diff --git a/src/pkg/go/printer/testdata/comments2.input b/src/go/printer/testdata/comments2.input
similarity index 100%
rename from src/pkg/go/printer/testdata/comments2.input
rename to src/go/printer/testdata/comments2.input
diff --git a/src/pkg/go/printer/testdata/declarations.golden b/src/go/printer/testdata/declarations.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/declarations.golden
rename to src/go/printer/testdata/declarations.golden
diff --git a/src/pkg/go/printer/testdata/declarations.input b/src/go/printer/testdata/declarations.input
similarity index 100%
rename from src/pkg/go/printer/testdata/declarations.input
rename to src/go/printer/testdata/declarations.input
diff --git a/src/pkg/go/printer/testdata/empty.golden b/src/go/printer/testdata/empty.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/empty.golden
rename to src/go/printer/testdata/empty.golden
diff --git a/src/pkg/go/printer/testdata/empty.input b/src/go/printer/testdata/empty.input
similarity index 100%
rename from src/pkg/go/printer/testdata/empty.input
rename to src/go/printer/testdata/empty.input
diff --git a/src/pkg/go/printer/testdata/expressions.golden b/src/go/printer/testdata/expressions.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/expressions.golden
rename to src/go/printer/testdata/expressions.golden
diff --git a/src/pkg/go/printer/testdata/expressions.input b/src/go/printer/testdata/expressions.input
similarity index 100%
rename from src/pkg/go/printer/testdata/expressions.input
rename to src/go/printer/testdata/expressions.input
diff --git a/src/pkg/go/printer/testdata/expressions.raw b/src/go/printer/testdata/expressions.raw
similarity index 100%
rename from src/pkg/go/printer/testdata/expressions.raw
rename to src/go/printer/testdata/expressions.raw
diff --git a/src/pkg/go/printer/testdata/linebreaks.golden b/src/go/printer/testdata/linebreaks.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/linebreaks.golden
rename to src/go/printer/testdata/linebreaks.golden
diff --git a/src/pkg/go/printer/testdata/linebreaks.input b/src/go/printer/testdata/linebreaks.input
similarity index 100%
rename from src/pkg/go/printer/testdata/linebreaks.input
rename to src/go/printer/testdata/linebreaks.input
diff --git a/src/pkg/go/printer/testdata/parser.go b/src/go/printer/testdata/parser.go
similarity index 100%
rename from src/pkg/go/printer/testdata/parser.go
rename to src/go/printer/testdata/parser.go
diff --git a/src/pkg/go/printer/testdata/slow.golden b/src/go/printer/testdata/slow.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/slow.golden
rename to src/go/printer/testdata/slow.golden
diff --git a/src/pkg/go/printer/testdata/slow.input b/src/go/printer/testdata/slow.input
similarity index 100%
rename from src/pkg/go/printer/testdata/slow.input
rename to src/go/printer/testdata/slow.input
diff --git a/src/pkg/go/printer/testdata/statements.golden b/src/go/printer/testdata/statements.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/statements.golden
rename to src/go/printer/testdata/statements.golden
diff --git a/src/pkg/go/printer/testdata/statements.input b/src/go/printer/testdata/statements.input
similarity index 100%
rename from src/pkg/go/printer/testdata/statements.input
rename to src/go/printer/testdata/statements.input
diff --git a/src/pkg/go/scanner/errors.go b/src/go/scanner/errors.go
similarity index 100%
rename from src/pkg/go/scanner/errors.go
rename to src/go/scanner/errors.go
diff --git a/src/pkg/go/scanner/example_test.go b/src/go/scanner/example_test.go
similarity index 100%
rename from src/pkg/go/scanner/example_test.go
rename to src/go/scanner/example_test.go
diff --git a/src/pkg/go/scanner/scanner.go b/src/go/scanner/scanner.go
similarity index 100%
rename from src/pkg/go/scanner/scanner.go
rename to src/go/scanner/scanner.go
diff --git a/src/pkg/go/scanner/scanner_test.go b/src/go/scanner/scanner_test.go
similarity index 100%
rename from src/pkg/go/scanner/scanner_test.go
rename to src/go/scanner/scanner_test.go
diff --git a/src/pkg/go/token/position.go b/src/go/token/position.go
similarity index 100%
rename from src/pkg/go/token/position.go
rename to src/go/token/position.go
diff --git a/src/pkg/go/token/position_test.go b/src/go/token/position_test.go
similarity index 100%
rename from src/pkg/go/token/position_test.go
rename to src/go/token/position_test.go
diff --git a/src/pkg/go/token/serialize.go b/src/go/token/serialize.go
similarity index 100%
rename from src/pkg/go/token/serialize.go
rename to src/go/token/serialize.go
diff --git a/src/pkg/go/token/serialize_test.go b/src/go/token/serialize_test.go
similarity index 100%
rename from src/pkg/go/token/serialize_test.go
rename to src/go/token/serialize_test.go
diff --git a/src/pkg/go/token/token.go b/src/go/token/token.go
similarity index 100%
rename from src/pkg/go/token/token.go
rename to src/go/token/token.go
diff --git a/src/pkg/hash/adler32/adler32.go b/src/hash/adler32/adler32.go
similarity index 100%
rename from src/pkg/hash/adler32/adler32.go
rename to src/hash/adler32/adler32.go
diff --git a/src/pkg/hash/adler32/adler32_test.go b/src/hash/adler32/adler32_test.go
similarity index 100%
rename from src/pkg/hash/adler32/adler32_test.go
rename to src/hash/adler32/adler32_test.go
diff --git a/src/pkg/hash/crc32/crc32.go b/src/hash/crc32/crc32.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32.go
rename to src/hash/crc32/crc32.go
diff --git a/src/pkg/hash/crc32/crc32_amd64.s b/src/hash/crc32/crc32_amd64.s
similarity index 100%
rename from src/pkg/hash/crc32/crc32_amd64.s
rename to src/hash/crc32/crc32_amd64.s
diff --git a/src/pkg/hash/crc32/crc32_amd64p32.s b/src/hash/crc32/crc32_amd64p32.s
similarity index 100%
rename from src/pkg/hash/crc32/crc32_amd64p32.s
rename to src/hash/crc32/crc32_amd64p32.s
diff --git a/src/pkg/hash/crc32/crc32_amd64x.go b/src/hash/crc32/crc32_amd64x.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32_amd64x.go
rename to src/hash/crc32/crc32_amd64x.go
diff --git a/src/pkg/hash/crc32/crc32_generic.go b/src/hash/crc32/crc32_generic.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32_generic.go
rename to src/hash/crc32/crc32_generic.go
diff --git a/src/pkg/hash/crc32/crc32_test.go b/src/hash/crc32/crc32_test.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32_test.go
rename to src/hash/crc32/crc32_test.go
diff --git a/src/pkg/hash/crc64/crc64.go b/src/hash/crc64/crc64.go
similarity index 100%
rename from src/pkg/hash/crc64/crc64.go
rename to src/hash/crc64/crc64.go
diff --git a/src/pkg/hash/crc64/crc64_test.go b/src/hash/crc64/crc64_test.go
similarity index 100%
rename from src/pkg/hash/crc64/crc64_test.go
rename to src/hash/crc64/crc64_test.go
diff --git a/src/pkg/hash/fnv/fnv.go b/src/hash/fnv/fnv.go
similarity index 100%
rename from src/pkg/hash/fnv/fnv.go
rename to src/hash/fnv/fnv.go
diff --git a/src/pkg/hash/fnv/fnv_test.go b/src/hash/fnv/fnv_test.go
similarity index 100%
rename from src/pkg/hash/fnv/fnv_test.go
rename to src/hash/fnv/fnv_test.go
diff --git a/src/pkg/hash/hash.go b/src/hash/hash.go
similarity index 100%
rename from src/pkg/hash/hash.go
rename to src/hash/hash.go
diff --git a/src/pkg/hash/test_cases.txt b/src/hash/test_cases.txt
similarity index 100%
rename from src/pkg/hash/test_cases.txt
rename to src/hash/test_cases.txt
diff --git a/src/pkg/hash/test_gen.awk b/src/hash/test_gen.awk
similarity index 100%
rename from src/pkg/hash/test_gen.awk
rename to src/hash/test_gen.awk
diff --git a/src/pkg/html/entity.go b/src/html/entity.go
similarity index 100%
rename from src/pkg/html/entity.go
rename to src/html/entity.go
diff --git a/src/pkg/html/entity_test.go b/src/html/entity_test.go
similarity index 100%
rename from src/pkg/html/entity_test.go
rename to src/html/entity_test.go
diff --git a/src/pkg/html/escape.go b/src/html/escape.go
similarity index 100%
rename from src/pkg/html/escape.go
rename to src/html/escape.go
diff --git a/src/pkg/html/escape_test.go b/src/html/escape_test.go
similarity index 100%
rename from src/pkg/html/escape_test.go
rename to src/html/escape_test.go
diff --git a/src/pkg/html/template/attr.go b/src/html/template/attr.go
similarity index 100%
rename from src/pkg/html/template/attr.go
rename to src/html/template/attr.go
diff --git a/src/pkg/html/template/clone_test.go b/src/html/template/clone_test.go
similarity index 100%
rename from src/pkg/html/template/clone_test.go
rename to src/html/template/clone_test.go
diff --git a/src/pkg/html/template/content.go b/src/html/template/content.go
similarity index 100%
rename from src/pkg/html/template/content.go
rename to src/html/template/content.go
diff --git a/src/pkg/html/template/content_test.go b/src/html/template/content_test.go
similarity index 100%
rename from src/pkg/html/template/content_test.go
rename to src/html/template/content_test.go
diff --git a/src/pkg/html/template/context.go b/src/html/template/context.go
similarity index 100%
rename from src/pkg/html/template/context.go
rename to src/html/template/context.go
diff --git a/src/pkg/html/template/css.go b/src/html/template/css.go
similarity index 100%
rename from src/pkg/html/template/css.go
rename to src/html/template/css.go
diff --git a/src/pkg/html/template/css_test.go b/src/html/template/css_test.go
similarity index 100%
rename from src/pkg/html/template/css_test.go
rename to src/html/template/css_test.go
diff --git a/src/pkg/html/template/doc.go b/src/html/template/doc.go
similarity index 100%
rename from src/pkg/html/template/doc.go
rename to src/html/template/doc.go
diff --git a/src/pkg/html/template/error.go b/src/html/template/error.go
similarity index 100%
rename from src/pkg/html/template/error.go
rename to src/html/template/error.go
diff --git a/src/pkg/html/template/escape.go b/src/html/template/escape.go
similarity index 100%
rename from src/pkg/html/template/escape.go
rename to src/html/template/escape.go
diff --git a/src/pkg/html/template/escape_test.go b/src/html/template/escape_test.go
similarity index 100%
rename from src/pkg/html/template/escape_test.go
rename to src/html/template/escape_test.go
diff --git a/src/pkg/html/template/html.go b/src/html/template/html.go
similarity index 100%
rename from src/pkg/html/template/html.go
rename to src/html/template/html.go
diff --git a/src/pkg/html/template/html_test.go b/src/html/template/html_test.go
similarity index 100%
rename from src/pkg/html/template/html_test.go
rename to src/html/template/html_test.go
diff --git a/src/pkg/html/template/js.go b/src/html/template/js.go
similarity index 100%
rename from src/pkg/html/template/js.go
rename to src/html/template/js.go
diff --git a/src/pkg/html/template/js_test.go b/src/html/template/js_test.go
similarity index 100%
rename from src/pkg/html/template/js_test.go
rename to src/html/template/js_test.go
diff --git a/src/pkg/html/template/template.go b/src/html/template/template.go
similarity index 100%
rename from src/pkg/html/template/template.go
rename to src/html/template/template.go
diff --git a/src/pkg/html/template/transition.go b/src/html/template/transition.go
similarity index 100%
rename from src/pkg/html/template/transition.go
rename to src/html/template/transition.go
diff --git a/src/pkg/html/template/url.go b/src/html/template/url.go
similarity index 100%
rename from src/pkg/html/template/url.go
rename to src/html/template/url.go
diff --git a/src/pkg/html/template/url_test.go b/src/html/template/url_test.go
similarity index 100%
rename from src/pkg/html/template/url_test.go
rename to src/html/template/url_test.go
diff --git a/src/pkg/image/color/color.go b/src/image/color/color.go
similarity index 100%
rename from src/pkg/image/color/color.go
rename to src/image/color/color.go
diff --git a/src/pkg/image/color/palette/gen.go b/src/image/color/palette/gen.go
similarity index 100%
rename from src/pkg/image/color/palette/gen.go
rename to src/image/color/palette/gen.go
diff --git a/src/pkg/image/color/palette/generate.go b/src/image/color/palette/generate.go
similarity index 100%
rename from src/pkg/image/color/palette/generate.go
rename to src/image/color/palette/generate.go
diff --git a/src/pkg/image/color/palette/palette.go b/src/image/color/palette/palette.go
similarity index 100%
rename from src/pkg/image/color/palette/palette.go
rename to src/image/color/palette/palette.go
diff --git a/src/pkg/image/color/ycbcr.go b/src/image/color/ycbcr.go
similarity index 100%
rename from src/pkg/image/color/ycbcr.go
rename to src/image/color/ycbcr.go
diff --git a/src/pkg/image/color/ycbcr_test.go b/src/image/color/ycbcr_test.go
similarity index 100%
rename from src/pkg/image/color/ycbcr_test.go
rename to src/image/color/ycbcr_test.go
diff --git a/src/pkg/image/decode_example_test.go b/src/image/decode_example_test.go
similarity index 100%
rename from src/pkg/image/decode_example_test.go
rename to src/image/decode_example_test.go
diff --git a/src/pkg/image/decode_test.go b/src/image/decode_test.go
similarity index 100%
rename from src/pkg/image/decode_test.go
rename to src/image/decode_test.go
diff --git a/src/pkg/image/draw/bench_test.go b/src/image/draw/bench_test.go
similarity index 100%
rename from src/pkg/image/draw/bench_test.go
rename to src/image/draw/bench_test.go
diff --git a/src/pkg/image/draw/clip_test.go b/src/image/draw/clip_test.go
similarity index 100%
rename from src/pkg/image/draw/clip_test.go
rename to src/image/draw/clip_test.go
diff --git a/src/pkg/image/draw/draw.go b/src/image/draw/draw.go
similarity index 100%
rename from src/pkg/image/draw/draw.go
rename to src/image/draw/draw.go
diff --git a/src/pkg/image/draw/draw_test.go b/src/image/draw/draw_test.go
similarity index 100%
rename from src/pkg/image/draw/draw_test.go
rename to src/image/draw/draw_test.go
diff --git a/src/pkg/image/format.go b/src/image/format.go
similarity index 100%
rename from src/pkg/image/format.go
rename to src/image/format.go
diff --git a/src/pkg/image/geom.go b/src/image/geom.go
similarity index 100%
rename from src/pkg/image/geom.go
rename to src/image/geom.go
diff --git a/src/pkg/image/gif/reader.go b/src/image/gif/reader.go
similarity index 100%
rename from src/pkg/image/gif/reader.go
rename to src/image/gif/reader.go
diff --git a/src/pkg/image/gif/reader_test.go b/src/image/gif/reader_test.go
similarity index 100%
rename from src/pkg/image/gif/reader_test.go
rename to src/image/gif/reader_test.go
diff --git a/src/pkg/image/gif/writer.go b/src/image/gif/writer.go
similarity index 100%
rename from src/pkg/image/gif/writer.go
rename to src/image/gif/writer.go
diff --git a/src/pkg/image/gif/writer_test.go b/src/image/gif/writer_test.go
similarity index 100%
rename from src/pkg/image/gif/writer_test.go
rename to src/image/gif/writer_test.go
diff --git a/src/pkg/image/image.go b/src/image/image.go
similarity index 100%
rename from src/pkg/image/image.go
rename to src/image/image.go
diff --git a/src/pkg/image/image_test.go b/src/image/image_test.go
similarity index 100%
rename from src/pkg/image/image_test.go
rename to src/image/image_test.go
diff --git a/src/pkg/image/jpeg/dct_test.go b/src/image/jpeg/dct_test.go
similarity index 100%
rename from src/pkg/image/jpeg/dct_test.go
rename to src/image/jpeg/dct_test.go
diff --git a/src/pkg/image/jpeg/fdct.go b/src/image/jpeg/fdct.go
similarity index 100%
rename from src/pkg/image/jpeg/fdct.go
rename to src/image/jpeg/fdct.go
diff --git a/src/pkg/image/jpeg/huffman.go b/src/image/jpeg/huffman.go
similarity index 100%
rename from src/pkg/image/jpeg/huffman.go
rename to src/image/jpeg/huffman.go
diff --git a/src/pkg/image/jpeg/idct.go b/src/image/jpeg/idct.go
similarity index 100%
rename from src/pkg/image/jpeg/idct.go
rename to src/image/jpeg/idct.go
diff --git a/src/pkg/image/jpeg/reader.go b/src/image/jpeg/reader.go
similarity index 100%
rename from src/pkg/image/jpeg/reader.go
rename to src/image/jpeg/reader.go
diff --git a/src/pkg/image/jpeg/reader_test.go b/src/image/jpeg/reader_test.go
similarity index 100%
rename from src/pkg/image/jpeg/reader_test.go
rename to src/image/jpeg/reader_test.go
diff --git a/src/pkg/image/jpeg/scan.go b/src/image/jpeg/scan.go
similarity index 100%
rename from src/pkg/image/jpeg/scan.go
rename to src/image/jpeg/scan.go
diff --git a/src/pkg/image/jpeg/writer.go b/src/image/jpeg/writer.go
similarity index 100%
rename from src/pkg/image/jpeg/writer.go
rename to src/image/jpeg/writer.go
diff --git a/src/pkg/image/jpeg/writer_test.go b/src/image/jpeg/writer_test.go
similarity index 100%
rename from src/pkg/image/jpeg/writer_test.go
rename to src/image/jpeg/writer_test.go
diff --git a/src/pkg/image/names.go b/src/image/names.go
similarity index 100%
rename from src/pkg/image/names.go
rename to src/image/names.go
diff --git a/src/pkg/image/png/paeth.go b/src/image/png/paeth.go
similarity index 100%
rename from src/pkg/image/png/paeth.go
rename to src/image/png/paeth.go
diff --git a/src/pkg/image/png/paeth_test.go b/src/image/png/paeth_test.go
similarity index 100%
rename from src/pkg/image/png/paeth_test.go
rename to src/image/png/paeth_test.go
diff --git a/src/pkg/image/png/reader.go b/src/image/png/reader.go
similarity index 100%
rename from src/pkg/image/png/reader.go
rename to src/image/png/reader.go
diff --git a/src/pkg/image/png/reader_test.go b/src/image/png/reader_test.go
similarity index 100%
rename from src/pkg/image/png/reader_test.go
rename to src/image/png/reader_test.go
diff --git a/src/pkg/image/png/testdata/benchGray.png b/src/image/png/testdata/benchGray.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchGray.png
rename to src/image/png/testdata/benchGray.png
diff --git a/src/pkg/image/png/testdata/benchNRGBA-gradient.png b/src/image/png/testdata/benchNRGBA-gradient.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchNRGBA-gradient.png
rename to src/image/png/testdata/benchNRGBA-gradient.png
diff --git a/src/pkg/image/png/testdata/benchNRGBA-opaque.png b/src/image/png/testdata/benchNRGBA-opaque.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchNRGBA-opaque.png
rename to src/image/png/testdata/benchNRGBA-opaque.png
diff --git a/src/pkg/image/png/testdata/benchPaletted.png b/src/image/png/testdata/benchPaletted.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchPaletted.png
rename to src/image/png/testdata/benchPaletted.png
diff --git a/src/pkg/image/png/testdata/benchRGB-interlace.png b/src/image/png/testdata/benchRGB-interlace.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchRGB-interlace.png
rename to src/image/png/testdata/benchRGB-interlace.png
diff --git a/src/pkg/image/png/testdata/benchRGB.png b/src/image/png/testdata/benchRGB.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchRGB.png
rename to src/image/png/testdata/benchRGB.png
diff --git a/src/pkg/image/png/testdata/invalid-crc32.png b/src/image/png/testdata/invalid-crc32.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-crc32.png
rename to src/image/png/testdata/invalid-crc32.png
diff --git a/src/pkg/image/png/testdata/invalid-noend.png b/src/image/png/testdata/invalid-noend.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-noend.png
rename to src/image/png/testdata/invalid-noend.png
diff --git a/src/pkg/image/png/testdata/invalid-trunc.png b/src/image/png/testdata/invalid-trunc.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-trunc.png
rename to src/image/png/testdata/invalid-trunc.png
diff --git a/src/pkg/image/png/testdata/invalid-zlib.png b/src/image/png/testdata/invalid-zlib.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-zlib.png
rename to src/image/png/testdata/invalid-zlib.png
diff --git a/src/pkg/image/png/testdata/pngsuite/README b/src/image/png/testdata/pngsuite/README
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/README
rename to src/image/png/testdata/pngsuite/README
diff --git a/src/pkg/image/png/testdata/pngsuite/README.original b/src/image/png/testdata/pngsuite/README.original
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/README.original
rename to src/image/png/testdata/pngsuite/README.original
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.png b/src/image/png/testdata/pngsuite/basn0g01-30.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01-30.png
rename to src/image/png/testdata/pngsuite/basn0g01-30.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.sng b/src/image/png/testdata/pngsuite/basn0g01-30.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01-30.sng
rename to src/image/png/testdata/pngsuite/basn0g01-30.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01.png b/src/image/png/testdata/pngsuite/basn0g01.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01.png
rename to src/image/png/testdata/pngsuite/basn0g01.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01.sng b/src/image/png/testdata/pngsuite/basn0g01.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01.sng
rename to src/image/png/testdata/pngsuite/basn0g01.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.png b/src/image/png/testdata/pngsuite/basn0g02-29.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02-29.png
rename to src/image/png/testdata/pngsuite/basn0g02-29.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.sng b/src/image/png/testdata/pngsuite/basn0g02-29.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02-29.sng
rename to src/image/png/testdata/pngsuite/basn0g02-29.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02.png b/src/image/png/testdata/pngsuite/basn0g02.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02.png
rename to src/image/png/testdata/pngsuite/basn0g02.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02.sng b/src/image/png/testdata/pngsuite/basn0g02.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02.sng
rename to src/image/png/testdata/pngsuite/basn0g02.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.png b/src/image/png/testdata/pngsuite/basn0g04-31.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04-31.png
rename to src/image/png/testdata/pngsuite/basn0g04-31.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.sng b/src/image/png/testdata/pngsuite/basn0g04-31.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04-31.sng
rename to src/image/png/testdata/pngsuite/basn0g04-31.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04.png b/src/image/png/testdata/pngsuite/basn0g04.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04.png
rename to src/image/png/testdata/pngsuite/basn0g04.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04.sng b/src/image/png/testdata/pngsuite/basn0g04.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04.sng
rename to src/image/png/testdata/pngsuite/basn0g04.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g08.png b/src/image/png/testdata/pngsuite/basn0g08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g08.png
rename to src/image/png/testdata/pngsuite/basn0g08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g08.sng b/src/image/png/testdata/pngsuite/basn0g08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g08.sng
rename to src/image/png/testdata/pngsuite/basn0g08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g16.png b/src/image/png/testdata/pngsuite/basn0g16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g16.png
rename to src/image/png/testdata/pngsuite/basn0g16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g16.sng b/src/image/png/testdata/pngsuite/basn0g16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g16.sng
rename to src/image/png/testdata/pngsuite/basn0g16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c08.png b/src/image/png/testdata/pngsuite/basn2c08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c08.png
rename to src/image/png/testdata/pngsuite/basn2c08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c08.sng b/src/image/png/testdata/pngsuite/basn2c08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c08.sng
rename to src/image/png/testdata/pngsuite/basn2c08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c16.png b/src/image/png/testdata/pngsuite/basn2c16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c16.png
rename to src/image/png/testdata/pngsuite/basn2c16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c16.sng b/src/image/png/testdata/pngsuite/basn2c16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c16.sng
rename to src/image/png/testdata/pngsuite/basn2c16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p01.png b/src/image/png/testdata/pngsuite/basn3p01.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p01.png
rename to src/image/png/testdata/pngsuite/basn3p01.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p01.sng b/src/image/png/testdata/pngsuite/basn3p01.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p01.sng
rename to src/image/png/testdata/pngsuite/basn3p01.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p02.png b/src/image/png/testdata/pngsuite/basn3p02.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p02.png
rename to src/image/png/testdata/pngsuite/basn3p02.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p02.sng b/src/image/png/testdata/pngsuite/basn3p02.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p02.sng
rename to src/image/png/testdata/pngsuite/basn3p02.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.png b/src/image/png/testdata/pngsuite/basn3p04-31i.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04-31i.png
rename to src/image/png/testdata/pngsuite/basn3p04-31i.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.sng b/src/image/png/testdata/pngsuite/basn3p04-31i.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04-31i.sng
rename to src/image/png/testdata/pngsuite/basn3p04-31i.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04.png b/src/image/png/testdata/pngsuite/basn3p04.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04.png
rename to src/image/png/testdata/pngsuite/basn3p04.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04.sng b/src/image/png/testdata/pngsuite/basn3p04.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04.sng
rename to src/image/png/testdata/pngsuite/basn3p04.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.png b/src/image/png/testdata/pngsuite/basn3p08-trns.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08-trns.png
rename to src/image/png/testdata/pngsuite/basn3p08-trns.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.sng b/src/image/png/testdata/pngsuite/basn3p08-trns.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08-trns.sng
rename to src/image/png/testdata/pngsuite/basn3p08-trns.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08.png b/src/image/png/testdata/pngsuite/basn3p08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08.png
rename to src/image/png/testdata/pngsuite/basn3p08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08.sng b/src/image/png/testdata/pngsuite/basn3p08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08.sng
rename to src/image/png/testdata/pngsuite/basn3p08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a08.png b/src/image/png/testdata/pngsuite/basn4a08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a08.png
rename to src/image/png/testdata/pngsuite/basn4a08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a08.sng b/src/image/png/testdata/pngsuite/basn4a08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a08.sng
rename to src/image/png/testdata/pngsuite/basn4a08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a16.png b/src/image/png/testdata/pngsuite/basn4a16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a16.png
rename to src/image/png/testdata/pngsuite/basn4a16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a16.sng b/src/image/png/testdata/pngsuite/basn4a16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a16.sng
rename to src/image/png/testdata/pngsuite/basn4a16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a08.png b/src/image/png/testdata/pngsuite/basn6a08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a08.png
rename to src/image/png/testdata/pngsuite/basn6a08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a08.sng b/src/image/png/testdata/pngsuite/basn6a08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a08.sng
rename to src/image/png/testdata/pngsuite/basn6a08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a16.png b/src/image/png/testdata/pngsuite/basn6a16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a16.png
rename to src/image/png/testdata/pngsuite/basn6a16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a16.sng b/src/image/png/testdata/pngsuite/basn6a16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a16.sng
rename to src/image/png/testdata/pngsuite/basn6a16.sng
diff --git a/src/pkg/image/png/writer.go b/src/image/png/writer.go
similarity index 100%
rename from src/pkg/image/png/writer.go
rename to src/image/png/writer.go
diff --git a/src/pkg/image/png/writer_test.go b/src/image/png/writer_test.go
similarity index 100%
rename from src/pkg/image/png/writer_test.go
rename to src/image/png/writer_test.go
diff --git a/src/pkg/image/testdata/video-001.5bpp.gif b/src/image/testdata/video-001.5bpp.gif
similarity index 100%
rename from src/pkg/image/testdata/video-001.5bpp.gif
rename to src/image/testdata/video-001.5bpp.gif
diff --git a/src/pkg/image/testdata/video-001.gif b/src/image/testdata/video-001.gif
similarity index 100%
rename from src/pkg/image/testdata/video-001.gif
rename to src/image/testdata/video-001.gif
diff --git a/src/pkg/image/testdata/video-001.interlaced.gif b/src/image/testdata/video-001.interlaced.gif
similarity index 100%
rename from src/pkg/image/testdata/video-001.interlaced.gif
rename to src/image/testdata/video-001.interlaced.gif
diff --git a/src/pkg/image/testdata/video-001.jpeg b/src/image/testdata/video-001.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.jpeg
rename to src/image/testdata/video-001.jpeg
diff --git a/src/pkg/image/testdata/video-001.png b/src/image/testdata/video-001.png
similarity index 100%
rename from src/pkg/image/testdata/video-001.png
rename to src/image/testdata/video-001.png
diff --git a/src/pkg/image/testdata/video-001.progressive.jpeg b/src/image/testdata/video-001.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.progressive.jpeg
rename to src/image/testdata/video-001.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.420.jpeg b/src/image/testdata/video-001.q50.420.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.420.jpeg
rename to src/image/testdata/video-001.q50.420.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.420.progressive.jpeg b/src/image/testdata/video-001.q50.420.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.420.progressive.jpeg
rename to src/image/testdata/video-001.q50.420.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.422.jpeg b/src/image/testdata/video-001.q50.422.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.422.jpeg
rename to src/image/testdata/video-001.q50.422.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.422.progressive.jpeg b/src/image/testdata/video-001.q50.422.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.422.progressive.jpeg
rename to src/image/testdata/video-001.q50.422.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.440.jpeg b/src/image/testdata/video-001.q50.440.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.440.jpeg
rename to src/image/testdata/video-001.q50.440.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.440.progressive.jpeg b/src/image/testdata/video-001.q50.440.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.440.progressive.jpeg
rename to src/image/testdata/video-001.q50.440.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.444.jpeg b/src/image/testdata/video-001.q50.444.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.444.jpeg
rename to src/image/testdata/video-001.q50.444.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.444.progressive.jpeg b/src/image/testdata/video-001.q50.444.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.444.progressive.jpeg
rename to src/image/testdata/video-001.q50.444.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.separate.dc.progression.jpeg b/src/image/testdata/video-001.separate.dc.progression.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.separate.dc.progression.jpeg
rename to src/image/testdata/video-001.separate.dc.progression.jpeg
diff --git a/src/pkg/image/testdata/video-001.separate.dc.progression.progressive.jpeg b/src/image/testdata/video-001.separate.dc.progression.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.separate.dc.progression.progressive.jpeg
rename to src/image/testdata/video-001.separate.dc.progression.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.gif b/src/image/testdata/video-005.gray.gif
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.gif
rename to src/image/testdata/video-005.gray.gif
diff --git a/src/pkg/image/testdata/video-005.gray.jpeg b/src/image/testdata/video-005.gray.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.jpeg
rename to src/image/testdata/video-005.gray.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.png b/src/image/testdata/video-005.gray.png
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.png
rename to src/image/testdata/video-005.gray.png
diff --git a/src/pkg/image/testdata/video-005.gray.q50.2x2.jpeg b/src/image/testdata/video-005.gray.q50.2x2.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.2x2.jpeg
rename to src/image/testdata/video-005.gray.q50.2x2.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.2x2.progressive.jpeg b/src/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
rename to src/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.jpeg b/src/image/testdata/video-005.gray.q50.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.jpeg
rename to src/image/testdata/video-005.gray.q50.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.progressive.jpeg b/src/image/testdata/video-005.gray.q50.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.progressive.jpeg
rename to src/image/testdata/video-005.gray.q50.progressive.jpeg
diff --git a/src/pkg/image/ycbcr.go b/src/image/ycbcr.go
similarity index 100%
rename from src/pkg/image/ycbcr.go
rename to src/image/ycbcr.go
diff --git a/src/pkg/image/ycbcr_test.go b/src/image/ycbcr_test.go
similarity index 100%
rename from src/pkg/image/ycbcr_test.go
rename to src/image/ycbcr_test.go
diff --git a/src/pkg/index/suffixarray/qsufsort.go b/src/index/suffixarray/qsufsort.go
similarity index 100%
rename from src/pkg/index/suffixarray/qsufsort.go
rename to src/index/suffixarray/qsufsort.go
diff --git a/src/pkg/index/suffixarray/suffixarray.go b/src/index/suffixarray/suffixarray.go
similarity index 100%
rename from src/pkg/index/suffixarray/suffixarray.go
rename to src/index/suffixarray/suffixarray.go
diff --git a/src/pkg/index/suffixarray/suffixarray_test.go b/src/index/suffixarray/suffixarray_test.go
similarity index 100%
rename from src/pkg/index/suffixarray/suffixarray_test.go
rename to src/index/suffixarray/suffixarray_test.go
diff --git a/src/pkg/internal/syscall/getrandom_linux.go b/src/internal/syscall/getrandom_linux.go
similarity index 100%
rename from src/pkg/internal/syscall/getrandom_linux.go
rename to src/internal/syscall/getrandom_linux.go
diff --git a/src/pkg/io/io.go b/src/io/io.go
similarity index 100%
rename from src/pkg/io/io.go
rename to src/io/io.go
diff --git a/src/pkg/io/io_test.go b/src/io/io_test.go
similarity index 100%
rename from src/pkg/io/io_test.go
rename to src/io/io_test.go
diff --git a/src/pkg/io/ioutil/ioutil.go b/src/io/ioutil/ioutil.go
similarity index 100%
rename from src/pkg/io/ioutil/ioutil.go
rename to src/io/ioutil/ioutil.go
diff --git a/src/pkg/io/ioutil/ioutil_test.go b/src/io/ioutil/ioutil_test.go
similarity index 100%
rename from src/pkg/io/ioutil/ioutil_test.go
rename to src/io/ioutil/ioutil_test.go
diff --git a/src/pkg/io/ioutil/tempfile.go b/src/io/ioutil/tempfile.go
similarity index 100%
rename from src/pkg/io/ioutil/tempfile.go
rename to src/io/ioutil/tempfile.go
diff --git a/src/pkg/io/ioutil/tempfile_test.go b/src/io/ioutil/tempfile_test.go
similarity index 100%
rename from src/pkg/io/ioutil/tempfile_test.go
rename to src/io/ioutil/tempfile_test.go
diff --git a/src/pkg/io/multi.go b/src/io/multi.go
similarity index 100%
rename from src/pkg/io/multi.go
rename to src/io/multi.go
diff --git a/src/pkg/io/multi_test.go b/src/io/multi_test.go
similarity index 100%
rename from src/pkg/io/multi_test.go
rename to src/io/multi_test.go
diff --git a/src/pkg/io/pipe.go b/src/io/pipe.go
similarity index 100%
rename from src/pkg/io/pipe.go
rename to src/io/pipe.go
diff --git a/src/pkg/io/pipe_test.go b/src/io/pipe_test.go
similarity index 100%
rename from src/pkg/io/pipe_test.go
rename to src/io/pipe_test.go
diff --git a/src/pkg/log/example_test.go b/src/log/example_test.go
similarity index 100%
rename from src/pkg/log/example_test.go
rename to src/log/example_test.go
diff --git a/src/pkg/log/log.go b/src/log/log.go
similarity index 100%
rename from src/pkg/log/log.go
rename to src/log/log.go
diff --git a/src/pkg/log/log_test.go b/src/log/log_test.go
similarity index 100%
rename from src/pkg/log/log_test.go
rename to src/log/log_test.go
diff --git a/src/pkg/log/syslog/syslog.go b/src/log/syslog/syslog.go
similarity index 100%
rename from src/pkg/log/syslog/syslog.go
rename to src/log/syslog/syslog.go
diff --git a/src/pkg/log/syslog/syslog_plan9.go b/src/log/syslog/syslog_plan9.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_plan9.go
rename to src/log/syslog/syslog_plan9.go
diff --git a/src/pkg/log/syslog/syslog_test.go b/src/log/syslog/syslog_test.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_test.go
rename to src/log/syslog/syslog_test.go
diff --git a/src/pkg/log/syslog/syslog_unix.go b/src/log/syslog/syslog_unix.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_unix.go
rename to src/log/syslog/syslog_unix.go
diff --git a/src/pkg/log/syslog/syslog_windows.go b/src/log/syslog/syslog_windows.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_windows.go
rename to src/log/syslog/syslog_windows.go
diff --git a/src/pkg/math/abs.go b/src/math/abs.go
similarity index 100%
rename from src/pkg/math/abs.go
rename to src/math/abs.go
diff --git a/src/pkg/math/abs_386.s b/src/math/abs_386.s
similarity index 100%
rename from src/pkg/math/abs_386.s
rename to src/math/abs_386.s
diff --git a/src/pkg/math/abs_amd64.s b/src/math/abs_amd64.s
similarity index 100%
rename from src/pkg/math/abs_amd64.s
rename to src/math/abs_amd64.s
diff --git a/src/pkg/math/abs_amd64p32.s b/src/math/abs_amd64p32.s
similarity index 100%
rename from src/pkg/math/abs_amd64p32.s
rename to src/math/abs_amd64p32.s
diff --git a/src/pkg/math/abs_arm.s b/src/math/abs_arm.s
similarity index 100%
rename from src/pkg/math/abs_arm.s
rename to src/math/abs_arm.s
diff --git a/src/pkg/math/acosh.go b/src/math/acosh.go
similarity index 100%
rename from src/pkg/math/acosh.go
rename to src/math/acosh.go
diff --git a/src/pkg/math/all_test.go b/src/math/all_test.go
similarity index 100%
rename from src/pkg/math/all_test.go
rename to src/math/all_test.go
diff --git a/src/pkg/math/asin.go b/src/math/asin.go
similarity index 100%
rename from src/pkg/math/asin.go
rename to src/math/asin.go
diff --git a/src/pkg/math/asin_386.s b/src/math/asin_386.s
similarity index 100%
rename from src/pkg/math/asin_386.s
rename to src/math/asin_386.s
diff --git a/src/pkg/math/asin_amd64.s b/src/math/asin_amd64.s
similarity index 100%
rename from src/pkg/math/asin_amd64.s
rename to src/math/asin_amd64.s
diff --git a/src/pkg/math/asin_amd64p32.s b/src/math/asin_amd64p32.s
similarity index 100%
rename from src/pkg/math/asin_amd64p32.s
rename to src/math/asin_amd64p32.s
diff --git a/src/pkg/math/asin_arm.s b/src/math/asin_arm.s
similarity index 100%
rename from src/pkg/math/asin_arm.s
rename to src/math/asin_arm.s
diff --git a/src/pkg/math/asinh.go b/src/math/asinh.go
similarity index 100%
rename from src/pkg/math/asinh.go
rename to src/math/asinh.go
diff --git a/src/pkg/math/atan.go b/src/math/atan.go
similarity index 100%
rename from src/pkg/math/atan.go
rename to src/math/atan.go
diff --git a/src/pkg/math/atan2.go b/src/math/atan2.go
similarity index 100%
rename from src/pkg/math/atan2.go
rename to src/math/atan2.go
diff --git a/src/pkg/math/atan2_386.s b/src/math/atan2_386.s
similarity index 100%
rename from src/pkg/math/atan2_386.s
rename to src/math/atan2_386.s
diff --git a/src/pkg/math/atan2_amd64.s b/src/math/atan2_amd64.s
similarity index 100%
rename from src/pkg/math/atan2_amd64.s
rename to src/math/atan2_amd64.s
diff --git a/src/pkg/math/atan2_amd64p32.s b/src/math/atan2_amd64p32.s
similarity index 100%
rename from src/pkg/math/atan2_amd64p32.s
rename to src/math/atan2_amd64p32.s
diff --git a/src/pkg/math/atan2_arm.s b/src/math/atan2_arm.s
similarity index 100%
rename from src/pkg/math/atan2_arm.s
rename to src/math/atan2_arm.s
diff --git a/src/pkg/math/atan_386.s b/src/math/atan_386.s
similarity index 100%
rename from src/pkg/math/atan_386.s
rename to src/math/atan_386.s
diff --git a/src/pkg/math/atan_amd64.s b/src/math/atan_amd64.s
similarity index 100%
rename from src/pkg/math/atan_amd64.s
rename to src/math/atan_amd64.s
diff --git a/src/pkg/math/atan_amd64p32.s b/src/math/atan_amd64p32.s
similarity index 100%
rename from src/pkg/math/atan_amd64p32.s
rename to src/math/atan_amd64p32.s
diff --git a/src/pkg/math/atan_arm.s b/src/math/atan_arm.s
similarity index 100%
rename from src/pkg/math/atan_arm.s
rename to src/math/atan_arm.s
diff --git a/src/pkg/math/atanh.go b/src/math/atanh.go
similarity index 100%
rename from src/pkg/math/atanh.go
rename to src/math/atanh.go
diff --git a/src/pkg/math/big/arith.go b/src/math/big/arith.go
similarity index 100%
rename from src/pkg/math/big/arith.go
rename to src/math/big/arith.go
diff --git a/src/pkg/math/big/arith_386.s b/src/math/big/arith_386.s
similarity index 100%
rename from src/pkg/math/big/arith_386.s
rename to src/math/big/arith_386.s
diff --git a/src/pkg/math/big/arith_amd64.s b/src/math/big/arith_amd64.s
similarity index 100%
rename from src/pkg/math/big/arith_amd64.s
rename to src/math/big/arith_amd64.s
diff --git a/src/pkg/math/big/arith_amd64p32.s b/src/math/big/arith_amd64p32.s
similarity index 100%
rename from src/pkg/math/big/arith_amd64p32.s
rename to src/math/big/arith_amd64p32.s
diff --git a/src/pkg/math/big/arith_arm.s b/src/math/big/arith_arm.s
similarity index 100%
rename from src/pkg/math/big/arith_arm.s
rename to src/math/big/arith_arm.s
diff --git a/src/pkg/math/big/arith_decl.go b/src/math/big/arith_decl.go
similarity index 100%
rename from src/pkg/math/big/arith_decl.go
rename to src/math/big/arith_decl.go
diff --git a/src/pkg/math/big/arith_test.go b/src/math/big/arith_test.go
similarity index 100%
rename from src/pkg/math/big/arith_test.go
rename to src/math/big/arith_test.go
diff --git a/src/pkg/math/big/calibrate_test.go b/src/math/big/calibrate_test.go
similarity index 100%
rename from src/pkg/math/big/calibrate_test.go
rename to src/math/big/calibrate_test.go
diff --git a/src/pkg/math/big/example_test.go b/src/math/big/example_test.go
similarity index 100%
rename from src/pkg/math/big/example_test.go
rename to src/math/big/example_test.go
diff --git a/src/pkg/math/big/gcd_test.go b/src/math/big/gcd_test.go
similarity index 100%
rename from src/pkg/math/big/gcd_test.go
rename to src/math/big/gcd_test.go
diff --git a/src/pkg/math/big/hilbert_test.go b/src/math/big/hilbert_test.go
similarity index 100%
rename from src/pkg/math/big/hilbert_test.go
rename to src/math/big/hilbert_test.go
diff --git a/src/pkg/math/big/int.go b/src/math/big/int.go
similarity index 100%
rename from src/pkg/math/big/int.go
rename to src/math/big/int.go
diff --git a/src/pkg/math/big/int_test.go b/src/math/big/int_test.go
similarity index 100%
rename from src/pkg/math/big/int_test.go
rename to src/math/big/int_test.go
diff --git a/src/pkg/math/big/nat.go b/src/math/big/nat.go
similarity index 100%
rename from src/pkg/math/big/nat.go
rename to src/math/big/nat.go
diff --git a/src/pkg/math/big/nat_test.go b/src/math/big/nat_test.go
similarity index 100%
rename from src/pkg/math/big/nat_test.go
rename to src/math/big/nat_test.go
diff --git a/src/pkg/math/big/rat.go b/src/math/big/rat.go
similarity index 100%
rename from src/pkg/math/big/rat.go
rename to src/math/big/rat.go
diff --git a/src/pkg/math/big/rat_test.go b/src/math/big/rat_test.go
similarity index 100%
rename from src/pkg/math/big/rat_test.go
rename to src/math/big/rat_test.go
diff --git a/src/pkg/math/bits.go b/src/math/bits.go
similarity index 100%
rename from src/pkg/math/bits.go
rename to src/math/bits.go
diff --git a/src/pkg/math/cbrt.go b/src/math/cbrt.go
similarity index 100%
rename from src/pkg/math/cbrt.go
rename to src/math/cbrt.go
diff --git a/src/pkg/math/cmplx/abs.go b/src/math/cmplx/abs.go
similarity index 100%
rename from src/pkg/math/cmplx/abs.go
rename to src/math/cmplx/abs.go
diff --git a/src/pkg/math/cmplx/asin.go b/src/math/cmplx/asin.go
similarity index 100%
rename from src/pkg/math/cmplx/asin.go
rename to src/math/cmplx/asin.go
diff --git a/src/pkg/math/cmplx/cmath_test.go b/src/math/cmplx/cmath_test.go
similarity index 100%
rename from src/pkg/math/cmplx/cmath_test.go
rename to src/math/cmplx/cmath_test.go
diff --git a/src/pkg/math/cmplx/conj.go b/src/math/cmplx/conj.go
similarity index 100%
rename from src/pkg/math/cmplx/conj.go
rename to src/math/cmplx/conj.go
diff --git a/src/pkg/math/cmplx/exp.go b/src/math/cmplx/exp.go
similarity index 100%
rename from src/pkg/math/cmplx/exp.go
rename to src/math/cmplx/exp.go
diff --git a/src/pkg/math/cmplx/isinf.go b/src/math/cmplx/isinf.go
similarity index 100%
rename from src/pkg/math/cmplx/isinf.go
rename to src/math/cmplx/isinf.go
diff --git a/src/pkg/math/cmplx/isnan.go b/src/math/cmplx/isnan.go
similarity index 100%
rename from src/pkg/math/cmplx/isnan.go
rename to src/math/cmplx/isnan.go
diff --git a/src/pkg/math/cmplx/log.go b/src/math/cmplx/log.go
similarity index 100%
rename from src/pkg/math/cmplx/log.go
rename to src/math/cmplx/log.go
diff --git a/src/pkg/math/cmplx/phase.go b/src/math/cmplx/phase.go
similarity index 100%
rename from src/pkg/math/cmplx/phase.go
rename to src/math/cmplx/phase.go
diff --git a/src/pkg/math/cmplx/polar.go b/src/math/cmplx/polar.go
similarity index 100%
rename from src/pkg/math/cmplx/polar.go
rename to src/math/cmplx/polar.go
diff --git a/src/pkg/math/cmplx/pow.go b/src/math/cmplx/pow.go
similarity index 100%
rename from src/pkg/math/cmplx/pow.go
rename to src/math/cmplx/pow.go
diff --git a/src/pkg/math/cmplx/rect.go b/src/math/cmplx/rect.go
similarity index 100%
rename from src/pkg/math/cmplx/rect.go
rename to src/math/cmplx/rect.go
diff --git a/src/pkg/math/cmplx/sin.go b/src/math/cmplx/sin.go
similarity index 100%
rename from src/pkg/math/cmplx/sin.go
rename to src/math/cmplx/sin.go
diff --git a/src/pkg/math/cmplx/sqrt.go b/src/math/cmplx/sqrt.go
similarity index 100%
rename from src/pkg/math/cmplx/sqrt.go
rename to src/math/cmplx/sqrt.go
diff --git a/src/pkg/math/cmplx/tan.go b/src/math/cmplx/tan.go
similarity index 100%
rename from src/pkg/math/cmplx/tan.go
rename to src/math/cmplx/tan.go
diff --git a/src/pkg/math/const.go b/src/math/const.go
similarity index 100%
rename from src/pkg/math/const.go
rename to src/math/const.go
diff --git a/src/pkg/math/copysign.go b/src/math/copysign.go
similarity index 100%
rename from src/pkg/math/copysign.go
rename to src/math/copysign.go
diff --git a/src/pkg/math/dim.go b/src/math/dim.go
similarity index 100%
rename from src/pkg/math/dim.go
rename to src/math/dim.go
diff --git a/src/pkg/math/dim_386.s b/src/math/dim_386.s
similarity index 100%
rename from src/pkg/math/dim_386.s
rename to src/math/dim_386.s
diff --git a/src/pkg/math/dim_amd64.s b/src/math/dim_amd64.s
similarity index 100%
rename from src/pkg/math/dim_amd64.s
rename to src/math/dim_amd64.s
diff --git a/src/pkg/math/dim_amd64p32.s b/src/math/dim_amd64p32.s
similarity index 100%
rename from src/pkg/math/dim_amd64p32.s
rename to src/math/dim_amd64p32.s
diff --git a/src/pkg/math/dim_arm.s b/src/math/dim_arm.s
similarity index 100%
rename from src/pkg/math/dim_arm.s
rename to src/math/dim_arm.s
diff --git a/src/pkg/math/erf.go b/src/math/erf.go
similarity index 100%
rename from src/pkg/math/erf.go
rename to src/math/erf.go
diff --git a/src/pkg/math/exp.go b/src/math/exp.go
similarity index 100%
rename from src/pkg/math/exp.go
rename to src/math/exp.go
diff --git a/src/pkg/math/exp2_386.s b/src/math/exp2_386.s
similarity index 100%
rename from src/pkg/math/exp2_386.s
rename to src/math/exp2_386.s
diff --git a/src/pkg/math/exp2_amd64.s b/src/math/exp2_amd64.s
similarity index 100%
rename from src/pkg/math/exp2_amd64.s
rename to src/math/exp2_amd64.s
diff --git a/src/pkg/math/exp2_amd64p32.s b/src/math/exp2_amd64p32.s
similarity index 100%
rename from src/pkg/math/exp2_amd64p32.s
rename to src/math/exp2_amd64p32.s
diff --git a/src/pkg/math/exp2_arm.s b/src/math/exp2_arm.s
similarity index 100%
rename from src/pkg/math/exp2_arm.s
rename to src/math/exp2_arm.s
diff --git a/src/pkg/math/exp_386.s b/src/math/exp_386.s
similarity index 100%
rename from src/pkg/math/exp_386.s
rename to src/math/exp_386.s
diff --git a/src/pkg/math/exp_amd64.s b/src/math/exp_amd64.s
similarity index 100%
rename from src/pkg/math/exp_amd64.s
rename to src/math/exp_amd64.s
diff --git a/src/pkg/math/exp_amd64p32.s b/src/math/exp_amd64p32.s
similarity index 100%
rename from src/pkg/math/exp_amd64p32.s
rename to src/math/exp_amd64p32.s
diff --git a/src/pkg/math/exp_arm.s b/src/math/exp_arm.s
similarity index 100%
rename from src/pkg/math/exp_arm.s
rename to src/math/exp_arm.s
diff --git a/src/pkg/math/expm1.go b/src/math/expm1.go
similarity index 100%
rename from src/pkg/math/expm1.go
rename to src/math/expm1.go
diff --git a/src/pkg/math/expm1_386.s b/src/math/expm1_386.s
similarity index 100%
rename from src/pkg/math/expm1_386.s
rename to src/math/expm1_386.s
diff --git a/src/pkg/math/expm1_amd64.s b/src/math/expm1_amd64.s
similarity index 100%
rename from src/pkg/math/expm1_amd64.s
rename to src/math/expm1_amd64.s
diff --git a/src/pkg/math/expm1_amd64p32.s b/src/math/expm1_amd64p32.s
similarity index 100%
rename from src/pkg/math/expm1_amd64p32.s
rename to src/math/expm1_amd64p32.s
diff --git a/src/pkg/math/expm1_arm.s b/src/math/expm1_arm.s
similarity index 100%
rename from src/pkg/math/expm1_arm.s
rename to src/math/expm1_arm.s
diff --git a/src/pkg/math/export_test.go b/src/math/export_test.go
similarity index 100%
rename from src/pkg/math/export_test.go
rename to src/math/export_test.go
diff --git a/src/pkg/math/floor.go b/src/math/floor.go
similarity index 100%
rename from src/pkg/math/floor.go
rename to src/math/floor.go
diff --git a/src/pkg/math/floor_386.s b/src/math/floor_386.s
similarity index 100%
rename from src/pkg/math/floor_386.s
rename to src/math/floor_386.s
diff --git a/src/pkg/math/floor_amd64.s b/src/math/floor_amd64.s
similarity index 100%
rename from src/pkg/math/floor_amd64.s
rename to src/math/floor_amd64.s
diff --git a/src/pkg/math/floor_amd64p32.s b/src/math/floor_amd64p32.s
similarity index 100%
rename from src/pkg/math/floor_amd64p32.s
rename to src/math/floor_amd64p32.s
diff --git a/src/pkg/math/floor_arm.s b/src/math/floor_arm.s
similarity index 100%
rename from src/pkg/math/floor_arm.s
rename to src/math/floor_arm.s
diff --git a/src/pkg/math/frexp.go b/src/math/frexp.go
similarity index 100%
rename from src/pkg/math/frexp.go
rename to src/math/frexp.go
diff --git a/src/pkg/math/frexp_386.s b/src/math/frexp_386.s
similarity index 100%
rename from src/pkg/math/frexp_386.s
rename to src/math/frexp_386.s
diff --git a/src/pkg/math/frexp_amd64.s b/src/math/frexp_amd64.s
similarity index 100%
rename from src/pkg/math/frexp_amd64.s
rename to src/math/frexp_amd64.s
diff --git a/src/pkg/math/frexp_amd64p32.s b/src/math/frexp_amd64p32.s
similarity index 100%
rename from src/pkg/math/frexp_amd64p32.s
rename to src/math/frexp_amd64p32.s
diff --git a/src/pkg/math/frexp_arm.s b/src/math/frexp_arm.s
similarity index 100%
rename from src/pkg/math/frexp_arm.s
rename to src/math/frexp_arm.s
diff --git a/src/pkg/math/gamma.go b/src/math/gamma.go
similarity index 100%
rename from src/pkg/math/gamma.go
rename to src/math/gamma.go
diff --git a/src/pkg/math/hypot.go b/src/math/hypot.go
similarity index 100%
rename from src/pkg/math/hypot.go
rename to src/math/hypot.go
diff --git a/src/pkg/math/hypot_386.s b/src/math/hypot_386.s
similarity index 100%
rename from src/pkg/math/hypot_386.s
rename to src/math/hypot_386.s
diff --git a/src/pkg/math/hypot_amd64.s b/src/math/hypot_amd64.s
similarity index 100%
rename from src/pkg/math/hypot_amd64.s
rename to src/math/hypot_amd64.s
diff --git a/src/pkg/math/hypot_amd64p32.s b/src/math/hypot_amd64p32.s
similarity index 100%
rename from src/pkg/math/hypot_amd64p32.s
rename to src/math/hypot_amd64p32.s
diff --git a/src/pkg/math/hypot_arm.s b/src/math/hypot_arm.s
similarity index 100%
rename from src/pkg/math/hypot_arm.s
rename to src/math/hypot_arm.s
diff --git a/src/pkg/math/j0.go b/src/math/j0.go
similarity index 100%
rename from src/pkg/math/j0.go
rename to src/math/j0.go
diff --git a/src/pkg/math/j1.go b/src/math/j1.go
similarity index 100%
rename from src/pkg/math/j1.go
rename to src/math/j1.go
diff --git a/src/pkg/math/jn.go b/src/math/jn.go
similarity index 100%
rename from src/pkg/math/jn.go
rename to src/math/jn.go
diff --git a/src/pkg/math/ldexp.go b/src/math/ldexp.go
similarity index 100%
rename from src/pkg/math/ldexp.go
rename to src/math/ldexp.go
diff --git a/src/pkg/math/ldexp_386.s b/src/math/ldexp_386.s
similarity index 100%
rename from src/pkg/math/ldexp_386.s
rename to src/math/ldexp_386.s
diff --git a/src/pkg/math/ldexp_amd64.s b/src/math/ldexp_amd64.s
similarity index 100%
rename from src/pkg/math/ldexp_amd64.s
rename to src/math/ldexp_amd64.s
diff --git a/src/pkg/math/ldexp_amd64p32.s b/src/math/ldexp_amd64p32.s
similarity index 100%
rename from src/pkg/math/ldexp_amd64p32.s
rename to src/math/ldexp_amd64p32.s
diff --git a/src/pkg/math/ldexp_arm.s b/src/math/ldexp_arm.s
similarity index 100%
rename from src/pkg/math/ldexp_arm.s
rename to src/math/ldexp_arm.s
diff --git a/src/pkg/math/lgamma.go b/src/math/lgamma.go
similarity index 100%
rename from src/pkg/math/lgamma.go
rename to src/math/lgamma.go
diff --git a/src/pkg/math/log.go b/src/math/log.go
similarity index 100%
rename from src/pkg/math/log.go
rename to src/math/log.go
diff --git a/src/pkg/math/log10.go b/src/math/log10.go
similarity index 100%
rename from src/pkg/math/log10.go
rename to src/math/log10.go
diff --git a/src/pkg/math/log10_386.s b/src/math/log10_386.s
similarity index 100%
rename from src/pkg/math/log10_386.s
rename to src/math/log10_386.s
diff --git a/src/pkg/math/log10_amd64.s b/src/math/log10_amd64.s
similarity index 100%
rename from src/pkg/math/log10_amd64.s
rename to src/math/log10_amd64.s
diff --git a/src/pkg/math/log10_amd64p32.s b/src/math/log10_amd64p32.s
similarity index 100%
rename from src/pkg/math/log10_amd64p32.s
rename to src/math/log10_amd64p32.s
diff --git a/src/pkg/math/log10_arm.s b/src/math/log10_arm.s
similarity index 100%
rename from src/pkg/math/log10_arm.s
rename to src/math/log10_arm.s
diff --git a/src/pkg/math/log1p.go b/src/math/log1p.go
similarity index 100%
rename from src/pkg/math/log1p.go
rename to src/math/log1p.go
diff --git a/src/pkg/math/log1p_386.s b/src/math/log1p_386.s
similarity index 100%
rename from src/pkg/math/log1p_386.s
rename to src/math/log1p_386.s
diff --git a/src/pkg/math/log1p_amd64.s b/src/math/log1p_amd64.s
similarity index 100%
rename from src/pkg/math/log1p_amd64.s
rename to src/math/log1p_amd64.s
diff --git a/src/pkg/math/log1p_amd64p32.s b/src/math/log1p_amd64p32.s
similarity index 100%
rename from src/pkg/math/log1p_amd64p32.s
rename to src/math/log1p_amd64p32.s
diff --git a/src/pkg/math/log1p_arm.s b/src/math/log1p_arm.s
similarity index 100%
rename from src/pkg/math/log1p_arm.s
rename to src/math/log1p_arm.s
diff --git a/src/pkg/math/log_386.s b/src/math/log_386.s
similarity index 100%
rename from src/pkg/math/log_386.s
rename to src/math/log_386.s
diff --git a/src/pkg/math/log_amd64.s b/src/math/log_amd64.s
similarity index 100%
rename from src/pkg/math/log_amd64.s
rename to src/math/log_amd64.s
diff --git a/src/pkg/math/log_amd64p32.s b/src/math/log_amd64p32.s
similarity index 100%
rename from src/pkg/math/log_amd64p32.s
rename to src/math/log_amd64p32.s
diff --git a/src/pkg/math/log_arm.s b/src/math/log_arm.s
similarity index 100%
rename from src/pkg/math/log_arm.s
rename to src/math/log_arm.s
diff --git a/src/pkg/math/logb.go b/src/math/logb.go
similarity index 100%
rename from src/pkg/math/logb.go
rename to src/math/logb.go
diff --git a/src/pkg/math/mod.go b/src/math/mod.go
similarity index 100%
rename from src/pkg/math/mod.go
rename to src/math/mod.go
diff --git a/src/pkg/math/mod_386.s b/src/math/mod_386.s
similarity index 100%
rename from src/pkg/math/mod_386.s
rename to src/math/mod_386.s
diff --git a/src/pkg/math/mod_amd64.s b/src/math/mod_amd64.s
similarity index 100%
rename from src/pkg/math/mod_amd64.s
rename to src/math/mod_amd64.s
diff --git a/src/pkg/math/mod_amd64p32.s b/src/math/mod_amd64p32.s
similarity index 100%
rename from src/pkg/math/mod_amd64p32.s
rename to src/math/mod_amd64p32.s
diff --git a/src/pkg/math/mod_arm.s b/src/math/mod_arm.s
similarity index 100%
rename from src/pkg/math/mod_arm.s
rename to src/math/mod_arm.s
diff --git a/src/pkg/math/modf.go b/src/math/modf.go
similarity index 100%
rename from src/pkg/math/modf.go
rename to src/math/modf.go
diff --git a/src/pkg/math/modf_386.s b/src/math/modf_386.s
similarity index 100%
rename from src/pkg/math/modf_386.s
rename to src/math/modf_386.s
diff --git a/src/pkg/math/modf_amd64.s b/src/math/modf_amd64.s
similarity index 100%
rename from src/pkg/math/modf_amd64.s
rename to src/math/modf_amd64.s
diff --git a/src/pkg/math/modf_amd64p32.s b/src/math/modf_amd64p32.s
similarity index 100%
rename from src/pkg/math/modf_amd64p32.s
rename to src/math/modf_amd64p32.s
diff --git a/src/pkg/math/modf_arm.s b/src/math/modf_arm.s
similarity index 100%
rename from src/pkg/math/modf_arm.s
rename to src/math/modf_arm.s
diff --git a/src/pkg/math/nextafter.go b/src/math/nextafter.go
similarity index 100%
rename from src/pkg/math/nextafter.go
rename to src/math/nextafter.go
diff --git a/src/pkg/math/pow.go b/src/math/pow.go
similarity index 100%
rename from src/pkg/math/pow.go
rename to src/math/pow.go
diff --git a/src/pkg/math/pow10.go b/src/math/pow10.go
similarity index 100%
rename from src/pkg/math/pow10.go
rename to src/math/pow10.go
diff --git a/src/pkg/math/rand/example_test.go b/src/math/rand/example_test.go
similarity index 100%
rename from src/pkg/math/rand/example_test.go
rename to src/math/rand/example_test.go
diff --git a/src/pkg/math/rand/exp.go b/src/math/rand/exp.go
similarity index 100%
rename from src/pkg/math/rand/exp.go
rename to src/math/rand/exp.go
diff --git a/src/pkg/math/rand/normal.go b/src/math/rand/normal.go
similarity index 100%
rename from src/pkg/math/rand/normal.go
rename to src/math/rand/normal.go
diff --git a/src/pkg/math/rand/rand.go b/src/math/rand/rand.go
similarity index 100%
rename from src/pkg/math/rand/rand.go
rename to src/math/rand/rand.go
diff --git a/src/pkg/math/rand/rand_test.go b/src/math/rand/rand_test.go
similarity index 100%
rename from src/pkg/math/rand/rand_test.go
rename to src/math/rand/rand_test.go
diff --git a/src/pkg/math/rand/regress_test.go b/src/math/rand/regress_test.go
similarity index 100%
rename from src/pkg/math/rand/regress_test.go
rename to src/math/rand/regress_test.go
diff --git a/src/pkg/math/rand/rng.go b/src/math/rand/rng.go
similarity index 100%
rename from src/pkg/math/rand/rng.go
rename to src/math/rand/rng.go
diff --git a/src/pkg/math/rand/zipf.go b/src/math/rand/zipf.go
similarity index 100%
rename from src/pkg/math/rand/zipf.go
rename to src/math/rand/zipf.go
diff --git a/src/pkg/math/remainder.go b/src/math/remainder.go
similarity index 100%
rename from src/pkg/math/remainder.go
rename to src/math/remainder.go
diff --git a/src/pkg/math/remainder_386.s b/src/math/remainder_386.s
similarity index 100%
rename from src/pkg/math/remainder_386.s
rename to src/math/remainder_386.s
diff --git a/src/pkg/math/remainder_amd64.s b/src/math/remainder_amd64.s
similarity index 100%
rename from src/pkg/math/remainder_amd64.s
rename to src/math/remainder_amd64.s
diff --git a/src/pkg/math/remainder_amd64p32.s b/src/math/remainder_amd64p32.s
similarity index 100%
rename from src/pkg/math/remainder_amd64p32.s
rename to src/math/remainder_amd64p32.s
diff --git a/src/pkg/math/remainder_arm.s b/src/math/remainder_arm.s
similarity index 100%
rename from src/pkg/math/remainder_arm.s
rename to src/math/remainder_arm.s
diff --git a/src/pkg/math/signbit.go b/src/math/signbit.go
similarity index 100%
rename from src/pkg/math/signbit.go
rename to src/math/signbit.go
diff --git a/src/pkg/math/sin.go b/src/math/sin.go
similarity index 100%
rename from src/pkg/math/sin.go
rename to src/math/sin.go
diff --git a/src/pkg/math/sin_386.s b/src/math/sin_386.s
similarity index 100%
rename from src/pkg/math/sin_386.s
rename to src/math/sin_386.s
diff --git a/src/pkg/math/sin_amd64.s b/src/math/sin_amd64.s
similarity index 100%
rename from src/pkg/math/sin_amd64.s
rename to src/math/sin_amd64.s
diff --git a/src/pkg/math/sin_amd64p32.s b/src/math/sin_amd64p32.s
similarity index 100%
rename from src/pkg/math/sin_amd64p32.s
rename to src/math/sin_amd64p32.s
diff --git a/src/pkg/math/sin_arm.s b/src/math/sin_arm.s
similarity index 100%
rename from src/pkg/math/sin_arm.s
rename to src/math/sin_arm.s
diff --git a/src/pkg/math/sincos.go b/src/math/sincos.go
similarity index 100%
rename from src/pkg/math/sincos.go
rename to src/math/sincos.go
diff --git a/src/pkg/math/sincos_386.s b/src/math/sincos_386.s
similarity index 100%
rename from src/pkg/math/sincos_386.s
rename to src/math/sincos_386.s
diff --git a/src/pkg/math/sincos_amd64.s b/src/math/sincos_amd64.s
similarity index 100%
rename from src/pkg/math/sincos_amd64.s
rename to src/math/sincos_amd64.s
diff --git a/src/pkg/math/sincos_amd64p32.s b/src/math/sincos_amd64p32.s
similarity index 100%
rename from src/pkg/math/sincos_amd64p32.s
rename to src/math/sincos_amd64p32.s
diff --git a/src/pkg/math/sincos_arm.s b/src/math/sincos_arm.s
similarity index 100%
rename from src/pkg/math/sincos_arm.s
rename to src/math/sincos_arm.s
diff --git a/src/pkg/math/sinh.go b/src/math/sinh.go
similarity index 100%
rename from src/pkg/math/sinh.go
rename to src/math/sinh.go
diff --git a/src/pkg/math/sqrt.go b/src/math/sqrt.go
similarity index 100%
rename from src/pkg/math/sqrt.go
rename to src/math/sqrt.go
diff --git a/src/pkg/math/sqrt_386.s b/src/math/sqrt_386.s
similarity index 100%
rename from src/pkg/math/sqrt_386.s
rename to src/math/sqrt_386.s
diff --git a/src/pkg/math/sqrt_amd64.s b/src/math/sqrt_amd64.s
similarity index 100%
rename from src/pkg/math/sqrt_amd64.s
rename to src/math/sqrt_amd64.s
diff --git a/src/pkg/math/sqrt_amd64p32.s b/src/math/sqrt_amd64p32.s
similarity index 100%
rename from src/pkg/math/sqrt_amd64p32.s
rename to src/math/sqrt_amd64p32.s
diff --git a/src/pkg/math/sqrt_arm.s b/src/math/sqrt_arm.s
similarity index 100%
rename from src/pkg/math/sqrt_arm.s
rename to src/math/sqrt_arm.s
diff --git a/src/pkg/math/tan.go b/src/math/tan.go
similarity index 100%
rename from src/pkg/math/tan.go
rename to src/math/tan.go
diff --git a/src/pkg/math/tan_386.s b/src/math/tan_386.s
similarity index 100%
rename from src/pkg/math/tan_386.s
rename to src/math/tan_386.s
diff --git a/src/pkg/math/tan_amd64.s b/src/math/tan_amd64.s
similarity index 100%
rename from src/pkg/math/tan_amd64.s
rename to src/math/tan_amd64.s
diff --git a/src/pkg/math/tan_amd64p32.s b/src/math/tan_amd64p32.s
similarity index 100%
rename from src/pkg/math/tan_amd64p32.s
rename to src/math/tan_amd64p32.s
diff --git a/src/pkg/math/tan_arm.s b/src/math/tan_arm.s
similarity index 100%
rename from src/pkg/math/tan_arm.s
rename to src/math/tan_arm.s
diff --git a/src/pkg/math/tanh.go b/src/math/tanh.go
similarity index 100%
rename from src/pkg/math/tanh.go
rename to src/math/tanh.go
diff --git a/src/pkg/math/unsafe.go b/src/math/unsafe.go
similarity index 100%
rename from src/pkg/math/unsafe.go
rename to src/math/unsafe.go
diff --git a/src/pkg/mime/grammar.go b/src/mime/grammar.go
similarity index 100%
rename from src/pkg/mime/grammar.go
rename to src/mime/grammar.go
diff --git a/src/pkg/mime/mediatype.go b/src/mime/mediatype.go
similarity index 100%
rename from src/pkg/mime/mediatype.go
rename to src/mime/mediatype.go
diff --git a/src/pkg/mime/mediatype_test.go b/src/mime/mediatype_test.go
similarity index 100%
rename from src/pkg/mime/mediatype_test.go
rename to src/mime/mediatype_test.go
diff --git a/src/pkg/mime/multipart/example_test.go b/src/mime/multipart/example_test.go
similarity index 100%
rename from src/pkg/mime/multipart/example_test.go
rename to src/mime/multipart/example_test.go
diff --git a/src/pkg/mime/multipart/formdata.go b/src/mime/multipart/formdata.go
similarity index 100%
rename from src/pkg/mime/multipart/formdata.go
rename to src/mime/multipart/formdata.go
diff --git a/src/pkg/mime/multipart/formdata_test.go b/src/mime/multipart/formdata_test.go
similarity index 100%
rename from src/pkg/mime/multipart/formdata_test.go
rename to src/mime/multipart/formdata_test.go
diff --git a/src/pkg/mime/multipart/multipart.go b/src/mime/multipart/multipart.go
similarity index 100%
rename from src/pkg/mime/multipart/multipart.go
rename to src/mime/multipart/multipart.go
diff --git a/src/pkg/mime/multipart/multipart_test.go b/src/mime/multipart/multipart_test.go
similarity index 100%
rename from src/pkg/mime/multipart/multipart_test.go
rename to src/mime/multipart/multipart_test.go
diff --git a/src/pkg/mime/multipart/quotedprintable.go b/src/mime/multipart/quotedprintable.go
similarity index 100%
rename from src/pkg/mime/multipart/quotedprintable.go
rename to src/mime/multipart/quotedprintable.go
diff --git a/src/pkg/mime/multipart/quotedprintable_test.go b/src/mime/multipart/quotedprintable_test.go
similarity index 100%
rename from src/pkg/mime/multipart/quotedprintable_test.go
rename to src/mime/multipart/quotedprintable_test.go
diff --git a/src/pkg/mime/multipart/testdata/nested-mime b/src/mime/multipart/testdata/nested-mime
similarity index 100%
rename from src/pkg/mime/multipart/testdata/nested-mime
rename to src/mime/multipart/testdata/nested-mime
diff --git a/src/pkg/mime/multipart/writer.go b/src/mime/multipart/writer.go
similarity index 100%
rename from src/pkg/mime/multipart/writer.go
rename to src/mime/multipart/writer.go
diff --git a/src/pkg/mime/multipart/writer_test.go b/src/mime/multipart/writer_test.go
similarity index 100%
rename from src/pkg/mime/multipart/writer_test.go
rename to src/mime/multipart/writer_test.go
diff --git a/src/pkg/mime/testdata/test.types b/src/mime/testdata/test.types
similarity index 100%
rename from src/pkg/mime/testdata/test.types
rename to src/mime/testdata/test.types
diff --git a/src/pkg/mime/testdata/test.types.plan9 b/src/mime/testdata/test.types.plan9
similarity index 100%
rename from src/pkg/mime/testdata/test.types.plan9
rename to src/mime/testdata/test.types.plan9
diff --git a/src/pkg/mime/type.go b/src/mime/type.go
similarity index 100%
rename from src/pkg/mime/type.go
rename to src/mime/type.go
diff --git a/src/pkg/mime/type_plan9.go b/src/mime/type_plan9.go
similarity index 100%
rename from src/pkg/mime/type_plan9.go
rename to src/mime/type_plan9.go
diff --git a/src/pkg/mime/type_test.go b/src/mime/type_test.go
similarity index 100%
rename from src/pkg/mime/type_test.go
rename to src/mime/type_test.go
diff --git a/src/pkg/mime/type_unix.go b/src/mime/type_unix.go
similarity index 100%
rename from src/pkg/mime/type_unix.go
rename to src/mime/type_unix.go
diff --git a/src/pkg/mime/type_windows.go b/src/mime/type_windows.go
similarity index 100%
rename from src/pkg/mime/type_windows.go
rename to src/mime/type_windows.go
diff --git a/src/pkg/net/cgo_android.go b/src/net/cgo_android.go
similarity index 100%
rename from src/pkg/net/cgo_android.go
rename to src/net/cgo_android.go
diff --git a/src/pkg/net/cgo_bsd.go b/src/net/cgo_bsd.go
similarity index 100%
rename from src/pkg/net/cgo_bsd.go
rename to src/net/cgo_bsd.go
diff --git a/src/pkg/net/cgo_linux.go b/src/net/cgo_linux.go
similarity index 100%
rename from src/pkg/net/cgo_linux.go
rename to src/net/cgo_linux.go
diff --git a/src/pkg/net/cgo_netbsd.go b/src/net/cgo_netbsd.go
similarity index 100%
rename from src/pkg/net/cgo_netbsd.go
rename to src/net/cgo_netbsd.go
diff --git a/src/pkg/net/cgo_openbsd.go b/src/net/cgo_openbsd.go
similarity index 100%
rename from src/pkg/net/cgo_openbsd.go
rename to src/net/cgo_openbsd.go
diff --git a/src/pkg/net/cgo_stub.go b/src/net/cgo_stub.go
similarity index 100%
rename from src/pkg/net/cgo_stub.go
rename to src/net/cgo_stub.go
diff --git a/src/pkg/net/cgo_unix.go b/src/net/cgo_unix.go
similarity index 100%
rename from src/pkg/net/cgo_unix.go
rename to src/net/cgo_unix.go
diff --git a/src/pkg/net/cgo_unix_test.go b/src/net/cgo_unix_test.go
similarity index 100%
rename from src/pkg/net/cgo_unix_test.go
rename to src/net/cgo_unix_test.go
diff --git a/src/pkg/net/conn_test.go b/src/net/conn_test.go
similarity index 100%
rename from src/pkg/net/conn_test.go
rename to src/net/conn_test.go
diff --git a/src/pkg/net/dial.go b/src/net/dial.go
similarity index 100%
rename from src/pkg/net/dial.go
rename to src/net/dial.go
diff --git a/src/pkg/net/dial_gen.go b/src/net/dial_gen.go
similarity index 100%
rename from src/pkg/net/dial_gen.go
rename to src/net/dial_gen.go
diff --git a/src/pkg/net/dial_gen_test.go b/src/net/dial_gen_test.go
similarity index 100%
rename from src/pkg/net/dial_gen_test.go
rename to src/net/dial_gen_test.go
diff --git a/src/pkg/net/dial_test.go b/src/net/dial_test.go
similarity index 100%
rename from src/pkg/net/dial_test.go
rename to src/net/dial_test.go
diff --git a/src/pkg/net/dialgoogle_test.go b/src/net/dialgoogle_test.go
similarity index 100%
rename from src/pkg/net/dialgoogle_test.go
rename to src/net/dialgoogle_test.go
diff --git a/src/pkg/net/dnsclient.go b/src/net/dnsclient.go
similarity index 100%
rename from src/pkg/net/dnsclient.go
rename to src/net/dnsclient.go
diff --git a/src/pkg/net/dnsclient_test.go b/src/net/dnsclient_test.go
similarity index 100%
rename from src/pkg/net/dnsclient_test.go
rename to src/net/dnsclient_test.go
diff --git a/src/pkg/net/dnsclient_unix.go b/src/net/dnsclient_unix.go
similarity index 100%
rename from src/pkg/net/dnsclient_unix.go
rename to src/net/dnsclient_unix.go
diff --git a/src/pkg/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
similarity index 100%
rename from src/pkg/net/dnsclient_unix_test.go
rename to src/net/dnsclient_unix_test.go
diff --git a/src/pkg/net/dnsconfig_unix.go b/src/net/dnsconfig_unix.go
similarity index 100%
rename from src/pkg/net/dnsconfig_unix.go
rename to src/net/dnsconfig_unix.go
diff --git a/src/pkg/net/dnsconfig_unix_test.go b/src/net/dnsconfig_unix_test.go
similarity index 100%
rename from src/pkg/net/dnsconfig_unix_test.go
rename to src/net/dnsconfig_unix_test.go
diff --git a/src/pkg/net/dnsmsg.go b/src/net/dnsmsg.go
similarity index 100%
rename from src/pkg/net/dnsmsg.go
rename to src/net/dnsmsg.go
diff --git a/src/pkg/net/dnsmsg_test.go b/src/net/dnsmsg_test.go
similarity index 100%
rename from src/pkg/net/dnsmsg_test.go
rename to src/net/dnsmsg_test.go
diff --git a/src/pkg/net/dnsname_test.go b/src/net/dnsname_test.go
similarity index 100%
rename from src/pkg/net/dnsname_test.go
rename to src/net/dnsname_test.go
diff --git a/src/pkg/net/empty.c b/src/net/empty.c
similarity index 100%
rename from src/pkg/net/empty.c
rename to src/net/empty.c
diff --git a/src/pkg/net/example_test.go b/src/net/example_test.go
similarity index 100%
rename from src/pkg/net/example_test.go
rename to src/net/example_test.go
diff --git a/src/pkg/net/fd_mutex.go b/src/net/fd_mutex.go
similarity index 100%
rename from src/pkg/net/fd_mutex.go
rename to src/net/fd_mutex.go
diff --git a/src/pkg/net/fd_mutex_test.go b/src/net/fd_mutex_test.go
similarity index 100%
rename from src/pkg/net/fd_mutex_test.go
rename to src/net/fd_mutex_test.go
diff --git a/src/pkg/net/fd_plan9.go b/src/net/fd_plan9.go
similarity index 100%
rename from src/pkg/net/fd_plan9.go
rename to src/net/fd_plan9.go
diff --git a/src/pkg/net/fd_poll_nacl.go b/src/net/fd_poll_nacl.go
similarity index 100%
rename from src/pkg/net/fd_poll_nacl.go
rename to src/net/fd_poll_nacl.go
diff --git a/src/pkg/net/fd_poll_runtime.go b/src/net/fd_poll_runtime.go
similarity index 100%
rename from src/pkg/net/fd_poll_runtime.go
rename to src/net/fd_poll_runtime.go
diff --git a/src/pkg/net/fd_unix.go b/src/net/fd_unix.go
similarity index 100%
rename from src/pkg/net/fd_unix.go
rename to src/net/fd_unix.go
diff --git a/src/pkg/net/fd_unix_test.go b/src/net/fd_unix_test.go
similarity index 100%
rename from src/pkg/net/fd_unix_test.go
rename to src/net/fd_unix_test.go
diff --git a/src/pkg/net/fd_windows.go b/src/net/fd_windows.go
similarity index 100%
rename from src/pkg/net/fd_windows.go
rename to src/net/fd_windows.go
diff --git a/src/pkg/net/file_plan9.go b/src/net/file_plan9.go
similarity index 100%
rename from src/pkg/net/file_plan9.go
rename to src/net/file_plan9.go
diff --git a/src/pkg/net/file_test.go b/src/net/file_test.go
similarity index 100%
rename from src/pkg/net/file_test.go
rename to src/net/file_test.go
diff --git a/src/pkg/net/file_unix.go b/src/net/file_unix.go
similarity index 100%
rename from src/pkg/net/file_unix.go
rename to src/net/file_unix.go
diff --git a/src/pkg/net/file_windows.go b/src/net/file_windows.go
similarity index 100%
rename from src/pkg/net/file_windows.go
rename to src/net/file_windows.go
diff --git a/src/pkg/net/hosts.go b/src/net/hosts.go
similarity index 100%
rename from src/pkg/net/hosts.go
rename to src/net/hosts.go
diff --git a/src/pkg/net/hosts_test.go b/src/net/hosts_test.go
similarity index 100%
rename from src/pkg/net/hosts_test.go
rename to src/net/hosts_test.go
diff --git a/src/pkg/net/http/cgi/child.go b/src/net/http/cgi/child.go
similarity index 100%
rename from src/pkg/net/http/cgi/child.go
rename to src/net/http/cgi/child.go
diff --git a/src/pkg/net/http/cgi/child_test.go b/src/net/http/cgi/child_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/child_test.go
rename to src/net/http/cgi/child_test.go
diff --git a/src/pkg/net/http/cgi/host.go b/src/net/http/cgi/host.go
similarity index 100%
rename from src/pkg/net/http/cgi/host.go
rename to src/net/http/cgi/host.go
diff --git a/src/pkg/net/http/cgi/host_test.go b/src/net/http/cgi/host_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/host_test.go
rename to src/net/http/cgi/host_test.go
diff --git a/src/pkg/net/http/cgi/matryoshka_test.go b/src/net/http/cgi/matryoshka_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/matryoshka_test.go
rename to src/net/http/cgi/matryoshka_test.go
diff --git a/src/pkg/net/http/cgi/plan9_test.go b/src/net/http/cgi/plan9_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/plan9_test.go
rename to src/net/http/cgi/plan9_test.go
diff --git a/src/pkg/net/http/cgi/posix_test.go b/src/net/http/cgi/posix_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/posix_test.go
rename to src/net/http/cgi/posix_test.go
diff --git a/src/pkg/net/http/cgi/testdata/test.cgi b/src/net/http/cgi/testdata/test.cgi
similarity index 100%
rename from src/pkg/net/http/cgi/testdata/test.cgi
rename to src/net/http/cgi/testdata/test.cgi
diff --git a/src/pkg/net/http/client.go b/src/net/http/client.go
similarity index 100%
rename from src/pkg/net/http/client.go
rename to src/net/http/client.go
diff --git a/src/pkg/net/http/client_test.go b/src/net/http/client_test.go
similarity index 100%
rename from src/pkg/net/http/client_test.go
rename to src/net/http/client_test.go
diff --git a/src/pkg/net/http/cookie.go b/src/net/http/cookie.go
similarity index 100%
rename from src/pkg/net/http/cookie.go
rename to src/net/http/cookie.go
diff --git a/src/pkg/net/http/cookie_test.go b/src/net/http/cookie_test.go
similarity index 100%
rename from src/pkg/net/http/cookie_test.go
rename to src/net/http/cookie_test.go
diff --git a/src/pkg/net/http/cookiejar/jar.go b/src/net/http/cookiejar/jar.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/jar.go
rename to src/net/http/cookiejar/jar.go
diff --git a/src/pkg/net/http/cookiejar/jar_test.go b/src/net/http/cookiejar/jar_test.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/jar_test.go
rename to src/net/http/cookiejar/jar_test.go
diff --git a/src/pkg/net/http/cookiejar/punycode.go b/src/net/http/cookiejar/punycode.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/punycode.go
rename to src/net/http/cookiejar/punycode.go
diff --git a/src/pkg/net/http/cookiejar/punycode_test.go b/src/net/http/cookiejar/punycode_test.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/punycode_test.go
rename to src/net/http/cookiejar/punycode_test.go
diff --git a/src/pkg/net/http/doc.go b/src/net/http/doc.go
similarity index 100%
rename from src/pkg/net/http/doc.go
rename to src/net/http/doc.go
diff --git a/src/pkg/net/http/example_test.go b/src/net/http/example_test.go
similarity index 100%
rename from src/pkg/net/http/example_test.go
rename to src/net/http/example_test.go
diff --git a/src/pkg/net/http/export_test.go b/src/net/http/export_test.go
similarity index 100%
rename from src/pkg/net/http/export_test.go
rename to src/net/http/export_test.go
diff --git a/src/pkg/net/http/fcgi/child.go b/src/net/http/fcgi/child.go
similarity index 100%
rename from src/pkg/net/http/fcgi/child.go
rename to src/net/http/fcgi/child.go
diff --git a/src/pkg/net/http/fcgi/fcgi.go b/src/net/http/fcgi/fcgi.go
similarity index 100%
rename from src/pkg/net/http/fcgi/fcgi.go
rename to src/net/http/fcgi/fcgi.go
diff --git a/src/pkg/net/http/fcgi/fcgi_test.go b/src/net/http/fcgi/fcgi_test.go
similarity index 100%
rename from src/pkg/net/http/fcgi/fcgi_test.go
rename to src/net/http/fcgi/fcgi_test.go
diff --git a/src/pkg/net/http/filetransport.go b/src/net/http/filetransport.go
similarity index 100%
rename from src/pkg/net/http/filetransport.go
rename to src/net/http/filetransport.go
diff --git a/src/pkg/net/http/filetransport_test.go b/src/net/http/filetransport_test.go
similarity index 100%
rename from src/pkg/net/http/filetransport_test.go
rename to src/net/http/filetransport_test.go
diff --git a/src/pkg/net/http/fs.go b/src/net/http/fs.go
similarity index 100%
rename from src/pkg/net/http/fs.go
rename to src/net/http/fs.go
diff --git a/src/pkg/net/http/fs_test.go b/src/net/http/fs_test.go
similarity index 100%
rename from src/pkg/net/http/fs_test.go
rename to src/net/http/fs_test.go
diff --git a/src/pkg/net/http/header.go b/src/net/http/header.go
similarity index 100%
rename from src/pkg/net/http/header.go
rename to src/net/http/header.go
diff --git a/src/pkg/net/http/header_test.go b/src/net/http/header_test.go
similarity index 100%
rename from src/pkg/net/http/header_test.go
rename to src/net/http/header_test.go
diff --git a/src/pkg/net/http/httptest/example_test.go b/src/net/http/httptest/example_test.go
similarity index 100%
rename from src/pkg/net/http/httptest/example_test.go
rename to src/net/http/httptest/example_test.go
diff --git a/src/pkg/net/http/httptest/recorder.go b/src/net/http/httptest/recorder.go
similarity index 100%
rename from src/pkg/net/http/httptest/recorder.go
rename to src/net/http/httptest/recorder.go
diff --git a/src/pkg/net/http/httptest/recorder_test.go b/src/net/http/httptest/recorder_test.go
similarity index 100%
rename from src/pkg/net/http/httptest/recorder_test.go
rename to src/net/http/httptest/recorder_test.go
diff --git a/src/pkg/net/http/httptest/server.go b/src/net/http/httptest/server.go
similarity index 100%
rename from src/pkg/net/http/httptest/server.go
rename to src/net/http/httptest/server.go
diff --git a/src/pkg/net/http/httptest/server_test.go b/src/net/http/httptest/server_test.go
similarity index 100%
rename from src/pkg/net/http/httptest/server_test.go
rename to src/net/http/httptest/server_test.go
diff --git a/src/pkg/net/http/httputil/dump.go b/src/net/http/httputil/dump.go
similarity index 100%
rename from src/pkg/net/http/httputil/dump.go
rename to src/net/http/httputil/dump.go
diff --git a/src/pkg/net/http/httputil/dump_test.go b/src/net/http/httputil/dump_test.go
similarity index 100%
rename from src/pkg/net/http/httputil/dump_test.go
rename to src/net/http/httputil/dump_test.go
diff --git a/src/pkg/net/http/httputil/httputil.go b/src/net/http/httputil/httputil.go
similarity index 100%
rename from src/pkg/net/http/httputil/httputil.go
rename to src/net/http/httputil/httputil.go
diff --git a/src/pkg/net/http/httputil/persist.go b/src/net/http/httputil/persist.go
similarity index 100%
rename from src/pkg/net/http/httputil/persist.go
rename to src/net/http/httputil/persist.go
diff --git a/src/pkg/net/http/httputil/reverseproxy.go b/src/net/http/httputil/reverseproxy.go
similarity index 100%
rename from src/pkg/net/http/httputil/reverseproxy.go
rename to src/net/http/httputil/reverseproxy.go
diff --git a/src/pkg/net/http/httputil/reverseproxy_test.go b/src/net/http/httputil/reverseproxy_test.go
similarity index 100%
rename from src/pkg/net/http/httputil/reverseproxy_test.go
rename to src/net/http/httputil/reverseproxy_test.go
diff --git a/src/pkg/net/http/internal/chunked.go b/src/net/http/internal/chunked.go
similarity index 100%
rename from src/pkg/net/http/internal/chunked.go
rename to src/net/http/internal/chunked.go
diff --git a/src/pkg/net/http/internal/chunked_test.go b/src/net/http/internal/chunked_test.go
similarity index 100%
rename from src/pkg/net/http/internal/chunked_test.go
rename to src/net/http/internal/chunked_test.go
diff --git a/src/pkg/net/http/jar.go b/src/net/http/jar.go
similarity index 100%
rename from src/pkg/net/http/jar.go
rename to src/net/http/jar.go
diff --git a/src/pkg/net/http/lex.go b/src/net/http/lex.go
similarity index 100%
rename from src/pkg/net/http/lex.go
rename to src/net/http/lex.go
diff --git a/src/pkg/net/http/lex_test.go b/src/net/http/lex_test.go
similarity index 100%
rename from src/pkg/net/http/lex_test.go
rename to src/net/http/lex_test.go
diff --git a/src/pkg/net/http/npn_test.go b/src/net/http/npn_test.go
similarity index 100%
rename from src/pkg/net/http/npn_test.go
rename to src/net/http/npn_test.go
diff --git a/src/pkg/net/http/pprof/pprof.go b/src/net/http/pprof/pprof.go
similarity index 100%
rename from src/pkg/net/http/pprof/pprof.go
rename to src/net/http/pprof/pprof.go
diff --git a/src/pkg/net/http/proxy_test.go b/src/net/http/proxy_test.go
similarity index 100%
rename from src/pkg/net/http/proxy_test.go
rename to src/net/http/proxy_test.go
diff --git a/src/pkg/net/http/race.go b/src/net/http/race.go
similarity index 100%
rename from src/pkg/net/http/race.go
rename to src/net/http/race.go
diff --git a/src/pkg/net/http/range_test.go b/src/net/http/range_test.go
similarity index 100%
rename from src/pkg/net/http/range_test.go
rename to src/net/http/range_test.go
diff --git a/src/pkg/net/http/readrequest_test.go b/src/net/http/readrequest_test.go
similarity index 100%
rename from src/pkg/net/http/readrequest_test.go
rename to src/net/http/readrequest_test.go
diff --git a/src/pkg/net/http/request.go b/src/net/http/request.go
similarity index 100%
rename from src/pkg/net/http/request.go
rename to src/net/http/request.go
diff --git a/src/pkg/net/http/request_test.go b/src/net/http/request_test.go
similarity index 100%
rename from src/pkg/net/http/request_test.go
rename to src/net/http/request_test.go
diff --git a/src/pkg/net/http/requestwrite_test.go b/src/net/http/requestwrite_test.go
similarity index 100%
rename from src/pkg/net/http/requestwrite_test.go
rename to src/net/http/requestwrite_test.go
diff --git a/src/pkg/net/http/response.go b/src/net/http/response.go
similarity index 100%
rename from src/pkg/net/http/response.go
rename to src/net/http/response.go
diff --git a/src/pkg/net/http/response_test.go b/src/net/http/response_test.go
similarity index 100%
rename from src/pkg/net/http/response_test.go
rename to src/net/http/response_test.go
diff --git a/src/pkg/net/http/responsewrite_test.go b/src/net/http/responsewrite_test.go
similarity index 100%
rename from src/pkg/net/http/responsewrite_test.go
rename to src/net/http/responsewrite_test.go
diff --git a/src/pkg/net/http/serve_test.go b/src/net/http/serve_test.go
similarity index 100%
rename from src/pkg/net/http/serve_test.go
rename to src/net/http/serve_test.go
diff --git a/src/pkg/net/http/server.go b/src/net/http/server.go
similarity index 100%
rename from src/pkg/net/http/server.go
rename to src/net/http/server.go
diff --git a/src/pkg/net/http/sniff.go b/src/net/http/sniff.go
similarity index 100%
rename from src/pkg/net/http/sniff.go
rename to src/net/http/sniff.go
diff --git a/src/pkg/net/http/sniff_test.go b/src/net/http/sniff_test.go
similarity index 100%
rename from src/pkg/net/http/sniff_test.go
rename to src/net/http/sniff_test.go
diff --git a/src/pkg/net/http/status.go b/src/net/http/status.go
similarity index 100%
rename from src/pkg/net/http/status.go
rename to src/net/http/status.go
diff --git a/src/pkg/net/http/testdata/file b/src/net/http/testdata/file
similarity index 100%
rename from src/pkg/net/http/testdata/file
rename to src/net/http/testdata/file
diff --git a/src/pkg/net/http/testdata/index.html b/src/net/http/testdata/index.html
similarity index 100%
rename from src/pkg/net/http/testdata/index.html
rename to src/net/http/testdata/index.html
diff --git a/src/pkg/net/http/testdata/style.css b/src/net/http/testdata/style.css
similarity index 100%
rename from src/pkg/net/http/testdata/style.css
rename to src/net/http/testdata/style.css
diff --git a/src/pkg/net/http/transfer.go b/src/net/http/transfer.go
similarity index 100%
rename from src/pkg/net/http/transfer.go
rename to src/net/http/transfer.go
diff --git a/src/pkg/net/http/transfer_test.go b/src/net/http/transfer_test.go
similarity index 100%
rename from src/pkg/net/http/transfer_test.go
rename to src/net/http/transfer_test.go
diff --git a/src/pkg/net/http/transport.go b/src/net/http/transport.go
similarity index 100%
rename from src/pkg/net/http/transport.go
rename to src/net/http/transport.go
diff --git a/src/pkg/net/http/transport_test.go b/src/net/http/transport_test.go
similarity index 100%
rename from src/pkg/net/http/transport_test.go
rename to src/net/http/transport_test.go
diff --git a/src/pkg/net/http/triv.go b/src/net/http/triv.go
similarity index 100%
rename from src/pkg/net/http/triv.go
rename to src/net/http/triv.go
diff --git a/src/pkg/net/http/z_last_test.go b/src/net/http/z_last_test.go
similarity index 100%
rename from src/pkg/net/http/z_last_test.go
rename to src/net/http/z_last_test.go
diff --git a/src/pkg/net/interface.go b/src/net/interface.go
similarity index 100%
rename from src/pkg/net/interface.go
rename to src/net/interface.go
diff --git a/src/pkg/net/interface_bsd.go b/src/net/interface_bsd.go
similarity index 100%
rename from src/pkg/net/interface_bsd.go
rename to src/net/interface_bsd.go
diff --git a/src/pkg/net/interface_bsd_test.go b/src/net/interface_bsd_test.go
similarity index 100%
rename from src/pkg/net/interface_bsd_test.go
rename to src/net/interface_bsd_test.go
diff --git a/src/pkg/net/interface_darwin.go b/src/net/interface_darwin.go
similarity index 100%
rename from src/pkg/net/interface_darwin.go
rename to src/net/interface_darwin.go
diff --git a/src/pkg/net/interface_dragonfly.go b/src/net/interface_dragonfly.go
similarity index 100%
rename from src/pkg/net/interface_dragonfly.go
rename to src/net/interface_dragonfly.go
diff --git a/src/pkg/net/interface_freebsd.go b/src/net/interface_freebsd.go
similarity index 100%
rename from src/pkg/net/interface_freebsd.go
rename to src/net/interface_freebsd.go
diff --git a/src/pkg/net/interface_linux.go b/src/net/interface_linux.go
similarity index 100%
rename from src/pkg/net/interface_linux.go
rename to src/net/interface_linux.go
diff --git a/src/pkg/net/interface_linux_test.go b/src/net/interface_linux_test.go
similarity index 100%
rename from src/pkg/net/interface_linux_test.go
rename to src/net/interface_linux_test.go
diff --git a/src/pkg/net/interface_netbsd.go b/src/net/interface_netbsd.go
similarity index 100%
rename from src/pkg/net/interface_netbsd.go
rename to src/net/interface_netbsd.go
diff --git a/src/pkg/net/interface_openbsd.go b/src/net/interface_openbsd.go
similarity index 100%
rename from src/pkg/net/interface_openbsd.go
rename to src/net/interface_openbsd.go
diff --git a/src/pkg/net/interface_stub.go b/src/net/interface_stub.go
similarity index 100%
rename from src/pkg/net/interface_stub.go
rename to src/net/interface_stub.go
diff --git a/src/pkg/net/interface_test.go b/src/net/interface_test.go
similarity index 100%
rename from src/pkg/net/interface_test.go
rename to src/net/interface_test.go
diff --git a/src/pkg/net/interface_unix_test.go b/src/net/interface_unix_test.go
similarity index 100%
rename from src/pkg/net/interface_unix_test.go
rename to src/net/interface_unix_test.go
diff --git a/src/pkg/net/interface_windows.go b/src/net/interface_windows.go
similarity index 100%
rename from src/pkg/net/interface_windows.go
rename to src/net/interface_windows.go
diff --git a/src/pkg/net/ip.go b/src/net/ip.go
similarity index 100%
rename from src/pkg/net/ip.go
rename to src/net/ip.go
diff --git a/src/pkg/net/ip_test.go b/src/net/ip_test.go
similarity index 100%
rename from src/pkg/net/ip_test.go
rename to src/net/ip_test.go
diff --git a/src/pkg/net/ipraw_test.go b/src/net/ipraw_test.go
similarity index 100%
rename from src/pkg/net/ipraw_test.go
rename to src/net/ipraw_test.go
diff --git a/src/pkg/net/iprawsock.go b/src/net/iprawsock.go
similarity index 100%
rename from src/pkg/net/iprawsock.go
rename to src/net/iprawsock.go
diff --git a/src/pkg/net/iprawsock_plan9.go b/src/net/iprawsock_plan9.go
similarity index 100%
rename from src/pkg/net/iprawsock_plan9.go
rename to src/net/iprawsock_plan9.go
diff --git a/src/pkg/net/iprawsock_posix.go b/src/net/iprawsock_posix.go
similarity index 100%
rename from src/pkg/net/iprawsock_posix.go
rename to src/net/iprawsock_posix.go
diff --git a/src/pkg/net/ipsock.go b/src/net/ipsock.go
similarity index 100%
rename from src/pkg/net/ipsock.go
rename to src/net/ipsock.go
diff --git a/src/pkg/net/ipsock_plan9.go b/src/net/ipsock_plan9.go
similarity index 100%
rename from src/pkg/net/ipsock_plan9.go
rename to src/net/ipsock_plan9.go
diff --git a/src/pkg/net/ipsock_posix.go b/src/net/ipsock_posix.go
similarity index 100%
rename from src/pkg/net/ipsock_posix.go
rename to src/net/ipsock_posix.go
diff --git a/src/pkg/net/ipsock_test.go b/src/net/ipsock_test.go
similarity index 100%
rename from src/pkg/net/ipsock_test.go
rename to src/net/ipsock_test.go
diff --git a/src/pkg/net/lookup.go b/src/net/lookup.go
similarity index 100%
rename from src/pkg/net/lookup.go
rename to src/net/lookup.go
diff --git a/src/pkg/net/lookup_plan9.go b/src/net/lookup_plan9.go
similarity index 100%
rename from src/pkg/net/lookup_plan9.go
rename to src/net/lookup_plan9.go
diff --git a/src/pkg/net/lookup_test.go b/src/net/lookup_test.go
similarity index 100%
rename from src/pkg/net/lookup_test.go
rename to src/net/lookup_test.go
diff --git a/src/pkg/net/lookup_unix.go b/src/net/lookup_unix.go
similarity index 100%
rename from src/pkg/net/lookup_unix.go
rename to src/net/lookup_unix.go
diff --git a/src/pkg/net/lookup_windows.go b/src/net/lookup_windows.go
similarity index 100%
rename from src/pkg/net/lookup_windows.go
rename to src/net/lookup_windows.go
diff --git a/src/pkg/net/lookup_windows_test.go b/src/net/lookup_windows_test.go
similarity index 100%
rename from src/pkg/net/lookup_windows_test.go
rename to src/net/lookup_windows_test.go
diff --git a/src/pkg/net/mac.go b/src/net/mac.go
similarity index 100%
rename from src/pkg/net/mac.go
rename to src/net/mac.go
diff --git a/src/pkg/net/mac_test.go b/src/net/mac_test.go
similarity index 100%
rename from src/pkg/net/mac_test.go
rename to src/net/mac_test.go
diff --git a/src/pkg/net/mail/message.go b/src/net/mail/message.go
similarity index 100%
rename from src/pkg/net/mail/message.go
rename to src/net/mail/message.go
diff --git a/src/pkg/net/mail/message_test.go b/src/net/mail/message_test.go
similarity index 100%
rename from src/pkg/net/mail/message_test.go
rename to src/net/mail/message_test.go
diff --git a/src/pkg/net/mockicmp_test.go b/src/net/mockicmp_test.go
similarity index 100%
rename from src/pkg/net/mockicmp_test.go
rename to src/net/mockicmp_test.go
diff --git a/src/pkg/net/mockserver_test.go b/src/net/mockserver_test.go
similarity index 100%
rename from src/pkg/net/mockserver_test.go
rename to src/net/mockserver_test.go
diff --git a/src/pkg/net/multicast_test.go b/src/net/multicast_test.go
similarity index 100%
rename from src/pkg/net/multicast_test.go
rename to src/net/multicast_test.go
diff --git a/src/pkg/net/net.go b/src/net/net.go
similarity index 100%
rename from src/pkg/net/net.go
rename to src/net/net.go
diff --git a/src/pkg/net/net_test.go b/src/net/net_test.go
similarity index 100%
rename from src/pkg/net/net_test.go
rename to src/net/net_test.go
diff --git a/src/pkg/net/net_windows_test.go b/src/net/net_windows_test.go
similarity index 100%
rename from src/pkg/net/net_windows_test.go
rename to src/net/net_windows_test.go
diff --git a/src/pkg/net/netgo_unix_test.go b/src/net/netgo_unix_test.go
similarity index 100%
rename from src/pkg/net/netgo_unix_test.go
rename to src/net/netgo_unix_test.go
diff --git a/src/pkg/net/packetconn_test.go b/src/net/packetconn_test.go
similarity index 100%
rename from src/pkg/net/packetconn_test.go
rename to src/net/packetconn_test.go
diff --git a/src/pkg/net/parse.go b/src/net/parse.go
similarity index 100%
rename from src/pkg/net/parse.go
rename to src/net/parse.go
diff --git a/src/pkg/net/parse_test.go b/src/net/parse_test.go
similarity index 100%
rename from src/pkg/net/parse_test.go
rename to src/net/parse_test.go
diff --git a/src/pkg/net/pipe.go b/src/net/pipe.go
similarity index 100%
rename from src/pkg/net/pipe.go
rename to src/net/pipe.go
diff --git a/src/pkg/net/pipe_test.go b/src/net/pipe_test.go
similarity index 100%
rename from src/pkg/net/pipe_test.go
rename to src/net/pipe_test.go
diff --git a/src/pkg/net/port.go b/src/net/port.go
similarity index 100%
rename from src/pkg/net/port.go
rename to src/net/port.go
diff --git a/src/pkg/net/port_test.go b/src/net/port_test.go
similarity index 100%
rename from src/pkg/net/port_test.go
rename to src/net/port_test.go
diff --git a/src/pkg/net/port_unix.go b/src/net/port_unix.go
similarity index 100%
rename from src/pkg/net/port_unix.go
rename to src/net/port_unix.go
diff --git a/src/pkg/net/protoconn_test.go b/src/net/protoconn_test.go
similarity index 100%
rename from src/pkg/net/protoconn_test.go
rename to src/net/protoconn_test.go
diff --git a/src/pkg/net/race.go b/src/net/race.go
similarity index 100%
rename from src/pkg/net/race.go
rename to src/net/race.go
diff --git a/src/pkg/net/race0.go b/src/net/race0.go
similarity index 100%
rename from src/pkg/net/race0.go
rename to src/net/race0.go
diff --git a/src/pkg/net/rpc/client.go b/src/net/rpc/client.go
similarity index 100%
rename from src/pkg/net/rpc/client.go
rename to src/net/rpc/client.go
diff --git a/src/pkg/net/rpc/client_test.go b/src/net/rpc/client_test.go
similarity index 100%
rename from src/pkg/net/rpc/client_test.go
rename to src/net/rpc/client_test.go
diff --git a/src/pkg/net/rpc/debug.go b/src/net/rpc/debug.go
similarity index 100%
rename from src/pkg/net/rpc/debug.go
rename to src/net/rpc/debug.go
diff --git a/src/pkg/net/rpc/jsonrpc/all_test.go b/src/net/rpc/jsonrpc/all_test.go
similarity index 100%
rename from src/pkg/net/rpc/jsonrpc/all_test.go
rename to src/net/rpc/jsonrpc/all_test.go
diff --git a/src/pkg/net/rpc/jsonrpc/client.go b/src/net/rpc/jsonrpc/client.go
similarity index 100%
rename from src/pkg/net/rpc/jsonrpc/client.go
rename to src/net/rpc/jsonrpc/client.go
diff --git a/src/pkg/net/rpc/jsonrpc/server.go b/src/net/rpc/jsonrpc/server.go
similarity index 100%
rename from src/pkg/net/rpc/jsonrpc/server.go
rename to src/net/rpc/jsonrpc/server.go
diff --git a/src/pkg/net/rpc/server.go b/src/net/rpc/server.go
similarity index 100%
rename from src/pkg/net/rpc/server.go
rename to src/net/rpc/server.go
diff --git a/src/pkg/net/rpc/server_test.go b/src/net/rpc/server_test.go
similarity index 100%
rename from src/pkg/net/rpc/server_test.go
rename to src/net/rpc/server_test.go
diff --git a/src/pkg/net/sendfile_dragonfly.go b/src/net/sendfile_dragonfly.go
similarity index 100%
rename from src/pkg/net/sendfile_dragonfly.go
rename to src/net/sendfile_dragonfly.go
diff --git a/src/pkg/net/sendfile_freebsd.go b/src/net/sendfile_freebsd.go
similarity index 100%
rename from src/pkg/net/sendfile_freebsd.go
rename to src/net/sendfile_freebsd.go
diff --git a/src/pkg/net/sendfile_linux.go b/src/net/sendfile_linux.go
similarity index 100%
rename from src/pkg/net/sendfile_linux.go
rename to src/net/sendfile_linux.go
diff --git a/src/pkg/net/sendfile_stub.go b/src/net/sendfile_stub.go
similarity index 100%
rename from src/pkg/net/sendfile_stub.go
rename to src/net/sendfile_stub.go
diff --git a/src/pkg/net/sendfile_windows.go b/src/net/sendfile_windows.go
similarity index 100%
rename from src/pkg/net/sendfile_windows.go
rename to src/net/sendfile_windows.go
diff --git a/src/pkg/net/server_test.go b/src/net/server_test.go
similarity index 100%
rename from src/pkg/net/server_test.go
rename to src/net/server_test.go
diff --git a/src/pkg/net/singleflight.go b/src/net/singleflight.go
similarity index 100%
rename from src/pkg/net/singleflight.go
rename to src/net/singleflight.go
diff --git a/src/pkg/net/smtp/auth.go b/src/net/smtp/auth.go
similarity index 100%
rename from src/pkg/net/smtp/auth.go
rename to src/net/smtp/auth.go
diff --git a/src/pkg/net/smtp/example_test.go b/src/net/smtp/example_test.go
similarity index 100%
rename from src/pkg/net/smtp/example_test.go
rename to src/net/smtp/example_test.go
diff --git a/src/pkg/net/smtp/smtp.go b/src/net/smtp/smtp.go
similarity index 100%
rename from src/pkg/net/smtp/smtp.go
rename to src/net/smtp/smtp.go
diff --git a/src/pkg/net/smtp/smtp_test.go b/src/net/smtp/smtp_test.go
similarity index 100%
rename from src/pkg/net/smtp/smtp_test.go
rename to src/net/smtp/smtp_test.go
diff --git a/src/pkg/net/sock_bsd.go b/src/net/sock_bsd.go
similarity index 100%
rename from src/pkg/net/sock_bsd.go
rename to src/net/sock_bsd.go
diff --git a/src/pkg/net/sock_cloexec.go b/src/net/sock_cloexec.go
similarity index 100%
rename from src/pkg/net/sock_cloexec.go
rename to src/net/sock_cloexec.go
diff --git a/src/pkg/net/sock_linux.go b/src/net/sock_linux.go
similarity index 100%
rename from src/pkg/net/sock_linux.go
rename to src/net/sock_linux.go
diff --git a/src/pkg/net/sock_plan9.go b/src/net/sock_plan9.go
similarity index 100%
rename from src/pkg/net/sock_plan9.go
rename to src/net/sock_plan9.go
diff --git a/src/pkg/net/sock_posix.go b/src/net/sock_posix.go
similarity index 100%
rename from src/pkg/net/sock_posix.go
rename to src/net/sock_posix.go
diff --git a/src/pkg/net/sock_solaris.go b/src/net/sock_solaris.go
similarity index 100%
rename from src/pkg/net/sock_solaris.go
rename to src/net/sock_solaris.go
diff --git a/src/pkg/net/sock_windows.go b/src/net/sock_windows.go
similarity index 100%
rename from src/pkg/net/sock_windows.go
rename to src/net/sock_windows.go
diff --git a/src/pkg/net/sockopt_bsd.go b/src/net/sockopt_bsd.go
similarity index 100%
rename from src/pkg/net/sockopt_bsd.go
rename to src/net/sockopt_bsd.go
diff --git a/src/pkg/net/sockopt_linux.go b/src/net/sockopt_linux.go
similarity index 100%
rename from src/pkg/net/sockopt_linux.go
rename to src/net/sockopt_linux.go
diff --git a/src/pkg/net/sockopt_plan9.go b/src/net/sockopt_plan9.go
similarity index 100%
rename from src/pkg/net/sockopt_plan9.go
rename to src/net/sockopt_plan9.go
diff --git a/src/pkg/net/sockopt_posix.go b/src/net/sockopt_posix.go
similarity index 100%
rename from src/pkg/net/sockopt_posix.go
rename to src/net/sockopt_posix.go
diff --git a/src/pkg/net/sockopt_solaris.go b/src/net/sockopt_solaris.go
similarity index 100%
rename from src/pkg/net/sockopt_solaris.go
rename to src/net/sockopt_solaris.go
diff --git a/src/pkg/net/sockopt_windows.go b/src/net/sockopt_windows.go
similarity index 100%
rename from src/pkg/net/sockopt_windows.go
rename to src/net/sockopt_windows.go
diff --git a/src/pkg/net/sockoptip_bsd.go b/src/net/sockoptip_bsd.go
similarity index 100%
rename from src/pkg/net/sockoptip_bsd.go
rename to src/net/sockoptip_bsd.go
diff --git a/src/pkg/net/sockoptip_linux.go b/src/net/sockoptip_linux.go
similarity index 100%
rename from src/pkg/net/sockoptip_linux.go
rename to src/net/sockoptip_linux.go
diff --git a/src/pkg/net/sockoptip_posix.go b/src/net/sockoptip_posix.go
similarity index 100%
rename from src/pkg/net/sockoptip_posix.go
rename to src/net/sockoptip_posix.go
diff --git a/src/pkg/net/sockoptip_stub.go b/src/net/sockoptip_stub.go
similarity index 100%
rename from src/pkg/net/sockoptip_stub.go
rename to src/net/sockoptip_stub.go
diff --git a/src/pkg/net/sockoptip_windows.go b/src/net/sockoptip_windows.go
similarity index 100%
rename from src/pkg/net/sockoptip_windows.go
rename to src/net/sockoptip_windows.go
diff --git a/src/pkg/net/sys_cloexec.go b/src/net/sys_cloexec.go
similarity index 100%
rename from src/pkg/net/sys_cloexec.go
rename to src/net/sys_cloexec.go
diff --git a/src/pkg/net/tcp_test.go b/src/net/tcp_test.go
similarity index 100%
rename from src/pkg/net/tcp_test.go
rename to src/net/tcp_test.go
diff --git a/src/pkg/net/tcpsock.go b/src/net/tcpsock.go
similarity index 100%
rename from src/pkg/net/tcpsock.go
rename to src/net/tcpsock.go
diff --git a/src/pkg/net/tcpsock_plan9.go b/src/net/tcpsock_plan9.go
similarity index 100%
rename from src/pkg/net/tcpsock_plan9.go
rename to src/net/tcpsock_plan9.go
diff --git a/src/pkg/net/tcpsock_posix.go b/src/net/tcpsock_posix.go
similarity index 100%
rename from src/pkg/net/tcpsock_posix.go
rename to src/net/tcpsock_posix.go
diff --git a/src/pkg/net/tcpsockopt_darwin.go b/src/net/tcpsockopt_darwin.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_darwin.go
rename to src/net/tcpsockopt_darwin.go
diff --git a/src/pkg/net/tcpsockopt_dragonfly.go b/src/net/tcpsockopt_dragonfly.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_dragonfly.go
rename to src/net/tcpsockopt_dragonfly.go
diff --git a/src/pkg/net/tcpsockopt_openbsd.go b/src/net/tcpsockopt_openbsd.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_openbsd.go
rename to src/net/tcpsockopt_openbsd.go
diff --git a/src/pkg/net/tcpsockopt_plan9.go b/src/net/tcpsockopt_plan9.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_plan9.go
rename to src/net/tcpsockopt_plan9.go
diff --git a/src/pkg/net/tcpsockopt_posix.go b/src/net/tcpsockopt_posix.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_posix.go
rename to src/net/tcpsockopt_posix.go
diff --git a/src/pkg/net/tcpsockopt_solaris.go b/src/net/tcpsockopt_solaris.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_solaris.go
rename to src/net/tcpsockopt_solaris.go
diff --git a/src/pkg/net/tcpsockopt_unix.go b/src/net/tcpsockopt_unix.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_unix.go
rename to src/net/tcpsockopt_unix.go
diff --git a/src/pkg/net/tcpsockopt_windows.go b/src/net/tcpsockopt_windows.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_windows.go
rename to src/net/tcpsockopt_windows.go
diff --git a/src/pkg/net/testdata/domain-resolv.conf b/src/net/testdata/domain-resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/domain-resolv.conf
rename to src/net/testdata/domain-resolv.conf
diff --git a/src/pkg/net/testdata/empty-resolv.conf b/src/net/testdata/empty-resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/empty-resolv.conf
rename to src/net/testdata/empty-resolv.conf
diff --git a/src/pkg/net/testdata/hosts b/src/net/testdata/hosts
similarity index 100%
rename from src/pkg/net/testdata/hosts
rename to src/net/testdata/hosts
diff --git a/src/pkg/net/testdata/hosts_singleline b/src/net/testdata/hosts_singleline
similarity index 100%
rename from src/pkg/net/testdata/hosts_singleline
rename to src/net/testdata/hosts_singleline
diff --git a/src/pkg/net/testdata/igmp b/src/net/testdata/igmp
similarity index 100%
rename from src/pkg/net/testdata/igmp
rename to src/net/testdata/igmp
diff --git a/src/pkg/net/testdata/igmp6 b/src/net/testdata/igmp6
similarity index 100%
rename from src/pkg/net/testdata/igmp6
rename to src/net/testdata/igmp6
diff --git a/src/pkg/net/testdata/resolv.conf b/src/net/testdata/resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/resolv.conf
rename to src/net/testdata/resolv.conf
diff --git a/src/pkg/net/testdata/search-resolv.conf b/src/net/testdata/search-resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/search-resolv.conf
rename to src/net/testdata/search-resolv.conf
diff --git a/src/pkg/net/textproto/header.go b/src/net/textproto/header.go
similarity index 100%
rename from src/pkg/net/textproto/header.go
rename to src/net/textproto/header.go
diff --git a/src/pkg/net/textproto/pipeline.go b/src/net/textproto/pipeline.go
similarity index 100%
rename from src/pkg/net/textproto/pipeline.go
rename to src/net/textproto/pipeline.go
diff --git a/src/pkg/net/textproto/reader.go b/src/net/textproto/reader.go
similarity index 100%
rename from src/pkg/net/textproto/reader.go
rename to src/net/textproto/reader.go
diff --git a/src/pkg/net/textproto/reader_test.go b/src/net/textproto/reader_test.go
similarity index 100%
rename from src/pkg/net/textproto/reader_test.go
rename to src/net/textproto/reader_test.go
diff --git a/src/pkg/net/textproto/textproto.go b/src/net/textproto/textproto.go
similarity index 100%
rename from src/pkg/net/textproto/textproto.go
rename to src/net/textproto/textproto.go
diff --git a/src/pkg/net/textproto/writer.go b/src/net/textproto/writer.go
similarity index 100%
rename from src/pkg/net/textproto/writer.go
rename to src/net/textproto/writer.go
diff --git a/src/pkg/net/textproto/writer_test.go b/src/net/textproto/writer_test.go
similarity index 100%
rename from src/pkg/net/textproto/writer_test.go
rename to src/net/textproto/writer_test.go
diff --git a/src/pkg/net/timeout_test.go b/src/net/timeout_test.go
similarity index 100%
rename from src/pkg/net/timeout_test.go
rename to src/net/timeout_test.go
diff --git a/src/pkg/net/udp_test.go b/src/net/udp_test.go
similarity index 100%
rename from src/pkg/net/udp_test.go
rename to src/net/udp_test.go
diff --git a/src/pkg/net/udpsock.go b/src/net/udpsock.go
similarity index 100%
rename from src/pkg/net/udpsock.go
rename to src/net/udpsock.go
diff --git a/src/pkg/net/udpsock_plan9.go b/src/net/udpsock_plan9.go
similarity index 100%
rename from src/pkg/net/udpsock_plan9.go
rename to src/net/udpsock_plan9.go
diff --git a/src/pkg/net/udpsock_posix.go b/src/net/udpsock_posix.go
similarity index 100%
rename from src/pkg/net/udpsock_posix.go
rename to src/net/udpsock_posix.go
diff --git a/src/pkg/net/unicast_posix_test.go b/src/net/unicast_posix_test.go
similarity index 100%
rename from src/pkg/net/unicast_posix_test.go
rename to src/net/unicast_posix_test.go
diff --git a/src/pkg/net/unix_test.go b/src/net/unix_test.go
similarity index 100%
rename from src/pkg/net/unix_test.go
rename to src/net/unix_test.go
diff --git a/src/pkg/net/unixsock.go b/src/net/unixsock.go
similarity index 100%
rename from src/pkg/net/unixsock.go
rename to src/net/unixsock.go
diff --git a/src/pkg/net/unixsock_plan9.go b/src/net/unixsock_plan9.go
similarity index 100%
rename from src/pkg/net/unixsock_plan9.go
rename to src/net/unixsock_plan9.go
diff --git a/src/pkg/net/unixsock_posix.go b/src/net/unixsock_posix.go
similarity index 100%
rename from src/pkg/net/unixsock_posix.go
rename to src/net/unixsock_posix.go
diff --git a/src/pkg/net/url/example_test.go b/src/net/url/example_test.go
similarity index 100%
rename from src/pkg/net/url/example_test.go
rename to src/net/url/example_test.go
diff --git a/src/pkg/net/url/url.go b/src/net/url/url.go
similarity index 100%
rename from src/pkg/net/url/url.go
rename to src/net/url/url.go
diff --git a/src/pkg/net/url/url_test.go b/src/net/url/url_test.go
similarity index 100%
rename from src/pkg/net/url/url_test.go
rename to src/net/url/url_test.go
diff --git a/src/pkg/net/z_last_test.go b/src/net/z_last_test.go
similarity index 100%
rename from src/pkg/net/z_last_test.go
rename to src/net/z_last_test.go
diff --git a/src/pkg/os/dir_plan9.go b/src/os/dir_plan9.go
similarity index 100%
rename from src/pkg/os/dir_plan9.go
rename to src/os/dir_plan9.go
diff --git a/src/pkg/os/dir_unix.go b/src/os/dir_unix.go
similarity index 100%
rename from src/pkg/os/dir_unix.go
rename to src/os/dir_unix.go
diff --git a/src/pkg/os/dir_windows.go b/src/os/dir_windows.go
similarity index 100%
rename from src/pkg/os/dir_windows.go
rename to src/os/dir_windows.go
diff --git a/src/pkg/os/doc.go b/src/os/doc.go
similarity index 100%
rename from src/pkg/os/doc.go
rename to src/os/doc.go
diff --git a/src/pkg/os/env.go b/src/os/env.go
similarity index 100%
rename from src/pkg/os/env.go
rename to src/os/env.go
diff --git a/src/pkg/os/env_test.go b/src/os/env_test.go
similarity index 100%
rename from src/pkg/os/env_test.go
rename to src/os/env_test.go
diff --git a/src/pkg/os/env_unix_test.go b/src/os/env_unix_test.go
similarity index 100%
rename from src/pkg/os/env_unix_test.go
rename to src/os/env_unix_test.go
diff --git a/src/pkg/os/error.go b/src/os/error.go
similarity index 100%
rename from src/pkg/os/error.go
rename to src/os/error.go
diff --git a/src/pkg/os/error_plan9.go b/src/os/error_plan9.go
similarity index 100%
rename from src/pkg/os/error_plan9.go
rename to src/os/error_plan9.go
diff --git a/src/pkg/os/error_test.go b/src/os/error_test.go
similarity index 100%
rename from src/pkg/os/error_test.go
rename to src/os/error_test.go
diff --git a/src/pkg/os/error_unix.go b/src/os/error_unix.go
similarity index 100%
rename from src/pkg/os/error_unix.go
rename to src/os/error_unix.go
diff --git a/src/pkg/os/error_windows.go b/src/os/error_windows.go
similarity index 100%
rename from src/pkg/os/error_windows.go
rename to src/os/error_windows.go
diff --git a/src/pkg/os/error_windows_test.go b/src/os/error_windows_test.go
similarity index 100%
rename from src/pkg/os/error_windows_test.go
rename to src/os/error_windows_test.go
diff --git a/src/pkg/os/exec.go b/src/os/exec.go
similarity index 100%
rename from src/pkg/os/exec.go
rename to src/os/exec.go
diff --git a/src/pkg/os/exec/example_test.go b/src/os/exec/example_test.go
similarity index 100%
rename from src/pkg/os/exec/example_test.go
rename to src/os/exec/example_test.go
diff --git a/src/pkg/os/exec/exec.go b/src/os/exec/exec.go
similarity index 100%
rename from src/pkg/os/exec/exec.go
rename to src/os/exec/exec.go
diff --git a/src/pkg/os/exec/exec_test.go b/src/os/exec/exec_test.go
similarity index 100%
rename from src/pkg/os/exec/exec_test.go
rename to src/os/exec/exec_test.go
diff --git a/src/pkg/os/exec/lp_plan9.go b/src/os/exec/lp_plan9.go
similarity index 100%
rename from src/pkg/os/exec/lp_plan9.go
rename to src/os/exec/lp_plan9.go
diff --git a/src/pkg/os/exec/lp_test.go b/src/os/exec/lp_test.go
similarity index 100%
rename from src/pkg/os/exec/lp_test.go
rename to src/os/exec/lp_test.go
diff --git a/src/pkg/os/exec/lp_unix.go b/src/os/exec/lp_unix.go
similarity index 100%
rename from src/pkg/os/exec/lp_unix.go
rename to src/os/exec/lp_unix.go
diff --git a/src/pkg/os/exec/lp_unix_test.go b/src/os/exec/lp_unix_test.go
similarity index 100%
rename from src/pkg/os/exec/lp_unix_test.go
rename to src/os/exec/lp_unix_test.go
diff --git a/src/pkg/os/exec/lp_windows.go b/src/os/exec/lp_windows.go
similarity index 100%
rename from src/pkg/os/exec/lp_windows.go
rename to src/os/exec/lp_windows.go
diff --git a/src/pkg/os/exec/lp_windows_test.go b/src/os/exec/lp_windows_test.go
similarity index 100%
rename from src/pkg/os/exec/lp_windows_test.go
rename to src/os/exec/lp_windows_test.go
diff --git a/src/pkg/os/exec_plan9.go b/src/os/exec_plan9.go
similarity index 100%
rename from src/pkg/os/exec_plan9.go
rename to src/os/exec_plan9.go
diff --git a/src/pkg/os/exec_posix.go b/src/os/exec_posix.go
similarity index 100%
rename from src/pkg/os/exec_posix.go
rename to src/os/exec_posix.go
diff --git a/src/pkg/os/exec_unix.go b/src/os/exec_unix.go
similarity index 100%
rename from src/pkg/os/exec_unix.go
rename to src/os/exec_unix.go
diff --git a/src/pkg/os/exec_windows.go b/src/os/exec_windows.go
similarity index 100%
rename from src/pkg/os/exec_windows.go
rename to src/os/exec_windows.go
diff --git a/src/pkg/os/export_test.go b/src/os/export_test.go
similarity index 100%
rename from src/pkg/os/export_test.go
rename to src/os/export_test.go
diff --git a/src/pkg/os/file.go b/src/os/file.go
similarity index 100%
rename from src/pkg/os/file.go
rename to src/os/file.go
diff --git a/src/pkg/os/file_plan9.go b/src/os/file_plan9.go
similarity index 100%
rename from src/pkg/os/file_plan9.go
rename to src/os/file_plan9.go
diff --git a/src/pkg/os/file_posix.go b/src/os/file_posix.go
similarity index 100%
rename from src/pkg/os/file_posix.go
rename to src/os/file_posix.go
diff --git a/src/pkg/os/file_unix.go b/src/os/file_unix.go
similarity index 100%
rename from src/pkg/os/file_unix.go
rename to src/os/file_unix.go
diff --git a/src/pkg/os/file_windows.go b/src/os/file_windows.go
similarity index 100%
rename from src/pkg/os/file_windows.go
rename to src/os/file_windows.go
diff --git a/src/pkg/os/getwd.go b/src/os/getwd.go
similarity index 100%
rename from src/pkg/os/getwd.go
rename to src/os/getwd.go
diff --git a/src/pkg/os/getwd_darwin.go b/src/os/getwd_darwin.go
similarity index 100%
rename from src/pkg/os/getwd_darwin.go
rename to src/os/getwd_darwin.go
diff --git a/src/pkg/os/os_test.go b/src/os/os_test.go
similarity index 100%
rename from src/pkg/os/os_test.go
rename to src/os/os_test.go
diff --git a/src/pkg/os/os_unix_test.go b/src/os/os_unix_test.go
similarity index 100%
rename from src/pkg/os/os_unix_test.go
rename to src/os/os_unix_test.go
diff --git a/src/pkg/os/os_windows_test.go b/src/os/os_windows_test.go
similarity index 100%
rename from src/pkg/os/os_windows_test.go
rename to src/os/os_windows_test.go
diff --git a/src/pkg/os/path.go b/src/os/path.go
similarity index 100%
rename from src/pkg/os/path.go
rename to src/os/path.go
diff --git a/src/pkg/os/path_plan9.go b/src/os/path_plan9.go
similarity index 100%
rename from src/pkg/os/path_plan9.go
rename to src/os/path_plan9.go
diff --git a/src/pkg/os/path_test.go b/src/os/path_test.go
similarity index 100%
rename from src/pkg/os/path_test.go
rename to src/os/path_test.go
diff --git a/src/pkg/os/path_unix.go b/src/os/path_unix.go
similarity index 100%
rename from src/pkg/os/path_unix.go
rename to src/os/path_unix.go
diff --git a/src/pkg/os/path_windows.go b/src/os/path_windows.go
similarity index 100%
rename from src/pkg/os/path_windows.go
rename to src/os/path_windows.go
diff --git a/src/pkg/os/pipe_bsd.go b/src/os/pipe_bsd.go
similarity index 100%
rename from src/pkg/os/pipe_bsd.go
rename to src/os/pipe_bsd.go
diff --git a/src/pkg/os/pipe_linux.go b/src/os/pipe_linux.go
similarity index 100%
rename from src/pkg/os/pipe_linux.go
rename to src/os/pipe_linux.go
diff --git a/src/pkg/os/proc.go b/src/os/proc.go
similarity index 100%
rename from src/pkg/os/proc.go
rename to src/os/proc.go
diff --git a/src/pkg/os/signal/example_test.go b/src/os/signal/example_test.go
similarity index 100%
rename from src/pkg/os/signal/example_test.go
rename to src/os/signal/example_test.go
diff --git a/src/pkg/os/signal/sig.s b/src/os/signal/sig.s
similarity index 100%
rename from src/pkg/os/signal/sig.s
rename to src/os/signal/sig.s
diff --git a/src/pkg/os/signal/signal.go b/src/os/signal/signal.go
similarity index 100%
rename from src/pkg/os/signal/signal.go
rename to src/os/signal/signal.go
diff --git a/src/pkg/os/signal/signal_stub.go b/src/os/signal/signal_stub.go
similarity index 100%
rename from src/pkg/os/signal/signal_stub.go
rename to src/os/signal/signal_stub.go
diff --git a/src/pkg/os/signal/signal_test.go b/src/os/signal/signal_test.go
similarity index 100%
rename from src/pkg/os/signal/signal_test.go
rename to src/os/signal/signal_test.go
diff --git a/src/pkg/os/signal/signal_unix.go b/src/os/signal/signal_unix.go
similarity index 100%
rename from src/pkg/os/signal/signal_unix.go
rename to src/os/signal/signal_unix.go
diff --git a/src/pkg/os/signal/signal_windows_test.go b/src/os/signal/signal_windows_test.go
similarity index 100%
rename from src/pkg/os/signal/signal_windows_test.go
rename to src/os/signal/signal_windows_test.go
diff --git a/src/pkg/os/stat_darwin.go b/src/os/stat_darwin.go
similarity index 100%
rename from src/pkg/os/stat_darwin.go
rename to src/os/stat_darwin.go
diff --git a/src/pkg/os/stat_dragonfly.go b/src/os/stat_dragonfly.go
similarity index 100%
rename from src/pkg/os/stat_dragonfly.go
rename to src/os/stat_dragonfly.go
diff --git a/src/pkg/os/stat_freebsd.go b/src/os/stat_freebsd.go
similarity index 100%
rename from src/pkg/os/stat_freebsd.go
rename to src/os/stat_freebsd.go
diff --git a/src/pkg/os/stat_linux.go b/src/os/stat_linux.go
similarity index 100%
rename from src/pkg/os/stat_linux.go
rename to src/os/stat_linux.go
diff --git a/src/pkg/os/stat_nacl.go b/src/os/stat_nacl.go
similarity index 100%
rename from src/pkg/os/stat_nacl.go
rename to src/os/stat_nacl.go
diff --git a/src/pkg/os/stat_netbsd.go b/src/os/stat_netbsd.go
similarity index 100%
rename from src/pkg/os/stat_netbsd.go
rename to src/os/stat_netbsd.go
diff --git a/src/pkg/os/stat_openbsd.go b/src/os/stat_openbsd.go
similarity index 100%
rename from src/pkg/os/stat_openbsd.go
rename to src/os/stat_openbsd.go
diff --git a/src/pkg/os/stat_plan9.go b/src/os/stat_plan9.go
similarity index 100%
rename from src/pkg/os/stat_plan9.go
rename to src/os/stat_plan9.go
diff --git a/src/pkg/os/stat_solaris.go b/src/os/stat_solaris.go
similarity index 100%
rename from src/pkg/os/stat_solaris.go
rename to src/os/stat_solaris.go
diff --git a/src/pkg/os/stat_windows.go b/src/os/stat_windows.go
similarity index 100%
rename from src/pkg/os/stat_windows.go
rename to src/os/stat_windows.go
diff --git a/src/pkg/os/str.go b/src/os/str.go
similarity index 100%
rename from src/pkg/os/str.go
rename to src/os/str.go
diff --git a/src/pkg/os/sys_bsd.go b/src/os/sys_bsd.go
similarity index 100%
rename from src/pkg/os/sys_bsd.go
rename to src/os/sys_bsd.go
diff --git a/src/pkg/os/sys_darwin.go b/src/os/sys_darwin.go
similarity index 100%
rename from src/pkg/os/sys_darwin.go
rename to src/os/sys_darwin.go
diff --git a/src/pkg/os/sys_freebsd.go b/src/os/sys_freebsd.go
similarity index 100%
rename from src/pkg/os/sys_freebsd.go
rename to src/os/sys_freebsd.go
diff --git a/src/pkg/os/sys_linux.go b/src/os/sys_linux.go
similarity index 100%
rename from src/pkg/os/sys_linux.go
rename to src/os/sys_linux.go
diff --git a/src/pkg/os/sys_nacl.go b/src/os/sys_nacl.go
similarity index 100%
rename from src/pkg/os/sys_nacl.go
rename to src/os/sys_nacl.go
diff --git a/src/pkg/os/sys_plan9.go b/src/os/sys_plan9.go
similarity index 100%
rename from src/pkg/os/sys_plan9.go
rename to src/os/sys_plan9.go
diff --git a/src/pkg/os/sys_solaris.go b/src/os/sys_solaris.go
similarity index 100%
rename from src/pkg/os/sys_solaris.go
rename to src/os/sys_solaris.go
diff --git a/src/pkg/os/sys_unix.go b/src/os/sys_unix.go
similarity index 100%
rename from src/pkg/os/sys_unix.go
rename to src/os/sys_unix.go
diff --git a/src/pkg/os/sys_windows.go b/src/os/sys_windows.go
similarity index 100%
rename from src/pkg/os/sys_windows.go
rename to src/os/sys_windows.go
diff --git a/src/pkg/os/types.go b/src/os/types.go
similarity index 100%
rename from src/pkg/os/types.go
rename to src/os/types.go
diff --git a/src/pkg/os/types_notwin.go b/src/os/types_notwin.go
similarity index 100%
rename from src/pkg/os/types_notwin.go
rename to src/os/types_notwin.go
diff --git a/src/pkg/os/types_windows.go b/src/os/types_windows.go
similarity index 100%
rename from src/pkg/os/types_windows.go
rename to src/os/types_windows.go
diff --git a/src/pkg/os/user/lookup.go b/src/os/user/lookup.go
similarity index 100%
rename from src/pkg/os/user/lookup.go
rename to src/os/user/lookup.go
diff --git a/src/pkg/os/user/lookup_plan9.go b/src/os/user/lookup_plan9.go
similarity index 100%
rename from src/pkg/os/user/lookup_plan9.go
rename to src/os/user/lookup_plan9.go
diff --git a/src/pkg/os/user/lookup_stubs.go b/src/os/user/lookup_stubs.go
similarity index 100%
rename from src/pkg/os/user/lookup_stubs.go
rename to src/os/user/lookup_stubs.go
diff --git a/src/pkg/os/user/lookup_unix.go b/src/os/user/lookup_unix.go
similarity index 100%
rename from src/pkg/os/user/lookup_unix.go
rename to src/os/user/lookup_unix.go
diff --git a/src/pkg/os/user/lookup_windows.go b/src/os/user/lookup_windows.go
similarity index 100%
rename from src/pkg/os/user/lookup_windows.go
rename to src/os/user/lookup_windows.go
diff --git a/src/pkg/os/user/user.go b/src/os/user/user.go
similarity index 100%
rename from src/pkg/os/user/user.go
rename to src/os/user/user.go
diff --git a/src/pkg/os/user/user_test.go b/src/os/user/user_test.go
similarity index 100%
rename from src/pkg/os/user/user_test.go
rename to src/os/user/user_test.go
diff --git a/src/pkg/path/example_test.go b/src/path/example_test.go
similarity index 100%
rename from src/pkg/path/example_test.go
rename to src/path/example_test.go
diff --git a/src/pkg/path/filepath/example_unix_test.go b/src/path/filepath/example_unix_test.go
similarity index 100%
rename from src/pkg/path/filepath/example_unix_test.go
rename to src/path/filepath/example_unix_test.go
diff --git a/src/pkg/path/filepath/export_test.go b/src/path/filepath/export_test.go
similarity index 100%
rename from src/pkg/path/filepath/export_test.go
rename to src/path/filepath/export_test.go
diff --git a/src/pkg/path/filepath/match.go b/src/path/filepath/match.go
similarity index 100%
rename from src/pkg/path/filepath/match.go
rename to src/path/filepath/match.go
diff --git a/src/pkg/path/filepath/match_test.go b/src/path/filepath/match_test.go
similarity index 100%
rename from src/pkg/path/filepath/match_test.go
rename to src/path/filepath/match_test.go
diff --git a/src/pkg/path/filepath/path.go b/src/path/filepath/path.go
similarity index 100%
rename from src/pkg/path/filepath/path.go
rename to src/path/filepath/path.go
diff --git a/src/pkg/path/filepath/path_plan9.go b/src/path/filepath/path_plan9.go
similarity index 100%
rename from src/pkg/path/filepath/path_plan9.go
rename to src/path/filepath/path_plan9.go
diff --git a/src/pkg/path/filepath/path_test.go b/src/path/filepath/path_test.go
similarity index 100%
rename from src/pkg/path/filepath/path_test.go
rename to src/path/filepath/path_test.go
diff --git a/src/pkg/path/filepath/path_unix.go b/src/path/filepath/path_unix.go
similarity index 100%
rename from src/pkg/path/filepath/path_unix.go
rename to src/path/filepath/path_unix.go
diff --git a/src/pkg/path/filepath/path_windows.go b/src/path/filepath/path_windows.go
similarity index 100%
rename from src/pkg/path/filepath/path_windows.go
rename to src/path/filepath/path_windows.go
diff --git a/src/pkg/path/filepath/path_windows_test.go b/src/path/filepath/path_windows_test.go
similarity index 100%
rename from src/pkg/path/filepath/path_windows_test.go
rename to src/path/filepath/path_windows_test.go
diff --git a/src/pkg/path/filepath/symlink.go b/src/path/filepath/symlink.go
similarity index 100%
rename from src/pkg/path/filepath/symlink.go
rename to src/path/filepath/symlink.go
diff --git a/src/pkg/path/filepath/symlink_unix.go b/src/path/filepath/symlink_unix.go
similarity index 100%
rename from src/pkg/path/filepath/symlink_unix.go
rename to src/path/filepath/symlink_unix.go
diff --git a/src/pkg/path/filepath/symlink_windows.go b/src/path/filepath/symlink_windows.go
similarity index 100%
rename from src/pkg/path/filepath/symlink_windows.go
rename to src/path/filepath/symlink_windows.go
diff --git a/src/pkg/path/match.go b/src/path/match.go
similarity index 100%
rename from src/pkg/path/match.go
rename to src/path/match.go
diff --git a/src/pkg/path/match_test.go b/src/path/match_test.go
similarity index 100%
rename from src/pkg/path/match_test.go
rename to src/path/match_test.go
diff --git a/src/pkg/path/path.go b/src/path/path.go
similarity index 100%
rename from src/pkg/path/path.go
rename to src/path/path.go
diff --git a/src/pkg/path/path_test.go b/src/path/path_test.go
similarity index 100%
rename from src/pkg/path/path_test.go
rename to src/path/path_test.go
diff --git a/src/pkg/reflect/all_test.go b/src/reflect/all_test.go
similarity index 100%
rename from src/pkg/reflect/all_test.go
rename to src/reflect/all_test.go
diff --git a/src/pkg/reflect/asm_386.s b/src/reflect/asm_386.s
similarity index 100%
rename from src/pkg/reflect/asm_386.s
rename to src/reflect/asm_386.s
diff --git a/src/pkg/reflect/asm_amd64.s b/src/reflect/asm_amd64.s
similarity index 100%
rename from src/pkg/reflect/asm_amd64.s
rename to src/reflect/asm_amd64.s
diff --git a/src/pkg/reflect/asm_amd64p32.s b/src/reflect/asm_amd64p32.s
similarity index 100%
rename from src/pkg/reflect/asm_amd64p32.s
rename to src/reflect/asm_amd64p32.s
diff --git a/src/pkg/reflect/asm_arm.s b/src/reflect/asm_arm.s
similarity index 100%
rename from src/pkg/reflect/asm_arm.s
rename to src/reflect/asm_arm.s
diff --git a/src/pkg/reflect/deepequal.go b/src/reflect/deepequal.go
similarity index 100%
rename from src/pkg/reflect/deepequal.go
rename to src/reflect/deepequal.go
diff --git a/src/pkg/reflect/example_test.go b/src/reflect/example_test.go
similarity index 100%
rename from src/pkg/reflect/example_test.go
rename to src/reflect/example_test.go
diff --git a/src/pkg/reflect/export_test.go b/src/reflect/export_test.go
similarity index 100%
rename from src/pkg/reflect/export_test.go
rename to src/reflect/export_test.go
diff --git a/src/pkg/reflect/makefunc.go b/src/reflect/makefunc.go
similarity index 100%
rename from src/pkg/reflect/makefunc.go
rename to src/reflect/makefunc.go
diff --git a/src/pkg/reflect/set_test.go b/src/reflect/set_test.go
similarity index 100%
rename from src/pkg/reflect/set_test.go
rename to src/reflect/set_test.go
diff --git a/src/pkg/reflect/tostring_test.go b/src/reflect/tostring_test.go
similarity index 100%
rename from src/pkg/reflect/tostring_test.go
rename to src/reflect/tostring_test.go
diff --git a/src/pkg/reflect/type.go b/src/reflect/type.go
similarity index 100%
rename from src/pkg/reflect/type.go
rename to src/reflect/type.go
diff --git a/src/pkg/reflect/value.go b/src/reflect/value.go
similarity index 100%
rename from src/pkg/reflect/value.go
rename to src/reflect/value.go
diff --git a/src/pkg/regexp/all_test.go b/src/regexp/all_test.go
similarity index 100%
rename from src/pkg/regexp/all_test.go
rename to src/regexp/all_test.go
diff --git a/src/pkg/regexp/example_test.go b/src/regexp/example_test.go
similarity index 100%
rename from src/pkg/regexp/example_test.go
rename to src/regexp/example_test.go
diff --git a/src/pkg/regexp/exec.go b/src/regexp/exec.go
similarity index 100%
rename from src/pkg/regexp/exec.go
rename to src/regexp/exec.go
diff --git a/src/pkg/regexp/exec2_test.go b/src/regexp/exec2_test.go
similarity index 100%
rename from src/pkg/regexp/exec2_test.go
rename to src/regexp/exec2_test.go
diff --git a/src/pkg/regexp/exec_test.go b/src/regexp/exec_test.go
similarity index 100%
rename from src/pkg/regexp/exec_test.go
rename to src/regexp/exec_test.go
diff --git a/src/pkg/regexp/find_test.go b/src/regexp/find_test.go
similarity index 100%
rename from src/pkg/regexp/find_test.go
rename to src/regexp/find_test.go
diff --git a/src/pkg/regexp/onepass.go b/src/regexp/onepass.go
similarity index 100%
rename from src/pkg/regexp/onepass.go
rename to src/regexp/onepass.go
diff --git a/src/pkg/regexp/onepass_test.go b/src/regexp/onepass_test.go
similarity index 100%
rename from src/pkg/regexp/onepass_test.go
rename to src/regexp/onepass_test.go
diff --git a/src/pkg/regexp/regexp.go b/src/regexp/regexp.go
similarity index 100%
rename from src/pkg/regexp/regexp.go
rename to src/regexp/regexp.go
diff --git a/src/pkg/regexp/syntax/compile.go b/src/regexp/syntax/compile.go
similarity index 100%
rename from src/pkg/regexp/syntax/compile.go
rename to src/regexp/syntax/compile.go
diff --git a/src/pkg/regexp/syntax/doc.go b/src/regexp/syntax/doc.go
similarity index 100%
rename from src/pkg/regexp/syntax/doc.go
rename to src/regexp/syntax/doc.go
diff --git a/src/pkg/regexp/syntax/make_perl_groups.pl b/src/regexp/syntax/make_perl_groups.pl
similarity index 100%
rename from src/pkg/regexp/syntax/make_perl_groups.pl
rename to src/regexp/syntax/make_perl_groups.pl
diff --git a/src/pkg/regexp/syntax/parse.go b/src/regexp/syntax/parse.go
similarity index 100%
rename from src/pkg/regexp/syntax/parse.go
rename to src/regexp/syntax/parse.go
diff --git a/src/pkg/regexp/syntax/parse_test.go b/src/regexp/syntax/parse_test.go
similarity index 100%
rename from src/pkg/regexp/syntax/parse_test.go
rename to src/regexp/syntax/parse_test.go
diff --git a/src/pkg/regexp/syntax/perl_groups.go b/src/regexp/syntax/perl_groups.go
similarity index 100%
rename from src/pkg/regexp/syntax/perl_groups.go
rename to src/regexp/syntax/perl_groups.go
diff --git a/src/pkg/regexp/syntax/prog.go b/src/regexp/syntax/prog.go
similarity index 100%
rename from src/pkg/regexp/syntax/prog.go
rename to src/regexp/syntax/prog.go
diff --git a/src/pkg/regexp/syntax/prog_test.go b/src/regexp/syntax/prog_test.go
similarity index 100%
rename from src/pkg/regexp/syntax/prog_test.go
rename to src/regexp/syntax/prog_test.go
diff --git a/src/pkg/regexp/syntax/regexp.go b/src/regexp/syntax/regexp.go
similarity index 100%
rename from src/pkg/regexp/syntax/regexp.go
rename to src/regexp/syntax/regexp.go
diff --git a/src/pkg/regexp/syntax/simplify.go b/src/regexp/syntax/simplify.go
similarity index 100%
rename from src/pkg/regexp/syntax/simplify.go
rename to src/regexp/syntax/simplify.go
diff --git a/src/pkg/regexp/syntax/simplify_test.go b/src/regexp/syntax/simplify_test.go
similarity index 100%
rename from src/pkg/regexp/syntax/simplify_test.go
rename to src/regexp/syntax/simplify_test.go
diff --git a/src/pkg/regexp/testdata/README b/src/regexp/testdata/README
similarity index 100%
rename from src/pkg/regexp/testdata/README
rename to src/regexp/testdata/README
diff --git a/src/pkg/regexp/testdata/basic.dat b/src/regexp/testdata/basic.dat
similarity index 100%
rename from src/pkg/regexp/testdata/basic.dat
rename to src/regexp/testdata/basic.dat
diff --git a/src/pkg/regexp/testdata/nullsubexpr.dat b/src/regexp/testdata/nullsubexpr.dat
similarity index 100%
rename from src/pkg/regexp/testdata/nullsubexpr.dat
rename to src/regexp/testdata/nullsubexpr.dat
diff --git a/src/pkg/regexp/testdata/re2-exhaustive.txt.bz2 b/src/regexp/testdata/re2-exhaustive.txt.bz2
similarity index 100%
rename from src/pkg/regexp/testdata/re2-exhaustive.txt.bz2
rename to src/regexp/testdata/re2-exhaustive.txt.bz2
diff --git a/src/pkg/regexp/testdata/re2-search.txt b/src/regexp/testdata/re2-search.txt
similarity index 100%
rename from src/pkg/regexp/testdata/re2-search.txt
rename to src/regexp/testdata/re2-search.txt
diff --git a/src/pkg/regexp/testdata/repetition.dat b/src/regexp/testdata/repetition.dat
similarity index 100%
rename from src/pkg/regexp/testdata/repetition.dat
rename to src/regexp/testdata/repetition.dat
diff --git a/src/pkg/regexp/testdata/testregex.c b/src/regexp/testdata/testregex.c
similarity index 100%
rename from src/pkg/regexp/testdata/testregex.c
rename to src/regexp/testdata/testregex.c
diff --git a/src/pkg/runtime/Makefile b/src/runtime/Makefile
similarity index 100%
rename from src/pkg/runtime/Makefile
rename to src/runtime/Makefile
diff --git a/src/pkg/runtime/alg.go b/src/runtime/alg.go
similarity index 100%
rename from src/pkg/runtime/alg.go
rename to src/runtime/alg.go
diff --git a/src/pkg/runtime/append_test.go b/src/runtime/append_test.go
similarity index 100%
rename from src/pkg/runtime/append_test.go
rename to src/runtime/append_test.go
diff --git a/src/pkg/runtime/arch_386.go b/src/runtime/arch_386.go
similarity index 100%
rename from src/pkg/runtime/arch_386.go
rename to src/runtime/arch_386.go
diff --git a/src/pkg/runtime/arch_386.h b/src/runtime/arch_386.h
similarity index 100%
rename from src/pkg/runtime/arch_386.h
rename to src/runtime/arch_386.h
diff --git a/src/pkg/runtime/arch_amd64.go b/src/runtime/arch_amd64.go
similarity index 100%
rename from src/pkg/runtime/arch_amd64.go
rename to src/runtime/arch_amd64.go
diff --git a/src/pkg/runtime/arch_amd64.h b/src/runtime/arch_amd64.h
similarity index 100%
rename from src/pkg/runtime/arch_amd64.h
rename to src/runtime/arch_amd64.h
diff --git a/src/pkg/runtime/arch_amd64p32.go b/src/runtime/arch_amd64p32.go
similarity index 100%
rename from src/pkg/runtime/arch_amd64p32.go
rename to src/runtime/arch_amd64p32.go
diff --git a/src/pkg/runtime/arch_amd64p32.h b/src/runtime/arch_amd64p32.h
similarity index 100%
rename from src/pkg/runtime/arch_amd64p32.h
rename to src/runtime/arch_amd64p32.h
diff --git a/src/pkg/runtime/arch_arm.go b/src/runtime/arch_arm.go
similarity index 100%
rename from src/pkg/runtime/arch_arm.go
rename to src/runtime/arch_arm.go
diff --git a/src/pkg/runtime/arch_arm.h b/src/runtime/arch_arm.h
similarity index 100%
rename from src/pkg/runtime/arch_arm.h
rename to src/runtime/arch_arm.h
diff --git a/src/pkg/runtime/asm_386.s b/src/runtime/asm_386.s
similarity index 100%
rename from src/pkg/runtime/asm_386.s
rename to src/runtime/asm_386.s
diff --git a/src/pkg/runtime/asm_amd64.s b/src/runtime/asm_amd64.s
similarity index 100%
rename from src/pkg/runtime/asm_amd64.s
rename to src/runtime/asm_amd64.s
diff --git a/src/pkg/runtime/asm_amd64p32.s b/src/runtime/asm_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/asm_amd64p32.s
rename to src/runtime/asm_amd64p32.s
diff --git a/src/pkg/runtime/asm_arm.s b/src/runtime/asm_arm.s
similarity index 100%
rename from src/pkg/runtime/asm_arm.s
rename to src/runtime/asm_arm.s
diff --git a/src/pkg/runtime/atomic.go b/src/runtime/atomic.go
similarity index 100%
rename from src/pkg/runtime/atomic.go
rename to src/runtime/atomic.go
diff --git a/src/pkg/runtime/atomic_386.c b/src/runtime/atomic_386.c
similarity index 100%
rename from src/pkg/runtime/atomic_386.c
rename to src/runtime/atomic_386.c
diff --git a/src/pkg/runtime/atomic_amd64x.c b/src/runtime/atomic_amd64x.c
similarity index 100%
rename from src/pkg/runtime/atomic_amd64x.c
rename to src/runtime/atomic_amd64x.c
diff --git a/src/pkg/runtime/atomic_arm.go b/src/runtime/atomic_arm.go
similarity index 100%
rename from src/pkg/runtime/atomic_arm.go
rename to src/runtime/atomic_arm.go
diff --git a/src/pkg/runtime/cgo/asm_386.s b/src/runtime/cgo/asm_386.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_386.s
rename to src/runtime/cgo/asm_386.s
diff --git a/src/pkg/runtime/cgo/asm_amd64.s b/src/runtime/cgo/asm_amd64.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_amd64.s
rename to src/runtime/cgo/asm_amd64.s
diff --git a/src/pkg/runtime/cgo/asm_arm.s b/src/runtime/cgo/asm_arm.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_arm.s
rename to src/runtime/cgo/asm_arm.s
diff --git a/src/pkg/runtime/cgo/asm_nacl_amd64p32.s b/src/runtime/cgo/asm_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_nacl_amd64p32.s
rename to src/runtime/cgo/asm_nacl_amd64p32.s
diff --git a/src/pkg/runtime/cgo/callbacks.c b/src/runtime/cgo/callbacks.c
similarity index 100%
rename from src/pkg/runtime/cgo/callbacks.c
rename to src/runtime/cgo/callbacks.c
diff --git a/src/pkg/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go
similarity index 100%
rename from src/pkg/runtime/cgo/cgo.go
rename to src/runtime/cgo/cgo.go
diff --git a/src/pkg/runtime/cgo/dragonfly.c b/src/runtime/cgo/dragonfly.c
similarity index 100%
rename from src/pkg/runtime/cgo/dragonfly.c
rename to src/runtime/cgo/dragonfly.c
diff --git a/src/pkg/runtime/cgo/freebsd.c b/src/runtime/cgo/freebsd.c
similarity index 100%
rename from src/pkg/runtime/cgo/freebsd.c
rename to src/runtime/cgo/freebsd.c
diff --git a/src/pkg/runtime/cgo/gcc_386.S b/src/runtime/cgo/gcc_386.S
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_386.S
rename to src/runtime/cgo/gcc_386.S
diff --git a/src/pkg/runtime/cgo/gcc_amd64.S b/src/runtime/cgo/gcc_amd64.S
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_amd64.S
rename to src/runtime/cgo/gcc_amd64.S
diff --git a/src/pkg/runtime/cgo/gcc_android.c b/src/runtime/cgo/gcc_android.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_android.c
rename to src/runtime/cgo/gcc_android.c
diff --git a/src/pkg/runtime/cgo/gcc_android_arm.c b/src/runtime/cgo/gcc_android_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_android_arm.c
rename to src/runtime/cgo/gcc_android_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/runtime/cgo/gcc_arm.S
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_arm.S
rename to src/runtime/cgo/gcc_arm.S
diff --git a/src/pkg/runtime/cgo/gcc_darwin_386.c b/src/runtime/cgo/gcc_darwin_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_darwin_386.c
rename to src/runtime/cgo/gcc_darwin_386.c
diff --git a/src/pkg/runtime/cgo/gcc_darwin_amd64.c b/src/runtime/cgo/gcc_darwin_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_darwin_amd64.c
rename to src/runtime/cgo/gcc_darwin_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_dragonfly_386.c b/src/runtime/cgo/gcc_dragonfly_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_dragonfly_386.c
rename to src/runtime/cgo/gcc_dragonfly_386.c
diff --git a/src/pkg/runtime/cgo/gcc_dragonfly_amd64.c b/src/runtime/cgo/gcc_dragonfly_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_dragonfly_amd64.c
rename to src/runtime/cgo/gcc_dragonfly_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_fatalf.c b/src/runtime/cgo/gcc_fatalf.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_fatalf.c
rename to src/runtime/cgo/gcc_fatalf.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_386.c b/src/runtime/cgo/gcc_freebsd_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_freebsd_386.c
rename to src/runtime/cgo/gcc_freebsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_amd64.c b/src/runtime/cgo/gcc_freebsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_freebsd_amd64.c
rename to src/runtime/cgo/gcc_freebsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_arm.c b/src/runtime/cgo/gcc_freebsd_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_freebsd_arm.c
rename to src/runtime/cgo/gcc_freebsd_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_386.c b/src/runtime/cgo/gcc_linux_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_linux_386.c
rename to src/runtime/cgo/gcc_linux_386.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_amd64.c b/src/runtime/cgo/gcc_linux_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_linux_amd64.c
rename to src/runtime/cgo/gcc_linux_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_arm.c b/src/runtime/cgo/gcc_linux_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_linux_arm.c
rename to src/runtime/cgo/gcc_linux_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_386.c b/src/runtime/cgo/gcc_netbsd_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_netbsd_386.c
rename to src/runtime/cgo/gcc_netbsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_amd64.c b/src/runtime/cgo/gcc_netbsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_netbsd_amd64.c
rename to src/runtime/cgo/gcc_netbsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_arm.c b/src/runtime/cgo/gcc_netbsd_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_netbsd_arm.c
rename to src/runtime/cgo/gcc_netbsd_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_openbsd_386.c b/src/runtime/cgo/gcc_openbsd_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_openbsd_386.c
rename to src/runtime/cgo/gcc_openbsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_openbsd_amd64.c b/src/runtime/cgo/gcc_openbsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_openbsd_amd64.c
rename to src/runtime/cgo/gcc_openbsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_setenv.c b/src/runtime/cgo/gcc_setenv.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_setenv.c
rename to src/runtime/cgo/gcc_setenv.c
diff --git a/src/pkg/runtime/cgo/gcc_util.c b/src/runtime/cgo/gcc_util.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_util.c
rename to src/runtime/cgo/gcc_util.c
diff --git a/src/pkg/runtime/cgo/gcc_windows_386.c b/src/runtime/cgo/gcc_windows_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_windows_386.c
rename to src/runtime/cgo/gcc_windows_386.c
diff --git a/src/pkg/runtime/cgo/gcc_windows_amd64.c b/src/runtime/cgo/gcc_windows_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_windows_amd64.c
rename to src/runtime/cgo/gcc_windows_amd64.c
diff --git a/src/pkg/runtime/cgo/iscgo.c b/src/runtime/cgo/iscgo.c
similarity index 100%
rename from src/pkg/runtime/cgo/iscgo.c
rename to src/runtime/cgo/iscgo.c
diff --git a/src/pkg/runtime/cgo/libcgo.h b/src/runtime/cgo/libcgo.h
similarity index 100%
rename from src/pkg/runtime/cgo/libcgo.h
rename to src/runtime/cgo/libcgo.h
diff --git a/src/pkg/runtime/cgo/netbsd.c b/src/runtime/cgo/netbsd.c
similarity index 100%
rename from src/pkg/runtime/cgo/netbsd.c
rename to src/runtime/cgo/netbsd.c
diff --git a/src/pkg/runtime/cgo/openbsd.c b/src/runtime/cgo/openbsd.c
similarity index 100%
rename from src/pkg/runtime/cgo/openbsd.c
rename to src/runtime/cgo/openbsd.c
diff --git a/src/pkg/runtime/cgo/setenv.c b/src/runtime/cgo/setenv.c
similarity index 100%
rename from src/pkg/runtime/cgo/setenv.c
rename to src/runtime/cgo/setenv.c
diff --git a/src/pkg/runtime/cgocall.go b/src/runtime/cgocall.go
similarity index 100%
rename from src/pkg/runtime/cgocall.go
rename to src/runtime/cgocall.go
diff --git a/src/pkg/runtime/cgocall.h b/src/runtime/cgocall.h
similarity index 100%
rename from src/pkg/runtime/cgocall.h
rename to src/runtime/cgocall.h
diff --git a/src/pkg/runtime/chan.go b/src/runtime/chan.go
similarity index 100%
rename from src/pkg/runtime/chan.go
rename to src/runtime/chan.go
diff --git a/src/pkg/runtime/chan.h b/src/runtime/chan.h
similarity index 100%
rename from src/pkg/runtime/chan.h
rename to src/runtime/chan.h
diff --git a/src/pkg/runtime/chan_test.go b/src/runtime/chan_test.go
similarity index 100%
rename from src/pkg/runtime/chan_test.go
rename to src/runtime/chan_test.go
diff --git a/src/pkg/runtime/closure_test.go b/src/runtime/closure_test.go
similarity index 100%
rename from src/pkg/runtime/closure_test.go
rename to src/runtime/closure_test.go
diff --git a/src/pkg/runtime/compiler.go b/src/runtime/compiler.go
similarity index 100%
rename from src/pkg/runtime/compiler.go
rename to src/runtime/compiler.go
diff --git a/src/pkg/runtime/complex.go b/src/runtime/complex.go
similarity index 100%
rename from src/pkg/runtime/complex.go
rename to src/runtime/complex.go
diff --git a/src/pkg/runtime/complex_test.go b/src/runtime/complex_test.go
similarity index 100%
rename from src/pkg/runtime/complex_test.go
rename to src/runtime/complex_test.go
diff --git a/src/pkg/runtime/cpuprof.go b/src/runtime/cpuprof.go
similarity index 100%
rename from src/pkg/runtime/cpuprof.go
rename to src/runtime/cpuprof.go
diff --git a/src/pkg/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
similarity index 100%
rename from src/pkg/runtime/crash_cgo_test.go
rename to src/runtime/crash_cgo_test.go
diff --git a/src/pkg/runtime/crash_test.go b/src/runtime/crash_test.go
similarity index 100%
rename from src/pkg/runtime/crash_test.go
rename to src/runtime/crash_test.go
diff --git a/src/pkg/runtime/debug.go b/src/runtime/debug.go
similarity index 100%
rename from src/pkg/runtime/debug.go
rename to src/runtime/debug.go
diff --git a/src/pkg/runtime/debug/debug.c b/src/runtime/debug/debug.c
similarity index 100%
rename from src/pkg/runtime/debug/debug.c
rename to src/runtime/debug/debug.c
diff --git a/src/pkg/runtime/debug/garbage.go b/src/runtime/debug/garbage.go
similarity index 100%
rename from src/pkg/runtime/debug/garbage.go
rename to src/runtime/debug/garbage.go
diff --git a/src/pkg/runtime/debug/garbage_test.go b/src/runtime/debug/garbage_test.go
similarity index 100%
rename from src/pkg/runtime/debug/garbage_test.go
rename to src/runtime/debug/garbage_test.go
diff --git a/src/pkg/runtime/debug/heapdump_test.go b/src/runtime/debug/heapdump_test.go
similarity index 100%
rename from src/pkg/runtime/debug/heapdump_test.go
rename to src/runtime/debug/heapdump_test.go
diff --git a/src/pkg/runtime/debug/stack.go b/src/runtime/debug/stack.go
similarity index 100%
rename from src/pkg/runtime/debug/stack.go
rename to src/runtime/debug/stack.go
diff --git a/src/pkg/runtime/debug/stack_test.go b/src/runtime/debug/stack_test.go
similarity index 100%
rename from src/pkg/runtime/debug/stack_test.go
rename to src/runtime/debug/stack_test.go
diff --git a/src/pkg/runtime/debug/stubs.go b/src/runtime/debug/stubs.go
similarity index 100%
rename from src/pkg/runtime/debug/stubs.go
rename to src/runtime/debug/stubs.go
diff --git a/src/pkg/runtime/debug/stubs.s b/src/runtime/debug/stubs.s
similarity index 100%
rename from src/pkg/runtime/debug/stubs.s
rename to src/runtime/debug/stubs.s
diff --git a/src/pkg/runtime/defs.c b/src/runtime/defs.c
similarity index 100%
rename from src/pkg/runtime/defs.c
rename to src/runtime/defs.c
diff --git a/src/pkg/runtime/defs1_linux.go b/src/runtime/defs1_linux.go
similarity index 100%
rename from src/pkg/runtime/defs1_linux.go
rename to src/runtime/defs1_linux.go
diff --git a/src/pkg/runtime/defs2_linux.go b/src/runtime/defs2_linux.go
similarity index 100%
rename from src/pkg/runtime/defs2_linux.go
rename to src/runtime/defs2_linux.go
diff --git a/src/pkg/runtime/defs_android_arm.h b/src/runtime/defs_android_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_android_arm.h
rename to src/runtime/defs_android_arm.h
diff --git a/src/pkg/runtime/defs_arm_linux.go b/src/runtime/defs_arm_linux.go
similarity index 100%
rename from src/pkg/runtime/defs_arm_linux.go
rename to src/runtime/defs_arm_linux.go
diff --git a/src/pkg/runtime/defs_darwin.go b/src/runtime/defs_darwin.go
similarity index 100%
rename from src/pkg/runtime/defs_darwin.go
rename to src/runtime/defs_darwin.go
diff --git a/src/pkg/runtime/defs_darwin_386.h b/src/runtime/defs_darwin_386.h
similarity index 100%
rename from src/pkg/runtime/defs_darwin_386.h
rename to src/runtime/defs_darwin_386.h
diff --git a/src/pkg/runtime/defs_darwin_amd64.h b/src/runtime/defs_darwin_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_darwin_amd64.h
rename to src/runtime/defs_darwin_amd64.h
diff --git a/src/pkg/runtime/defs_dragonfly.go b/src/runtime/defs_dragonfly.go
similarity index 100%
rename from src/pkg/runtime/defs_dragonfly.go
rename to src/runtime/defs_dragonfly.go
diff --git a/src/pkg/runtime/defs_dragonfly_386.h b/src/runtime/defs_dragonfly_386.h
similarity index 100%
rename from src/pkg/runtime/defs_dragonfly_386.h
rename to src/runtime/defs_dragonfly_386.h
diff --git a/src/pkg/runtime/defs_dragonfly_amd64.h b/src/runtime/defs_dragonfly_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_dragonfly_amd64.h
rename to src/runtime/defs_dragonfly_amd64.h
diff --git a/src/pkg/runtime/defs_freebsd.go b/src/runtime/defs_freebsd.go
similarity index 100%
rename from src/pkg/runtime/defs_freebsd.go
rename to src/runtime/defs_freebsd.go
diff --git a/src/pkg/runtime/defs_freebsd_386.h b/src/runtime/defs_freebsd_386.h
similarity index 100%
rename from src/pkg/runtime/defs_freebsd_386.h
rename to src/runtime/defs_freebsd_386.h
diff --git a/src/pkg/runtime/defs_freebsd_amd64.h b/src/runtime/defs_freebsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_freebsd_amd64.h
rename to src/runtime/defs_freebsd_amd64.h
diff --git a/src/pkg/runtime/defs_freebsd_arm.h b/src/runtime/defs_freebsd_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_freebsd_arm.h
rename to src/runtime/defs_freebsd_arm.h
diff --git a/src/pkg/runtime/defs_linux.go b/src/runtime/defs_linux.go
similarity index 100%
rename from src/pkg/runtime/defs_linux.go
rename to src/runtime/defs_linux.go
diff --git a/src/pkg/runtime/defs_linux_386.h b/src/runtime/defs_linux_386.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_386.h
rename to src/runtime/defs_linux_386.h
diff --git a/src/pkg/runtime/defs_linux_amd64.h b/src/runtime/defs_linux_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_amd64.h
rename to src/runtime/defs_linux_amd64.h
diff --git a/src/pkg/runtime/defs_linux_arm.h b/src/runtime/defs_linux_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_arm.h
rename to src/runtime/defs_linux_arm.h
diff --git a/src/pkg/runtime/defs_nacl_386.h b/src/runtime/defs_nacl_386.h
similarity index 100%
rename from src/pkg/runtime/defs_nacl_386.h
rename to src/runtime/defs_nacl_386.h
diff --git a/src/pkg/runtime/defs_nacl_amd64p32.h b/src/runtime/defs_nacl_amd64p32.h
similarity index 100%
rename from src/pkg/runtime/defs_nacl_amd64p32.h
rename to src/runtime/defs_nacl_amd64p32.h
diff --git a/src/pkg/runtime/defs_nacl_arm.h b/src/runtime/defs_nacl_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_nacl_arm.h
rename to src/runtime/defs_nacl_arm.h
diff --git a/src/pkg/runtime/defs_netbsd.go b/src/runtime/defs_netbsd.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd.go
rename to src/runtime/defs_netbsd.go
diff --git a/src/pkg/runtime/defs_netbsd_386.go b/src/runtime/defs_netbsd_386.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_386.go
rename to src/runtime/defs_netbsd_386.go
diff --git a/src/pkg/runtime/defs_netbsd_386.h b/src/runtime/defs_netbsd_386.h
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_386.h
rename to src/runtime/defs_netbsd_386.h
diff --git a/src/pkg/runtime/defs_netbsd_amd64.go b/src/runtime/defs_netbsd_amd64.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_amd64.go
rename to src/runtime/defs_netbsd_amd64.go
diff --git a/src/pkg/runtime/defs_netbsd_amd64.h b/src/runtime/defs_netbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_amd64.h
rename to src/runtime/defs_netbsd_amd64.h
diff --git a/src/pkg/runtime/defs_netbsd_arm.go b/src/runtime/defs_netbsd_arm.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_arm.go
rename to src/runtime/defs_netbsd_arm.go
diff --git a/src/pkg/runtime/defs_netbsd_arm.h b/src/runtime/defs_netbsd_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_arm.h
rename to src/runtime/defs_netbsd_arm.h
diff --git a/src/pkg/runtime/defs_openbsd.go b/src/runtime/defs_openbsd.go
similarity index 100%
rename from src/pkg/runtime/defs_openbsd.go
rename to src/runtime/defs_openbsd.go
diff --git a/src/pkg/runtime/defs_openbsd_386.h b/src/runtime/defs_openbsd_386.h
similarity index 100%
rename from src/pkg/runtime/defs_openbsd_386.h
rename to src/runtime/defs_openbsd_386.h
diff --git a/src/pkg/runtime/defs_openbsd_amd64.h b/src/runtime/defs_openbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_openbsd_amd64.h
rename to src/runtime/defs_openbsd_amd64.h
diff --git a/src/pkg/runtime/defs_plan9_386.h b/src/runtime/defs_plan9_386.h
similarity index 100%
rename from src/pkg/runtime/defs_plan9_386.h
rename to src/runtime/defs_plan9_386.h
diff --git a/src/pkg/runtime/defs_plan9_amd64.h b/src/runtime/defs_plan9_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_plan9_amd64.h
rename to src/runtime/defs_plan9_amd64.h
diff --git a/src/pkg/runtime/defs_solaris.go b/src/runtime/defs_solaris.go
similarity index 100%
rename from src/pkg/runtime/defs_solaris.go
rename to src/runtime/defs_solaris.go
diff --git a/src/pkg/runtime/defs_solaris_amd64.go b/src/runtime/defs_solaris_amd64.go
similarity index 100%
rename from src/pkg/runtime/defs_solaris_amd64.go
rename to src/runtime/defs_solaris_amd64.go
diff --git a/src/pkg/runtime/defs_solaris_amd64.h b/src/runtime/defs_solaris_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_solaris_amd64.h
rename to src/runtime/defs_solaris_amd64.h
diff --git a/src/pkg/runtime/defs_windows.go b/src/runtime/defs_windows.go
similarity index 100%
rename from src/pkg/runtime/defs_windows.go
rename to src/runtime/defs_windows.go
diff --git a/src/pkg/runtime/defs_windows_386.h b/src/runtime/defs_windows_386.h
similarity index 100%
rename from src/pkg/runtime/defs_windows_386.h
rename to src/runtime/defs_windows_386.h
diff --git a/src/pkg/runtime/defs_windows_amd64.h b/src/runtime/defs_windows_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_windows_amd64.h
rename to src/runtime/defs_windows_amd64.h
diff --git a/src/pkg/runtime/env_plan9.go b/src/runtime/env_plan9.go
similarity index 100%
rename from src/pkg/runtime/env_plan9.go
rename to src/runtime/env_plan9.go
diff --git a/src/pkg/runtime/env_posix.go b/src/runtime/env_posix.go
similarity index 100%
rename from src/pkg/runtime/env_posix.go
rename to src/runtime/env_posix.go
diff --git a/src/pkg/runtime/error.go b/src/runtime/error.go
similarity index 100%
rename from src/pkg/runtime/error.go
rename to src/runtime/error.go
diff --git a/src/pkg/runtime/export_futex_test.go b/src/runtime/export_futex_test.go
similarity index 100%
rename from src/pkg/runtime/export_futex_test.go
rename to src/runtime/export_futex_test.go
diff --git a/src/pkg/runtime/export_test.go b/src/runtime/export_test.go
similarity index 100%
rename from src/pkg/runtime/export_test.go
rename to src/runtime/export_test.go
diff --git a/src/pkg/runtime/extern.go b/src/runtime/extern.go
similarity index 100%
rename from src/pkg/runtime/extern.go
rename to src/runtime/extern.go
diff --git a/src/pkg/runtime/float.c b/src/runtime/float.c
similarity index 100%
rename from src/pkg/runtime/float.c
rename to src/runtime/float.c
diff --git a/src/pkg/runtime/funcdata.h b/src/runtime/funcdata.h
similarity index 100%
rename from src/pkg/runtime/funcdata.h
rename to src/runtime/funcdata.h
diff --git a/src/pkg/runtime/futex_test.go b/src/runtime/futex_test.go
similarity index 100%
rename from src/pkg/runtime/futex_test.go
rename to src/runtime/futex_test.go
diff --git a/src/pkg/runtime/gc_test.go b/src/runtime/gc_test.go
similarity index 100%
rename from src/pkg/runtime/gc_test.go
rename to src/runtime/gc_test.go
diff --git a/src/pkg/runtime/gcinfo_test.go b/src/runtime/gcinfo_test.go
similarity index 100%
rename from src/pkg/runtime/gcinfo_test.go
rename to src/runtime/gcinfo_test.go
diff --git a/src/pkg/runtime/hash_test.go b/src/runtime/hash_test.go
similarity index 100%
rename from src/pkg/runtime/hash_test.go
rename to src/runtime/hash_test.go
diff --git a/src/pkg/runtime/hashmap.go b/src/runtime/hashmap.go
similarity index 100%
rename from src/pkg/runtime/hashmap.go
rename to src/runtime/hashmap.go
diff --git a/src/pkg/runtime/hashmap_fast.go b/src/runtime/hashmap_fast.go
similarity index 100%
rename from src/pkg/runtime/hashmap_fast.go
rename to src/runtime/hashmap_fast.go
diff --git a/src/pkg/runtime/heapdump.c b/src/runtime/heapdump.c
similarity index 100%
rename from src/pkg/runtime/heapdump.c
rename to src/runtime/heapdump.c
diff --git a/src/pkg/runtime/iface.go b/src/runtime/iface.go
similarity index 100%
rename from src/pkg/runtime/iface.go
rename to src/runtime/iface.go
diff --git a/src/pkg/runtime/iface_test.go b/src/runtime/iface_test.go
similarity index 100%
rename from src/pkg/runtime/iface_test.go
rename to src/runtime/iface_test.go
diff --git a/src/pkg/runtime/lfstack.c b/src/runtime/lfstack.c
similarity index 100%
rename from src/pkg/runtime/lfstack.c
rename to src/runtime/lfstack.c
diff --git a/src/pkg/runtime/lfstack_test.go b/src/runtime/lfstack_test.go
similarity index 100%
rename from src/pkg/runtime/lfstack_test.go
rename to src/runtime/lfstack_test.go
diff --git a/src/pkg/runtime/lock_futex.go b/src/runtime/lock_futex.go
similarity index 100%
rename from src/pkg/runtime/lock_futex.go
rename to src/runtime/lock_futex.go
diff --git a/src/pkg/runtime/lock_sema.go b/src/runtime/lock_sema.go
similarity index 100%
rename from src/pkg/runtime/lock_sema.go
rename to src/runtime/lock_sema.go
diff --git a/src/pkg/runtime/malloc.c b/src/runtime/malloc.c
similarity index 100%
rename from src/pkg/runtime/malloc.c
rename to src/runtime/malloc.c
diff --git a/src/pkg/runtime/malloc.go b/src/runtime/malloc.go
similarity index 100%
rename from src/pkg/runtime/malloc.go
rename to src/runtime/malloc.go
diff --git a/src/pkg/runtime/malloc.h b/src/runtime/malloc.h
similarity index 100%
rename from src/pkg/runtime/malloc.h
rename to src/runtime/malloc.h
diff --git a/src/pkg/runtime/malloc_test.go b/src/runtime/malloc_test.go
similarity index 100%
rename from src/pkg/runtime/malloc_test.go
rename to src/runtime/malloc_test.go
diff --git a/src/pkg/runtime/map_test.go b/src/runtime/map_test.go
similarity index 100%
rename from src/pkg/runtime/map_test.go
rename to src/runtime/map_test.go
diff --git a/src/pkg/runtime/mapspeed_test.go b/src/runtime/mapspeed_test.go
similarity index 100%
rename from src/pkg/runtime/mapspeed_test.go
rename to src/runtime/mapspeed_test.go
diff --git a/src/pkg/runtime/mcache.c b/src/runtime/mcache.c
similarity index 100%
rename from src/pkg/runtime/mcache.c
rename to src/runtime/mcache.c
diff --git a/src/pkg/runtime/mcentral.c b/src/runtime/mcentral.c
similarity index 100%
rename from src/pkg/runtime/mcentral.c
rename to src/runtime/mcentral.c
diff --git a/src/pkg/runtime/mem.go b/src/runtime/mem.go
similarity index 100%
rename from src/pkg/runtime/mem.go
rename to src/runtime/mem.go
diff --git a/src/pkg/runtime/mem_darwin.c b/src/runtime/mem_darwin.c
similarity index 100%
rename from src/pkg/runtime/mem_darwin.c
rename to src/runtime/mem_darwin.c
diff --git a/src/pkg/runtime/mem_dragonfly.c b/src/runtime/mem_dragonfly.c
similarity index 100%
rename from src/pkg/runtime/mem_dragonfly.c
rename to src/runtime/mem_dragonfly.c
diff --git a/src/pkg/runtime/mem_freebsd.c b/src/runtime/mem_freebsd.c
similarity index 100%
rename from src/pkg/runtime/mem_freebsd.c
rename to src/runtime/mem_freebsd.c
diff --git a/src/pkg/runtime/mem_linux.c b/src/runtime/mem_linux.c
similarity index 100%
rename from src/pkg/runtime/mem_linux.c
rename to src/runtime/mem_linux.c
diff --git a/src/pkg/runtime/mem_nacl.c b/src/runtime/mem_nacl.c
similarity index 100%
rename from src/pkg/runtime/mem_nacl.c
rename to src/runtime/mem_nacl.c
diff --git a/src/pkg/runtime/mem_netbsd.c b/src/runtime/mem_netbsd.c
similarity index 100%
rename from src/pkg/runtime/mem_netbsd.c
rename to src/runtime/mem_netbsd.c
diff --git a/src/pkg/runtime/mem_openbsd.c b/src/runtime/mem_openbsd.c
similarity index 100%
rename from src/pkg/runtime/mem_openbsd.c
rename to src/runtime/mem_openbsd.c
diff --git a/src/pkg/runtime/mem_plan9.c b/src/runtime/mem_plan9.c
similarity index 100%
rename from src/pkg/runtime/mem_plan9.c
rename to src/runtime/mem_plan9.c
diff --git a/src/pkg/runtime/mem_solaris.c b/src/runtime/mem_solaris.c
similarity index 100%
rename from src/pkg/runtime/mem_solaris.c
rename to src/runtime/mem_solaris.c
diff --git a/src/pkg/runtime/mem_windows.c b/src/runtime/mem_windows.c
similarity index 100%
rename from src/pkg/runtime/mem_windows.c
rename to src/runtime/mem_windows.c
diff --git a/src/pkg/runtime/memclr_386.s b/src/runtime/memclr_386.s
similarity index 100%
rename from src/pkg/runtime/memclr_386.s
rename to src/runtime/memclr_386.s
diff --git a/src/pkg/runtime/memclr_amd64.s b/src/runtime/memclr_amd64.s
similarity index 100%
rename from src/pkg/runtime/memclr_amd64.s
rename to src/runtime/memclr_amd64.s
diff --git a/src/pkg/runtime/memclr_arm.s b/src/runtime/memclr_arm.s
similarity index 100%
rename from src/pkg/runtime/memclr_arm.s
rename to src/runtime/memclr_arm.s
diff --git a/src/pkg/runtime/memclr_plan9_386.s b/src/runtime/memclr_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/memclr_plan9_386.s
rename to src/runtime/memclr_plan9_386.s
diff --git a/src/pkg/runtime/memclr_plan9_amd64.s b/src/runtime/memclr_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/memclr_plan9_amd64.s
rename to src/runtime/memclr_plan9_amd64.s
diff --git a/src/pkg/runtime/memmove_386.s b/src/runtime/memmove_386.s
similarity index 100%
rename from src/pkg/runtime/memmove_386.s
rename to src/runtime/memmove_386.s
diff --git a/src/pkg/runtime/memmove_amd64.s b/src/runtime/memmove_amd64.s
similarity index 100%
rename from src/pkg/runtime/memmove_amd64.s
rename to src/runtime/memmove_amd64.s
diff --git a/src/pkg/runtime/memmove_arm.s b/src/runtime/memmove_arm.s
similarity index 100%
rename from src/pkg/runtime/memmove_arm.s
rename to src/runtime/memmove_arm.s
diff --git a/src/pkg/runtime/memmove_linux_amd64_test.go b/src/runtime/memmove_linux_amd64_test.go
similarity index 100%
rename from src/pkg/runtime/memmove_linux_amd64_test.go
rename to src/runtime/memmove_linux_amd64_test.go
diff --git a/src/pkg/runtime/memmove_nacl_amd64p32.s b/src/runtime/memmove_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/memmove_nacl_amd64p32.s
rename to src/runtime/memmove_nacl_amd64p32.s
diff --git a/src/pkg/runtime/memmove_plan9_386.s b/src/runtime/memmove_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/memmove_plan9_386.s
rename to src/runtime/memmove_plan9_386.s
diff --git a/src/pkg/runtime/memmove_plan9_amd64.s b/src/runtime/memmove_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/memmove_plan9_amd64.s
rename to src/runtime/memmove_plan9_amd64.s
diff --git a/src/pkg/runtime/memmove_test.go b/src/runtime/memmove_test.go
similarity index 100%
rename from src/pkg/runtime/memmove_test.go
rename to src/runtime/memmove_test.go
diff --git a/src/pkg/runtime/mfinal_test.go b/src/runtime/mfinal_test.go
similarity index 100%
rename from src/pkg/runtime/mfinal_test.go
rename to src/runtime/mfinal_test.go
diff --git a/src/pkg/runtime/mfixalloc.c b/src/runtime/mfixalloc.c
similarity index 100%
rename from src/pkg/runtime/mfixalloc.c
rename to src/runtime/mfixalloc.c
diff --git a/src/pkg/runtime/mgc0.c b/src/runtime/mgc0.c
similarity index 100%
rename from src/pkg/runtime/mgc0.c
rename to src/runtime/mgc0.c
diff --git a/src/pkg/runtime/mgc0.go b/src/runtime/mgc0.go
similarity index 100%
rename from src/pkg/runtime/mgc0.go
rename to src/runtime/mgc0.go
diff --git a/src/pkg/runtime/mgc0.h b/src/runtime/mgc0.h
similarity index 100%
rename from src/pkg/runtime/mgc0.h
rename to src/runtime/mgc0.h
diff --git a/src/pkg/runtime/mheap.c b/src/runtime/mheap.c
similarity index 100%
rename from src/pkg/runtime/mheap.c
rename to src/runtime/mheap.c
diff --git a/src/pkg/runtime/mknacl.sh b/src/runtime/mknacl.sh
similarity index 100%
rename from src/pkg/runtime/mknacl.sh
rename to src/runtime/mknacl.sh
diff --git a/src/pkg/runtime/mprof.go b/src/runtime/mprof.go
similarity index 100%
rename from src/pkg/runtime/mprof.go
rename to src/runtime/mprof.go
diff --git a/src/pkg/runtime/msize.c b/src/runtime/msize.c
similarity index 100%
rename from src/pkg/runtime/msize.c
rename to src/runtime/msize.c
diff --git a/src/pkg/runtime/netpoll.go b/src/runtime/netpoll.go
similarity index 100%
rename from src/pkg/runtime/netpoll.go
rename to src/runtime/netpoll.go
diff --git a/src/pkg/runtime/netpoll_epoll.go b/src/runtime/netpoll_epoll.go
similarity index 100%
rename from src/pkg/runtime/netpoll_epoll.go
rename to src/runtime/netpoll_epoll.go
diff --git a/src/pkg/runtime/netpoll_kqueue.go b/src/runtime/netpoll_kqueue.go
similarity index 100%
rename from src/pkg/runtime/netpoll_kqueue.go
rename to src/runtime/netpoll_kqueue.go
diff --git a/src/pkg/runtime/netpoll_nacl.go b/src/runtime/netpoll_nacl.go
similarity index 100%
rename from src/pkg/runtime/netpoll_nacl.go
rename to src/runtime/netpoll_nacl.go
diff --git a/src/pkg/runtime/netpoll_solaris.c b/src/runtime/netpoll_solaris.c
similarity index 100%
rename from src/pkg/runtime/netpoll_solaris.c
rename to src/runtime/netpoll_solaris.c
diff --git a/src/pkg/runtime/netpoll_stub.c b/src/runtime/netpoll_stub.c
similarity index 100%
rename from src/pkg/runtime/netpoll_stub.c
rename to src/runtime/netpoll_stub.c
diff --git a/src/pkg/runtime/netpoll_windows.c b/src/runtime/netpoll_windows.c
similarity index 100%
rename from src/pkg/runtime/netpoll_windows.c
rename to src/runtime/netpoll_windows.c
diff --git a/src/pkg/runtime/noasm_arm.go b/src/runtime/noasm_arm.go
similarity index 100%
rename from src/pkg/runtime/noasm_arm.go
rename to src/runtime/noasm_arm.go
diff --git a/src/pkg/runtime/norace_test.go b/src/runtime/norace_test.go
similarity index 100%
rename from src/pkg/runtime/norace_test.go
rename to src/runtime/norace_test.go
diff --git a/src/pkg/runtime/os_android.c b/src/runtime/os_android.c
similarity index 100%
rename from src/pkg/runtime/os_android.c
rename to src/runtime/os_android.c
diff --git a/src/pkg/runtime/os_android.h b/src/runtime/os_android.h
similarity index 100%
rename from src/pkg/runtime/os_android.h
rename to src/runtime/os_android.h
diff --git a/src/pkg/runtime/os_darwin.c b/src/runtime/os_darwin.c
similarity index 100%
rename from src/pkg/runtime/os_darwin.c
rename to src/runtime/os_darwin.c
diff --git a/src/pkg/runtime/os_darwin.go b/src/runtime/os_darwin.go
similarity index 100%
rename from src/pkg/runtime/os_darwin.go
rename to src/runtime/os_darwin.go
diff --git a/src/pkg/runtime/os_darwin.h b/src/runtime/os_darwin.h
similarity index 100%
rename from src/pkg/runtime/os_darwin.h
rename to src/runtime/os_darwin.h
diff --git a/src/pkg/runtime/os_dragonfly.c b/src/runtime/os_dragonfly.c
similarity index 100%
rename from src/pkg/runtime/os_dragonfly.c
rename to src/runtime/os_dragonfly.c
diff --git a/src/pkg/runtime/os_dragonfly.go b/src/runtime/os_dragonfly.go
similarity index 100%
rename from src/pkg/runtime/os_dragonfly.go
rename to src/runtime/os_dragonfly.go
diff --git a/src/pkg/runtime/os_dragonfly.h b/src/runtime/os_dragonfly.h
similarity index 100%
rename from src/pkg/runtime/os_dragonfly.h
rename to src/runtime/os_dragonfly.h
diff --git a/src/pkg/runtime/os_freebsd.c b/src/runtime/os_freebsd.c
similarity index 100%
rename from src/pkg/runtime/os_freebsd.c
rename to src/runtime/os_freebsd.c
diff --git a/src/pkg/runtime/os_freebsd.go b/src/runtime/os_freebsd.go
similarity index 100%
rename from src/pkg/runtime/os_freebsd.go
rename to src/runtime/os_freebsd.go
diff --git a/src/pkg/runtime/os_freebsd.h b/src/runtime/os_freebsd.h
similarity index 100%
rename from src/pkg/runtime/os_freebsd.h
rename to src/runtime/os_freebsd.h
diff --git a/src/pkg/runtime/os_freebsd_arm.c b/src/runtime/os_freebsd_arm.c
similarity index 100%
rename from src/pkg/runtime/os_freebsd_arm.c
rename to src/runtime/os_freebsd_arm.c
diff --git a/src/pkg/runtime/os_linux.c b/src/runtime/os_linux.c
similarity index 100%
rename from src/pkg/runtime/os_linux.c
rename to src/runtime/os_linux.c
diff --git a/src/pkg/runtime/os_linux.go b/src/runtime/os_linux.go
similarity index 100%
rename from src/pkg/runtime/os_linux.go
rename to src/runtime/os_linux.go
diff --git a/src/pkg/runtime/os_linux.h b/src/runtime/os_linux.h
similarity index 100%
rename from src/pkg/runtime/os_linux.h
rename to src/runtime/os_linux.h
diff --git a/src/pkg/runtime/os_linux_386.c b/src/runtime/os_linux_386.c
similarity index 100%
rename from src/pkg/runtime/os_linux_386.c
rename to src/runtime/os_linux_386.c
diff --git a/src/pkg/runtime/os_linux_arm.c b/src/runtime/os_linux_arm.c
similarity index 100%
rename from src/pkg/runtime/os_linux_arm.c
rename to src/runtime/os_linux_arm.c
diff --git a/src/pkg/runtime/os_nacl.c b/src/runtime/os_nacl.c
similarity index 100%
rename from src/pkg/runtime/os_nacl.c
rename to src/runtime/os_nacl.c
diff --git a/src/pkg/runtime/os_nacl.go b/src/runtime/os_nacl.go
similarity index 100%
rename from src/pkg/runtime/os_nacl.go
rename to src/runtime/os_nacl.go
diff --git a/src/pkg/runtime/os_nacl.h b/src/runtime/os_nacl.h
similarity index 100%
rename from src/pkg/runtime/os_nacl.h
rename to src/runtime/os_nacl.h
diff --git a/src/pkg/runtime/os_nacl_arm.c b/src/runtime/os_nacl_arm.c
similarity index 100%
rename from src/pkg/runtime/os_nacl_arm.c
rename to src/runtime/os_nacl_arm.c
diff --git a/src/pkg/runtime/os_netbsd.c b/src/runtime/os_netbsd.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd.c
rename to src/runtime/os_netbsd.c
diff --git a/src/pkg/runtime/os_netbsd.go b/src/runtime/os_netbsd.go
similarity index 100%
rename from src/pkg/runtime/os_netbsd.go
rename to src/runtime/os_netbsd.go
diff --git a/src/pkg/runtime/os_netbsd.h b/src/runtime/os_netbsd.h
similarity index 100%
rename from src/pkg/runtime/os_netbsd.h
rename to src/runtime/os_netbsd.h
diff --git a/src/pkg/runtime/os_netbsd_386.c b/src/runtime/os_netbsd_386.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd_386.c
rename to src/runtime/os_netbsd_386.c
diff --git a/src/pkg/runtime/os_netbsd_amd64.c b/src/runtime/os_netbsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd_amd64.c
rename to src/runtime/os_netbsd_amd64.c
diff --git a/src/pkg/runtime/os_netbsd_arm.c b/src/runtime/os_netbsd_arm.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd_arm.c
rename to src/runtime/os_netbsd_arm.c
diff --git a/src/pkg/runtime/os_openbsd.c b/src/runtime/os_openbsd.c
similarity index 100%
rename from src/pkg/runtime/os_openbsd.c
rename to src/runtime/os_openbsd.c
diff --git a/src/pkg/runtime/os_openbsd.go b/src/runtime/os_openbsd.go
similarity index 100%
rename from src/pkg/runtime/os_openbsd.go
rename to src/runtime/os_openbsd.go
diff --git a/src/pkg/runtime/os_openbsd.h b/src/runtime/os_openbsd.h
similarity index 100%
rename from src/pkg/runtime/os_openbsd.h
rename to src/runtime/os_openbsd.h
diff --git a/src/pkg/runtime/os_plan9.c b/src/runtime/os_plan9.c
similarity index 100%
rename from src/pkg/runtime/os_plan9.c
rename to src/runtime/os_plan9.c
diff --git a/src/pkg/runtime/os_plan9.go b/src/runtime/os_plan9.go
similarity index 100%
rename from src/pkg/runtime/os_plan9.go
rename to src/runtime/os_plan9.go
diff --git a/src/pkg/runtime/os_plan9.h b/src/runtime/os_plan9.h
similarity index 100%
rename from src/pkg/runtime/os_plan9.h
rename to src/runtime/os_plan9.h
diff --git a/src/pkg/runtime/os_plan9_386.c b/src/runtime/os_plan9_386.c
similarity index 100%
rename from src/pkg/runtime/os_plan9_386.c
rename to src/runtime/os_plan9_386.c
diff --git a/src/pkg/runtime/os_plan9_amd64.c b/src/runtime/os_plan9_amd64.c
similarity index 100%
rename from src/pkg/runtime/os_plan9_amd64.c
rename to src/runtime/os_plan9_amd64.c
diff --git a/src/pkg/runtime/os_solaris.c b/src/runtime/os_solaris.c
similarity index 100%
rename from src/pkg/runtime/os_solaris.c
rename to src/runtime/os_solaris.c
diff --git a/src/pkg/runtime/os_solaris.go b/src/runtime/os_solaris.go
similarity index 100%
rename from src/pkg/runtime/os_solaris.go
rename to src/runtime/os_solaris.go
diff --git a/src/pkg/runtime/os_solaris.h b/src/runtime/os_solaris.h
similarity index 100%
rename from src/pkg/runtime/os_solaris.h
rename to src/runtime/os_solaris.h
diff --git a/src/pkg/runtime/os_windows.c b/src/runtime/os_windows.c
similarity index 100%
rename from src/pkg/runtime/os_windows.c
rename to src/runtime/os_windows.c
diff --git a/src/pkg/runtime/os_windows.go b/src/runtime/os_windows.go
similarity index 100%
rename from src/pkg/runtime/os_windows.go
rename to src/runtime/os_windows.go
diff --git a/src/pkg/runtime/os_windows.h b/src/runtime/os_windows.h
similarity index 100%
rename from src/pkg/runtime/os_windows.h
rename to src/runtime/os_windows.h
diff --git a/src/pkg/runtime/os_windows_386.c b/src/runtime/os_windows_386.c
similarity index 100%
rename from src/pkg/runtime/os_windows_386.c
rename to src/runtime/os_windows_386.c
diff --git a/src/pkg/runtime/os_windows_386.go b/src/runtime/os_windows_386.go
similarity index 100%
rename from src/pkg/runtime/os_windows_386.go
rename to src/runtime/os_windows_386.go
diff --git a/src/pkg/runtime/os_windows_amd64.c b/src/runtime/os_windows_amd64.c
similarity index 100%
rename from src/pkg/runtime/os_windows_amd64.c
rename to src/runtime/os_windows_amd64.c
diff --git a/src/pkg/runtime/os_windows_amd64.go b/src/runtime/os_windows_amd64.go
similarity index 100%
rename from src/pkg/runtime/os_windows_amd64.go
rename to src/runtime/os_windows_amd64.go
diff --git a/src/pkg/runtime/panic.c b/src/runtime/panic.c
similarity index 100%
rename from src/pkg/runtime/panic.c
rename to src/runtime/panic.c
diff --git a/src/pkg/runtime/panic.go b/src/runtime/panic.go
similarity index 100%
rename from src/pkg/runtime/panic.go
rename to src/runtime/panic.go
diff --git a/src/pkg/runtime/panic1.go b/src/runtime/panic1.go
similarity index 100%
rename from src/pkg/runtime/panic1.go
rename to src/runtime/panic1.go
diff --git a/src/pkg/runtime/parfor.c b/src/runtime/parfor.c
similarity index 100%
rename from src/pkg/runtime/parfor.c
rename to src/runtime/parfor.c
diff --git a/src/pkg/runtime/parfor_test.go b/src/runtime/parfor_test.go
similarity index 100%
rename from src/pkg/runtime/parfor_test.go
rename to src/runtime/parfor_test.go
diff --git a/src/pkg/runtime/pprof/pprof.go b/src/runtime/pprof/pprof.go
similarity index 100%
rename from src/pkg/runtime/pprof/pprof.go
rename to src/runtime/pprof/pprof.go
diff --git a/src/pkg/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
similarity index 100%
rename from src/pkg/runtime/pprof/pprof_test.go
rename to src/runtime/pprof/pprof_test.go
diff --git a/src/pkg/runtime/print1.go b/src/runtime/print1.go
similarity index 100%
rename from src/pkg/runtime/print1.go
rename to src/runtime/print1.go
diff --git a/src/pkg/runtime/proc.c b/src/runtime/proc.c
similarity index 100%
rename from src/pkg/runtime/proc.c
rename to src/runtime/proc.c
diff --git a/src/pkg/runtime/proc.go b/src/runtime/proc.go
similarity index 100%
rename from src/pkg/runtime/proc.go
rename to src/runtime/proc.go
diff --git a/src/pkg/runtime/proc_test.go b/src/runtime/proc_test.go
similarity index 100%
rename from src/pkg/runtime/proc_test.go
rename to src/runtime/proc_test.go
diff --git a/src/pkg/runtime/race.c b/src/runtime/race.c
similarity index 100%
rename from src/pkg/runtime/race.c
rename to src/runtime/race.c
diff --git a/src/pkg/runtime/race.go b/src/runtime/race.go
similarity index 100%
rename from src/pkg/runtime/race.go
rename to src/runtime/race.go
diff --git a/src/pkg/runtime/race.h b/src/runtime/race.h
similarity index 100%
rename from src/pkg/runtime/race.h
rename to src/runtime/race.h
diff --git a/src/pkg/runtime/race/README b/src/runtime/race/README
similarity index 100%
rename from src/pkg/runtime/race/README
rename to src/runtime/race/README
diff --git a/src/pkg/runtime/race/doc.go b/src/runtime/race/doc.go
similarity index 100%
rename from src/pkg/runtime/race/doc.go
rename to src/runtime/race/doc.go
diff --git a/src/pkg/runtime/race/output_test.go b/src/runtime/race/output_test.go
similarity index 100%
rename from src/pkg/runtime/race/output_test.go
rename to src/runtime/race/output_test.go
diff --git a/src/pkg/runtime/race/race.go b/src/runtime/race/race.go
similarity index 100%
rename from src/pkg/runtime/race/race.go
rename to src/runtime/race/race.go
diff --git a/src/pkg/runtime/race/race_darwin_amd64.syso b/src/runtime/race/race_darwin_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_darwin_amd64.syso
rename to src/runtime/race/race_darwin_amd64.syso
diff --git a/src/pkg/runtime/race/race_freebsd_amd64.syso b/src/runtime/race/race_freebsd_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_freebsd_amd64.syso
rename to src/runtime/race/race_freebsd_amd64.syso
diff --git a/src/pkg/runtime/race/race_linux_amd64.syso b/src/runtime/race/race_linux_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_linux_amd64.syso
rename to src/runtime/race/race_linux_amd64.syso
diff --git a/src/pkg/runtime/race/race_test.go b/src/runtime/race/race_test.go
similarity index 100%
rename from src/pkg/runtime/race/race_test.go
rename to src/runtime/race/race_test.go
diff --git a/src/pkg/runtime/race/race_windows_amd64.syso b/src/runtime/race/race_windows_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_windows_amd64.syso
rename to src/runtime/race/race_windows_amd64.syso
diff --git a/src/pkg/runtime/race/testdata/atomic_test.go b/src/runtime/race/testdata/atomic_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/atomic_test.go
rename to src/runtime/race/testdata/atomic_test.go
diff --git a/src/pkg/runtime/race/testdata/cgo_test.go b/src/runtime/race/testdata/cgo_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/cgo_test.go
rename to src/runtime/race/testdata/cgo_test.go
diff --git a/src/pkg/runtime/race/testdata/cgo_test_main.go b/src/runtime/race/testdata/cgo_test_main.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/cgo_test_main.go
rename to src/runtime/race/testdata/cgo_test_main.go
diff --git a/src/pkg/runtime/race/testdata/chan_test.go b/src/runtime/race/testdata/chan_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/chan_test.go
rename to src/runtime/race/testdata/chan_test.go
diff --git a/src/pkg/runtime/race/testdata/comp_test.go b/src/runtime/race/testdata/comp_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/comp_test.go
rename to src/runtime/race/testdata/comp_test.go
diff --git a/src/pkg/runtime/race/testdata/finalizer_test.go b/src/runtime/race/testdata/finalizer_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/finalizer_test.go
rename to src/runtime/race/testdata/finalizer_test.go
diff --git a/src/pkg/runtime/race/testdata/io_test.go b/src/runtime/race/testdata/io_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/io_test.go
rename to src/runtime/race/testdata/io_test.go
diff --git a/src/pkg/runtime/race/testdata/map_test.go b/src/runtime/race/testdata/map_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/map_test.go
rename to src/runtime/race/testdata/map_test.go
diff --git a/src/pkg/runtime/race/testdata/mop_test.go b/src/runtime/race/testdata/mop_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/mop_test.go
rename to src/runtime/race/testdata/mop_test.go
diff --git a/src/pkg/runtime/race/testdata/mutex_test.go b/src/runtime/race/testdata/mutex_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/mutex_test.go
rename to src/runtime/race/testdata/mutex_test.go
diff --git a/src/pkg/runtime/race/testdata/regression_test.go b/src/runtime/race/testdata/regression_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/regression_test.go
rename to src/runtime/race/testdata/regression_test.go
diff --git a/src/pkg/runtime/race/testdata/rwmutex_test.go b/src/runtime/race/testdata/rwmutex_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/rwmutex_test.go
rename to src/runtime/race/testdata/rwmutex_test.go
diff --git a/src/pkg/runtime/race/testdata/select_test.go b/src/runtime/race/testdata/select_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/select_test.go
rename to src/runtime/race/testdata/select_test.go
diff --git a/src/pkg/runtime/race/testdata/slice_test.go b/src/runtime/race/testdata/slice_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/slice_test.go
rename to src/runtime/race/testdata/slice_test.go
diff --git a/src/pkg/runtime/race/testdata/sync_test.go b/src/runtime/race/testdata/sync_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/sync_test.go
rename to src/runtime/race/testdata/sync_test.go
diff --git a/src/pkg/runtime/race/testdata/waitgroup_test.go b/src/runtime/race/testdata/waitgroup_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/waitgroup_test.go
rename to src/runtime/race/testdata/waitgroup_test.go
diff --git a/src/pkg/runtime/race0.go b/src/runtime/race0.go
similarity index 100%
rename from src/pkg/runtime/race0.go
rename to src/runtime/race0.go
diff --git a/src/pkg/runtime/race_amd64.s b/src/runtime/race_amd64.s
similarity index 100%
rename from src/pkg/runtime/race_amd64.s
rename to src/runtime/race_amd64.s
diff --git a/src/pkg/runtime/rdebug.go b/src/runtime/rdebug.go
similarity index 100%
rename from src/pkg/runtime/rdebug.go
rename to src/runtime/rdebug.go
diff --git a/src/pkg/runtime/rt0_android_arm.s b/src/runtime/rt0_android_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_android_arm.s
rename to src/runtime/rt0_android_arm.s
diff --git a/src/pkg/runtime/rt0_darwin_386.s b/src/runtime/rt0_darwin_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_darwin_386.s
rename to src/runtime/rt0_darwin_386.s
diff --git a/src/pkg/runtime/rt0_darwin_amd64.s b/src/runtime/rt0_darwin_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_darwin_amd64.s
rename to src/runtime/rt0_darwin_amd64.s
diff --git a/src/pkg/runtime/rt0_dragonfly_386.s b/src/runtime/rt0_dragonfly_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_dragonfly_386.s
rename to src/runtime/rt0_dragonfly_386.s
diff --git a/src/pkg/runtime/rt0_dragonfly_amd64.s b/src/runtime/rt0_dragonfly_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_dragonfly_amd64.s
rename to src/runtime/rt0_dragonfly_amd64.s
diff --git a/src/pkg/runtime/rt0_freebsd_386.s b/src/runtime/rt0_freebsd_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_freebsd_386.s
rename to src/runtime/rt0_freebsd_386.s
diff --git a/src/pkg/runtime/rt0_freebsd_amd64.s b/src/runtime/rt0_freebsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_freebsd_amd64.s
rename to src/runtime/rt0_freebsd_amd64.s
diff --git a/src/pkg/runtime/rt0_freebsd_arm.s b/src/runtime/rt0_freebsd_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_freebsd_arm.s
rename to src/runtime/rt0_freebsd_arm.s
diff --git a/src/pkg/runtime/rt0_linux_386.s b/src/runtime/rt0_linux_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_386.s
rename to src/runtime/rt0_linux_386.s
diff --git a/src/pkg/runtime/rt0_linux_amd64.s b/src/runtime/rt0_linux_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_amd64.s
rename to src/runtime/rt0_linux_amd64.s
diff --git a/src/pkg/runtime/rt0_linux_arm.s b/src/runtime/rt0_linux_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_arm.s
rename to src/runtime/rt0_linux_arm.s
diff --git a/src/pkg/runtime/rt0_nacl_386.s b/src/runtime/rt0_nacl_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_nacl_386.s
rename to src/runtime/rt0_nacl_386.s
diff --git a/src/pkg/runtime/rt0_nacl_amd64p32.s b/src/runtime/rt0_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/rt0_nacl_amd64p32.s
rename to src/runtime/rt0_nacl_amd64p32.s
diff --git a/src/pkg/runtime/rt0_nacl_arm.s b/src/runtime/rt0_nacl_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_nacl_arm.s
rename to src/runtime/rt0_nacl_arm.s
diff --git a/src/pkg/runtime/rt0_netbsd_386.s b/src/runtime/rt0_netbsd_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_netbsd_386.s
rename to src/runtime/rt0_netbsd_386.s
diff --git a/src/pkg/runtime/rt0_netbsd_amd64.s b/src/runtime/rt0_netbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_netbsd_amd64.s
rename to src/runtime/rt0_netbsd_amd64.s
diff --git a/src/pkg/runtime/rt0_netbsd_arm.s b/src/runtime/rt0_netbsd_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_netbsd_arm.s
rename to src/runtime/rt0_netbsd_arm.s
diff --git a/src/pkg/runtime/rt0_openbsd_386.s b/src/runtime/rt0_openbsd_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_openbsd_386.s
rename to src/runtime/rt0_openbsd_386.s
diff --git a/src/pkg/runtime/rt0_openbsd_amd64.s b/src/runtime/rt0_openbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_openbsd_amd64.s
rename to src/runtime/rt0_openbsd_amd64.s
diff --git a/src/pkg/runtime/rt0_plan9_386.s b/src/runtime/rt0_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_plan9_386.s
rename to src/runtime/rt0_plan9_386.s
diff --git a/src/pkg/runtime/rt0_plan9_amd64.s b/src/runtime/rt0_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_plan9_amd64.s
rename to src/runtime/rt0_plan9_amd64.s
diff --git a/src/pkg/runtime/rt0_solaris_amd64.s b/src/runtime/rt0_solaris_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_solaris_amd64.s
rename to src/runtime/rt0_solaris_amd64.s
diff --git a/src/pkg/runtime/rt0_windows_386.s b/src/runtime/rt0_windows_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_windows_386.s
rename to src/runtime/rt0_windows_386.s
diff --git a/src/pkg/runtime/rt0_windows_amd64.s b/src/runtime/rt0_windows_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_windows_amd64.s
rename to src/runtime/rt0_windows_amd64.s
diff --git a/src/pkg/runtime/rune.go b/src/runtime/rune.go
similarity index 100%
rename from src/pkg/runtime/rune.go
rename to src/runtime/rune.go
diff --git a/src/pkg/runtime/runtime-gdb.py b/src/runtime/runtime-gdb.py
similarity index 100%
rename from src/pkg/runtime/runtime-gdb.py
rename to src/runtime/runtime-gdb.py
diff --git a/src/pkg/runtime/runtime.c b/src/runtime/runtime.c
similarity index 100%
rename from src/pkg/runtime/runtime.c
rename to src/runtime/runtime.c
diff --git a/src/pkg/runtime/runtime.go b/src/runtime/runtime.go
similarity index 100%
rename from src/pkg/runtime/runtime.go
rename to src/runtime/runtime.go
diff --git a/src/pkg/runtime/runtime.h b/src/runtime/runtime.h
similarity index 100%
rename from src/pkg/runtime/runtime.h
rename to src/runtime/runtime.h
diff --git a/src/pkg/runtime/runtime_linux_test.go b/src/runtime/runtime_linux_test.go
similarity index 100%
rename from src/pkg/runtime/runtime_linux_test.go
rename to src/runtime/runtime_linux_test.go
diff --git a/src/pkg/runtime/runtime_test.go b/src/runtime/runtime_test.go
similarity index 100%
rename from src/pkg/runtime/runtime_test.go
rename to src/runtime/runtime_test.go
diff --git a/src/pkg/runtime/runtime_unix_test.go b/src/runtime/runtime_unix_test.go
similarity index 100%
rename from src/pkg/runtime/runtime_unix_test.go
rename to src/runtime/runtime_unix_test.go
diff --git a/src/pkg/runtime/select.go b/src/runtime/select.go
similarity index 100%
rename from src/pkg/runtime/select.go
rename to src/runtime/select.go
diff --git a/src/pkg/runtime/sema.go b/src/runtime/sema.go
similarity index 100%
rename from src/pkg/runtime/sema.go
rename to src/runtime/sema.go
diff --git a/src/pkg/runtime/signal.c b/src/runtime/signal.c
similarity index 100%
rename from src/pkg/runtime/signal.c
rename to src/runtime/signal.c
diff --git a/src/pkg/runtime/signal_386.c b/src/runtime/signal_386.c
similarity index 100%
rename from src/pkg/runtime/signal_386.c
rename to src/runtime/signal_386.c
diff --git a/src/pkg/runtime/signal_amd64x.c b/src/runtime/signal_amd64x.c
similarity index 100%
rename from src/pkg/runtime/signal_amd64x.c
rename to src/runtime/signal_amd64x.c
diff --git a/src/pkg/runtime/signal_android_386.h b/src/runtime/signal_android_386.h
similarity index 100%
rename from src/pkg/runtime/signal_android_386.h
rename to src/runtime/signal_android_386.h
diff --git a/src/pkg/runtime/signal_android_arm.h b/src/runtime/signal_android_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_android_arm.h
rename to src/runtime/signal_android_arm.h
diff --git a/src/pkg/runtime/signal_arm.c b/src/runtime/signal_arm.c
similarity index 100%
rename from src/pkg/runtime/signal_arm.c
rename to src/runtime/signal_arm.c
diff --git a/src/pkg/runtime/signal_darwin_386.h b/src/runtime/signal_darwin_386.h
similarity index 100%
rename from src/pkg/runtime/signal_darwin_386.h
rename to src/runtime/signal_darwin_386.h
diff --git a/src/pkg/runtime/signal_darwin_amd64.h b/src/runtime/signal_darwin_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_darwin_amd64.h
rename to src/runtime/signal_darwin_amd64.h
diff --git a/src/pkg/runtime/signal_dragonfly_386.h b/src/runtime/signal_dragonfly_386.h
similarity index 100%
rename from src/pkg/runtime/signal_dragonfly_386.h
rename to src/runtime/signal_dragonfly_386.h
diff --git a/src/pkg/runtime/signal_dragonfly_amd64.h b/src/runtime/signal_dragonfly_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_dragonfly_amd64.h
rename to src/runtime/signal_dragonfly_amd64.h
diff --git a/src/pkg/runtime/signal_freebsd_386.h b/src/runtime/signal_freebsd_386.h
similarity index 100%
rename from src/pkg/runtime/signal_freebsd_386.h
rename to src/runtime/signal_freebsd_386.h
diff --git a/src/pkg/runtime/signal_freebsd_amd64.h b/src/runtime/signal_freebsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_freebsd_amd64.h
rename to src/runtime/signal_freebsd_amd64.h
diff --git a/src/pkg/runtime/signal_freebsd_arm.h b/src/runtime/signal_freebsd_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_freebsd_arm.h
rename to src/runtime/signal_freebsd_arm.h
diff --git a/src/pkg/runtime/signal_linux_386.h b/src/runtime/signal_linux_386.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_386.h
rename to src/runtime/signal_linux_386.h
diff --git a/src/pkg/runtime/signal_linux_amd64.h b/src/runtime/signal_linux_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_amd64.h
rename to src/runtime/signal_linux_amd64.h
diff --git a/src/pkg/runtime/signal_linux_arm.h b/src/runtime/signal_linux_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_arm.h
rename to src/runtime/signal_linux_arm.h
diff --git a/src/pkg/runtime/signal_nacl_386.h b/src/runtime/signal_nacl_386.h
similarity index 100%
rename from src/pkg/runtime/signal_nacl_386.h
rename to src/runtime/signal_nacl_386.h
diff --git a/src/pkg/runtime/signal_nacl_amd64p32.h b/src/runtime/signal_nacl_amd64p32.h
similarity index 100%
rename from src/pkg/runtime/signal_nacl_amd64p32.h
rename to src/runtime/signal_nacl_amd64p32.h
diff --git a/src/pkg/runtime/signal_nacl_arm.h b/src/runtime/signal_nacl_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_nacl_arm.h
rename to src/runtime/signal_nacl_arm.h
diff --git a/src/pkg/runtime/signal_netbsd_386.h b/src/runtime/signal_netbsd_386.h
similarity index 100%
rename from src/pkg/runtime/signal_netbsd_386.h
rename to src/runtime/signal_netbsd_386.h
diff --git a/src/pkg/runtime/signal_netbsd_amd64.h b/src/runtime/signal_netbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_netbsd_amd64.h
rename to src/runtime/signal_netbsd_amd64.h
diff --git a/src/pkg/runtime/signal_netbsd_arm.h b/src/runtime/signal_netbsd_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_netbsd_arm.h
rename to src/runtime/signal_netbsd_arm.h
diff --git a/src/pkg/runtime/signal_openbsd_386.h b/src/runtime/signal_openbsd_386.h
similarity index 100%
rename from src/pkg/runtime/signal_openbsd_386.h
rename to src/runtime/signal_openbsd_386.h
diff --git a/src/pkg/runtime/signal_openbsd_amd64.h b/src/runtime/signal_openbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_openbsd_amd64.h
rename to src/runtime/signal_openbsd_amd64.h
diff --git a/src/pkg/runtime/signal_solaris_amd64.h b/src/runtime/signal_solaris_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_solaris_amd64.h
rename to src/runtime/signal_solaris_amd64.h
diff --git a/src/pkg/runtime/signal_unix.c b/src/runtime/signal_unix.c
similarity index 100%
rename from src/pkg/runtime/signal_unix.c
rename to src/runtime/signal_unix.c
diff --git a/src/pkg/runtime/signal_unix.go b/src/runtime/signal_unix.go
similarity index 100%
rename from src/pkg/runtime/signal_unix.go
rename to src/runtime/signal_unix.go
diff --git a/src/pkg/runtime/signal_unix.h b/src/runtime/signal_unix.h
similarity index 100%
rename from src/pkg/runtime/signal_unix.h
rename to src/runtime/signal_unix.h
diff --git a/src/pkg/runtime/signals_android.h b/src/runtime/signals_android.h
similarity index 100%
rename from src/pkg/runtime/signals_android.h
rename to src/runtime/signals_android.h
diff --git a/src/pkg/runtime/signals_darwin.h b/src/runtime/signals_darwin.h
similarity index 100%
rename from src/pkg/runtime/signals_darwin.h
rename to src/runtime/signals_darwin.h
diff --git a/src/pkg/runtime/signals_dragonfly.h b/src/runtime/signals_dragonfly.h
similarity index 100%
rename from src/pkg/runtime/signals_dragonfly.h
rename to src/runtime/signals_dragonfly.h
diff --git a/src/pkg/runtime/signals_freebsd.h b/src/runtime/signals_freebsd.h
similarity index 100%
rename from src/pkg/runtime/signals_freebsd.h
rename to src/runtime/signals_freebsd.h
diff --git a/src/pkg/runtime/signals_linux.h b/src/runtime/signals_linux.h
similarity index 100%
rename from src/pkg/runtime/signals_linux.h
rename to src/runtime/signals_linux.h
diff --git a/src/pkg/runtime/signals_nacl.h b/src/runtime/signals_nacl.h
similarity index 100%
rename from src/pkg/runtime/signals_nacl.h
rename to src/runtime/signals_nacl.h
diff --git a/src/pkg/runtime/signals_netbsd.h b/src/runtime/signals_netbsd.h
similarity index 100%
rename from src/pkg/runtime/signals_netbsd.h
rename to src/runtime/signals_netbsd.h
diff --git a/src/pkg/runtime/signals_openbsd.h b/src/runtime/signals_openbsd.h
similarity index 100%
rename from src/pkg/runtime/signals_openbsd.h
rename to src/runtime/signals_openbsd.h
diff --git a/src/pkg/runtime/signals_plan9.h b/src/runtime/signals_plan9.h
similarity index 100%
rename from src/pkg/runtime/signals_plan9.h
rename to src/runtime/signals_plan9.h
diff --git a/src/pkg/runtime/signals_solaris.h b/src/runtime/signals_solaris.h
similarity index 100%
rename from src/pkg/runtime/signals_solaris.h
rename to src/runtime/signals_solaris.h
diff --git a/src/pkg/runtime/signals_windows.h b/src/runtime/signals_windows.h
similarity index 100%
rename from src/pkg/runtime/signals_windows.h
rename to src/runtime/signals_windows.h
diff --git a/src/pkg/runtime/sigqueue.go b/src/runtime/sigqueue.go
similarity index 100%
rename from src/pkg/runtime/sigqueue.go
rename to src/runtime/sigqueue.go
diff --git a/src/pkg/runtime/slice.go b/src/runtime/slice.go
similarity index 100%
rename from src/pkg/runtime/slice.go
rename to src/runtime/slice.go
diff --git a/src/pkg/runtime/softfloat64.go b/src/runtime/softfloat64.go
similarity index 100%
rename from src/pkg/runtime/softfloat64.go
rename to src/runtime/softfloat64.go
diff --git a/src/pkg/runtime/softfloat64_test.go b/src/runtime/softfloat64_test.go
similarity index 100%
rename from src/pkg/runtime/softfloat64_test.go
rename to src/runtime/softfloat64_test.go
diff --git a/src/pkg/runtime/softfloat_arm.c b/src/runtime/softfloat_arm.c
similarity index 100%
rename from src/pkg/runtime/softfloat_arm.c
rename to src/runtime/softfloat_arm.c
diff --git a/src/pkg/runtime/sqrt.go b/src/runtime/sqrt.go
similarity index 100%
rename from src/pkg/runtime/sqrt.go
rename to src/runtime/sqrt.go
diff --git a/src/pkg/runtime/stack.c b/src/runtime/stack.c
similarity index 100%
rename from src/pkg/runtime/stack.c
rename to src/runtime/stack.c
diff --git a/src/pkg/runtime/stack.go b/src/runtime/stack.go
similarity index 100%
rename from src/pkg/runtime/stack.go
rename to src/runtime/stack.go
diff --git a/src/pkg/runtime/stack.h b/src/runtime/stack.h
similarity index 100%
rename from src/pkg/runtime/stack.h
rename to src/runtime/stack.h
diff --git a/src/pkg/runtime/stack_gen_test.go b/src/runtime/stack_gen_test.go
similarity index 100%
rename from src/pkg/runtime/stack_gen_test.go
rename to src/runtime/stack_gen_test.go
diff --git a/src/pkg/runtime/stack_test.go b/src/runtime/stack_test.go
similarity index 100%
rename from src/pkg/runtime/stack_test.go
rename to src/runtime/stack_test.go
diff --git a/src/pkg/runtime/string.c b/src/runtime/string.c
similarity index 100%
rename from src/pkg/runtime/string.c
rename to src/runtime/string.c
diff --git a/src/pkg/runtime/string.go b/src/runtime/string.go
similarity index 100%
rename from src/pkg/runtime/string.go
rename to src/runtime/string.go
diff --git a/src/pkg/runtime/string_test.go b/src/runtime/string_test.go
similarity index 100%
rename from src/pkg/runtime/string_test.go
rename to src/runtime/string_test.go
diff --git a/src/pkg/runtime/stubs.go b/src/runtime/stubs.go
similarity index 100%
rename from src/pkg/runtime/stubs.go
rename to src/runtime/stubs.go
diff --git a/src/pkg/runtime/symtab.go b/src/runtime/symtab.go
similarity index 100%
rename from src/pkg/runtime/symtab.go
rename to src/runtime/symtab.go
diff --git a/src/pkg/runtime/symtab_test.go b/src/runtime/symtab_test.go
similarity index 100%
rename from src/pkg/runtime/symtab_test.go
rename to src/runtime/symtab_test.go
diff --git a/src/pkg/runtime/sys_arm.c b/src/runtime/sys_arm.c
similarity index 100%
rename from src/pkg/runtime/sys_arm.c
rename to src/runtime/sys_arm.c
diff --git a/src/pkg/runtime/sys_darwin_386.s b/src/runtime/sys_darwin_386.s
similarity index 100%
rename from src/pkg/runtime/sys_darwin_386.s
rename to src/runtime/sys_darwin_386.s
diff --git a/src/pkg/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_darwin_amd64.s
rename to src/runtime/sys_darwin_amd64.s
diff --git a/src/pkg/runtime/sys_dragonfly_386.s b/src/runtime/sys_dragonfly_386.s
similarity index 100%
rename from src/pkg/runtime/sys_dragonfly_386.s
rename to src/runtime/sys_dragonfly_386.s
diff --git a/src/pkg/runtime/sys_dragonfly_amd64.s b/src/runtime/sys_dragonfly_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_dragonfly_amd64.s
rename to src/runtime/sys_dragonfly_amd64.s
diff --git a/src/pkg/runtime/sys_freebsd_386.s b/src/runtime/sys_freebsd_386.s
similarity index 100%
rename from src/pkg/runtime/sys_freebsd_386.s
rename to src/runtime/sys_freebsd_386.s
diff --git a/src/pkg/runtime/sys_freebsd_amd64.s b/src/runtime/sys_freebsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_freebsd_amd64.s
rename to src/runtime/sys_freebsd_amd64.s
diff --git a/src/pkg/runtime/sys_freebsd_arm.s b/src/runtime/sys_freebsd_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_freebsd_arm.s
rename to src/runtime/sys_freebsd_arm.s
diff --git a/src/pkg/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
similarity index 100%
rename from src/pkg/runtime/sys_linux_386.s
rename to src/runtime/sys_linux_386.s
diff --git a/src/pkg/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_linux_amd64.s
rename to src/runtime/sys_linux_amd64.s
diff --git a/src/pkg/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_linux_arm.s
rename to src/runtime/sys_linux_arm.s
diff --git a/src/pkg/runtime/sys_nacl_386.s b/src/runtime/sys_nacl_386.s
similarity index 100%
rename from src/pkg/runtime/sys_nacl_386.s
rename to src/runtime/sys_nacl_386.s
diff --git a/src/pkg/runtime/sys_nacl_amd64p32.s b/src/runtime/sys_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/sys_nacl_amd64p32.s
rename to src/runtime/sys_nacl_amd64p32.s
diff --git a/src/pkg/runtime/sys_nacl_arm.s b/src/runtime/sys_nacl_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_nacl_arm.s
rename to src/runtime/sys_nacl_arm.s
diff --git a/src/pkg/runtime/sys_netbsd_386.s b/src/runtime/sys_netbsd_386.s
similarity index 100%
rename from src/pkg/runtime/sys_netbsd_386.s
rename to src/runtime/sys_netbsd_386.s
diff --git a/src/pkg/runtime/sys_netbsd_amd64.s b/src/runtime/sys_netbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_netbsd_amd64.s
rename to src/runtime/sys_netbsd_amd64.s
diff --git a/src/pkg/runtime/sys_netbsd_arm.s b/src/runtime/sys_netbsd_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_netbsd_arm.s
rename to src/runtime/sys_netbsd_arm.s
diff --git a/src/pkg/runtime/sys_openbsd_386.s b/src/runtime/sys_openbsd_386.s
similarity index 100%
rename from src/pkg/runtime/sys_openbsd_386.s
rename to src/runtime/sys_openbsd_386.s
diff --git a/src/pkg/runtime/sys_openbsd_amd64.s b/src/runtime/sys_openbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_openbsd_amd64.s
rename to src/runtime/sys_openbsd_amd64.s
diff --git a/src/pkg/runtime/sys_plan9_386.s b/src/runtime/sys_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/sys_plan9_386.s
rename to src/runtime/sys_plan9_386.s
diff --git a/src/pkg/runtime/sys_plan9_amd64.s b/src/runtime/sys_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_plan9_amd64.s
rename to src/runtime/sys_plan9_amd64.s
diff --git a/src/pkg/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_solaris_amd64.s
rename to src/runtime/sys_solaris_amd64.s
diff --git a/src/pkg/runtime/sys_windows_386.s b/src/runtime/sys_windows_386.s
similarity index 100%
rename from src/pkg/runtime/sys_windows_386.s
rename to src/runtime/sys_windows_386.s
diff --git a/src/pkg/runtime/sys_windows_amd64.s b/src/runtime/sys_windows_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_windows_amd64.s
rename to src/runtime/sys_windows_amd64.s
diff --git a/src/pkg/runtime/sys_x86.c b/src/runtime/sys_x86.c
similarity index 100%
rename from src/pkg/runtime/sys_x86.c
rename to src/runtime/sys_x86.c
diff --git a/src/pkg/runtime/syscall_nacl.h b/src/runtime/syscall_nacl.h
similarity index 100%
rename from src/pkg/runtime/syscall_nacl.h
rename to src/runtime/syscall_nacl.h
diff --git a/src/pkg/runtime/syscall_solaris.c b/src/runtime/syscall_solaris.c
similarity index 100%
rename from src/pkg/runtime/syscall_solaris.c
rename to src/runtime/syscall_solaris.c
diff --git a/src/pkg/runtime/syscall_solaris.go b/src/runtime/syscall_solaris.go
similarity index 100%
rename from src/pkg/runtime/syscall_solaris.go
rename to src/runtime/syscall_solaris.go
diff --git a/src/pkg/runtime/syscall_windows.c b/src/runtime/syscall_windows.c
similarity index 100%
rename from src/pkg/runtime/syscall_windows.c
rename to src/runtime/syscall_windows.c
diff --git a/src/pkg/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
similarity index 100%
rename from src/pkg/runtime/syscall_windows.go
rename to src/runtime/syscall_windows.go
diff --git a/src/pkg/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go
similarity index 100%
rename from src/pkg/runtime/syscall_windows_test.go
rename to src/runtime/syscall_windows_test.go
diff --git a/src/pkg/runtime/thunk.s b/src/runtime/thunk.s
similarity index 100%
rename from src/pkg/runtime/thunk.s
rename to src/runtime/thunk.s
diff --git a/src/pkg/runtime/thunk_solaris_amd64.s b/src/runtime/thunk_solaris_amd64.s
similarity index 100%
rename from src/pkg/runtime/thunk_solaris_amd64.s
rename to src/runtime/thunk_solaris_amd64.s
diff --git a/src/pkg/runtime/time.go b/src/runtime/time.go
similarity index 100%
rename from src/pkg/runtime/time.go
rename to src/runtime/time.go
diff --git a/src/pkg/runtime/tls_arm.s b/src/runtime/tls_arm.s
similarity index 100%
rename from src/pkg/runtime/tls_arm.s
rename to src/runtime/tls_arm.s
diff --git a/src/pkg/runtime/traceback.go b/src/runtime/traceback.go
similarity index 100%
rename from src/pkg/runtime/traceback.go
rename to src/runtime/traceback.go
diff --git a/src/pkg/runtime/traceback_windows.go b/src/runtime/traceback_windows.go
similarity index 100%
rename from src/pkg/runtime/traceback_windows.go
rename to src/runtime/traceback_windows.go
diff --git a/src/pkg/runtime/type.h b/src/runtime/type.h
similarity index 100%
rename from src/pkg/runtime/type.h
rename to src/runtime/type.h
diff --git a/src/pkg/runtime/typekind.go b/src/runtime/typekind.go
similarity index 100%
rename from src/pkg/runtime/typekind.go
rename to src/runtime/typekind.go
diff --git a/src/pkg/runtime/typekind.h b/src/runtime/typekind.h
similarity index 100%
rename from src/pkg/runtime/typekind.h
rename to src/runtime/typekind.h
diff --git a/src/pkg/runtime/vdso_linux_amd64.c b/src/runtime/vdso_linux_amd64.c
similarity index 100%
rename from src/pkg/runtime/vdso_linux_amd64.c
rename to src/runtime/vdso_linux_amd64.c
diff --git a/src/pkg/runtime/vlop_386.s b/src/runtime/vlop_386.s
similarity index 100%
rename from src/pkg/runtime/vlop_386.s
rename to src/runtime/vlop_386.s
diff --git a/src/pkg/runtime/vlop_arm.s b/src/runtime/vlop_arm.s
similarity index 100%
rename from src/pkg/runtime/vlop_arm.s
rename to src/runtime/vlop_arm.s
diff --git a/src/pkg/runtime/vlop_arm_test.go b/src/runtime/vlop_arm_test.go
similarity index 100%
rename from src/pkg/runtime/vlop_arm_test.go
rename to src/runtime/vlop_arm_test.go
diff --git a/src/pkg/runtime/vlrt.c b/src/runtime/vlrt.c
similarity index 100%
rename from src/pkg/runtime/vlrt.c
rename to src/runtime/vlrt.c
diff --git a/src/pkg/runtime/vlrt.go b/src/runtime/vlrt.go
similarity index 100%
rename from src/pkg/runtime/vlrt.go
rename to src/runtime/vlrt.go
diff --git a/src/pkg/sort/example_interface_test.go b/src/sort/example_interface_test.go
similarity index 100%
rename from src/pkg/sort/example_interface_test.go
rename to src/sort/example_interface_test.go
diff --git a/src/pkg/sort/example_keys_test.go b/src/sort/example_keys_test.go
similarity index 100%
rename from src/pkg/sort/example_keys_test.go
rename to src/sort/example_keys_test.go
diff --git a/src/pkg/sort/example_multi_test.go b/src/sort/example_multi_test.go
similarity index 100%
rename from src/pkg/sort/example_multi_test.go
rename to src/sort/example_multi_test.go
diff --git a/src/pkg/sort/example_test.go b/src/sort/example_test.go
similarity index 100%
rename from src/pkg/sort/example_test.go
rename to src/sort/example_test.go
diff --git a/src/pkg/sort/example_wrapper_test.go b/src/sort/example_wrapper_test.go
similarity index 100%
rename from src/pkg/sort/example_wrapper_test.go
rename to src/sort/example_wrapper_test.go
diff --git a/src/pkg/sort/export_test.go b/src/sort/export_test.go
similarity index 100%
rename from src/pkg/sort/export_test.go
rename to src/sort/export_test.go
diff --git a/src/pkg/sort/search.go b/src/sort/search.go
similarity index 100%
rename from src/pkg/sort/search.go
rename to src/sort/search.go
diff --git a/src/pkg/sort/search_test.go b/src/sort/search_test.go
similarity index 100%
rename from src/pkg/sort/search_test.go
rename to src/sort/search_test.go
diff --git a/src/pkg/sort/sort.go b/src/sort/sort.go
similarity index 100%
rename from src/pkg/sort/sort.go
rename to src/sort/sort.go
diff --git a/src/pkg/sort/sort_test.go b/src/sort/sort_test.go
similarity index 100%
rename from src/pkg/sort/sort_test.go
rename to src/sort/sort_test.go
diff --git a/src/pkg/strconv/atob.go b/src/strconv/atob.go
similarity index 100%
rename from src/pkg/strconv/atob.go
rename to src/strconv/atob.go
diff --git a/src/pkg/strconv/atob_test.go b/src/strconv/atob_test.go
similarity index 100%
rename from src/pkg/strconv/atob_test.go
rename to src/strconv/atob_test.go
diff --git a/src/pkg/strconv/atof.go b/src/strconv/atof.go
similarity index 100%
rename from src/pkg/strconv/atof.go
rename to src/strconv/atof.go
diff --git a/src/pkg/strconv/atof_test.go b/src/strconv/atof_test.go
similarity index 100%
rename from src/pkg/strconv/atof_test.go
rename to src/strconv/atof_test.go
diff --git a/src/pkg/strconv/atoi.go b/src/strconv/atoi.go
similarity index 100%
rename from src/pkg/strconv/atoi.go
rename to src/strconv/atoi.go
diff --git a/src/pkg/strconv/atoi_test.go b/src/strconv/atoi_test.go
similarity index 100%
rename from src/pkg/strconv/atoi_test.go
rename to src/strconv/atoi_test.go
diff --git a/src/pkg/strconv/decimal.go b/src/strconv/decimal.go
similarity index 100%
rename from src/pkg/strconv/decimal.go
rename to src/strconv/decimal.go
diff --git a/src/pkg/strconv/decimal_test.go b/src/strconv/decimal_test.go
similarity index 100%
rename from src/pkg/strconv/decimal_test.go
rename to src/strconv/decimal_test.go
diff --git a/src/pkg/strconv/extfloat.go b/src/strconv/extfloat.go
similarity index 100%
rename from src/pkg/strconv/extfloat.go
rename to src/strconv/extfloat.go
diff --git a/src/pkg/strconv/fp_test.go b/src/strconv/fp_test.go
similarity index 100%
rename from src/pkg/strconv/fp_test.go
rename to src/strconv/fp_test.go
diff --git a/src/pkg/strconv/ftoa.go b/src/strconv/ftoa.go
similarity index 100%
rename from src/pkg/strconv/ftoa.go
rename to src/strconv/ftoa.go
diff --git a/src/pkg/strconv/ftoa_test.go b/src/strconv/ftoa_test.go
similarity index 100%
rename from src/pkg/strconv/ftoa_test.go
rename to src/strconv/ftoa_test.go
diff --git a/src/pkg/strconv/internal_test.go b/src/strconv/internal_test.go
similarity index 100%
rename from src/pkg/strconv/internal_test.go
rename to src/strconv/internal_test.go
diff --git a/src/pkg/strconv/isprint.go b/src/strconv/isprint.go
similarity index 100%
rename from src/pkg/strconv/isprint.go
rename to src/strconv/isprint.go
diff --git a/src/pkg/strconv/itoa.go b/src/strconv/itoa.go
similarity index 100%
rename from src/pkg/strconv/itoa.go
rename to src/strconv/itoa.go
diff --git a/src/pkg/strconv/itoa_test.go b/src/strconv/itoa_test.go
similarity index 100%
rename from src/pkg/strconv/itoa_test.go
rename to src/strconv/itoa_test.go
diff --git a/src/pkg/strconv/makeisprint.go b/src/strconv/makeisprint.go
similarity index 100%
rename from src/pkg/strconv/makeisprint.go
rename to src/strconv/makeisprint.go
diff --git a/src/pkg/strconv/quote.go b/src/strconv/quote.go
similarity index 100%
rename from src/pkg/strconv/quote.go
rename to src/strconv/quote.go
diff --git a/src/pkg/strconv/quote_example_test.go b/src/strconv/quote_example_test.go
similarity index 100%
rename from src/pkg/strconv/quote_example_test.go
rename to src/strconv/quote_example_test.go
diff --git a/src/pkg/strconv/quote_test.go b/src/strconv/quote_test.go
similarity index 100%
rename from src/pkg/strconv/quote_test.go
rename to src/strconv/quote_test.go
diff --git a/src/pkg/strconv/strconv_test.go b/src/strconv/strconv_test.go
similarity index 100%
rename from src/pkg/strconv/strconv_test.go
rename to src/strconv/strconv_test.go
diff --git a/src/pkg/strconv/testdata/testfp.txt b/src/strconv/testdata/testfp.txt
similarity index 100%
rename from src/pkg/strconv/testdata/testfp.txt
rename to src/strconv/testdata/testfp.txt
diff --git a/src/pkg/strings/example_test.go b/src/strings/example_test.go
similarity index 100%
rename from src/pkg/strings/example_test.go
rename to src/strings/example_test.go
diff --git a/src/pkg/strings/export_test.go b/src/strings/export_test.go
similarity index 100%
rename from src/pkg/strings/export_test.go
rename to src/strings/export_test.go
diff --git a/src/pkg/strings/reader.go b/src/strings/reader.go
similarity index 100%
rename from src/pkg/strings/reader.go
rename to src/strings/reader.go
diff --git a/src/pkg/strings/reader_test.go b/src/strings/reader_test.go
similarity index 100%
rename from src/pkg/strings/reader_test.go
rename to src/strings/reader_test.go
diff --git a/src/pkg/strings/replace.go b/src/strings/replace.go
similarity index 100%
rename from src/pkg/strings/replace.go
rename to src/strings/replace.go
diff --git a/src/pkg/strings/replace_test.go b/src/strings/replace_test.go
similarity index 100%
rename from src/pkg/strings/replace_test.go
rename to src/strings/replace_test.go
diff --git a/src/pkg/strings/search.go b/src/strings/search.go
similarity index 100%
rename from src/pkg/strings/search.go
rename to src/strings/search.go
diff --git a/src/pkg/strings/search_test.go b/src/strings/search_test.go
similarity index 100%
rename from src/pkg/strings/search_test.go
rename to src/strings/search_test.go
diff --git a/src/pkg/strings/strings.go b/src/strings/strings.go
similarity index 100%
rename from src/pkg/strings/strings.go
rename to src/strings/strings.go
diff --git a/src/pkg/strings/strings.s b/src/strings/strings.s
similarity index 100%
rename from src/pkg/strings/strings.s
rename to src/strings/strings.s
diff --git a/src/pkg/strings/strings_decl.go b/src/strings/strings_decl.go
similarity index 100%
rename from src/pkg/strings/strings_decl.go
rename to src/strings/strings_decl.go
diff --git a/src/pkg/strings/strings_test.go b/src/strings/strings_test.go
similarity index 100%
rename from src/pkg/strings/strings_test.go
rename to src/strings/strings_test.go
diff --git a/src/pkg/sync/atomic/64bit_arm.go b/src/sync/atomic/64bit_arm.go
similarity index 100%
rename from src/pkg/sync/atomic/64bit_arm.go
rename to src/sync/atomic/64bit_arm.go
diff --git a/src/pkg/sync/atomic/asm_386.s b/src/sync/atomic/asm_386.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_386.s
rename to src/sync/atomic/asm_386.s
diff --git a/src/pkg/sync/atomic/asm_amd64.s b/src/sync/atomic/asm_amd64.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_amd64.s
rename to src/sync/atomic/asm_amd64.s
diff --git a/src/pkg/sync/atomic/asm_amd64p32.s b/src/sync/atomic/asm_amd64p32.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_amd64p32.s
rename to src/sync/atomic/asm_amd64p32.s
diff --git a/src/pkg/sync/atomic/asm_arm.s b/src/sync/atomic/asm_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_arm.s
rename to src/sync/atomic/asm_arm.s
diff --git a/src/pkg/sync/atomic/asm_freebsd_arm.s b/src/sync/atomic/asm_freebsd_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_freebsd_arm.s
rename to src/sync/atomic/asm_freebsd_arm.s
diff --git a/src/pkg/sync/atomic/asm_linux_arm.s b/src/sync/atomic/asm_linux_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_linux_arm.s
rename to src/sync/atomic/asm_linux_arm.s
diff --git a/src/pkg/sync/atomic/asm_nacl_arm.s b/src/sync/atomic/asm_nacl_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_nacl_arm.s
rename to src/sync/atomic/asm_nacl_arm.s
diff --git a/src/pkg/sync/atomic/asm_netbsd_arm.s b/src/sync/atomic/asm_netbsd_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_netbsd_arm.s
rename to src/sync/atomic/asm_netbsd_arm.s
diff --git a/src/pkg/sync/atomic/atomic_linux_arm_test.go b/src/sync/atomic/atomic_linux_arm_test.go
similarity index 100%
rename from src/pkg/sync/atomic/atomic_linux_arm_test.go
rename to src/sync/atomic/atomic_linux_arm_test.go
diff --git a/src/pkg/sync/atomic/atomic_test.go b/src/sync/atomic/atomic_test.go
similarity index 100%
rename from src/pkg/sync/atomic/atomic_test.go
rename to src/sync/atomic/atomic_test.go
diff --git a/src/pkg/sync/atomic/doc.go b/src/sync/atomic/doc.go
similarity index 100%
rename from src/pkg/sync/atomic/doc.go
rename to src/sync/atomic/doc.go
diff --git a/src/pkg/sync/atomic/export_linux_arm_test.go b/src/sync/atomic/export_linux_arm_test.go
similarity index 100%
rename from src/pkg/sync/atomic/export_linux_arm_test.go
rename to src/sync/atomic/export_linux_arm_test.go
diff --git a/src/pkg/sync/atomic/race.s b/src/sync/atomic/race.s
similarity index 100%
rename from src/pkg/sync/atomic/race.s
rename to src/sync/atomic/race.s
diff --git a/src/pkg/sync/cond.go b/src/sync/cond.go
similarity index 100%
rename from src/pkg/sync/cond.go
rename to src/sync/cond.go
diff --git a/src/pkg/sync/cond_test.go b/src/sync/cond_test.go
similarity index 100%
rename from src/pkg/sync/cond_test.go
rename to src/sync/cond_test.go
diff --git a/src/pkg/sync/example_test.go b/src/sync/example_test.go
similarity index 100%
rename from src/pkg/sync/example_test.go
rename to src/sync/example_test.go
diff --git a/src/pkg/sync/export_test.go b/src/sync/export_test.go
similarity index 100%
rename from src/pkg/sync/export_test.go
rename to src/sync/export_test.go
diff --git a/src/pkg/sync/mutex.go b/src/sync/mutex.go
similarity index 100%
rename from src/pkg/sync/mutex.go
rename to src/sync/mutex.go
diff --git a/src/pkg/sync/mutex_test.go b/src/sync/mutex_test.go
similarity index 100%
rename from src/pkg/sync/mutex_test.go
rename to src/sync/mutex_test.go
diff --git a/src/pkg/sync/once.go b/src/sync/once.go
similarity index 100%
rename from src/pkg/sync/once.go
rename to src/sync/once.go
diff --git a/src/pkg/sync/once_test.go b/src/sync/once_test.go
similarity index 100%
rename from src/pkg/sync/once_test.go
rename to src/sync/once_test.go
diff --git a/src/pkg/sync/pool.go b/src/sync/pool.go
similarity index 100%
rename from src/pkg/sync/pool.go
rename to src/sync/pool.go
diff --git a/src/pkg/sync/pool_test.go b/src/sync/pool_test.go
similarity index 100%
rename from src/pkg/sync/pool_test.go
rename to src/sync/pool_test.go
diff --git a/src/pkg/sync/race.go b/src/sync/race.go
similarity index 100%
rename from src/pkg/sync/race.go
rename to src/sync/race.go
diff --git a/src/pkg/sync/race0.go b/src/sync/race0.go
similarity index 100%
rename from src/pkg/sync/race0.go
rename to src/sync/race0.go
diff --git a/src/pkg/sync/runtime.go b/src/sync/runtime.go
similarity index 100%
rename from src/pkg/sync/runtime.go
rename to src/sync/runtime.go
diff --git a/src/pkg/sync/runtime_sema_test.go b/src/sync/runtime_sema_test.go
similarity index 100%
rename from src/pkg/sync/runtime_sema_test.go
rename to src/sync/runtime_sema_test.go
diff --git a/src/pkg/sync/rwmutex.go b/src/sync/rwmutex.go
similarity index 100%
rename from src/pkg/sync/rwmutex.go
rename to src/sync/rwmutex.go
diff --git a/src/pkg/sync/rwmutex_test.go b/src/sync/rwmutex_test.go
similarity index 100%
rename from src/pkg/sync/rwmutex_test.go
rename to src/sync/rwmutex_test.go
diff --git a/src/pkg/sync/waitgroup.go b/src/sync/waitgroup.go
similarity index 100%
rename from src/pkg/sync/waitgroup.go
rename to src/sync/waitgroup.go
diff --git a/src/pkg/sync/waitgroup_test.go b/src/sync/waitgroup_test.go
similarity index 100%
rename from src/pkg/sync/waitgroup_test.go
rename to src/sync/waitgroup_test.go
diff --git a/src/pkg/syscall/asm_darwin_386.s b/src/syscall/asm_darwin_386.s
similarity index 100%
rename from src/pkg/syscall/asm_darwin_386.s
rename to src/syscall/asm_darwin_386.s
diff --git a/src/pkg/syscall/asm_darwin_amd64.s b/src/syscall/asm_darwin_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_darwin_amd64.s
rename to src/syscall/asm_darwin_amd64.s
diff --git a/src/pkg/syscall/asm_dragonfly_386.s b/src/syscall/asm_dragonfly_386.s
similarity index 100%
rename from src/pkg/syscall/asm_dragonfly_386.s
rename to src/syscall/asm_dragonfly_386.s
diff --git a/src/pkg/syscall/asm_dragonfly_amd64.s b/src/syscall/asm_dragonfly_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_dragonfly_amd64.s
rename to src/syscall/asm_dragonfly_amd64.s
diff --git a/src/pkg/syscall/asm_freebsd_386.s b/src/syscall/asm_freebsd_386.s
similarity index 100%
rename from src/pkg/syscall/asm_freebsd_386.s
rename to src/syscall/asm_freebsd_386.s
diff --git a/src/pkg/syscall/asm_freebsd_amd64.s b/src/syscall/asm_freebsd_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_freebsd_amd64.s
rename to src/syscall/asm_freebsd_amd64.s
diff --git a/src/pkg/syscall/asm_freebsd_arm.s b/src/syscall/asm_freebsd_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_freebsd_arm.s
rename to src/syscall/asm_freebsd_arm.s
diff --git a/src/pkg/syscall/asm_linux_386.s b/src/syscall/asm_linux_386.s
similarity index 100%
rename from src/pkg/syscall/asm_linux_386.s
rename to src/syscall/asm_linux_386.s
diff --git a/src/pkg/syscall/asm_linux_amd64.s b/src/syscall/asm_linux_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_linux_amd64.s
rename to src/syscall/asm_linux_amd64.s
diff --git a/src/pkg/syscall/asm_linux_arm.s b/src/syscall/asm_linux_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_linux_arm.s
rename to src/syscall/asm_linux_arm.s
diff --git a/src/pkg/syscall/asm_nacl_386.s b/src/syscall/asm_nacl_386.s
similarity index 100%
rename from src/pkg/syscall/asm_nacl_386.s
rename to src/syscall/asm_nacl_386.s
diff --git a/src/pkg/syscall/asm_nacl_amd64p32.s b/src/syscall/asm_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/syscall/asm_nacl_amd64p32.s
rename to src/syscall/asm_nacl_amd64p32.s
diff --git a/src/pkg/syscall/asm_nacl_arm.s b/src/syscall/asm_nacl_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_nacl_arm.s
rename to src/syscall/asm_nacl_arm.s
diff --git a/src/pkg/syscall/asm_netbsd_386.s b/src/syscall/asm_netbsd_386.s
similarity index 100%
rename from src/pkg/syscall/asm_netbsd_386.s
rename to src/syscall/asm_netbsd_386.s
diff --git a/src/pkg/syscall/asm_netbsd_amd64.s b/src/syscall/asm_netbsd_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_netbsd_amd64.s
rename to src/syscall/asm_netbsd_amd64.s
diff --git a/src/pkg/syscall/asm_netbsd_arm.s b/src/syscall/asm_netbsd_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_netbsd_arm.s
rename to src/syscall/asm_netbsd_arm.s
diff --git a/src/pkg/syscall/asm_openbsd_386.s b/src/syscall/asm_openbsd_386.s
similarity index 100%
rename from src/pkg/syscall/asm_openbsd_386.s
rename to src/syscall/asm_openbsd_386.s
diff --git a/src/pkg/syscall/asm_openbsd_amd64.s b/src/syscall/asm_openbsd_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_openbsd_amd64.s
rename to src/syscall/asm_openbsd_amd64.s
diff --git a/src/pkg/syscall/asm_plan9_386.s b/src/syscall/asm_plan9_386.s
similarity index 100%
rename from src/pkg/syscall/asm_plan9_386.s
rename to src/syscall/asm_plan9_386.s
diff --git a/src/pkg/syscall/asm_plan9_amd64.s b/src/syscall/asm_plan9_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_plan9_amd64.s
rename to src/syscall/asm_plan9_amd64.s
diff --git a/src/pkg/syscall/asm_solaris_amd64.s b/src/syscall/asm_solaris_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_solaris_amd64.s
rename to src/syscall/asm_solaris_amd64.s
diff --git a/src/pkg/syscall/asm_windows.s b/src/syscall/asm_windows.s
similarity index 100%
rename from src/pkg/syscall/asm_windows.s
rename to src/syscall/asm_windows.s
diff --git a/src/pkg/syscall/bpf_bsd.go b/src/syscall/bpf_bsd.go
similarity index 100%
rename from src/pkg/syscall/bpf_bsd.go
rename to src/syscall/bpf_bsd.go
diff --git a/src/pkg/syscall/creds_test.go b/src/syscall/creds_test.go
similarity index 100%
rename from src/pkg/syscall/creds_test.go
rename to src/syscall/creds_test.go
diff --git a/src/pkg/syscall/dir_plan9.go b/src/syscall/dir_plan9.go
similarity index 100%
rename from src/pkg/syscall/dir_plan9.go
rename to src/syscall/dir_plan9.go
diff --git a/src/pkg/syscall/dll_windows.go b/src/syscall/dll_windows.go
similarity index 100%
rename from src/pkg/syscall/dll_windows.go
rename to src/syscall/dll_windows.go
diff --git a/src/pkg/syscall/env_plan9.go b/src/syscall/env_plan9.go
similarity index 100%
rename from src/pkg/syscall/env_plan9.go
rename to src/syscall/env_plan9.go
diff --git a/src/pkg/syscall/env_unix.go b/src/syscall/env_unix.go
similarity index 100%
rename from src/pkg/syscall/env_unix.go
rename to src/syscall/env_unix.go
diff --git a/src/pkg/syscall/env_windows.go b/src/syscall/env_windows.go
similarity index 100%
rename from src/pkg/syscall/env_windows.go
rename to src/syscall/env_windows.go
diff --git a/src/pkg/syscall/exec_bsd.go b/src/syscall/exec_bsd.go
similarity index 100%
rename from src/pkg/syscall/exec_bsd.go
rename to src/syscall/exec_bsd.go
diff --git a/src/pkg/syscall/exec_linux.go b/src/syscall/exec_linux.go
similarity index 100%
rename from src/pkg/syscall/exec_linux.go
rename to src/syscall/exec_linux.go
diff --git a/src/pkg/syscall/exec_plan9.go b/src/syscall/exec_plan9.go
similarity index 100%
rename from src/pkg/syscall/exec_plan9.go
rename to src/syscall/exec_plan9.go
diff --git a/src/pkg/syscall/exec_solaris.go b/src/syscall/exec_solaris.go
similarity index 100%
rename from src/pkg/syscall/exec_solaris.go
rename to src/syscall/exec_solaris.go
diff --git a/src/pkg/syscall/exec_unix.go b/src/syscall/exec_unix.go
similarity index 100%
rename from src/pkg/syscall/exec_unix.go
rename to src/syscall/exec_unix.go
diff --git a/src/pkg/syscall/exec_windows.go b/src/syscall/exec_windows.go
similarity index 100%
rename from src/pkg/syscall/exec_windows.go
rename to src/syscall/exec_windows.go
diff --git a/src/pkg/syscall/fd_nacl.go b/src/syscall/fd_nacl.go
similarity index 100%
rename from src/pkg/syscall/fd_nacl.go
rename to src/syscall/fd_nacl.go
diff --git a/src/pkg/syscall/flock.go b/src/syscall/flock.go
similarity index 100%
rename from src/pkg/syscall/flock.go
rename to src/syscall/flock.go
diff --git a/src/pkg/syscall/flock_linux_32bit.go b/src/syscall/flock_linux_32bit.go
similarity index 100%
rename from src/pkg/syscall/flock_linux_32bit.go
rename to src/syscall/flock_linux_32bit.go
diff --git a/src/pkg/syscall/fs_nacl.go b/src/syscall/fs_nacl.go
similarity index 100%
rename from src/pkg/syscall/fs_nacl.go
rename to src/syscall/fs_nacl.go
diff --git a/src/pkg/syscall/lsf_linux.go b/src/syscall/lsf_linux.go
similarity index 100%
rename from src/pkg/syscall/lsf_linux.go
rename to src/syscall/lsf_linux.go
diff --git a/src/pkg/syscall/mkall.sh b/src/syscall/mkall.sh
similarity index 100%
rename from src/pkg/syscall/mkall.sh
rename to src/syscall/mkall.sh
diff --git a/src/pkg/syscall/mkall_windows.bat b/src/syscall/mkall_windows.bat
similarity index 100%
rename from src/pkg/syscall/mkall_windows.bat
rename to src/syscall/mkall_windows.bat
diff --git a/src/pkg/syscall/mkerrors.sh b/src/syscall/mkerrors.sh
similarity index 100%
rename from src/pkg/syscall/mkerrors.sh
rename to src/syscall/mkerrors.sh
diff --git a/src/pkg/syscall/mksyscall.pl b/src/syscall/mksyscall.pl
similarity index 100%
rename from src/pkg/syscall/mksyscall.pl
rename to src/syscall/mksyscall.pl
diff --git a/src/pkg/syscall/mksyscall_solaris.pl b/src/syscall/mksyscall_solaris.pl
similarity index 100%
rename from src/pkg/syscall/mksyscall_solaris.pl
rename to src/syscall/mksyscall_solaris.pl
diff --git a/src/pkg/syscall/mksyscall_windows.go b/src/syscall/mksyscall_windows.go
similarity index 100%
rename from src/pkg/syscall/mksyscall_windows.go
rename to src/syscall/mksyscall_windows.go
diff --git a/src/pkg/syscall/mksysctl_openbsd.pl b/src/syscall/mksysctl_openbsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysctl_openbsd.pl
rename to src/syscall/mksysctl_openbsd.pl
diff --git a/src/pkg/syscall/mksysnum_darwin.pl b/src/syscall/mksysnum_darwin.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_darwin.pl
rename to src/syscall/mksysnum_darwin.pl
diff --git a/src/pkg/syscall/mksysnum_dragonfly.pl b/src/syscall/mksysnum_dragonfly.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_dragonfly.pl
rename to src/syscall/mksysnum_dragonfly.pl
diff --git a/src/pkg/syscall/mksysnum_freebsd.pl b/src/syscall/mksysnum_freebsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_freebsd.pl
rename to src/syscall/mksysnum_freebsd.pl
diff --git a/src/pkg/syscall/mksysnum_linux.pl b/src/syscall/mksysnum_linux.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_linux.pl
rename to src/syscall/mksysnum_linux.pl
diff --git a/src/pkg/syscall/mksysnum_netbsd.pl b/src/syscall/mksysnum_netbsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_netbsd.pl
rename to src/syscall/mksysnum_netbsd.pl
diff --git a/src/pkg/syscall/mksysnum_openbsd.pl b/src/syscall/mksysnum_openbsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_openbsd.pl
rename to src/syscall/mksysnum_openbsd.pl
diff --git a/src/pkg/syscall/mksysnum_plan9.sh b/src/syscall/mksysnum_plan9.sh
similarity index 100%
rename from src/pkg/syscall/mksysnum_plan9.sh
rename to src/syscall/mksysnum_plan9.sh
diff --git a/src/pkg/syscall/mmap_unix_test.go b/src/syscall/mmap_unix_test.go
similarity index 100%
rename from src/pkg/syscall/mmap_unix_test.go
rename to src/syscall/mmap_unix_test.go
diff --git a/src/pkg/syscall/net_nacl.go b/src/syscall/net_nacl.go
similarity index 100%
rename from src/pkg/syscall/net_nacl.go
rename to src/syscall/net_nacl.go
diff --git a/src/pkg/syscall/netlink_linux.go b/src/syscall/netlink_linux.go
similarity index 100%
rename from src/pkg/syscall/netlink_linux.go
rename to src/syscall/netlink_linux.go
diff --git a/src/pkg/syscall/race.go b/src/syscall/race.go
similarity index 100%
rename from src/pkg/syscall/race.go
rename to src/syscall/race.go
diff --git a/src/pkg/syscall/race0.go b/src/syscall/race0.go
similarity index 100%
rename from src/pkg/syscall/race0.go
rename to src/syscall/race0.go
diff --git a/src/pkg/syscall/route_bsd.go b/src/syscall/route_bsd.go
similarity index 100%
rename from src/pkg/syscall/route_bsd.go
rename to src/syscall/route_bsd.go
diff --git a/src/pkg/syscall/route_darwin.go b/src/syscall/route_darwin.go
similarity index 100%
rename from src/pkg/syscall/route_darwin.go
rename to src/syscall/route_darwin.go
diff --git a/src/pkg/syscall/route_dragonfly.go b/src/syscall/route_dragonfly.go
similarity index 100%
rename from src/pkg/syscall/route_dragonfly.go
rename to src/syscall/route_dragonfly.go
diff --git a/src/pkg/syscall/route_freebsd.go b/src/syscall/route_freebsd.go
similarity index 100%
rename from src/pkg/syscall/route_freebsd.go
rename to src/syscall/route_freebsd.go
diff --git a/src/pkg/syscall/route_freebsd_32bit.go b/src/syscall/route_freebsd_32bit.go
similarity index 100%
rename from src/pkg/syscall/route_freebsd_32bit.go
rename to src/syscall/route_freebsd_32bit.go
diff --git a/src/pkg/syscall/route_freebsd_64bit.go b/src/syscall/route_freebsd_64bit.go
similarity index 100%
rename from src/pkg/syscall/route_freebsd_64bit.go
rename to src/syscall/route_freebsd_64bit.go
diff --git a/src/pkg/syscall/route_netbsd.go b/src/syscall/route_netbsd.go
similarity index 100%
rename from src/pkg/syscall/route_netbsd.go
rename to src/syscall/route_netbsd.go
diff --git a/src/pkg/syscall/route_openbsd.go b/src/syscall/route_openbsd.go
similarity index 100%
rename from src/pkg/syscall/route_openbsd.go
rename to src/syscall/route_openbsd.go
diff --git a/src/pkg/syscall/security_windows.go b/src/syscall/security_windows.go
similarity index 100%
rename from src/pkg/syscall/security_windows.go
rename to src/syscall/security_windows.go
diff --git a/src/pkg/syscall/so_solaris.go b/src/syscall/so_solaris.go
similarity index 100%
rename from src/pkg/syscall/so_solaris.go
rename to src/syscall/so_solaris.go
diff --git a/src/pkg/syscall/sockcmsg_linux.go b/src/syscall/sockcmsg_linux.go
similarity index 100%
rename from src/pkg/syscall/sockcmsg_linux.go
rename to src/syscall/sockcmsg_linux.go
diff --git a/src/pkg/syscall/sockcmsg_unix.go b/src/syscall/sockcmsg_unix.go
similarity index 100%
rename from src/pkg/syscall/sockcmsg_unix.go
rename to src/syscall/sockcmsg_unix.go
diff --git a/src/pkg/syscall/srpc_nacl.go b/src/syscall/srpc_nacl.go
similarity index 100%
rename from src/pkg/syscall/srpc_nacl.go
rename to src/syscall/srpc_nacl.go
diff --git a/src/pkg/syscall/str.go b/src/syscall/str.go
similarity index 100%
rename from src/pkg/syscall/str.go
rename to src/syscall/str.go
diff --git a/src/pkg/syscall/syscall.go b/src/syscall/syscall.go
similarity index 100%
rename from src/pkg/syscall/syscall.go
rename to src/syscall/syscall.go
diff --git a/src/pkg/syscall/syscall_bsd.go b/src/syscall/syscall_bsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_bsd.go
rename to src/syscall/syscall_bsd.go
diff --git a/src/pkg/syscall/syscall_bsd_test.go b/src/syscall/syscall_bsd_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_bsd_test.go
rename to src/syscall/syscall_bsd_test.go
diff --git a/src/pkg/syscall/syscall_darwin.go b/src/syscall/syscall_darwin.go
similarity index 100%
rename from src/pkg/syscall/syscall_darwin.go
rename to src/syscall/syscall_darwin.go
diff --git a/src/pkg/syscall/syscall_darwin_386.go b/src/syscall/syscall_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_darwin_386.go
rename to src/syscall/syscall_darwin_386.go
diff --git a/src/pkg/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_darwin_amd64.go
rename to src/syscall/syscall_darwin_amd64.go
diff --git a/src/pkg/syscall/syscall_dragonfly.go b/src/syscall/syscall_dragonfly.go
similarity index 100%
rename from src/pkg/syscall/syscall_dragonfly.go
rename to src/syscall/syscall_dragonfly.go
diff --git a/src/pkg/syscall/syscall_dragonfly_386.go b/src/syscall/syscall_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_dragonfly_386.go
rename to src/syscall/syscall_dragonfly_386.go
diff --git a/src/pkg/syscall/syscall_dragonfly_amd64.go b/src/syscall/syscall_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_dragonfly_amd64.go
rename to src/syscall/syscall_dragonfly_amd64.go
diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/syscall/syscall_freebsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd.go
rename to src/syscall/syscall_freebsd.go
diff --git a/src/pkg/syscall/syscall_freebsd_386.go b/src/syscall/syscall_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd_386.go
rename to src/syscall/syscall_freebsd_386.go
diff --git a/src/pkg/syscall/syscall_freebsd_amd64.go b/src/syscall/syscall_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd_amd64.go
rename to src/syscall/syscall_freebsd_amd64.go
diff --git a/src/pkg/syscall/syscall_freebsd_arm.go b/src/syscall/syscall_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd_arm.go
rename to src/syscall/syscall_freebsd_arm.go
diff --git a/src/pkg/syscall/syscall_linux.go b/src/syscall/syscall_linux.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux.go
rename to src/syscall/syscall_linux.go
diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/syscall/syscall_linux_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux_386.go
rename to src/syscall/syscall_linux_386.go
diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/syscall/syscall_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux_amd64.go
rename to src/syscall/syscall_linux_amd64.go
diff --git a/src/pkg/syscall/syscall_linux_arm.go b/src/syscall/syscall_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux_arm.go
rename to src/syscall/syscall_linux_arm.go
diff --git a/src/pkg/syscall/syscall_nacl.go b/src/syscall/syscall_nacl.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl.go
rename to src/syscall/syscall_nacl.go
diff --git a/src/pkg/syscall/syscall_nacl_386.go b/src/syscall/syscall_nacl_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl_386.go
rename to src/syscall/syscall_nacl_386.go
diff --git a/src/pkg/syscall/syscall_nacl_amd64p32.go b/src/syscall/syscall_nacl_amd64p32.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl_amd64p32.go
rename to src/syscall/syscall_nacl_amd64p32.go
diff --git a/src/pkg/syscall/syscall_nacl_arm.go b/src/syscall/syscall_nacl_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl_arm.go
rename to src/syscall/syscall_nacl_arm.go
diff --git a/src/pkg/syscall/syscall_netbsd.go b/src/syscall/syscall_netbsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd.go
rename to src/syscall/syscall_netbsd.go
diff --git a/src/pkg/syscall/syscall_netbsd_386.go b/src/syscall/syscall_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd_386.go
rename to src/syscall/syscall_netbsd_386.go
diff --git a/src/pkg/syscall/syscall_netbsd_amd64.go b/src/syscall/syscall_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd_amd64.go
rename to src/syscall/syscall_netbsd_amd64.go
diff --git a/src/pkg/syscall/syscall_netbsd_arm.go b/src/syscall/syscall_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd_arm.go
rename to src/syscall/syscall_netbsd_arm.go
diff --git a/src/pkg/syscall/syscall_no_getwd.go b/src/syscall/syscall_no_getwd.go
similarity index 100%
rename from src/pkg/syscall/syscall_no_getwd.go
rename to src/syscall/syscall_no_getwd.go
diff --git a/src/pkg/syscall/syscall_openbsd.go b/src/syscall/syscall_openbsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_openbsd.go
rename to src/syscall/syscall_openbsd.go
diff --git a/src/pkg/syscall/syscall_openbsd_386.go b/src/syscall/syscall_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_openbsd_386.go
rename to src/syscall/syscall_openbsd_386.go
diff --git a/src/pkg/syscall/syscall_openbsd_amd64.go b/src/syscall/syscall_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_openbsd_amd64.go
rename to src/syscall/syscall_openbsd_amd64.go
diff --git a/src/pkg/syscall/syscall_plan9.go b/src/syscall/syscall_plan9.go
similarity index 100%
rename from src/pkg/syscall/syscall_plan9.go
rename to src/syscall/syscall_plan9.go
diff --git a/src/pkg/syscall/syscall_solaris.go b/src/syscall/syscall_solaris.go
similarity index 100%
rename from src/pkg/syscall/syscall_solaris.go
rename to src/syscall/syscall_solaris.go
diff --git a/src/pkg/syscall/syscall_solaris_amd64.go b/src/syscall/syscall_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_solaris_amd64.go
rename to src/syscall/syscall_solaris_amd64.go
diff --git a/src/pkg/syscall/syscall_test.go b/src/syscall/syscall_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_test.go
rename to src/syscall/syscall_test.go
diff --git a/src/pkg/syscall/syscall_unix.go b/src/syscall/syscall_unix.go
similarity index 100%
rename from src/pkg/syscall/syscall_unix.go
rename to src/syscall/syscall_unix.go
diff --git a/src/pkg/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_unix_test.go
rename to src/syscall/syscall_unix_test.go
diff --git a/src/pkg/syscall/syscall_windows.go b/src/syscall/syscall_windows.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows.go
rename to src/syscall/syscall_windows.go
diff --git a/src/pkg/syscall/syscall_windows_386.go b/src/syscall/syscall_windows_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows_386.go
rename to src/syscall/syscall_windows_386.go
diff --git a/src/pkg/syscall/syscall_windows_amd64.go b/src/syscall/syscall_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows_amd64.go
rename to src/syscall/syscall_windows_amd64.go
diff --git a/src/pkg/syscall/syscall_windows_test.go b/src/syscall/syscall_windows_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows_test.go
rename to src/syscall/syscall_windows_test.go
diff --git a/src/pkg/syscall/tables_nacl.go b/src/syscall/tables_nacl.go
similarity index 100%
rename from src/pkg/syscall/tables_nacl.go
rename to src/syscall/tables_nacl.go
diff --git a/src/pkg/syscall/time_nacl_386.s b/src/syscall/time_nacl_386.s
similarity index 100%
rename from src/pkg/syscall/time_nacl_386.s
rename to src/syscall/time_nacl_386.s
diff --git a/src/pkg/syscall/time_nacl_amd64p32.s b/src/syscall/time_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/syscall/time_nacl_amd64p32.s
rename to src/syscall/time_nacl_amd64p32.s
diff --git a/src/pkg/syscall/time_nacl_arm.s b/src/syscall/time_nacl_arm.s
similarity index 100%
rename from src/pkg/syscall/time_nacl_arm.s
rename to src/syscall/time_nacl_arm.s
diff --git a/src/pkg/syscall/types_darwin.go b/src/syscall/types_darwin.go
similarity index 100%
rename from src/pkg/syscall/types_darwin.go
rename to src/syscall/types_darwin.go
diff --git a/src/pkg/syscall/types_dragonfly.go b/src/syscall/types_dragonfly.go
similarity index 100%
rename from src/pkg/syscall/types_dragonfly.go
rename to src/syscall/types_dragonfly.go
diff --git a/src/pkg/syscall/types_freebsd.go b/src/syscall/types_freebsd.go
similarity index 100%
rename from src/pkg/syscall/types_freebsd.go
rename to src/syscall/types_freebsd.go
diff --git a/src/pkg/syscall/types_linux.go b/src/syscall/types_linux.go
similarity index 100%
rename from src/pkg/syscall/types_linux.go
rename to src/syscall/types_linux.go
diff --git a/src/pkg/syscall/types_netbsd.go b/src/syscall/types_netbsd.go
similarity index 100%
rename from src/pkg/syscall/types_netbsd.go
rename to src/syscall/types_netbsd.go
diff --git a/src/pkg/syscall/types_openbsd.go b/src/syscall/types_openbsd.go
similarity index 100%
rename from src/pkg/syscall/types_openbsd.go
rename to src/syscall/types_openbsd.go
diff --git a/src/pkg/syscall/types_plan9.c b/src/syscall/types_plan9.c
similarity index 100%
rename from src/pkg/syscall/types_plan9.c
rename to src/syscall/types_plan9.c
diff --git a/src/pkg/syscall/types_solaris.go b/src/syscall/types_solaris.go
similarity index 100%
rename from src/pkg/syscall/types_solaris.go
rename to src/syscall/types_solaris.go
diff --git a/src/pkg/syscall/unzip_nacl.go b/src/syscall/unzip_nacl.go
similarity index 100%
rename from src/pkg/syscall/unzip_nacl.go
rename to src/syscall/unzip_nacl.go
diff --git a/src/pkg/syscall/zerrors_darwin_386.go b/src/syscall/zerrors_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_darwin_386.go
rename to src/syscall/zerrors_darwin_386.go
diff --git a/src/pkg/syscall/zerrors_darwin_amd64.go b/src/syscall/zerrors_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_darwin_amd64.go
rename to src/syscall/zerrors_darwin_amd64.go
diff --git a/src/pkg/syscall/zerrors_dragonfly_386.go b/src/syscall/zerrors_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_dragonfly_386.go
rename to src/syscall/zerrors_dragonfly_386.go
diff --git a/src/pkg/syscall/zerrors_dragonfly_amd64.go b/src/syscall/zerrors_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_dragonfly_amd64.go
rename to src/syscall/zerrors_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zerrors_freebsd_386.go b/src/syscall/zerrors_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_freebsd_386.go
rename to src/syscall/zerrors_freebsd_386.go
diff --git a/src/pkg/syscall/zerrors_freebsd_amd64.go b/src/syscall/zerrors_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_freebsd_amd64.go
rename to src/syscall/zerrors_freebsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_freebsd_arm.go b/src/syscall/zerrors_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zerrors_freebsd_arm.go
rename to src/syscall/zerrors_freebsd_arm.go
diff --git a/src/pkg/syscall/zerrors_linux_386.go b/src/syscall/zerrors_linux_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_386.go
rename to src/syscall/zerrors_linux_386.go
diff --git a/src/pkg/syscall/zerrors_linux_amd64.go b/src/syscall/zerrors_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_amd64.go
rename to src/syscall/zerrors_linux_amd64.go
diff --git a/src/pkg/syscall/zerrors_linux_arm.go b/src/syscall/zerrors_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_arm.go
rename to src/syscall/zerrors_linux_arm.go
diff --git a/src/pkg/syscall/zerrors_netbsd_386.go b/src/syscall/zerrors_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_netbsd_386.go
rename to src/syscall/zerrors_netbsd_386.go
diff --git a/src/pkg/syscall/zerrors_netbsd_amd64.go b/src/syscall/zerrors_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_netbsd_amd64.go
rename to src/syscall/zerrors_netbsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_netbsd_arm.go b/src/syscall/zerrors_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zerrors_netbsd_arm.go
rename to src/syscall/zerrors_netbsd_arm.go
diff --git a/src/pkg/syscall/zerrors_openbsd_386.go b/src/syscall/zerrors_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_openbsd_386.go
rename to src/syscall/zerrors_openbsd_386.go
diff --git a/src/pkg/syscall/zerrors_openbsd_amd64.go b/src/syscall/zerrors_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_openbsd_amd64.go
rename to src/syscall/zerrors_openbsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_plan9_386.go b/src/syscall/zerrors_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_plan9_386.go
rename to src/syscall/zerrors_plan9_386.go
diff --git a/src/pkg/syscall/zerrors_plan9_amd64.go b/src/syscall/zerrors_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_plan9_amd64.go
rename to src/syscall/zerrors_plan9_amd64.go
diff --git a/src/pkg/syscall/zerrors_solaris_amd64.go b/src/syscall/zerrors_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_solaris_amd64.go
rename to src/syscall/zerrors_solaris_amd64.go
diff --git a/src/pkg/syscall/zerrors_windows.go b/src/syscall/zerrors_windows.go
similarity index 100%
rename from src/pkg/syscall/zerrors_windows.go
rename to src/syscall/zerrors_windows.go
diff --git a/src/pkg/syscall/zerrors_windows_386.go b/src/syscall/zerrors_windows_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_windows_386.go
rename to src/syscall/zerrors_windows_386.go
diff --git a/src/pkg/syscall/zerrors_windows_amd64.go b/src/syscall/zerrors_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_windows_amd64.go
rename to src/syscall/zerrors_windows_amd64.go
diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/syscall/zsyscall_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_darwin_386.go
rename to src/syscall/zsyscall_darwin_386.go
diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/syscall/zsyscall_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_darwin_amd64.go
rename to src/syscall/zsyscall_darwin_amd64.go
diff --git a/src/pkg/syscall/zsyscall_dragonfly_386.go b/src/syscall/zsyscall_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_dragonfly_386.go
rename to src/syscall/zsyscall_dragonfly_386.go
diff --git a/src/pkg/syscall/zsyscall_dragonfly_amd64.go b/src/syscall/zsyscall_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_dragonfly_amd64.go
rename to src/syscall/zsyscall_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_386.go b/src/syscall/zsyscall_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_freebsd_386.go
rename to src/syscall/zsyscall_freebsd_386.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_amd64.go b/src/syscall/zsyscall_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_freebsd_amd64.go
rename to src/syscall/zsyscall_freebsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_arm.go b/src/syscall/zsyscall_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_freebsd_arm.go
rename to src/syscall/zsyscall_freebsd_arm.go
diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/syscall/zsyscall_linux_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_386.go
rename to src/syscall/zsyscall_linux_386.go
diff --git a/src/pkg/syscall/zsyscall_linux_amd64.go b/src/syscall/zsyscall_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_amd64.go
rename to src/syscall/zsyscall_linux_amd64.go
diff --git a/src/pkg/syscall/zsyscall_linux_arm.go b/src/syscall/zsyscall_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_arm.go
rename to src/syscall/zsyscall_linux_arm.go
diff --git a/src/pkg/syscall/zsyscall_nacl_386.go b/src/syscall/zsyscall_nacl_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_nacl_386.go
rename to src/syscall/zsyscall_nacl_386.go
diff --git a/src/pkg/syscall/zsyscall_nacl_amd64p32.go b/src/syscall/zsyscall_nacl_amd64p32.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_nacl_amd64p32.go
rename to src/syscall/zsyscall_nacl_amd64p32.go
diff --git a/src/pkg/syscall/zsyscall_nacl_arm.go b/src/syscall/zsyscall_nacl_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_nacl_arm.go
rename to src/syscall/zsyscall_nacl_arm.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_386.go b/src/syscall/zsyscall_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_netbsd_386.go
rename to src/syscall/zsyscall_netbsd_386.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_amd64.go b/src/syscall/zsyscall_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_netbsd_amd64.go
rename to src/syscall/zsyscall_netbsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_arm.go b/src/syscall/zsyscall_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_netbsd_arm.go
rename to src/syscall/zsyscall_netbsd_arm.go
diff --git a/src/pkg/syscall/zsyscall_openbsd_386.go b/src/syscall/zsyscall_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_openbsd_386.go
rename to src/syscall/zsyscall_openbsd_386.go
diff --git a/src/pkg/syscall/zsyscall_openbsd_amd64.go b/src/syscall/zsyscall_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_openbsd_amd64.go
rename to src/syscall/zsyscall_openbsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_plan9_386.go b/src/syscall/zsyscall_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_plan9_386.go
rename to src/syscall/zsyscall_plan9_386.go
diff --git a/src/pkg/syscall/zsyscall_plan9_amd64.go b/src/syscall/zsyscall_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_plan9_amd64.go
rename to src/syscall/zsyscall_plan9_amd64.go
diff --git a/src/pkg/syscall/zsyscall_solaris_amd64.go b/src/syscall/zsyscall_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_solaris_amd64.go
rename to src/syscall/zsyscall_solaris_amd64.go
diff --git a/src/pkg/syscall/zsyscall_windows.go b/src/syscall/zsyscall_windows.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_windows.go
rename to src/syscall/zsyscall_windows.go
diff --git a/src/pkg/syscall/zsysctl_openbsd.go b/src/syscall/zsysctl_openbsd.go
similarity index 100%
rename from src/pkg/syscall/zsysctl_openbsd.go
rename to src/syscall/zsysctl_openbsd.go
diff --git a/src/pkg/syscall/zsysnum_darwin_386.go b/src/syscall/zsysnum_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_darwin_386.go
rename to src/syscall/zsysnum_darwin_386.go
diff --git a/src/pkg/syscall/zsysnum_darwin_amd64.go b/src/syscall/zsysnum_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_darwin_amd64.go
rename to src/syscall/zsysnum_darwin_amd64.go
diff --git a/src/pkg/syscall/zsysnum_dragonfly_386.go b/src/syscall/zsysnum_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_dragonfly_386.go
rename to src/syscall/zsysnum_dragonfly_386.go
diff --git a/src/pkg/syscall/zsysnum_dragonfly_amd64.go b/src/syscall/zsysnum_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_dragonfly_amd64.go
rename to src/syscall/zsysnum_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_386.go b/src/syscall/zsysnum_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_freebsd_386.go
rename to src/syscall/zsysnum_freebsd_386.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_amd64.go b/src/syscall/zsysnum_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_freebsd_amd64.go
rename to src/syscall/zsysnum_freebsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_arm.go b/src/syscall/zsysnum_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_freebsd_arm.go
rename to src/syscall/zsysnum_freebsd_arm.go
diff --git a/src/pkg/syscall/zsysnum_linux_386.go b/src/syscall/zsysnum_linux_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_386.go
rename to src/syscall/zsysnum_linux_386.go
diff --git a/src/pkg/syscall/zsysnum_linux_amd64.go b/src/syscall/zsysnum_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_amd64.go
rename to src/syscall/zsysnum_linux_amd64.go
diff --git a/src/pkg/syscall/zsysnum_linux_arm.go b/src/syscall/zsysnum_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_arm.go
rename to src/syscall/zsysnum_linux_arm.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_386.go b/src/syscall/zsysnum_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_netbsd_386.go
rename to src/syscall/zsysnum_netbsd_386.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_amd64.go b/src/syscall/zsysnum_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_netbsd_amd64.go
rename to src/syscall/zsysnum_netbsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_arm.go b/src/syscall/zsysnum_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_netbsd_arm.go
rename to src/syscall/zsysnum_netbsd_arm.go
diff --git a/src/pkg/syscall/zsysnum_openbsd_386.go b/src/syscall/zsysnum_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_openbsd_386.go
rename to src/syscall/zsysnum_openbsd_386.go
diff --git a/src/pkg/syscall/zsysnum_openbsd_amd64.go b/src/syscall/zsysnum_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_openbsd_amd64.go
rename to src/syscall/zsysnum_openbsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_plan9_386.go b/src/syscall/zsysnum_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_plan9_386.go
rename to src/syscall/zsysnum_plan9_386.go
diff --git a/src/pkg/syscall/zsysnum_plan9_amd64.go b/src/syscall/zsysnum_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_plan9_amd64.go
rename to src/syscall/zsysnum_plan9_amd64.go
diff --git a/src/pkg/syscall/zsysnum_solaris_amd64.go b/src/syscall/zsysnum_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_solaris_amd64.go
rename to src/syscall/zsysnum_solaris_amd64.go
diff --git a/src/pkg/syscall/zsysnum_windows_386.go b/src/syscall/zsysnum_windows_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_windows_386.go
rename to src/syscall/zsysnum_windows_386.go
diff --git a/src/pkg/syscall/zsysnum_windows_amd64.go b/src/syscall/zsysnum_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_windows_amd64.go
rename to src/syscall/zsysnum_windows_amd64.go
diff --git a/src/pkg/syscall/ztypes_darwin_386.go b/src/syscall/ztypes_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_darwin_386.go
rename to src/syscall/ztypes_darwin_386.go
diff --git a/src/pkg/syscall/ztypes_darwin_amd64.go b/src/syscall/ztypes_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_darwin_amd64.go
rename to src/syscall/ztypes_darwin_amd64.go
diff --git a/src/pkg/syscall/ztypes_dragonfly_386.go b/src/syscall/ztypes_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_dragonfly_386.go
rename to src/syscall/ztypes_dragonfly_386.go
diff --git a/src/pkg/syscall/ztypes_dragonfly_amd64.go b/src/syscall/ztypes_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_dragonfly_amd64.go
rename to src/syscall/ztypes_dragonfly_amd64.go
diff --git a/src/pkg/syscall/ztypes_freebsd_386.go b/src/syscall/ztypes_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_freebsd_386.go
rename to src/syscall/ztypes_freebsd_386.go
diff --git a/src/pkg/syscall/ztypes_freebsd_amd64.go b/src/syscall/ztypes_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_freebsd_amd64.go
rename to src/syscall/ztypes_freebsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_freebsd_arm.go b/src/syscall/ztypes_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/ztypes_freebsd_arm.go
rename to src/syscall/ztypes_freebsd_arm.go
diff --git a/src/pkg/syscall/ztypes_linux_386.go b/src/syscall/ztypes_linux_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_386.go
rename to src/syscall/ztypes_linux_386.go
diff --git a/src/pkg/syscall/ztypes_linux_amd64.go b/src/syscall/ztypes_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_amd64.go
rename to src/syscall/ztypes_linux_amd64.go
diff --git a/src/pkg/syscall/ztypes_linux_arm.go b/src/syscall/ztypes_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_arm.go
rename to src/syscall/ztypes_linux_arm.go
diff --git a/src/pkg/syscall/ztypes_netbsd_386.go b/src/syscall/ztypes_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_netbsd_386.go
rename to src/syscall/ztypes_netbsd_386.go
diff --git a/src/pkg/syscall/ztypes_netbsd_amd64.go b/src/syscall/ztypes_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_netbsd_amd64.go
rename to src/syscall/ztypes_netbsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_netbsd_arm.go b/src/syscall/ztypes_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/ztypes_netbsd_arm.go
rename to src/syscall/ztypes_netbsd_arm.go
diff --git a/src/pkg/syscall/ztypes_openbsd_386.go b/src/syscall/ztypes_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_openbsd_386.go
rename to src/syscall/ztypes_openbsd_386.go
diff --git a/src/pkg/syscall/ztypes_openbsd_amd64.go b/src/syscall/ztypes_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_openbsd_amd64.go
rename to src/syscall/ztypes_openbsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_plan9_386.go b/src/syscall/ztypes_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_plan9_386.go
rename to src/syscall/ztypes_plan9_386.go
diff --git a/src/pkg/syscall/ztypes_plan9_amd64.go b/src/syscall/ztypes_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_plan9_amd64.go
rename to src/syscall/ztypes_plan9_amd64.go
diff --git a/src/pkg/syscall/ztypes_solaris_amd64.go b/src/syscall/ztypes_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_solaris_amd64.go
rename to src/syscall/ztypes_solaris_amd64.go
diff --git a/src/pkg/syscall/ztypes_windows.go b/src/syscall/ztypes_windows.go
similarity index 100%
rename from src/pkg/syscall/ztypes_windows.go
rename to src/syscall/ztypes_windows.go
diff --git a/src/pkg/syscall/ztypes_windows_386.go b/src/syscall/ztypes_windows_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_windows_386.go
rename to src/syscall/ztypes_windows_386.go
diff --git a/src/pkg/syscall/ztypes_windows_amd64.go b/src/syscall/ztypes_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_windows_amd64.go
rename to src/syscall/ztypes_windows_amd64.go
diff --git a/src/pkg/testing/allocs.go b/src/testing/allocs.go
similarity index 100%
rename from src/pkg/testing/allocs.go
rename to src/testing/allocs.go
diff --git a/src/pkg/testing/benchmark.go b/src/testing/benchmark.go
similarity index 100%
rename from src/pkg/testing/benchmark.go
rename to src/testing/benchmark.go
diff --git a/src/pkg/testing/benchmark_test.go b/src/testing/benchmark_test.go
similarity index 100%
rename from src/pkg/testing/benchmark_test.go
rename to src/testing/benchmark_test.go
diff --git a/src/pkg/testing/cover.go b/src/testing/cover.go
similarity index 100%
rename from src/pkg/testing/cover.go
rename to src/testing/cover.go
diff --git a/src/pkg/testing/example.go b/src/testing/example.go
similarity index 100%
rename from src/pkg/testing/example.go
rename to src/testing/example.go
diff --git a/src/pkg/testing/export_test.go b/src/testing/export_test.go
similarity index 100%
rename from src/pkg/testing/export_test.go
rename to src/testing/export_test.go
diff --git a/src/pkg/testing/iotest/logger.go b/src/testing/iotest/logger.go
similarity index 100%
rename from src/pkg/testing/iotest/logger.go
rename to src/testing/iotest/logger.go
diff --git a/src/pkg/testing/iotest/reader.go b/src/testing/iotest/reader.go
similarity index 100%
rename from src/pkg/testing/iotest/reader.go
rename to src/testing/iotest/reader.go
diff --git a/src/pkg/testing/iotest/writer.go b/src/testing/iotest/writer.go
similarity index 100%
rename from src/pkg/testing/iotest/writer.go
rename to src/testing/iotest/writer.go
diff --git a/src/pkg/testing/quick/quick.go b/src/testing/quick/quick.go
similarity index 100%
rename from src/pkg/testing/quick/quick.go
rename to src/testing/quick/quick.go
diff --git a/src/pkg/testing/quick/quick_test.go b/src/testing/quick/quick_test.go
similarity index 100%
rename from src/pkg/testing/quick/quick_test.go
rename to src/testing/quick/quick_test.go
diff --git a/src/pkg/testing/testing.go b/src/testing/testing.go
similarity index 100%
rename from src/pkg/testing/testing.go
rename to src/testing/testing.go
diff --git a/src/pkg/text/scanner/scanner.go b/src/text/scanner/scanner.go
similarity index 100%
rename from src/pkg/text/scanner/scanner.go
rename to src/text/scanner/scanner.go
diff --git a/src/pkg/text/scanner/scanner_test.go b/src/text/scanner/scanner_test.go
similarity index 100%
rename from src/pkg/text/scanner/scanner_test.go
rename to src/text/scanner/scanner_test.go
diff --git a/src/pkg/text/tabwriter/example_test.go b/src/text/tabwriter/example_test.go
similarity index 100%
rename from src/pkg/text/tabwriter/example_test.go
rename to src/text/tabwriter/example_test.go
diff --git a/src/pkg/text/tabwriter/tabwriter.go b/src/text/tabwriter/tabwriter.go
similarity index 100%
rename from src/pkg/text/tabwriter/tabwriter.go
rename to src/text/tabwriter/tabwriter.go
diff --git a/src/pkg/text/tabwriter/tabwriter_test.go b/src/text/tabwriter/tabwriter_test.go
similarity index 100%
rename from src/pkg/text/tabwriter/tabwriter_test.go
rename to src/text/tabwriter/tabwriter_test.go
diff --git a/src/pkg/text/template/doc.go b/src/text/template/doc.go
similarity index 100%
rename from src/pkg/text/template/doc.go
rename to src/text/template/doc.go
diff --git a/src/pkg/text/template/example_test.go b/src/text/template/example_test.go
similarity index 100%
rename from src/pkg/text/template/example_test.go
rename to src/text/template/example_test.go
diff --git a/src/pkg/text/template/examplefiles_test.go b/src/text/template/examplefiles_test.go
similarity index 100%
rename from src/pkg/text/template/examplefiles_test.go
rename to src/text/template/examplefiles_test.go
diff --git a/src/pkg/text/template/examplefunc_test.go b/src/text/template/examplefunc_test.go
similarity index 100%
rename from src/pkg/text/template/examplefunc_test.go
rename to src/text/template/examplefunc_test.go
diff --git a/src/pkg/text/template/exec.go b/src/text/template/exec.go
similarity index 100%
rename from src/pkg/text/template/exec.go
rename to src/text/template/exec.go
diff --git a/src/pkg/text/template/exec_test.go b/src/text/template/exec_test.go
similarity index 100%
rename from src/pkg/text/template/exec_test.go
rename to src/text/template/exec_test.go
diff --git a/src/pkg/text/template/funcs.go b/src/text/template/funcs.go
similarity index 100%
rename from src/pkg/text/template/funcs.go
rename to src/text/template/funcs.go
diff --git a/src/pkg/text/template/helper.go b/src/text/template/helper.go
similarity index 100%
rename from src/pkg/text/template/helper.go
rename to src/text/template/helper.go
diff --git a/src/pkg/text/template/multi_test.go b/src/text/template/multi_test.go
similarity index 100%
rename from src/pkg/text/template/multi_test.go
rename to src/text/template/multi_test.go
diff --git a/src/pkg/text/template/parse/lex.go b/src/text/template/parse/lex.go
similarity index 100%
rename from src/pkg/text/template/parse/lex.go
rename to src/text/template/parse/lex.go
diff --git a/src/pkg/text/template/parse/lex_test.go b/src/text/template/parse/lex_test.go
similarity index 100%
rename from src/pkg/text/template/parse/lex_test.go
rename to src/text/template/parse/lex_test.go
diff --git a/src/pkg/text/template/parse/node.go b/src/text/template/parse/node.go
similarity index 100%
rename from src/pkg/text/template/parse/node.go
rename to src/text/template/parse/node.go
diff --git a/src/pkg/text/template/parse/parse.go b/src/text/template/parse/parse.go
similarity index 100%
rename from src/pkg/text/template/parse/parse.go
rename to src/text/template/parse/parse.go
diff --git a/src/pkg/text/template/parse/parse_test.go b/src/text/template/parse/parse_test.go
similarity index 100%
rename from src/pkg/text/template/parse/parse_test.go
rename to src/text/template/parse/parse_test.go
diff --git a/src/pkg/text/template/template.go b/src/text/template/template.go
similarity index 100%
rename from src/pkg/text/template/template.go
rename to src/text/template/template.go
diff --git a/src/pkg/text/template/testdata/file1.tmpl b/src/text/template/testdata/file1.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/file1.tmpl
rename to src/text/template/testdata/file1.tmpl
diff --git a/src/pkg/text/template/testdata/file2.tmpl b/src/text/template/testdata/file2.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/file2.tmpl
rename to src/text/template/testdata/file2.tmpl
diff --git a/src/pkg/text/template/testdata/tmpl1.tmpl b/src/text/template/testdata/tmpl1.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/tmpl1.tmpl
rename to src/text/template/testdata/tmpl1.tmpl
diff --git a/src/pkg/text/template/testdata/tmpl2.tmpl b/src/text/template/testdata/tmpl2.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/tmpl2.tmpl
rename to src/text/template/testdata/tmpl2.tmpl
diff --git a/src/pkg/time/example_test.go b/src/time/example_test.go
similarity index 100%
rename from src/pkg/time/example_test.go
rename to src/time/example_test.go
diff --git a/src/pkg/time/export_test.go b/src/time/export_test.go
similarity index 100%
rename from src/pkg/time/export_test.go
rename to src/time/export_test.go
diff --git a/src/pkg/time/export_windows_test.go b/src/time/export_windows_test.go
similarity index 100%
rename from src/pkg/time/export_windows_test.go
rename to src/time/export_windows_test.go
diff --git a/src/pkg/time/format.go b/src/time/format.go
similarity index 100%
rename from src/pkg/time/format.go
rename to src/time/format.go
diff --git a/src/pkg/time/format_test.go b/src/time/format_test.go
similarity index 100%
rename from src/pkg/time/format_test.go
rename to src/time/format_test.go
diff --git a/src/pkg/time/genzabbrs.go b/src/time/genzabbrs.go
similarity index 100%
rename from src/pkg/time/genzabbrs.go
rename to src/time/genzabbrs.go
diff --git a/src/pkg/time/internal_test.go b/src/time/internal_test.go
similarity index 100%
rename from src/pkg/time/internal_test.go
rename to src/time/internal_test.go
diff --git a/src/pkg/time/sleep.go b/src/time/sleep.go
similarity index 100%
rename from src/pkg/time/sleep.go
rename to src/time/sleep.go
diff --git a/src/pkg/time/sleep_test.go b/src/time/sleep_test.go
similarity index 100%
rename from src/pkg/time/sleep_test.go
rename to src/time/sleep_test.go
diff --git a/src/pkg/time/sys_plan9.go b/src/time/sys_plan9.go
similarity index 100%
rename from src/pkg/time/sys_plan9.go
rename to src/time/sys_plan9.go
diff --git a/src/pkg/time/sys_unix.go b/src/time/sys_unix.go
similarity index 100%
rename from src/pkg/time/sys_unix.go
rename to src/time/sys_unix.go
diff --git a/src/pkg/time/sys_windows.go b/src/time/sys_windows.go
similarity index 100%
rename from src/pkg/time/sys_windows.go
rename to src/time/sys_windows.go
diff --git a/src/pkg/time/tick.go b/src/time/tick.go
similarity index 100%
rename from src/pkg/time/tick.go
rename to src/time/tick.go
diff --git a/src/pkg/time/tick_test.go b/src/time/tick_test.go
similarity index 100%
rename from src/pkg/time/tick_test.go
rename to src/time/tick_test.go
diff --git a/src/pkg/time/time.go b/src/time/time.go
similarity index 100%
rename from src/pkg/time/time.go
rename to src/time/time.go
diff --git a/src/pkg/time/time_test.go b/src/time/time_test.go
similarity index 100%
rename from src/pkg/time/time_test.go
rename to src/time/time_test.go
diff --git a/src/pkg/time/zoneinfo.go b/src/time/zoneinfo.go
similarity index 100%
rename from src/pkg/time/zoneinfo.go
rename to src/time/zoneinfo.go
diff --git a/src/pkg/time/zoneinfo_abbrs_windows.go b/src/time/zoneinfo_abbrs_windows.go
similarity index 100%
rename from src/pkg/time/zoneinfo_abbrs_windows.go
rename to src/time/zoneinfo_abbrs_windows.go
diff --git a/src/pkg/time/zoneinfo_plan9.go b/src/time/zoneinfo_plan9.go
similarity index 100%
rename from src/pkg/time/zoneinfo_plan9.go
rename to src/time/zoneinfo_plan9.go
diff --git a/src/pkg/time/zoneinfo_read.go b/src/time/zoneinfo_read.go
similarity index 100%
rename from src/pkg/time/zoneinfo_read.go
rename to src/time/zoneinfo_read.go
diff --git a/src/pkg/time/zoneinfo_test.go b/src/time/zoneinfo_test.go
similarity index 100%
rename from src/pkg/time/zoneinfo_test.go
rename to src/time/zoneinfo_test.go
diff --git a/src/pkg/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
similarity index 100%
rename from src/pkg/time/zoneinfo_unix.go
rename to src/time/zoneinfo_unix.go
diff --git a/src/pkg/time/zoneinfo_windows.go b/src/time/zoneinfo_windows.go
similarity index 100%
rename from src/pkg/time/zoneinfo_windows.go
rename to src/time/zoneinfo_windows.go
diff --git a/src/pkg/time/zoneinfo_windows_test.go b/src/time/zoneinfo_windows_test.go
similarity index 100%
rename from src/pkg/time/zoneinfo_windows_test.go
rename to src/time/zoneinfo_windows_test.go
diff --git a/src/pkg/unicode/casetables.go b/src/unicode/casetables.go
similarity index 100%
rename from src/pkg/unicode/casetables.go
rename to src/unicode/casetables.go
diff --git a/src/pkg/unicode/digit.go b/src/unicode/digit.go
similarity index 100%
rename from src/pkg/unicode/digit.go
rename to src/unicode/digit.go
diff --git a/src/pkg/unicode/digit_test.go b/src/unicode/digit_test.go
similarity index 100%
rename from src/pkg/unicode/digit_test.go
rename to src/unicode/digit_test.go
diff --git a/src/pkg/unicode/graphic.go b/src/unicode/graphic.go
similarity index 100%
rename from src/pkg/unicode/graphic.go
rename to src/unicode/graphic.go
diff --git a/src/pkg/unicode/graphic_test.go b/src/unicode/graphic_test.go
similarity index 100%
rename from src/pkg/unicode/graphic_test.go
rename to src/unicode/graphic_test.go
diff --git a/src/pkg/unicode/letter.go b/src/unicode/letter.go
similarity index 100%
rename from src/pkg/unicode/letter.go
rename to src/unicode/letter.go
diff --git a/src/pkg/unicode/letter_test.go b/src/unicode/letter_test.go
similarity index 100%
rename from src/pkg/unicode/letter_test.go
rename to src/unicode/letter_test.go
diff --git a/src/pkg/unicode/maketables.go b/src/unicode/maketables.go
similarity index 100%
rename from src/pkg/unicode/maketables.go
rename to src/unicode/maketables.go
diff --git a/src/pkg/unicode/script_test.go b/src/unicode/script_test.go
similarity index 100%
rename from src/pkg/unicode/script_test.go
rename to src/unicode/script_test.go
diff --git a/src/pkg/unicode/tables.go b/src/unicode/tables.go
similarity index 100%
rename from src/pkg/unicode/tables.go
rename to src/unicode/tables.go
diff --git a/src/pkg/unicode/utf16/export_test.go b/src/unicode/utf16/export_test.go
similarity index 100%
rename from src/pkg/unicode/utf16/export_test.go
rename to src/unicode/utf16/export_test.go
diff --git a/src/pkg/unicode/utf16/utf16.go b/src/unicode/utf16/utf16.go
similarity index 100%
rename from src/pkg/unicode/utf16/utf16.go
rename to src/unicode/utf16/utf16.go
diff --git a/src/pkg/unicode/utf16/utf16_test.go b/src/unicode/utf16/utf16_test.go
similarity index 100%
rename from src/pkg/unicode/utf16/utf16_test.go
rename to src/unicode/utf16/utf16_test.go
diff --git a/src/pkg/unicode/utf8/example_test.go b/src/unicode/utf8/example_test.go
similarity index 100%
rename from src/pkg/unicode/utf8/example_test.go
rename to src/unicode/utf8/example_test.go
diff --git a/src/pkg/unicode/utf8/utf8.go b/src/unicode/utf8/utf8.go
similarity index 100%
rename from src/pkg/unicode/utf8/utf8.go
rename to src/unicode/utf8/utf8.go
diff --git a/src/pkg/unicode/utf8/utf8_test.go b/src/unicode/utf8/utf8_test.go
similarity index 100%
rename from src/pkg/unicode/utf8/utf8_test.go
rename to src/unicode/utf8/utf8_test.go
diff --git a/src/pkg/unsafe/unsafe.go b/src/unsafe/unsafe.go
similarity index 100%
rename from src/pkg/unsafe/unsafe.go
rename to src/unsafe/unsafe.go

From de4964a78c5cd4258081f9305abc3147b1dbc793 Mon Sep 17 00:00:00 2001
From: Russ Cox 
Date: Mon, 8 Sep 2014 00:22:40 -0400
Subject: [PATCH 3/4] build: more adjustments for move from src/pkg to src

These were missed in CL 134570043.

Fixes nacl, solaris builds.

TBR=r
CC=golang-codereviews
https://golang.org/cl/136320043
---
 misc/nacl/testzip.proto           | 155 +++++++++++++++---------------
 src/nacltest.bash                 |   4 +-
 src/runtime/thunk_solaris_amd64.s |   2 +-
 3 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto
index 89e1e1193a..fd0c6a035b 100644
--- a/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@ -21,98 +21,97 @@ go	src=..
 			link
 				testdata
 					+
-		pkg
-			archive
-				tar
-					testdata
-						+
-				zip
-					testdata
-						+
-			compress
-				bzip2
-					testdata
-						+
-				flate
-				gzip
-					testdata
-						+
-				lzw
+		archive
+			tar
 				testdata
 					+
-				zlib
-			crypto
-				rsa
-					testdata
-						+
-				tls
-					testdata
-						+
-			debug
-				dwarf
-					testdata
-						+
-				elf
-					testdata
-						+
-				macho
-					testdata
-						+
-				pe
-					testdata
-						+
-				plan9obj
-					testdata
-						+
-			go
-				build
-					+
-				doc
-					testdata
-						+
-				format
-					+
-				parser
-					+
-				printer
-					+
-			image
+			zip
 				testdata
 					+
-				draw
-				gif
-				jpeg
-				png
-					testdata
-						+
-			io
+		compress
+			bzip2
+				testdata
+					+
+			flate
+			gzip
+				testdata
+					+
+			lzw
+			testdata
 				+
-			mime
+			zlib
+		crypto
+			rsa
 				testdata
 					+
-				multipart
-					testdata
-						+
-			net
-				http
-					+
+			tls
 				testdata
 					+
-			os
+		debug
+			dwarf
+				testdata
+					+
+			elf
+				testdata
+					+
+			macho
+				testdata
+					+
+			pe
+				testdata
+					+
+			plan9obj
+				testdata
+					+
+		go
+			build
 				+
-			path
-				filepath
-					+
-			regexp
+			doc
 				testdata
 					+
-			strconv
+			format
+				+
+			parser
+				+
+			printer
+				+
+		image
+			testdata
+				+
+			draw
+			gif
+			jpeg
+			png
+				testdata
+					+
+		io
+			+
+		mime
+			testdata
+				+
+			multipart
+				testdata
+					+
+		net
+			http
+				+
+			testdata
+				+
+		os
+			+
+		path
+			filepath
+				+
+		regexp
+			testdata
+				+
+		strconv
+			testdata
+				+
+		text
+			template
 				testdata
 					+
-			text
-				template
-					testdata
-						+
 	lib
 		time
 			zoneinfo.zip
diff --git a/src/nacltest.bash b/src/nacltest.bash
index 154d99ae98..6220d39f13 100755
--- a/src/nacltest.bash
+++ b/src/nacltest.bash
@@ -72,8 +72,8 @@ export GOROOT=$(pwd)/..
 
 # Build zip file embedded in package syscall.
 gobin=${GOBIN:-$(pwd)/../bin}
-rm -f pkg/syscall/fstest_nacl.go
-GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto pkg/syscall/fstest_nacl.go
+rm -f syscall/fstest_nacl.go
+GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH $gobin/go run ../misc/nacl/mkzip.go -p syscall -r .. ../misc/nacl/testzip.proto syscall/fstest_nacl.go
 
 # Run standard build and tests.
 export PATH=$(pwd)/../misc/nacl:$PATH
diff --git a/src/runtime/thunk_solaris_amd64.s b/src/runtime/thunk_solaris_amd64.s
index 352011e047..f61188c140 100644
--- a/src/runtime/thunk_solaris_amd64.s
+++ b/src/runtime/thunk_solaris_amd64.s
@@ -5,7 +5,7 @@
 // This file exposes various external library functions to Go code in the runtime.
 
 #include "zasm_GOOS_GOARCH.h"
-#include "../../cmd/ld/textflag.h"
+#include "textflag.h"
 
 TEXT runtime·libc_chdir(SB),NOSPLIT,$0
 	MOVQ	libc·chdir(SB), AX

From 31bd41e04bd3cbd4a4a213b8a098eaebabae15a3 Mon Sep 17 00:00:00 2001
From: Rob Pike 
Date: Sun, 7 Sep 2014 21:55:02 -0700
Subject: [PATCH 4/4] doc/go1.4.txt: src/pkg directory is gone.

CC=golang-codereviews
https://golang.org/cl/139310043
---
 doc/go1.4.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/go1.4.txt b/doc/go1.4.txt
index c5da7b72b6..4fe71b4b9e 100644
--- a/doc/go1.4.txt
+++ b/doc/go1.4.txt
@@ -7,6 +7,8 @@ Please keep the list sorted (as in sort.Strings of the lines).
 
 spec: permit for range x (CL 104680043)
 
+the directory src/pkg has been deleted, for instance src/pkg/fmt is now just src/fmt (CL 134570043)
+
 cmd/6l, liblink: use pc-relative addressing for all memory references, so that linking Go binaries at high addresses works (CL 125140043). This cuts the maximum size of a Go binary's text+data+bss from 4GB to 2GB.
 cmd/go: import comments (CL 124940043)
 cmd/go: implement "internal" (CL 120600043)