diff --git a/.hgignore b/.hgignore
index 5b90728d44..f28da84603 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/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)
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/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/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/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/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/9a/a.y b/src/cmd/9a/a.y
index 2e0317e061..41776fd3c3 100644
--- a/src/cmd/9a/a.y
+++ b/src/cmd/9a/a.y
@@ -32,7 +32,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/9a/y.tab.c b/src/cmd/9a/y.tab.c
index 9a09cf932f..e81db9924c 100644
--- a/src/cmd/9a/y.tab.c
+++ b/src/cmd/9a/y.tab.c
@@ -72,7 +72,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 268 of yacc.c */
diff --git a/src/cmd/9c/cgen.c b/src/cmd/9c/cgen.c
index aeedc60c06..d756af93bb 100644
--- a/src/cmd/9c/cgen.c
+++ b/src/cmd/9c/cgen.c
@@ -28,7 +28,7 @@
// THE SOFTWARE.
#include "gc.h"
-#include "../../pkg/runtime/funcdata.h"
+#include "../../runtime/funcdata.h"
void
cgen(Node *n, Node *nn)
diff --git a/src/cmd/9g/ggen.c b/src/cmd/9g/ggen.c
index 09f51536a5..708a9392c9 100644
--- a/src/cmd/9g/ggen.c
+++ b/src/cmd/9g/ggen.c
@@ -970,7 +970,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_power64x.s
+ // 4 and 128 = magic constants: see ../../runtime/asm_power64x.s
p->to.offset = 4*(128-q);
} else
for(t = 0; t < q; t++) {
diff --git a/src/cmd/9g/gsubr.c b/src/cmd/9g/gsubr.c
index b194cfd9ee..a84056bbef 100644
--- a/src/cmd/9g/gsubr.c
+++ b/src/cmd/9g/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/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 4b4684a523..869e377dfe 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 6fab14a118..5e8dfee783 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -369,8 +369,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.
@@ -610,7 +610,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",
@@ -727,7 +727,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 = "";
@@ -753,11 +753,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));
@@ -904,7 +904,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),
@@ -932,7 +932,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).
@@ -950,7 +950,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);
}
@@ -1095,7 +1095,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);
@@ -1124,11 +1124,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);
}
@@ -1339,47 +1339,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",
};
@@ -1387,6 +1387,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",
@@ -1409,46 +1410,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
@@ -1477,9 +1480,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();
@@ -1646,9 +1658,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 7af38456d5..c21a316397 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 5ac46e774e..2d4795ac1f 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 dc4edad631..0feb2c710a 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 365ece2671..d1d4c72462 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 7bf18f0815..be8c7ef25c 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 702d4dfcbb..13c47aa210 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 7b997464de..0e2107fd55 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))
@@ -900,7 +900,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/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/go-relocation-test-gcc482-ppc64le.obj b/src/debug/elf/testdata/go-relocation-test-gcc482-ppc64le.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc482-ppc64le.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc482-ppc64le.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 98%
rename from src/pkg/go/build/build.go
rename to src/go/build/build.go
index 1002851e84..d6c04b7858 100644
--- a/src/pkg/go/build/build.go
+++ b/src/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/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/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/asm9.c b/src/liblink/asm9.c
index 56582fe27d..47d515e054 100644
--- a/src/liblink/asm9.c
+++ b/src/liblink/asm9.c
@@ -34,7 +34,7 @@
#include
#include
#include "../cmd/9l/9.out.h"
-#include "../pkg/runtime/stack.h"
+#include "../runtime/stack.h"
enum {
FuncAlign = 8,
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/obj9.c b/src/liblink/obj9.c
index d0c14dfb57..3906181a31 100644
--- a/src/liblink/obj9.c
+++ b/src/liblink/obj9.c
@@ -32,8 +32,8 @@
#include
#include
#include "../cmd/9l/9.out.h"
-#include "../pkg/runtime/stack.h"
-#include "../pkg/runtime/funcdata.h"
+#include "../runtime/stack.h"
+#include "../runtime/funcdata.h"
static Prog zprg = {
.as = AGOK,
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/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/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/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/abs_power64x.s b/src/math/abs_power64x.s
similarity index 100%
rename from src/pkg/math/abs_power64x.s
rename to src/math/abs_power64x.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_power64x.s b/src/math/big/arith_power64x.s
similarity index 100%
rename from src/pkg/math/big/arith_power64x.s
rename to src/math/big/arith_power64x.s
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 98%
rename from src/pkg/math/sqrt.go
rename to src/math/sqrt.go
index 1bd4437f15..fdc869992e 100644
--- a/src/pkg/math/sqrt.go
+++ b/src/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/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/stubs_power64x.s b/src/math/stubs_power64x.s
similarity index 100%
rename from src/pkg/math/stubs_power64x.s
rename to src/math/stubs_power64x.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/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/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 99%
rename from src/pkg/net/http/httptest/server.go
rename to src/net/http/httptest/server.go
index 7f265552f5..789e7bf41e 100644
--- a/src/pkg/net/http/httptest/server.go
+++ b/src/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/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 99%
rename from src/pkg/net/smtp/smtp_test.go
rename to src/net/smtp/smtp_test.go
index 3fba1ea5ae..5c659e8a09 100644
--- a/src/pkg/net/smtp/smtp_test.go
+++ b/src/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/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/runtime/noasm.goc b/src/pkg/runtime/noasm.goc
deleted file mode 100644
index 4966677293..0000000000
--- a/src/pkg/runtime/noasm.goc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Routines that are implemented in assembly in asm_{amd64,386}.s
-// but are implemented in C for arm.
-
-// +build arm power64 power64le
-
-package runtime
-#include "runtime.h"
-#include "../../cmd/ld/textflag.h"
-
-#pragma textflag NOSPLIT
-func cmpstring(s1 String, s2 String) (v int) {
- uintgo i, l;
- byte c1, c2;
-
- l = s1.len;
- if(s2.len < l)
- l = s2.len;
- for(i=0; i c2) {
- v = +1;
- goto done;
- }
- }
- if(s1.len < s2.len) {
- v = -1;
- goto done;
- }
- if(s1.len > s2.len) {
- v = +1;
- goto done;
- }
- v = 0;
- done:;
-}
-
-#pragma textflag NOSPLIT
-func bytes·Compare(s1 Slice, s2 Slice) (v int) {
- uintgo i, l;
- byte c1, c2;
-
- l = s1.len;
- if(s2.len < l)
- l = s2.len;
- for(i=0; i c2) {
- v = +1;
- goto done;
- }
- }
- if(s1.len < s2.len) {
- v = -1;
- goto done;
- }
- if(s1.len > s2.len) {
- v = +1;
- goto done;
- }
- v = 0;
- done:;
-}
diff --git a/src/pkg/runtime/traceback_lr.c b/src/pkg/runtime/traceback_lr.c
deleted file mode 100644
index d8fcddf68b..0000000000
--- a/src/pkg/runtime/traceback_lr.c
+++ /dev/null
@@ -1,365 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm power64 power64le
-
-#include "runtime.h"
-#include "arch_GOARCH.h"
-#include "malloc.h"
-#include "funcdata.h"
-
-void runtime·sigpanic(void);
-void runtime·newproc(void);
-void runtime·deferproc(void);
-
-int32
-runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, uintptr *pcbuf, int32 max, bool (*callback)(Stkframe*, void*), void *v, bool printall)
-{
- int32 i, n, nprint, line, gotraceback;
- uintptr x, tracepc, sparg;
- bool waspanic, wasnewproc, printing;
- Func *f, *flr;
- Stkframe frame;
- Stktop *stk;
- String file;
- Panic *panic;
- Defer *defer;
-
- gotraceback = runtime·gotraceback(nil);
-
- if(pc0 == ~(uintptr)0 && sp0 == ~(uintptr)0) { // Signal to fetch saved values from gp.
- if(gp->syscallstack != (uintptr)nil) {
- pc0 = gp->syscallpc;
- sp0 = gp->syscallsp;
- lr0 = 0;
- } else {
- pc0 = gp->sched.pc;
- sp0 = gp->sched.sp;
- lr0 = gp->sched.lr;
- }
- }
-
- nprint = 0;
- runtime·memclr((byte*)&frame, sizeof frame);
- frame.pc = pc0;
- frame.lr = lr0;
- frame.sp = sp0;
- waspanic = false;
- wasnewproc = false;
- printing = pcbuf==nil && callback==nil;
-
- panic = gp->panic;
- defer = gp->defer;
-
- while(defer != nil && defer->argp == NoArgs)
- defer = defer->link;
- while(panic != nil && panic->defer == nil)
- panic = panic->link;
-
- // If the PC is zero, it's likely a nil function call.
- // Start in the caller's frame.
- if(frame.pc == 0) {
- frame.pc = frame.lr;
- frame.lr = 0;
- }
-
- f = runtime·findfunc(frame.pc);
- if(f == nil) {
- if(callback != nil) {
- runtime·printf("runtime: unknown pc %p\n", frame.pc);
- runtime·throw("unknown pc");
- }
- return 0;
- }
- frame.fn = f;
-
- n = 0;
- stk = (Stktop*)gp->stackbase;
- while(n < max) {
- // Typically:
- // pc is the PC of the running function.
- // sp is the stack pointer at that program counter.
- // fp is the frame pointer (caller's stack pointer) at that program counter, or nil if unknown.
- // stk is the stack containing sp.
- // The caller's program counter is lr, unless lr is zero, in which case it is *(uintptr*)sp.
-
- if(frame.pc == (uintptr)runtime·lessstack) {
- // Hit top of stack segment. Unwind to next segment.
- frame.pc = stk->gobuf.pc;
- frame.sp = stk->gobuf.sp;
- frame.lr = 0;
- frame.fp = 0;
- if(printing && runtime·showframe(nil, gp))
- runtime·printf("----- stack segment boundary -----\n");
- stk = (Stktop*)stk->stackbase;
-
- f = runtime·findfunc(frame.pc);
- if(f == nil) {
- runtime·printf("runtime: unknown pc %p after stack split\n", frame.pc);
- if(callback != nil)
- runtime·throw("unknown pc");
- }
- frame.fn = f;
- continue;
- }
- f = frame.fn;
-
- // Found an actual function.
- // Derive frame pointer and link register.
- if(frame.fp == 0)
- frame.fp = frame.sp + runtime·funcspdelta(f, frame.pc);
- if(runtime·topofstack(f)) {
- frame.lr = 0;
- flr = nil;
- } else if(f->entry == (uintptr)runtime·jmpdefer) {
- // jmpdefer modifies SP/LR/PC non-atomically.
- // If a profiling interrupt arrives during jmpdefer,
- // the stack unwind may see a mismatched register set
- // and get confused. Stop if we see PC within jmpdefer
- // to avoid that confusion.
- // See golang.org/issue/8153.
- // This check can be deleted if jmpdefer is changed
- // to restore all three atomically using pop.
- if(callback != nil)
- runtime·throw("traceback_arm: found jmpdefer when tracing with callback");
- frame.lr = 0;
- flr = nil;
- } else {
- if((n == 0 && frame.sp < frame.fp) || frame.lr == 0)
- frame.lr = *(uintptr*)frame.sp;
- flr = runtime·findfunc(frame.lr);
- if(flr == nil) {
- // This happens if you get a profiling interrupt at just the wrong time.
- // In that context it is okay to stop early.
- // But if callback is set, we're doing a garbage collection and must
- // get everything, so crash loudly.
- if(callback != nil) {
- runtime·printf("runtime: unexpected return pc for %s called from %p\n", runtime·funcname(f), frame.lr);
- runtime·throw("unknown caller pc");
- }
- }
- }
-
- frame.varp = (byte*)frame.fp;
-
- // Derive size of arguments.
- // Most functions have a fixed-size argument block,
- // so we can use metadata about the function f.
- // Not all, though: there are some variadic functions
- // in package runtime and reflect, and for those we use call-specific
- // metadata recorded by f's caller.
- if(callback != nil || printing) {
- frame.argp = (byte*)frame.fp + sizeof(uintptr);
- if(f->args != ArgsSizeUnknown)
- frame.arglen = f->args;
- else if(flr == nil)
- frame.arglen = 0;
- else if(frame.lr == (uintptr)runtime·lessstack)
- frame.arglen = stk->argsize;
- else if((i = runtime·funcarglen(flr, frame.lr)) >= 0)
- frame.arglen = i;
- else {
- runtime·printf("runtime: unknown argument frame size for %s called from %p [%s]\n",
- runtime·funcname(f), frame.lr, flr ? runtime·funcname(flr) : "?");
- if(callback != nil)
- runtime·throw("invalid stack");
- frame.arglen = 0;
- }
- }
-
- // Determine function SP where deferproc would find its arguments.
- // On ARM that's just the standard bottom-of-stack plus 1 word for
- // the saved LR. If the previous frame was a direct call to newproc/deferproc,
- // however, the SP is three words lower than normal.
- // If the function has no frame at all - perhaps it just started, or perhaps
- // it is a leaf with no local variables - then we cannot possibly find its
- // SP in a defer, and we might confuse its SP for its caller's SP, so
- // set sparg=0 in that case.
- sparg = 0;
- if(frame.fp != frame.sp) {
- sparg = frame.sp + sizeof(uintreg);
- if(wasnewproc)
- sparg += 3*sizeof(uintreg);
- }
-
- // Determine frame's 'continuation PC', where it can continue.
- // Normally this is the return address on the stack, but if sigpanic
- // is immediately below this function on the stack, then the frame
- // stopped executing due to a trap, and frame.pc is probably not
- // a safe point for looking up liveness information. In this panicking case,
- // the function either doesn't return at all (if it has no defers or if the
- // defers do not recover) or it returns from one of the calls to
- // deferproc a second time (if the corresponding deferred func recovers).
- // It suffices to assume that the most recent deferproc is the one that
- // returns; everything live at earlier deferprocs is still live at that one.
- frame.continpc = frame.pc;
- if(waspanic) {
- if(panic != nil && panic->defer->argp == (byte*)sparg)
- frame.continpc = (uintptr)panic->defer->pc;
- else if(defer != nil && defer->argp == (byte*)sparg)
- frame.continpc = (uintptr)defer->pc;
- else
- frame.continpc = 0;
- }
-
- // Unwind our local panic & defer stacks past this frame.
- while(panic != nil && (panic->defer == nil || panic->defer->argp == (byte*)sparg || panic->defer->argp == NoArgs))
- panic = panic->link;
- while(defer != nil && (defer->argp == (byte*)sparg || defer->argp == NoArgs))
- defer = defer->link;
-
- if(skip > 0) {
- skip--;
- goto skipped;
- }
-
- if(pcbuf != nil)
- pcbuf[n] = frame.pc;
- if(callback != nil) {
- if(!callback(&frame, v))
- return n;
- }
- if(printing) {
- if(printall || runtime·showframe(f, gp)) {
- // Print during crash.
- // main(0x1, 0x2, 0x3)
- // /home/rsc/go/src/runtime/x.go:23 +0xf
- tracepc = frame.pc; // back up to CALL instruction for funcline.
- if(n > 0 && frame.pc > f->entry && !waspanic)
- tracepc -= sizeof(uintptr);
- runtime·printf("%s(", runtime·funcname(f));
- for(i = 0; i < frame.arglen/sizeof(uintptr); i++) {
- if(i >= 10) {
- runtime·prints(", ...");
- break;
- }
- if(i != 0)
- runtime·prints(", ");
- runtime·printhex_c(((uintptr*)frame.argp)[i]);
- }
- runtime·prints(")\n");
- line = runtime·funcline(f, tracepc, &file);
- runtime·printf("\t%S:%d", file, line);
- if(frame.pc > f->entry)
- runtime·printf(" +%p", (uintptr)(frame.pc - f->entry));
- if(g->m->throwing > 0 && gp == g->m->curg || gotraceback >= 2)
- runtime·printf(" fp=%p sp=%p", frame.fp, frame.sp);
- runtime·printf("\n");
- nprint++;
- }
- }
- n++;
-
- skipped:
- waspanic = f->entry == (uintptr)runtime·sigpanic;
- wasnewproc = f->entry == (uintptr)runtime·newproc || f->entry == (uintptr)runtime·deferproc;
-
- // Do not unwind past the bottom of the stack.
- if(flr == nil)
- break;
-
- // Unwind to next frame.
- frame.pc = frame.lr;
- frame.fn = flr;
- frame.lr = 0;
- frame.sp = frame.fp;
- frame.fp = 0;
-
- // sighandler saves the lr on stack before faking a call to sigpanic
- if(waspanic) {
- x = *(uintptr*)frame.sp;
- frame.sp += sizeof(uintptr);
- frame.fn = f = runtime·findfunc(frame.pc);
- if(f == nil)
- frame.pc = x;
- else if(f->frame == 0)
- frame.lr = x;
- }
- }
-
- if(pcbuf == nil && callback == nil)
- n = nprint;
-
- // For rationale, see long comment in traceback_x86.c.
- if(callback != nil && n < max && defer != nil) {
- if(defer != nil)
- runtime·printf("runtime: g%D: leftover defer argp=%p pc=%p\n", gp->goid, defer->argp, defer->pc);
- if(panic != nil)
- runtime·printf("runtime: g%D: leftover panic argp=%p pc=%p\n", gp->goid, panic->defer->argp, panic->defer->pc);
- for(defer = gp->defer; defer != nil; defer = defer->link)
- runtime·printf("\tdefer %p argp=%p pc=%p\n", defer, defer->argp, defer->pc);
- for(panic = gp->panic; panic != nil; panic = panic->link) {
- runtime·printf("\tpanic %p defer %p", panic, panic->defer);
- if(panic->defer != nil)
- runtime·printf(" argp=%p pc=%p", panic->defer->argp, panic->defer->pc);
- runtime·printf("\n");
- }
- runtime·throw("traceback has leftover defers or panics");
- }
-
- return n;
-}
-
-void
-runtime·printcreatedby(G *gp)
-{
- int32 line;
- uintptr pc, tracepc;
- Func *f;
- String file;
-
- // Show what created goroutine, except main goroutine (goid 1).
- if((pc = gp->gopc) != 0 && (f = runtime·findfunc(pc)) != nil &&
- runtime·showframe(f, gp) && gp->goid != 1) {
- runtime·printf("created by %s\n", runtime·funcname(f));
- tracepc = pc; // back up to CALL instruction for funcline.
- if(pc > f->entry)
- tracepc -= PCQuantum;
- line = runtime·funcline(f, tracepc, &file);
- runtime·printf("\t%S:%d", file, line);
- if(pc > f->entry)
- runtime·printf(" +%p", (uintptr)(pc - f->entry));
- runtime·printf("\n");
- }
-}
-
-void
-runtime·traceback(uintptr pc, uintptr sp, uintptr lr, G *gp)
-{
- int32 n;
-
- if(gp->status == Gsyscall) {
- // Override signal registers if blocked in system call.
- pc = gp->syscallpc;
- sp = gp->syscallsp;
- lr = 0;
- }
-
- // Print traceback. By default, omits runtime frames.
- // If that means we print nothing at all, repeat forcing all frames printed.
- n = runtime·gentraceback(pc, sp, lr, gp, 0, nil, TracebackMaxFrames, nil, nil, false);
- if(n == 0)
- runtime·gentraceback(pc, sp, lr, gp, 0, nil, TracebackMaxFrames, nil, nil, true);
- if(n == TracebackMaxFrames)
- runtime·printf("...additional frames elided...\n");
- runtime·printcreatedby(gp);
-}
-
-// func caller(n int) (pc uintptr, file string, line int, ok bool)
-int32
-runtime·callers(int32 skip, uintptr *pcbuf, int32 m)
-{
- uintptr pc, sp;
-
- sp = runtime·getcallersp(&skip);
- pc = (uintptr)runtime·getcallerpc(&skip);
-
- return runtime·gentraceback(pc, sp, 0, g, skip, pcbuf, m, nil, nil, false);
-}
-
-int32
-runtime·gcallers(G *gp, int32 skip, uintptr *pcbuf, int32 m)
-{
- return runtime·gentraceback(~(uintptr)0, ~(uintptr)0, 0, gp, skip, pcbuf, m, nil, nil, false);
-}
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/asm_power64x.s b/src/reflect/asm_power64x.s
similarity index 100%
rename from src/pkg/reflect/asm_power64x.s
rename to src/reflect/asm_power64x.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 99%
rename from src/pkg/reflect/type.go
rename to src/reflect/type.go
index 47aecd0023..6817cd74d7 100644
--- a/src/pkg/reflect/type.go
+++ b/src/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/reflect/value.go
similarity index 99%
rename from src/pkg/reflect/value.go
rename to src/reflect/value.go
index 6ffa63e98f..b7cc755c94 100644
--- a/src/pkg/reflect/value.go
+++ b/src/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/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 86%
rename from src/pkg/runtime/Makefile
rename to src/runtime/Makefile
index 5827ce134c..55087def04 100644
--- a/src/pkg/runtime/Makefile
+++ b/src/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/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/arch_power64.h b/src/runtime/arch_power64.h
similarity index 100%
rename from src/pkg/runtime/arch_power64.h
rename to src/runtime/arch_power64.h
diff --git a/src/pkg/runtime/arch_power64le.h b/src/runtime/arch_power64le.h
similarity index 100%
rename from src/pkg/runtime/arch_power64le.h
rename to src/runtime/arch_power64le.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/asm_power64x.s b/src/runtime/asm_power64x.s
similarity index 100%
rename from src/pkg/runtime/asm_power64x.s
rename to src/runtime/asm_power64x.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/atomic_power64x.s b/src/runtime/atomic_power64x.s
similarity index 100%
rename from src/pkg/runtime/atomic_power64x.s
rename to src/runtime/atomic_power64x.s
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 66%
rename from src/pkg/runtime/debug/stack_test.go
rename to src/runtime/debug/stack_test.go
index bbd662618f..28691ee4d5 100644
--- a/src/pkg/runtime/debug/stack_test.go
+++ b/src/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/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/defs3_linux.go b/src/runtime/defs3_linux.go
similarity index 100%
rename from src/pkg/runtime/defs3_linux.go
rename to src/runtime/defs3_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_linux_power64.h b/src/runtime/defs_linux_power64.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_power64.h
rename to src/runtime/defs_linux_power64.h
diff --git a/src/pkg/runtime/defs_linux_power64le.h b/src/runtime/defs_linux_power64le.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_power64le.h
rename to src/runtime/defs_linux_power64le.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/memclr_power64x.s b/src/runtime/memclr_power64x.s
similarity index 100%
rename from src/pkg/runtime/memclr_power64x.s
rename to src/runtime/memclr_power64x.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_power64x.s b/src/runtime/memmove_power64x.s
similarity index 100%
rename from src/pkg/runtime/memmove_power64x.s
rename to src/runtime/memmove_power64x.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 89%
rename from src/pkg/runtime/pprof/pprof_test.go
rename to src/runtime/pprof/pprof_test.go
index df271273ce..54f93f8610 100644
--- a/src/pkg/runtime/pprof/pprof_test.go
+++ b/src/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/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 87%
rename from src/pkg/runtime/race/race.go
rename to src/runtime/race/race.go
index 3c297e84b2..31deedd73d 100644
--- a/src/pkg/runtime/race/race.go
+++ b/src/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/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_linux_power64.s b/src/runtime/rt0_linux_power64.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_power64.s
rename to src/runtime/rt0_linux_power64.s
diff --git a/src/pkg/runtime/rt0_linux_power64le.s b/src/runtime/rt0_linux_power64le.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_power64le.s
rename to src/runtime/rt0_linux_power64le.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 99%
rename from src/pkg/runtime/runtime_test.go
rename to src/runtime/runtime_test.go
index 5e24e2570c..cffc9f7d35 100644
--- a/src/pkg/runtime/runtime_test.go
+++ b/src/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/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_linux_power64.h b/src/runtime/signal_linux_power64.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_power64.h
rename to src/runtime/signal_linux_power64.h
diff --git a/src/pkg/runtime/signal_linux_power64le.h b/src/runtime/signal_linux_power64le.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_power64le.h
rename to src/runtime/signal_linux_power64le.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_power64x.c b/src/runtime/signal_power64x.c
similarity index 100%
rename from src/pkg/runtime/signal_power64x.c
rename to src/runtime/signal_power64x.c
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_linux_power64x.s b/src/runtime/sys_linux_power64x.s
similarity index 100%
rename from src/pkg/runtime/sys_linux_power64x.s
rename to src/runtime/sys_linux_power64x.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_power64x.c b/src/runtime/sys_power64x.c
similarity index 100%
rename from src/pkg/runtime/sys_power64x.c
rename to src/runtime/sys_power64x.c
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 98%
rename from src/pkg/runtime/thunk_solaris_amd64.s
rename to src/runtime/thunk_solaris_amd64.s
index 352011e047..f61188c140 100644
--- a/src/pkg/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
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/asm_power64x.s b/src/sync/atomic/asm_power64x.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_power64x.s
rename to src/sync/atomic/asm_power64x.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 77%
rename from src/pkg/sync/atomic/race.s
rename to src/sync/atomic/race.s
index 4dadc9ed7e..bdce7668bc 100644
--- a/src/pkg/sync/atomic/race.s
+++ b/src/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/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_linux_power64x.s b/src/syscall/asm_linux_power64x.s
similarity index 100%
rename from src/pkg/syscall/asm_linux_power64x.s
rename to src/syscall/asm_linux_power64x.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_linux_power64x.go b/src/syscall/syscall_linux_power64x.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux_power64x.go
rename to src/syscall/syscall_linux_power64x.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_linux_power64.go b/src/syscall/zerrors_linux_power64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_power64.go
rename to src/syscall/zerrors_linux_power64.go
diff --git a/src/pkg/syscall/zerrors_linux_power64le.go b/src/syscall/zerrors_linux_power64le.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_power64le.go
rename to src/syscall/zerrors_linux_power64le.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_linux_power64.go b/src/syscall/zsyscall_linux_power64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_power64.go
rename to src/syscall/zsyscall_linux_power64.go
diff --git a/src/pkg/syscall/zsyscall_linux_power64le.go b/src/syscall/zsyscall_linux_power64le.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_power64le.go
rename to src/syscall/zsyscall_linux_power64le.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_linux_power64.go b/src/syscall/zsysnum_linux_power64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_power64.go
rename to src/syscall/zsysnum_linux_power64.go
diff --git a/src/pkg/syscall/zsysnum_linux_power64le.go b/src/syscall/zsysnum_linux_power64le.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_power64le.go
rename to src/syscall/zsysnum_linux_power64le.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_linux_power64.go b/src/syscall/ztypes_linux_power64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_power64.go
rename to src/syscall/ztypes_linux_power64.go
diff --git a/src/pkg/syscall/ztypes_linux_power64le.go b/src/syscall/ztypes_linux_power64le.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_power64le.go
rename to src/syscall/ztypes_linux_power64le.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
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 {