diff --git a/src/pkg/archive/tar/common.go b/src/archive/tar/common.go
similarity index 100%
rename from src/pkg/archive/tar/common.go
rename to src/archive/tar/common.go
diff --git a/src/pkg/archive/tar/example_test.go b/src/archive/tar/example_test.go
similarity index 100%
rename from src/pkg/archive/tar/example_test.go
rename to src/archive/tar/example_test.go
diff --git a/src/pkg/archive/tar/reader.go b/src/archive/tar/reader.go
similarity index 100%
rename from src/pkg/archive/tar/reader.go
rename to src/archive/tar/reader.go
diff --git a/src/pkg/archive/tar/reader_test.go b/src/archive/tar/reader_test.go
similarity index 100%
rename from src/pkg/archive/tar/reader_test.go
rename to src/archive/tar/reader_test.go
diff --git a/src/pkg/archive/tar/stat_atim.go b/src/archive/tar/stat_atim.go
similarity index 100%
rename from src/pkg/archive/tar/stat_atim.go
rename to src/archive/tar/stat_atim.go
diff --git a/src/pkg/archive/tar/stat_atimespec.go b/src/archive/tar/stat_atimespec.go
similarity index 100%
rename from src/pkg/archive/tar/stat_atimespec.go
rename to src/archive/tar/stat_atimespec.go
diff --git a/src/pkg/archive/tar/stat_unix.go b/src/archive/tar/stat_unix.go
similarity index 100%
rename from src/pkg/archive/tar/stat_unix.go
rename to src/archive/tar/stat_unix.go
diff --git a/src/pkg/archive/tar/tar_test.go b/src/archive/tar/tar_test.go
similarity index 100%
rename from src/pkg/archive/tar/tar_test.go
rename to src/archive/tar/tar_test.go
diff --git a/src/pkg/archive/tar/testdata/gnu.tar b/src/archive/tar/testdata/gnu.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/gnu.tar
rename to src/archive/tar/testdata/gnu.tar
diff --git a/src/pkg/archive/tar/testdata/nil-uid.tar b/src/archive/tar/testdata/nil-uid.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/nil-uid.tar
rename to src/archive/tar/testdata/nil-uid.tar
diff --git a/src/pkg/archive/tar/testdata/pax.tar b/src/archive/tar/testdata/pax.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/pax.tar
rename to src/archive/tar/testdata/pax.tar
diff --git a/src/pkg/archive/tar/testdata/small.txt b/src/archive/tar/testdata/small.txt
similarity index 100%
rename from src/pkg/archive/tar/testdata/small.txt
rename to src/archive/tar/testdata/small.txt
diff --git a/src/pkg/archive/tar/testdata/small2.txt b/src/archive/tar/testdata/small2.txt
similarity index 100%
rename from src/pkg/archive/tar/testdata/small2.txt
rename to src/archive/tar/testdata/small2.txt
diff --git a/src/pkg/archive/tar/testdata/sparse-formats.tar b/src/archive/tar/testdata/sparse-formats.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/sparse-formats.tar
rename to src/archive/tar/testdata/sparse-formats.tar
diff --git a/src/pkg/archive/tar/testdata/star.tar b/src/archive/tar/testdata/star.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/star.tar
rename to src/archive/tar/testdata/star.tar
diff --git a/src/pkg/archive/tar/testdata/ustar.tar b/src/archive/tar/testdata/ustar.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/ustar.tar
rename to src/archive/tar/testdata/ustar.tar
diff --git a/src/pkg/archive/tar/testdata/v7.tar b/src/archive/tar/testdata/v7.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/v7.tar
rename to src/archive/tar/testdata/v7.tar
diff --git a/src/pkg/archive/tar/testdata/writer-big-long.tar b/src/archive/tar/testdata/writer-big-long.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/writer-big-long.tar
rename to src/archive/tar/testdata/writer-big-long.tar
diff --git a/src/pkg/archive/tar/testdata/writer-big.tar b/src/archive/tar/testdata/writer-big.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/writer-big.tar
rename to src/archive/tar/testdata/writer-big.tar
diff --git a/src/pkg/archive/tar/testdata/writer.tar b/src/archive/tar/testdata/writer.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/writer.tar
rename to src/archive/tar/testdata/writer.tar
diff --git a/src/pkg/archive/tar/testdata/xattrs.tar b/src/archive/tar/testdata/xattrs.tar
similarity index 100%
rename from src/pkg/archive/tar/testdata/xattrs.tar
rename to src/archive/tar/testdata/xattrs.tar
diff --git a/src/pkg/archive/tar/writer.go b/src/archive/tar/writer.go
similarity index 100%
rename from src/pkg/archive/tar/writer.go
rename to src/archive/tar/writer.go
diff --git a/src/pkg/archive/tar/writer_test.go b/src/archive/tar/writer_test.go
similarity index 100%
rename from src/pkg/archive/tar/writer_test.go
rename to src/archive/tar/writer_test.go
diff --git a/src/pkg/archive/zip/example_test.go b/src/archive/zip/example_test.go
similarity index 100%
rename from src/pkg/archive/zip/example_test.go
rename to src/archive/zip/example_test.go
diff --git a/src/pkg/archive/zip/reader.go b/src/archive/zip/reader.go
similarity index 100%
rename from src/pkg/archive/zip/reader.go
rename to src/archive/zip/reader.go
diff --git a/src/pkg/archive/zip/reader_test.go b/src/archive/zip/reader_test.go
similarity index 100%
rename from src/pkg/archive/zip/reader_test.go
rename to src/archive/zip/reader_test.go
diff --git a/src/pkg/archive/zip/register.go b/src/archive/zip/register.go
similarity index 100%
rename from src/pkg/archive/zip/register.go
rename to src/archive/zip/register.go
diff --git a/src/pkg/archive/zip/struct.go b/src/archive/zip/struct.go
similarity index 100%
rename from src/pkg/archive/zip/struct.go
rename to src/archive/zip/struct.go
diff --git a/src/pkg/archive/zip/testdata/crc32-not-streamed.zip b/src/archive/zip/testdata/crc32-not-streamed.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/crc32-not-streamed.zip
rename to src/archive/zip/testdata/crc32-not-streamed.zip
diff --git a/src/pkg/archive/zip/testdata/dd.zip b/src/archive/zip/testdata/dd.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/dd.zip
rename to src/archive/zip/testdata/dd.zip
diff --git a/src/pkg/archive/zip/testdata/go-no-datadesc-sig.zip b/src/archive/zip/testdata/go-no-datadesc-sig.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/go-no-datadesc-sig.zip
rename to src/archive/zip/testdata/go-no-datadesc-sig.zip
diff --git a/src/pkg/archive/zip/testdata/go-with-datadesc-sig.zip b/src/archive/zip/testdata/go-with-datadesc-sig.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/go-with-datadesc-sig.zip
rename to src/archive/zip/testdata/go-with-datadesc-sig.zip
diff --git a/src/pkg/archive/zip/testdata/gophercolor16x16.png b/src/archive/zip/testdata/gophercolor16x16.png
similarity index 100%
rename from src/pkg/archive/zip/testdata/gophercolor16x16.png
rename to src/archive/zip/testdata/gophercolor16x16.png
diff --git a/src/pkg/archive/zip/testdata/readme.notzip b/src/archive/zip/testdata/readme.notzip
similarity index 100%
rename from src/pkg/archive/zip/testdata/readme.notzip
rename to src/archive/zip/testdata/readme.notzip
diff --git a/src/pkg/archive/zip/testdata/readme.zip b/src/archive/zip/testdata/readme.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/readme.zip
rename to src/archive/zip/testdata/readme.zip
diff --git a/src/pkg/archive/zip/testdata/symlink.zip b/src/archive/zip/testdata/symlink.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/symlink.zip
rename to src/archive/zip/testdata/symlink.zip
diff --git a/src/pkg/archive/zip/testdata/test-trailing-junk.zip b/src/archive/zip/testdata/test-trailing-junk.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/test-trailing-junk.zip
rename to src/archive/zip/testdata/test-trailing-junk.zip
diff --git a/src/pkg/archive/zip/testdata/test.zip b/src/archive/zip/testdata/test.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/test.zip
rename to src/archive/zip/testdata/test.zip
diff --git a/src/pkg/archive/zip/testdata/unix.zip b/src/archive/zip/testdata/unix.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/unix.zip
rename to src/archive/zip/testdata/unix.zip
diff --git a/src/pkg/archive/zip/testdata/winxp.zip b/src/archive/zip/testdata/winxp.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/winxp.zip
rename to src/archive/zip/testdata/winxp.zip
diff --git a/src/pkg/archive/zip/testdata/zip64-2.zip b/src/archive/zip/testdata/zip64-2.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/zip64-2.zip
rename to src/archive/zip/testdata/zip64-2.zip
diff --git a/src/pkg/archive/zip/testdata/zip64.zip b/src/archive/zip/testdata/zip64.zip
similarity index 100%
rename from src/pkg/archive/zip/testdata/zip64.zip
rename to src/archive/zip/testdata/zip64.zip
diff --git a/src/pkg/archive/zip/writer.go b/src/archive/zip/writer.go
similarity index 100%
rename from src/pkg/archive/zip/writer.go
rename to src/archive/zip/writer.go
diff --git a/src/pkg/archive/zip/writer_test.go b/src/archive/zip/writer_test.go
similarity index 100%
rename from src/pkg/archive/zip/writer_test.go
rename to src/archive/zip/writer_test.go
diff --git a/src/pkg/archive/zip/zip_test.go b/src/archive/zip/zip_test.go
similarity index 100%
rename from src/pkg/archive/zip/zip_test.go
rename to src/archive/zip/zip_test.go
diff --git a/src/pkg/bufio/bufio.go b/src/bufio/bufio.go
similarity index 100%
rename from src/pkg/bufio/bufio.go
rename to src/bufio/bufio.go
diff --git a/src/pkg/bufio/bufio_test.go b/src/bufio/bufio_test.go
similarity index 100%
rename from src/pkg/bufio/bufio_test.go
rename to src/bufio/bufio_test.go
diff --git a/src/pkg/bufio/example_test.go b/src/bufio/example_test.go
similarity index 100%
rename from src/pkg/bufio/example_test.go
rename to src/bufio/example_test.go
diff --git a/src/pkg/bufio/export_test.go b/src/bufio/export_test.go
similarity index 100%
rename from src/pkg/bufio/export_test.go
rename to src/bufio/export_test.go
diff --git a/src/pkg/bufio/scan.go b/src/bufio/scan.go
similarity index 100%
rename from src/pkg/bufio/scan.go
rename to src/bufio/scan.go
diff --git a/src/pkg/bufio/scan_test.go b/src/bufio/scan_test.go
similarity index 100%
rename from src/pkg/bufio/scan_test.go
rename to src/bufio/scan_test.go
diff --git a/src/pkg/builtin/builtin.go b/src/builtin/builtin.go
similarity index 100%
rename from src/pkg/builtin/builtin.go
rename to src/builtin/builtin.go
diff --git a/src/pkg/bytes/buffer.go b/src/bytes/buffer.go
similarity index 100%
rename from src/pkg/bytes/buffer.go
rename to src/bytes/buffer.go
diff --git a/src/pkg/bytes/buffer_test.go b/src/bytes/buffer_test.go
similarity index 100%
rename from src/pkg/bytes/buffer_test.go
rename to src/bytes/buffer_test.go
diff --git a/src/pkg/bytes/bytes.go b/src/bytes/bytes.go
similarity index 100%
rename from src/pkg/bytes/bytes.go
rename to src/bytes/bytes.go
diff --git a/src/pkg/bytes/bytes.s b/src/bytes/bytes.s
similarity index 100%
rename from src/pkg/bytes/bytes.s
rename to src/bytes/bytes.s
diff --git a/src/pkg/bytes/bytes_decl.go b/src/bytes/bytes_decl.go
similarity index 100%
rename from src/pkg/bytes/bytes_decl.go
rename to src/bytes/bytes_decl.go
diff --git a/src/pkg/bytes/bytes_test.go b/src/bytes/bytes_test.go
similarity index 100%
rename from src/pkg/bytes/bytes_test.go
rename to src/bytes/bytes_test.go
diff --git a/src/pkg/bytes/compare_test.go b/src/bytes/compare_test.go
similarity index 100%
rename from src/pkg/bytes/compare_test.go
rename to src/bytes/compare_test.go
diff --git a/src/pkg/bytes/equal_test.go b/src/bytes/equal_test.go
similarity index 100%
rename from src/pkg/bytes/equal_test.go
rename to src/bytes/equal_test.go
diff --git a/src/pkg/bytes/example_test.go b/src/bytes/example_test.go
similarity index 100%
rename from src/pkg/bytes/example_test.go
rename to src/bytes/example_test.go
diff --git a/src/pkg/bytes/export_test.go b/src/bytes/export_test.go
similarity index 100%
rename from src/pkg/bytes/export_test.go
rename to src/bytes/export_test.go
diff --git a/src/pkg/bytes/reader.go b/src/bytes/reader.go
similarity index 100%
rename from src/pkg/bytes/reader.go
rename to src/bytes/reader.go
diff --git a/src/pkg/bytes/reader_test.go b/src/bytes/reader_test.go
similarity index 100%
rename from src/pkg/bytes/reader_test.go
rename to src/bytes/reader_test.go
diff --git a/src/pkg/compress/bzip2/bit_reader.go b/src/compress/bzip2/bit_reader.go
similarity index 100%
rename from src/pkg/compress/bzip2/bit_reader.go
rename to src/compress/bzip2/bit_reader.go
diff --git a/src/pkg/compress/bzip2/bzip2.go b/src/compress/bzip2/bzip2.go
similarity index 100%
rename from src/pkg/compress/bzip2/bzip2.go
rename to src/compress/bzip2/bzip2.go
diff --git a/src/pkg/compress/bzip2/bzip2_test.go b/src/compress/bzip2/bzip2_test.go
similarity index 100%
rename from src/pkg/compress/bzip2/bzip2_test.go
rename to src/compress/bzip2/bzip2_test.go
diff --git a/src/pkg/compress/bzip2/huffman.go b/src/compress/bzip2/huffman.go
similarity index 100%
rename from src/pkg/compress/bzip2/huffman.go
rename to src/compress/bzip2/huffman.go
diff --git a/src/pkg/compress/bzip2/move_to_front.go b/src/compress/bzip2/move_to_front.go
similarity index 100%
rename from src/pkg/compress/bzip2/move_to_front.go
rename to src/compress/bzip2/move_to_front.go
diff --git a/src/pkg/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2 b/src/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
similarity index 100%
rename from src/pkg/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
rename to src/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2
diff --git a/src/pkg/compress/bzip2/testdata/e.txt.bz2 b/src/compress/bzip2/testdata/e.txt.bz2
similarity index 100%
rename from src/pkg/compress/bzip2/testdata/e.txt.bz2
rename to src/compress/bzip2/testdata/e.txt.bz2
diff --git a/src/pkg/compress/flate/copy.go b/src/compress/flate/copy.go
similarity index 100%
rename from src/pkg/compress/flate/copy.go
rename to src/compress/flate/copy.go
diff --git a/src/pkg/compress/flate/copy_test.go b/src/compress/flate/copy_test.go
similarity index 100%
rename from src/pkg/compress/flate/copy_test.go
rename to src/compress/flate/copy_test.go
diff --git a/src/pkg/compress/flate/deflate.go b/src/compress/flate/deflate.go
similarity index 100%
rename from src/pkg/compress/flate/deflate.go
rename to src/compress/flate/deflate.go
diff --git a/src/pkg/compress/flate/deflate_test.go b/src/compress/flate/deflate_test.go
similarity index 100%
rename from src/pkg/compress/flate/deflate_test.go
rename to src/compress/flate/deflate_test.go
diff --git a/src/pkg/compress/flate/fixedhuff.go b/src/compress/flate/fixedhuff.go
similarity index 100%
rename from src/pkg/compress/flate/fixedhuff.go
rename to src/compress/flate/fixedhuff.go
diff --git a/src/pkg/compress/flate/flate_test.go b/src/compress/flate/flate_test.go
similarity index 100%
rename from src/pkg/compress/flate/flate_test.go
rename to src/compress/flate/flate_test.go
diff --git a/src/pkg/compress/flate/gen.go b/src/compress/flate/gen.go
similarity index 100%
rename from src/pkg/compress/flate/gen.go
rename to src/compress/flate/gen.go
diff --git a/src/pkg/compress/flate/huffman_bit_writer.go b/src/compress/flate/huffman_bit_writer.go
similarity index 100%
rename from src/pkg/compress/flate/huffman_bit_writer.go
rename to src/compress/flate/huffman_bit_writer.go
diff --git a/src/pkg/compress/flate/huffman_code.go b/src/compress/flate/huffman_code.go
similarity index 100%
rename from src/pkg/compress/flate/huffman_code.go
rename to src/compress/flate/huffman_code.go
diff --git a/src/pkg/compress/flate/inflate.go b/src/compress/flate/inflate.go
similarity index 100%
rename from src/pkg/compress/flate/inflate.go
rename to src/compress/flate/inflate.go
diff --git a/src/pkg/compress/flate/reader_test.go b/src/compress/flate/reader_test.go
similarity index 100%
rename from src/pkg/compress/flate/reader_test.go
rename to src/compress/flate/reader_test.go
diff --git a/src/pkg/compress/flate/reverse_bits.go b/src/compress/flate/reverse_bits.go
similarity index 100%
rename from src/pkg/compress/flate/reverse_bits.go
rename to src/compress/flate/reverse_bits.go
diff --git a/src/pkg/compress/flate/token.go b/src/compress/flate/token.go
similarity index 100%
rename from src/pkg/compress/flate/token.go
rename to src/compress/flate/token.go
diff --git a/src/pkg/compress/flate/writer_test.go b/src/compress/flate/writer_test.go
similarity index 100%
rename from src/pkg/compress/flate/writer_test.go
rename to src/compress/flate/writer_test.go
diff --git a/src/pkg/compress/gzip/gunzip.go b/src/compress/gzip/gunzip.go
similarity index 100%
rename from src/pkg/compress/gzip/gunzip.go
rename to src/compress/gzip/gunzip.go
diff --git a/src/pkg/compress/gzip/gunzip_test.go b/src/compress/gzip/gunzip_test.go
similarity index 100%
rename from src/pkg/compress/gzip/gunzip_test.go
rename to src/compress/gzip/gunzip_test.go
diff --git a/src/pkg/compress/gzip/gzip.go b/src/compress/gzip/gzip.go
similarity index 100%
rename from src/pkg/compress/gzip/gzip.go
rename to src/compress/gzip/gzip.go
diff --git a/src/pkg/compress/gzip/gzip_test.go b/src/compress/gzip/gzip_test.go
similarity index 100%
rename from src/pkg/compress/gzip/gzip_test.go
rename to src/compress/gzip/gzip_test.go
diff --git a/src/pkg/compress/gzip/testdata/issue6550.gz b/src/compress/gzip/testdata/issue6550.gz
similarity index 100%
rename from src/pkg/compress/gzip/testdata/issue6550.gz
rename to src/compress/gzip/testdata/issue6550.gz
diff --git a/src/pkg/compress/lzw/reader.go b/src/compress/lzw/reader.go
similarity index 100%
rename from src/pkg/compress/lzw/reader.go
rename to src/compress/lzw/reader.go
diff --git a/src/pkg/compress/lzw/reader_test.go b/src/compress/lzw/reader_test.go
similarity index 100%
rename from src/pkg/compress/lzw/reader_test.go
rename to src/compress/lzw/reader_test.go
diff --git a/src/pkg/compress/lzw/writer.go b/src/compress/lzw/writer.go
similarity index 100%
rename from src/pkg/compress/lzw/writer.go
rename to src/compress/lzw/writer.go
diff --git a/src/pkg/compress/lzw/writer_test.go b/src/compress/lzw/writer_test.go
similarity index 100%
rename from src/pkg/compress/lzw/writer_test.go
rename to src/compress/lzw/writer_test.go
diff --git a/src/pkg/compress/testdata/Mark.Twain-Tom.Sawyer.txt b/src/compress/testdata/Mark.Twain-Tom.Sawyer.txt
similarity index 100%
rename from src/pkg/compress/testdata/Mark.Twain-Tom.Sawyer.txt
rename to src/compress/testdata/Mark.Twain-Tom.Sawyer.txt
diff --git a/src/pkg/compress/testdata/e.txt b/src/compress/testdata/e.txt
similarity index 100%
rename from src/pkg/compress/testdata/e.txt
rename to src/compress/testdata/e.txt
diff --git a/src/pkg/compress/testdata/pi.txt b/src/compress/testdata/pi.txt
similarity index 100%
rename from src/pkg/compress/testdata/pi.txt
rename to src/compress/testdata/pi.txt
diff --git a/src/pkg/compress/zlib/example_test.go b/src/compress/zlib/example_test.go
similarity index 100%
rename from src/pkg/compress/zlib/example_test.go
rename to src/compress/zlib/example_test.go
diff --git a/src/pkg/compress/zlib/reader.go b/src/compress/zlib/reader.go
similarity index 100%
rename from src/pkg/compress/zlib/reader.go
rename to src/compress/zlib/reader.go
diff --git a/src/pkg/compress/zlib/reader_test.go b/src/compress/zlib/reader_test.go
similarity index 100%
rename from src/pkg/compress/zlib/reader_test.go
rename to src/compress/zlib/reader_test.go
diff --git a/src/pkg/compress/zlib/writer.go b/src/compress/zlib/writer.go
similarity index 100%
rename from src/pkg/compress/zlib/writer.go
rename to src/compress/zlib/writer.go
diff --git a/src/pkg/compress/zlib/writer_test.go b/src/compress/zlib/writer_test.go
similarity index 100%
rename from src/pkg/compress/zlib/writer_test.go
rename to src/compress/zlib/writer_test.go
diff --git a/src/pkg/container/heap/example_intheap_test.go b/src/container/heap/example_intheap_test.go
similarity index 100%
rename from src/pkg/container/heap/example_intheap_test.go
rename to src/container/heap/example_intheap_test.go
diff --git a/src/pkg/container/heap/example_pq_test.go b/src/container/heap/example_pq_test.go
similarity index 100%
rename from src/pkg/container/heap/example_pq_test.go
rename to src/container/heap/example_pq_test.go
diff --git a/src/pkg/container/heap/heap.go b/src/container/heap/heap.go
similarity index 100%
rename from src/pkg/container/heap/heap.go
rename to src/container/heap/heap.go
diff --git a/src/pkg/container/heap/heap_test.go b/src/container/heap/heap_test.go
similarity index 100%
rename from src/pkg/container/heap/heap_test.go
rename to src/container/heap/heap_test.go
diff --git a/src/pkg/container/list/example_test.go b/src/container/list/example_test.go
similarity index 100%
rename from src/pkg/container/list/example_test.go
rename to src/container/list/example_test.go
diff --git a/src/pkg/container/list/list.go b/src/container/list/list.go
similarity index 100%
rename from src/pkg/container/list/list.go
rename to src/container/list/list.go
diff --git a/src/pkg/container/list/list_test.go b/src/container/list/list_test.go
similarity index 100%
rename from src/pkg/container/list/list_test.go
rename to src/container/list/list_test.go
diff --git a/src/pkg/container/ring/ring.go b/src/container/ring/ring.go
similarity index 100%
rename from src/pkg/container/ring/ring.go
rename to src/container/ring/ring.go
diff --git a/src/pkg/container/ring/ring_test.go b/src/container/ring/ring_test.go
similarity index 100%
rename from src/pkg/container/ring/ring_test.go
rename to src/container/ring/ring_test.go
diff --git a/src/pkg/crypto/aes/aes_test.go b/src/crypto/aes/aes_test.go
similarity index 100%
rename from src/pkg/crypto/aes/aes_test.go
rename to src/crypto/aes/aes_test.go
diff --git a/src/pkg/crypto/aes/asm_amd64.s b/src/crypto/aes/asm_amd64.s
similarity index 100%
rename from src/pkg/crypto/aes/asm_amd64.s
rename to src/crypto/aes/asm_amd64.s
diff --git a/src/pkg/crypto/aes/block.go b/src/crypto/aes/block.go
similarity index 100%
rename from src/pkg/crypto/aes/block.go
rename to src/crypto/aes/block.go
diff --git a/src/pkg/crypto/aes/cipher.go b/src/crypto/aes/cipher.go
similarity index 100%
rename from src/pkg/crypto/aes/cipher.go
rename to src/crypto/aes/cipher.go
diff --git a/src/pkg/crypto/aes/cipher_asm.go b/src/crypto/aes/cipher_asm.go
similarity index 100%
rename from src/pkg/crypto/aes/cipher_asm.go
rename to src/crypto/aes/cipher_asm.go
diff --git a/src/pkg/crypto/aes/cipher_generic.go b/src/crypto/aes/cipher_generic.go
similarity index 100%
rename from src/pkg/crypto/aes/cipher_generic.go
rename to src/crypto/aes/cipher_generic.go
diff --git a/src/pkg/crypto/aes/const.go b/src/crypto/aes/const.go
similarity index 100%
rename from src/pkg/crypto/aes/const.go
rename to src/crypto/aes/const.go
diff --git a/src/pkg/crypto/cipher/benchmark_test.go b/src/crypto/cipher/benchmark_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/benchmark_test.go
rename to src/crypto/cipher/benchmark_test.go
diff --git a/src/pkg/crypto/cipher/cbc.go b/src/crypto/cipher/cbc.go
similarity index 100%
rename from src/pkg/crypto/cipher/cbc.go
rename to src/crypto/cipher/cbc.go
diff --git a/src/pkg/crypto/cipher/cbc_aes_test.go b/src/crypto/cipher/cbc_aes_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/cbc_aes_test.go
rename to src/crypto/cipher/cbc_aes_test.go
diff --git a/src/pkg/crypto/cipher/cfb.go b/src/crypto/cipher/cfb.go
similarity index 100%
rename from src/pkg/crypto/cipher/cfb.go
rename to src/crypto/cipher/cfb.go
diff --git a/src/pkg/crypto/cipher/cfb_test.go b/src/crypto/cipher/cfb_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/cfb_test.go
rename to src/crypto/cipher/cfb_test.go
diff --git a/src/pkg/crypto/cipher/cipher.go b/src/crypto/cipher/cipher.go
similarity index 100%
rename from src/pkg/crypto/cipher/cipher.go
rename to src/crypto/cipher/cipher.go
diff --git a/src/pkg/crypto/cipher/cipher_test.go b/src/crypto/cipher/cipher_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/cipher_test.go
rename to src/crypto/cipher/cipher_test.go
diff --git a/src/pkg/crypto/cipher/common_test.go b/src/crypto/cipher/common_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/common_test.go
rename to src/crypto/cipher/common_test.go
diff --git a/src/pkg/crypto/cipher/ctr.go b/src/crypto/cipher/ctr.go
similarity index 100%
rename from src/pkg/crypto/cipher/ctr.go
rename to src/crypto/cipher/ctr.go
diff --git a/src/pkg/crypto/cipher/ctr_aes_test.go b/src/crypto/cipher/ctr_aes_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/ctr_aes_test.go
rename to src/crypto/cipher/ctr_aes_test.go
diff --git a/src/pkg/crypto/cipher/example_test.go b/src/crypto/cipher/example_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/example_test.go
rename to src/crypto/cipher/example_test.go
diff --git a/src/pkg/crypto/cipher/gcm.go b/src/crypto/cipher/gcm.go
similarity index 100%
rename from src/pkg/crypto/cipher/gcm.go
rename to src/crypto/cipher/gcm.go
diff --git a/src/pkg/crypto/cipher/gcm_test.go b/src/crypto/cipher/gcm_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/gcm_test.go
rename to src/crypto/cipher/gcm_test.go
diff --git a/src/pkg/crypto/cipher/io.go b/src/crypto/cipher/io.go
similarity index 100%
rename from src/pkg/crypto/cipher/io.go
rename to src/crypto/cipher/io.go
diff --git a/src/pkg/crypto/cipher/ofb.go b/src/crypto/cipher/ofb.go
similarity index 100%
rename from src/pkg/crypto/cipher/ofb.go
rename to src/crypto/cipher/ofb.go
diff --git a/src/pkg/crypto/cipher/ofb_test.go b/src/crypto/cipher/ofb_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/ofb_test.go
rename to src/crypto/cipher/ofb_test.go
diff --git a/src/pkg/crypto/cipher/xor.go b/src/crypto/cipher/xor.go
similarity index 100%
rename from src/pkg/crypto/cipher/xor.go
rename to src/crypto/cipher/xor.go
diff --git a/src/pkg/crypto/cipher/xor_test.go b/src/crypto/cipher/xor_test.go
similarity index 100%
rename from src/pkg/crypto/cipher/xor_test.go
rename to src/crypto/cipher/xor_test.go
diff --git a/src/pkg/crypto/crypto.go b/src/crypto/crypto.go
similarity index 100%
rename from src/pkg/crypto/crypto.go
rename to src/crypto/crypto.go
diff --git a/src/pkg/crypto/des/block.go b/src/crypto/des/block.go
similarity index 100%
rename from src/pkg/crypto/des/block.go
rename to src/crypto/des/block.go
diff --git a/src/pkg/crypto/des/cipher.go b/src/crypto/des/cipher.go
similarity index 100%
rename from src/pkg/crypto/des/cipher.go
rename to src/crypto/des/cipher.go
diff --git a/src/pkg/crypto/des/const.go b/src/crypto/des/const.go
similarity index 100%
rename from src/pkg/crypto/des/const.go
rename to src/crypto/des/const.go
diff --git a/src/pkg/crypto/des/des_test.go b/src/crypto/des/des_test.go
similarity index 100%
rename from src/pkg/crypto/des/des_test.go
rename to src/crypto/des/des_test.go
diff --git a/src/pkg/crypto/des/example_test.go b/src/crypto/des/example_test.go
similarity index 100%
rename from src/pkg/crypto/des/example_test.go
rename to src/crypto/des/example_test.go
diff --git a/src/pkg/crypto/dsa/dsa.go b/src/crypto/dsa/dsa.go
similarity index 100%
rename from src/pkg/crypto/dsa/dsa.go
rename to src/crypto/dsa/dsa.go
diff --git a/src/pkg/crypto/dsa/dsa_test.go b/src/crypto/dsa/dsa_test.go
similarity index 100%
rename from src/pkg/crypto/dsa/dsa_test.go
rename to src/crypto/dsa/dsa_test.go
diff --git a/src/pkg/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go
similarity index 100%
rename from src/pkg/crypto/ecdsa/ecdsa.go
rename to src/crypto/ecdsa/ecdsa.go
diff --git a/src/pkg/crypto/ecdsa/ecdsa_test.go b/src/crypto/ecdsa/ecdsa_test.go
similarity index 100%
rename from src/pkg/crypto/ecdsa/ecdsa_test.go
rename to src/crypto/ecdsa/ecdsa_test.go
diff --git a/src/pkg/crypto/ecdsa/testdata/SigVer.rsp.bz2 b/src/crypto/ecdsa/testdata/SigVer.rsp.bz2
similarity index 100%
rename from src/pkg/crypto/ecdsa/testdata/SigVer.rsp.bz2
rename to src/crypto/ecdsa/testdata/SigVer.rsp.bz2
diff --git a/src/pkg/crypto/elliptic/elliptic.go b/src/crypto/elliptic/elliptic.go
similarity index 100%
rename from src/pkg/crypto/elliptic/elliptic.go
rename to src/crypto/elliptic/elliptic.go
diff --git a/src/pkg/crypto/elliptic/elliptic_test.go b/src/crypto/elliptic/elliptic_test.go
similarity index 100%
rename from src/pkg/crypto/elliptic/elliptic_test.go
rename to src/crypto/elliptic/elliptic_test.go
diff --git a/src/pkg/crypto/elliptic/p224.go b/src/crypto/elliptic/p224.go
similarity index 100%
rename from src/pkg/crypto/elliptic/p224.go
rename to src/crypto/elliptic/p224.go
diff --git a/src/pkg/crypto/elliptic/p224_test.go b/src/crypto/elliptic/p224_test.go
similarity index 100%
rename from src/pkg/crypto/elliptic/p224_test.go
rename to src/crypto/elliptic/p224_test.go
diff --git a/src/pkg/crypto/elliptic/p256.go b/src/crypto/elliptic/p256.go
similarity index 100%
rename from src/pkg/crypto/elliptic/p256.go
rename to src/crypto/elliptic/p256.go
diff --git a/src/pkg/crypto/hmac/hmac.go b/src/crypto/hmac/hmac.go
similarity index 100%
rename from src/pkg/crypto/hmac/hmac.go
rename to src/crypto/hmac/hmac.go
diff --git a/src/pkg/crypto/hmac/hmac_test.go b/src/crypto/hmac/hmac_test.go
similarity index 100%
rename from src/pkg/crypto/hmac/hmac_test.go
rename to src/crypto/hmac/hmac_test.go
diff --git a/src/pkg/crypto/md5/example_test.go b/src/crypto/md5/example_test.go
similarity index 100%
rename from src/pkg/crypto/md5/example_test.go
rename to src/crypto/md5/example_test.go
diff --git a/src/pkg/crypto/md5/gen.go b/src/crypto/md5/gen.go
similarity index 100%
rename from src/pkg/crypto/md5/gen.go
rename to src/crypto/md5/gen.go
diff --git a/src/pkg/crypto/md5/md5.go b/src/crypto/md5/md5.go
similarity index 100%
rename from src/pkg/crypto/md5/md5.go
rename to src/crypto/md5/md5.go
diff --git a/src/pkg/crypto/md5/md5_test.go b/src/crypto/md5/md5_test.go
similarity index 100%
rename from src/pkg/crypto/md5/md5_test.go
rename to src/crypto/md5/md5_test.go
diff --git a/src/pkg/crypto/md5/md5block.go b/src/crypto/md5/md5block.go
similarity index 100%
rename from src/pkg/crypto/md5/md5block.go
rename to src/crypto/md5/md5block.go
diff --git a/src/pkg/crypto/md5/md5block_386.s b/src/crypto/md5/md5block_386.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_386.s
rename to src/crypto/md5/md5block_386.s
diff --git a/src/pkg/crypto/md5/md5block_amd64.s b/src/crypto/md5/md5block_amd64.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_amd64.s
rename to src/crypto/md5/md5block_amd64.s
diff --git a/src/pkg/crypto/md5/md5block_amd64p32.s b/src/crypto/md5/md5block_amd64p32.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_amd64p32.s
rename to src/crypto/md5/md5block_amd64p32.s
diff --git a/src/pkg/crypto/md5/md5block_arm.s b/src/crypto/md5/md5block_arm.s
similarity index 100%
rename from src/pkg/crypto/md5/md5block_arm.s
rename to src/crypto/md5/md5block_arm.s
diff --git a/src/pkg/crypto/md5/md5block_decl.go b/src/crypto/md5/md5block_decl.go
similarity index 100%
rename from src/pkg/crypto/md5/md5block_decl.go
rename to src/crypto/md5/md5block_decl.go
diff --git a/src/pkg/crypto/md5/md5block_generic.go b/src/crypto/md5/md5block_generic.go
similarity index 100%
rename from src/pkg/crypto/md5/md5block_generic.go
rename to src/crypto/md5/md5block_generic.go
diff --git a/src/pkg/crypto/rand/example_test.go b/src/crypto/rand/example_test.go
similarity index 100%
rename from src/pkg/crypto/rand/example_test.go
rename to src/crypto/rand/example_test.go
diff --git a/src/pkg/crypto/rand/rand.go b/src/crypto/rand/rand.go
similarity index 100%
rename from src/pkg/crypto/rand/rand.go
rename to src/crypto/rand/rand.go
diff --git a/src/pkg/crypto/rand/rand_linux.go b/src/crypto/rand/rand_linux.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_linux.go
rename to src/crypto/rand/rand_linux.go
diff --git a/src/pkg/crypto/rand/rand_test.go b/src/crypto/rand/rand_test.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_test.go
rename to src/crypto/rand/rand_test.go
diff --git a/src/pkg/crypto/rand/rand_unix.go b/src/crypto/rand/rand_unix.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_unix.go
rename to src/crypto/rand/rand_unix.go
diff --git a/src/pkg/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
similarity index 100%
rename from src/pkg/crypto/rand/rand_windows.go
rename to src/crypto/rand/rand_windows.go
diff --git a/src/pkg/crypto/rand/util.go b/src/crypto/rand/util.go
similarity index 100%
rename from src/pkg/crypto/rand/util.go
rename to src/crypto/rand/util.go
diff --git a/src/pkg/crypto/rand/util_test.go b/src/crypto/rand/util_test.go
similarity index 100%
rename from src/pkg/crypto/rand/util_test.go
rename to src/crypto/rand/util_test.go
diff --git a/src/pkg/crypto/rc4/rc4.go b/src/crypto/rc4/rc4.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4.go
rename to src/crypto/rc4/rc4.go
diff --git a/src/pkg/crypto/rc4/rc4_386.s b/src/crypto/rc4/rc4_386.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_386.s
rename to src/crypto/rc4/rc4_386.s
diff --git a/src/pkg/crypto/rc4/rc4_amd64.s b/src/crypto/rc4/rc4_amd64.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_amd64.s
rename to src/crypto/rc4/rc4_amd64.s
diff --git a/src/pkg/crypto/rc4/rc4_amd64p32.s b/src/crypto/rc4/rc4_amd64p32.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_amd64p32.s
rename to src/crypto/rc4/rc4_amd64p32.s
diff --git a/src/pkg/crypto/rc4/rc4_arm.s b/src/crypto/rc4/rc4_arm.s
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_arm.s
rename to src/crypto/rc4/rc4_arm.s
diff --git a/src/pkg/crypto/rc4/rc4_asm.go b/src/crypto/rc4/rc4_asm.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_asm.go
rename to src/crypto/rc4/rc4_asm.go
diff --git a/src/pkg/crypto/rc4/rc4_ref.go b/src/crypto/rc4/rc4_ref.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_ref.go
rename to src/crypto/rc4/rc4_ref.go
diff --git a/src/pkg/crypto/rc4/rc4_test.go b/src/crypto/rc4/rc4_test.go
similarity index 100%
rename from src/pkg/crypto/rc4/rc4_test.go
rename to src/crypto/rc4/rc4_test.go
diff --git a/src/pkg/crypto/rsa/pkcs1v15.go b/src/crypto/rsa/pkcs1v15.go
similarity index 100%
rename from src/pkg/crypto/rsa/pkcs1v15.go
rename to src/crypto/rsa/pkcs1v15.go
diff --git a/src/pkg/crypto/rsa/pkcs1v15_test.go b/src/crypto/rsa/pkcs1v15_test.go
similarity index 100%
rename from src/pkg/crypto/rsa/pkcs1v15_test.go
rename to src/crypto/rsa/pkcs1v15_test.go
diff --git a/src/pkg/crypto/rsa/pss.go b/src/crypto/rsa/pss.go
similarity index 100%
rename from src/pkg/crypto/rsa/pss.go
rename to src/crypto/rsa/pss.go
diff --git a/src/pkg/crypto/rsa/pss_test.go b/src/crypto/rsa/pss_test.go
similarity index 100%
rename from src/pkg/crypto/rsa/pss_test.go
rename to src/crypto/rsa/pss_test.go
diff --git a/src/pkg/crypto/rsa/rsa.go b/src/crypto/rsa/rsa.go
similarity index 100%
rename from src/pkg/crypto/rsa/rsa.go
rename to src/crypto/rsa/rsa.go
diff --git a/src/pkg/crypto/rsa/rsa_test.go b/src/crypto/rsa/rsa_test.go
similarity index 100%
rename from src/pkg/crypto/rsa/rsa_test.go
rename to src/crypto/rsa/rsa_test.go
diff --git a/src/pkg/crypto/rsa/testdata/pss-vect.txt.bz2 b/src/crypto/rsa/testdata/pss-vect.txt.bz2
similarity index 100%
rename from src/pkg/crypto/rsa/testdata/pss-vect.txt.bz2
rename to src/crypto/rsa/testdata/pss-vect.txt.bz2
diff --git a/src/pkg/crypto/sha1/example_test.go b/src/crypto/sha1/example_test.go
similarity index 100%
rename from src/pkg/crypto/sha1/example_test.go
rename to src/crypto/sha1/example_test.go
diff --git a/src/pkg/crypto/sha1/sha1.go b/src/crypto/sha1/sha1.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1.go
rename to src/crypto/sha1/sha1.go
diff --git a/src/pkg/crypto/sha1/sha1_test.go b/src/crypto/sha1/sha1_test.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1_test.go
rename to src/crypto/sha1/sha1_test.go
diff --git a/src/pkg/crypto/sha1/sha1block.go b/src/crypto/sha1/sha1block.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block.go
rename to src/crypto/sha1/sha1block.go
diff --git a/src/pkg/crypto/sha1/sha1block_386.s b/src/crypto/sha1/sha1block_386.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_386.s
rename to src/crypto/sha1/sha1block_386.s
diff --git a/src/pkg/crypto/sha1/sha1block_amd64.s b/src/crypto/sha1/sha1block_amd64.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_amd64.s
rename to src/crypto/sha1/sha1block_amd64.s
diff --git a/src/pkg/crypto/sha1/sha1block_amd64p32.s b/src/crypto/sha1/sha1block_amd64p32.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_amd64p32.s
rename to src/crypto/sha1/sha1block_amd64p32.s
diff --git a/src/pkg/crypto/sha1/sha1block_arm.s b/src/crypto/sha1/sha1block_arm.s
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_arm.s
rename to src/crypto/sha1/sha1block_arm.s
diff --git a/src/pkg/crypto/sha1/sha1block_decl.go b/src/crypto/sha1/sha1block_decl.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_decl.go
rename to src/crypto/sha1/sha1block_decl.go
diff --git a/src/pkg/crypto/sha1/sha1block_generic.go b/src/crypto/sha1/sha1block_generic.go
similarity index 100%
rename from src/pkg/crypto/sha1/sha1block_generic.go
rename to src/crypto/sha1/sha1block_generic.go
diff --git a/src/pkg/crypto/sha256/sha256.go b/src/crypto/sha256/sha256.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256.go
rename to src/crypto/sha256/sha256.go
diff --git a/src/pkg/crypto/sha256/sha256_test.go b/src/crypto/sha256/sha256_test.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256_test.go
rename to src/crypto/sha256/sha256_test.go
diff --git a/src/pkg/crypto/sha256/sha256block.go b/src/crypto/sha256/sha256block.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block.go
rename to src/crypto/sha256/sha256block.go
diff --git a/src/pkg/crypto/sha256/sha256block_386.s b/src/crypto/sha256/sha256block_386.s
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block_386.s
rename to src/crypto/sha256/sha256block_386.s
diff --git a/src/pkg/crypto/sha256/sha256block_amd64.s b/src/crypto/sha256/sha256block_amd64.s
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block_amd64.s
rename to src/crypto/sha256/sha256block_amd64.s
diff --git a/src/pkg/crypto/sha256/sha256block_decl.go b/src/crypto/sha256/sha256block_decl.go
similarity index 100%
rename from src/pkg/crypto/sha256/sha256block_decl.go
rename to src/crypto/sha256/sha256block_decl.go
diff --git a/src/pkg/crypto/sha512/sha512.go b/src/crypto/sha512/sha512.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512.go
rename to src/crypto/sha512/sha512.go
diff --git a/src/pkg/crypto/sha512/sha512_test.go b/src/crypto/sha512/sha512_test.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512_test.go
rename to src/crypto/sha512/sha512_test.go
diff --git a/src/pkg/crypto/sha512/sha512block.go b/src/crypto/sha512/sha512block.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512block.go
rename to src/crypto/sha512/sha512block.go
diff --git a/src/pkg/crypto/sha512/sha512block_amd64.s b/src/crypto/sha512/sha512block_amd64.s
similarity index 100%
rename from src/pkg/crypto/sha512/sha512block_amd64.s
rename to src/crypto/sha512/sha512block_amd64.s
diff --git a/src/pkg/crypto/sha512/sha512block_decl.go b/src/crypto/sha512/sha512block_decl.go
similarity index 100%
rename from src/pkg/crypto/sha512/sha512block_decl.go
rename to src/crypto/sha512/sha512block_decl.go
diff --git a/src/pkg/crypto/subtle/constant_time.go b/src/crypto/subtle/constant_time.go
similarity index 100%
rename from src/pkg/crypto/subtle/constant_time.go
rename to src/crypto/subtle/constant_time.go
diff --git a/src/pkg/crypto/subtle/constant_time_test.go b/src/crypto/subtle/constant_time_test.go
similarity index 100%
rename from src/pkg/crypto/subtle/constant_time_test.go
rename to src/crypto/subtle/constant_time_test.go
diff --git a/src/pkg/crypto/tls/alert.go b/src/crypto/tls/alert.go
similarity index 100%
rename from src/pkg/crypto/tls/alert.go
rename to src/crypto/tls/alert.go
diff --git a/src/pkg/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go
similarity index 100%
rename from src/pkg/crypto/tls/cipher_suites.go
rename to src/crypto/tls/cipher_suites.go
diff --git a/src/pkg/crypto/tls/common.go b/src/crypto/tls/common.go
similarity index 100%
rename from src/pkg/crypto/tls/common.go
rename to src/crypto/tls/common.go
diff --git a/src/pkg/crypto/tls/conn.go b/src/crypto/tls/conn.go
similarity index 100%
rename from src/pkg/crypto/tls/conn.go
rename to src/crypto/tls/conn.go
diff --git a/src/pkg/crypto/tls/conn_test.go b/src/crypto/tls/conn_test.go
similarity index 100%
rename from src/pkg/crypto/tls/conn_test.go
rename to src/crypto/tls/conn_test.go
diff --git a/src/pkg/crypto/tls/example_test.go b/src/crypto/tls/example_test.go
similarity index 100%
rename from src/pkg/crypto/tls/example_test.go
rename to src/crypto/tls/example_test.go
diff --git a/src/pkg/crypto/tls/generate_cert.go b/src/crypto/tls/generate_cert.go
similarity index 100%
rename from src/pkg/crypto/tls/generate_cert.go
rename to src/crypto/tls/generate_cert.go
diff --git a/src/pkg/crypto/tls/handshake_client.go b/src/crypto/tls/handshake_client.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_client.go
rename to src/crypto/tls/handshake_client.go
diff --git a/src/pkg/crypto/tls/handshake_client_test.go b/src/crypto/tls/handshake_client_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_client_test.go
rename to src/crypto/tls/handshake_client_test.go
diff --git a/src/pkg/crypto/tls/handshake_messages.go b/src/crypto/tls/handshake_messages.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_messages.go
rename to src/crypto/tls/handshake_messages.go
diff --git a/src/pkg/crypto/tls/handshake_messages_test.go b/src/crypto/tls/handshake_messages_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_messages_test.go
rename to src/crypto/tls/handshake_messages_test.go
diff --git a/src/pkg/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_server.go
rename to src/crypto/tls/handshake_server.go
diff --git a/src/pkg/crypto/tls/handshake_server_test.go b/src/crypto/tls/handshake_server_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_server_test.go
rename to src/crypto/tls/handshake_server_test.go
diff --git a/src/pkg/crypto/tls/handshake_test.go b/src/crypto/tls/handshake_test.go
similarity index 100%
rename from src/pkg/crypto/tls/handshake_test.go
rename to src/crypto/tls/handshake_test.go
diff --git a/src/pkg/crypto/tls/key_agreement.go b/src/crypto/tls/key_agreement.go
similarity index 100%
rename from src/pkg/crypto/tls/key_agreement.go
rename to src/crypto/tls/key_agreement.go
diff --git a/src/pkg/crypto/tls/prf.go b/src/crypto/tls/prf.go
similarity index 100%
rename from src/pkg/crypto/tls/prf.go
rename to src/crypto/tls/prf.go
diff --git a/src/pkg/crypto/tls/prf_test.go b/src/crypto/tls/prf_test.go
similarity index 100%
rename from src/pkg/crypto/tls/prf_test.go
rename to src/crypto/tls/prf_test.go
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv10-ClientCert-RSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
rename to src/crypto/tls/testdata/Client-TLSv10-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv10-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv10-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv10-RSA-RC4
rename to src/crypto/tls/testdata/Client-TLSv10-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
rename to src/crypto/tls/testdata/Client-TLSv11-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv11-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv11-RSA-RC4
rename to src/crypto/tls/testdata/Client-TLSv11-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN b/src/crypto/tls/testdata/Client-TLSv12-ALPN
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN
rename to src/crypto/tls/testdata/Client-TLSv12-ALPN
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch b/src/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
rename to src/crypto/tls/testdata/Client-TLSv12-ALPN-NoMatch
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA b/src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
rename to src/crypto/tls/testdata/Client-TLSv12-ClientCert-RSA-RSA
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
rename to src/crypto/tls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES b/src/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
rename to src/crypto/tls/testdata/Client-TLSv12-ECDHE-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Client-TLSv12-RSA-RC4 b/src/crypto/tls/testdata/Client-TLSv12-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Client-TLSv12-RSA-RC4
rename to src/crypto/tls/testdata/Client-TLSv12-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-3DES b/src/crypto/tls/testdata/Server-SSLv3-RSA-3DES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-3DES
rename to src/crypto/tls/testdata/Server-SSLv3-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-AES b/src/crypto/tls/testdata/Server-SSLv3-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-AES
rename to src/crypto/tls/testdata/Server-SSLv3-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-RC4 b/src/crypto/tls/testdata/Server-SSLv3-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-SSLv3-RSA-RC4
rename to src/crypto/tls/testdata/Server-SSLv3-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-3DES b/src/crypto/tls/testdata/Server-TLSv10-RSA-3DES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-3DES
rename to src/crypto/tls/testdata/Server-TLSv10-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-AES b/src/crypto/tls/testdata/Server-TLSv10-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-AES
rename to src/crypto/tls/testdata/Server-TLSv10-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv10-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv10-RSA-RC4
rename to src/crypto/tls/testdata/Server-TLSv10-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv11-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv11-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv11-RSA-RC4
rename to src/crypto/tls/testdata/Server-TLSv11-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN b/src/crypto/tls/testdata/Server-TLSv12-ALPN
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN
rename to src/crypto/tls/testdata/Server-TLSv12-ALPN
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch b/src/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
rename to src/crypto/tls/testdata/Server-TLSv12-ALPN-NoMatch
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
rename to src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA b/src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
rename to src/crypto/tls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
rename to src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
rename to src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven b/src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
rename to src/crypto/tls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES b/src/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
rename to src/crypto/tls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-IssueTicket b/src/crypto/tls/testdata/Server-TLSv12-IssueTicket
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-IssueTicket
rename to src/crypto/tls/testdata/Server-TLSv12-IssueTicket
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-3DES b/src/crypto/tls/testdata/Server-TLSv12-RSA-3DES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-3DES
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-3DES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-AES
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM b/src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-AES-GCM
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-RC4 b/src/crypto/tls/testdata/Server-TLSv12-RSA-RC4
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-RSA-RC4
rename to src/crypto/tls/testdata/Server-TLSv12-RSA-RC4
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-Resume b/src/crypto/tls/testdata/Server-TLSv12-Resume
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-Resume
rename to src/crypto/tls/testdata/Server-TLSv12-Resume
diff --git a/src/pkg/crypto/tls/testdata/Server-TLSv12-SNI b/src/crypto/tls/testdata/Server-TLSv12-SNI
similarity index 100%
rename from src/pkg/crypto/tls/testdata/Server-TLSv12-SNI
rename to src/crypto/tls/testdata/Server-TLSv12-SNI
diff --git a/src/pkg/crypto/tls/ticket.go b/src/crypto/tls/ticket.go
similarity index 100%
rename from src/pkg/crypto/tls/ticket.go
rename to src/crypto/tls/ticket.go
diff --git a/src/pkg/crypto/tls/tls.go b/src/crypto/tls/tls.go
similarity index 100%
rename from src/pkg/crypto/tls/tls.go
rename to src/crypto/tls/tls.go
diff --git a/src/pkg/crypto/tls/tls_test.go b/src/crypto/tls/tls_test.go
similarity index 100%
rename from src/pkg/crypto/tls/tls_test.go
rename to src/crypto/tls/tls_test.go
diff --git a/src/pkg/crypto/x509/cert_pool.go b/src/crypto/x509/cert_pool.go
similarity index 100%
rename from src/pkg/crypto/x509/cert_pool.go
rename to src/crypto/x509/cert_pool.go
diff --git a/src/pkg/crypto/x509/example_test.go b/src/crypto/x509/example_test.go
similarity index 100%
rename from src/pkg/crypto/x509/example_test.go
rename to src/crypto/x509/example_test.go
diff --git a/src/pkg/crypto/x509/pem_decrypt.go b/src/crypto/x509/pem_decrypt.go
similarity index 100%
rename from src/pkg/crypto/x509/pem_decrypt.go
rename to src/crypto/x509/pem_decrypt.go
diff --git a/src/pkg/crypto/x509/pem_decrypt_test.go b/src/crypto/x509/pem_decrypt_test.go
similarity index 100%
rename from src/pkg/crypto/x509/pem_decrypt_test.go
rename to src/crypto/x509/pem_decrypt_test.go
diff --git a/src/pkg/crypto/x509/pkcs1.go b/src/crypto/x509/pkcs1.go
similarity index 100%
rename from src/pkg/crypto/x509/pkcs1.go
rename to src/crypto/x509/pkcs1.go
diff --git a/src/pkg/crypto/x509/pkcs8.go b/src/crypto/x509/pkcs8.go
similarity index 100%
rename from src/pkg/crypto/x509/pkcs8.go
rename to src/crypto/x509/pkcs8.go
diff --git a/src/pkg/crypto/x509/pkcs8_test.go b/src/crypto/x509/pkcs8_test.go
similarity index 100%
rename from src/pkg/crypto/x509/pkcs8_test.go
rename to src/crypto/x509/pkcs8_test.go
diff --git a/src/pkg/crypto/x509/pkix/pkix.go b/src/crypto/x509/pkix/pkix.go
similarity index 100%
rename from src/pkg/crypto/x509/pkix/pkix.go
rename to src/crypto/x509/pkix/pkix.go
diff --git a/src/pkg/crypto/x509/root.go b/src/crypto/x509/root.go
similarity index 100%
rename from src/pkg/crypto/x509/root.go
rename to src/crypto/x509/root.go
diff --git a/src/pkg/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
similarity index 100%
rename from src/pkg/crypto/x509/root_cgo_darwin.go
rename to src/crypto/x509/root_cgo_darwin.go
diff --git a/src/pkg/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
similarity index 100%
rename from src/pkg/crypto/x509/root_darwin.go
rename to src/crypto/x509/root_darwin.go
diff --git a/src/pkg/crypto/x509/root_darwin_test.go b/src/crypto/x509/root_darwin_test.go
similarity index 100%
rename from src/pkg/crypto/x509/root_darwin_test.go
rename to src/crypto/x509/root_darwin_test.go
diff --git a/src/pkg/crypto/x509/root_nocgo_darwin.go b/src/crypto/x509/root_nocgo_darwin.go
similarity index 100%
rename from src/pkg/crypto/x509/root_nocgo_darwin.go
rename to src/crypto/x509/root_nocgo_darwin.go
diff --git a/src/pkg/crypto/x509/root_plan9.go b/src/crypto/x509/root_plan9.go
similarity index 100%
rename from src/pkg/crypto/x509/root_plan9.go
rename to src/crypto/x509/root_plan9.go
diff --git a/src/pkg/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
similarity index 100%
rename from src/pkg/crypto/x509/root_unix.go
rename to src/crypto/x509/root_unix.go
diff --git a/src/pkg/crypto/x509/root_windows.go b/src/crypto/x509/root_windows.go
similarity index 100%
rename from src/pkg/crypto/x509/root_windows.go
rename to src/crypto/x509/root_windows.go
diff --git a/src/pkg/crypto/x509/sec1.go b/src/crypto/x509/sec1.go
similarity index 100%
rename from src/pkg/crypto/x509/sec1.go
rename to src/crypto/x509/sec1.go
diff --git a/src/pkg/crypto/x509/sec1_test.go b/src/crypto/x509/sec1_test.go
similarity index 100%
rename from src/pkg/crypto/x509/sec1_test.go
rename to src/crypto/x509/sec1_test.go
diff --git a/src/pkg/crypto/x509/verify.go b/src/crypto/x509/verify.go
similarity index 100%
rename from src/pkg/crypto/x509/verify.go
rename to src/crypto/x509/verify.go
diff --git a/src/pkg/crypto/x509/verify_test.go b/src/crypto/x509/verify_test.go
similarity index 100%
rename from src/pkg/crypto/x509/verify_test.go
rename to src/crypto/x509/verify_test.go
diff --git a/src/pkg/crypto/x509/x509.go b/src/crypto/x509/x509.go
similarity index 100%
rename from src/pkg/crypto/x509/x509.go
rename to src/crypto/x509/x509.go
diff --git a/src/pkg/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go
similarity index 100%
rename from src/pkg/crypto/x509/x509_test.go
rename to src/crypto/x509/x509_test.go
diff --git a/src/pkg/crypto/x509/x509_test_import.go b/src/crypto/x509/x509_test_import.go
similarity index 100%
rename from src/pkg/crypto/x509/x509_test_import.go
rename to src/crypto/x509/x509_test_import.go
diff --git a/src/pkg/database/sql/convert.go b/src/database/sql/convert.go
similarity index 100%
rename from src/pkg/database/sql/convert.go
rename to src/database/sql/convert.go
diff --git a/src/pkg/database/sql/convert_test.go b/src/database/sql/convert_test.go
similarity index 100%
rename from src/pkg/database/sql/convert_test.go
rename to src/database/sql/convert_test.go
diff --git a/src/pkg/database/sql/doc.txt b/src/database/sql/doc.txt
similarity index 100%
rename from src/pkg/database/sql/doc.txt
rename to src/database/sql/doc.txt
diff --git a/src/pkg/database/sql/driver/driver.go b/src/database/sql/driver/driver.go
similarity index 100%
rename from src/pkg/database/sql/driver/driver.go
rename to src/database/sql/driver/driver.go
diff --git a/src/pkg/database/sql/driver/types.go b/src/database/sql/driver/types.go
similarity index 100%
rename from src/pkg/database/sql/driver/types.go
rename to src/database/sql/driver/types.go
diff --git a/src/pkg/database/sql/driver/types_test.go b/src/database/sql/driver/types_test.go
similarity index 100%
rename from src/pkg/database/sql/driver/types_test.go
rename to src/database/sql/driver/types_test.go
diff --git a/src/pkg/database/sql/example_test.go b/src/database/sql/example_test.go
similarity index 100%
rename from src/pkg/database/sql/example_test.go
rename to src/database/sql/example_test.go
diff --git a/src/pkg/database/sql/fakedb_test.go b/src/database/sql/fakedb_test.go
similarity index 100%
rename from src/pkg/database/sql/fakedb_test.go
rename to src/database/sql/fakedb_test.go
diff --git a/src/pkg/database/sql/sql.go b/src/database/sql/sql.go
similarity index 100%
rename from src/pkg/database/sql/sql.go
rename to src/database/sql/sql.go
diff --git a/src/pkg/database/sql/sql_test.go b/src/database/sql/sql_test.go
similarity index 100%
rename from src/pkg/database/sql/sql_test.go
rename to src/database/sql/sql_test.go
diff --git a/src/pkg/debug/dwarf/buf.go b/src/debug/dwarf/buf.go
similarity index 100%
rename from src/pkg/debug/dwarf/buf.go
rename to src/debug/dwarf/buf.go
diff --git a/src/pkg/debug/dwarf/const.go b/src/debug/dwarf/const.go
similarity index 100%
rename from src/pkg/debug/dwarf/const.go
rename to src/debug/dwarf/const.go
diff --git a/src/pkg/debug/dwarf/entry.go b/src/debug/dwarf/entry.go
similarity index 100%
rename from src/pkg/debug/dwarf/entry.go
rename to src/debug/dwarf/entry.go
diff --git a/src/pkg/debug/dwarf/open.go b/src/debug/dwarf/open.go
similarity index 100%
rename from src/pkg/debug/dwarf/open.go
rename to src/debug/dwarf/open.go
diff --git a/src/pkg/debug/dwarf/testdata/typedef.c b/src/debug/dwarf/testdata/typedef.c
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.c
rename to src/debug/dwarf/testdata/typedef.c
diff --git a/src/pkg/debug/dwarf/testdata/typedef.elf b/src/debug/dwarf/testdata/typedef.elf
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.elf
rename to src/debug/dwarf/testdata/typedef.elf
diff --git a/src/pkg/debug/dwarf/testdata/typedef.elf4 b/src/debug/dwarf/testdata/typedef.elf4
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.elf4
rename to src/debug/dwarf/testdata/typedef.elf4
diff --git a/src/pkg/debug/dwarf/testdata/typedef.macho b/src/debug/dwarf/testdata/typedef.macho
similarity index 100%
rename from src/pkg/debug/dwarf/testdata/typedef.macho
rename to src/debug/dwarf/testdata/typedef.macho
diff --git a/src/pkg/debug/dwarf/type.go b/src/debug/dwarf/type.go
similarity index 100%
rename from src/pkg/debug/dwarf/type.go
rename to src/debug/dwarf/type.go
diff --git a/src/pkg/debug/dwarf/type_test.go b/src/debug/dwarf/type_test.go
similarity index 100%
rename from src/pkg/debug/dwarf/type_test.go
rename to src/debug/dwarf/type_test.go
diff --git a/src/pkg/debug/dwarf/typeunit.go b/src/debug/dwarf/typeunit.go
similarity index 100%
rename from src/pkg/debug/dwarf/typeunit.go
rename to src/debug/dwarf/typeunit.go
diff --git a/src/pkg/debug/dwarf/unit.go b/src/debug/dwarf/unit.go
similarity index 100%
rename from src/pkg/debug/dwarf/unit.go
rename to src/debug/dwarf/unit.go
diff --git a/src/pkg/debug/elf/elf.go b/src/debug/elf/elf.go
similarity index 100%
rename from src/pkg/debug/elf/elf.go
rename to src/debug/elf/elf.go
diff --git a/src/pkg/debug/elf/elf_test.go b/src/debug/elf/elf_test.go
similarity index 100%
rename from src/pkg/debug/elf/elf_test.go
rename to src/debug/elf/elf_test.go
diff --git a/src/pkg/debug/elf/file.go b/src/debug/elf/file.go
similarity index 100%
rename from src/pkg/debug/elf/file.go
rename to src/debug/elf/file.go
diff --git a/src/pkg/debug/elf/file_test.go b/src/debug/elf/file_test.go
similarity index 100%
rename from src/pkg/debug/elf/file_test.go
rename to src/debug/elf/file_test.go
diff --git a/src/pkg/debug/elf/symbols_test.go b/src/debug/elf/symbols_test.go
similarity index 100%
rename from src/pkg/debug/elf/symbols_test.go
rename to src/debug/elf/symbols_test.go
diff --git a/src/pkg/debug/elf/testdata/gcc-386-freebsd-exec b/src/debug/elf/testdata/gcc-386-freebsd-exec
similarity index 100%
rename from src/pkg/debug/elf/testdata/gcc-386-freebsd-exec
rename to src/debug/elf/testdata/gcc-386-freebsd-exec
diff --git a/src/pkg/debug/elf/testdata/gcc-amd64-linux-exec b/src/debug/elf/testdata/gcc-amd64-linux-exec
similarity index 100%
rename from src/pkg/debug/elf/testdata/gcc-amd64-linux-exec
rename to src/debug/elf/testdata/gcc-amd64-linux-exec
diff --git a/src/pkg/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj b/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
rename to src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-clang-x86.obj b/src/debug/elf/testdata/go-relocation-test-clang-x86.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-clang-x86.obj
rename to src/debug/elf/testdata/go-relocation-test-clang-x86.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj b/src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj b/src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc441-x86-64.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.obj b/src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
diff --git a/src/pkg/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj b/src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
similarity index 100%
rename from src/pkg/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
rename to src/debug/elf/testdata/go-relocation-test-gcc482-aarch64.obj
diff --git a/src/pkg/debug/elf/testdata/hello-world-core.gz b/src/debug/elf/testdata/hello-world-core.gz
similarity index 100%
rename from src/pkg/debug/elf/testdata/hello-world-core.gz
rename to src/debug/elf/testdata/hello-world-core.gz
diff --git a/src/pkg/debug/elf/testdata/hello.c b/src/debug/elf/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/elf/testdata/hello.c
rename to src/debug/elf/testdata/hello.c
diff --git a/src/pkg/debug/goobj/read.go b/src/debug/goobj/read.go
similarity index 100%
rename from src/pkg/debug/goobj/read.go
rename to src/debug/goobj/read.go
diff --git a/src/pkg/debug/goobj/read_test.go b/src/debug/goobj/read_test.go
similarity index 100%
rename from src/pkg/debug/goobj/read_test.go
rename to src/debug/goobj/read_test.go
diff --git a/src/pkg/debug/gosym/pclinetest.asm b/src/debug/gosym/pclinetest.asm
similarity index 100%
rename from src/pkg/debug/gosym/pclinetest.asm
rename to src/debug/gosym/pclinetest.asm
diff --git a/src/pkg/debug/gosym/pclinetest.h b/src/debug/gosym/pclinetest.h
similarity index 100%
rename from src/pkg/debug/gosym/pclinetest.h
rename to src/debug/gosym/pclinetest.h
diff --git a/src/pkg/debug/gosym/pclntab.go b/src/debug/gosym/pclntab.go
similarity index 100%
rename from src/pkg/debug/gosym/pclntab.go
rename to src/debug/gosym/pclntab.go
diff --git a/src/pkg/debug/gosym/pclntab_test.go b/src/debug/gosym/pclntab_test.go
similarity index 100%
rename from src/pkg/debug/gosym/pclntab_test.go
rename to src/debug/gosym/pclntab_test.go
diff --git a/src/pkg/debug/gosym/symtab.go b/src/debug/gosym/symtab.go
similarity index 100%
rename from src/pkg/debug/gosym/symtab.go
rename to src/debug/gosym/symtab.go
diff --git a/src/pkg/debug/macho/fat.go b/src/debug/macho/fat.go
similarity index 100%
rename from src/pkg/debug/macho/fat.go
rename to src/debug/macho/fat.go
diff --git a/src/pkg/debug/macho/file.go b/src/debug/macho/file.go
similarity index 100%
rename from src/pkg/debug/macho/file.go
rename to src/debug/macho/file.go
diff --git a/src/pkg/debug/macho/file_test.go b/src/debug/macho/file_test.go
similarity index 100%
rename from src/pkg/debug/macho/file_test.go
rename to src/debug/macho/file_test.go
diff --git a/src/pkg/debug/macho/macho.go b/src/debug/macho/macho.go
similarity index 100%
rename from src/pkg/debug/macho/macho.go
rename to src/debug/macho/macho.go
diff --git a/src/pkg/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec b/src/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
similarity index 100%
rename from src/pkg/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
rename to src/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-386-darwin-exec b/src/debug/macho/testdata/gcc-386-darwin-exec
similarity index 100%
rename from src/pkg/debug/macho/testdata/gcc-386-darwin-exec
rename to src/debug/macho/testdata/gcc-386-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec b/src/debug/macho/testdata/gcc-amd64-darwin-exec
similarity index 100%
rename from src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec
rename to src/debug/macho/testdata/gcc-amd64-darwin-exec
diff --git a/src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec-debug b/src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
similarity index 100%
rename from src/pkg/debug/macho/testdata/gcc-amd64-darwin-exec-debug
rename to src/debug/macho/testdata/gcc-amd64-darwin-exec-debug
diff --git a/src/pkg/debug/macho/testdata/hello.c b/src/debug/macho/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/macho/testdata/hello.c
rename to src/debug/macho/testdata/hello.c
diff --git a/src/pkg/debug/pe/file.go b/src/debug/pe/file.go
similarity index 100%
rename from src/pkg/debug/pe/file.go
rename to src/debug/pe/file.go
diff --git a/src/pkg/debug/pe/file_test.go b/src/debug/pe/file_test.go
similarity index 100%
rename from src/pkg/debug/pe/file_test.go
rename to src/debug/pe/file_test.go
diff --git a/src/pkg/debug/pe/pe.go b/src/debug/pe/pe.go
similarity index 100%
rename from src/pkg/debug/pe/pe.go
rename to src/debug/pe/pe.go
diff --git a/src/pkg/debug/pe/testdata/gcc-386-mingw-exec b/src/debug/pe/testdata/gcc-386-mingw-exec
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-386-mingw-exec
rename to src/debug/pe/testdata/gcc-386-mingw-exec
diff --git a/src/pkg/debug/pe/testdata/gcc-386-mingw-obj b/src/debug/pe/testdata/gcc-386-mingw-obj
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-386-mingw-obj
rename to src/debug/pe/testdata/gcc-386-mingw-obj
diff --git a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-exec b/src/debug/pe/testdata/gcc-amd64-mingw-exec
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-amd64-mingw-exec
rename to src/debug/pe/testdata/gcc-amd64-mingw-exec
diff --git a/src/pkg/debug/pe/testdata/gcc-amd64-mingw-obj b/src/debug/pe/testdata/gcc-amd64-mingw-obj
similarity index 100%
rename from src/pkg/debug/pe/testdata/gcc-amd64-mingw-obj
rename to src/debug/pe/testdata/gcc-amd64-mingw-obj
diff --git a/src/pkg/debug/pe/testdata/hello.c b/src/debug/pe/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/pe/testdata/hello.c
rename to src/debug/pe/testdata/hello.c
diff --git a/src/pkg/debug/plan9obj/file.go b/src/debug/plan9obj/file.go
similarity index 100%
rename from src/pkg/debug/plan9obj/file.go
rename to src/debug/plan9obj/file.go
diff --git a/src/pkg/debug/plan9obj/file_test.go b/src/debug/plan9obj/file_test.go
similarity index 100%
rename from src/pkg/debug/plan9obj/file_test.go
rename to src/debug/plan9obj/file_test.go
diff --git a/src/pkg/debug/plan9obj/plan9obj.go b/src/debug/plan9obj/plan9obj.go
similarity index 100%
rename from src/pkg/debug/plan9obj/plan9obj.go
rename to src/debug/plan9obj/plan9obj.go
diff --git a/src/pkg/debug/plan9obj/testdata/386-plan9-exec b/src/debug/plan9obj/testdata/386-plan9-exec
similarity index 100%
rename from src/pkg/debug/plan9obj/testdata/386-plan9-exec
rename to src/debug/plan9obj/testdata/386-plan9-exec
diff --git a/src/pkg/debug/plan9obj/testdata/amd64-plan9-exec b/src/debug/plan9obj/testdata/amd64-plan9-exec
similarity index 100%
rename from src/pkg/debug/plan9obj/testdata/amd64-plan9-exec
rename to src/debug/plan9obj/testdata/amd64-plan9-exec
diff --git a/src/pkg/debug/plan9obj/testdata/hello.c b/src/debug/plan9obj/testdata/hello.c
similarity index 100%
rename from src/pkg/debug/plan9obj/testdata/hello.c
rename to src/debug/plan9obj/testdata/hello.c
diff --git a/src/pkg/encoding/ascii85/ascii85.go b/src/encoding/ascii85/ascii85.go
similarity index 100%
rename from src/pkg/encoding/ascii85/ascii85.go
rename to src/encoding/ascii85/ascii85.go
diff --git a/src/pkg/encoding/ascii85/ascii85_test.go b/src/encoding/ascii85/ascii85_test.go
similarity index 100%
rename from src/pkg/encoding/ascii85/ascii85_test.go
rename to src/encoding/ascii85/ascii85_test.go
diff --git a/src/pkg/encoding/asn1/asn1.go b/src/encoding/asn1/asn1.go
similarity index 100%
rename from src/pkg/encoding/asn1/asn1.go
rename to src/encoding/asn1/asn1.go
diff --git a/src/pkg/encoding/asn1/asn1_test.go b/src/encoding/asn1/asn1_test.go
similarity index 100%
rename from src/pkg/encoding/asn1/asn1_test.go
rename to src/encoding/asn1/asn1_test.go
diff --git a/src/pkg/encoding/asn1/common.go b/src/encoding/asn1/common.go
similarity index 100%
rename from src/pkg/encoding/asn1/common.go
rename to src/encoding/asn1/common.go
diff --git a/src/pkg/encoding/asn1/marshal.go b/src/encoding/asn1/marshal.go
similarity index 100%
rename from src/pkg/encoding/asn1/marshal.go
rename to src/encoding/asn1/marshal.go
diff --git a/src/pkg/encoding/asn1/marshal_test.go b/src/encoding/asn1/marshal_test.go
similarity index 100%
rename from src/pkg/encoding/asn1/marshal_test.go
rename to src/encoding/asn1/marshal_test.go
diff --git a/src/pkg/encoding/base32/base32.go b/src/encoding/base32/base32.go
similarity index 100%
rename from src/pkg/encoding/base32/base32.go
rename to src/encoding/base32/base32.go
diff --git a/src/pkg/encoding/base32/base32_test.go b/src/encoding/base32/base32_test.go
similarity index 100%
rename from src/pkg/encoding/base32/base32_test.go
rename to src/encoding/base32/base32_test.go
diff --git a/src/pkg/encoding/base32/example_test.go b/src/encoding/base32/example_test.go
similarity index 100%
rename from src/pkg/encoding/base32/example_test.go
rename to src/encoding/base32/example_test.go
diff --git a/src/pkg/encoding/base64/base64.go b/src/encoding/base64/base64.go
similarity index 100%
rename from src/pkg/encoding/base64/base64.go
rename to src/encoding/base64/base64.go
diff --git a/src/pkg/encoding/base64/base64_test.go b/src/encoding/base64/base64_test.go
similarity index 100%
rename from src/pkg/encoding/base64/base64_test.go
rename to src/encoding/base64/base64_test.go
diff --git a/src/pkg/encoding/base64/example_test.go b/src/encoding/base64/example_test.go
similarity index 100%
rename from src/pkg/encoding/base64/example_test.go
rename to src/encoding/base64/example_test.go
diff --git a/src/pkg/encoding/binary/binary.go b/src/encoding/binary/binary.go
similarity index 100%
rename from src/pkg/encoding/binary/binary.go
rename to src/encoding/binary/binary.go
diff --git a/src/pkg/encoding/binary/binary_test.go b/src/encoding/binary/binary_test.go
similarity index 100%
rename from src/pkg/encoding/binary/binary_test.go
rename to src/encoding/binary/binary_test.go
diff --git a/src/pkg/encoding/binary/example_test.go b/src/encoding/binary/example_test.go
similarity index 100%
rename from src/pkg/encoding/binary/example_test.go
rename to src/encoding/binary/example_test.go
diff --git a/src/pkg/encoding/binary/varint.go b/src/encoding/binary/varint.go
similarity index 100%
rename from src/pkg/encoding/binary/varint.go
rename to src/encoding/binary/varint.go
diff --git a/src/pkg/encoding/binary/varint_test.go b/src/encoding/binary/varint_test.go
similarity index 100%
rename from src/pkg/encoding/binary/varint_test.go
rename to src/encoding/binary/varint_test.go
diff --git a/src/pkg/encoding/csv/reader.go b/src/encoding/csv/reader.go
similarity index 100%
rename from src/pkg/encoding/csv/reader.go
rename to src/encoding/csv/reader.go
diff --git a/src/pkg/encoding/csv/reader_test.go b/src/encoding/csv/reader_test.go
similarity index 100%
rename from src/pkg/encoding/csv/reader_test.go
rename to src/encoding/csv/reader_test.go
diff --git a/src/pkg/encoding/csv/writer.go b/src/encoding/csv/writer.go
similarity index 100%
rename from src/pkg/encoding/csv/writer.go
rename to src/encoding/csv/writer.go
diff --git a/src/pkg/encoding/csv/writer_test.go b/src/encoding/csv/writer_test.go
similarity index 100%
rename from src/pkg/encoding/csv/writer_test.go
rename to src/encoding/csv/writer_test.go
diff --git a/src/pkg/encoding/encoding.go b/src/encoding/encoding.go
similarity index 100%
rename from src/pkg/encoding/encoding.go
rename to src/encoding/encoding.go
diff --git a/src/pkg/encoding/gob/codec_test.go b/src/encoding/gob/codec_test.go
similarity index 100%
rename from src/pkg/encoding/gob/codec_test.go
rename to src/encoding/gob/codec_test.go
diff --git a/src/pkg/encoding/gob/debug.go b/src/encoding/gob/debug.go
similarity index 100%
rename from src/pkg/encoding/gob/debug.go
rename to src/encoding/gob/debug.go
diff --git a/src/pkg/encoding/gob/decode.go b/src/encoding/gob/decode.go
similarity index 100%
rename from src/pkg/encoding/gob/decode.go
rename to src/encoding/gob/decode.go
diff --git a/src/pkg/encoding/gob/decoder.go b/src/encoding/gob/decoder.go
similarity index 100%
rename from src/pkg/encoding/gob/decoder.go
rename to src/encoding/gob/decoder.go
diff --git a/src/pkg/encoding/gob/doc.go b/src/encoding/gob/doc.go
similarity index 100%
rename from src/pkg/encoding/gob/doc.go
rename to src/encoding/gob/doc.go
diff --git a/src/pkg/encoding/gob/dump.go b/src/encoding/gob/dump.go
similarity index 100%
rename from src/pkg/encoding/gob/dump.go
rename to src/encoding/gob/dump.go
diff --git a/src/pkg/encoding/gob/encode.go b/src/encoding/gob/encode.go
similarity index 100%
rename from src/pkg/encoding/gob/encode.go
rename to src/encoding/gob/encode.go
diff --git a/src/pkg/encoding/gob/encoder.go b/src/encoding/gob/encoder.go
similarity index 100%
rename from src/pkg/encoding/gob/encoder.go
rename to src/encoding/gob/encoder.go
diff --git a/src/pkg/encoding/gob/encoder_test.go b/src/encoding/gob/encoder_test.go
similarity index 100%
rename from src/pkg/encoding/gob/encoder_test.go
rename to src/encoding/gob/encoder_test.go
diff --git a/src/pkg/encoding/gob/error.go b/src/encoding/gob/error.go
similarity index 100%
rename from src/pkg/encoding/gob/error.go
rename to src/encoding/gob/error.go
diff --git a/src/pkg/encoding/gob/example_encdec_test.go b/src/encoding/gob/example_encdec_test.go
similarity index 100%
rename from src/pkg/encoding/gob/example_encdec_test.go
rename to src/encoding/gob/example_encdec_test.go
diff --git a/src/pkg/encoding/gob/example_interface_test.go b/src/encoding/gob/example_interface_test.go
similarity index 100%
rename from src/pkg/encoding/gob/example_interface_test.go
rename to src/encoding/gob/example_interface_test.go
diff --git a/src/pkg/encoding/gob/example_test.go b/src/encoding/gob/example_test.go
similarity index 100%
rename from src/pkg/encoding/gob/example_test.go
rename to src/encoding/gob/example_test.go
diff --git a/src/pkg/encoding/gob/gobencdec_test.go b/src/encoding/gob/gobencdec_test.go
similarity index 100%
rename from src/pkg/encoding/gob/gobencdec_test.go
rename to src/encoding/gob/gobencdec_test.go
diff --git a/src/pkg/encoding/gob/timing_test.go b/src/encoding/gob/timing_test.go
similarity index 100%
rename from src/pkg/encoding/gob/timing_test.go
rename to src/encoding/gob/timing_test.go
diff --git a/src/pkg/encoding/gob/type.go b/src/encoding/gob/type.go
similarity index 100%
rename from src/pkg/encoding/gob/type.go
rename to src/encoding/gob/type.go
diff --git a/src/pkg/encoding/gob/type_test.go b/src/encoding/gob/type_test.go
similarity index 100%
rename from src/pkg/encoding/gob/type_test.go
rename to src/encoding/gob/type_test.go
diff --git a/src/pkg/encoding/hex/hex.go b/src/encoding/hex/hex.go
similarity index 100%
rename from src/pkg/encoding/hex/hex.go
rename to src/encoding/hex/hex.go
diff --git a/src/pkg/encoding/hex/hex_test.go b/src/encoding/hex/hex_test.go
similarity index 100%
rename from src/pkg/encoding/hex/hex_test.go
rename to src/encoding/hex/hex_test.go
diff --git a/src/pkg/encoding/json/bench_test.go b/src/encoding/json/bench_test.go
similarity index 100%
rename from src/pkg/encoding/json/bench_test.go
rename to src/encoding/json/bench_test.go
diff --git a/src/pkg/encoding/json/decode.go b/src/encoding/json/decode.go
similarity index 100%
rename from src/pkg/encoding/json/decode.go
rename to src/encoding/json/decode.go
diff --git a/src/pkg/encoding/json/decode_test.go b/src/encoding/json/decode_test.go
similarity index 100%
rename from src/pkg/encoding/json/decode_test.go
rename to src/encoding/json/decode_test.go
diff --git a/src/pkg/encoding/json/encode.go b/src/encoding/json/encode.go
similarity index 100%
rename from src/pkg/encoding/json/encode.go
rename to src/encoding/json/encode.go
diff --git a/src/pkg/encoding/json/encode_test.go b/src/encoding/json/encode_test.go
similarity index 100%
rename from src/pkg/encoding/json/encode_test.go
rename to src/encoding/json/encode_test.go
diff --git a/src/pkg/encoding/json/example_test.go b/src/encoding/json/example_test.go
similarity index 100%
rename from src/pkg/encoding/json/example_test.go
rename to src/encoding/json/example_test.go
diff --git a/src/pkg/encoding/json/fold.go b/src/encoding/json/fold.go
similarity index 100%
rename from src/pkg/encoding/json/fold.go
rename to src/encoding/json/fold.go
diff --git a/src/pkg/encoding/json/fold_test.go b/src/encoding/json/fold_test.go
similarity index 100%
rename from src/pkg/encoding/json/fold_test.go
rename to src/encoding/json/fold_test.go
diff --git a/src/pkg/encoding/json/indent.go b/src/encoding/json/indent.go
similarity index 100%
rename from src/pkg/encoding/json/indent.go
rename to src/encoding/json/indent.go
diff --git a/src/pkg/encoding/json/scanner.go b/src/encoding/json/scanner.go
similarity index 100%
rename from src/pkg/encoding/json/scanner.go
rename to src/encoding/json/scanner.go
diff --git a/src/pkg/encoding/json/scanner_test.go b/src/encoding/json/scanner_test.go
similarity index 100%
rename from src/pkg/encoding/json/scanner_test.go
rename to src/encoding/json/scanner_test.go
diff --git a/src/pkg/encoding/json/stream.go b/src/encoding/json/stream.go
similarity index 100%
rename from src/pkg/encoding/json/stream.go
rename to src/encoding/json/stream.go
diff --git a/src/pkg/encoding/json/stream_test.go b/src/encoding/json/stream_test.go
similarity index 100%
rename from src/pkg/encoding/json/stream_test.go
rename to src/encoding/json/stream_test.go
diff --git a/src/pkg/encoding/json/tagkey_test.go b/src/encoding/json/tagkey_test.go
similarity index 100%
rename from src/pkg/encoding/json/tagkey_test.go
rename to src/encoding/json/tagkey_test.go
diff --git a/src/pkg/encoding/json/tags.go b/src/encoding/json/tags.go
similarity index 100%
rename from src/pkg/encoding/json/tags.go
rename to src/encoding/json/tags.go
diff --git a/src/pkg/encoding/json/tags_test.go b/src/encoding/json/tags_test.go
similarity index 100%
rename from src/pkg/encoding/json/tags_test.go
rename to src/encoding/json/tags_test.go
diff --git a/src/pkg/encoding/json/testdata/code.json.gz b/src/encoding/json/testdata/code.json.gz
similarity index 100%
rename from src/pkg/encoding/json/testdata/code.json.gz
rename to src/encoding/json/testdata/code.json.gz
diff --git a/src/pkg/encoding/pem/pem.go b/src/encoding/pem/pem.go
similarity index 100%
rename from src/pkg/encoding/pem/pem.go
rename to src/encoding/pem/pem.go
diff --git a/src/pkg/encoding/pem/pem_test.go b/src/encoding/pem/pem_test.go
similarity index 100%
rename from src/pkg/encoding/pem/pem_test.go
rename to src/encoding/pem/pem_test.go
diff --git a/src/pkg/encoding/xml/atom_test.go b/src/encoding/xml/atom_test.go
similarity index 100%
rename from src/pkg/encoding/xml/atom_test.go
rename to src/encoding/xml/atom_test.go
diff --git a/src/pkg/encoding/xml/example_test.go b/src/encoding/xml/example_test.go
similarity index 100%
rename from src/pkg/encoding/xml/example_test.go
rename to src/encoding/xml/example_test.go
diff --git a/src/pkg/encoding/xml/marshal.go b/src/encoding/xml/marshal.go
similarity index 100%
rename from src/pkg/encoding/xml/marshal.go
rename to src/encoding/xml/marshal.go
diff --git a/src/pkg/encoding/xml/marshal_test.go b/src/encoding/xml/marshal_test.go
similarity index 100%
rename from src/pkg/encoding/xml/marshal_test.go
rename to src/encoding/xml/marshal_test.go
diff --git a/src/pkg/encoding/xml/read.go b/src/encoding/xml/read.go
similarity index 100%
rename from src/pkg/encoding/xml/read.go
rename to src/encoding/xml/read.go
diff --git a/src/pkg/encoding/xml/read_test.go b/src/encoding/xml/read_test.go
similarity index 100%
rename from src/pkg/encoding/xml/read_test.go
rename to src/encoding/xml/read_test.go
diff --git a/src/pkg/encoding/xml/typeinfo.go b/src/encoding/xml/typeinfo.go
similarity index 100%
rename from src/pkg/encoding/xml/typeinfo.go
rename to src/encoding/xml/typeinfo.go
diff --git a/src/pkg/encoding/xml/xml.go b/src/encoding/xml/xml.go
similarity index 100%
rename from src/pkg/encoding/xml/xml.go
rename to src/encoding/xml/xml.go
diff --git a/src/pkg/encoding/xml/xml_test.go b/src/encoding/xml/xml_test.go
similarity index 100%
rename from src/pkg/encoding/xml/xml_test.go
rename to src/encoding/xml/xml_test.go
diff --git a/src/pkg/errors/errors.go b/src/errors/errors.go
similarity index 100%
rename from src/pkg/errors/errors.go
rename to src/errors/errors.go
diff --git a/src/pkg/errors/errors_test.go b/src/errors/errors_test.go
similarity index 100%
rename from src/pkg/errors/errors_test.go
rename to src/errors/errors_test.go
diff --git a/src/pkg/errors/example_test.go b/src/errors/example_test.go
similarity index 100%
rename from src/pkg/errors/example_test.go
rename to src/errors/example_test.go
diff --git a/src/pkg/expvar/expvar.go b/src/expvar/expvar.go
similarity index 100%
rename from src/pkg/expvar/expvar.go
rename to src/expvar/expvar.go
diff --git a/src/pkg/expvar/expvar_test.go b/src/expvar/expvar_test.go
similarity index 100%
rename from src/pkg/expvar/expvar_test.go
rename to src/expvar/expvar_test.go
diff --git a/src/pkg/flag/example_test.go b/src/flag/example_test.go
similarity index 100%
rename from src/pkg/flag/example_test.go
rename to src/flag/example_test.go
diff --git a/src/pkg/flag/export_test.go b/src/flag/export_test.go
similarity index 100%
rename from src/pkg/flag/export_test.go
rename to src/flag/export_test.go
diff --git a/src/pkg/flag/flag.go b/src/flag/flag.go
similarity index 100%
rename from src/pkg/flag/flag.go
rename to src/flag/flag.go
diff --git a/src/pkg/flag/flag_test.go b/src/flag/flag_test.go
similarity index 100%
rename from src/pkg/flag/flag_test.go
rename to src/flag/flag_test.go
diff --git a/src/pkg/fmt/doc.go b/src/fmt/doc.go
similarity index 100%
rename from src/pkg/fmt/doc.go
rename to src/fmt/doc.go
diff --git a/src/pkg/fmt/export_test.go b/src/fmt/export_test.go
similarity index 100%
rename from src/pkg/fmt/export_test.go
rename to src/fmt/export_test.go
diff --git a/src/pkg/fmt/fmt_test.go b/src/fmt/fmt_test.go
similarity index 100%
rename from src/pkg/fmt/fmt_test.go
rename to src/fmt/fmt_test.go
diff --git a/src/pkg/fmt/format.go b/src/fmt/format.go
similarity index 100%
rename from src/pkg/fmt/format.go
rename to src/fmt/format.go
diff --git a/src/pkg/fmt/print.go b/src/fmt/print.go
similarity index 100%
rename from src/pkg/fmt/print.go
rename to src/fmt/print.go
diff --git a/src/pkg/fmt/scan.go b/src/fmt/scan.go
similarity index 100%
rename from src/pkg/fmt/scan.go
rename to src/fmt/scan.go
diff --git a/src/pkg/fmt/scan_test.go b/src/fmt/scan_test.go
similarity index 100%
rename from src/pkg/fmt/scan_test.go
rename to src/fmt/scan_test.go
diff --git a/src/pkg/fmt/stringer_test.go b/src/fmt/stringer_test.go
similarity index 100%
rename from src/pkg/fmt/stringer_test.go
rename to src/fmt/stringer_test.go
diff --git a/src/pkg/go/ast/ast.go b/src/go/ast/ast.go
similarity index 100%
rename from src/pkg/go/ast/ast.go
rename to src/go/ast/ast.go
diff --git a/src/pkg/go/ast/ast_test.go b/src/go/ast/ast_test.go
similarity index 100%
rename from src/pkg/go/ast/ast_test.go
rename to src/go/ast/ast_test.go
diff --git a/src/pkg/go/ast/commentmap.go b/src/go/ast/commentmap.go
similarity index 100%
rename from src/pkg/go/ast/commentmap.go
rename to src/go/ast/commentmap.go
diff --git a/src/pkg/go/ast/commentmap_test.go b/src/go/ast/commentmap_test.go
similarity index 100%
rename from src/pkg/go/ast/commentmap_test.go
rename to src/go/ast/commentmap_test.go
diff --git a/src/pkg/go/ast/example_test.go b/src/go/ast/example_test.go
similarity index 100%
rename from src/pkg/go/ast/example_test.go
rename to src/go/ast/example_test.go
diff --git a/src/pkg/go/ast/filter.go b/src/go/ast/filter.go
similarity index 100%
rename from src/pkg/go/ast/filter.go
rename to src/go/ast/filter.go
diff --git a/src/pkg/go/ast/filter_test.go b/src/go/ast/filter_test.go
similarity index 100%
rename from src/pkg/go/ast/filter_test.go
rename to src/go/ast/filter_test.go
diff --git a/src/pkg/go/ast/import.go b/src/go/ast/import.go
similarity index 100%
rename from src/pkg/go/ast/import.go
rename to src/go/ast/import.go
diff --git a/src/pkg/go/ast/print.go b/src/go/ast/print.go
similarity index 100%
rename from src/pkg/go/ast/print.go
rename to src/go/ast/print.go
diff --git a/src/pkg/go/ast/print_test.go b/src/go/ast/print_test.go
similarity index 100%
rename from src/pkg/go/ast/print_test.go
rename to src/go/ast/print_test.go
diff --git a/src/pkg/go/ast/resolve.go b/src/go/ast/resolve.go
similarity index 100%
rename from src/pkg/go/ast/resolve.go
rename to src/go/ast/resolve.go
diff --git a/src/pkg/go/ast/scope.go b/src/go/ast/scope.go
similarity index 100%
rename from src/pkg/go/ast/scope.go
rename to src/go/ast/scope.go
diff --git a/src/pkg/go/ast/walk.go b/src/go/ast/walk.go
similarity index 100%
rename from src/pkg/go/ast/walk.go
rename to src/go/ast/walk.go
diff --git a/src/pkg/go/build/build.go b/src/go/build/build.go
similarity index 100%
rename from src/pkg/go/build/build.go
rename to src/go/build/build.go
diff --git a/src/pkg/go/build/build_test.go b/src/go/build/build_test.go
similarity index 100%
rename from src/pkg/go/build/build_test.go
rename to src/go/build/build_test.go
diff --git a/src/pkg/go/build/deps_test.go b/src/go/build/deps_test.go
similarity index 100%
rename from src/pkg/go/build/deps_test.go
rename to src/go/build/deps_test.go
diff --git a/src/pkg/go/build/doc.go b/src/go/build/doc.go
similarity index 100%
rename from src/pkg/go/build/doc.go
rename to src/go/build/doc.go
diff --git a/src/pkg/go/build/read.go b/src/go/build/read.go
similarity index 100%
rename from src/pkg/go/build/read.go
rename to src/go/build/read.go
diff --git a/src/pkg/go/build/read_test.go b/src/go/build/read_test.go
similarity index 100%
rename from src/pkg/go/build/read_test.go
rename to src/go/build/read_test.go
diff --git a/src/pkg/go/build/syslist.go b/src/go/build/syslist.go
similarity index 100%
rename from src/pkg/go/build/syslist.go
rename to src/go/build/syslist.go
diff --git a/src/pkg/go/build/syslist_test.go b/src/go/build/syslist_test.go
similarity index 100%
rename from src/pkg/go/build/syslist_test.go
rename to src/go/build/syslist_test.go
diff --git a/src/pkg/go/build/testdata/other/file/file.go b/src/go/build/testdata/other/file/file.go
similarity index 100%
rename from src/pkg/go/build/testdata/other/file/file.go
rename to src/go/build/testdata/other/file/file.go
diff --git a/src/pkg/go/build/testdata/other/main.go b/src/go/build/testdata/other/main.go
similarity index 100%
rename from src/pkg/go/build/testdata/other/main.go
rename to src/go/build/testdata/other/main.go
diff --git a/src/pkg/go/doc/Makefile b/src/go/doc/Makefile
similarity index 100%
rename from src/pkg/go/doc/Makefile
rename to src/go/doc/Makefile
diff --git a/src/pkg/go/doc/comment.go b/src/go/doc/comment.go
similarity index 100%
rename from src/pkg/go/doc/comment.go
rename to src/go/doc/comment.go
diff --git a/src/pkg/go/doc/comment_test.go b/src/go/doc/comment_test.go
similarity index 100%
rename from src/pkg/go/doc/comment_test.go
rename to src/go/doc/comment_test.go
diff --git a/src/pkg/go/doc/doc.go b/src/go/doc/doc.go
similarity index 100%
rename from src/pkg/go/doc/doc.go
rename to src/go/doc/doc.go
diff --git a/src/pkg/go/doc/doc_test.go b/src/go/doc/doc_test.go
similarity index 100%
rename from src/pkg/go/doc/doc_test.go
rename to src/go/doc/doc_test.go
diff --git a/src/pkg/go/doc/example.go b/src/go/doc/example.go
similarity index 100%
rename from src/pkg/go/doc/example.go
rename to src/go/doc/example.go
diff --git a/src/pkg/go/doc/example_test.go b/src/go/doc/example_test.go
similarity index 100%
rename from src/pkg/go/doc/example_test.go
rename to src/go/doc/example_test.go
diff --git a/src/pkg/go/doc/exports.go b/src/go/doc/exports.go
similarity index 100%
rename from src/pkg/go/doc/exports.go
rename to src/go/doc/exports.go
diff --git a/src/pkg/go/doc/filter.go b/src/go/doc/filter.go
similarity index 100%
rename from src/pkg/go/doc/filter.go
rename to src/go/doc/filter.go
diff --git a/src/pkg/go/doc/headscan.go b/src/go/doc/headscan.go
similarity index 100%
rename from src/pkg/go/doc/headscan.go
rename to src/go/doc/headscan.go
diff --git a/src/pkg/go/doc/reader.go b/src/go/doc/reader.go
similarity index 100%
rename from src/pkg/go/doc/reader.go
rename to src/go/doc/reader.go
diff --git a/src/pkg/go/doc/synopsis.go b/src/go/doc/synopsis.go
similarity index 100%
rename from src/pkg/go/doc/synopsis.go
rename to src/go/doc/synopsis.go
diff --git a/src/pkg/go/doc/synopsis_test.go b/src/go/doc/synopsis_test.go
similarity index 100%
rename from src/pkg/go/doc/synopsis_test.go
rename to src/go/doc/synopsis_test.go
diff --git a/src/pkg/go/doc/testdata/a.0.golden b/src/go/doc/testdata/a.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/a.0.golden
rename to src/go/doc/testdata/a.0.golden
diff --git a/src/pkg/go/doc/testdata/a.1.golden b/src/go/doc/testdata/a.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/a.1.golden
rename to src/go/doc/testdata/a.1.golden
diff --git a/src/pkg/go/doc/testdata/a.2.golden b/src/go/doc/testdata/a.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/a.2.golden
rename to src/go/doc/testdata/a.2.golden
diff --git a/src/pkg/go/doc/testdata/a0.go b/src/go/doc/testdata/a0.go
similarity index 100%
rename from src/pkg/go/doc/testdata/a0.go
rename to src/go/doc/testdata/a0.go
diff --git a/src/pkg/go/doc/testdata/a1.go b/src/go/doc/testdata/a1.go
similarity index 100%
rename from src/pkg/go/doc/testdata/a1.go
rename to src/go/doc/testdata/a1.go
diff --git a/src/pkg/go/doc/testdata/b.0.golden b/src/go/doc/testdata/b.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/b.0.golden
rename to src/go/doc/testdata/b.0.golden
diff --git a/src/pkg/go/doc/testdata/b.1.golden b/src/go/doc/testdata/b.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/b.1.golden
rename to src/go/doc/testdata/b.1.golden
diff --git a/src/pkg/go/doc/testdata/b.2.golden b/src/go/doc/testdata/b.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/b.2.golden
rename to src/go/doc/testdata/b.2.golden
diff --git a/src/pkg/go/doc/testdata/b.go b/src/go/doc/testdata/b.go
similarity index 100%
rename from src/pkg/go/doc/testdata/b.go
rename to src/go/doc/testdata/b.go
diff --git a/src/pkg/go/doc/testdata/benchmark.go b/src/go/doc/testdata/benchmark.go
similarity index 100%
rename from src/pkg/go/doc/testdata/benchmark.go
rename to src/go/doc/testdata/benchmark.go
diff --git a/src/pkg/go/doc/testdata/bugpara.0.golden b/src/go/doc/testdata/bugpara.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.0.golden
rename to src/go/doc/testdata/bugpara.0.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.1.golden b/src/go/doc/testdata/bugpara.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.1.golden
rename to src/go/doc/testdata/bugpara.1.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.2.golden b/src/go/doc/testdata/bugpara.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.2.golden
rename to src/go/doc/testdata/bugpara.2.golden
diff --git a/src/pkg/go/doc/testdata/bugpara.go b/src/go/doc/testdata/bugpara.go
similarity index 100%
rename from src/pkg/go/doc/testdata/bugpara.go
rename to src/go/doc/testdata/bugpara.go
diff --git a/src/pkg/go/doc/testdata/c.0.golden b/src/go/doc/testdata/c.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/c.0.golden
rename to src/go/doc/testdata/c.0.golden
diff --git a/src/pkg/go/doc/testdata/c.1.golden b/src/go/doc/testdata/c.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/c.1.golden
rename to src/go/doc/testdata/c.1.golden
diff --git a/src/pkg/go/doc/testdata/c.2.golden b/src/go/doc/testdata/c.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/c.2.golden
rename to src/go/doc/testdata/c.2.golden
diff --git a/src/pkg/go/doc/testdata/c.go b/src/go/doc/testdata/c.go
similarity index 100%
rename from src/pkg/go/doc/testdata/c.go
rename to src/go/doc/testdata/c.go
diff --git a/src/pkg/go/doc/testdata/d.0.golden b/src/go/doc/testdata/d.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/d.0.golden
rename to src/go/doc/testdata/d.0.golden
diff --git a/src/pkg/go/doc/testdata/d.1.golden b/src/go/doc/testdata/d.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/d.1.golden
rename to src/go/doc/testdata/d.1.golden
diff --git a/src/pkg/go/doc/testdata/d.2.golden b/src/go/doc/testdata/d.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/d.2.golden
rename to src/go/doc/testdata/d.2.golden
diff --git a/src/pkg/go/doc/testdata/d1.go b/src/go/doc/testdata/d1.go
similarity index 100%
rename from src/pkg/go/doc/testdata/d1.go
rename to src/go/doc/testdata/d1.go
diff --git a/src/pkg/go/doc/testdata/d2.go b/src/go/doc/testdata/d2.go
similarity index 100%
rename from src/pkg/go/doc/testdata/d2.go
rename to src/go/doc/testdata/d2.go
diff --git a/src/pkg/go/doc/testdata/e.0.golden b/src/go/doc/testdata/e.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/e.0.golden
rename to src/go/doc/testdata/e.0.golden
diff --git a/src/pkg/go/doc/testdata/e.1.golden b/src/go/doc/testdata/e.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/e.1.golden
rename to src/go/doc/testdata/e.1.golden
diff --git a/src/pkg/go/doc/testdata/e.2.golden b/src/go/doc/testdata/e.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/e.2.golden
rename to src/go/doc/testdata/e.2.golden
diff --git a/src/pkg/go/doc/testdata/e.go b/src/go/doc/testdata/e.go
similarity index 100%
rename from src/pkg/go/doc/testdata/e.go
rename to src/go/doc/testdata/e.go
diff --git a/src/pkg/go/doc/testdata/error1.0.golden b/src/go/doc/testdata/error1.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.0.golden
rename to src/go/doc/testdata/error1.0.golden
diff --git a/src/pkg/go/doc/testdata/error1.1.golden b/src/go/doc/testdata/error1.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.1.golden
rename to src/go/doc/testdata/error1.1.golden
diff --git a/src/pkg/go/doc/testdata/error1.2.golden b/src/go/doc/testdata/error1.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.2.golden
rename to src/go/doc/testdata/error1.2.golden
diff --git a/src/pkg/go/doc/testdata/error1.go b/src/go/doc/testdata/error1.go
similarity index 100%
rename from src/pkg/go/doc/testdata/error1.go
rename to src/go/doc/testdata/error1.go
diff --git a/src/pkg/go/doc/testdata/error2.0.golden b/src/go/doc/testdata/error2.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.0.golden
rename to src/go/doc/testdata/error2.0.golden
diff --git a/src/pkg/go/doc/testdata/error2.1.golden b/src/go/doc/testdata/error2.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.1.golden
rename to src/go/doc/testdata/error2.1.golden
diff --git a/src/pkg/go/doc/testdata/error2.2.golden b/src/go/doc/testdata/error2.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.2.golden
rename to src/go/doc/testdata/error2.2.golden
diff --git a/src/pkg/go/doc/testdata/error2.go b/src/go/doc/testdata/error2.go
similarity index 100%
rename from src/pkg/go/doc/testdata/error2.go
rename to src/go/doc/testdata/error2.go
diff --git a/src/pkg/go/doc/testdata/example.go b/src/go/doc/testdata/example.go
similarity index 100%
rename from src/pkg/go/doc/testdata/example.go
rename to src/go/doc/testdata/example.go
diff --git a/src/pkg/go/doc/testdata/f.0.golden b/src/go/doc/testdata/f.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/f.0.golden
rename to src/go/doc/testdata/f.0.golden
diff --git a/src/pkg/go/doc/testdata/f.1.golden b/src/go/doc/testdata/f.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/f.1.golden
rename to src/go/doc/testdata/f.1.golden
diff --git a/src/pkg/go/doc/testdata/f.2.golden b/src/go/doc/testdata/f.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/f.2.golden
rename to src/go/doc/testdata/f.2.golden
diff --git a/src/pkg/go/doc/testdata/f.go b/src/go/doc/testdata/f.go
similarity index 100%
rename from src/pkg/go/doc/testdata/f.go
rename to src/go/doc/testdata/f.go
diff --git a/src/pkg/go/doc/testdata/template.txt b/src/go/doc/testdata/template.txt
similarity index 100%
rename from src/pkg/go/doc/testdata/template.txt
rename to src/go/doc/testdata/template.txt
diff --git a/src/pkg/go/doc/testdata/testing.0.golden b/src/go/doc/testdata/testing.0.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.0.golden
rename to src/go/doc/testdata/testing.0.golden
diff --git a/src/pkg/go/doc/testdata/testing.1.golden b/src/go/doc/testdata/testing.1.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.1.golden
rename to src/go/doc/testdata/testing.1.golden
diff --git a/src/pkg/go/doc/testdata/testing.2.golden b/src/go/doc/testdata/testing.2.golden
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.2.golden
rename to src/go/doc/testdata/testing.2.golden
diff --git a/src/pkg/go/doc/testdata/testing.go b/src/go/doc/testdata/testing.go
similarity index 100%
rename from src/pkg/go/doc/testdata/testing.go
rename to src/go/doc/testdata/testing.go
diff --git a/src/pkg/go/format/format.go b/src/go/format/format.go
similarity index 100%
rename from src/pkg/go/format/format.go
rename to src/go/format/format.go
diff --git a/src/pkg/go/format/format_test.go b/src/go/format/format_test.go
similarity index 100%
rename from src/pkg/go/format/format_test.go
rename to src/go/format/format_test.go
diff --git a/src/pkg/go/parser/error_test.go b/src/go/parser/error_test.go
similarity index 100%
rename from src/pkg/go/parser/error_test.go
rename to src/go/parser/error_test.go
diff --git a/src/pkg/go/parser/example_test.go b/src/go/parser/example_test.go
similarity index 100%
rename from src/pkg/go/parser/example_test.go
rename to src/go/parser/example_test.go
diff --git a/src/pkg/go/parser/interface.go b/src/go/parser/interface.go
similarity index 100%
rename from src/pkg/go/parser/interface.go
rename to src/go/parser/interface.go
diff --git a/src/pkg/go/parser/parser.go b/src/go/parser/parser.go
similarity index 100%
rename from src/pkg/go/parser/parser.go
rename to src/go/parser/parser.go
diff --git a/src/pkg/go/parser/parser_test.go b/src/go/parser/parser_test.go
similarity index 100%
rename from src/pkg/go/parser/parser_test.go
rename to src/go/parser/parser_test.go
diff --git a/src/pkg/go/parser/performance_test.go b/src/go/parser/performance_test.go
similarity index 100%
rename from src/pkg/go/parser/performance_test.go
rename to src/go/parser/performance_test.go
diff --git a/src/pkg/go/parser/short_test.go b/src/go/parser/short_test.go
similarity index 100%
rename from src/pkg/go/parser/short_test.go
rename to src/go/parser/short_test.go
diff --git a/src/pkg/go/parser/testdata/commas.src b/src/go/parser/testdata/commas.src
similarity index 100%
rename from src/pkg/go/parser/testdata/commas.src
rename to src/go/parser/testdata/commas.src
diff --git a/src/pkg/go/parser/testdata/issue3106.src b/src/go/parser/testdata/issue3106.src
similarity index 100%
rename from src/pkg/go/parser/testdata/issue3106.src
rename to src/go/parser/testdata/issue3106.src
diff --git a/src/pkg/go/printer/example_test.go b/src/go/printer/example_test.go
similarity index 100%
rename from src/pkg/go/printer/example_test.go
rename to src/go/printer/example_test.go
diff --git a/src/pkg/go/printer/nodes.go b/src/go/printer/nodes.go
similarity index 100%
rename from src/pkg/go/printer/nodes.go
rename to src/go/printer/nodes.go
diff --git a/src/pkg/go/printer/performance_test.go b/src/go/printer/performance_test.go
similarity index 100%
rename from src/pkg/go/printer/performance_test.go
rename to src/go/printer/performance_test.go
diff --git a/src/pkg/go/printer/printer.go b/src/go/printer/printer.go
similarity index 100%
rename from src/pkg/go/printer/printer.go
rename to src/go/printer/printer.go
diff --git a/src/pkg/go/printer/printer_test.go b/src/go/printer/printer_test.go
similarity index 100%
rename from src/pkg/go/printer/printer_test.go
rename to src/go/printer/printer_test.go
diff --git a/src/pkg/go/printer/testdata/comments.golden b/src/go/printer/testdata/comments.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/comments.golden
rename to src/go/printer/testdata/comments.golden
diff --git a/src/pkg/go/printer/testdata/comments.input b/src/go/printer/testdata/comments.input
similarity index 100%
rename from src/pkg/go/printer/testdata/comments.input
rename to src/go/printer/testdata/comments.input
diff --git a/src/pkg/go/printer/testdata/comments.x b/src/go/printer/testdata/comments.x
similarity index 100%
rename from src/pkg/go/printer/testdata/comments.x
rename to src/go/printer/testdata/comments.x
diff --git a/src/pkg/go/printer/testdata/comments2.golden b/src/go/printer/testdata/comments2.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/comments2.golden
rename to src/go/printer/testdata/comments2.golden
diff --git a/src/pkg/go/printer/testdata/comments2.input b/src/go/printer/testdata/comments2.input
similarity index 100%
rename from src/pkg/go/printer/testdata/comments2.input
rename to src/go/printer/testdata/comments2.input
diff --git a/src/pkg/go/printer/testdata/declarations.golden b/src/go/printer/testdata/declarations.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/declarations.golden
rename to src/go/printer/testdata/declarations.golden
diff --git a/src/pkg/go/printer/testdata/declarations.input b/src/go/printer/testdata/declarations.input
similarity index 100%
rename from src/pkg/go/printer/testdata/declarations.input
rename to src/go/printer/testdata/declarations.input
diff --git a/src/pkg/go/printer/testdata/empty.golden b/src/go/printer/testdata/empty.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/empty.golden
rename to src/go/printer/testdata/empty.golden
diff --git a/src/pkg/go/printer/testdata/empty.input b/src/go/printer/testdata/empty.input
similarity index 100%
rename from src/pkg/go/printer/testdata/empty.input
rename to src/go/printer/testdata/empty.input
diff --git a/src/pkg/go/printer/testdata/expressions.golden b/src/go/printer/testdata/expressions.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/expressions.golden
rename to src/go/printer/testdata/expressions.golden
diff --git a/src/pkg/go/printer/testdata/expressions.input b/src/go/printer/testdata/expressions.input
similarity index 100%
rename from src/pkg/go/printer/testdata/expressions.input
rename to src/go/printer/testdata/expressions.input
diff --git a/src/pkg/go/printer/testdata/expressions.raw b/src/go/printer/testdata/expressions.raw
similarity index 100%
rename from src/pkg/go/printer/testdata/expressions.raw
rename to src/go/printer/testdata/expressions.raw
diff --git a/src/pkg/go/printer/testdata/linebreaks.golden b/src/go/printer/testdata/linebreaks.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/linebreaks.golden
rename to src/go/printer/testdata/linebreaks.golden
diff --git a/src/pkg/go/printer/testdata/linebreaks.input b/src/go/printer/testdata/linebreaks.input
similarity index 100%
rename from src/pkg/go/printer/testdata/linebreaks.input
rename to src/go/printer/testdata/linebreaks.input
diff --git a/src/pkg/go/printer/testdata/parser.go b/src/go/printer/testdata/parser.go
similarity index 100%
rename from src/pkg/go/printer/testdata/parser.go
rename to src/go/printer/testdata/parser.go
diff --git a/src/pkg/go/printer/testdata/slow.golden b/src/go/printer/testdata/slow.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/slow.golden
rename to src/go/printer/testdata/slow.golden
diff --git a/src/pkg/go/printer/testdata/slow.input b/src/go/printer/testdata/slow.input
similarity index 100%
rename from src/pkg/go/printer/testdata/slow.input
rename to src/go/printer/testdata/slow.input
diff --git a/src/pkg/go/printer/testdata/statements.golden b/src/go/printer/testdata/statements.golden
similarity index 100%
rename from src/pkg/go/printer/testdata/statements.golden
rename to src/go/printer/testdata/statements.golden
diff --git a/src/pkg/go/printer/testdata/statements.input b/src/go/printer/testdata/statements.input
similarity index 100%
rename from src/pkg/go/printer/testdata/statements.input
rename to src/go/printer/testdata/statements.input
diff --git a/src/pkg/go/scanner/errors.go b/src/go/scanner/errors.go
similarity index 100%
rename from src/pkg/go/scanner/errors.go
rename to src/go/scanner/errors.go
diff --git a/src/pkg/go/scanner/example_test.go b/src/go/scanner/example_test.go
similarity index 100%
rename from src/pkg/go/scanner/example_test.go
rename to src/go/scanner/example_test.go
diff --git a/src/pkg/go/scanner/scanner.go b/src/go/scanner/scanner.go
similarity index 100%
rename from src/pkg/go/scanner/scanner.go
rename to src/go/scanner/scanner.go
diff --git a/src/pkg/go/scanner/scanner_test.go b/src/go/scanner/scanner_test.go
similarity index 100%
rename from src/pkg/go/scanner/scanner_test.go
rename to src/go/scanner/scanner_test.go
diff --git a/src/pkg/go/token/position.go b/src/go/token/position.go
similarity index 100%
rename from src/pkg/go/token/position.go
rename to src/go/token/position.go
diff --git a/src/pkg/go/token/position_test.go b/src/go/token/position_test.go
similarity index 100%
rename from src/pkg/go/token/position_test.go
rename to src/go/token/position_test.go
diff --git a/src/pkg/go/token/serialize.go b/src/go/token/serialize.go
similarity index 100%
rename from src/pkg/go/token/serialize.go
rename to src/go/token/serialize.go
diff --git a/src/pkg/go/token/serialize_test.go b/src/go/token/serialize_test.go
similarity index 100%
rename from src/pkg/go/token/serialize_test.go
rename to src/go/token/serialize_test.go
diff --git a/src/pkg/go/token/token.go b/src/go/token/token.go
similarity index 100%
rename from src/pkg/go/token/token.go
rename to src/go/token/token.go
diff --git a/src/pkg/hash/adler32/adler32.go b/src/hash/adler32/adler32.go
similarity index 100%
rename from src/pkg/hash/adler32/adler32.go
rename to src/hash/adler32/adler32.go
diff --git a/src/pkg/hash/adler32/adler32_test.go b/src/hash/adler32/adler32_test.go
similarity index 100%
rename from src/pkg/hash/adler32/adler32_test.go
rename to src/hash/adler32/adler32_test.go
diff --git a/src/pkg/hash/crc32/crc32.go b/src/hash/crc32/crc32.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32.go
rename to src/hash/crc32/crc32.go
diff --git a/src/pkg/hash/crc32/crc32_amd64.s b/src/hash/crc32/crc32_amd64.s
similarity index 100%
rename from src/pkg/hash/crc32/crc32_amd64.s
rename to src/hash/crc32/crc32_amd64.s
diff --git a/src/pkg/hash/crc32/crc32_amd64p32.s b/src/hash/crc32/crc32_amd64p32.s
similarity index 100%
rename from src/pkg/hash/crc32/crc32_amd64p32.s
rename to src/hash/crc32/crc32_amd64p32.s
diff --git a/src/pkg/hash/crc32/crc32_amd64x.go b/src/hash/crc32/crc32_amd64x.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32_amd64x.go
rename to src/hash/crc32/crc32_amd64x.go
diff --git a/src/pkg/hash/crc32/crc32_generic.go b/src/hash/crc32/crc32_generic.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32_generic.go
rename to src/hash/crc32/crc32_generic.go
diff --git a/src/pkg/hash/crc32/crc32_test.go b/src/hash/crc32/crc32_test.go
similarity index 100%
rename from src/pkg/hash/crc32/crc32_test.go
rename to src/hash/crc32/crc32_test.go
diff --git a/src/pkg/hash/crc64/crc64.go b/src/hash/crc64/crc64.go
similarity index 100%
rename from src/pkg/hash/crc64/crc64.go
rename to src/hash/crc64/crc64.go
diff --git a/src/pkg/hash/crc64/crc64_test.go b/src/hash/crc64/crc64_test.go
similarity index 100%
rename from src/pkg/hash/crc64/crc64_test.go
rename to src/hash/crc64/crc64_test.go
diff --git a/src/pkg/hash/fnv/fnv.go b/src/hash/fnv/fnv.go
similarity index 100%
rename from src/pkg/hash/fnv/fnv.go
rename to src/hash/fnv/fnv.go
diff --git a/src/pkg/hash/fnv/fnv_test.go b/src/hash/fnv/fnv_test.go
similarity index 100%
rename from src/pkg/hash/fnv/fnv_test.go
rename to src/hash/fnv/fnv_test.go
diff --git a/src/pkg/hash/hash.go b/src/hash/hash.go
similarity index 100%
rename from src/pkg/hash/hash.go
rename to src/hash/hash.go
diff --git a/src/pkg/hash/test_cases.txt b/src/hash/test_cases.txt
similarity index 100%
rename from src/pkg/hash/test_cases.txt
rename to src/hash/test_cases.txt
diff --git a/src/pkg/hash/test_gen.awk b/src/hash/test_gen.awk
similarity index 100%
rename from src/pkg/hash/test_gen.awk
rename to src/hash/test_gen.awk
diff --git a/src/pkg/html/entity.go b/src/html/entity.go
similarity index 100%
rename from src/pkg/html/entity.go
rename to src/html/entity.go
diff --git a/src/pkg/html/entity_test.go b/src/html/entity_test.go
similarity index 100%
rename from src/pkg/html/entity_test.go
rename to src/html/entity_test.go
diff --git a/src/pkg/html/escape.go b/src/html/escape.go
similarity index 100%
rename from src/pkg/html/escape.go
rename to src/html/escape.go
diff --git a/src/pkg/html/escape_test.go b/src/html/escape_test.go
similarity index 100%
rename from src/pkg/html/escape_test.go
rename to src/html/escape_test.go
diff --git a/src/pkg/html/template/attr.go b/src/html/template/attr.go
similarity index 100%
rename from src/pkg/html/template/attr.go
rename to src/html/template/attr.go
diff --git a/src/pkg/html/template/clone_test.go b/src/html/template/clone_test.go
similarity index 100%
rename from src/pkg/html/template/clone_test.go
rename to src/html/template/clone_test.go
diff --git a/src/pkg/html/template/content.go b/src/html/template/content.go
similarity index 100%
rename from src/pkg/html/template/content.go
rename to src/html/template/content.go
diff --git a/src/pkg/html/template/content_test.go b/src/html/template/content_test.go
similarity index 100%
rename from src/pkg/html/template/content_test.go
rename to src/html/template/content_test.go
diff --git a/src/pkg/html/template/context.go b/src/html/template/context.go
similarity index 100%
rename from src/pkg/html/template/context.go
rename to src/html/template/context.go
diff --git a/src/pkg/html/template/css.go b/src/html/template/css.go
similarity index 100%
rename from src/pkg/html/template/css.go
rename to src/html/template/css.go
diff --git a/src/pkg/html/template/css_test.go b/src/html/template/css_test.go
similarity index 100%
rename from src/pkg/html/template/css_test.go
rename to src/html/template/css_test.go
diff --git a/src/pkg/html/template/doc.go b/src/html/template/doc.go
similarity index 100%
rename from src/pkg/html/template/doc.go
rename to src/html/template/doc.go
diff --git a/src/pkg/html/template/error.go b/src/html/template/error.go
similarity index 100%
rename from src/pkg/html/template/error.go
rename to src/html/template/error.go
diff --git a/src/pkg/html/template/escape.go b/src/html/template/escape.go
similarity index 100%
rename from src/pkg/html/template/escape.go
rename to src/html/template/escape.go
diff --git a/src/pkg/html/template/escape_test.go b/src/html/template/escape_test.go
similarity index 100%
rename from src/pkg/html/template/escape_test.go
rename to src/html/template/escape_test.go
diff --git a/src/pkg/html/template/html.go b/src/html/template/html.go
similarity index 100%
rename from src/pkg/html/template/html.go
rename to src/html/template/html.go
diff --git a/src/pkg/html/template/html_test.go b/src/html/template/html_test.go
similarity index 100%
rename from src/pkg/html/template/html_test.go
rename to src/html/template/html_test.go
diff --git a/src/pkg/html/template/js.go b/src/html/template/js.go
similarity index 100%
rename from src/pkg/html/template/js.go
rename to src/html/template/js.go
diff --git a/src/pkg/html/template/js_test.go b/src/html/template/js_test.go
similarity index 100%
rename from src/pkg/html/template/js_test.go
rename to src/html/template/js_test.go
diff --git a/src/pkg/html/template/template.go b/src/html/template/template.go
similarity index 100%
rename from src/pkg/html/template/template.go
rename to src/html/template/template.go
diff --git a/src/pkg/html/template/transition.go b/src/html/template/transition.go
similarity index 100%
rename from src/pkg/html/template/transition.go
rename to src/html/template/transition.go
diff --git a/src/pkg/html/template/url.go b/src/html/template/url.go
similarity index 100%
rename from src/pkg/html/template/url.go
rename to src/html/template/url.go
diff --git a/src/pkg/html/template/url_test.go b/src/html/template/url_test.go
similarity index 100%
rename from src/pkg/html/template/url_test.go
rename to src/html/template/url_test.go
diff --git a/src/pkg/image/color/color.go b/src/image/color/color.go
similarity index 100%
rename from src/pkg/image/color/color.go
rename to src/image/color/color.go
diff --git a/src/pkg/image/color/palette/gen.go b/src/image/color/palette/gen.go
similarity index 100%
rename from src/pkg/image/color/palette/gen.go
rename to src/image/color/palette/gen.go
diff --git a/src/pkg/image/color/palette/generate.go b/src/image/color/palette/generate.go
similarity index 100%
rename from src/pkg/image/color/palette/generate.go
rename to src/image/color/palette/generate.go
diff --git a/src/pkg/image/color/palette/palette.go b/src/image/color/palette/palette.go
similarity index 100%
rename from src/pkg/image/color/palette/palette.go
rename to src/image/color/palette/palette.go
diff --git a/src/pkg/image/color/ycbcr.go b/src/image/color/ycbcr.go
similarity index 100%
rename from src/pkg/image/color/ycbcr.go
rename to src/image/color/ycbcr.go
diff --git a/src/pkg/image/color/ycbcr_test.go b/src/image/color/ycbcr_test.go
similarity index 100%
rename from src/pkg/image/color/ycbcr_test.go
rename to src/image/color/ycbcr_test.go
diff --git a/src/pkg/image/decode_example_test.go b/src/image/decode_example_test.go
similarity index 100%
rename from src/pkg/image/decode_example_test.go
rename to src/image/decode_example_test.go
diff --git a/src/pkg/image/decode_test.go b/src/image/decode_test.go
similarity index 100%
rename from src/pkg/image/decode_test.go
rename to src/image/decode_test.go
diff --git a/src/pkg/image/draw/bench_test.go b/src/image/draw/bench_test.go
similarity index 100%
rename from src/pkg/image/draw/bench_test.go
rename to src/image/draw/bench_test.go
diff --git a/src/pkg/image/draw/clip_test.go b/src/image/draw/clip_test.go
similarity index 100%
rename from src/pkg/image/draw/clip_test.go
rename to src/image/draw/clip_test.go
diff --git a/src/pkg/image/draw/draw.go b/src/image/draw/draw.go
similarity index 100%
rename from src/pkg/image/draw/draw.go
rename to src/image/draw/draw.go
diff --git a/src/pkg/image/draw/draw_test.go b/src/image/draw/draw_test.go
similarity index 100%
rename from src/pkg/image/draw/draw_test.go
rename to src/image/draw/draw_test.go
diff --git a/src/pkg/image/format.go b/src/image/format.go
similarity index 100%
rename from src/pkg/image/format.go
rename to src/image/format.go
diff --git a/src/pkg/image/geom.go b/src/image/geom.go
similarity index 100%
rename from src/pkg/image/geom.go
rename to src/image/geom.go
diff --git a/src/pkg/image/gif/reader.go b/src/image/gif/reader.go
similarity index 100%
rename from src/pkg/image/gif/reader.go
rename to src/image/gif/reader.go
diff --git a/src/pkg/image/gif/reader_test.go b/src/image/gif/reader_test.go
similarity index 100%
rename from src/pkg/image/gif/reader_test.go
rename to src/image/gif/reader_test.go
diff --git a/src/pkg/image/gif/writer.go b/src/image/gif/writer.go
similarity index 100%
rename from src/pkg/image/gif/writer.go
rename to src/image/gif/writer.go
diff --git a/src/pkg/image/gif/writer_test.go b/src/image/gif/writer_test.go
similarity index 100%
rename from src/pkg/image/gif/writer_test.go
rename to src/image/gif/writer_test.go
diff --git a/src/pkg/image/image.go b/src/image/image.go
similarity index 100%
rename from src/pkg/image/image.go
rename to src/image/image.go
diff --git a/src/pkg/image/image_test.go b/src/image/image_test.go
similarity index 100%
rename from src/pkg/image/image_test.go
rename to src/image/image_test.go
diff --git a/src/pkg/image/jpeg/dct_test.go b/src/image/jpeg/dct_test.go
similarity index 100%
rename from src/pkg/image/jpeg/dct_test.go
rename to src/image/jpeg/dct_test.go
diff --git a/src/pkg/image/jpeg/fdct.go b/src/image/jpeg/fdct.go
similarity index 100%
rename from src/pkg/image/jpeg/fdct.go
rename to src/image/jpeg/fdct.go
diff --git a/src/pkg/image/jpeg/huffman.go b/src/image/jpeg/huffman.go
similarity index 100%
rename from src/pkg/image/jpeg/huffman.go
rename to src/image/jpeg/huffman.go
diff --git a/src/pkg/image/jpeg/idct.go b/src/image/jpeg/idct.go
similarity index 100%
rename from src/pkg/image/jpeg/idct.go
rename to src/image/jpeg/idct.go
diff --git a/src/pkg/image/jpeg/reader.go b/src/image/jpeg/reader.go
similarity index 100%
rename from src/pkg/image/jpeg/reader.go
rename to src/image/jpeg/reader.go
diff --git a/src/pkg/image/jpeg/reader_test.go b/src/image/jpeg/reader_test.go
similarity index 100%
rename from src/pkg/image/jpeg/reader_test.go
rename to src/image/jpeg/reader_test.go
diff --git a/src/pkg/image/jpeg/scan.go b/src/image/jpeg/scan.go
similarity index 100%
rename from src/pkg/image/jpeg/scan.go
rename to src/image/jpeg/scan.go
diff --git a/src/pkg/image/jpeg/writer.go b/src/image/jpeg/writer.go
similarity index 100%
rename from src/pkg/image/jpeg/writer.go
rename to src/image/jpeg/writer.go
diff --git a/src/pkg/image/jpeg/writer_test.go b/src/image/jpeg/writer_test.go
similarity index 100%
rename from src/pkg/image/jpeg/writer_test.go
rename to src/image/jpeg/writer_test.go
diff --git a/src/pkg/image/names.go b/src/image/names.go
similarity index 100%
rename from src/pkg/image/names.go
rename to src/image/names.go
diff --git a/src/pkg/image/png/paeth.go b/src/image/png/paeth.go
similarity index 100%
rename from src/pkg/image/png/paeth.go
rename to src/image/png/paeth.go
diff --git a/src/pkg/image/png/paeth_test.go b/src/image/png/paeth_test.go
similarity index 100%
rename from src/pkg/image/png/paeth_test.go
rename to src/image/png/paeth_test.go
diff --git a/src/pkg/image/png/reader.go b/src/image/png/reader.go
similarity index 100%
rename from src/pkg/image/png/reader.go
rename to src/image/png/reader.go
diff --git a/src/pkg/image/png/reader_test.go b/src/image/png/reader_test.go
similarity index 100%
rename from src/pkg/image/png/reader_test.go
rename to src/image/png/reader_test.go
diff --git a/src/pkg/image/png/testdata/benchGray.png b/src/image/png/testdata/benchGray.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchGray.png
rename to src/image/png/testdata/benchGray.png
diff --git a/src/pkg/image/png/testdata/benchNRGBA-gradient.png b/src/image/png/testdata/benchNRGBA-gradient.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchNRGBA-gradient.png
rename to src/image/png/testdata/benchNRGBA-gradient.png
diff --git a/src/pkg/image/png/testdata/benchNRGBA-opaque.png b/src/image/png/testdata/benchNRGBA-opaque.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchNRGBA-opaque.png
rename to src/image/png/testdata/benchNRGBA-opaque.png
diff --git a/src/pkg/image/png/testdata/benchPaletted.png b/src/image/png/testdata/benchPaletted.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchPaletted.png
rename to src/image/png/testdata/benchPaletted.png
diff --git a/src/pkg/image/png/testdata/benchRGB-interlace.png b/src/image/png/testdata/benchRGB-interlace.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchRGB-interlace.png
rename to src/image/png/testdata/benchRGB-interlace.png
diff --git a/src/pkg/image/png/testdata/benchRGB.png b/src/image/png/testdata/benchRGB.png
similarity index 100%
rename from src/pkg/image/png/testdata/benchRGB.png
rename to src/image/png/testdata/benchRGB.png
diff --git a/src/pkg/image/png/testdata/invalid-crc32.png b/src/image/png/testdata/invalid-crc32.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-crc32.png
rename to src/image/png/testdata/invalid-crc32.png
diff --git a/src/pkg/image/png/testdata/invalid-noend.png b/src/image/png/testdata/invalid-noend.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-noend.png
rename to src/image/png/testdata/invalid-noend.png
diff --git a/src/pkg/image/png/testdata/invalid-trunc.png b/src/image/png/testdata/invalid-trunc.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-trunc.png
rename to src/image/png/testdata/invalid-trunc.png
diff --git a/src/pkg/image/png/testdata/invalid-zlib.png b/src/image/png/testdata/invalid-zlib.png
similarity index 100%
rename from src/pkg/image/png/testdata/invalid-zlib.png
rename to src/image/png/testdata/invalid-zlib.png
diff --git a/src/pkg/image/png/testdata/pngsuite/README b/src/image/png/testdata/pngsuite/README
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/README
rename to src/image/png/testdata/pngsuite/README
diff --git a/src/pkg/image/png/testdata/pngsuite/README.original b/src/image/png/testdata/pngsuite/README.original
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/README.original
rename to src/image/png/testdata/pngsuite/README.original
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.png b/src/image/png/testdata/pngsuite/basn0g01-30.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01-30.png
rename to src/image/png/testdata/pngsuite/basn0g01-30.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01-30.sng b/src/image/png/testdata/pngsuite/basn0g01-30.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01-30.sng
rename to src/image/png/testdata/pngsuite/basn0g01-30.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01.png b/src/image/png/testdata/pngsuite/basn0g01.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01.png
rename to src/image/png/testdata/pngsuite/basn0g01.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g01.sng b/src/image/png/testdata/pngsuite/basn0g01.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g01.sng
rename to src/image/png/testdata/pngsuite/basn0g01.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.png b/src/image/png/testdata/pngsuite/basn0g02-29.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02-29.png
rename to src/image/png/testdata/pngsuite/basn0g02-29.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02-29.sng b/src/image/png/testdata/pngsuite/basn0g02-29.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02-29.sng
rename to src/image/png/testdata/pngsuite/basn0g02-29.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02.png b/src/image/png/testdata/pngsuite/basn0g02.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02.png
rename to src/image/png/testdata/pngsuite/basn0g02.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g02.sng b/src/image/png/testdata/pngsuite/basn0g02.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g02.sng
rename to src/image/png/testdata/pngsuite/basn0g02.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.png b/src/image/png/testdata/pngsuite/basn0g04-31.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04-31.png
rename to src/image/png/testdata/pngsuite/basn0g04-31.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04-31.sng b/src/image/png/testdata/pngsuite/basn0g04-31.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04-31.sng
rename to src/image/png/testdata/pngsuite/basn0g04-31.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04.png b/src/image/png/testdata/pngsuite/basn0g04.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04.png
rename to src/image/png/testdata/pngsuite/basn0g04.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g04.sng b/src/image/png/testdata/pngsuite/basn0g04.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g04.sng
rename to src/image/png/testdata/pngsuite/basn0g04.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g08.png b/src/image/png/testdata/pngsuite/basn0g08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g08.png
rename to src/image/png/testdata/pngsuite/basn0g08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g08.sng b/src/image/png/testdata/pngsuite/basn0g08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g08.sng
rename to src/image/png/testdata/pngsuite/basn0g08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g16.png b/src/image/png/testdata/pngsuite/basn0g16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g16.png
rename to src/image/png/testdata/pngsuite/basn0g16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn0g16.sng b/src/image/png/testdata/pngsuite/basn0g16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn0g16.sng
rename to src/image/png/testdata/pngsuite/basn0g16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c08.png b/src/image/png/testdata/pngsuite/basn2c08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c08.png
rename to src/image/png/testdata/pngsuite/basn2c08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c08.sng b/src/image/png/testdata/pngsuite/basn2c08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c08.sng
rename to src/image/png/testdata/pngsuite/basn2c08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c16.png b/src/image/png/testdata/pngsuite/basn2c16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c16.png
rename to src/image/png/testdata/pngsuite/basn2c16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn2c16.sng b/src/image/png/testdata/pngsuite/basn2c16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn2c16.sng
rename to src/image/png/testdata/pngsuite/basn2c16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p01.png b/src/image/png/testdata/pngsuite/basn3p01.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p01.png
rename to src/image/png/testdata/pngsuite/basn3p01.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p01.sng b/src/image/png/testdata/pngsuite/basn3p01.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p01.sng
rename to src/image/png/testdata/pngsuite/basn3p01.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p02.png b/src/image/png/testdata/pngsuite/basn3p02.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p02.png
rename to src/image/png/testdata/pngsuite/basn3p02.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p02.sng b/src/image/png/testdata/pngsuite/basn3p02.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p02.sng
rename to src/image/png/testdata/pngsuite/basn3p02.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.png b/src/image/png/testdata/pngsuite/basn3p04-31i.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04-31i.png
rename to src/image/png/testdata/pngsuite/basn3p04-31i.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04-31i.sng b/src/image/png/testdata/pngsuite/basn3p04-31i.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04-31i.sng
rename to src/image/png/testdata/pngsuite/basn3p04-31i.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04.png b/src/image/png/testdata/pngsuite/basn3p04.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04.png
rename to src/image/png/testdata/pngsuite/basn3p04.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p04.sng b/src/image/png/testdata/pngsuite/basn3p04.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p04.sng
rename to src/image/png/testdata/pngsuite/basn3p04.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.png b/src/image/png/testdata/pngsuite/basn3p08-trns.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08-trns.png
rename to src/image/png/testdata/pngsuite/basn3p08-trns.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08-trns.sng b/src/image/png/testdata/pngsuite/basn3p08-trns.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08-trns.sng
rename to src/image/png/testdata/pngsuite/basn3p08-trns.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08.png b/src/image/png/testdata/pngsuite/basn3p08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08.png
rename to src/image/png/testdata/pngsuite/basn3p08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn3p08.sng b/src/image/png/testdata/pngsuite/basn3p08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn3p08.sng
rename to src/image/png/testdata/pngsuite/basn3p08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a08.png b/src/image/png/testdata/pngsuite/basn4a08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a08.png
rename to src/image/png/testdata/pngsuite/basn4a08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a08.sng b/src/image/png/testdata/pngsuite/basn4a08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a08.sng
rename to src/image/png/testdata/pngsuite/basn4a08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a16.png b/src/image/png/testdata/pngsuite/basn4a16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a16.png
rename to src/image/png/testdata/pngsuite/basn4a16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn4a16.sng b/src/image/png/testdata/pngsuite/basn4a16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn4a16.sng
rename to src/image/png/testdata/pngsuite/basn4a16.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a08.png b/src/image/png/testdata/pngsuite/basn6a08.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a08.png
rename to src/image/png/testdata/pngsuite/basn6a08.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a08.sng b/src/image/png/testdata/pngsuite/basn6a08.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a08.sng
rename to src/image/png/testdata/pngsuite/basn6a08.sng
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a16.png b/src/image/png/testdata/pngsuite/basn6a16.png
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a16.png
rename to src/image/png/testdata/pngsuite/basn6a16.png
diff --git a/src/pkg/image/png/testdata/pngsuite/basn6a16.sng b/src/image/png/testdata/pngsuite/basn6a16.sng
similarity index 100%
rename from src/pkg/image/png/testdata/pngsuite/basn6a16.sng
rename to src/image/png/testdata/pngsuite/basn6a16.sng
diff --git a/src/pkg/image/png/writer.go b/src/image/png/writer.go
similarity index 100%
rename from src/pkg/image/png/writer.go
rename to src/image/png/writer.go
diff --git a/src/pkg/image/png/writer_test.go b/src/image/png/writer_test.go
similarity index 100%
rename from src/pkg/image/png/writer_test.go
rename to src/image/png/writer_test.go
diff --git a/src/pkg/image/testdata/video-001.5bpp.gif b/src/image/testdata/video-001.5bpp.gif
similarity index 100%
rename from src/pkg/image/testdata/video-001.5bpp.gif
rename to src/image/testdata/video-001.5bpp.gif
diff --git a/src/pkg/image/testdata/video-001.gif b/src/image/testdata/video-001.gif
similarity index 100%
rename from src/pkg/image/testdata/video-001.gif
rename to src/image/testdata/video-001.gif
diff --git a/src/pkg/image/testdata/video-001.interlaced.gif b/src/image/testdata/video-001.interlaced.gif
similarity index 100%
rename from src/pkg/image/testdata/video-001.interlaced.gif
rename to src/image/testdata/video-001.interlaced.gif
diff --git a/src/pkg/image/testdata/video-001.jpeg b/src/image/testdata/video-001.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.jpeg
rename to src/image/testdata/video-001.jpeg
diff --git a/src/pkg/image/testdata/video-001.png b/src/image/testdata/video-001.png
similarity index 100%
rename from src/pkg/image/testdata/video-001.png
rename to src/image/testdata/video-001.png
diff --git a/src/pkg/image/testdata/video-001.progressive.jpeg b/src/image/testdata/video-001.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.progressive.jpeg
rename to src/image/testdata/video-001.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.420.jpeg b/src/image/testdata/video-001.q50.420.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.420.jpeg
rename to src/image/testdata/video-001.q50.420.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.420.progressive.jpeg b/src/image/testdata/video-001.q50.420.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.420.progressive.jpeg
rename to src/image/testdata/video-001.q50.420.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.422.jpeg b/src/image/testdata/video-001.q50.422.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.422.jpeg
rename to src/image/testdata/video-001.q50.422.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.422.progressive.jpeg b/src/image/testdata/video-001.q50.422.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.422.progressive.jpeg
rename to src/image/testdata/video-001.q50.422.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.440.jpeg b/src/image/testdata/video-001.q50.440.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.440.jpeg
rename to src/image/testdata/video-001.q50.440.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.440.progressive.jpeg b/src/image/testdata/video-001.q50.440.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.440.progressive.jpeg
rename to src/image/testdata/video-001.q50.440.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.444.jpeg b/src/image/testdata/video-001.q50.444.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.444.jpeg
rename to src/image/testdata/video-001.q50.444.jpeg
diff --git a/src/pkg/image/testdata/video-001.q50.444.progressive.jpeg b/src/image/testdata/video-001.q50.444.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.q50.444.progressive.jpeg
rename to src/image/testdata/video-001.q50.444.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-001.separate.dc.progression.jpeg b/src/image/testdata/video-001.separate.dc.progression.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.separate.dc.progression.jpeg
rename to src/image/testdata/video-001.separate.dc.progression.jpeg
diff --git a/src/pkg/image/testdata/video-001.separate.dc.progression.progressive.jpeg b/src/image/testdata/video-001.separate.dc.progression.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-001.separate.dc.progression.progressive.jpeg
rename to src/image/testdata/video-001.separate.dc.progression.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.gif b/src/image/testdata/video-005.gray.gif
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.gif
rename to src/image/testdata/video-005.gray.gif
diff --git a/src/pkg/image/testdata/video-005.gray.jpeg b/src/image/testdata/video-005.gray.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.jpeg
rename to src/image/testdata/video-005.gray.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.png b/src/image/testdata/video-005.gray.png
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.png
rename to src/image/testdata/video-005.gray.png
diff --git a/src/pkg/image/testdata/video-005.gray.q50.2x2.jpeg b/src/image/testdata/video-005.gray.q50.2x2.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.2x2.jpeg
rename to src/image/testdata/video-005.gray.q50.2x2.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.2x2.progressive.jpeg b/src/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
rename to src/image/testdata/video-005.gray.q50.2x2.progressive.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.jpeg b/src/image/testdata/video-005.gray.q50.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.jpeg
rename to src/image/testdata/video-005.gray.q50.jpeg
diff --git a/src/pkg/image/testdata/video-005.gray.q50.progressive.jpeg b/src/image/testdata/video-005.gray.q50.progressive.jpeg
similarity index 100%
rename from src/pkg/image/testdata/video-005.gray.q50.progressive.jpeg
rename to src/image/testdata/video-005.gray.q50.progressive.jpeg
diff --git a/src/pkg/image/ycbcr.go b/src/image/ycbcr.go
similarity index 100%
rename from src/pkg/image/ycbcr.go
rename to src/image/ycbcr.go
diff --git a/src/pkg/image/ycbcr_test.go b/src/image/ycbcr_test.go
similarity index 100%
rename from src/pkg/image/ycbcr_test.go
rename to src/image/ycbcr_test.go
diff --git a/src/pkg/index/suffixarray/qsufsort.go b/src/index/suffixarray/qsufsort.go
similarity index 100%
rename from src/pkg/index/suffixarray/qsufsort.go
rename to src/index/suffixarray/qsufsort.go
diff --git a/src/pkg/index/suffixarray/suffixarray.go b/src/index/suffixarray/suffixarray.go
similarity index 100%
rename from src/pkg/index/suffixarray/suffixarray.go
rename to src/index/suffixarray/suffixarray.go
diff --git a/src/pkg/index/suffixarray/suffixarray_test.go b/src/index/suffixarray/suffixarray_test.go
similarity index 100%
rename from src/pkg/index/suffixarray/suffixarray_test.go
rename to src/index/suffixarray/suffixarray_test.go
diff --git a/src/pkg/internal/syscall/getrandom_linux.go b/src/internal/syscall/getrandom_linux.go
similarity index 100%
rename from src/pkg/internal/syscall/getrandom_linux.go
rename to src/internal/syscall/getrandom_linux.go
diff --git a/src/pkg/io/io.go b/src/io/io.go
similarity index 100%
rename from src/pkg/io/io.go
rename to src/io/io.go
diff --git a/src/pkg/io/io_test.go b/src/io/io_test.go
similarity index 100%
rename from src/pkg/io/io_test.go
rename to src/io/io_test.go
diff --git a/src/pkg/io/ioutil/ioutil.go b/src/io/ioutil/ioutil.go
similarity index 100%
rename from src/pkg/io/ioutil/ioutil.go
rename to src/io/ioutil/ioutil.go
diff --git a/src/pkg/io/ioutil/ioutil_test.go b/src/io/ioutil/ioutil_test.go
similarity index 100%
rename from src/pkg/io/ioutil/ioutil_test.go
rename to src/io/ioutil/ioutil_test.go
diff --git a/src/pkg/io/ioutil/tempfile.go b/src/io/ioutil/tempfile.go
similarity index 100%
rename from src/pkg/io/ioutil/tempfile.go
rename to src/io/ioutil/tempfile.go
diff --git a/src/pkg/io/ioutil/tempfile_test.go b/src/io/ioutil/tempfile_test.go
similarity index 100%
rename from src/pkg/io/ioutil/tempfile_test.go
rename to src/io/ioutil/tempfile_test.go
diff --git a/src/pkg/io/multi.go b/src/io/multi.go
similarity index 100%
rename from src/pkg/io/multi.go
rename to src/io/multi.go
diff --git a/src/pkg/io/multi_test.go b/src/io/multi_test.go
similarity index 100%
rename from src/pkg/io/multi_test.go
rename to src/io/multi_test.go
diff --git a/src/pkg/io/pipe.go b/src/io/pipe.go
similarity index 100%
rename from src/pkg/io/pipe.go
rename to src/io/pipe.go
diff --git a/src/pkg/io/pipe_test.go b/src/io/pipe_test.go
similarity index 100%
rename from src/pkg/io/pipe_test.go
rename to src/io/pipe_test.go
diff --git a/src/pkg/log/example_test.go b/src/log/example_test.go
similarity index 100%
rename from src/pkg/log/example_test.go
rename to src/log/example_test.go
diff --git a/src/pkg/log/log.go b/src/log/log.go
similarity index 100%
rename from src/pkg/log/log.go
rename to src/log/log.go
diff --git a/src/pkg/log/log_test.go b/src/log/log_test.go
similarity index 100%
rename from src/pkg/log/log_test.go
rename to src/log/log_test.go
diff --git a/src/pkg/log/syslog/syslog.go b/src/log/syslog/syslog.go
similarity index 100%
rename from src/pkg/log/syslog/syslog.go
rename to src/log/syslog/syslog.go
diff --git a/src/pkg/log/syslog/syslog_plan9.go b/src/log/syslog/syslog_plan9.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_plan9.go
rename to src/log/syslog/syslog_plan9.go
diff --git a/src/pkg/log/syslog/syslog_test.go b/src/log/syslog/syslog_test.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_test.go
rename to src/log/syslog/syslog_test.go
diff --git a/src/pkg/log/syslog/syslog_unix.go b/src/log/syslog/syslog_unix.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_unix.go
rename to src/log/syslog/syslog_unix.go
diff --git a/src/pkg/log/syslog/syslog_windows.go b/src/log/syslog/syslog_windows.go
similarity index 100%
rename from src/pkg/log/syslog/syslog_windows.go
rename to src/log/syslog/syslog_windows.go
diff --git a/src/pkg/math/abs.go b/src/math/abs.go
similarity index 100%
rename from src/pkg/math/abs.go
rename to src/math/abs.go
diff --git a/src/pkg/math/abs_386.s b/src/math/abs_386.s
similarity index 100%
rename from src/pkg/math/abs_386.s
rename to src/math/abs_386.s
diff --git a/src/pkg/math/abs_amd64.s b/src/math/abs_amd64.s
similarity index 100%
rename from src/pkg/math/abs_amd64.s
rename to src/math/abs_amd64.s
diff --git a/src/pkg/math/abs_amd64p32.s b/src/math/abs_amd64p32.s
similarity index 100%
rename from src/pkg/math/abs_amd64p32.s
rename to src/math/abs_amd64p32.s
diff --git a/src/pkg/math/abs_arm.s b/src/math/abs_arm.s
similarity index 100%
rename from src/pkg/math/abs_arm.s
rename to src/math/abs_arm.s
diff --git a/src/pkg/math/acosh.go b/src/math/acosh.go
similarity index 100%
rename from src/pkg/math/acosh.go
rename to src/math/acosh.go
diff --git a/src/pkg/math/all_test.go b/src/math/all_test.go
similarity index 100%
rename from src/pkg/math/all_test.go
rename to src/math/all_test.go
diff --git a/src/pkg/math/asin.go b/src/math/asin.go
similarity index 100%
rename from src/pkg/math/asin.go
rename to src/math/asin.go
diff --git a/src/pkg/math/asin_386.s b/src/math/asin_386.s
similarity index 100%
rename from src/pkg/math/asin_386.s
rename to src/math/asin_386.s
diff --git a/src/pkg/math/asin_amd64.s b/src/math/asin_amd64.s
similarity index 100%
rename from src/pkg/math/asin_amd64.s
rename to src/math/asin_amd64.s
diff --git a/src/pkg/math/asin_amd64p32.s b/src/math/asin_amd64p32.s
similarity index 100%
rename from src/pkg/math/asin_amd64p32.s
rename to src/math/asin_amd64p32.s
diff --git a/src/pkg/math/asin_arm.s b/src/math/asin_arm.s
similarity index 100%
rename from src/pkg/math/asin_arm.s
rename to src/math/asin_arm.s
diff --git a/src/pkg/math/asinh.go b/src/math/asinh.go
similarity index 100%
rename from src/pkg/math/asinh.go
rename to src/math/asinh.go
diff --git a/src/pkg/math/atan.go b/src/math/atan.go
similarity index 100%
rename from src/pkg/math/atan.go
rename to src/math/atan.go
diff --git a/src/pkg/math/atan2.go b/src/math/atan2.go
similarity index 100%
rename from src/pkg/math/atan2.go
rename to src/math/atan2.go
diff --git a/src/pkg/math/atan2_386.s b/src/math/atan2_386.s
similarity index 100%
rename from src/pkg/math/atan2_386.s
rename to src/math/atan2_386.s
diff --git a/src/pkg/math/atan2_amd64.s b/src/math/atan2_amd64.s
similarity index 100%
rename from src/pkg/math/atan2_amd64.s
rename to src/math/atan2_amd64.s
diff --git a/src/pkg/math/atan2_amd64p32.s b/src/math/atan2_amd64p32.s
similarity index 100%
rename from src/pkg/math/atan2_amd64p32.s
rename to src/math/atan2_amd64p32.s
diff --git a/src/pkg/math/atan2_arm.s b/src/math/atan2_arm.s
similarity index 100%
rename from src/pkg/math/atan2_arm.s
rename to src/math/atan2_arm.s
diff --git a/src/pkg/math/atan_386.s b/src/math/atan_386.s
similarity index 100%
rename from src/pkg/math/atan_386.s
rename to src/math/atan_386.s
diff --git a/src/pkg/math/atan_amd64.s b/src/math/atan_amd64.s
similarity index 100%
rename from src/pkg/math/atan_amd64.s
rename to src/math/atan_amd64.s
diff --git a/src/pkg/math/atan_amd64p32.s b/src/math/atan_amd64p32.s
similarity index 100%
rename from src/pkg/math/atan_amd64p32.s
rename to src/math/atan_amd64p32.s
diff --git a/src/pkg/math/atan_arm.s b/src/math/atan_arm.s
similarity index 100%
rename from src/pkg/math/atan_arm.s
rename to src/math/atan_arm.s
diff --git a/src/pkg/math/atanh.go b/src/math/atanh.go
similarity index 100%
rename from src/pkg/math/atanh.go
rename to src/math/atanh.go
diff --git a/src/pkg/math/big/arith.go b/src/math/big/arith.go
similarity index 100%
rename from src/pkg/math/big/arith.go
rename to src/math/big/arith.go
diff --git a/src/pkg/math/big/arith_386.s b/src/math/big/arith_386.s
similarity index 100%
rename from src/pkg/math/big/arith_386.s
rename to src/math/big/arith_386.s
diff --git a/src/pkg/math/big/arith_amd64.s b/src/math/big/arith_amd64.s
similarity index 100%
rename from src/pkg/math/big/arith_amd64.s
rename to src/math/big/arith_amd64.s
diff --git a/src/pkg/math/big/arith_amd64p32.s b/src/math/big/arith_amd64p32.s
similarity index 100%
rename from src/pkg/math/big/arith_amd64p32.s
rename to src/math/big/arith_amd64p32.s
diff --git a/src/pkg/math/big/arith_arm.s b/src/math/big/arith_arm.s
similarity index 100%
rename from src/pkg/math/big/arith_arm.s
rename to src/math/big/arith_arm.s
diff --git a/src/pkg/math/big/arith_decl.go b/src/math/big/arith_decl.go
similarity index 100%
rename from src/pkg/math/big/arith_decl.go
rename to src/math/big/arith_decl.go
diff --git a/src/pkg/math/big/arith_test.go b/src/math/big/arith_test.go
similarity index 100%
rename from src/pkg/math/big/arith_test.go
rename to src/math/big/arith_test.go
diff --git a/src/pkg/math/big/calibrate_test.go b/src/math/big/calibrate_test.go
similarity index 100%
rename from src/pkg/math/big/calibrate_test.go
rename to src/math/big/calibrate_test.go
diff --git a/src/pkg/math/big/example_test.go b/src/math/big/example_test.go
similarity index 100%
rename from src/pkg/math/big/example_test.go
rename to src/math/big/example_test.go
diff --git a/src/pkg/math/big/gcd_test.go b/src/math/big/gcd_test.go
similarity index 100%
rename from src/pkg/math/big/gcd_test.go
rename to src/math/big/gcd_test.go
diff --git a/src/pkg/math/big/hilbert_test.go b/src/math/big/hilbert_test.go
similarity index 100%
rename from src/pkg/math/big/hilbert_test.go
rename to src/math/big/hilbert_test.go
diff --git a/src/pkg/math/big/int.go b/src/math/big/int.go
similarity index 100%
rename from src/pkg/math/big/int.go
rename to src/math/big/int.go
diff --git a/src/pkg/math/big/int_test.go b/src/math/big/int_test.go
similarity index 100%
rename from src/pkg/math/big/int_test.go
rename to src/math/big/int_test.go
diff --git a/src/pkg/math/big/nat.go b/src/math/big/nat.go
similarity index 100%
rename from src/pkg/math/big/nat.go
rename to src/math/big/nat.go
diff --git a/src/pkg/math/big/nat_test.go b/src/math/big/nat_test.go
similarity index 100%
rename from src/pkg/math/big/nat_test.go
rename to src/math/big/nat_test.go
diff --git a/src/pkg/math/big/rat.go b/src/math/big/rat.go
similarity index 100%
rename from src/pkg/math/big/rat.go
rename to src/math/big/rat.go
diff --git a/src/pkg/math/big/rat_test.go b/src/math/big/rat_test.go
similarity index 100%
rename from src/pkg/math/big/rat_test.go
rename to src/math/big/rat_test.go
diff --git a/src/pkg/math/bits.go b/src/math/bits.go
similarity index 100%
rename from src/pkg/math/bits.go
rename to src/math/bits.go
diff --git a/src/pkg/math/cbrt.go b/src/math/cbrt.go
similarity index 100%
rename from src/pkg/math/cbrt.go
rename to src/math/cbrt.go
diff --git a/src/pkg/math/cmplx/abs.go b/src/math/cmplx/abs.go
similarity index 100%
rename from src/pkg/math/cmplx/abs.go
rename to src/math/cmplx/abs.go
diff --git a/src/pkg/math/cmplx/asin.go b/src/math/cmplx/asin.go
similarity index 100%
rename from src/pkg/math/cmplx/asin.go
rename to src/math/cmplx/asin.go
diff --git a/src/pkg/math/cmplx/cmath_test.go b/src/math/cmplx/cmath_test.go
similarity index 100%
rename from src/pkg/math/cmplx/cmath_test.go
rename to src/math/cmplx/cmath_test.go
diff --git a/src/pkg/math/cmplx/conj.go b/src/math/cmplx/conj.go
similarity index 100%
rename from src/pkg/math/cmplx/conj.go
rename to src/math/cmplx/conj.go
diff --git a/src/pkg/math/cmplx/exp.go b/src/math/cmplx/exp.go
similarity index 100%
rename from src/pkg/math/cmplx/exp.go
rename to src/math/cmplx/exp.go
diff --git a/src/pkg/math/cmplx/isinf.go b/src/math/cmplx/isinf.go
similarity index 100%
rename from src/pkg/math/cmplx/isinf.go
rename to src/math/cmplx/isinf.go
diff --git a/src/pkg/math/cmplx/isnan.go b/src/math/cmplx/isnan.go
similarity index 100%
rename from src/pkg/math/cmplx/isnan.go
rename to src/math/cmplx/isnan.go
diff --git a/src/pkg/math/cmplx/log.go b/src/math/cmplx/log.go
similarity index 100%
rename from src/pkg/math/cmplx/log.go
rename to src/math/cmplx/log.go
diff --git a/src/pkg/math/cmplx/phase.go b/src/math/cmplx/phase.go
similarity index 100%
rename from src/pkg/math/cmplx/phase.go
rename to src/math/cmplx/phase.go
diff --git a/src/pkg/math/cmplx/polar.go b/src/math/cmplx/polar.go
similarity index 100%
rename from src/pkg/math/cmplx/polar.go
rename to src/math/cmplx/polar.go
diff --git a/src/pkg/math/cmplx/pow.go b/src/math/cmplx/pow.go
similarity index 100%
rename from src/pkg/math/cmplx/pow.go
rename to src/math/cmplx/pow.go
diff --git a/src/pkg/math/cmplx/rect.go b/src/math/cmplx/rect.go
similarity index 100%
rename from src/pkg/math/cmplx/rect.go
rename to src/math/cmplx/rect.go
diff --git a/src/pkg/math/cmplx/sin.go b/src/math/cmplx/sin.go
similarity index 100%
rename from src/pkg/math/cmplx/sin.go
rename to src/math/cmplx/sin.go
diff --git a/src/pkg/math/cmplx/sqrt.go b/src/math/cmplx/sqrt.go
similarity index 100%
rename from src/pkg/math/cmplx/sqrt.go
rename to src/math/cmplx/sqrt.go
diff --git a/src/pkg/math/cmplx/tan.go b/src/math/cmplx/tan.go
similarity index 100%
rename from src/pkg/math/cmplx/tan.go
rename to src/math/cmplx/tan.go
diff --git a/src/pkg/math/const.go b/src/math/const.go
similarity index 100%
rename from src/pkg/math/const.go
rename to src/math/const.go
diff --git a/src/pkg/math/copysign.go b/src/math/copysign.go
similarity index 100%
rename from src/pkg/math/copysign.go
rename to src/math/copysign.go
diff --git a/src/pkg/math/dim.go b/src/math/dim.go
similarity index 100%
rename from src/pkg/math/dim.go
rename to src/math/dim.go
diff --git a/src/pkg/math/dim_386.s b/src/math/dim_386.s
similarity index 100%
rename from src/pkg/math/dim_386.s
rename to src/math/dim_386.s
diff --git a/src/pkg/math/dim_amd64.s b/src/math/dim_amd64.s
similarity index 100%
rename from src/pkg/math/dim_amd64.s
rename to src/math/dim_amd64.s
diff --git a/src/pkg/math/dim_amd64p32.s b/src/math/dim_amd64p32.s
similarity index 100%
rename from src/pkg/math/dim_amd64p32.s
rename to src/math/dim_amd64p32.s
diff --git a/src/pkg/math/dim_arm.s b/src/math/dim_arm.s
similarity index 100%
rename from src/pkg/math/dim_arm.s
rename to src/math/dim_arm.s
diff --git a/src/pkg/math/erf.go b/src/math/erf.go
similarity index 100%
rename from src/pkg/math/erf.go
rename to src/math/erf.go
diff --git a/src/pkg/math/exp.go b/src/math/exp.go
similarity index 100%
rename from src/pkg/math/exp.go
rename to src/math/exp.go
diff --git a/src/pkg/math/exp2_386.s b/src/math/exp2_386.s
similarity index 100%
rename from src/pkg/math/exp2_386.s
rename to src/math/exp2_386.s
diff --git a/src/pkg/math/exp2_amd64.s b/src/math/exp2_amd64.s
similarity index 100%
rename from src/pkg/math/exp2_amd64.s
rename to src/math/exp2_amd64.s
diff --git a/src/pkg/math/exp2_amd64p32.s b/src/math/exp2_amd64p32.s
similarity index 100%
rename from src/pkg/math/exp2_amd64p32.s
rename to src/math/exp2_amd64p32.s
diff --git a/src/pkg/math/exp2_arm.s b/src/math/exp2_arm.s
similarity index 100%
rename from src/pkg/math/exp2_arm.s
rename to src/math/exp2_arm.s
diff --git a/src/pkg/math/exp_386.s b/src/math/exp_386.s
similarity index 100%
rename from src/pkg/math/exp_386.s
rename to src/math/exp_386.s
diff --git a/src/pkg/math/exp_amd64.s b/src/math/exp_amd64.s
similarity index 100%
rename from src/pkg/math/exp_amd64.s
rename to src/math/exp_amd64.s
diff --git a/src/pkg/math/exp_amd64p32.s b/src/math/exp_amd64p32.s
similarity index 100%
rename from src/pkg/math/exp_amd64p32.s
rename to src/math/exp_amd64p32.s
diff --git a/src/pkg/math/exp_arm.s b/src/math/exp_arm.s
similarity index 100%
rename from src/pkg/math/exp_arm.s
rename to src/math/exp_arm.s
diff --git a/src/pkg/math/expm1.go b/src/math/expm1.go
similarity index 100%
rename from src/pkg/math/expm1.go
rename to src/math/expm1.go
diff --git a/src/pkg/math/expm1_386.s b/src/math/expm1_386.s
similarity index 100%
rename from src/pkg/math/expm1_386.s
rename to src/math/expm1_386.s
diff --git a/src/pkg/math/expm1_amd64.s b/src/math/expm1_amd64.s
similarity index 100%
rename from src/pkg/math/expm1_amd64.s
rename to src/math/expm1_amd64.s
diff --git a/src/pkg/math/expm1_amd64p32.s b/src/math/expm1_amd64p32.s
similarity index 100%
rename from src/pkg/math/expm1_amd64p32.s
rename to src/math/expm1_amd64p32.s
diff --git a/src/pkg/math/expm1_arm.s b/src/math/expm1_arm.s
similarity index 100%
rename from src/pkg/math/expm1_arm.s
rename to src/math/expm1_arm.s
diff --git a/src/pkg/math/export_test.go b/src/math/export_test.go
similarity index 100%
rename from src/pkg/math/export_test.go
rename to src/math/export_test.go
diff --git a/src/pkg/math/floor.go b/src/math/floor.go
similarity index 100%
rename from src/pkg/math/floor.go
rename to src/math/floor.go
diff --git a/src/pkg/math/floor_386.s b/src/math/floor_386.s
similarity index 100%
rename from src/pkg/math/floor_386.s
rename to src/math/floor_386.s
diff --git a/src/pkg/math/floor_amd64.s b/src/math/floor_amd64.s
similarity index 100%
rename from src/pkg/math/floor_amd64.s
rename to src/math/floor_amd64.s
diff --git a/src/pkg/math/floor_amd64p32.s b/src/math/floor_amd64p32.s
similarity index 100%
rename from src/pkg/math/floor_amd64p32.s
rename to src/math/floor_amd64p32.s
diff --git a/src/pkg/math/floor_arm.s b/src/math/floor_arm.s
similarity index 100%
rename from src/pkg/math/floor_arm.s
rename to src/math/floor_arm.s
diff --git a/src/pkg/math/frexp.go b/src/math/frexp.go
similarity index 100%
rename from src/pkg/math/frexp.go
rename to src/math/frexp.go
diff --git a/src/pkg/math/frexp_386.s b/src/math/frexp_386.s
similarity index 100%
rename from src/pkg/math/frexp_386.s
rename to src/math/frexp_386.s
diff --git a/src/pkg/math/frexp_amd64.s b/src/math/frexp_amd64.s
similarity index 100%
rename from src/pkg/math/frexp_amd64.s
rename to src/math/frexp_amd64.s
diff --git a/src/pkg/math/frexp_amd64p32.s b/src/math/frexp_amd64p32.s
similarity index 100%
rename from src/pkg/math/frexp_amd64p32.s
rename to src/math/frexp_amd64p32.s
diff --git a/src/pkg/math/frexp_arm.s b/src/math/frexp_arm.s
similarity index 100%
rename from src/pkg/math/frexp_arm.s
rename to src/math/frexp_arm.s
diff --git a/src/pkg/math/gamma.go b/src/math/gamma.go
similarity index 100%
rename from src/pkg/math/gamma.go
rename to src/math/gamma.go
diff --git a/src/pkg/math/hypot.go b/src/math/hypot.go
similarity index 100%
rename from src/pkg/math/hypot.go
rename to src/math/hypot.go
diff --git a/src/pkg/math/hypot_386.s b/src/math/hypot_386.s
similarity index 100%
rename from src/pkg/math/hypot_386.s
rename to src/math/hypot_386.s
diff --git a/src/pkg/math/hypot_amd64.s b/src/math/hypot_amd64.s
similarity index 100%
rename from src/pkg/math/hypot_amd64.s
rename to src/math/hypot_amd64.s
diff --git a/src/pkg/math/hypot_amd64p32.s b/src/math/hypot_amd64p32.s
similarity index 100%
rename from src/pkg/math/hypot_amd64p32.s
rename to src/math/hypot_amd64p32.s
diff --git a/src/pkg/math/hypot_arm.s b/src/math/hypot_arm.s
similarity index 100%
rename from src/pkg/math/hypot_arm.s
rename to src/math/hypot_arm.s
diff --git a/src/pkg/math/j0.go b/src/math/j0.go
similarity index 100%
rename from src/pkg/math/j0.go
rename to src/math/j0.go
diff --git a/src/pkg/math/j1.go b/src/math/j1.go
similarity index 100%
rename from src/pkg/math/j1.go
rename to src/math/j1.go
diff --git a/src/pkg/math/jn.go b/src/math/jn.go
similarity index 100%
rename from src/pkg/math/jn.go
rename to src/math/jn.go
diff --git a/src/pkg/math/ldexp.go b/src/math/ldexp.go
similarity index 100%
rename from src/pkg/math/ldexp.go
rename to src/math/ldexp.go
diff --git a/src/pkg/math/ldexp_386.s b/src/math/ldexp_386.s
similarity index 100%
rename from src/pkg/math/ldexp_386.s
rename to src/math/ldexp_386.s
diff --git a/src/pkg/math/ldexp_amd64.s b/src/math/ldexp_amd64.s
similarity index 100%
rename from src/pkg/math/ldexp_amd64.s
rename to src/math/ldexp_amd64.s
diff --git a/src/pkg/math/ldexp_amd64p32.s b/src/math/ldexp_amd64p32.s
similarity index 100%
rename from src/pkg/math/ldexp_amd64p32.s
rename to src/math/ldexp_amd64p32.s
diff --git a/src/pkg/math/ldexp_arm.s b/src/math/ldexp_arm.s
similarity index 100%
rename from src/pkg/math/ldexp_arm.s
rename to src/math/ldexp_arm.s
diff --git a/src/pkg/math/lgamma.go b/src/math/lgamma.go
similarity index 100%
rename from src/pkg/math/lgamma.go
rename to src/math/lgamma.go
diff --git a/src/pkg/math/log.go b/src/math/log.go
similarity index 100%
rename from src/pkg/math/log.go
rename to src/math/log.go
diff --git a/src/pkg/math/log10.go b/src/math/log10.go
similarity index 100%
rename from src/pkg/math/log10.go
rename to src/math/log10.go
diff --git a/src/pkg/math/log10_386.s b/src/math/log10_386.s
similarity index 100%
rename from src/pkg/math/log10_386.s
rename to src/math/log10_386.s
diff --git a/src/pkg/math/log10_amd64.s b/src/math/log10_amd64.s
similarity index 100%
rename from src/pkg/math/log10_amd64.s
rename to src/math/log10_amd64.s
diff --git a/src/pkg/math/log10_amd64p32.s b/src/math/log10_amd64p32.s
similarity index 100%
rename from src/pkg/math/log10_amd64p32.s
rename to src/math/log10_amd64p32.s
diff --git a/src/pkg/math/log10_arm.s b/src/math/log10_arm.s
similarity index 100%
rename from src/pkg/math/log10_arm.s
rename to src/math/log10_arm.s
diff --git a/src/pkg/math/log1p.go b/src/math/log1p.go
similarity index 100%
rename from src/pkg/math/log1p.go
rename to src/math/log1p.go
diff --git a/src/pkg/math/log1p_386.s b/src/math/log1p_386.s
similarity index 100%
rename from src/pkg/math/log1p_386.s
rename to src/math/log1p_386.s
diff --git a/src/pkg/math/log1p_amd64.s b/src/math/log1p_amd64.s
similarity index 100%
rename from src/pkg/math/log1p_amd64.s
rename to src/math/log1p_amd64.s
diff --git a/src/pkg/math/log1p_amd64p32.s b/src/math/log1p_amd64p32.s
similarity index 100%
rename from src/pkg/math/log1p_amd64p32.s
rename to src/math/log1p_amd64p32.s
diff --git a/src/pkg/math/log1p_arm.s b/src/math/log1p_arm.s
similarity index 100%
rename from src/pkg/math/log1p_arm.s
rename to src/math/log1p_arm.s
diff --git a/src/pkg/math/log_386.s b/src/math/log_386.s
similarity index 100%
rename from src/pkg/math/log_386.s
rename to src/math/log_386.s
diff --git a/src/pkg/math/log_amd64.s b/src/math/log_amd64.s
similarity index 100%
rename from src/pkg/math/log_amd64.s
rename to src/math/log_amd64.s
diff --git a/src/pkg/math/log_amd64p32.s b/src/math/log_amd64p32.s
similarity index 100%
rename from src/pkg/math/log_amd64p32.s
rename to src/math/log_amd64p32.s
diff --git a/src/pkg/math/log_arm.s b/src/math/log_arm.s
similarity index 100%
rename from src/pkg/math/log_arm.s
rename to src/math/log_arm.s
diff --git a/src/pkg/math/logb.go b/src/math/logb.go
similarity index 100%
rename from src/pkg/math/logb.go
rename to src/math/logb.go
diff --git a/src/pkg/math/mod.go b/src/math/mod.go
similarity index 100%
rename from src/pkg/math/mod.go
rename to src/math/mod.go
diff --git a/src/pkg/math/mod_386.s b/src/math/mod_386.s
similarity index 100%
rename from src/pkg/math/mod_386.s
rename to src/math/mod_386.s
diff --git a/src/pkg/math/mod_amd64.s b/src/math/mod_amd64.s
similarity index 100%
rename from src/pkg/math/mod_amd64.s
rename to src/math/mod_amd64.s
diff --git a/src/pkg/math/mod_amd64p32.s b/src/math/mod_amd64p32.s
similarity index 100%
rename from src/pkg/math/mod_amd64p32.s
rename to src/math/mod_amd64p32.s
diff --git a/src/pkg/math/mod_arm.s b/src/math/mod_arm.s
similarity index 100%
rename from src/pkg/math/mod_arm.s
rename to src/math/mod_arm.s
diff --git a/src/pkg/math/modf.go b/src/math/modf.go
similarity index 100%
rename from src/pkg/math/modf.go
rename to src/math/modf.go
diff --git a/src/pkg/math/modf_386.s b/src/math/modf_386.s
similarity index 100%
rename from src/pkg/math/modf_386.s
rename to src/math/modf_386.s
diff --git a/src/pkg/math/modf_amd64.s b/src/math/modf_amd64.s
similarity index 100%
rename from src/pkg/math/modf_amd64.s
rename to src/math/modf_amd64.s
diff --git a/src/pkg/math/modf_amd64p32.s b/src/math/modf_amd64p32.s
similarity index 100%
rename from src/pkg/math/modf_amd64p32.s
rename to src/math/modf_amd64p32.s
diff --git a/src/pkg/math/modf_arm.s b/src/math/modf_arm.s
similarity index 100%
rename from src/pkg/math/modf_arm.s
rename to src/math/modf_arm.s
diff --git a/src/pkg/math/nextafter.go b/src/math/nextafter.go
similarity index 100%
rename from src/pkg/math/nextafter.go
rename to src/math/nextafter.go
diff --git a/src/pkg/math/pow.go b/src/math/pow.go
similarity index 100%
rename from src/pkg/math/pow.go
rename to src/math/pow.go
diff --git a/src/pkg/math/pow10.go b/src/math/pow10.go
similarity index 100%
rename from src/pkg/math/pow10.go
rename to src/math/pow10.go
diff --git a/src/pkg/math/rand/example_test.go b/src/math/rand/example_test.go
similarity index 100%
rename from src/pkg/math/rand/example_test.go
rename to src/math/rand/example_test.go
diff --git a/src/pkg/math/rand/exp.go b/src/math/rand/exp.go
similarity index 100%
rename from src/pkg/math/rand/exp.go
rename to src/math/rand/exp.go
diff --git a/src/pkg/math/rand/normal.go b/src/math/rand/normal.go
similarity index 100%
rename from src/pkg/math/rand/normal.go
rename to src/math/rand/normal.go
diff --git a/src/pkg/math/rand/rand.go b/src/math/rand/rand.go
similarity index 100%
rename from src/pkg/math/rand/rand.go
rename to src/math/rand/rand.go
diff --git a/src/pkg/math/rand/rand_test.go b/src/math/rand/rand_test.go
similarity index 100%
rename from src/pkg/math/rand/rand_test.go
rename to src/math/rand/rand_test.go
diff --git a/src/pkg/math/rand/regress_test.go b/src/math/rand/regress_test.go
similarity index 100%
rename from src/pkg/math/rand/regress_test.go
rename to src/math/rand/regress_test.go
diff --git a/src/pkg/math/rand/rng.go b/src/math/rand/rng.go
similarity index 100%
rename from src/pkg/math/rand/rng.go
rename to src/math/rand/rng.go
diff --git a/src/pkg/math/rand/zipf.go b/src/math/rand/zipf.go
similarity index 100%
rename from src/pkg/math/rand/zipf.go
rename to src/math/rand/zipf.go
diff --git a/src/pkg/math/remainder.go b/src/math/remainder.go
similarity index 100%
rename from src/pkg/math/remainder.go
rename to src/math/remainder.go
diff --git a/src/pkg/math/remainder_386.s b/src/math/remainder_386.s
similarity index 100%
rename from src/pkg/math/remainder_386.s
rename to src/math/remainder_386.s
diff --git a/src/pkg/math/remainder_amd64.s b/src/math/remainder_amd64.s
similarity index 100%
rename from src/pkg/math/remainder_amd64.s
rename to src/math/remainder_amd64.s
diff --git a/src/pkg/math/remainder_amd64p32.s b/src/math/remainder_amd64p32.s
similarity index 100%
rename from src/pkg/math/remainder_amd64p32.s
rename to src/math/remainder_amd64p32.s
diff --git a/src/pkg/math/remainder_arm.s b/src/math/remainder_arm.s
similarity index 100%
rename from src/pkg/math/remainder_arm.s
rename to src/math/remainder_arm.s
diff --git a/src/pkg/math/signbit.go b/src/math/signbit.go
similarity index 100%
rename from src/pkg/math/signbit.go
rename to src/math/signbit.go
diff --git a/src/pkg/math/sin.go b/src/math/sin.go
similarity index 100%
rename from src/pkg/math/sin.go
rename to src/math/sin.go
diff --git a/src/pkg/math/sin_386.s b/src/math/sin_386.s
similarity index 100%
rename from src/pkg/math/sin_386.s
rename to src/math/sin_386.s
diff --git a/src/pkg/math/sin_amd64.s b/src/math/sin_amd64.s
similarity index 100%
rename from src/pkg/math/sin_amd64.s
rename to src/math/sin_amd64.s
diff --git a/src/pkg/math/sin_amd64p32.s b/src/math/sin_amd64p32.s
similarity index 100%
rename from src/pkg/math/sin_amd64p32.s
rename to src/math/sin_amd64p32.s
diff --git a/src/pkg/math/sin_arm.s b/src/math/sin_arm.s
similarity index 100%
rename from src/pkg/math/sin_arm.s
rename to src/math/sin_arm.s
diff --git a/src/pkg/math/sincos.go b/src/math/sincos.go
similarity index 100%
rename from src/pkg/math/sincos.go
rename to src/math/sincos.go
diff --git a/src/pkg/math/sincos_386.s b/src/math/sincos_386.s
similarity index 100%
rename from src/pkg/math/sincos_386.s
rename to src/math/sincos_386.s
diff --git a/src/pkg/math/sincos_amd64.s b/src/math/sincos_amd64.s
similarity index 100%
rename from src/pkg/math/sincos_amd64.s
rename to src/math/sincos_amd64.s
diff --git a/src/pkg/math/sincos_amd64p32.s b/src/math/sincos_amd64p32.s
similarity index 100%
rename from src/pkg/math/sincos_amd64p32.s
rename to src/math/sincos_amd64p32.s
diff --git a/src/pkg/math/sincos_arm.s b/src/math/sincos_arm.s
similarity index 100%
rename from src/pkg/math/sincos_arm.s
rename to src/math/sincos_arm.s
diff --git a/src/pkg/math/sinh.go b/src/math/sinh.go
similarity index 100%
rename from src/pkg/math/sinh.go
rename to src/math/sinh.go
diff --git a/src/pkg/math/sqrt.go b/src/math/sqrt.go
similarity index 100%
rename from src/pkg/math/sqrt.go
rename to src/math/sqrt.go
diff --git a/src/pkg/math/sqrt_386.s b/src/math/sqrt_386.s
similarity index 100%
rename from src/pkg/math/sqrt_386.s
rename to src/math/sqrt_386.s
diff --git a/src/pkg/math/sqrt_amd64.s b/src/math/sqrt_amd64.s
similarity index 100%
rename from src/pkg/math/sqrt_amd64.s
rename to src/math/sqrt_amd64.s
diff --git a/src/pkg/math/sqrt_amd64p32.s b/src/math/sqrt_amd64p32.s
similarity index 100%
rename from src/pkg/math/sqrt_amd64p32.s
rename to src/math/sqrt_amd64p32.s
diff --git a/src/pkg/math/sqrt_arm.s b/src/math/sqrt_arm.s
similarity index 100%
rename from src/pkg/math/sqrt_arm.s
rename to src/math/sqrt_arm.s
diff --git a/src/pkg/math/tan.go b/src/math/tan.go
similarity index 100%
rename from src/pkg/math/tan.go
rename to src/math/tan.go
diff --git a/src/pkg/math/tan_386.s b/src/math/tan_386.s
similarity index 100%
rename from src/pkg/math/tan_386.s
rename to src/math/tan_386.s
diff --git a/src/pkg/math/tan_amd64.s b/src/math/tan_amd64.s
similarity index 100%
rename from src/pkg/math/tan_amd64.s
rename to src/math/tan_amd64.s
diff --git a/src/pkg/math/tan_amd64p32.s b/src/math/tan_amd64p32.s
similarity index 100%
rename from src/pkg/math/tan_amd64p32.s
rename to src/math/tan_amd64p32.s
diff --git a/src/pkg/math/tan_arm.s b/src/math/tan_arm.s
similarity index 100%
rename from src/pkg/math/tan_arm.s
rename to src/math/tan_arm.s
diff --git a/src/pkg/math/tanh.go b/src/math/tanh.go
similarity index 100%
rename from src/pkg/math/tanh.go
rename to src/math/tanh.go
diff --git a/src/pkg/math/unsafe.go b/src/math/unsafe.go
similarity index 100%
rename from src/pkg/math/unsafe.go
rename to src/math/unsafe.go
diff --git a/src/pkg/mime/grammar.go b/src/mime/grammar.go
similarity index 100%
rename from src/pkg/mime/grammar.go
rename to src/mime/grammar.go
diff --git a/src/pkg/mime/mediatype.go b/src/mime/mediatype.go
similarity index 100%
rename from src/pkg/mime/mediatype.go
rename to src/mime/mediatype.go
diff --git a/src/pkg/mime/mediatype_test.go b/src/mime/mediatype_test.go
similarity index 100%
rename from src/pkg/mime/mediatype_test.go
rename to src/mime/mediatype_test.go
diff --git a/src/pkg/mime/multipart/example_test.go b/src/mime/multipart/example_test.go
similarity index 100%
rename from src/pkg/mime/multipart/example_test.go
rename to src/mime/multipart/example_test.go
diff --git a/src/pkg/mime/multipart/formdata.go b/src/mime/multipart/formdata.go
similarity index 100%
rename from src/pkg/mime/multipart/formdata.go
rename to src/mime/multipart/formdata.go
diff --git a/src/pkg/mime/multipart/formdata_test.go b/src/mime/multipart/formdata_test.go
similarity index 100%
rename from src/pkg/mime/multipart/formdata_test.go
rename to src/mime/multipart/formdata_test.go
diff --git a/src/pkg/mime/multipart/multipart.go b/src/mime/multipart/multipart.go
similarity index 100%
rename from src/pkg/mime/multipart/multipart.go
rename to src/mime/multipart/multipart.go
diff --git a/src/pkg/mime/multipart/multipart_test.go b/src/mime/multipart/multipart_test.go
similarity index 100%
rename from src/pkg/mime/multipart/multipart_test.go
rename to src/mime/multipart/multipart_test.go
diff --git a/src/pkg/mime/multipart/quotedprintable.go b/src/mime/multipart/quotedprintable.go
similarity index 100%
rename from src/pkg/mime/multipart/quotedprintable.go
rename to src/mime/multipart/quotedprintable.go
diff --git a/src/pkg/mime/multipart/quotedprintable_test.go b/src/mime/multipart/quotedprintable_test.go
similarity index 100%
rename from src/pkg/mime/multipart/quotedprintable_test.go
rename to src/mime/multipart/quotedprintable_test.go
diff --git a/src/pkg/mime/multipart/testdata/nested-mime b/src/mime/multipart/testdata/nested-mime
similarity index 100%
rename from src/pkg/mime/multipart/testdata/nested-mime
rename to src/mime/multipart/testdata/nested-mime
diff --git a/src/pkg/mime/multipart/writer.go b/src/mime/multipart/writer.go
similarity index 100%
rename from src/pkg/mime/multipart/writer.go
rename to src/mime/multipart/writer.go
diff --git a/src/pkg/mime/multipart/writer_test.go b/src/mime/multipart/writer_test.go
similarity index 100%
rename from src/pkg/mime/multipart/writer_test.go
rename to src/mime/multipart/writer_test.go
diff --git a/src/pkg/mime/testdata/test.types b/src/mime/testdata/test.types
similarity index 100%
rename from src/pkg/mime/testdata/test.types
rename to src/mime/testdata/test.types
diff --git a/src/pkg/mime/testdata/test.types.plan9 b/src/mime/testdata/test.types.plan9
similarity index 100%
rename from src/pkg/mime/testdata/test.types.plan9
rename to src/mime/testdata/test.types.plan9
diff --git a/src/pkg/mime/type.go b/src/mime/type.go
similarity index 100%
rename from src/pkg/mime/type.go
rename to src/mime/type.go
diff --git a/src/pkg/mime/type_plan9.go b/src/mime/type_plan9.go
similarity index 100%
rename from src/pkg/mime/type_plan9.go
rename to src/mime/type_plan9.go
diff --git a/src/pkg/mime/type_test.go b/src/mime/type_test.go
similarity index 100%
rename from src/pkg/mime/type_test.go
rename to src/mime/type_test.go
diff --git a/src/pkg/mime/type_unix.go b/src/mime/type_unix.go
similarity index 100%
rename from src/pkg/mime/type_unix.go
rename to src/mime/type_unix.go
diff --git a/src/pkg/mime/type_windows.go b/src/mime/type_windows.go
similarity index 100%
rename from src/pkg/mime/type_windows.go
rename to src/mime/type_windows.go
diff --git a/src/pkg/net/cgo_android.go b/src/net/cgo_android.go
similarity index 100%
rename from src/pkg/net/cgo_android.go
rename to src/net/cgo_android.go
diff --git a/src/pkg/net/cgo_bsd.go b/src/net/cgo_bsd.go
similarity index 100%
rename from src/pkg/net/cgo_bsd.go
rename to src/net/cgo_bsd.go
diff --git a/src/pkg/net/cgo_linux.go b/src/net/cgo_linux.go
similarity index 100%
rename from src/pkg/net/cgo_linux.go
rename to src/net/cgo_linux.go
diff --git a/src/pkg/net/cgo_netbsd.go b/src/net/cgo_netbsd.go
similarity index 100%
rename from src/pkg/net/cgo_netbsd.go
rename to src/net/cgo_netbsd.go
diff --git a/src/pkg/net/cgo_openbsd.go b/src/net/cgo_openbsd.go
similarity index 100%
rename from src/pkg/net/cgo_openbsd.go
rename to src/net/cgo_openbsd.go
diff --git a/src/pkg/net/cgo_stub.go b/src/net/cgo_stub.go
similarity index 100%
rename from src/pkg/net/cgo_stub.go
rename to src/net/cgo_stub.go
diff --git a/src/pkg/net/cgo_unix.go b/src/net/cgo_unix.go
similarity index 100%
rename from src/pkg/net/cgo_unix.go
rename to src/net/cgo_unix.go
diff --git a/src/pkg/net/cgo_unix_test.go b/src/net/cgo_unix_test.go
similarity index 100%
rename from src/pkg/net/cgo_unix_test.go
rename to src/net/cgo_unix_test.go
diff --git a/src/pkg/net/conn_test.go b/src/net/conn_test.go
similarity index 100%
rename from src/pkg/net/conn_test.go
rename to src/net/conn_test.go
diff --git a/src/pkg/net/dial.go b/src/net/dial.go
similarity index 100%
rename from src/pkg/net/dial.go
rename to src/net/dial.go
diff --git a/src/pkg/net/dial_gen.go b/src/net/dial_gen.go
similarity index 100%
rename from src/pkg/net/dial_gen.go
rename to src/net/dial_gen.go
diff --git a/src/pkg/net/dial_gen_test.go b/src/net/dial_gen_test.go
similarity index 100%
rename from src/pkg/net/dial_gen_test.go
rename to src/net/dial_gen_test.go
diff --git a/src/pkg/net/dial_test.go b/src/net/dial_test.go
similarity index 100%
rename from src/pkg/net/dial_test.go
rename to src/net/dial_test.go
diff --git a/src/pkg/net/dialgoogle_test.go b/src/net/dialgoogle_test.go
similarity index 100%
rename from src/pkg/net/dialgoogle_test.go
rename to src/net/dialgoogle_test.go
diff --git a/src/pkg/net/dnsclient.go b/src/net/dnsclient.go
similarity index 100%
rename from src/pkg/net/dnsclient.go
rename to src/net/dnsclient.go
diff --git a/src/pkg/net/dnsclient_test.go b/src/net/dnsclient_test.go
similarity index 100%
rename from src/pkg/net/dnsclient_test.go
rename to src/net/dnsclient_test.go
diff --git a/src/pkg/net/dnsclient_unix.go b/src/net/dnsclient_unix.go
similarity index 100%
rename from src/pkg/net/dnsclient_unix.go
rename to src/net/dnsclient_unix.go
diff --git a/src/pkg/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
similarity index 100%
rename from src/pkg/net/dnsclient_unix_test.go
rename to src/net/dnsclient_unix_test.go
diff --git a/src/pkg/net/dnsconfig_unix.go b/src/net/dnsconfig_unix.go
similarity index 100%
rename from src/pkg/net/dnsconfig_unix.go
rename to src/net/dnsconfig_unix.go
diff --git a/src/pkg/net/dnsconfig_unix_test.go b/src/net/dnsconfig_unix_test.go
similarity index 100%
rename from src/pkg/net/dnsconfig_unix_test.go
rename to src/net/dnsconfig_unix_test.go
diff --git a/src/pkg/net/dnsmsg.go b/src/net/dnsmsg.go
similarity index 100%
rename from src/pkg/net/dnsmsg.go
rename to src/net/dnsmsg.go
diff --git a/src/pkg/net/dnsmsg_test.go b/src/net/dnsmsg_test.go
similarity index 100%
rename from src/pkg/net/dnsmsg_test.go
rename to src/net/dnsmsg_test.go
diff --git a/src/pkg/net/dnsname_test.go b/src/net/dnsname_test.go
similarity index 100%
rename from src/pkg/net/dnsname_test.go
rename to src/net/dnsname_test.go
diff --git a/src/pkg/net/empty.c b/src/net/empty.c
similarity index 100%
rename from src/pkg/net/empty.c
rename to src/net/empty.c
diff --git a/src/pkg/net/example_test.go b/src/net/example_test.go
similarity index 100%
rename from src/pkg/net/example_test.go
rename to src/net/example_test.go
diff --git a/src/pkg/net/fd_mutex.go b/src/net/fd_mutex.go
similarity index 100%
rename from src/pkg/net/fd_mutex.go
rename to src/net/fd_mutex.go
diff --git a/src/pkg/net/fd_mutex_test.go b/src/net/fd_mutex_test.go
similarity index 100%
rename from src/pkg/net/fd_mutex_test.go
rename to src/net/fd_mutex_test.go
diff --git a/src/pkg/net/fd_plan9.go b/src/net/fd_plan9.go
similarity index 100%
rename from src/pkg/net/fd_plan9.go
rename to src/net/fd_plan9.go
diff --git a/src/pkg/net/fd_poll_nacl.go b/src/net/fd_poll_nacl.go
similarity index 100%
rename from src/pkg/net/fd_poll_nacl.go
rename to src/net/fd_poll_nacl.go
diff --git a/src/pkg/net/fd_poll_runtime.go b/src/net/fd_poll_runtime.go
similarity index 100%
rename from src/pkg/net/fd_poll_runtime.go
rename to src/net/fd_poll_runtime.go
diff --git a/src/pkg/net/fd_unix.go b/src/net/fd_unix.go
similarity index 100%
rename from src/pkg/net/fd_unix.go
rename to src/net/fd_unix.go
diff --git a/src/pkg/net/fd_unix_test.go b/src/net/fd_unix_test.go
similarity index 100%
rename from src/pkg/net/fd_unix_test.go
rename to src/net/fd_unix_test.go
diff --git a/src/pkg/net/fd_windows.go b/src/net/fd_windows.go
similarity index 100%
rename from src/pkg/net/fd_windows.go
rename to src/net/fd_windows.go
diff --git a/src/pkg/net/file_plan9.go b/src/net/file_plan9.go
similarity index 100%
rename from src/pkg/net/file_plan9.go
rename to src/net/file_plan9.go
diff --git a/src/pkg/net/file_test.go b/src/net/file_test.go
similarity index 100%
rename from src/pkg/net/file_test.go
rename to src/net/file_test.go
diff --git a/src/pkg/net/file_unix.go b/src/net/file_unix.go
similarity index 100%
rename from src/pkg/net/file_unix.go
rename to src/net/file_unix.go
diff --git a/src/pkg/net/file_windows.go b/src/net/file_windows.go
similarity index 100%
rename from src/pkg/net/file_windows.go
rename to src/net/file_windows.go
diff --git a/src/pkg/net/hosts.go b/src/net/hosts.go
similarity index 100%
rename from src/pkg/net/hosts.go
rename to src/net/hosts.go
diff --git a/src/pkg/net/hosts_test.go b/src/net/hosts_test.go
similarity index 100%
rename from src/pkg/net/hosts_test.go
rename to src/net/hosts_test.go
diff --git a/src/pkg/net/http/cgi/child.go b/src/net/http/cgi/child.go
similarity index 100%
rename from src/pkg/net/http/cgi/child.go
rename to src/net/http/cgi/child.go
diff --git a/src/pkg/net/http/cgi/child_test.go b/src/net/http/cgi/child_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/child_test.go
rename to src/net/http/cgi/child_test.go
diff --git a/src/pkg/net/http/cgi/host.go b/src/net/http/cgi/host.go
similarity index 100%
rename from src/pkg/net/http/cgi/host.go
rename to src/net/http/cgi/host.go
diff --git a/src/pkg/net/http/cgi/host_test.go b/src/net/http/cgi/host_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/host_test.go
rename to src/net/http/cgi/host_test.go
diff --git a/src/pkg/net/http/cgi/matryoshka_test.go b/src/net/http/cgi/matryoshka_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/matryoshka_test.go
rename to src/net/http/cgi/matryoshka_test.go
diff --git a/src/pkg/net/http/cgi/plan9_test.go b/src/net/http/cgi/plan9_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/plan9_test.go
rename to src/net/http/cgi/plan9_test.go
diff --git a/src/pkg/net/http/cgi/posix_test.go b/src/net/http/cgi/posix_test.go
similarity index 100%
rename from src/pkg/net/http/cgi/posix_test.go
rename to src/net/http/cgi/posix_test.go
diff --git a/src/pkg/net/http/cgi/testdata/test.cgi b/src/net/http/cgi/testdata/test.cgi
similarity index 100%
rename from src/pkg/net/http/cgi/testdata/test.cgi
rename to src/net/http/cgi/testdata/test.cgi
diff --git a/src/pkg/net/http/client.go b/src/net/http/client.go
similarity index 100%
rename from src/pkg/net/http/client.go
rename to src/net/http/client.go
diff --git a/src/pkg/net/http/client_test.go b/src/net/http/client_test.go
similarity index 100%
rename from src/pkg/net/http/client_test.go
rename to src/net/http/client_test.go
diff --git a/src/pkg/net/http/cookie.go b/src/net/http/cookie.go
similarity index 100%
rename from src/pkg/net/http/cookie.go
rename to src/net/http/cookie.go
diff --git a/src/pkg/net/http/cookie_test.go b/src/net/http/cookie_test.go
similarity index 100%
rename from src/pkg/net/http/cookie_test.go
rename to src/net/http/cookie_test.go
diff --git a/src/pkg/net/http/cookiejar/jar.go b/src/net/http/cookiejar/jar.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/jar.go
rename to src/net/http/cookiejar/jar.go
diff --git a/src/pkg/net/http/cookiejar/jar_test.go b/src/net/http/cookiejar/jar_test.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/jar_test.go
rename to src/net/http/cookiejar/jar_test.go
diff --git a/src/pkg/net/http/cookiejar/punycode.go b/src/net/http/cookiejar/punycode.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/punycode.go
rename to src/net/http/cookiejar/punycode.go
diff --git a/src/pkg/net/http/cookiejar/punycode_test.go b/src/net/http/cookiejar/punycode_test.go
similarity index 100%
rename from src/pkg/net/http/cookiejar/punycode_test.go
rename to src/net/http/cookiejar/punycode_test.go
diff --git a/src/pkg/net/http/doc.go b/src/net/http/doc.go
similarity index 100%
rename from src/pkg/net/http/doc.go
rename to src/net/http/doc.go
diff --git a/src/pkg/net/http/example_test.go b/src/net/http/example_test.go
similarity index 100%
rename from src/pkg/net/http/example_test.go
rename to src/net/http/example_test.go
diff --git a/src/pkg/net/http/export_test.go b/src/net/http/export_test.go
similarity index 100%
rename from src/pkg/net/http/export_test.go
rename to src/net/http/export_test.go
diff --git a/src/pkg/net/http/fcgi/child.go b/src/net/http/fcgi/child.go
similarity index 100%
rename from src/pkg/net/http/fcgi/child.go
rename to src/net/http/fcgi/child.go
diff --git a/src/pkg/net/http/fcgi/fcgi.go b/src/net/http/fcgi/fcgi.go
similarity index 100%
rename from src/pkg/net/http/fcgi/fcgi.go
rename to src/net/http/fcgi/fcgi.go
diff --git a/src/pkg/net/http/fcgi/fcgi_test.go b/src/net/http/fcgi/fcgi_test.go
similarity index 100%
rename from src/pkg/net/http/fcgi/fcgi_test.go
rename to src/net/http/fcgi/fcgi_test.go
diff --git a/src/pkg/net/http/filetransport.go b/src/net/http/filetransport.go
similarity index 100%
rename from src/pkg/net/http/filetransport.go
rename to src/net/http/filetransport.go
diff --git a/src/pkg/net/http/filetransport_test.go b/src/net/http/filetransport_test.go
similarity index 100%
rename from src/pkg/net/http/filetransport_test.go
rename to src/net/http/filetransport_test.go
diff --git a/src/pkg/net/http/fs.go b/src/net/http/fs.go
similarity index 100%
rename from src/pkg/net/http/fs.go
rename to src/net/http/fs.go
diff --git a/src/pkg/net/http/fs_test.go b/src/net/http/fs_test.go
similarity index 100%
rename from src/pkg/net/http/fs_test.go
rename to src/net/http/fs_test.go
diff --git a/src/pkg/net/http/header.go b/src/net/http/header.go
similarity index 100%
rename from src/pkg/net/http/header.go
rename to src/net/http/header.go
diff --git a/src/pkg/net/http/header_test.go b/src/net/http/header_test.go
similarity index 100%
rename from src/pkg/net/http/header_test.go
rename to src/net/http/header_test.go
diff --git a/src/pkg/net/http/httptest/example_test.go b/src/net/http/httptest/example_test.go
similarity index 100%
rename from src/pkg/net/http/httptest/example_test.go
rename to src/net/http/httptest/example_test.go
diff --git a/src/pkg/net/http/httptest/recorder.go b/src/net/http/httptest/recorder.go
similarity index 100%
rename from src/pkg/net/http/httptest/recorder.go
rename to src/net/http/httptest/recorder.go
diff --git a/src/pkg/net/http/httptest/recorder_test.go b/src/net/http/httptest/recorder_test.go
similarity index 100%
rename from src/pkg/net/http/httptest/recorder_test.go
rename to src/net/http/httptest/recorder_test.go
diff --git a/src/pkg/net/http/httptest/server.go b/src/net/http/httptest/server.go
similarity index 100%
rename from src/pkg/net/http/httptest/server.go
rename to src/net/http/httptest/server.go
diff --git a/src/pkg/net/http/httptest/server_test.go b/src/net/http/httptest/server_test.go
similarity index 100%
rename from src/pkg/net/http/httptest/server_test.go
rename to src/net/http/httptest/server_test.go
diff --git a/src/pkg/net/http/httputil/dump.go b/src/net/http/httputil/dump.go
similarity index 100%
rename from src/pkg/net/http/httputil/dump.go
rename to src/net/http/httputil/dump.go
diff --git a/src/pkg/net/http/httputil/dump_test.go b/src/net/http/httputil/dump_test.go
similarity index 100%
rename from src/pkg/net/http/httputil/dump_test.go
rename to src/net/http/httputil/dump_test.go
diff --git a/src/pkg/net/http/httputil/httputil.go b/src/net/http/httputil/httputil.go
similarity index 100%
rename from src/pkg/net/http/httputil/httputil.go
rename to src/net/http/httputil/httputil.go
diff --git a/src/pkg/net/http/httputil/persist.go b/src/net/http/httputil/persist.go
similarity index 100%
rename from src/pkg/net/http/httputil/persist.go
rename to src/net/http/httputil/persist.go
diff --git a/src/pkg/net/http/httputil/reverseproxy.go b/src/net/http/httputil/reverseproxy.go
similarity index 100%
rename from src/pkg/net/http/httputil/reverseproxy.go
rename to src/net/http/httputil/reverseproxy.go
diff --git a/src/pkg/net/http/httputil/reverseproxy_test.go b/src/net/http/httputil/reverseproxy_test.go
similarity index 100%
rename from src/pkg/net/http/httputil/reverseproxy_test.go
rename to src/net/http/httputil/reverseproxy_test.go
diff --git a/src/pkg/net/http/internal/chunked.go b/src/net/http/internal/chunked.go
similarity index 100%
rename from src/pkg/net/http/internal/chunked.go
rename to src/net/http/internal/chunked.go
diff --git a/src/pkg/net/http/internal/chunked_test.go b/src/net/http/internal/chunked_test.go
similarity index 100%
rename from src/pkg/net/http/internal/chunked_test.go
rename to src/net/http/internal/chunked_test.go
diff --git a/src/pkg/net/http/jar.go b/src/net/http/jar.go
similarity index 100%
rename from src/pkg/net/http/jar.go
rename to src/net/http/jar.go
diff --git a/src/pkg/net/http/lex.go b/src/net/http/lex.go
similarity index 100%
rename from src/pkg/net/http/lex.go
rename to src/net/http/lex.go
diff --git a/src/pkg/net/http/lex_test.go b/src/net/http/lex_test.go
similarity index 100%
rename from src/pkg/net/http/lex_test.go
rename to src/net/http/lex_test.go
diff --git a/src/pkg/net/http/npn_test.go b/src/net/http/npn_test.go
similarity index 100%
rename from src/pkg/net/http/npn_test.go
rename to src/net/http/npn_test.go
diff --git a/src/pkg/net/http/pprof/pprof.go b/src/net/http/pprof/pprof.go
similarity index 100%
rename from src/pkg/net/http/pprof/pprof.go
rename to src/net/http/pprof/pprof.go
diff --git a/src/pkg/net/http/proxy_test.go b/src/net/http/proxy_test.go
similarity index 100%
rename from src/pkg/net/http/proxy_test.go
rename to src/net/http/proxy_test.go
diff --git a/src/pkg/net/http/race.go b/src/net/http/race.go
similarity index 100%
rename from src/pkg/net/http/race.go
rename to src/net/http/race.go
diff --git a/src/pkg/net/http/range_test.go b/src/net/http/range_test.go
similarity index 100%
rename from src/pkg/net/http/range_test.go
rename to src/net/http/range_test.go
diff --git a/src/pkg/net/http/readrequest_test.go b/src/net/http/readrequest_test.go
similarity index 100%
rename from src/pkg/net/http/readrequest_test.go
rename to src/net/http/readrequest_test.go
diff --git a/src/pkg/net/http/request.go b/src/net/http/request.go
similarity index 100%
rename from src/pkg/net/http/request.go
rename to src/net/http/request.go
diff --git a/src/pkg/net/http/request_test.go b/src/net/http/request_test.go
similarity index 100%
rename from src/pkg/net/http/request_test.go
rename to src/net/http/request_test.go
diff --git a/src/pkg/net/http/requestwrite_test.go b/src/net/http/requestwrite_test.go
similarity index 100%
rename from src/pkg/net/http/requestwrite_test.go
rename to src/net/http/requestwrite_test.go
diff --git a/src/pkg/net/http/response.go b/src/net/http/response.go
similarity index 100%
rename from src/pkg/net/http/response.go
rename to src/net/http/response.go
diff --git a/src/pkg/net/http/response_test.go b/src/net/http/response_test.go
similarity index 100%
rename from src/pkg/net/http/response_test.go
rename to src/net/http/response_test.go
diff --git a/src/pkg/net/http/responsewrite_test.go b/src/net/http/responsewrite_test.go
similarity index 100%
rename from src/pkg/net/http/responsewrite_test.go
rename to src/net/http/responsewrite_test.go
diff --git a/src/pkg/net/http/serve_test.go b/src/net/http/serve_test.go
similarity index 100%
rename from src/pkg/net/http/serve_test.go
rename to src/net/http/serve_test.go
diff --git a/src/pkg/net/http/server.go b/src/net/http/server.go
similarity index 100%
rename from src/pkg/net/http/server.go
rename to src/net/http/server.go
diff --git a/src/pkg/net/http/sniff.go b/src/net/http/sniff.go
similarity index 100%
rename from src/pkg/net/http/sniff.go
rename to src/net/http/sniff.go
diff --git a/src/pkg/net/http/sniff_test.go b/src/net/http/sniff_test.go
similarity index 100%
rename from src/pkg/net/http/sniff_test.go
rename to src/net/http/sniff_test.go
diff --git a/src/pkg/net/http/status.go b/src/net/http/status.go
similarity index 100%
rename from src/pkg/net/http/status.go
rename to src/net/http/status.go
diff --git a/src/pkg/net/http/testdata/file b/src/net/http/testdata/file
similarity index 100%
rename from src/pkg/net/http/testdata/file
rename to src/net/http/testdata/file
diff --git a/src/pkg/net/http/testdata/index.html b/src/net/http/testdata/index.html
similarity index 100%
rename from src/pkg/net/http/testdata/index.html
rename to src/net/http/testdata/index.html
diff --git a/src/pkg/net/http/testdata/style.css b/src/net/http/testdata/style.css
similarity index 100%
rename from src/pkg/net/http/testdata/style.css
rename to src/net/http/testdata/style.css
diff --git a/src/pkg/net/http/transfer.go b/src/net/http/transfer.go
similarity index 100%
rename from src/pkg/net/http/transfer.go
rename to src/net/http/transfer.go
diff --git a/src/pkg/net/http/transfer_test.go b/src/net/http/transfer_test.go
similarity index 100%
rename from src/pkg/net/http/transfer_test.go
rename to src/net/http/transfer_test.go
diff --git a/src/pkg/net/http/transport.go b/src/net/http/transport.go
similarity index 100%
rename from src/pkg/net/http/transport.go
rename to src/net/http/transport.go
diff --git a/src/pkg/net/http/transport_test.go b/src/net/http/transport_test.go
similarity index 100%
rename from src/pkg/net/http/transport_test.go
rename to src/net/http/transport_test.go
diff --git a/src/pkg/net/http/triv.go b/src/net/http/triv.go
similarity index 100%
rename from src/pkg/net/http/triv.go
rename to src/net/http/triv.go
diff --git a/src/pkg/net/http/z_last_test.go b/src/net/http/z_last_test.go
similarity index 100%
rename from src/pkg/net/http/z_last_test.go
rename to src/net/http/z_last_test.go
diff --git a/src/pkg/net/interface.go b/src/net/interface.go
similarity index 100%
rename from src/pkg/net/interface.go
rename to src/net/interface.go
diff --git a/src/pkg/net/interface_bsd.go b/src/net/interface_bsd.go
similarity index 100%
rename from src/pkg/net/interface_bsd.go
rename to src/net/interface_bsd.go
diff --git a/src/pkg/net/interface_bsd_test.go b/src/net/interface_bsd_test.go
similarity index 100%
rename from src/pkg/net/interface_bsd_test.go
rename to src/net/interface_bsd_test.go
diff --git a/src/pkg/net/interface_darwin.go b/src/net/interface_darwin.go
similarity index 100%
rename from src/pkg/net/interface_darwin.go
rename to src/net/interface_darwin.go
diff --git a/src/pkg/net/interface_dragonfly.go b/src/net/interface_dragonfly.go
similarity index 100%
rename from src/pkg/net/interface_dragonfly.go
rename to src/net/interface_dragonfly.go
diff --git a/src/pkg/net/interface_freebsd.go b/src/net/interface_freebsd.go
similarity index 100%
rename from src/pkg/net/interface_freebsd.go
rename to src/net/interface_freebsd.go
diff --git a/src/pkg/net/interface_linux.go b/src/net/interface_linux.go
similarity index 100%
rename from src/pkg/net/interface_linux.go
rename to src/net/interface_linux.go
diff --git a/src/pkg/net/interface_linux_test.go b/src/net/interface_linux_test.go
similarity index 100%
rename from src/pkg/net/interface_linux_test.go
rename to src/net/interface_linux_test.go
diff --git a/src/pkg/net/interface_netbsd.go b/src/net/interface_netbsd.go
similarity index 100%
rename from src/pkg/net/interface_netbsd.go
rename to src/net/interface_netbsd.go
diff --git a/src/pkg/net/interface_openbsd.go b/src/net/interface_openbsd.go
similarity index 100%
rename from src/pkg/net/interface_openbsd.go
rename to src/net/interface_openbsd.go
diff --git a/src/pkg/net/interface_stub.go b/src/net/interface_stub.go
similarity index 100%
rename from src/pkg/net/interface_stub.go
rename to src/net/interface_stub.go
diff --git a/src/pkg/net/interface_test.go b/src/net/interface_test.go
similarity index 100%
rename from src/pkg/net/interface_test.go
rename to src/net/interface_test.go
diff --git a/src/pkg/net/interface_unix_test.go b/src/net/interface_unix_test.go
similarity index 100%
rename from src/pkg/net/interface_unix_test.go
rename to src/net/interface_unix_test.go
diff --git a/src/pkg/net/interface_windows.go b/src/net/interface_windows.go
similarity index 100%
rename from src/pkg/net/interface_windows.go
rename to src/net/interface_windows.go
diff --git a/src/pkg/net/ip.go b/src/net/ip.go
similarity index 100%
rename from src/pkg/net/ip.go
rename to src/net/ip.go
diff --git a/src/pkg/net/ip_test.go b/src/net/ip_test.go
similarity index 100%
rename from src/pkg/net/ip_test.go
rename to src/net/ip_test.go
diff --git a/src/pkg/net/ipraw_test.go b/src/net/ipraw_test.go
similarity index 100%
rename from src/pkg/net/ipraw_test.go
rename to src/net/ipraw_test.go
diff --git a/src/pkg/net/iprawsock.go b/src/net/iprawsock.go
similarity index 100%
rename from src/pkg/net/iprawsock.go
rename to src/net/iprawsock.go
diff --git a/src/pkg/net/iprawsock_plan9.go b/src/net/iprawsock_plan9.go
similarity index 100%
rename from src/pkg/net/iprawsock_plan9.go
rename to src/net/iprawsock_plan9.go
diff --git a/src/pkg/net/iprawsock_posix.go b/src/net/iprawsock_posix.go
similarity index 100%
rename from src/pkg/net/iprawsock_posix.go
rename to src/net/iprawsock_posix.go
diff --git a/src/pkg/net/ipsock.go b/src/net/ipsock.go
similarity index 100%
rename from src/pkg/net/ipsock.go
rename to src/net/ipsock.go
diff --git a/src/pkg/net/ipsock_plan9.go b/src/net/ipsock_plan9.go
similarity index 100%
rename from src/pkg/net/ipsock_plan9.go
rename to src/net/ipsock_plan9.go
diff --git a/src/pkg/net/ipsock_posix.go b/src/net/ipsock_posix.go
similarity index 100%
rename from src/pkg/net/ipsock_posix.go
rename to src/net/ipsock_posix.go
diff --git a/src/pkg/net/ipsock_test.go b/src/net/ipsock_test.go
similarity index 100%
rename from src/pkg/net/ipsock_test.go
rename to src/net/ipsock_test.go
diff --git a/src/pkg/net/lookup.go b/src/net/lookup.go
similarity index 100%
rename from src/pkg/net/lookup.go
rename to src/net/lookup.go
diff --git a/src/pkg/net/lookup_plan9.go b/src/net/lookup_plan9.go
similarity index 100%
rename from src/pkg/net/lookup_plan9.go
rename to src/net/lookup_plan9.go
diff --git a/src/pkg/net/lookup_test.go b/src/net/lookup_test.go
similarity index 100%
rename from src/pkg/net/lookup_test.go
rename to src/net/lookup_test.go
diff --git a/src/pkg/net/lookup_unix.go b/src/net/lookup_unix.go
similarity index 100%
rename from src/pkg/net/lookup_unix.go
rename to src/net/lookup_unix.go
diff --git a/src/pkg/net/lookup_windows.go b/src/net/lookup_windows.go
similarity index 100%
rename from src/pkg/net/lookup_windows.go
rename to src/net/lookup_windows.go
diff --git a/src/pkg/net/lookup_windows_test.go b/src/net/lookup_windows_test.go
similarity index 100%
rename from src/pkg/net/lookup_windows_test.go
rename to src/net/lookup_windows_test.go
diff --git a/src/pkg/net/mac.go b/src/net/mac.go
similarity index 100%
rename from src/pkg/net/mac.go
rename to src/net/mac.go
diff --git a/src/pkg/net/mac_test.go b/src/net/mac_test.go
similarity index 100%
rename from src/pkg/net/mac_test.go
rename to src/net/mac_test.go
diff --git a/src/pkg/net/mail/message.go b/src/net/mail/message.go
similarity index 100%
rename from src/pkg/net/mail/message.go
rename to src/net/mail/message.go
diff --git a/src/pkg/net/mail/message_test.go b/src/net/mail/message_test.go
similarity index 100%
rename from src/pkg/net/mail/message_test.go
rename to src/net/mail/message_test.go
diff --git a/src/pkg/net/mockicmp_test.go b/src/net/mockicmp_test.go
similarity index 100%
rename from src/pkg/net/mockicmp_test.go
rename to src/net/mockicmp_test.go
diff --git a/src/pkg/net/mockserver_test.go b/src/net/mockserver_test.go
similarity index 100%
rename from src/pkg/net/mockserver_test.go
rename to src/net/mockserver_test.go
diff --git a/src/pkg/net/multicast_test.go b/src/net/multicast_test.go
similarity index 100%
rename from src/pkg/net/multicast_test.go
rename to src/net/multicast_test.go
diff --git a/src/pkg/net/net.go b/src/net/net.go
similarity index 100%
rename from src/pkg/net/net.go
rename to src/net/net.go
diff --git a/src/pkg/net/net_test.go b/src/net/net_test.go
similarity index 100%
rename from src/pkg/net/net_test.go
rename to src/net/net_test.go
diff --git a/src/pkg/net/net_windows_test.go b/src/net/net_windows_test.go
similarity index 100%
rename from src/pkg/net/net_windows_test.go
rename to src/net/net_windows_test.go
diff --git a/src/pkg/net/netgo_unix_test.go b/src/net/netgo_unix_test.go
similarity index 100%
rename from src/pkg/net/netgo_unix_test.go
rename to src/net/netgo_unix_test.go
diff --git a/src/pkg/net/packetconn_test.go b/src/net/packetconn_test.go
similarity index 100%
rename from src/pkg/net/packetconn_test.go
rename to src/net/packetconn_test.go
diff --git a/src/pkg/net/parse.go b/src/net/parse.go
similarity index 100%
rename from src/pkg/net/parse.go
rename to src/net/parse.go
diff --git a/src/pkg/net/parse_test.go b/src/net/parse_test.go
similarity index 100%
rename from src/pkg/net/parse_test.go
rename to src/net/parse_test.go
diff --git a/src/pkg/net/pipe.go b/src/net/pipe.go
similarity index 100%
rename from src/pkg/net/pipe.go
rename to src/net/pipe.go
diff --git a/src/pkg/net/pipe_test.go b/src/net/pipe_test.go
similarity index 100%
rename from src/pkg/net/pipe_test.go
rename to src/net/pipe_test.go
diff --git a/src/pkg/net/port.go b/src/net/port.go
similarity index 100%
rename from src/pkg/net/port.go
rename to src/net/port.go
diff --git a/src/pkg/net/port_test.go b/src/net/port_test.go
similarity index 100%
rename from src/pkg/net/port_test.go
rename to src/net/port_test.go
diff --git a/src/pkg/net/port_unix.go b/src/net/port_unix.go
similarity index 100%
rename from src/pkg/net/port_unix.go
rename to src/net/port_unix.go
diff --git a/src/pkg/net/protoconn_test.go b/src/net/protoconn_test.go
similarity index 100%
rename from src/pkg/net/protoconn_test.go
rename to src/net/protoconn_test.go
diff --git a/src/pkg/net/race.go b/src/net/race.go
similarity index 100%
rename from src/pkg/net/race.go
rename to src/net/race.go
diff --git a/src/pkg/net/race0.go b/src/net/race0.go
similarity index 100%
rename from src/pkg/net/race0.go
rename to src/net/race0.go
diff --git a/src/pkg/net/rpc/client.go b/src/net/rpc/client.go
similarity index 100%
rename from src/pkg/net/rpc/client.go
rename to src/net/rpc/client.go
diff --git a/src/pkg/net/rpc/client_test.go b/src/net/rpc/client_test.go
similarity index 100%
rename from src/pkg/net/rpc/client_test.go
rename to src/net/rpc/client_test.go
diff --git a/src/pkg/net/rpc/debug.go b/src/net/rpc/debug.go
similarity index 100%
rename from src/pkg/net/rpc/debug.go
rename to src/net/rpc/debug.go
diff --git a/src/pkg/net/rpc/jsonrpc/all_test.go b/src/net/rpc/jsonrpc/all_test.go
similarity index 100%
rename from src/pkg/net/rpc/jsonrpc/all_test.go
rename to src/net/rpc/jsonrpc/all_test.go
diff --git a/src/pkg/net/rpc/jsonrpc/client.go b/src/net/rpc/jsonrpc/client.go
similarity index 100%
rename from src/pkg/net/rpc/jsonrpc/client.go
rename to src/net/rpc/jsonrpc/client.go
diff --git a/src/pkg/net/rpc/jsonrpc/server.go b/src/net/rpc/jsonrpc/server.go
similarity index 100%
rename from src/pkg/net/rpc/jsonrpc/server.go
rename to src/net/rpc/jsonrpc/server.go
diff --git a/src/pkg/net/rpc/server.go b/src/net/rpc/server.go
similarity index 100%
rename from src/pkg/net/rpc/server.go
rename to src/net/rpc/server.go
diff --git a/src/pkg/net/rpc/server_test.go b/src/net/rpc/server_test.go
similarity index 100%
rename from src/pkg/net/rpc/server_test.go
rename to src/net/rpc/server_test.go
diff --git a/src/pkg/net/sendfile_dragonfly.go b/src/net/sendfile_dragonfly.go
similarity index 100%
rename from src/pkg/net/sendfile_dragonfly.go
rename to src/net/sendfile_dragonfly.go
diff --git a/src/pkg/net/sendfile_freebsd.go b/src/net/sendfile_freebsd.go
similarity index 100%
rename from src/pkg/net/sendfile_freebsd.go
rename to src/net/sendfile_freebsd.go
diff --git a/src/pkg/net/sendfile_linux.go b/src/net/sendfile_linux.go
similarity index 100%
rename from src/pkg/net/sendfile_linux.go
rename to src/net/sendfile_linux.go
diff --git a/src/pkg/net/sendfile_stub.go b/src/net/sendfile_stub.go
similarity index 100%
rename from src/pkg/net/sendfile_stub.go
rename to src/net/sendfile_stub.go
diff --git a/src/pkg/net/sendfile_windows.go b/src/net/sendfile_windows.go
similarity index 100%
rename from src/pkg/net/sendfile_windows.go
rename to src/net/sendfile_windows.go
diff --git a/src/pkg/net/server_test.go b/src/net/server_test.go
similarity index 100%
rename from src/pkg/net/server_test.go
rename to src/net/server_test.go
diff --git a/src/pkg/net/singleflight.go b/src/net/singleflight.go
similarity index 100%
rename from src/pkg/net/singleflight.go
rename to src/net/singleflight.go
diff --git a/src/pkg/net/smtp/auth.go b/src/net/smtp/auth.go
similarity index 100%
rename from src/pkg/net/smtp/auth.go
rename to src/net/smtp/auth.go
diff --git a/src/pkg/net/smtp/example_test.go b/src/net/smtp/example_test.go
similarity index 100%
rename from src/pkg/net/smtp/example_test.go
rename to src/net/smtp/example_test.go
diff --git a/src/pkg/net/smtp/smtp.go b/src/net/smtp/smtp.go
similarity index 100%
rename from src/pkg/net/smtp/smtp.go
rename to src/net/smtp/smtp.go
diff --git a/src/pkg/net/smtp/smtp_test.go b/src/net/smtp/smtp_test.go
similarity index 100%
rename from src/pkg/net/smtp/smtp_test.go
rename to src/net/smtp/smtp_test.go
diff --git a/src/pkg/net/sock_bsd.go b/src/net/sock_bsd.go
similarity index 100%
rename from src/pkg/net/sock_bsd.go
rename to src/net/sock_bsd.go
diff --git a/src/pkg/net/sock_cloexec.go b/src/net/sock_cloexec.go
similarity index 100%
rename from src/pkg/net/sock_cloexec.go
rename to src/net/sock_cloexec.go
diff --git a/src/pkg/net/sock_linux.go b/src/net/sock_linux.go
similarity index 100%
rename from src/pkg/net/sock_linux.go
rename to src/net/sock_linux.go
diff --git a/src/pkg/net/sock_plan9.go b/src/net/sock_plan9.go
similarity index 100%
rename from src/pkg/net/sock_plan9.go
rename to src/net/sock_plan9.go
diff --git a/src/pkg/net/sock_posix.go b/src/net/sock_posix.go
similarity index 100%
rename from src/pkg/net/sock_posix.go
rename to src/net/sock_posix.go
diff --git a/src/pkg/net/sock_solaris.go b/src/net/sock_solaris.go
similarity index 100%
rename from src/pkg/net/sock_solaris.go
rename to src/net/sock_solaris.go
diff --git a/src/pkg/net/sock_windows.go b/src/net/sock_windows.go
similarity index 100%
rename from src/pkg/net/sock_windows.go
rename to src/net/sock_windows.go
diff --git a/src/pkg/net/sockopt_bsd.go b/src/net/sockopt_bsd.go
similarity index 100%
rename from src/pkg/net/sockopt_bsd.go
rename to src/net/sockopt_bsd.go
diff --git a/src/pkg/net/sockopt_linux.go b/src/net/sockopt_linux.go
similarity index 100%
rename from src/pkg/net/sockopt_linux.go
rename to src/net/sockopt_linux.go
diff --git a/src/pkg/net/sockopt_plan9.go b/src/net/sockopt_plan9.go
similarity index 100%
rename from src/pkg/net/sockopt_plan9.go
rename to src/net/sockopt_plan9.go
diff --git a/src/pkg/net/sockopt_posix.go b/src/net/sockopt_posix.go
similarity index 100%
rename from src/pkg/net/sockopt_posix.go
rename to src/net/sockopt_posix.go
diff --git a/src/pkg/net/sockopt_solaris.go b/src/net/sockopt_solaris.go
similarity index 100%
rename from src/pkg/net/sockopt_solaris.go
rename to src/net/sockopt_solaris.go
diff --git a/src/pkg/net/sockopt_windows.go b/src/net/sockopt_windows.go
similarity index 100%
rename from src/pkg/net/sockopt_windows.go
rename to src/net/sockopt_windows.go
diff --git a/src/pkg/net/sockoptip_bsd.go b/src/net/sockoptip_bsd.go
similarity index 100%
rename from src/pkg/net/sockoptip_bsd.go
rename to src/net/sockoptip_bsd.go
diff --git a/src/pkg/net/sockoptip_linux.go b/src/net/sockoptip_linux.go
similarity index 100%
rename from src/pkg/net/sockoptip_linux.go
rename to src/net/sockoptip_linux.go
diff --git a/src/pkg/net/sockoptip_posix.go b/src/net/sockoptip_posix.go
similarity index 100%
rename from src/pkg/net/sockoptip_posix.go
rename to src/net/sockoptip_posix.go
diff --git a/src/pkg/net/sockoptip_stub.go b/src/net/sockoptip_stub.go
similarity index 100%
rename from src/pkg/net/sockoptip_stub.go
rename to src/net/sockoptip_stub.go
diff --git a/src/pkg/net/sockoptip_windows.go b/src/net/sockoptip_windows.go
similarity index 100%
rename from src/pkg/net/sockoptip_windows.go
rename to src/net/sockoptip_windows.go
diff --git a/src/pkg/net/sys_cloexec.go b/src/net/sys_cloexec.go
similarity index 100%
rename from src/pkg/net/sys_cloexec.go
rename to src/net/sys_cloexec.go
diff --git a/src/pkg/net/tcp_test.go b/src/net/tcp_test.go
similarity index 100%
rename from src/pkg/net/tcp_test.go
rename to src/net/tcp_test.go
diff --git a/src/pkg/net/tcpsock.go b/src/net/tcpsock.go
similarity index 100%
rename from src/pkg/net/tcpsock.go
rename to src/net/tcpsock.go
diff --git a/src/pkg/net/tcpsock_plan9.go b/src/net/tcpsock_plan9.go
similarity index 100%
rename from src/pkg/net/tcpsock_plan9.go
rename to src/net/tcpsock_plan9.go
diff --git a/src/pkg/net/tcpsock_posix.go b/src/net/tcpsock_posix.go
similarity index 100%
rename from src/pkg/net/tcpsock_posix.go
rename to src/net/tcpsock_posix.go
diff --git a/src/pkg/net/tcpsockopt_darwin.go b/src/net/tcpsockopt_darwin.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_darwin.go
rename to src/net/tcpsockopt_darwin.go
diff --git a/src/pkg/net/tcpsockopt_dragonfly.go b/src/net/tcpsockopt_dragonfly.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_dragonfly.go
rename to src/net/tcpsockopt_dragonfly.go
diff --git a/src/pkg/net/tcpsockopt_openbsd.go b/src/net/tcpsockopt_openbsd.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_openbsd.go
rename to src/net/tcpsockopt_openbsd.go
diff --git a/src/pkg/net/tcpsockopt_plan9.go b/src/net/tcpsockopt_plan9.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_plan9.go
rename to src/net/tcpsockopt_plan9.go
diff --git a/src/pkg/net/tcpsockopt_posix.go b/src/net/tcpsockopt_posix.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_posix.go
rename to src/net/tcpsockopt_posix.go
diff --git a/src/pkg/net/tcpsockopt_solaris.go b/src/net/tcpsockopt_solaris.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_solaris.go
rename to src/net/tcpsockopt_solaris.go
diff --git a/src/pkg/net/tcpsockopt_unix.go b/src/net/tcpsockopt_unix.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_unix.go
rename to src/net/tcpsockopt_unix.go
diff --git a/src/pkg/net/tcpsockopt_windows.go b/src/net/tcpsockopt_windows.go
similarity index 100%
rename from src/pkg/net/tcpsockopt_windows.go
rename to src/net/tcpsockopt_windows.go
diff --git a/src/pkg/net/testdata/domain-resolv.conf b/src/net/testdata/domain-resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/domain-resolv.conf
rename to src/net/testdata/domain-resolv.conf
diff --git a/src/pkg/net/testdata/empty-resolv.conf b/src/net/testdata/empty-resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/empty-resolv.conf
rename to src/net/testdata/empty-resolv.conf
diff --git a/src/pkg/net/testdata/hosts b/src/net/testdata/hosts
similarity index 100%
rename from src/pkg/net/testdata/hosts
rename to src/net/testdata/hosts
diff --git a/src/pkg/net/testdata/hosts_singleline b/src/net/testdata/hosts_singleline
similarity index 100%
rename from src/pkg/net/testdata/hosts_singleline
rename to src/net/testdata/hosts_singleline
diff --git a/src/pkg/net/testdata/igmp b/src/net/testdata/igmp
similarity index 100%
rename from src/pkg/net/testdata/igmp
rename to src/net/testdata/igmp
diff --git a/src/pkg/net/testdata/igmp6 b/src/net/testdata/igmp6
similarity index 100%
rename from src/pkg/net/testdata/igmp6
rename to src/net/testdata/igmp6
diff --git a/src/pkg/net/testdata/resolv.conf b/src/net/testdata/resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/resolv.conf
rename to src/net/testdata/resolv.conf
diff --git a/src/pkg/net/testdata/search-resolv.conf b/src/net/testdata/search-resolv.conf
similarity index 100%
rename from src/pkg/net/testdata/search-resolv.conf
rename to src/net/testdata/search-resolv.conf
diff --git a/src/pkg/net/textproto/header.go b/src/net/textproto/header.go
similarity index 100%
rename from src/pkg/net/textproto/header.go
rename to src/net/textproto/header.go
diff --git a/src/pkg/net/textproto/pipeline.go b/src/net/textproto/pipeline.go
similarity index 100%
rename from src/pkg/net/textproto/pipeline.go
rename to src/net/textproto/pipeline.go
diff --git a/src/pkg/net/textproto/reader.go b/src/net/textproto/reader.go
similarity index 100%
rename from src/pkg/net/textproto/reader.go
rename to src/net/textproto/reader.go
diff --git a/src/pkg/net/textproto/reader_test.go b/src/net/textproto/reader_test.go
similarity index 100%
rename from src/pkg/net/textproto/reader_test.go
rename to src/net/textproto/reader_test.go
diff --git a/src/pkg/net/textproto/textproto.go b/src/net/textproto/textproto.go
similarity index 100%
rename from src/pkg/net/textproto/textproto.go
rename to src/net/textproto/textproto.go
diff --git a/src/pkg/net/textproto/writer.go b/src/net/textproto/writer.go
similarity index 100%
rename from src/pkg/net/textproto/writer.go
rename to src/net/textproto/writer.go
diff --git a/src/pkg/net/textproto/writer_test.go b/src/net/textproto/writer_test.go
similarity index 100%
rename from src/pkg/net/textproto/writer_test.go
rename to src/net/textproto/writer_test.go
diff --git a/src/pkg/net/timeout_test.go b/src/net/timeout_test.go
similarity index 100%
rename from src/pkg/net/timeout_test.go
rename to src/net/timeout_test.go
diff --git a/src/pkg/net/udp_test.go b/src/net/udp_test.go
similarity index 100%
rename from src/pkg/net/udp_test.go
rename to src/net/udp_test.go
diff --git a/src/pkg/net/udpsock.go b/src/net/udpsock.go
similarity index 100%
rename from src/pkg/net/udpsock.go
rename to src/net/udpsock.go
diff --git a/src/pkg/net/udpsock_plan9.go b/src/net/udpsock_plan9.go
similarity index 100%
rename from src/pkg/net/udpsock_plan9.go
rename to src/net/udpsock_plan9.go
diff --git a/src/pkg/net/udpsock_posix.go b/src/net/udpsock_posix.go
similarity index 100%
rename from src/pkg/net/udpsock_posix.go
rename to src/net/udpsock_posix.go
diff --git a/src/pkg/net/unicast_posix_test.go b/src/net/unicast_posix_test.go
similarity index 100%
rename from src/pkg/net/unicast_posix_test.go
rename to src/net/unicast_posix_test.go
diff --git a/src/pkg/net/unix_test.go b/src/net/unix_test.go
similarity index 100%
rename from src/pkg/net/unix_test.go
rename to src/net/unix_test.go
diff --git a/src/pkg/net/unixsock.go b/src/net/unixsock.go
similarity index 100%
rename from src/pkg/net/unixsock.go
rename to src/net/unixsock.go
diff --git a/src/pkg/net/unixsock_plan9.go b/src/net/unixsock_plan9.go
similarity index 100%
rename from src/pkg/net/unixsock_plan9.go
rename to src/net/unixsock_plan9.go
diff --git a/src/pkg/net/unixsock_posix.go b/src/net/unixsock_posix.go
similarity index 100%
rename from src/pkg/net/unixsock_posix.go
rename to src/net/unixsock_posix.go
diff --git a/src/pkg/net/url/example_test.go b/src/net/url/example_test.go
similarity index 100%
rename from src/pkg/net/url/example_test.go
rename to src/net/url/example_test.go
diff --git a/src/pkg/net/url/url.go b/src/net/url/url.go
similarity index 100%
rename from src/pkg/net/url/url.go
rename to src/net/url/url.go
diff --git a/src/pkg/net/url/url_test.go b/src/net/url/url_test.go
similarity index 100%
rename from src/pkg/net/url/url_test.go
rename to src/net/url/url_test.go
diff --git a/src/pkg/net/z_last_test.go b/src/net/z_last_test.go
similarity index 100%
rename from src/pkg/net/z_last_test.go
rename to src/net/z_last_test.go
diff --git a/src/pkg/os/dir_plan9.go b/src/os/dir_plan9.go
similarity index 100%
rename from src/pkg/os/dir_plan9.go
rename to src/os/dir_plan9.go
diff --git a/src/pkg/os/dir_unix.go b/src/os/dir_unix.go
similarity index 100%
rename from src/pkg/os/dir_unix.go
rename to src/os/dir_unix.go
diff --git a/src/pkg/os/dir_windows.go b/src/os/dir_windows.go
similarity index 100%
rename from src/pkg/os/dir_windows.go
rename to src/os/dir_windows.go
diff --git a/src/pkg/os/doc.go b/src/os/doc.go
similarity index 100%
rename from src/pkg/os/doc.go
rename to src/os/doc.go
diff --git a/src/pkg/os/env.go b/src/os/env.go
similarity index 100%
rename from src/pkg/os/env.go
rename to src/os/env.go
diff --git a/src/pkg/os/env_test.go b/src/os/env_test.go
similarity index 100%
rename from src/pkg/os/env_test.go
rename to src/os/env_test.go
diff --git a/src/pkg/os/env_unix_test.go b/src/os/env_unix_test.go
similarity index 100%
rename from src/pkg/os/env_unix_test.go
rename to src/os/env_unix_test.go
diff --git a/src/pkg/os/error.go b/src/os/error.go
similarity index 100%
rename from src/pkg/os/error.go
rename to src/os/error.go
diff --git a/src/pkg/os/error_plan9.go b/src/os/error_plan9.go
similarity index 100%
rename from src/pkg/os/error_plan9.go
rename to src/os/error_plan9.go
diff --git a/src/pkg/os/error_test.go b/src/os/error_test.go
similarity index 100%
rename from src/pkg/os/error_test.go
rename to src/os/error_test.go
diff --git a/src/pkg/os/error_unix.go b/src/os/error_unix.go
similarity index 100%
rename from src/pkg/os/error_unix.go
rename to src/os/error_unix.go
diff --git a/src/pkg/os/error_windows.go b/src/os/error_windows.go
similarity index 100%
rename from src/pkg/os/error_windows.go
rename to src/os/error_windows.go
diff --git a/src/pkg/os/error_windows_test.go b/src/os/error_windows_test.go
similarity index 100%
rename from src/pkg/os/error_windows_test.go
rename to src/os/error_windows_test.go
diff --git a/src/pkg/os/exec.go b/src/os/exec.go
similarity index 100%
rename from src/pkg/os/exec.go
rename to src/os/exec.go
diff --git a/src/pkg/os/exec/example_test.go b/src/os/exec/example_test.go
similarity index 100%
rename from src/pkg/os/exec/example_test.go
rename to src/os/exec/example_test.go
diff --git a/src/pkg/os/exec/exec.go b/src/os/exec/exec.go
similarity index 100%
rename from src/pkg/os/exec/exec.go
rename to src/os/exec/exec.go
diff --git a/src/pkg/os/exec/exec_test.go b/src/os/exec/exec_test.go
similarity index 100%
rename from src/pkg/os/exec/exec_test.go
rename to src/os/exec/exec_test.go
diff --git a/src/pkg/os/exec/lp_plan9.go b/src/os/exec/lp_plan9.go
similarity index 100%
rename from src/pkg/os/exec/lp_plan9.go
rename to src/os/exec/lp_plan9.go
diff --git a/src/pkg/os/exec/lp_test.go b/src/os/exec/lp_test.go
similarity index 100%
rename from src/pkg/os/exec/lp_test.go
rename to src/os/exec/lp_test.go
diff --git a/src/pkg/os/exec/lp_unix.go b/src/os/exec/lp_unix.go
similarity index 100%
rename from src/pkg/os/exec/lp_unix.go
rename to src/os/exec/lp_unix.go
diff --git a/src/pkg/os/exec/lp_unix_test.go b/src/os/exec/lp_unix_test.go
similarity index 100%
rename from src/pkg/os/exec/lp_unix_test.go
rename to src/os/exec/lp_unix_test.go
diff --git a/src/pkg/os/exec/lp_windows.go b/src/os/exec/lp_windows.go
similarity index 100%
rename from src/pkg/os/exec/lp_windows.go
rename to src/os/exec/lp_windows.go
diff --git a/src/pkg/os/exec/lp_windows_test.go b/src/os/exec/lp_windows_test.go
similarity index 100%
rename from src/pkg/os/exec/lp_windows_test.go
rename to src/os/exec/lp_windows_test.go
diff --git a/src/pkg/os/exec_plan9.go b/src/os/exec_plan9.go
similarity index 100%
rename from src/pkg/os/exec_plan9.go
rename to src/os/exec_plan9.go
diff --git a/src/pkg/os/exec_posix.go b/src/os/exec_posix.go
similarity index 100%
rename from src/pkg/os/exec_posix.go
rename to src/os/exec_posix.go
diff --git a/src/pkg/os/exec_unix.go b/src/os/exec_unix.go
similarity index 100%
rename from src/pkg/os/exec_unix.go
rename to src/os/exec_unix.go
diff --git a/src/pkg/os/exec_windows.go b/src/os/exec_windows.go
similarity index 100%
rename from src/pkg/os/exec_windows.go
rename to src/os/exec_windows.go
diff --git a/src/pkg/os/export_test.go b/src/os/export_test.go
similarity index 100%
rename from src/pkg/os/export_test.go
rename to src/os/export_test.go
diff --git a/src/pkg/os/file.go b/src/os/file.go
similarity index 100%
rename from src/pkg/os/file.go
rename to src/os/file.go
diff --git a/src/pkg/os/file_plan9.go b/src/os/file_plan9.go
similarity index 100%
rename from src/pkg/os/file_plan9.go
rename to src/os/file_plan9.go
diff --git a/src/pkg/os/file_posix.go b/src/os/file_posix.go
similarity index 100%
rename from src/pkg/os/file_posix.go
rename to src/os/file_posix.go
diff --git a/src/pkg/os/file_unix.go b/src/os/file_unix.go
similarity index 100%
rename from src/pkg/os/file_unix.go
rename to src/os/file_unix.go
diff --git a/src/pkg/os/file_windows.go b/src/os/file_windows.go
similarity index 100%
rename from src/pkg/os/file_windows.go
rename to src/os/file_windows.go
diff --git a/src/pkg/os/getwd.go b/src/os/getwd.go
similarity index 100%
rename from src/pkg/os/getwd.go
rename to src/os/getwd.go
diff --git a/src/pkg/os/getwd_darwin.go b/src/os/getwd_darwin.go
similarity index 100%
rename from src/pkg/os/getwd_darwin.go
rename to src/os/getwd_darwin.go
diff --git a/src/pkg/os/os_test.go b/src/os/os_test.go
similarity index 100%
rename from src/pkg/os/os_test.go
rename to src/os/os_test.go
diff --git a/src/pkg/os/os_unix_test.go b/src/os/os_unix_test.go
similarity index 100%
rename from src/pkg/os/os_unix_test.go
rename to src/os/os_unix_test.go
diff --git a/src/pkg/os/os_windows_test.go b/src/os/os_windows_test.go
similarity index 100%
rename from src/pkg/os/os_windows_test.go
rename to src/os/os_windows_test.go
diff --git a/src/pkg/os/path.go b/src/os/path.go
similarity index 100%
rename from src/pkg/os/path.go
rename to src/os/path.go
diff --git a/src/pkg/os/path_plan9.go b/src/os/path_plan9.go
similarity index 100%
rename from src/pkg/os/path_plan9.go
rename to src/os/path_plan9.go
diff --git a/src/pkg/os/path_test.go b/src/os/path_test.go
similarity index 100%
rename from src/pkg/os/path_test.go
rename to src/os/path_test.go
diff --git a/src/pkg/os/path_unix.go b/src/os/path_unix.go
similarity index 100%
rename from src/pkg/os/path_unix.go
rename to src/os/path_unix.go
diff --git a/src/pkg/os/path_windows.go b/src/os/path_windows.go
similarity index 100%
rename from src/pkg/os/path_windows.go
rename to src/os/path_windows.go
diff --git a/src/pkg/os/pipe_bsd.go b/src/os/pipe_bsd.go
similarity index 100%
rename from src/pkg/os/pipe_bsd.go
rename to src/os/pipe_bsd.go
diff --git a/src/pkg/os/pipe_linux.go b/src/os/pipe_linux.go
similarity index 100%
rename from src/pkg/os/pipe_linux.go
rename to src/os/pipe_linux.go
diff --git a/src/pkg/os/proc.go b/src/os/proc.go
similarity index 100%
rename from src/pkg/os/proc.go
rename to src/os/proc.go
diff --git a/src/pkg/os/signal/example_test.go b/src/os/signal/example_test.go
similarity index 100%
rename from src/pkg/os/signal/example_test.go
rename to src/os/signal/example_test.go
diff --git a/src/pkg/os/signal/sig.s b/src/os/signal/sig.s
similarity index 100%
rename from src/pkg/os/signal/sig.s
rename to src/os/signal/sig.s
diff --git a/src/pkg/os/signal/signal.go b/src/os/signal/signal.go
similarity index 100%
rename from src/pkg/os/signal/signal.go
rename to src/os/signal/signal.go
diff --git a/src/pkg/os/signal/signal_stub.go b/src/os/signal/signal_stub.go
similarity index 100%
rename from src/pkg/os/signal/signal_stub.go
rename to src/os/signal/signal_stub.go
diff --git a/src/pkg/os/signal/signal_test.go b/src/os/signal/signal_test.go
similarity index 100%
rename from src/pkg/os/signal/signal_test.go
rename to src/os/signal/signal_test.go
diff --git a/src/pkg/os/signal/signal_unix.go b/src/os/signal/signal_unix.go
similarity index 100%
rename from src/pkg/os/signal/signal_unix.go
rename to src/os/signal/signal_unix.go
diff --git a/src/pkg/os/signal/signal_windows_test.go b/src/os/signal/signal_windows_test.go
similarity index 100%
rename from src/pkg/os/signal/signal_windows_test.go
rename to src/os/signal/signal_windows_test.go
diff --git a/src/pkg/os/stat_darwin.go b/src/os/stat_darwin.go
similarity index 100%
rename from src/pkg/os/stat_darwin.go
rename to src/os/stat_darwin.go
diff --git a/src/pkg/os/stat_dragonfly.go b/src/os/stat_dragonfly.go
similarity index 100%
rename from src/pkg/os/stat_dragonfly.go
rename to src/os/stat_dragonfly.go
diff --git a/src/pkg/os/stat_freebsd.go b/src/os/stat_freebsd.go
similarity index 100%
rename from src/pkg/os/stat_freebsd.go
rename to src/os/stat_freebsd.go
diff --git a/src/pkg/os/stat_linux.go b/src/os/stat_linux.go
similarity index 100%
rename from src/pkg/os/stat_linux.go
rename to src/os/stat_linux.go
diff --git a/src/pkg/os/stat_nacl.go b/src/os/stat_nacl.go
similarity index 100%
rename from src/pkg/os/stat_nacl.go
rename to src/os/stat_nacl.go
diff --git a/src/pkg/os/stat_netbsd.go b/src/os/stat_netbsd.go
similarity index 100%
rename from src/pkg/os/stat_netbsd.go
rename to src/os/stat_netbsd.go
diff --git a/src/pkg/os/stat_openbsd.go b/src/os/stat_openbsd.go
similarity index 100%
rename from src/pkg/os/stat_openbsd.go
rename to src/os/stat_openbsd.go
diff --git a/src/pkg/os/stat_plan9.go b/src/os/stat_plan9.go
similarity index 100%
rename from src/pkg/os/stat_plan9.go
rename to src/os/stat_plan9.go
diff --git a/src/pkg/os/stat_solaris.go b/src/os/stat_solaris.go
similarity index 100%
rename from src/pkg/os/stat_solaris.go
rename to src/os/stat_solaris.go
diff --git a/src/pkg/os/stat_windows.go b/src/os/stat_windows.go
similarity index 100%
rename from src/pkg/os/stat_windows.go
rename to src/os/stat_windows.go
diff --git a/src/pkg/os/str.go b/src/os/str.go
similarity index 100%
rename from src/pkg/os/str.go
rename to src/os/str.go
diff --git a/src/pkg/os/sys_bsd.go b/src/os/sys_bsd.go
similarity index 100%
rename from src/pkg/os/sys_bsd.go
rename to src/os/sys_bsd.go
diff --git a/src/pkg/os/sys_darwin.go b/src/os/sys_darwin.go
similarity index 100%
rename from src/pkg/os/sys_darwin.go
rename to src/os/sys_darwin.go
diff --git a/src/pkg/os/sys_freebsd.go b/src/os/sys_freebsd.go
similarity index 100%
rename from src/pkg/os/sys_freebsd.go
rename to src/os/sys_freebsd.go
diff --git a/src/pkg/os/sys_linux.go b/src/os/sys_linux.go
similarity index 100%
rename from src/pkg/os/sys_linux.go
rename to src/os/sys_linux.go
diff --git a/src/pkg/os/sys_nacl.go b/src/os/sys_nacl.go
similarity index 100%
rename from src/pkg/os/sys_nacl.go
rename to src/os/sys_nacl.go
diff --git a/src/pkg/os/sys_plan9.go b/src/os/sys_plan9.go
similarity index 100%
rename from src/pkg/os/sys_plan9.go
rename to src/os/sys_plan9.go
diff --git a/src/pkg/os/sys_solaris.go b/src/os/sys_solaris.go
similarity index 100%
rename from src/pkg/os/sys_solaris.go
rename to src/os/sys_solaris.go
diff --git a/src/pkg/os/sys_unix.go b/src/os/sys_unix.go
similarity index 100%
rename from src/pkg/os/sys_unix.go
rename to src/os/sys_unix.go
diff --git a/src/pkg/os/sys_windows.go b/src/os/sys_windows.go
similarity index 100%
rename from src/pkg/os/sys_windows.go
rename to src/os/sys_windows.go
diff --git a/src/pkg/os/types.go b/src/os/types.go
similarity index 100%
rename from src/pkg/os/types.go
rename to src/os/types.go
diff --git a/src/pkg/os/types_notwin.go b/src/os/types_notwin.go
similarity index 100%
rename from src/pkg/os/types_notwin.go
rename to src/os/types_notwin.go
diff --git a/src/pkg/os/types_windows.go b/src/os/types_windows.go
similarity index 100%
rename from src/pkg/os/types_windows.go
rename to src/os/types_windows.go
diff --git a/src/pkg/os/user/lookup.go b/src/os/user/lookup.go
similarity index 100%
rename from src/pkg/os/user/lookup.go
rename to src/os/user/lookup.go
diff --git a/src/pkg/os/user/lookup_plan9.go b/src/os/user/lookup_plan9.go
similarity index 100%
rename from src/pkg/os/user/lookup_plan9.go
rename to src/os/user/lookup_plan9.go
diff --git a/src/pkg/os/user/lookup_stubs.go b/src/os/user/lookup_stubs.go
similarity index 100%
rename from src/pkg/os/user/lookup_stubs.go
rename to src/os/user/lookup_stubs.go
diff --git a/src/pkg/os/user/lookup_unix.go b/src/os/user/lookup_unix.go
similarity index 100%
rename from src/pkg/os/user/lookup_unix.go
rename to src/os/user/lookup_unix.go
diff --git a/src/pkg/os/user/lookup_windows.go b/src/os/user/lookup_windows.go
similarity index 100%
rename from src/pkg/os/user/lookup_windows.go
rename to src/os/user/lookup_windows.go
diff --git a/src/pkg/os/user/user.go b/src/os/user/user.go
similarity index 100%
rename from src/pkg/os/user/user.go
rename to src/os/user/user.go
diff --git a/src/pkg/os/user/user_test.go b/src/os/user/user_test.go
similarity index 100%
rename from src/pkg/os/user/user_test.go
rename to src/os/user/user_test.go
diff --git a/src/pkg/path/example_test.go b/src/path/example_test.go
similarity index 100%
rename from src/pkg/path/example_test.go
rename to src/path/example_test.go
diff --git a/src/pkg/path/filepath/example_unix_test.go b/src/path/filepath/example_unix_test.go
similarity index 100%
rename from src/pkg/path/filepath/example_unix_test.go
rename to src/path/filepath/example_unix_test.go
diff --git a/src/pkg/path/filepath/export_test.go b/src/path/filepath/export_test.go
similarity index 100%
rename from src/pkg/path/filepath/export_test.go
rename to src/path/filepath/export_test.go
diff --git a/src/pkg/path/filepath/match.go b/src/path/filepath/match.go
similarity index 100%
rename from src/pkg/path/filepath/match.go
rename to src/path/filepath/match.go
diff --git a/src/pkg/path/filepath/match_test.go b/src/path/filepath/match_test.go
similarity index 100%
rename from src/pkg/path/filepath/match_test.go
rename to src/path/filepath/match_test.go
diff --git a/src/pkg/path/filepath/path.go b/src/path/filepath/path.go
similarity index 100%
rename from src/pkg/path/filepath/path.go
rename to src/path/filepath/path.go
diff --git a/src/pkg/path/filepath/path_plan9.go b/src/path/filepath/path_plan9.go
similarity index 100%
rename from src/pkg/path/filepath/path_plan9.go
rename to src/path/filepath/path_plan9.go
diff --git a/src/pkg/path/filepath/path_test.go b/src/path/filepath/path_test.go
similarity index 100%
rename from src/pkg/path/filepath/path_test.go
rename to src/path/filepath/path_test.go
diff --git a/src/pkg/path/filepath/path_unix.go b/src/path/filepath/path_unix.go
similarity index 100%
rename from src/pkg/path/filepath/path_unix.go
rename to src/path/filepath/path_unix.go
diff --git a/src/pkg/path/filepath/path_windows.go b/src/path/filepath/path_windows.go
similarity index 100%
rename from src/pkg/path/filepath/path_windows.go
rename to src/path/filepath/path_windows.go
diff --git a/src/pkg/path/filepath/path_windows_test.go b/src/path/filepath/path_windows_test.go
similarity index 100%
rename from src/pkg/path/filepath/path_windows_test.go
rename to src/path/filepath/path_windows_test.go
diff --git a/src/pkg/path/filepath/symlink.go b/src/path/filepath/symlink.go
similarity index 100%
rename from src/pkg/path/filepath/symlink.go
rename to src/path/filepath/symlink.go
diff --git a/src/pkg/path/filepath/symlink_unix.go b/src/path/filepath/symlink_unix.go
similarity index 100%
rename from src/pkg/path/filepath/symlink_unix.go
rename to src/path/filepath/symlink_unix.go
diff --git a/src/pkg/path/filepath/symlink_windows.go b/src/path/filepath/symlink_windows.go
similarity index 100%
rename from src/pkg/path/filepath/symlink_windows.go
rename to src/path/filepath/symlink_windows.go
diff --git a/src/pkg/path/match.go b/src/path/match.go
similarity index 100%
rename from src/pkg/path/match.go
rename to src/path/match.go
diff --git a/src/pkg/path/match_test.go b/src/path/match_test.go
similarity index 100%
rename from src/pkg/path/match_test.go
rename to src/path/match_test.go
diff --git a/src/pkg/path/path.go b/src/path/path.go
similarity index 100%
rename from src/pkg/path/path.go
rename to src/path/path.go
diff --git a/src/pkg/path/path_test.go b/src/path/path_test.go
similarity index 100%
rename from src/pkg/path/path_test.go
rename to src/path/path_test.go
diff --git a/src/pkg/reflect/all_test.go b/src/reflect/all_test.go
similarity index 100%
rename from src/pkg/reflect/all_test.go
rename to src/reflect/all_test.go
diff --git a/src/pkg/reflect/asm_386.s b/src/reflect/asm_386.s
similarity index 100%
rename from src/pkg/reflect/asm_386.s
rename to src/reflect/asm_386.s
diff --git a/src/pkg/reflect/asm_amd64.s b/src/reflect/asm_amd64.s
similarity index 100%
rename from src/pkg/reflect/asm_amd64.s
rename to src/reflect/asm_amd64.s
diff --git a/src/pkg/reflect/asm_amd64p32.s b/src/reflect/asm_amd64p32.s
similarity index 100%
rename from src/pkg/reflect/asm_amd64p32.s
rename to src/reflect/asm_amd64p32.s
diff --git a/src/pkg/reflect/asm_arm.s b/src/reflect/asm_arm.s
similarity index 100%
rename from src/pkg/reflect/asm_arm.s
rename to src/reflect/asm_arm.s
diff --git a/src/pkg/reflect/deepequal.go b/src/reflect/deepequal.go
similarity index 100%
rename from src/pkg/reflect/deepequal.go
rename to src/reflect/deepequal.go
diff --git a/src/pkg/reflect/example_test.go b/src/reflect/example_test.go
similarity index 100%
rename from src/pkg/reflect/example_test.go
rename to src/reflect/example_test.go
diff --git a/src/pkg/reflect/export_test.go b/src/reflect/export_test.go
similarity index 100%
rename from src/pkg/reflect/export_test.go
rename to src/reflect/export_test.go
diff --git a/src/pkg/reflect/makefunc.go b/src/reflect/makefunc.go
similarity index 100%
rename from src/pkg/reflect/makefunc.go
rename to src/reflect/makefunc.go
diff --git a/src/pkg/reflect/set_test.go b/src/reflect/set_test.go
similarity index 100%
rename from src/pkg/reflect/set_test.go
rename to src/reflect/set_test.go
diff --git a/src/pkg/reflect/tostring_test.go b/src/reflect/tostring_test.go
similarity index 100%
rename from src/pkg/reflect/tostring_test.go
rename to src/reflect/tostring_test.go
diff --git a/src/pkg/reflect/type.go b/src/reflect/type.go
similarity index 100%
rename from src/pkg/reflect/type.go
rename to src/reflect/type.go
diff --git a/src/pkg/reflect/value.go b/src/reflect/value.go
similarity index 100%
rename from src/pkg/reflect/value.go
rename to src/reflect/value.go
diff --git a/src/pkg/regexp/all_test.go b/src/regexp/all_test.go
similarity index 100%
rename from src/pkg/regexp/all_test.go
rename to src/regexp/all_test.go
diff --git a/src/pkg/regexp/example_test.go b/src/regexp/example_test.go
similarity index 100%
rename from src/pkg/regexp/example_test.go
rename to src/regexp/example_test.go
diff --git a/src/pkg/regexp/exec.go b/src/regexp/exec.go
similarity index 100%
rename from src/pkg/regexp/exec.go
rename to src/regexp/exec.go
diff --git a/src/pkg/regexp/exec2_test.go b/src/regexp/exec2_test.go
similarity index 100%
rename from src/pkg/regexp/exec2_test.go
rename to src/regexp/exec2_test.go
diff --git a/src/pkg/regexp/exec_test.go b/src/regexp/exec_test.go
similarity index 100%
rename from src/pkg/regexp/exec_test.go
rename to src/regexp/exec_test.go
diff --git a/src/pkg/regexp/find_test.go b/src/regexp/find_test.go
similarity index 100%
rename from src/pkg/regexp/find_test.go
rename to src/regexp/find_test.go
diff --git a/src/pkg/regexp/onepass.go b/src/regexp/onepass.go
similarity index 100%
rename from src/pkg/regexp/onepass.go
rename to src/regexp/onepass.go
diff --git a/src/pkg/regexp/onepass_test.go b/src/regexp/onepass_test.go
similarity index 100%
rename from src/pkg/regexp/onepass_test.go
rename to src/regexp/onepass_test.go
diff --git a/src/pkg/regexp/regexp.go b/src/regexp/regexp.go
similarity index 100%
rename from src/pkg/regexp/regexp.go
rename to src/regexp/regexp.go
diff --git a/src/pkg/regexp/syntax/compile.go b/src/regexp/syntax/compile.go
similarity index 100%
rename from src/pkg/regexp/syntax/compile.go
rename to src/regexp/syntax/compile.go
diff --git a/src/pkg/regexp/syntax/doc.go b/src/regexp/syntax/doc.go
similarity index 100%
rename from src/pkg/regexp/syntax/doc.go
rename to src/regexp/syntax/doc.go
diff --git a/src/pkg/regexp/syntax/make_perl_groups.pl b/src/regexp/syntax/make_perl_groups.pl
similarity index 100%
rename from src/pkg/regexp/syntax/make_perl_groups.pl
rename to src/regexp/syntax/make_perl_groups.pl
diff --git a/src/pkg/regexp/syntax/parse.go b/src/regexp/syntax/parse.go
similarity index 100%
rename from src/pkg/regexp/syntax/parse.go
rename to src/regexp/syntax/parse.go
diff --git a/src/pkg/regexp/syntax/parse_test.go b/src/regexp/syntax/parse_test.go
similarity index 100%
rename from src/pkg/regexp/syntax/parse_test.go
rename to src/regexp/syntax/parse_test.go
diff --git a/src/pkg/regexp/syntax/perl_groups.go b/src/regexp/syntax/perl_groups.go
similarity index 100%
rename from src/pkg/regexp/syntax/perl_groups.go
rename to src/regexp/syntax/perl_groups.go
diff --git a/src/pkg/regexp/syntax/prog.go b/src/regexp/syntax/prog.go
similarity index 100%
rename from src/pkg/regexp/syntax/prog.go
rename to src/regexp/syntax/prog.go
diff --git a/src/pkg/regexp/syntax/prog_test.go b/src/regexp/syntax/prog_test.go
similarity index 100%
rename from src/pkg/regexp/syntax/prog_test.go
rename to src/regexp/syntax/prog_test.go
diff --git a/src/pkg/regexp/syntax/regexp.go b/src/regexp/syntax/regexp.go
similarity index 100%
rename from src/pkg/regexp/syntax/regexp.go
rename to src/regexp/syntax/regexp.go
diff --git a/src/pkg/regexp/syntax/simplify.go b/src/regexp/syntax/simplify.go
similarity index 100%
rename from src/pkg/regexp/syntax/simplify.go
rename to src/regexp/syntax/simplify.go
diff --git a/src/pkg/regexp/syntax/simplify_test.go b/src/regexp/syntax/simplify_test.go
similarity index 100%
rename from src/pkg/regexp/syntax/simplify_test.go
rename to src/regexp/syntax/simplify_test.go
diff --git a/src/pkg/regexp/testdata/README b/src/regexp/testdata/README
similarity index 100%
rename from src/pkg/regexp/testdata/README
rename to src/regexp/testdata/README
diff --git a/src/pkg/regexp/testdata/basic.dat b/src/regexp/testdata/basic.dat
similarity index 100%
rename from src/pkg/regexp/testdata/basic.dat
rename to src/regexp/testdata/basic.dat
diff --git a/src/pkg/regexp/testdata/nullsubexpr.dat b/src/regexp/testdata/nullsubexpr.dat
similarity index 100%
rename from src/pkg/regexp/testdata/nullsubexpr.dat
rename to src/regexp/testdata/nullsubexpr.dat
diff --git a/src/pkg/regexp/testdata/re2-exhaustive.txt.bz2 b/src/regexp/testdata/re2-exhaustive.txt.bz2
similarity index 100%
rename from src/pkg/regexp/testdata/re2-exhaustive.txt.bz2
rename to src/regexp/testdata/re2-exhaustive.txt.bz2
diff --git a/src/pkg/regexp/testdata/re2-search.txt b/src/regexp/testdata/re2-search.txt
similarity index 100%
rename from src/pkg/regexp/testdata/re2-search.txt
rename to src/regexp/testdata/re2-search.txt
diff --git a/src/pkg/regexp/testdata/repetition.dat b/src/regexp/testdata/repetition.dat
similarity index 100%
rename from src/pkg/regexp/testdata/repetition.dat
rename to src/regexp/testdata/repetition.dat
diff --git a/src/pkg/regexp/testdata/testregex.c b/src/regexp/testdata/testregex.c
similarity index 100%
rename from src/pkg/regexp/testdata/testregex.c
rename to src/regexp/testdata/testregex.c
diff --git a/src/pkg/runtime/Makefile b/src/runtime/Makefile
similarity index 100%
rename from src/pkg/runtime/Makefile
rename to src/runtime/Makefile
diff --git a/src/pkg/runtime/alg.go b/src/runtime/alg.go
similarity index 100%
rename from src/pkg/runtime/alg.go
rename to src/runtime/alg.go
diff --git a/src/pkg/runtime/append_test.go b/src/runtime/append_test.go
similarity index 100%
rename from src/pkg/runtime/append_test.go
rename to src/runtime/append_test.go
diff --git a/src/pkg/runtime/arch_386.go b/src/runtime/arch_386.go
similarity index 100%
rename from src/pkg/runtime/arch_386.go
rename to src/runtime/arch_386.go
diff --git a/src/pkg/runtime/arch_386.h b/src/runtime/arch_386.h
similarity index 100%
rename from src/pkg/runtime/arch_386.h
rename to src/runtime/arch_386.h
diff --git a/src/pkg/runtime/arch_amd64.go b/src/runtime/arch_amd64.go
similarity index 100%
rename from src/pkg/runtime/arch_amd64.go
rename to src/runtime/arch_amd64.go
diff --git a/src/pkg/runtime/arch_amd64.h b/src/runtime/arch_amd64.h
similarity index 100%
rename from src/pkg/runtime/arch_amd64.h
rename to src/runtime/arch_amd64.h
diff --git a/src/pkg/runtime/arch_amd64p32.go b/src/runtime/arch_amd64p32.go
similarity index 100%
rename from src/pkg/runtime/arch_amd64p32.go
rename to src/runtime/arch_amd64p32.go
diff --git a/src/pkg/runtime/arch_amd64p32.h b/src/runtime/arch_amd64p32.h
similarity index 100%
rename from src/pkg/runtime/arch_amd64p32.h
rename to src/runtime/arch_amd64p32.h
diff --git a/src/pkg/runtime/arch_arm.go b/src/runtime/arch_arm.go
similarity index 100%
rename from src/pkg/runtime/arch_arm.go
rename to src/runtime/arch_arm.go
diff --git a/src/pkg/runtime/arch_arm.h b/src/runtime/arch_arm.h
similarity index 100%
rename from src/pkg/runtime/arch_arm.h
rename to src/runtime/arch_arm.h
diff --git a/src/pkg/runtime/asm_386.s b/src/runtime/asm_386.s
similarity index 100%
rename from src/pkg/runtime/asm_386.s
rename to src/runtime/asm_386.s
diff --git a/src/pkg/runtime/asm_amd64.s b/src/runtime/asm_amd64.s
similarity index 100%
rename from src/pkg/runtime/asm_amd64.s
rename to src/runtime/asm_amd64.s
diff --git a/src/pkg/runtime/asm_amd64p32.s b/src/runtime/asm_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/asm_amd64p32.s
rename to src/runtime/asm_amd64p32.s
diff --git a/src/pkg/runtime/asm_arm.s b/src/runtime/asm_arm.s
similarity index 100%
rename from src/pkg/runtime/asm_arm.s
rename to src/runtime/asm_arm.s
diff --git a/src/pkg/runtime/atomic.go b/src/runtime/atomic.go
similarity index 100%
rename from src/pkg/runtime/atomic.go
rename to src/runtime/atomic.go
diff --git a/src/pkg/runtime/atomic_386.c b/src/runtime/atomic_386.c
similarity index 100%
rename from src/pkg/runtime/atomic_386.c
rename to src/runtime/atomic_386.c
diff --git a/src/pkg/runtime/atomic_amd64x.c b/src/runtime/atomic_amd64x.c
similarity index 100%
rename from src/pkg/runtime/atomic_amd64x.c
rename to src/runtime/atomic_amd64x.c
diff --git a/src/pkg/runtime/atomic_arm.go b/src/runtime/atomic_arm.go
similarity index 100%
rename from src/pkg/runtime/atomic_arm.go
rename to src/runtime/atomic_arm.go
diff --git a/src/pkg/runtime/cgo/asm_386.s b/src/runtime/cgo/asm_386.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_386.s
rename to src/runtime/cgo/asm_386.s
diff --git a/src/pkg/runtime/cgo/asm_amd64.s b/src/runtime/cgo/asm_amd64.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_amd64.s
rename to src/runtime/cgo/asm_amd64.s
diff --git a/src/pkg/runtime/cgo/asm_arm.s b/src/runtime/cgo/asm_arm.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_arm.s
rename to src/runtime/cgo/asm_arm.s
diff --git a/src/pkg/runtime/cgo/asm_nacl_amd64p32.s b/src/runtime/cgo/asm_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/cgo/asm_nacl_amd64p32.s
rename to src/runtime/cgo/asm_nacl_amd64p32.s
diff --git a/src/pkg/runtime/cgo/callbacks.c b/src/runtime/cgo/callbacks.c
similarity index 100%
rename from src/pkg/runtime/cgo/callbacks.c
rename to src/runtime/cgo/callbacks.c
diff --git a/src/pkg/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go
similarity index 100%
rename from src/pkg/runtime/cgo/cgo.go
rename to src/runtime/cgo/cgo.go
diff --git a/src/pkg/runtime/cgo/dragonfly.c b/src/runtime/cgo/dragonfly.c
similarity index 100%
rename from src/pkg/runtime/cgo/dragonfly.c
rename to src/runtime/cgo/dragonfly.c
diff --git a/src/pkg/runtime/cgo/freebsd.c b/src/runtime/cgo/freebsd.c
similarity index 100%
rename from src/pkg/runtime/cgo/freebsd.c
rename to src/runtime/cgo/freebsd.c
diff --git a/src/pkg/runtime/cgo/gcc_386.S b/src/runtime/cgo/gcc_386.S
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_386.S
rename to src/runtime/cgo/gcc_386.S
diff --git a/src/pkg/runtime/cgo/gcc_amd64.S b/src/runtime/cgo/gcc_amd64.S
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_amd64.S
rename to src/runtime/cgo/gcc_amd64.S
diff --git a/src/pkg/runtime/cgo/gcc_android.c b/src/runtime/cgo/gcc_android.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_android.c
rename to src/runtime/cgo/gcc_android.c
diff --git a/src/pkg/runtime/cgo/gcc_android_arm.c b/src/runtime/cgo/gcc_android_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_android_arm.c
rename to src/runtime/cgo/gcc_android_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_arm.S b/src/runtime/cgo/gcc_arm.S
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_arm.S
rename to src/runtime/cgo/gcc_arm.S
diff --git a/src/pkg/runtime/cgo/gcc_darwin_386.c b/src/runtime/cgo/gcc_darwin_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_darwin_386.c
rename to src/runtime/cgo/gcc_darwin_386.c
diff --git a/src/pkg/runtime/cgo/gcc_darwin_amd64.c b/src/runtime/cgo/gcc_darwin_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_darwin_amd64.c
rename to src/runtime/cgo/gcc_darwin_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_dragonfly_386.c b/src/runtime/cgo/gcc_dragonfly_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_dragonfly_386.c
rename to src/runtime/cgo/gcc_dragonfly_386.c
diff --git a/src/pkg/runtime/cgo/gcc_dragonfly_amd64.c b/src/runtime/cgo/gcc_dragonfly_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_dragonfly_amd64.c
rename to src/runtime/cgo/gcc_dragonfly_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_fatalf.c b/src/runtime/cgo/gcc_fatalf.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_fatalf.c
rename to src/runtime/cgo/gcc_fatalf.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_386.c b/src/runtime/cgo/gcc_freebsd_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_freebsd_386.c
rename to src/runtime/cgo/gcc_freebsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_amd64.c b/src/runtime/cgo/gcc_freebsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_freebsd_amd64.c
rename to src/runtime/cgo/gcc_freebsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_freebsd_arm.c b/src/runtime/cgo/gcc_freebsd_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_freebsd_arm.c
rename to src/runtime/cgo/gcc_freebsd_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_386.c b/src/runtime/cgo/gcc_linux_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_linux_386.c
rename to src/runtime/cgo/gcc_linux_386.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_amd64.c b/src/runtime/cgo/gcc_linux_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_linux_amd64.c
rename to src/runtime/cgo/gcc_linux_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_linux_arm.c b/src/runtime/cgo/gcc_linux_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_linux_arm.c
rename to src/runtime/cgo/gcc_linux_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_386.c b/src/runtime/cgo/gcc_netbsd_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_netbsd_386.c
rename to src/runtime/cgo/gcc_netbsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_amd64.c b/src/runtime/cgo/gcc_netbsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_netbsd_amd64.c
rename to src/runtime/cgo/gcc_netbsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_netbsd_arm.c b/src/runtime/cgo/gcc_netbsd_arm.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_netbsd_arm.c
rename to src/runtime/cgo/gcc_netbsd_arm.c
diff --git a/src/pkg/runtime/cgo/gcc_openbsd_386.c b/src/runtime/cgo/gcc_openbsd_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_openbsd_386.c
rename to src/runtime/cgo/gcc_openbsd_386.c
diff --git a/src/pkg/runtime/cgo/gcc_openbsd_amd64.c b/src/runtime/cgo/gcc_openbsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_openbsd_amd64.c
rename to src/runtime/cgo/gcc_openbsd_amd64.c
diff --git a/src/pkg/runtime/cgo/gcc_setenv.c b/src/runtime/cgo/gcc_setenv.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_setenv.c
rename to src/runtime/cgo/gcc_setenv.c
diff --git a/src/pkg/runtime/cgo/gcc_util.c b/src/runtime/cgo/gcc_util.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_util.c
rename to src/runtime/cgo/gcc_util.c
diff --git a/src/pkg/runtime/cgo/gcc_windows_386.c b/src/runtime/cgo/gcc_windows_386.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_windows_386.c
rename to src/runtime/cgo/gcc_windows_386.c
diff --git a/src/pkg/runtime/cgo/gcc_windows_amd64.c b/src/runtime/cgo/gcc_windows_amd64.c
similarity index 100%
rename from src/pkg/runtime/cgo/gcc_windows_amd64.c
rename to src/runtime/cgo/gcc_windows_amd64.c
diff --git a/src/pkg/runtime/cgo/iscgo.c b/src/runtime/cgo/iscgo.c
similarity index 100%
rename from src/pkg/runtime/cgo/iscgo.c
rename to src/runtime/cgo/iscgo.c
diff --git a/src/pkg/runtime/cgo/libcgo.h b/src/runtime/cgo/libcgo.h
similarity index 100%
rename from src/pkg/runtime/cgo/libcgo.h
rename to src/runtime/cgo/libcgo.h
diff --git a/src/pkg/runtime/cgo/netbsd.c b/src/runtime/cgo/netbsd.c
similarity index 100%
rename from src/pkg/runtime/cgo/netbsd.c
rename to src/runtime/cgo/netbsd.c
diff --git a/src/pkg/runtime/cgo/openbsd.c b/src/runtime/cgo/openbsd.c
similarity index 100%
rename from src/pkg/runtime/cgo/openbsd.c
rename to src/runtime/cgo/openbsd.c
diff --git a/src/pkg/runtime/cgo/setenv.c b/src/runtime/cgo/setenv.c
similarity index 100%
rename from src/pkg/runtime/cgo/setenv.c
rename to src/runtime/cgo/setenv.c
diff --git a/src/pkg/runtime/cgocall.go b/src/runtime/cgocall.go
similarity index 100%
rename from src/pkg/runtime/cgocall.go
rename to src/runtime/cgocall.go
diff --git a/src/pkg/runtime/cgocall.h b/src/runtime/cgocall.h
similarity index 100%
rename from src/pkg/runtime/cgocall.h
rename to src/runtime/cgocall.h
diff --git a/src/pkg/runtime/chan.go b/src/runtime/chan.go
similarity index 100%
rename from src/pkg/runtime/chan.go
rename to src/runtime/chan.go
diff --git a/src/pkg/runtime/chan.h b/src/runtime/chan.h
similarity index 100%
rename from src/pkg/runtime/chan.h
rename to src/runtime/chan.h
diff --git a/src/pkg/runtime/chan_test.go b/src/runtime/chan_test.go
similarity index 100%
rename from src/pkg/runtime/chan_test.go
rename to src/runtime/chan_test.go
diff --git a/src/pkg/runtime/closure_test.go b/src/runtime/closure_test.go
similarity index 100%
rename from src/pkg/runtime/closure_test.go
rename to src/runtime/closure_test.go
diff --git a/src/pkg/runtime/compiler.go b/src/runtime/compiler.go
similarity index 100%
rename from src/pkg/runtime/compiler.go
rename to src/runtime/compiler.go
diff --git a/src/pkg/runtime/complex.go b/src/runtime/complex.go
similarity index 100%
rename from src/pkg/runtime/complex.go
rename to src/runtime/complex.go
diff --git a/src/pkg/runtime/complex_test.go b/src/runtime/complex_test.go
similarity index 100%
rename from src/pkg/runtime/complex_test.go
rename to src/runtime/complex_test.go
diff --git a/src/pkg/runtime/cpuprof.go b/src/runtime/cpuprof.go
similarity index 100%
rename from src/pkg/runtime/cpuprof.go
rename to src/runtime/cpuprof.go
diff --git a/src/pkg/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
similarity index 100%
rename from src/pkg/runtime/crash_cgo_test.go
rename to src/runtime/crash_cgo_test.go
diff --git a/src/pkg/runtime/crash_test.go b/src/runtime/crash_test.go
similarity index 100%
rename from src/pkg/runtime/crash_test.go
rename to src/runtime/crash_test.go
diff --git a/src/pkg/runtime/debug.go b/src/runtime/debug.go
similarity index 100%
rename from src/pkg/runtime/debug.go
rename to src/runtime/debug.go
diff --git a/src/pkg/runtime/debug/debug.c b/src/runtime/debug/debug.c
similarity index 100%
rename from src/pkg/runtime/debug/debug.c
rename to src/runtime/debug/debug.c
diff --git a/src/pkg/runtime/debug/garbage.go b/src/runtime/debug/garbage.go
similarity index 100%
rename from src/pkg/runtime/debug/garbage.go
rename to src/runtime/debug/garbage.go
diff --git a/src/pkg/runtime/debug/garbage_test.go b/src/runtime/debug/garbage_test.go
similarity index 100%
rename from src/pkg/runtime/debug/garbage_test.go
rename to src/runtime/debug/garbage_test.go
diff --git a/src/pkg/runtime/debug/heapdump_test.go b/src/runtime/debug/heapdump_test.go
similarity index 100%
rename from src/pkg/runtime/debug/heapdump_test.go
rename to src/runtime/debug/heapdump_test.go
diff --git a/src/pkg/runtime/debug/stack.go b/src/runtime/debug/stack.go
similarity index 100%
rename from src/pkg/runtime/debug/stack.go
rename to src/runtime/debug/stack.go
diff --git a/src/pkg/runtime/debug/stack_test.go b/src/runtime/debug/stack_test.go
similarity index 100%
rename from src/pkg/runtime/debug/stack_test.go
rename to src/runtime/debug/stack_test.go
diff --git a/src/pkg/runtime/debug/stubs.go b/src/runtime/debug/stubs.go
similarity index 100%
rename from src/pkg/runtime/debug/stubs.go
rename to src/runtime/debug/stubs.go
diff --git a/src/pkg/runtime/debug/stubs.s b/src/runtime/debug/stubs.s
similarity index 100%
rename from src/pkg/runtime/debug/stubs.s
rename to src/runtime/debug/stubs.s
diff --git a/src/pkg/runtime/defs.c b/src/runtime/defs.c
similarity index 100%
rename from src/pkg/runtime/defs.c
rename to src/runtime/defs.c
diff --git a/src/pkg/runtime/defs1_linux.go b/src/runtime/defs1_linux.go
similarity index 100%
rename from src/pkg/runtime/defs1_linux.go
rename to src/runtime/defs1_linux.go
diff --git a/src/pkg/runtime/defs2_linux.go b/src/runtime/defs2_linux.go
similarity index 100%
rename from src/pkg/runtime/defs2_linux.go
rename to src/runtime/defs2_linux.go
diff --git a/src/pkg/runtime/defs_android_arm.h b/src/runtime/defs_android_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_android_arm.h
rename to src/runtime/defs_android_arm.h
diff --git a/src/pkg/runtime/defs_arm_linux.go b/src/runtime/defs_arm_linux.go
similarity index 100%
rename from src/pkg/runtime/defs_arm_linux.go
rename to src/runtime/defs_arm_linux.go
diff --git a/src/pkg/runtime/defs_darwin.go b/src/runtime/defs_darwin.go
similarity index 100%
rename from src/pkg/runtime/defs_darwin.go
rename to src/runtime/defs_darwin.go
diff --git a/src/pkg/runtime/defs_darwin_386.h b/src/runtime/defs_darwin_386.h
similarity index 100%
rename from src/pkg/runtime/defs_darwin_386.h
rename to src/runtime/defs_darwin_386.h
diff --git a/src/pkg/runtime/defs_darwin_amd64.h b/src/runtime/defs_darwin_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_darwin_amd64.h
rename to src/runtime/defs_darwin_amd64.h
diff --git a/src/pkg/runtime/defs_dragonfly.go b/src/runtime/defs_dragonfly.go
similarity index 100%
rename from src/pkg/runtime/defs_dragonfly.go
rename to src/runtime/defs_dragonfly.go
diff --git a/src/pkg/runtime/defs_dragonfly_386.h b/src/runtime/defs_dragonfly_386.h
similarity index 100%
rename from src/pkg/runtime/defs_dragonfly_386.h
rename to src/runtime/defs_dragonfly_386.h
diff --git a/src/pkg/runtime/defs_dragonfly_amd64.h b/src/runtime/defs_dragonfly_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_dragonfly_amd64.h
rename to src/runtime/defs_dragonfly_amd64.h
diff --git a/src/pkg/runtime/defs_freebsd.go b/src/runtime/defs_freebsd.go
similarity index 100%
rename from src/pkg/runtime/defs_freebsd.go
rename to src/runtime/defs_freebsd.go
diff --git a/src/pkg/runtime/defs_freebsd_386.h b/src/runtime/defs_freebsd_386.h
similarity index 100%
rename from src/pkg/runtime/defs_freebsd_386.h
rename to src/runtime/defs_freebsd_386.h
diff --git a/src/pkg/runtime/defs_freebsd_amd64.h b/src/runtime/defs_freebsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_freebsd_amd64.h
rename to src/runtime/defs_freebsd_amd64.h
diff --git a/src/pkg/runtime/defs_freebsd_arm.h b/src/runtime/defs_freebsd_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_freebsd_arm.h
rename to src/runtime/defs_freebsd_arm.h
diff --git a/src/pkg/runtime/defs_linux.go b/src/runtime/defs_linux.go
similarity index 100%
rename from src/pkg/runtime/defs_linux.go
rename to src/runtime/defs_linux.go
diff --git a/src/pkg/runtime/defs_linux_386.h b/src/runtime/defs_linux_386.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_386.h
rename to src/runtime/defs_linux_386.h
diff --git a/src/pkg/runtime/defs_linux_amd64.h b/src/runtime/defs_linux_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_amd64.h
rename to src/runtime/defs_linux_amd64.h
diff --git a/src/pkg/runtime/defs_linux_arm.h b/src/runtime/defs_linux_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_linux_arm.h
rename to src/runtime/defs_linux_arm.h
diff --git a/src/pkg/runtime/defs_nacl_386.h b/src/runtime/defs_nacl_386.h
similarity index 100%
rename from src/pkg/runtime/defs_nacl_386.h
rename to src/runtime/defs_nacl_386.h
diff --git a/src/pkg/runtime/defs_nacl_amd64p32.h b/src/runtime/defs_nacl_amd64p32.h
similarity index 100%
rename from src/pkg/runtime/defs_nacl_amd64p32.h
rename to src/runtime/defs_nacl_amd64p32.h
diff --git a/src/pkg/runtime/defs_nacl_arm.h b/src/runtime/defs_nacl_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_nacl_arm.h
rename to src/runtime/defs_nacl_arm.h
diff --git a/src/pkg/runtime/defs_netbsd.go b/src/runtime/defs_netbsd.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd.go
rename to src/runtime/defs_netbsd.go
diff --git a/src/pkg/runtime/defs_netbsd_386.go b/src/runtime/defs_netbsd_386.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_386.go
rename to src/runtime/defs_netbsd_386.go
diff --git a/src/pkg/runtime/defs_netbsd_386.h b/src/runtime/defs_netbsd_386.h
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_386.h
rename to src/runtime/defs_netbsd_386.h
diff --git a/src/pkg/runtime/defs_netbsd_amd64.go b/src/runtime/defs_netbsd_amd64.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_amd64.go
rename to src/runtime/defs_netbsd_amd64.go
diff --git a/src/pkg/runtime/defs_netbsd_amd64.h b/src/runtime/defs_netbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_amd64.h
rename to src/runtime/defs_netbsd_amd64.h
diff --git a/src/pkg/runtime/defs_netbsd_arm.go b/src/runtime/defs_netbsd_arm.go
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_arm.go
rename to src/runtime/defs_netbsd_arm.go
diff --git a/src/pkg/runtime/defs_netbsd_arm.h b/src/runtime/defs_netbsd_arm.h
similarity index 100%
rename from src/pkg/runtime/defs_netbsd_arm.h
rename to src/runtime/defs_netbsd_arm.h
diff --git a/src/pkg/runtime/defs_openbsd.go b/src/runtime/defs_openbsd.go
similarity index 100%
rename from src/pkg/runtime/defs_openbsd.go
rename to src/runtime/defs_openbsd.go
diff --git a/src/pkg/runtime/defs_openbsd_386.h b/src/runtime/defs_openbsd_386.h
similarity index 100%
rename from src/pkg/runtime/defs_openbsd_386.h
rename to src/runtime/defs_openbsd_386.h
diff --git a/src/pkg/runtime/defs_openbsd_amd64.h b/src/runtime/defs_openbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_openbsd_amd64.h
rename to src/runtime/defs_openbsd_amd64.h
diff --git a/src/pkg/runtime/defs_plan9_386.h b/src/runtime/defs_plan9_386.h
similarity index 100%
rename from src/pkg/runtime/defs_plan9_386.h
rename to src/runtime/defs_plan9_386.h
diff --git a/src/pkg/runtime/defs_plan9_amd64.h b/src/runtime/defs_plan9_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_plan9_amd64.h
rename to src/runtime/defs_plan9_amd64.h
diff --git a/src/pkg/runtime/defs_solaris.go b/src/runtime/defs_solaris.go
similarity index 100%
rename from src/pkg/runtime/defs_solaris.go
rename to src/runtime/defs_solaris.go
diff --git a/src/pkg/runtime/defs_solaris_amd64.go b/src/runtime/defs_solaris_amd64.go
similarity index 100%
rename from src/pkg/runtime/defs_solaris_amd64.go
rename to src/runtime/defs_solaris_amd64.go
diff --git a/src/pkg/runtime/defs_solaris_amd64.h b/src/runtime/defs_solaris_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_solaris_amd64.h
rename to src/runtime/defs_solaris_amd64.h
diff --git a/src/pkg/runtime/defs_windows.go b/src/runtime/defs_windows.go
similarity index 100%
rename from src/pkg/runtime/defs_windows.go
rename to src/runtime/defs_windows.go
diff --git a/src/pkg/runtime/defs_windows_386.h b/src/runtime/defs_windows_386.h
similarity index 100%
rename from src/pkg/runtime/defs_windows_386.h
rename to src/runtime/defs_windows_386.h
diff --git a/src/pkg/runtime/defs_windows_amd64.h b/src/runtime/defs_windows_amd64.h
similarity index 100%
rename from src/pkg/runtime/defs_windows_amd64.h
rename to src/runtime/defs_windows_amd64.h
diff --git a/src/pkg/runtime/env_plan9.go b/src/runtime/env_plan9.go
similarity index 100%
rename from src/pkg/runtime/env_plan9.go
rename to src/runtime/env_plan9.go
diff --git a/src/pkg/runtime/env_posix.go b/src/runtime/env_posix.go
similarity index 100%
rename from src/pkg/runtime/env_posix.go
rename to src/runtime/env_posix.go
diff --git a/src/pkg/runtime/error.go b/src/runtime/error.go
similarity index 100%
rename from src/pkg/runtime/error.go
rename to src/runtime/error.go
diff --git a/src/pkg/runtime/export_futex_test.go b/src/runtime/export_futex_test.go
similarity index 100%
rename from src/pkg/runtime/export_futex_test.go
rename to src/runtime/export_futex_test.go
diff --git a/src/pkg/runtime/export_test.go b/src/runtime/export_test.go
similarity index 100%
rename from src/pkg/runtime/export_test.go
rename to src/runtime/export_test.go
diff --git a/src/pkg/runtime/extern.go b/src/runtime/extern.go
similarity index 100%
rename from src/pkg/runtime/extern.go
rename to src/runtime/extern.go
diff --git a/src/pkg/runtime/float.c b/src/runtime/float.c
similarity index 100%
rename from src/pkg/runtime/float.c
rename to src/runtime/float.c
diff --git a/src/pkg/runtime/funcdata.h b/src/runtime/funcdata.h
similarity index 100%
rename from src/pkg/runtime/funcdata.h
rename to src/runtime/funcdata.h
diff --git a/src/pkg/runtime/futex_test.go b/src/runtime/futex_test.go
similarity index 100%
rename from src/pkg/runtime/futex_test.go
rename to src/runtime/futex_test.go
diff --git a/src/pkg/runtime/gc_test.go b/src/runtime/gc_test.go
similarity index 100%
rename from src/pkg/runtime/gc_test.go
rename to src/runtime/gc_test.go
diff --git a/src/pkg/runtime/gcinfo_test.go b/src/runtime/gcinfo_test.go
similarity index 100%
rename from src/pkg/runtime/gcinfo_test.go
rename to src/runtime/gcinfo_test.go
diff --git a/src/pkg/runtime/hash_test.go b/src/runtime/hash_test.go
similarity index 100%
rename from src/pkg/runtime/hash_test.go
rename to src/runtime/hash_test.go
diff --git a/src/pkg/runtime/hashmap.go b/src/runtime/hashmap.go
similarity index 100%
rename from src/pkg/runtime/hashmap.go
rename to src/runtime/hashmap.go
diff --git a/src/pkg/runtime/hashmap_fast.go b/src/runtime/hashmap_fast.go
similarity index 100%
rename from src/pkg/runtime/hashmap_fast.go
rename to src/runtime/hashmap_fast.go
diff --git a/src/pkg/runtime/heapdump.c b/src/runtime/heapdump.c
similarity index 100%
rename from src/pkg/runtime/heapdump.c
rename to src/runtime/heapdump.c
diff --git a/src/pkg/runtime/iface.go b/src/runtime/iface.go
similarity index 100%
rename from src/pkg/runtime/iface.go
rename to src/runtime/iface.go
diff --git a/src/pkg/runtime/iface_test.go b/src/runtime/iface_test.go
similarity index 100%
rename from src/pkg/runtime/iface_test.go
rename to src/runtime/iface_test.go
diff --git a/src/pkg/runtime/lfstack.c b/src/runtime/lfstack.c
similarity index 100%
rename from src/pkg/runtime/lfstack.c
rename to src/runtime/lfstack.c
diff --git a/src/pkg/runtime/lfstack_test.go b/src/runtime/lfstack_test.go
similarity index 100%
rename from src/pkg/runtime/lfstack_test.go
rename to src/runtime/lfstack_test.go
diff --git a/src/pkg/runtime/lock_futex.go b/src/runtime/lock_futex.go
similarity index 100%
rename from src/pkg/runtime/lock_futex.go
rename to src/runtime/lock_futex.go
diff --git a/src/pkg/runtime/lock_sema.go b/src/runtime/lock_sema.go
similarity index 100%
rename from src/pkg/runtime/lock_sema.go
rename to src/runtime/lock_sema.go
diff --git a/src/pkg/runtime/malloc.c b/src/runtime/malloc.c
similarity index 100%
rename from src/pkg/runtime/malloc.c
rename to src/runtime/malloc.c
diff --git a/src/pkg/runtime/malloc.go b/src/runtime/malloc.go
similarity index 100%
rename from src/pkg/runtime/malloc.go
rename to src/runtime/malloc.go
diff --git a/src/pkg/runtime/malloc.h b/src/runtime/malloc.h
similarity index 100%
rename from src/pkg/runtime/malloc.h
rename to src/runtime/malloc.h
diff --git a/src/pkg/runtime/malloc_test.go b/src/runtime/malloc_test.go
similarity index 100%
rename from src/pkg/runtime/malloc_test.go
rename to src/runtime/malloc_test.go
diff --git a/src/pkg/runtime/map_test.go b/src/runtime/map_test.go
similarity index 100%
rename from src/pkg/runtime/map_test.go
rename to src/runtime/map_test.go
diff --git a/src/pkg/runtime/mapspeed_test.go b/src/runtime/mapspeed_test.go
similarity index 100%
rename from src/pkg/runtime/mapspeed_test.go
rename to src/runtime/mapspeed_test.go
diff --git a/src/pkg/runtime/mcache.c b/src/runtime/mcache.c
similarity index 100%
rename from src/pkg/runtime/mcache.c
rename to src/runtime/mcache.c
diff --git a/src/pkg/runtime/mcentral.c b/src/runtime/mcentral.c
similarity index 100%
rename from src/pkg/runtime/mcentral.c
rename to src/runtime/mcentral.c
diff --git a/src/pkg/runtime/mem.go b/src/runtime/mem.go
similarity index 100%
rename from src/pkg/runtime/mem.go
rename to src/runtime/mem.go
diff --git a/src/pkg/runtime/mem_darwin.c b/src/runtime/mem_darwin.c
similarity index 100%
rename from src/pkg/runtime/mem_darwin.c
rename to src/runtime/mem_darwin.c
diff --git a/src/pkg/runtime/mem_dragonfly.c b/src/runtime/mem_dragonfly.c
similarity index 100%
rename from src/pkg/runtime/mem_dragonfly.c
rename to src/runtime/mem_dragonfly.c
diff --git a/src/pkg/runtime/mem_freebsd.c b/src/runtime/mem_freebsd.c
similarity index 100%
rename from src/pkg/runtime/mem_freebsd.c
rename to src/runtime/mem_freebsd.c
diff --git a/src/pkg/runtime/mem_linux.c b/src/runtime/mem_linux.c
similarity index 100%
rename from src/pkg/runtime/mem_linux.c
rename to src/runtime/mem_linux.c
diff --git a/src/pkg/runtime/mem_nacl.c b/src/runtime/mem_nacl.c
similarity index 100%
rename from src/pkg/runtime/mem_nacl.c
rename to src/runtime/mem_nacl.c
diff --git a/src/pkg/runtime/mem_netbsd.c b/src/runtime/mem_netbsd.c
similarity index 100%
rename from src/pkg/runtime/mem_netbsd.c
rename to src/runtime/mem_netbsd.c
diff --git a/src/pkg/runtime/mem_openbsd.c b/src/runtime/mem_openbsd.c
similarity index 100%
rename from src/pkg/runtime/mem_openbsd.c
rename to src/runtime/mem_openbsd.c
diff --git a/src/pkg/runtime/mem_plan9.c b/src/runtime/mem_plan9.c
similarity index 100%
rename from src/pkg/runtime/mem_plan9.c
rename to src/runtime/mem_plan9.c
diff --git a/src/pkg/runtime/mem_solaris.c b/src/runtime/mem_solaris.c
similarity index 100%
rename from src/pkg/runtime/mem_solaris.c
rename to src/runtime/mem_solaris.c
diff --git a/src/pkg/runtime/mem_windows.c b/src/runtime/mem_windows.c
similarity index 100%
rename from src/pkg/runtime/mem_windows.c
rename to src/runtime/mem_windows.c
diff --git a/src/pkg/runtime/memclr_386.s b/src/runtime/memclr_386.s
similarity index 100%
rename from src/pkg/runtime/memclr_386.s
rename to src/runtime/memclr_386.s
diff --git a/src/pkg/runtime/memclr_amd64.s b/src/runtime/memclr_amd64.s
similarity index 100%
rename from src/pkg/runtime/memclr_amd64.s
rename to src/runtime/memclr_amd64.s
diff --git a/src/pkg/runtime/memclr_arm.s b/src/runtime/memclr_arm.s
similarity index 100%
rename from src/pkg/runtime/memclr_arm.s
rename to src/runtime/memclr_arm.s
diff --git a/src/pkg/runtime/memclr_plan9_386.s b/src/runtime/memclr_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/memclr_plan9_386.s
rename to src/runtime/memclr_plan9_386.s
diff --git a/src/pkg/runtime/memclr_plan9_amd64.s b/src/runtime/memclr_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/memclr_plan9_amd64.s
rename to src/runtime/memclr_plan9_amd64.s
diff --git a/src/pkg/runtime/memmove_386.s b/src/runtime/memmove_386.s
similarity index 100%
rename from src/pkg/runtime/memmove_386.s
rename to src/runtime/memmove_386.s
diff --git a/src/pkg/runtime/memmove_amd64.s b/src/runtime/memmove_amd64.s
similarity index 100%
rename from src/pkg/runtime/memmove_amd64.s
rename to src/runtime/memmove_amd64.s
diff --git a/src/pkg/runtime/memmove_arm.s b/src/runtime/memmove_arm.s
similarity index 100%
rename from src/pkg/runtime/memmove_arm.s
rename to src/runtime/memmove_arm.s
diff --git a/src/pkg/runtime/memmove_linux_amd64_test.go b/src/runtime/memmove_linux_amd64_test.go
similarity index 100%
rename from src/pkg/runtime/memmove_linux_amd64_test.go
rename to src/runtime/memmove_linux_amd64_test.go
diff --git a/src/pkg/runtime/memmove_nacl_amd64p32.s b/src/runtime/memmove_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/memmove_nacl_amd64p32.s
rename to src/runtime/memmove_nacl_amd64p32.s
diff --git a/src/pkg/runtime/memmove_plan9_386.s b/src/runtime/memmove_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/memmove_plan9_386.s
rename to src/runtime/memmove_plan9_386.s
diff --git a/src/pkg/runtime/memmove_plan9_amd64.s b/src/runtime/memmove_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/memmove_plan9_amd64.s
rename to src/runtime/memmove_plan9_amd64.s
diff --git a/src/pkg/runtime/memmove_test.go b/src/runtime/memmove_test.go
similarity index 100%
rename from src/pkg/runtime/memmove_test.go
rename to src/runtime/memmove_test.go
diff --git a/src/pkg/runtime/mfinal_test.go b/src/runtime/mfinal_test.go
similarity index 100%
rename from src/pkg/runtime/mfinal_test.go
rename to src/runtime/mfinal_test.go
diff --git a/src/pkg/runtime/mfixalloc.c b/src/runtime/mfixalloc.c
similarity index 100%
rename from src/pkg/runtime/mfixalloc.c
rename to src/runtime/mfixalloc.c
diff --git a/src/pkg/runtime/mgc0.c b/src/runtime/mgc0.c
similarity index 100%
rename from src/pkg/runtime/mgc0.c
rename to src/runtime/mgc0.c
diff --git a/src/pkg/runtime/mgc0.go b/src/runtime/mgc0.go
similarity index 100%
rename from src/pkg/runtime/mgc0.go
rename to src/runtime/mgc0.go
diff --git a/src/pkg/runtime/mgc0.h b/src/runtime/mgc0.h
similarity index 100%
rename from src/pkg/runtime/mgc0.h
rename to src/runtime/mgc0.h
diff --git a/src/pkg/runtime/mheap.c b/src/runtime/mheap.c
similarity index 100%
rename from src/pkg/runtime/mheap.c
rename to src/runtime/mheap.c
diff --git a/src/pkg/runtime/mknacl.sh b/src/runtime/mknacl.sh
similarity index 100%
rename from src/pkg/runtime/mknacl.sh
rename to src/runtime/mknacl.sh
diff --git a/src/pkg/runtime/mprof.go b/src/runtime/mprof.go
similarity index 100%
rename from src/pkg/runtime/mprof.go
rename to src/runtime/mprof.go
diff --git a/src/pkg/runtime/msize.c b/src/runtime/msize.c
similarity index 100%
rename from src/pkg/runtime/msize.c
rename to src/runtime/msize.c
diff --git a/src/pkg/runtime/netpoll.go b/src/runtime/netpoll.go
similarity index 100%
rename from src/pkg/runtime/netpoll.go
rename to src/runtime/netpoll.go
diff --git a/src/pkg/runtime/netpoll_epoll.go b/src/runtime/netpoll_epoll.go
similarity index 100%
rename from src/pkg/runtime/netpoll_epoll.go
rename to src/runtime/netpoll_epoll.go
diff --git a/src/pkg/runtime/netpoll_kqueue.go b/src/runtime/netpoll_kqueue.go
similarity index 100%
rename from src/pkg/runtime/netpoll_kqueue.go
rename to src/runtime/netpoll_kqueue.go
diff --git a/src/pkg/runtime/netpoll_nacl.go b/src/runtime/netpoll_nacl.go
similarity index 100%
rename from src/pkg/runtime/netpoll_nacl.go
rename to src/runtime/netpoll_nacl.go
diff --git a/src/pkg/runtime/netpoll_solaris.c b/src/runtime/netpoll_solaris.c
similarity index 100%
rename from src/pkg/runtime/netpoll_solaris.c
rename to src/runtime/netpoll_solaris.c
diff --git a/src/pkg/runtime/netpoll_stub.c b/src/runtime/netpoll_stub.c
similarity index 100%
rename from src/pkg/runtime/netpoll_stub.c
rename to src/runtime/netpoll_stub.c
diff --git a/src/pkg/runtime/netpoll_windows.c b/src/runtime/netpoll_windows.c
similarity index 100%
rename from src/pkg/runtime/netpoll_windows.c
rename to src/runtime/netpoll_windows.c
diff --git a/src/pkg/runtime/noasm_arm.go b/src/runtime/noasm_arm.go
similarity index 100%
rename from src/pkg/runtime/noasm_arm.go
rename to src/runtime/noasm_arm.go
diff --git a/src/pkg/runtime/norace_test.go b/src/runtime/norace_test.go
similarity index 100%
rename from src/pkg/runtime/norace_test.go
rename to src/runtime/norace_test.go
diff --git a/src/pkg/runtime/os_android.c b/src/runtime/os_android.c
similarity index 100%
rename from src/pkg/runtime/os_android.c
rename to src/runtime/os_android.c
diff --git a/src/pkg/runtime/os_android.h b/src/runtime/os_android.h
similarity index 100%
rename from src/pkg/runtime/os_android.h
rename to src/runtime/os_android.h
diff --git a/src/pkg/runtime/os_darwin.c b/src/runtime/os_darwin.c
similarity index 100%
rename from src/pkg/runtime/os_darwin.c
rename to src/runtime/os_darwin.c
diff --git a/src/pkg/runtime/os_darwin.go b/src/runtime/os_darwin.go
similarity index 100%
rename from src/pkg/runtime/os_darwin.go
rename to src/runtime/os_darwin.go
diff --git a/src/pkg/runtime/os_darwin.h b/src/runtime/os_darwin.h
similarity index 100%
rename from src/pkg/runtime/os_darwin.h
rename to src/runtime/os_darwin.h
diff --git a/src/pkg/runtime/os_dragonfly.c b/src/runtime/os_dragonfly.c
similarity index 100%
rename from src/pkg/runtime/os_dragonfly.c
rename to src/runtime/os_dragonfly.c
diff --git a/src/pkg/runtime/os_dragonfly.go b/src/runtime/os_dragonfly.go
similarity index 100%
rename from src/pkg/runtime/os_dragonfly.go
rename to src/runtime/os_dragonfly.go
diff --git a/src/pkg/runtime/os_dragonfly.h b/src/runtime/os_dragonfly.h
similarity index 100%
rename from src/pkg/runtime/os_dragonfly.h
rename to src/runtime/os_dragonfly.h
diff --git a/src/pkg/runtime/os_freebsd.c b/src/runtime/os_freebsd.c
similarity index 100%
rename from src/pkg/runtime/os_freebsd.c
rename to src/runtime/os_freebsd.c
diff --git a/src/pkg/runtime/os_freebsd.go b/src/runtime/os_freebsd.go
similarity index 100%
rename from src/pkg/runtime/os_freebsd.go
rename to src/runtime/os_freebsd.go
diff --git a/src/pkg/runtime/os_freebsd.h b/src/runtime/os_freebsd.h
similarity index 100%
rename from src/pkg/runtime/os_freebsd.h
rename to src/runtime/os_freebsd.h
diff --git a/src/pkg/runtime/os_freebsd_arm.c b/src/runtime/os_freebsd_arm.c
similarity index 100%
rename from src/pkg/runtime/os_freebsd_arm.c
rename to src/runtime/os_freebsd_arm.c
diff --git a/src/pkg/runtime/os_linux.c b/src/runtime/os_linux.c
similarity index 100%
rename from src/pkg/runtime/os_linux.c
rename to src/runtime/os_linux.c
diff --git a/src/pkg/runtime/os_linux.go b/src/runtime/os_linux.go
similarity index 100%
rename from src/pkg/runtime/os_linux.go
rename to src/runtime/os_linux.go
diff --git a/src/pkg/runtime/os_linux.h b/src/runtime/os_linux.h
similarity index 100%
rename from src/pkg/runtime/os_linux.h
rename to src/runtime/os_linux.h
diff --git a/src/pkg/runtime/os_linux_386.c b/src/runtime/os_linux_386.c
similarity index 100%
rename from src/pkg/runtime/os_linux_386.c
rename to src/runtime/os_linux_386.c
diff --git a/src/pkg/runtime/os_linux_arm.c b/src/runtime/os_linux_arm.c
similarity index 100%
rename from src/pkg/runtime/os_linux_arm.c
rename to src/runtime/os_linux_arm.c
diff --git a/src/pkg/runtime/os_nacl.c b/src/runtime/os_nacl.c
similarity index 100%
rename from src/pkg/runtime/os_nacl.c
rename to src/runtime/os_nacl.c
diff --git a/src/pkg/runtime/os_nacl.go b/src/runtime/os_nacl.go
similarity index 100%
rename from src/pkg/runtime/os_nacl.go
rename to src/runtime/os_nacl.go
diff --git a/src/pkg/runtime/os_nacl.h b/src/runtime/os_nacl.h
similarity index 100%
rename from src/pkg/runtime/os_nacl.h
rename to src/runtime/os_nacl.h
diff --git a/src/pkg/runtime/os_nacl_arm.c b/src/runtime/os_nacl_arm.c
similarity index 100%
rename from src/pkg/runtime/os_nacl_arm.c
rename to src/runtime/os_nacl_arm.c
diff --git a/src/pkg/runtime/os_netbsd.c b/src/runtime/os_netbsd.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd.c
rename to src/runtime/os_netbsd.c
diff --git a/src/pkg/runtime/os_netbsd.go b/src/runtime/os_netbsd.go
similarity index 100%
rename from src/pkg/runtime/os_netbsd.go
rename to src/runtime/os_netbsd.go
diff --git a/src/pkg/runtime/os_netbsd.h b/src/runtime/os_netbsd.h
similarity index 100%
rename from src/pkg/runtime/os_netbsd.h
rename to src/runtime/os_netbsd.h
diff --git a/src/pkg/runtime/os_netbsd_386.c b/src/runtime/os_netbsd_386.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd_386.c
rename to src/runtime/os_netbsd_386.c
diff --git a/src/pkg/runtime/os_netbsd_amd64.c b/src/runtime/os_netbsd_amd64.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd_amd64.c
rename to src/runtime/os_netbsd_amd64.c
diff --git a/src/pkg/runtime/os_netbsd_arm.c b/src/runtime/os_netbsd_arm.c
similarity index 100%
rename from src/pkg/runtime/os_netbsd_arm.c
rename to src/runtime/os_netbsd_arm.c
diff --git a/src/pkg/runtime/os_openbsd.c b/src/runtime/os_openbsd.c
similarity index 100%
rename from src/pkg/runtime/os_openbsd.c
rename to src/runtime/os_openbsd.c
diff --git a/src/pkg/runtime/os_openbsd.go b/src/runtime/os_openbsd.go
similarity index 100%
rename from src/pkg/runtime/os_openbsd.go
rename to src/runtime/os_openbsd.go
diff --git a/src/pkg/runtime/os_openbsd.h b/src/runtime/os_openbsd.h
similarity index 100%
rename from src/pkg/runtime/os_openbsd.h
rename to src/runtime/os_openbsd.h
diff --git a/src/pkg/runtime/os_plan9.c b/src/runtime/os_plan9.c
similarity index 100%
rename from src/pkg/runtime/os_plan9.c
rename to src/runtime/os_plan9.c
diff --git a/src/pkg/runtime/os_plan9.go b/src/runtime/os_plan9.go
similarity index 100%
rename from src/pkg/runtime/os_plan9.go
rename to src/runtime/os_plan9.go
diff --git a/src/pkg/runtime/os_plan9.h b/src/runtime/os_plan9.h
similarity index 100%
rename from src/pkg/runtime/os_plan9.h
rename to src/runtime/os_plan9.h
diff --git a/src/pkg/runtime/os_plan9_386.c b/src/runtime/os_plan9_386.c
similarity index 100%
rename from src/pkg/runtime/os_plan9_386.c
rename to src/runtime/os_plan9_386.c
diff --git a/src/pkg/runtime/os_plan9_amd64.c b/src/runtime/os_plan9_amd64.c
similarity index 100%
rename from src/pkg/runtime/os_plan9_amd64.c
rename to src/runtime/os_plan9_amd64.c
diff --git a/src/pkg/runtime/os_solaris.c b/src/runtime/os_solaris.c
similarity index 100%
rename from src/pkg/runtime/os_solaris.c
rename to src/runtime/os_solaris.c
diff --git a/src/pkg/runtime/os_solaris.go b/src/runtime/os_solaris.go
similarity index 100%
rename from src/pkg/runtime/os_solaris.go
rename to src/runtime/os_solaris.go
diff --git a/src/pkg/runtime/os_solaris.h b/src/runtime/os_solaris.h
similarity index 100%
rename from src/pkg/runtime/os_solaris.h
rename to src/runtime/os_solaris.h
diff --git a/src/pkg/runtime/os_windows.c b/src/runtime/os_windows.c
similarity index 100%
rename from src/pkg/runtime/os_windows.c
rename to src/runtime/os_windows.c
diff --git a/src/pkg/runtime/os_windows.go b/src/runtime/os_windows.go
similarity index 100%
rename from src/pkg/runtime/os_windows.go
rename to src/runtime/os_windows.go
diff --git a/src/pkg/runtime/os_windows.h b/src/runtime/os_windows.h
similarity index 100%
rename from src/pkg/runtime/os_windows.h
rename to src/runtime/os_windows.h
diff --git a/src/pkg/runtime/os_windows_386.c b/src/runtime/os_windows_386.c
similarity index 100%
rename from src/pkg/runtime/os_windows_386.c
rename to src/runtime/os_windows_386.c
diff --git a/src/pkg/runtime/os_windows_386.go b/src/runtime/os_windows_386.go
similarity index 100%
rename from src/pkg/runtime/os_windows_386.go
rename to src/runtime/os_windows_386.go
diff --git a/src/pkg/runtime/os_windows_amd64.c b/src/runtime/os_windows_amd64.c
similarity index 100%
rename from src/pkg/runtime/os_windows_amd64.c
rename to src/runtime/os_windows_amd64.c
diff --git a/src/pkg/runtime/os_windows_amd64.go b/src/runtime/os_windows_amd64.go
similarity index 100%
rename from src/pkg/runtime/os_windows_amd64.go
rename to src/runtime/os_windows_amd64.go
diff --git a/src/pkg/runtime/panic.c b/src/runtime/panic.c
similarity index 100%
rename from src/pkg/runtime/panic.c
rename to src/runtime/panic.c
diff --git a/src/pkg/runtime/panic.go b/src/runtime/panic.go
similarity index 100%
rename from src/pkg/runtime/panic.go
rename to src/runtime/panic.go
diff --git a/src/pkg/runtime/panic1.go b/src/runtime/panic1.go
similarity index 100%
rename from src/pkg/runtime/panic1.go
rename to src/runtime/panic1.go
diff --git a/src/pkg/runtime/parfor.c b/src/runtime/parfor.c
similarity index 100%
rename from src/pkg/runtime/parfor.c
rename to src/runtime/parfor.c
diff --git a/src/pkg/runtime/parfor_test.go b/src/runtime/parfor_test.go
similarity index 100%
rename from src/pkg/runtime/parfor_test.go
rename to src/runtime/parfor_test.go
diff --git a/src/pkg/runtime/pprof/pprof.go b/src/runtime/pprof/pprof.go
similarity index 100%
rename from src/pkg/runtime/pprof/pprof.go
rename to src/runtime/pprof/pprof.go
diff --git a/src/pkg/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
similarity index 100%
rename from src/pkg/runtime/pprof/pprof_test.go
rename to src/runtime/pprof/pprof_test.go
diff --git a/src/pkg/runtime/print1.go b/src/runtime/print1.go
similarity index 100%
rename from src/pkg/runtime/print1.go
rename to src/runtime/print1.go
diff --git a/src/pkg/runtime/proc.c b/src/runtime/proc.c
similarity index 100%
rename from src/pkg/runtime/proc.c
rename to src/runtime/proc.c
diff --git a/src/pkg/runtime/proc.go b/src/runtime/proc.go
similarity index 100%
rename from src/pkg/runtime/proc.go
rename to src/runtime/proc.go
diff --git a/src/pkg/runtime/proc_test.go b/src/runtime/proc_test.go
similarity index 100%
rename from src/pkg/runtime/proc_test.go
rename to src/runtime/proc_test.go
diff --git a/src/pkg/runtime/race.c b/src/runtime/race.c
similarity index 100%
rename from src/pkg/runtime/race.c
rename to src/runtime/race.c
diff --git a/src/pkg/runtime/race.go b/src/runtime/race.go
similarity index 100%
rename from src/pkg/runtime/race.go
rename to src/runtime/race.go
diff --git a/src/pkg/runtime/race.h b/src/runtime/race.h
similarity index 100%
rename from src/pkg/runtime/race.h
rename to src/runtime/race.h
diff --git a/src/pkg/runtime/race/README b/src/runtime/race/README
similarity index 100%
rename from src/pkg/runtime/race/README
rename to src/runtime/race/README
diff --git a/src/pkg/runtime/race/doc.go b/src/runtime/race/doc.go
similarity index 100%
rename from src/pkg/runtime/race/doc.go
rename to src/runtime/race/doc.go
diff --git a/src/pkg/runtime/race/output_test.go b/src/runtime/race/output_test.go
similarity index 100%
rename from src/pkg/runtime/race/output_test.go
rename to src/runtime/race/output_test.go
diff --git a/src/pkg/runtime/race/race.go b/src/runtime/race/race.go
similarity index 100%
rename from src/pkg/runtime/race/race.go
rename to src/runtime/race/race.go
diff --git a/src/pkg/runtime/race/race_darwin_amd64.syso b/src/runtime/race/race_darwin_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_darwin_amd64.syso
rename to src/runtime/race/race_darwin_amd64.syso
diff --git a/src/pkg/runtime/race/race_freebsd_amd64.syso b/src/runtime/race/race_freebsd_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_freebsd_amd64.syso
rename to src/runtime/race/race_freebsd_amd64.syso
diff --git a/src/pkg/runtime/race/race_linux_amd64.syso b/src/runtime/race/race_linux_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_linux_amd64.syso
rename to src/runtime/race/race_linux_amd64.syso
diff --git a/src/pkg/runtime/race/race_test.go b/src/runtime/race/race_test.go
similarity index 100%
rename from src/pkg/runtime/race/race_test.go
rename to src/runtime/race/race_test.go
diff --git a/src/pkg/runtime/race/race_windows_amd64.syso b/src/runtime/race/race_windows_amd64.syso
similarity index 100%
rename from src/pkg/runtime/race/race_windows_amd64.syso
rename to src/runtime/race/race_windows_amd64.syso
diff --git a/src/pkg/runtime/race/testdata/atomic_test.go b/src/runtime/race/testdata/atomic_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/atomic_test.go
rename to src/runtime/race/testdata/atomic_test.go
diff --git a/src/pkg/runtime/race/testdata/cgo_test.go b/src/runtime/race/testdata/cgo_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/cgo_test.go
rename to src/runtime/race/testdata/cgo_test.go
diff --git a/src/pkg/runtime/race/testdata/cgo_test_main.go b/src/runtime/race/testdata/cgo_test_main.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/cgo_test_main.go
rename to src/runtime/race/testdata/cgo_test_main.go
diff --git a/src/pkg/runtime/race/testdata/chan_test.go b/src/runtime/race/testdata/chan_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/chan_test.go
rename to src/runtime/race/testdata/chan_test.go
diff --git a/src/pkg/runtime/race/testdata/comp_test.go b/src/runtime/race/testdata/comp_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/comp_test.go
rename to src/runtime/race/testdata/comp_test.go
diff --git a/src/pkg/runtime/race/testdata/finalizer_test.go b/src/runtime/race/testdata/finalizer_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/finalizer_test.go
rename to src/runtime/race/testdata/finalizer_test.go
diff --git a/src/pkg/runtime/race/testdata/io_test.go b/src/runtime/race/testdata/io_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/io_test.go
rename to src/runtime/race/testdata/io_test.go
diff --git a/src/pkg/runtime/race/testdata/map_test.go b/src/runtime/race/testdata/map_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/map_test.go
rename to src/runtime/race/testdata/map_test.go
diff --git a/src/pkg/runtime/race/testdata/mop_test.go b/src/runtime/race/testdata/mop_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/mop_test.go
rename to src/runtime/race/testdata/mop_test.go
diff --git a/src/pkg/runtime/race/testdata/mutex_test.go b/src/runtime/race/testdata/mutex_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/mutex_test.go
rename to src/runtime/race/testdata/mutex_test.go
diff --git a/src/pkg/runtime/race/testdata/regression_test.go b/src/runtime/race/testdata/regression_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/regression_test.go
rename to src/runtime/race/testdata/regression_test.go
diff --git a/src/pkg/runtime/race/testdata/rwmutex_test.go b/src/runtime/race/testdata/rwmutex_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/rwmutex_test.go
rename to src/runtime/race/testdata/rwmutex_test.go
diff --git a/src/pkg/runtime/race/testdata/select_test.go b/src/runtime/race/testdata/select_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/select_test.go
rename to src/runtime/race/testdata/select_test.go
diff --git a/src/pkg/runtime/race/testdata/slice_test.go b/src/runtime/race/testdata/slice_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/slice_test.go
rename to src/runtime/race/testdata/slice_test.go
diff --git a/src/pkg/runtime/race/testdata/sync_test.go b/src/runtime/race/testdata/sync_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/sync_test.go
rename to src/runtime/race/testdata/sync_test.go
diff --git a/src/pkg/runtime/race/testdata/waitgroup_test.go b/src/runtime/race/testdata/waitgroup_test.go
similarity index 100%
rename from src/pkg/runtime/race/testdata/waitgroup_test.go
rename to src/runtime/race/testdata/waitgroup_test.go
diff --git a/src/pkg/runtime/race0.go b/src/runtime/race0.go
similarity index 100%
rename from src/pkg/runtime/race0.go
rename to src/runtime/race0.go
diff --git a/src/pkg/runtime/race_amd64.s b/src/runtime/race_amd64.s
similarity index 100%
rename from src/pkg/runtime/race_amd64.s
rename to src/runtime/race_amd64.s
diff --git a/src/pkg/runtime/rdebug.go b/src/runtime/rdebug.go
similarity index 100%
rename from src/pkg/runtime/rdebug.go
rename to src/runtime/rdebug.go
diff --git a/src/pkg/runtime/rt0_android_arm.s b/src/runtime/rt0_android_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_android_arm.s
rename to src/runtime/rt0_android_arm.s
diff --git a/src/pkg/runtime/rt0_darwin_386.s b/src/runtime/rt0_darwin_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_darwin_386.s
rename to src/runtime/rt0_darwin_386.s
diff --git a/src/pkg/runtime/rt0_darwin_amd64.s b/src/runtime/rt0_darwin_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_darwin_amd64.s
rename to src/runtime/rt0_darwin_amd64.s
diff --git a/src/pkg/runtime/rt0_dragonfly_386.s b/src/runtime/rt0_dragonfly_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_dragonfly_386.s
rename to src/runtime/rt0_dragonfly_386.s
diff --git a/src/pkg/runtime/rt0_dragonfly_amd64.s b/src/runtime/rt0_dragonfly_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_dragonfly_amd64.s
rename to src/runtime/rt0_dragonfly_amd64.s
diff --git a/src/pkg/runtime/rt0_freebsd_386.s b/src/runtime/rt0_freebsd_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_freebsd_386.s
rename to src/runtime/rt0_freebsd_386.s
diff --git a/src/pkg/runtime/rt0_freebsd_amd64.s b/src/runtime/rt0_freebsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_freebsd_amd64.s
rename to src/runtime/rt0_freebsd_amd64.s
diff --git a/src/pkg/runtime/rt0_freebsd_arm.s b/src/runtime/rt0_freebsd_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_freebsd_arm.s
rename to src/runtime/rt0_freebsd_arm.s
diff --git a/src/pkg/runtime/rt0_linux_386.s b/src/runtime/rt0_linux_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_386.s
rename to src/runtime/rt0_linux_386.s
diff --git a/src/pkg/runtime/rt0_linux_amd64.s b/src/runtime/rt0_linux_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_amd64.s
rename to src/runtime/rt0_linux_amd64.s
diff --git a/src/pkg/runtime/rt0_linux_arm.s b/src/runtime/rt0_linux_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_linux_arm.s
rename to src/runtime/rt0_linux_arm.s
diff --git a/src/pkg/runtime/rt0_nacl_386.s b/src/runtime/rt0_nacl_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_nacl_386.s
rename to src/runtime/rt0_nacl_386.s
diff --git a/src/pkg/runtime/rt0_nacl_amd64p32.s b/src/runtime/rt0_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/rt0_nacl_amd64p32.s
rename to src/runtime/rt0_nacl_amd64p32.s
diff --git a/src/pkg/runtime/rt0_nacl_arm.s b/src/runtime/rt0_nacl_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_nacl_arm.s
rename to src/runtime/rt0_nacl_arm.s
diff --git a/src/pkg/runtime/rt0_netbsd_386.s b/src/runtime/rt0_netbsd_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_netbsd_386.s
rename to src/runtime/rt0_netbsd_386.s
diff --git a/src/pkg/runtime/rt0_netbsd_amd64.s b/src/runtime/rt0_netbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_netbsd_amd64.s
rename to src/runtime/rt0_netbsd_amd64.s
diff --git a/src/pkg/runtime/rt0_netbsd_arm.s b/src/runtime/rt0_netbsd_arm.s
similarity index 100%
rename from src/pkg/runtime/rt0_netbsd_arm.s
rename to src/runtime/rt0_netbsd_arm.s
diff --git a/src/pkg/runtime/rt0_openbsd_386.s b/src/runtime/rt0_openbsd_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_openbsd_386.s
rename to src/runtime/rt0_openbsd_386.s
diff --git a/src/pkg/runtime/rt0_openbsd_amd64.s b/src/runtime/rt0_openbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_openbsd_amd64.s
rename to src/runtime/rt0_openbsd_amd64.s
diff --git a/src/pkg/runtime/rt0_plan9_386.s b/src/runtime/rt0_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_plan9_386.s
rename to src/runtime/rt0_plan9_386.s
diff --git a/src/pkg/runtime/rt0_plan9_amd64.s b/src/runtime/rt0_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_plan9_amd64.s
rename to src/runtime/rt0_plan9_amd64.s
diff --git a/src/pkg/runtime/rt0_solaris_amd64.s b/src/runtime/rt0_solaris_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_solaris_amd64.s
rename to src/runtime/rt0_solaris_amd64.s
diff --git a/src/pkg/runtime/rt0_windows_386.s b/src/runtime/rt0_windows_386.s
similarity index 100%
rename from src/pkg/runtime/rt0_windows_386.s
rename to src/runtime/rt0_windows_386.s
diff --git a/src/pkg/runtime/rt0_windows_amd64.s b/src/runtime/rt0_windows_amd64.s
similarity index 100%
rename from src/pkg/runtime/rt0_windows_amd64.s
rename to src/runtime/rt0_windows_amd64.s
diff --git a/src/pkg/runtime/rune.go b/src/runtime/rune.go
similarity index 100%
rename from src/pkg/runtime/rune.go
rename to src/runtime/rune.go
diff --git a/src/pkg/runtime/runtime-gdb.py b/src/runtime/runtime-gdb.py
similarity index 100%
rename from src/pkg/runtime/runtime-gdb.py
rename to src/runtime/runtime-gdb.py
diff --git a/src/pkg/runtime/runtime.c b/src/runtime/runtime.c
similarity index 100%
rename from src/pkg/runtime/runtime.c
rename to src/runtime/runtime.c
diff --git a/src/pkg/runtime/runtime.go b/src/runtime/runtime.go
similarity index 100%
rename from src/pkg/runtime/runtime.go
rename to src/runtime/runtime.go
diff --git a/src/pkg/runtime/runtime.h b/src/runtime/runtime.h
similarity index 100%
rename from src/pkg/runtime/runtime.h
rename to src/runtime/runtime.h
diff --git a/src/pkg/runtime/runtime_linux_test.go b/src/runtime/runtime_linux_test.go
similarity index 100%
rename from src/pkg/runtime/runtime_linux_test.go
rename to src/runtime/runtime_linux_test.go
diff --git a/src/pkg/runtime/runtime_test.go b/src/runtime/runtime_test.go
similarity index 100%
rename from src/pkg/runtime/runtime_test.go
rename to src/runtime/runtime_test.go
diff --git a/src/pkg/runtime/runtime_unix_test.go b/src/runtime/runtime_unix_test.go
similarity index 100%
rename from src/pkg/runtime/runtime_unix_test.go
rename to src/runtime/runtime_unix_test.go
diff --git a/src/pkg/runtime/select.go b/src/runtime/select.go
similarity index 100%
rename from src/pkg/runtime/select.go
rename to src/runtime/select.go
diff --git a/src/pkg/runtime/sema.go b/src/runtime/sema.go
similarity index 100%
rename from src/pkg/runtime/sema.go
rename to src/runtime/sema.go
diff --git a/src/pkg/runtime/signal.c b/src/runtime/signal.c
similarity index 100%
rename from src/pkg/runtime/signal.c
rename to src/runtime/signal.c
diff --git a/src/pkg/runtime/signal_386.c b/src/runtime/signal_386.c
similarity index 100%
rename from src/pkg/runtime/signal_386.c
rename to src/runtime/signal_386.c
diff --git a/src/pkg/runtime/signal_amd64x.c b/src/runtime/signal_amd64x.c
similarity index 100%
rename from src/pkg/runtime/signal_amd64x.c
rename to src/runtime/signal_amd64x.c
diff --git a/src/pkg/runtime/signal_android_386.h b/src/runtime/signal_android_386.h
similarity index 100%
rename from src/pkg/runtime/signal_android_386.h
rename to src/runtime/signal_android_386.h
diff --git a/src/pkg/runtime/signal_android_arm.h b/src/runtime/signal_android_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_android_arm.h
rename to src/runtime/signal_android_arm.h
diff --git a/src/pkg/runtime/signal_arm.c b/src/runtime/signal_arm.c
similarity index 100%
rename from src/pkg/runtime/signal_arm.c
rename to src/runtime/signal_arm.c
diff --git a/src/pkg/runtime/signal_darwin_386.h b/src/runtime/signal_darwin_386.h
similarity index 100%
rename from src/pkg/runtime/signal_darwin_386.h
rename to src/runtime/signal_darwin_386.h
diff --git a/src/pkg/runtime/signal_darwin_amd64.h b/src/runtime/signal_darwin_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_darwin_amd64.h
rename to src/runtime/signal_darwin_amd64.h
diff --git a/src/pkg/runtime/signal_dragonfly_386.h b/src/runtime/signal_dragonfly_386.h
similarity index 100%
rename from src/pkg/runtime/signal_dragonfly_386.h
rename to src/runtime/signal_dragonfly_386.h
diff --git a/src/pkg/runtime/signal_dragonfly_amd64.h b/src/runtime/signal_dragonfly_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_dragonfly_amd64.h
rename to src/runtime/signal_dragonfly_amd64.h
diff --git a/src/pkg/runtime/signal_freebsd_386.h b/src/runtime/signal_freebsd_386.h
similarity index 100%
rename from src/pkg/runtime/signal_freebsd_386.h
rename to src/runtime/signal_freebsd_386.h
diff --git a/src/pkg/runtime/signal_freebsd_amd64.h b/src/runtime/signal_freebsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_freebsd_amd64.h
rename to src/runtime/signal_freebsd_amd64.h
diff --git a/src/pkg/runtime/signal_freebsd_arm.h b/src/runtime/signal_freebsd_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_freebsd_arm.h
rename to src/runtime/signal_freebsd_arm.h
diff --git a/src/pkg/runtime/signal_linux_386.h b/src/runtime/signal_linux_386.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_386.h
rename to src/runtime/signal_linux_386.h
diff --git a/src/pkg/runtime/signal_linux_amd64.h b/src/runtime/signal_linux_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_amd64.h
rename to src/runtime/signal_linux_amd64.h
diff --git a/src/pkg/runtime/signal_linux_arm.h b/src/runtime/signal_linux_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_linux_arm.h
rename to src/runtime/signal_linux_arm.h
diff --git a/src/pkg/runtime/signal_nacl_386.h b/src/runtime/signal_nacl_386.h
similarity index 100%
rename from src/pkg/runtime/signal_nacl_386.h
rename to src/runtime/signal_nacl_386.h
diff --git a/src/pkg/runtime/signal_nacl_amd64p32.h b/src/runtime/signal_nacl_amd64p32.h
similarity index 100%
rename from src/pkg/runtime/signal_nacl_amd64p32.h
rename to src/runtime/signal_nacl_amd64p32.h
diff --git a/src/pkg/runtime/signal_nacl_arm.h b/src/runtime/signal_nacl_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_nacl_arm.h
rename to src/runtime/signal_nacl_arm.h
diff --git a/src/pkg/runtime/signal_netbsd_386.h b/src/runtime/signal_netbsd_386.h
similarity index 100%
rename from src/pkg/runtime/signal_netbsd_386.h
rename to src/runtime/signal_netbsd_386.h
diff --git a/src/pkg/runtime/signal_netbsd_amd64.h b/src/runtime/signal_netbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_netbsd_amd64.h
rename to src/runtime/signal_netbsd_amd64.h
diff --git a/src/pkg/runtime/signal_netbsd_arm.h b/src/runtime/signal_netbsd_arm.h
similarity index 100%
rename from src/pkg/runtime/signal_netbsd_arm.h
rename to src/runtime/signal_netbsd_arm.h
diff --git a/src/pkg/runtime/signal_openbsd_386.h b/src/runtime/signal_openbsd_386.h
similarity index 100%
rename from src/pkg/runtime/signal_openbsd_386.h
rename to src/runtime/signal_openbsd_386.h
diff --git a/src/pkg/runtime/signal_openbsd_amd64.h b/src/runtime/signal_openbsd_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_openbsd_amd64.h
rename to src/runtime/signal_openbsd_amd64.h
diff --git a/src/pkg/runtime/signal_solaris_amd64.h b/src/runtime/signal_solaris_amd64.h
similarity index 100%
rename from src/pkg/runtime/signal_solaris_amd64.h
rename to src/runtime/signal_solaris_amd64.h
diff --git a/src/pkg/runtime/signal_unix.c b/src/runtime/signal_unix.c
similarity index 100%
rename from src/pkg/runtime/signal_unix.c
rename to src/runtime/signal_unix.c
diff --git a/src/pkg/runtime/signal_unix.go b/src/runtime/signal_unix.go
similarity index 100%
rename from src/pkg/runtime/signal_unix.go
rename to src/runtime/signal_unix.go
diff --git a/src/pkg/runtime/signal_unix.h b/src/runtime/signal_unix.h
similarity index 100%
rename from src/pkg/runtime/signal_unix.h
rename to src/runtime/signal_unix.h
diff --git a/src/pkg/runtime/signals_android.h b/src/runtime/signals_android.h
similarity index 100%
rename from src/pkg/runtime/signals_android.h
rename to src/runtime/signals_android.h
diff --git a/src/pkg/runtime/signals_darwin.h b/src/runtime/signals_darwin.h
similarity index 100%
rename from src/pkg/runtime/signals_darwin.h
rename to src/runtime/signals_darwin.h
diff --git a/src/pkg/runtime/signals_dragonfly.h b/src/runtime/signals_dragonfly.h
similarity index 100%
rename from src/pkg/runtime/signals_dragonfly.h
rename to src/runtime/signals_dragonfly.h
diff --git a/src/pkg/runtime/signals_freebsd.h b/src/runtime/signals_freebsd.h
similarity index 100%
rename from src/pkg/runtime/signals_freebsd.h
rename to src/runtime/signals_freebsd.h
diff --git a/src/pkg/runtime/signals_linux.h b/src/runtime/signals_linux.h
similarity index 100%
rename from src/pkg/runtime/signals_linux.h
rename to src/runtime/signals_linux.h
diff --git a/src/pkg/runtime/signals_nacl.h b/src/runtime/signals_nacl.h
similarity index 100%
rename from src/pkg/runtime/signals_nacl.h
rename to src/runtime/signals_nacl.h
diff --git a/src/pkg/runtime/signals_netbsd.h b/src/runtime/signals_netbsd.h
similarity index 100%
rename from src/pkg/runtime/signals_netbsd.h
rename to src/runtime/signals_netbsd.h
diff --git a/src/pkg/runtime/signals_openbsd.h b/src/runtime/signals_openbsd.h
similarity index 100%
rename from src/pkg/runtime/signals_openbsd.h
rename to src/runtime/signals_openbsd.h
diff --git a/src/pkg/runtime/signals_plan9.h b/src/runtime/signals_plan9.h
similarity index 100%
rename from src/pkg/runtime/signals_plan9.h
rename to src/runtime/signals_plan9.h
diff --git a/src/pkg/runtime/signals_solaris.h b/src/runtime/signals_solaris.h
similarity index 100%
rename from src/pkg/runtime/signals_solaris.h
rename to src/runtime/signals_solaris.h
diff --git a/src/pkg/runtime/signals_windows.h b/src/runtime/signals_windows.h
similarity index 100%
rename from src/pkg/runtime/signals_windows.h
rename to src/runtime/signals_windows.h
diff --git a/src/pkg/runtime/sigqueue.go b/src/runtime/sigqueue.go
similarity index 100%
rename from src/pkg/runtime/sigqueue.go
rename to src/runtime/sigqueue.go
diff --git a/src/pkg/runtime/slice.go b/src/runtime/slice.go
similarity index 100%
rename from src/pkg/runtime/slice.go
rename to src/runtime/slice.go
diff --git a/src/pkg/runtime/softfloat64.go b/src/runtime/softfloat64.go
similarity index 100%
rename from src/pkg/runtime/softfloat64.go
rename to src/runtime/softfloat64.go
diff --git a/src/pkg/runtime/softfloat64_test.go b/src/runtime/softfloat64_test.go
similarity index 100%
rename from src/pkg/runtime/softfloat64_test.go
rename to src/runtime/softfloat64_test.go
diff --git a/src/pkg/runtime/softfloat_arm.c b/src/runtime/softfloat_arm.c
similarity index 100%
rename from src/pkg/runtime/softfloat_arm.c
rename to src/runtime/softfloat_arm.c
diff --git a/src/pkg/runtime/sqrt.go b/src/runtime/sqrt.go
similarity index 100%
rename from src/pkg/runtime/sqrt.go
rename to src/runtime/sqrt.go
diff --git a/src/pkg/runtime/stack.c b/src/runtime/stack.c
similarity index 100%
rename from src/pkg/runtime/stack.c
rename to src/runtime/stack.c
diff --git a/src/pkg/runtime/stack.go b/src/runtime/stack.go
similarity index 100%
rename from src/pkg/runtime/stack.go
rename to src/runtime/stack.go
diff --git a/src/pkg/runtime/stack.h b/src/runtime/stack.h
similarity index 100%
rename from src/pkg/runtime/stack.h
rename to src/runtime/stack.h
diff --git a/src/pkg/runtime/stack_gen_test.go b/src/runtime/stack_gen_test.go
similarity index 100%
rename from src/pkg/runtime/stack_gen_test.go
rename to src/runtime/stack_gen_test.go
diff --git a/src/pkg/runtime/stack_test.go b/src/runtime/stack_test.go
similarity index 100%
rename from src/pkg/runtime/stack_test.go
rename to src/runtime/stack_test.go
diff --git a/src/pkg/runtime/string.c b/src/runtime/string.c
similarity index 100%
rename from src/pkg/runtime/string.c
rename to src/runtime/string.c
diff --git a/src/pkg/runtime/string.go b/src/runtime/string.go
similarity index 100%
rename from src/pkg/runtime/string.go
rename to src/runtime/string.go
diff --git a/src/pkg/runtime/string_test.go b/src/runtime/string_test.go
similarity index 100%
rename from src/pkg/runtime/string_test.go
rename to src/runtime/string_test.go
diff --git a/src/pkg/runtime/stubs.go b/src/runtime/stubs.go
similarity index 100%
rename from src/pkg/runtime/stubs.go
rename to src/runtime/stubs.go
diff --git a/src/pkg/runtime/symtab.go b/src/runtime/symtab.go
similarity index 100%
rename from src/pkg/runtime/symtab.go
rename to src/runtime/symtab.go
diff --git a/src/pkg/runtime/symtab_test.go b/src/runtime/symtab_test.go
similarity index 100%
rename from src/pkg/runtime/symtab_test.go
rename to src/runtime/symtab_test.go
diff --git a/src/pkg/runtime/sys_arm.c b/src/runtime/sys_arm.c
similarity index 100%
rename from src/pkg/runtime/sys_arm.c
rename to src/runtime/sys_arm.c
diff --git a/src/pkg/runtime/sys_darwin_386.s b/src/runtime/sys_darwin_386.s
similarity index 100%
rename from src/pkg/runtime/sys_darwin_386.s
rename to src/runtime/sys_darwin_386.s
diff --git a/src/pkg/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_darwin_amd64.s
rename to src/runtime/sys_darwin_amd64.s
diff --git a/src/pkg/runtime/sys_dragonfly_386.s b/src/runtime/sys_dragonfly_386.s
similarity index 100%
rename from src/pkg/runtime/sys_dragonfly_386.s
rename to src/runtime/sys_dragonfly_386.s
diff --git a/src/pkg/runtime/sys_dragonfly_amd64.s b/src/runtime/sys_dragonfly_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_dragonfly_amd64.s
rename to src/runtime/sys_dragonfly_amd64.s
diff --git a/src/pkg/runtime/sys_freebsd_386.s b/src/runtime/sys_freebsd_386.s
similarity index 100%
rename from src/pkg/runtime/sys_freebsd_386.s
rename to src/runtime/sys_freebsd_386.s
diff --git a/src/pkg/runtime/sys_freebsd_amd64.s b/src/runtime/sys_freebsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_freebsd_amd64.s
rename to src/runtime/sys_freebsd_amd64.s
diff --git a/src/pkg/runtime/sys_freebsd_arm.s b/src/runtime/sys_freebsd_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_freebsd_arm.s
rename to src/runtime/sys_freebsd_arm.s
diff --git a/src/pkg/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
similarity index 100%
rename from src/pkg/runtime/sys_linux_386.s
rename to src/runtime/sys_linux_386.s
diff --git a/src/pkg/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_linux_amd64.s
rename to src/runtime/sys_linux_amd64.s
diff --git a/src/pkg/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_linux_arm.s
rename to src/runtime/sys_linux_arm.s
diff --git a/src/pkg/runtime/sys_nacl_386.s b/src/runtime/sys_nacl_386.s
similarity index 100%
rename from src/pkg/runtime/sys_nacl_386.s
rename to src/runtime/sys_nacl_386.s
diff --git a/src/pkg/runtime/sys_nacl_amd64p32.s b/src/runtime/sys_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/runtime/sys_nacl_amd64p32.s
rename to src/runtime/sys_nacl_amd64p32.s
diff --git a/src/pkg/runtime/sys_nacl_arm.s b/src/runtime/sys_nacl_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_nacl_arm.s
rename to src/runtime/sys_nacl_arm.s
diff --git a/src/pkg/runtime/sys_netbsd_386.s b/src/runtime/sys_netbsd_386.s
similarity index 100%
rename from src/pkg/runtime/sys_netbsd_386.s
rename to src/runtime/sys_netbsd_386.s
diff --git a/src/pkg/runtime/sys_netbsd_amd64.s b/src/runtime/sys_netbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_netbsd_amd64.s
rename to src/runtime/sys_netbsd_amd64.s
diff --git a/src/pkg/runtime/sys_netbsd_arm.s b/src/runtime/sys_netbsd_arm.s
similarity index 100%
rename from src/pkg/runtime/sys_netbsd_arm.s
rename to src/runtime/sys_netbsd_arm.s
diff --git a/src/pkg/runtime/sys_openbsd_386.s b/src/runtime/sys_openbsd_386.s
similarity index 100%
rename from src/pkg/runtime/sys_openbsd_386.s
rename to src/runtime/sys_openbsd_386.s
diff --git a/src/pkg/runtime/sys_openbsd_amd64.s b/src/runtime/sys_openbsd_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_openbsd_amd64.s
rename to src/runtime/sys_openbsd_amd64.s
diff --git a/src/pkg/runtime/sys_plan9_386.s b/src/runtime/sys_plan9_386.s
similarity index 100%
rename from src/pkg/runtime/sys_plan9_386.s
rename to src/runtime/sys_plan9_386.s
diff --git a/src/pkg/runtime/sys_plan9_amd64.s b/src/runtime/sys_plan9_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_plan9_amd64.s
rename to src/runtime/sys_plan9_amd64.s
diff --git a/src/pkg/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_solaris_amd64.s
rename to src/runtime/sys_solaris_amd64.s
diff --git a/src/pkg/runtime/sys_windows_386.s b/src/runtime/sys_windows_386.s
similarity index 100%
rename from src/pkg/runtime/sys_windows_386.s
rename to src/runtime/sys_windows_386.s
diff --git a/src/pkg/runtime/sys_windows_amd64.s b/src/runtime/sys_windows_amd64.s
similarity index 100%
rename from src/pkg/runtime/sys_windows_amd64.s
rename to src/runtime/sys_windows_amd64.s
diff --git a/src/pkg/runtime/sys_x86.c b/src/runtime/sys_x86.c
similarity index 100%
rename from src/pkg/runtime/sys_x86.c
rename to src/runtime/sys_x86.c
diff --git a/src/pkg/runtime/syscall_nacl.h b/src/runtime/syscall_nacl.h
similarity index 100%
rename from src/pkg/runtime/syscall_nacl.h
rename to src/runtime/syscall_nacl.h
diff --git a/src/pkg/runtime/syscall_solaris.c b/src/runtime/syscall_solaris.c
similarity index 100%
rename from src/pkg/runtime/syscall_solaris.c
rename to src/runtime/syscall_solaris.c
diff --git a/src/pkg/runtime/syscall_solaris.go b/src/runtime/syscall_solaris.go
similarity index 100%
rename from src/pkg/runtime/syscall_solaris.go
rename to src/runtime/syscall_solaris.go
diff --git a/src/pkg/runtime/syscall_windows.c b/src/runtime/syscall_windows.c
similarity index 100%
rename from src/pkg/runtime/syscall_windows.c
rename to src/runtime/syscall_windows.c
diff --git a/src/pkg/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
similarity index 100%
rename from src/pkg/runtime/syscall_windows.go
rename to src/runtime/syscall_windows.go
diff --git a/src/pkg/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go
similarity index 100%
rename from src/pkg/runtime/syscall_windows_test.go
rename to src/runtime/syscall_windows_test.go
diff --git a/src/pkg/runtime/thunk.s b/src/runtime/thunk.s
similarity index 100%
rename from src/pkg/runtime/thunk.s
rename to src/runtime/thunk.s
diff --git a/src/pkg/runtime/thunk_solaris_amd64.s b/src/runtime/thunk_solaris_amd64.s
similarity index 100%
rename from src/pkg/runtime/thunk_solaris_amd64.s
rename to src/runtime/thunk_solaris_amd64.s
diff --git a/src/pkg/runtime/time.go b/src/runtime/time.go
similarity index 100%
rename from src/pkg/runtime/time.go
rename to src/runtime/time.go
diff --git a/src/pkg/runtime/tls_arm.s b/src/runtime/tls_arm.s
similarity index 100%
rename from src/pkg/runtime/tls_arm.s
rename to src/runtime/tls_arm.s
diff --git a/src/pkg/runtime/traceback.go b/src/runtime/traceback.go
similarity index 100%
rename from src/pkg/runtime/traceback.go
rename to src/runtime/traceback.go
diff --git a/src/pkg/runtime/traceback_windows.go b/src/runtime/traceback_windows.go
similarity index 100%
rename from src/pkg/runtime/traceback_windows.go
rename to src/runtime/traceback_windows.go
diff --git a/src/pkg/runtime/type.h b/src/runtime/type.h
similarity index 100%
rename from src/pkg/runtime/type.h
rename to src/runtime/type.h
diff --git a/src/pkg/runtime/typekind.go b/src/runtime/typekind.go
similarity index 100%
rename from src/pkg/runtime/typekind.go
rename to src/runtime/typekind.go
diff --git a/src/pkg/runtime/typekind.h b/src/runtime/typekind.h
similarity index 100%
rename from src/pkg/runtime/typekind.h
rename to src/runtime/typekind.h
diff --git a/src/pkg/runtime/vdso_linux_amd64.c b/src/runtime/vdso_linux_amd64.c
similarity index 100%
rename from src/pkg/runtime/vdso_linux_amd64.c
rename to src/runtime/vdso_linux_amd64.c
diff --git a/src/pkg/runtime/vlop_386.s b/src/runtime/vlop_386.s
similarity index 100%
rename from src/pkg/runtime/vlop_386.s
rename to src/runtime/vlop_386.s
diff --git a/src/pkg/runtime/vlop_arm.s b/src/runtime/vlop_arm.s
similarity index 100%
rename from src/pkg/runtime/vlop_arm.s
rename to src/runtime/vlop_arm.s
diff --git a/src/pkg/runtime/vlop_arm_test.go b/src/runtime/vlop_arm_test.go
similarity index 100%
rename from src/pkg/runtime/vlop_arm_test.go
rename to src/runtime/vlop_arm_test.go
diff --git a/src/pkg/runtime/vlrt.c b/src/runtime/vlrt.c
similarity index 100%
rename from src/pkg/runtime/vlrt.c
rename to src/runtime/vlrt.c
diff --git a/src/pkg/runtime/vlrt.go b/src/runtime/vlrt.go
similarity index 100%
rename from src/pkg/runtime/vlrt.go
rename to src/runtime/vlrt.go
diff --git a/src/pkg/sort/example_interface_test.go b/src/sort/example_interface_test.go
similarity index 100%
rename from src/pkg/sort/example_interface_test.go
rename to src/sort/example_interface_test.go
diff --git a/src/pkg/sort/example_keys_test.go b/src/sort/example_keys_test.go
similarity index 100%
rename from src/pkg/sort/example_keys_test.go
rename to src/sort/example_keys_test.go
diff --git a/src/pkg/sort/example_multi_test.go b/src/sort/example_multi_test.go
similarity index 100%
rename from src/pkg/sort/example_multi_test.go
rename to src/sort/example_multi_test.go
diff --git a/src/pkg/sort/example_test.go b/src/sort/example_test.go
similarity index 100%
rename from src/pkg/sort/example_test.go
rename to src/sort/example_test.go
diff --git a/src/pkg/sort/example_wrapper_test.go b/src/sort/example_wrapper_test.go
similarity index 100%
rename from src/pkg/sort/example_wrapper_test.go
rename to src/sort/example_wrapper_test.go
diff --git a/src/pkg/sort/export_test.go b/src/sort/export_test.go
similarity index 100%
rename from src/pkg/sort/export_test.go
rename to src/sort/export_test.go
diff --git a/src/pkg/sort/search.go b/src/sort/search.go
similarity index 100%
rename from src/pkg/sort/search.go
rename to src/sort/search.go
diff --git a/src/pkg/sort/search_test.go b/src/sort/search_test.go
similarity index 100%
rename from src/pkg/sort/search_test.go
rename to src/sort/search_test.go
diff --git a/src/pkg/sort/sort.go b/src/sort/sort.go
similarity index 100%
rename from src/pkg/sort/sort.go
rename to src/sort/sort.go
diff --git a/src/pkg/sort/sort_test.go b/src/sort/sort_test.go
similarity index 100%
rename from src/pkg/sort/sort_test.go
rename to src/sort/sort_test.go
diff --git a/src/pkg/strconv/atob.go b/src/strconv/atob.go
similarity index 100%
rename from src/pkg/strconv/atob.go
rename to src/strconv/atob.go
diff --git a/src/pkg/strconv/atob_test.go b/src/strconv/atob_test.go
similarity index 100%
rename from src/pkg/strconv/atob_test.go
rename to src/strconv/atob_test.go
diff --git a/src/pkg/strconv/atof.go b/src/strconv/atof.go
similarity index 100%
rename from src/pkg/strconv/atof.go
rename to src/strconv/atof.go
diff --git a/src/pkg/strconv/atof_test.go b/src/strconv/atof_test.go
similarity index 100%
rename from src/pkg/strconv/atof_test.go
rename to src/strconv/atof_test.go
diff --git a/src/pkg/strconv/atoi.go b/src/strconv/atoi.go
similarity index 100%
rename from src/pkg/strconv/atoi.go
rename to src/strconv/atoi.go
diff --git a/src/pkg/strconv/atoi_test.go b/src/strconv/atoi_test.go
similarity index 100%
rename from src/pkg/strconv/atoi_test.go
rename to src/strconv/atoi_test.go
diff --git a/src/pkg/strconv/decimal.go b/src/strconv/decimal.go
similarity index 100%
rename from src/pkg/strconv/decimal.go
rename to src/strconv/decimal.go
diff --git a/src/pkg/strconv/decimal_test.go b/src/strconv/decimal_test.go
similarity index 100%
rename from src/pkg/strconv/decimal_test.go
rename to src/strconv/decimal_test.go
diff --git a/src/pkg/strconv/extfloat.go b/src/strconv/extfloat.go
similarity index 100%
rename from src/pkg/strconv/extfloat.go
rename to src/strconv/extfloat.go
diff --git a/src/pkg/strconv/fp_test.go b/src/strconv/fp_test.go
similarity index 100%
rename from src/pkg/strconv/fp_test.go
rename to src/strconv/fp_test.go
diff --git a/src/pkg/strconv/ftoa.go b/src/strconv/ftoa.go
similarity index 100%
rename from src/pkg/strconv/ftoa.go
rename to src/strconv/ftoa.go
diff --git a/src/pkg/strconv/ftoa_test.go b/src/strconv/ftoa_test.go
similarity index 100%
rename from src/pkg/strconv/ftoa_test.go
rename to src/strconv/ftoa_test.go
diff --git a/src/pkg/strconv/internal_test.go b/src/strconv/internal_test.go
similarity index 100%
rename from src/pkg/strconv/internal_test.go
rename to src/strconv/internal_test.go
diff --git a/src/pkg/strconv/isprint.go b/src/strconv/isprint.go
similarity index 100%
rename from src/pkg/strconv/isprint.go
rename to src/strconv/isprint.go
diff --git a/src/pkg/strconv/itoa.go b/src/strconv/itoa.go
similarity index 100%
rename from src/pkg/strconv/itoa.go
rename to src/strconv/itoa.go
diff --git a/src/pkg/strconv/itoa_test.go b/src/strconv/itoa_test.go
similarity index 100%
rename from src/pkg/strconv/itoa_test.go
rename to src/strconv/itoa_test.go
diff --git a/src/pkg/strconv/makeisprint.go b/src/strconv/makeisprint.go
similarity index 100%
rename from src/pkg/strconv/makeisprint.go
rename to src/strconv/makeisprint.go
diff --git a/src/pkg/strconv/quote.go b/src/strconv/quote.go
similarity index 100%
rename from src/pkg/strconv/quote.go
rename to src/strconv/quote.go
diff --git a/src/pkg/strconv/quote_example_test.go b/src/strconv/quote_example_test.go
similarity index 100%
rename from src/pkg/strconv/quote_example_test.go
rename to src/strconv/quote_example_test.go
diff --git a/src/pkg/strconv/quote_test.go b/src/strconv/quote_test.go
similarity index 100%
rename from src/pkg/strconv/quote_test.go
rename to src/strconv/quote_test.go
diff --git a/src/pkg/strconv/strconv_test.go b/src/strconv/strconv_test.go
similarity index 100%
rename from src/pkg/strconv/strconv_test.go
rename to src/strconv/strconv_test.go
diff --git a/src/pkg/strconv/testdata/testfp.txt b/src/strconv/testdata/testfp.txt
similarity index 100%
rename from src/pkg/strconv/testdata/testfp.txt
rename to src/strconv/testdata/testfp.txt
diff --git a/src/pkg/strings/example_test.go b/src/strings/example_test.go
similarity index 100%
rename from src/pkg/strings/example_test.go
rename to src/strings/example_test.go
diff --git a/src/pkg/strings/export_test.go b/src/strings/export_test.go
similarity index 100%
rename from src/pkg/strings/export_test.go
rename to src/strings/export_test.go
diff --git a/src/pkg/strings/reader.go b/src/strings/reader.go
similarity index 100%
rename from src/pkg/strings/reader.go
rename to src/strings/reader.go
diff --git a/src/pkg/strings/reader_test.go b/src/strings/reader_test.go
similarity index 100%
rename from src/pkg/strings/reader_test.go
rename to src/strings/reader_test.go
diff --git a/src/pkg/strings/replace.go b/src/strings/replace.go
similarity index 100%
rename from src/pkg/strings/replace.go
rename to src/strings/replace.go
diff --git a/src/pkg/strings/replace_test.go b/src/strings/replace_test.go
similarity index 100%
rename from src/pkg/strings/replace_test.go
rename to src/strings/replace_test.go
diff --git a/src/pkg/strings/search.go b/src/strings/search.go
similarity index 100%
rename from src/pkg/strings/search.go
rename to src/strings/search.go
diff --git a/src/pkg/strings/search_test.go b/src/strings/search_test.go
similarity index 100%
rename from src/pkg/strings/search_test.go
rename to src/strings/search_test.go
diff --git a/src/pkg/strings/strings.go b/src/strings/strings.go
similarity index 100%
rename from src/pkg/strings/strings.go
rename to src/strings/strings.go
diff --git a/src/pkg/strings/strings.s b/src/strings/strings.s
similarity index 100%
rename from src/pkg/strings/strings.s
rename to src/strings/strings.s
diff --git a/src/pkg/strings/strings_decl.go b/src/strings/strings_decl.go
similarity index 100%
rename from src/pkg/strings/strings_decl.go
rename to src/strings/strings_decl.go
diff --git a/src/pkg/strings/strings_test.go b/src/strings/strings_test.go
similarity index 100%
rename from src/pkg/strings/strings_test.go
rename to src/strings/strings_test.go
diff --git a/src/pkg/sync/atomic/64bit_arm.go b/src/sync/atomic/64bit_arm.go
similarity index 100%
rename from src/pkg/sync/atomic/64bit_arm.go
rename to src/sync/atomic/64bit_arm.go
diff --git a/src/pkg/sync/atomic/asm_386.s b/src/sync/atomic/asm_386.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_386.s
rename to src/sync/atomic/asm_386.s
diff --git a/src/pkg/sync/atomic/asm_amd64.s b/src/sync/atomic/asm_amd64.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_amd64.s
rename to src/sync/atomic/asm_amd64.s
diff --git a/src/pkg/sync/atomic/asm_amd64p32.s b/src/sync/atomic/asm_amd64p32.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_amd64p32.s
rename to src/sync/atomic/asm_amd64p32.s
diff --git a/src/pkg/sync/atomic/asm_arm.s b/src/sync/atomic/asm_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_arm.s
rename to src/sync/atomic/asm_arm.s
diff --git a/src/pkg/sync/atomic/asm_freebsd_arm.s b/src/sync/atomic/asm_freebsd_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_freebsd_arm.s
rename to src/sync/atomic/asm_freebsd_arm.s
diff --git a/src/pkg/sync/atomic/asm_linux_arm.s b/src/sync/atomic/asm_linux_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_linux_arm.s
rename to src/sync/atomic/asm_linux_arm.s
diff --git a/src/pkg/sync/atomic/asm_nacl_arm.s b/src/sync/atomic/asm_nacl_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_nacl_arm.s
rename to src/sync/atomic/asm_nacl_arm.s
diff --git a/src/pkg/sync/atomic/asm_netbsd_arm.s b/src/sync/atomic/asm_netbsd_arm.s
similarity index 100%
rename from src/pkg/sync/atomic/asm_netbsd_arm.s
rename to src/sync/atomic/asm_netbsd_arm.s
diff --git a/src/pkg/sync/atomic/atomic_linux_arm_test.go b/src/sync/atomic/atomic_linux_arm_test.go
similarity index 100%
rename from src/pkg/sync/atomic/atomic_linux_arm_test.go
rename to src/sync/atomic/atomic_linux_arm_test.go
diff --git a/src/pkg/sync/atomic/atomic_test.go b/src/sync/atomic/atomic_test.go
similarity index 100%
rename from src/pkg/sync/atomic/atomic_test.go
rename to src/sync/atomic/atomic_test.go
diff --git a/src/pkg/sync/atomic/doc.go b/src/sync/atomic/doc.go
similarity index 100%
rename from src/pkg/sync/atomic/doc.go
rename to src/sync/atomic/doc.go
diff --git a/src/pkg/sync/atomic/export_linux_arm_test.go b/src/sync/atomic/export_linux_arm_test.go
similarity index 100%
rename from src/pkg/sync/atomic/export_linux_arm_test.go
rename to src/sync/atomic/export_linux_arm_test.go
diff --git a/src/pkg/sync/atomic/race.s b/src/sync/atomic/race.s
similarity index 100%
rename from src/pkg/sync/atomic/race.s
rename to src/sync/atomic/race.s
diff --git a/src/pkg/sync/cond.go b/src/sync/cond.go
similarity index 100%
rename from src/pkg/sync/cond.go
rename to src/sync/cond.go
diff --git a/src/pkg/sync/cond_test.go b/src/sync/cond_test.go
similarity index 100%
rename from src/pkg/sync/cond_test.go
rename to src/sync/cond_test.go
diff --git a/src/pkg/sync/example_test.go b/src/sync/example_test.go
similarity index 100%
rename from src/pkg/sync/example_test.go
rename to src/sync/example_test.go
diff --git a/src/pkg/sync/export_test.go b/src/sync/export_test.go
similarity index 100%
rename from src/pkg/sync/export_test.go
rename to src/sync/export_test.go
diff --git a/src/pkg/sync/mutex.go b/src/sync/mutex.go
similarity index 100%
rename from src/pkg/sync/mutex.go
rename to src/sync/mutex.go
diff --git a/src/pkg/sync/mutex_test.go b/src/sync/mutex_test.go
similarity index 100%
rename from src/pkg/sync/mutex_test.go
rename to src/sync/mutex_test.go
diff --git a/src/pkg/sync/once.go b/src/sync/once.go
similarity index 100%
rename from src/pkg/sync/once.go
rename to src/sync/once.go
diff --git a/src/pkg/sync/once_test.go b/src/sync/once_test.go
similarity index 100%
rename from src/pkg/sync/once_test.go
rename to src/sync/once_test.go
diff --git a/src/pkg/sync/pool.go b/src/sync/pool.go
similarity index 100%
rename from src/pkg/sync/pool.go
rename to src/sync/pool.go
diff --git a/src/pkg/sync/pool_test.go b/src/sync/pool_test.go
similarity index 100%
rename from src/pkg/sync/pool_test.go
rename to src/sync/pool_test.go
diff --git a/src/pkg/sync/race.go b/src/sync/race.go
similarity index 100%
rename from src/pkg/sync/race.go
rename to src/sync/race.go
diff --git a/src/pkg/sync/race0.go b/src/sync/race0.go
similarity index 100%
rename from src/pkg/sync/race0.go
rename to src/sync/race0.go
diff --git a/src/pkg/sync/runtime.go b/src/sync/runtime.go
similarity index 100%
rename from src/pkg/sync/runtime.go
rename to src/sync/runtime.go
diff --git a/src/pkg/sync/runtime_sema_test.go b/src/sync/runtime_sema_test.go
similarity index 100%
rename from src/pkg/sync/runtime_sema_test.go
rename to src/sync/runtime_sema_test.go
diff --git a/src/pkg/sync/rwmutex.go b/src/sync/rwmutex.go
similarity index 100%
rename from src/pkg/sync/rwmutex.go
rename to src/sync/rwmutex.go
diff --git a/src/pkg/sync/rwmutex_test.go b/src/sync/rwmutex_test.go
similarity index 100%
rename from src/pkg/sync/rwmutex_test.go
rename to src/sync/rwmutex_test.go
diff --git a/src/pkg/sync/waitgroup.go b/src/sync/waitgroup.go
similarity index 100%
rename from src/pkg/sync/waitgroup.go
rename to src/sync/waitgroup.go
diff --git a/src/pkg/sync/waitgroup_test.go b/src/sync/waitgroup_test.go
similarity index 100%
rename from src/pkg/sync/waitgroup_test.go
rename to src/sync/waitgroup_test.go
diff --git a/src/pkg/syscall/asm_darwin_386.s b/src/syscall/asm_darwin_386.s
similarity index 100%
rename from src/pkg/syscall/asm_darwin_386.s
rename to src/syscall/asm_darwin_386.s
diff --git a/src/pkg/syscall/asm_darwin_amd64.s b/src/syscall/asm_darwin_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_darwin_amd64.s
rename to src/syscall/asm_darwin_amd64.s
diff --git a/src/pkg/syscall/asm_dragonfly_386.s b/src/syscall/asm_dragonfly_386.s
similarity index 100%
rename from src/pkg/syscall/asm_dragonfly_386.s
rename to src/syscall/asm_dragonfly_386.s
diff --git a/src/pkg/syscall/asm_dragonfly_amd64.s b/src/syscall/asm_dragonfly_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_dragonfly_amd64.s
rename to src/syscall/asm_dragonfly_amd64.s
diff --git a/src/pkg/syscall/asm_freebsd_386.s b/src/syscall/asm_freebsd_386.s
similarity index 100%
rename from src/pkg/syscall/asm_freebsd_386.s
rename to src/syscall/asm_freebsd_386.s
diff --git a/src/pkg/syscall/asm_freebsd_amd64.s b/src/syscall/asm_freebsd_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_freebsd_amd64.s
rename to src/syscall/asm_freebsd_amd64.s
diff --git a/src/pkg/syscall/asm_freebsd_arm.s b/src/syscall/asm_freebsd_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_freebsd_arm.s
rename to src/syscall/asm_freebsd_arm.s
diff --git a/src/pkg/syscall/asm_linux_386.s b/src/syscall/asm_linux_386.s
similarity index 100%
rename from src/pkg/syscall/asm_linux_386.s
rename to src/syscall/asm_linux_386.s
diff --git a/src/pkg/syscall/asm_linux_amd64.s b/src/syscall/asm_linux_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_linux_amd64.s
rename to src/syscall/asm_linux_amd64.s
diff --git a/src/pkg/syscall/asm_linux_arm.s b/src/syscall/asm_linux_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_linux_arm.s
rename to src/syscall/asm_linux_arm.s
diff --git a/src/pkg/syscall/asm_nacl_386.s b/src/syscall/asm_nacl_386.s
similarity index 100%
rename from src/pkg/syscall/asm_nacl_386.s
rename to src/syscall/asm_nacl_386.s
diff --git a/src/pkg/syscall/asm_nacl_amd64p32.s b/src/syscall/asm_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/syscall/asm_nacl_amd64p32.s
rename to src/syscall/asm_nacl_amd64p32.s
diff --git a/src/pkg/syscall/asm_nacl_arm.s b/src/syscall/asm_nacl_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_nacl_arm.s
rename to src/syscall/asm_nacl_arm.s
diff --git a/src/pkg/syscall/asm_netbsd_386.s b/src/syscall/asm_netbsd_386.s
similarity index 100%
rename from src/pkg/syscall/asm_netbsd_386.s
rename to src/syscall/asm_netbsd_386.s
diff --git a/src/pkg/syscall/asm_netbsd_amd64.s b/src/syscall/asm_netbsd_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_netbsd_amd64.s
rename to src/syscall/asm_netbsd_amd64.s
diff --git a/src/pkg/syscall/asm_netbsd_arm.s b/src/syscall/asm_netbsd_arm.s
similarity index 100%
rename from src/pkg/syscall/asm_netbsd_arm.s
rename to src/syscall/asm_netbsd_arm.s
diff --git a/src/pkg/syscall/asm_openbsd_386.s b/src/syscall/asm_openbsd_386.s
similarity index 100%
rename from src/pkg/syscall/asm_openbsd_386.s
rename to src/syscall/asm_openbsd_386.s
diff --git a/src/pkg/syscall/asm_openbsd_amd64.s b/src/syscall/asm_openbsd_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_openbsd_amd64.s
rename to src/syscall/asm_openbsd_amd64.s
diff --git a/src/pkg/syscall/asm_plan9_386.s b/src/syscall/asm_plan9_386.s
similarity index 100%
rename from src/pkg/syscall/asm_plan9_386.s
rename to src/syscall/asm_plan9_386.s
diff --git a/src/pkg/syscall/asm_plan9_amd64.s b/src/syscall/asm_plan9_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_plan9_amd64.s
rename to src/syscall/asm_plan9_amd64.s
diff --git a/src/pkg/syscall/asm_solaris_amd64.s b/src/syscall/asm_solaris_amd64.s
similarity index 100%
rename from src/pkg/syscall/asm_solaris_amd64.s
rename to src/syscall/asm_solaris_amd64.s
diff --git a/src/pkg/syscall/asm_windows.s b/src/syscall/asm_windows.s
similarity index 100%
rename from src/pkg/syscall/asm_windows.s
rename to src/syscall/asm_windows.s
diff --git a/src/pkg/syscall/bpf_bsd.go b/src/syscall/bpf_bsd.go
similarity index 100%
rename from src/pkg/syscall/bpf_bsd.go
rename to src/syscall/bpf_bsd.go
diff --git a/src/pkg/syscall/creds_test.go b/src/syscall/creds_test.go
similarity index 100%
rename from src/pkg/syscall/creds_test.go
rename to src/syscall/creds_test.go
diff --git a/src/pkg/syscall/dir_plan9.go b/src/syscall/dir_plan9.go
similarity index 100%
rename from src/pkg/syscall/dir_plan9.go
rename to src/syscall/dir_plan9.go
diff --git a/src/pkg/syscall/dll_windows.go b/src/syscall/dll_windows.go
similarity index 100%
rename from src/pkg/syscall/dll_windows.go
rename to src/syscall/dll_windows.go
diff --git a/src/pkg/syscall/env_plan9.go b/src/syscall/env_plan9.go
similarity index 100%
rename from src/pkg/syscall/env_plan9.go
rename to src/syscall/env_plan9.go
diff --git a/src/pkg/syscall/env_unix.go b/src/syscall/env_unix.go
similarity index 100%
rename from src/pkg/syscall/env_unix.go
rename to src/syscall/env_unix.go
diff --git a/src/pkg/syscall/env_windows.go b/src/syscall/env_windows.go
similarity index 100%
rename from src/pkg/syscall/env_windows.go
rename to src/syscall/env_windows.go
diff --git a/src/pkg/syscall/exec_bsd.go b/src/syscall/exec_bsd.go
similarity index 100%
rename from src/pkg/syscall/exec_bsd.go
rename to src/syscall/exec_bsd.go
diff --git a/src/pkg/syscall/exec_linux.go b/src/syscall/exec_linux.go
similarity index 100%
rename from src/pkg/syscall/exec_linux.go
rename to src/syscall/exec_linux.go
diff --git a/src/pkg/syscall/exec_plan9.go b/src/syscall/exec_plan9.go
similarity index 100%
rename from src/pkg/syscall/exec_plan9.go
rename to src/syscall/exec_plan9.go
diff --git a/src/pkg/syscall/exec_solaris.go b/src/syscall/exec_solaris.go
similarity index 100%
rename from src/pkg/syscall/exec_solaris.go
rename to src/syscall/exec_solaris.go
diff --git a/src/pkg/syscall/exec_unix.go b/src/syscall/exec_unix.go
similarity index 100%
rename from src/pkg/syscall/exec_unix.go
rename to src/syscall/exec_unix.go
diff --git a/src/pkg/syscall/exec_windows.go b/src/syscall/exec_windows.go
similarity index 100%
rename from src/pkg/syscall/exec_windows.go
rename to src/syscall/exec_windows.go
diff --git a/src/pkg/syscall/fd_nacl.go b/src/syscall/fd_nacl.go
similarity index 100%
rename from src/pkg/syscall/fd_nacl.go
rename to src/syscall/fd_nacl.go
diff --git a/src/pkg/syscall/flock.go b/src/syscall/flock.go
similarity index 100%
rename from src/pkg/syscall/flock.go
rename to src/syscall/flock.go
diff --git a/src/pkg/syscall/flock_linux_32bit.go b/src/syscall/flock_linux_32bit.go
similarity index 100%
rename from src/pkg/syscall/flock_linux_32bit.go
rename to src/syscall/flock_linux_32bit.go
diff --git a/src/pkg/syscall/fs_nacl.go b/src/syscall/fs_nacl.go
similarity index 100%
rename from src/pkg/syscall/fs_nacl.go
rename to src/syscall/fs_nacl.go
diff --git a/src/pkg/syscall/lsf_linux.go b/src/syscall/lsf_linux.go
similarity index 100%
rename from src/pkg/syscall/lsf_linux.go
rename to src/syscall/lsf_linux.go
diff --git a/src/pkg/syscall/mkall.sh b/src/syscall/mkall.sh
similarity index 100%
rename from src/pkg/syscall/mkall.sh
rename to src/syscall/mkall.sh
diff --git a/src/pkg/syscall/mkall_windows.bat b/src/syscall/mkall_windows.bat
similarity index 100%
rename from src/pkg/syscall/mkall_windows.bat
rename to src/syscall/mkall_windows.bat
diff --git a/src/pkg/syscall/mkerrors.sh b/src/syscall/mkerrors.sh
similarity index 100%
rename from src/pkg/syscall/mkerrors.sh
rename to src/syscall/mkerrors.sh
diff --git a/src/pkg/syscall/mksyscall.pl b/src/syscall/mksyscall.pl
similarity index 100%
rename from src/pkg/syscall/mksyscall.pl
rename to src/syscall/mksyscall.pl
diff --git a/src/pkg/syscall/mksyscall_solaris.pl b/src/syscall/mksyscall_solaris.pl
similarity index 100%
rename from src/pkg/syscall/mksyscall_solaris.pl
rename to src/syscall/mksyscall_solaris.pl
diff --git a/src/pkg/syscall/mksyscall_windows.go b/src/syscall/mksyscall_windows.go
similarity index 100%
rename from src/pkg/syscall/mksyscall_windows.go
rename to src/syscall/mksyscall_windows.go
diff --git a/src/pkg/syscall/mksysctl_openbsd.pl b/src/syscall/mksysctl_openbsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysctl_openbsd.pl
rename to src/syscall/mksysctl_openbsd.pl
diff --git a/src/pkg/syscall/mksysnum_darwin.pl b/src/syscall/mksysnum_darwin.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_darwin.pl
rename to src/syscall/mksysnum_darwin.pl
diff --git a/src/pkg/syscall/mksysnum_dragonfly.pl b/src/syscall/mksysnum_dragonfly.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_dragonfly.pl
rename to src/syscall/mksysnum_dragonfly.pl
diff --git a/src/pkg/syscall/mksysnum_freebsd.pl b/src/syscall/mksysnum_freebsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_freebsd.pl
rename to src/syscall/mksysnum_freebsd.pl
diff --git a/src/pkg/syscall/mksysnum_linux.pl b/src/syscall/mksysnum_linux.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_linux.pl
rename to src/syscall/mksysnum_linux.pl
diff --git a/src/pkg/syscall/mksysnum_netbsd.pl b/src/syscall/mksysnum_netbsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_netbsd.pl
rename to src/syscall/mksysnum_netbsd.pl
diff --git a/src/pkg/syscall/mksysnum_openbsd.pl b/src/syscall/mksysnum_openbsd.pl
similarity index 100%
rename from src/pkg/syscall/mksysnum_openbsd.pl
rename to src/syscall/mksysnum_openbsd.pl
diff --git a/src/pkg/syscall/mksysnum_plan9.sh b/src/syscall/mksysnum_plan9.sh
similarity index 100%
rename from src/pkg/syscall/mksysnum_plan9.sh
rename to src/syscall/mksysnum_plan9.sh
diff --git a/src/pkg/syscall/mmap_unix_test.go b/src/syscall/mmap_unix_test.go
similarity index 100%
rename from src/pkg/syscall/mmap_unix_test.go
rename to src/syscall/mmap_unix_test.go
diff --git a/src/pkg/syscall/net_nacl.go b/src/syscall/net_nacl.go
similarity index 100%
rename from src/pkg/syscall/net_nacl.go
rename to src/syscall/net_nacl.go
diff --git a/src/pkg/syscall/netlink_linux.go b/src/syscall/netlink_linux.go
similarity index 100%
rename from src/pkg/syscall/netlink_linux.go
rename to src/syscall/netlink_linux.go
diff --git a/src/pkg/syscall/race.go b/src/syscall/race.go
similarity index 100%
rename from src/pkg/syscall/race.go
rename to src/syscall/race.go
diff --git a/src/pkg/syscall/race0.go b/src/syscall/race0.go
similarity index 100%
rename from src/pkg/syscall/race0.go
rename to src/syscall/race0.go
diff --git a/src/pkg/syscall/route_bsd.go b/src/syscall/route_bsd.go
similarity index 100%
rename from src/pkg/syscall/route_bsd.go
rename to src/syscall/route_bsd.go
diff --git a/src/pkg/syscall/route_darwin.go b/src/syscall/route_darwin.go
similarity index 100%
rename from src/pkg/syscall/route_darwin.go
rename to src/syscall/route_darwin.go
diff --git a/src/pkg/syscall/route_dragonfly.go b/src/syscall/route_dragonfly.go
similarity index 100%
rename from src/pkg/syscall/route_dragonfly.go
rename to src/syscall/route_dragonfly.go
diff --git a/src/pkg/syscall/route_freebsd.go b/src/syscall/route_freebsd.go
similarity index 100%
rename from src/pkg/syscall/route_freebsd.go
rename to src/syscall/route_freebsd.go
diff --git a/src/pkg/syscall/route_freebsd_32bit.go b/src/syscall/route_freebsd_32bit.go
similarity index 100%
rename from src/pkg/syscall/route_freebsd_32bit.go
rename to src/syscall/route_freebsd_32bit.go
diff --git a/src/pkg/syscall/route_freebsd_64bit.go b/src/syscall/route_freebsd_64bit.go
similarity index 100%
rename from src/pkg/syscall/route_freebsd_64bit.go
rename to src/syscall/route_freebsd_64bit.go
diff --git a/src/pkg/syscall/route_netbsd.go b/src/syscall/route_netbsd.go
similarity index 100%
rename from src/pkg/syscall/route_netbsd.go
rename to src/syscall/route_netbsd.go
diff --git a/src/pkg/syscall/route_openbsd.go b/src/syscall/route_openbsd.go
similarity index 100%
rename from src/pkg/syscall/route_openbsd.go
rename to src/syscall/route_openbsd.go
diff --git a/src/pkg/syscall/security_windows.go b/src/syscall/security_windows.go
similarity index 100%
rename from src/pkg/syscall/security_windows.go
rename to src/syscall/security_windows.go
diff --git a/src/pkg/syscall/so_solaris.go b/src/syscall/so_solaris.go
similarity index 100%
rename from src/pkg/syscall/so_solaris.go
rename to src/syscall/so_solaris.go
diff --git a/src/pkg/syscall/sockcmsg_linux.go b/src/syscall/sockcmsg_linux.go
similarity index 100%
rename from src/pkg/syscall/sockcmsg_linux.go
rename to src/syscall/sockcmsg_linux.go
diff --git a/src/pkg/syscall/sockcmsg_unix.go b/src/syscall/sockcmsg_unix.go
similarity index 100%
rename from src/pkg/syscall/sockcmsg_unix.go
rename to src/syscall/sockcmsg_unix.go
diff --git a/src/pkg/syscall/srpc_nacl.go b/src/syscall/srpc_nacl.go
similarity index 100%
rename from src/pkg/syscall/srpc_nacl.go
rename to src/syscall/srpc_nacl.go
diff --git a/src/pkg/syscall/str.go b/src/syscall/str.go
similarity index 100%
rename from src/pkg/syscall/str.go
rename to src/syscall/str.go
diff --git a/src/pkg/syscall/syscall.go b/src/syscall/syscall.go
similarity index 100%
rename from src/pkg/syscall/syscall.go
rename to src/syscall/syscall.go
diff --git a/src/pkg/syscall/syscall_bsd.go b/src/syscall/syscall_bsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_bsd.go
rename to src/syscall/syscall_bsd.go
diff --git a/src/pkg/syscall/syscall_bsd_test.go b/src/syscall/syscall_bsd_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_bsd_test.go
rename to src/syscall/syscall_bsd_test.go
diff --git a/src/pkg/syscall/syscall_darwin.go b/src/syscall/syscall_darwin.go
similarity index 100%
rename from src/pkg/syscall/syscall_darwin.go
rename to src/syscall/syscall_darwin.go
diff --git a/src/pkg/syscall/syscall_darwin_386.go b/src/syscall/syscall_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_darwin_386.go
rename to src/syscall/syscall_darwin_386.go
diff --git a/src/pkg/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_darwin_amd64.go
rename to src/syscall/syscall_darwin_amd64.go
diff --git a/src/pkg/syscall/syscall_dragonfly.go b/src/syscall/syscall_dragonfly.go
similarity index 100%
rename from src/pkg/syscall/syscall_dragonfly.go
rename to src/syscall/syscall_dragonfly.go
diff --git a/src/pkg/syscall/syscall_dragonfly_386.go b/src/syscall/syscall_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_dragonfly_386.go
rename to src/syscall/syscall_dragonfly_386.go
diff --git a/src/pkg/syscall/syscall_dragonfly_amd64.go b/src/syscall/syscall_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_dragonfly_amd64.go
rename to src/syscall/syscall_dragonfly_amd64.go
diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/syscall/syscall_freebsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd.go
rename to src/syscall/syscall_freebsd.go
diff --git a/src/pkg/syscall/syscall_freebsd_386.go b/src/syscall/syscall_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd_386.go
rename to src/syscall/syscall_freebsd_386.go
diff --git a/src/pkg/syscall/syscall_freebsd_amd64.go b/src/syscall/syscall_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd_amd64.go
rename to src/syscall/syscall_freebsd_amd64.go
diff --git a/src/pkg/syscall/syscall_freebsd_arm.go b/src/syscall/syscall_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_freebsd_arm.go
rename to src/syscall/syscall_freebsd_arm.go
diff --git a/src/pkg/syscall/syscall_linux.go b/src/syscall/syscall_linux.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux.go
rename to src/syscall/syscall_linux.go
diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/syscall/syscall_linux_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux_386.go
rename to src/syscall/syscall_linux_386.go
diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/syscall/syscall_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux_amd64.go
rename to src/syscall/syscall_linux_amd64.go
diff --git a/src/pkg/syscall/syscall_linux_arm.go b/src/syscall/syscall_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_linux_arm.go
rename to src/syscall/syscall_linux_arm.go
diff --git a/src/pkg/syscall/syscall_nacl.go b/src/syscall/syscall_nacl.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl.go
rename to src/syscall/syscall_nacl.go
diff --git a/src/pkg/syscall/syscall_nacl_386.go b/src/syscall/syscall_nacl_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl_386.go
rename to src/syscall/syscall_nacl_386.go
diff --git a/src/pkg/syscall/syscall_nacl_amd64p32.go b/src/syscall/syscall_nacl_amd64p32.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl_amd64p32.go
rename to src/syscall/syscall_nacl_amd64p32.go
diff --git a/src/pkg/syscall/syscall_nacl_arm.go b/src/syscall/syscall_nacl_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_nacl_arm.go
rename to src/syscall/syscall_nacl_arm.go
diff --git a/src/pkg/syscall/syscall_netbsd.go b/src/syscall/syscall_netbsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd.go
rename to src/syscall/syscall_netbsd.go
diff --git a/src/pkg/syscall/syscall_netbsd_386.go b/src/syscall/syscall_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd_386.go
rename to src/syscall/syscall_netbsd_386.go
diff --git a/src/pkg/syscall/syscall_netbsd_amd64.go b/src/syscall/syscall_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd_amd64.go
rename to src/syscall/syscall_netbsd_amd64.go
diff --git a/src/pkg/syscall/syscall_netbsd_arm.go b/src/syscall/syscall_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/syscall_netbsd_arm.go
rename to src/syscall/syscall_netbsd_arm.go
diff --git a/src/pkg/syscall/syscall_no_getwd.go b/src/syscall/syscall_no_getwd.go
similarity index 100%
rename from src/pkg/syscall/syscall_no_getwd.go
rename to src/syscall/syscall_no_getwd.go
diff --git a/src/pkg/syscall/syscall_openbsd.go b/src/syscall/syscall_openbsd.go
similarity index 100%
rename from src/pkg/syscall/syscall_openbsd.go
rename to src/syscall/syscall_openbsd.go
diff --git a/src/pkg/syscall/syscall_openbsd_386.go b/src/syscall/syscall_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_openbsd_386.go
rename to src/syscall/syscall_openbsd_386.go
diff --git a/src/pkg/syscall/syscall_openbsd_amd64.go b/src/syscall/syscall_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_openbsd_amd64.go
rename to src/syscall/syscall_openbsd_amd64.go
diff --git a/src/pkg/syscall/syscall_plan9.go b/src/syscall/syscall_plan9.go
similarity index 100%
rename from src/pkg/syscall/syscall_plan9.go
rename to src/syscall/syscall_plan9.go
diff --git a/src/pkg/syscall/syscall_solaris.go b/src/syscall/syscall_solaris.go
similarity index 100%
rename from src/pkg/syscall/syscall_solaris.go
rename to src/syscall/syscall_solaris.go
diff --git a/src/pkg/syscall/syscall_solaris_amd64.go b/src/syscall/syscall_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_solaris_amd64.go
rename to src/syscall/syscall_solaris_amd64.go
diff --git a/src/pkg/syscall/syscall_test.go b/src/syscall/syscall_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_test.go
rename to src/syscall/syscall_test.go
diff --git a/src/pkg/syscall/syscall_unix.go b/src/syscall/syscall_unix.go
similarity index 100%
rename from src/pkg/syscall/syscall_unix.go
rename to src/syscall/syscall_unix.go
diff --git a/src/pkg/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_unix_test.go
rename to src/syscall/syscall_unix_test.go
diff --git a/src/pkg/syscall/syscall_windows.go b/src/syscall/syscall_windows.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows.go
rename to src/syscall/syscall_windows.go
diff --git a/src/pkg/syscall/syscall_windows_386.go b/src/syscall/syscall_windows_386.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows_386.go
rename to src/syscall/syscall_windows_386.go
diff --git a/src/pkg/syscall/syscall_windows_amd64.go b/src/syscall/syscall_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows_amd64.go
rename to src/syscall/syscall_windows_amd64.go
diff --git a/src/pkg/syscall/syscall_windows_test.go b/src/syscall/syscall_windows_test.go
similarity index 100%
rename from src/pkg/syscall/syscall_windows_test.go
rename to src/syscall/syscall_windows_test.go
diff --git a/src/pkg/syscall/tables_nacl.go b/src/syscall/tables_nacl.go
similarity index 100%
rename from src/pkg/syscall/tables_nacl.go
rename to src/syscall/tables_nacl.go
diff --git a/src/pkg/syscall/time_nacl_386.s b/src/syscall/time_nacl_386.s
similarity index 100%
rename from src/pkg/syscall/time_nacl_386.s
rename to src/syscall/time_nacl_386.s
diff --git a/src/pkg/syscall/time_nacl_amd64p32.s b/src/syscall/time_nacl_amd64p32.s
similarity index 100%
rename from src/pkg/syscall/time_nacl_amd64p32.s
rename to src/syscall/time_nacl_amd64p32.s
diff --git a/src/pkg/syscall/time_nacl_arm.s b/src/syscall/time_nacl_arm.s
similarity index 100%
rename from src/pkg/syscall/time_nacl_arm.s
rename to src/syscall/time_nacl_arm.s
diff --git a/src/pkg/syscall/types_darwin.go b/src/syscall/types_darwin.go
similarity index 100%
rename from src/pkg/syscall/types_darwin.go
rename to src/syscall/types_darwin.go
diff --git a/src/pkg/syscall/types_dragonfly.go b/src/syscall/types_dragonfly.go
similarity index 100%
rename from src/pkg/syscall/types_dragonfly.go
rename to src/syscall/types_dragonfly.go
diff --git a/src/pkg/syscall/types_freebsd.go b/src/syscall/types_freebsd.go
similarity index 100%
rename from src/pkg/syscall/types_freebsd.go
rename to src/syscall/types_freebsd.go
diff --git a/src/pkg/syscall/types_linux.go b/src/syscall/types_linux.go
similarity index 100%
rename from src/pkg/syscall/types_linux.go
rename to src/syscall/types_linux.go
diff --git a/src/pkg/syscall/types_netbsd.go b/src/syscall/types_netbsd.go
similarity index 100%
rename from src/pkg/syscall/types_netbsd.go
rename to src/syscall/types_netbsd.go
diff --git a/src/pkg/syscall/types_openbsd.go b/src/syscall/types_openbsd.go
similarity index 100%
rename from src/pkg/syscall/types_openbsd.go
rename to src/syscall/types_openbsd.go
diff --git a/src/pkg/syscall/types_plan9.c b/src/syscall/types_plan9.c
similarity index 100%
rename from src/pkg/syscall/types_plan9.c
rename to src/syscall/types_plan9.c
diff --git a/src/pkg/syscall/types_solaris.go b/src/syscall/types_solaris.go
similarity index 100%
rename from src/pkg/syscall/types_solaris.go
rename to src/syscall/types_solaris.go
diff --git a/src/pkg/syscall/unzip_nacl.go b/src/syscall/unzip_nacl.go
similarity index 100%
rename from src/pkg/syscall/unzip_nacl.go
rename to src/syscall/unzip_nacl.go
diff --git a/src/pkg/syscall/zerrors_darwin_386.go b/src/syscall/zerrors_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_darwin_386.go
rename to src/syscall/zerrors_darwin_386.go
diff --git a/src/pkg/syscall/zerrors_darwin_amd64.go b/src/syscall/zerrors_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_darwin_amd64.go
rename to src/syscall/zerrors_darwin_amd64.go
diff --git a/src/pkg/syscall/zerrors_dragonfly_386.go b/src/syscall/zerrors_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_dragonfly_386.go
rename to src/syscall/zerrors_dragonfly_386.go
diff --git a/src/pkg/syscall/zerrors_dragonfly_amd64.go b/src/syscall/zerrors_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_dragonfly_amd64.go
rename to src/syscall/zerrors_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zerrors_freebsd_386.go b/src/syscall/zerrors_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_freebsd_386.go
rename to src/syscall/zerrors_freebsd_386.go
diff --git a/src/pkg/syscall/zerrors_freebsd_amd64.go b/src/syscall/zerrors_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_freebsd_amd64.go
rename to src/syscall/zerrors_freebsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_freebsd_arm.go b/src/syscall/zerrors_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zerrors_freebsd_arm.go
rename to src/syscall/zerrors_freebsd_arm.go
diff --git a/src/pkg/syscall/zerrors_linux_386.go b/src/syscall/zerrors_linux_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_386.go
rename to src/syscall/zerrors_linux_386.go
diff --git a/src/pkg/syscall/zerrors_linux_amd64.go b/src/syscall/zerrors_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_amd64.go
rename to src/syscall/zerrors_linux_amd64.go
diff --git a/src/pkg/syscall/zerrors_linux_arm.go b/src/syscall/zerrors_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/zerrors_linux_arm.go
rename to src/syscall/zerrors_linux_arm.go
diff --git a/src/pkg/syscall/zerrors_netbsd_386.go b/src/syscall/zerrors_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_netbsd_386.go
rename to src/syscall/zerrors_netbsd_386.go
diff --git a/src/pkg/syscall/zerrors_netbsd_amd64.go b/src/syscall/zerrors_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_netbsd_amd64.go
rename to src/syscall/zerrors_netbsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_netbsd_arm.go b/src/syscall/zerrors_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zerrors_netbsd_arm.go
rename to src/syscall/zerrors_netbsd_arm.go
diff --git a/src/pkg/syscall/zerrors_openbsd_386.go b/src/syscall/zerrors_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_openbsd_386.go
rename to src/syscall/zerrors_openbsd_386.go
diff --git a/src/pkg/syscall/zerrors_openbsd_amd64.go b/src/syscall/zerrors_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_openbsd_amd64.go
rename to src/syscall/zerrors_openbsd_amd64.go
diff --git a/src/pkg/syscall/zerrors_plan9_386.go b/src/syscall/zerrors_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_plan9_386.go
rename to src/syscall/zerrors_plan9_386.go
diff --git a/src/pkg/syscall/zerrors_plan9_amd64.go b/src/syscall/zerrors_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_plan9_amd64.go
rename to src/syscall/zerrors_plan9_amd64.go
diff --git a/src/pkg/syscall/zerrors_solaris_amd64.go b/src/syscall/zerrors_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_solaris_amd64.go
rename to src/syscall/zerrors_solaris_amd64.go
diff --git a/src/pkg/syscall/zerrors_windows.go b/src/syscall/zerrors_windows.go
similarity index 100%
rename from src/pkg/syscall/zerrors_windows.go
rename to src/syscall/zerrors_windows.go
diff --git a/src/pkg/syscall/zerrors_windows_386.go b/src/syscall/zerrors_windows_386.go
similarity index 100%
rename from src/pkg/syscall/zerrors_windows_386.go
rename to src/syscall/zerrors_windows_386.go
diff --git a/src/pkg/syscall/zerrors_windows_amd64.go b/src/syscall/zerrors_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/zerrors_windows_amd64.go
rename to src/syscall/zerrors_windows_amd64.go
diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/syscall/zsyscall_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_darwin_386.go
rename to src/syscall/zsyscall_darwin_386.go
diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/syscall/zsyscall_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_darwin_amd64.go
rename to src/syscall/zsyscall_darwin_amd64.go
diff --git a/src/pkg/syscall/zsyscall_dragonfly_386.go b/src/syscall/zsyscall_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_dragonfly_386.go
rename to src/syscall/zsyscall_dragonfly_386.go
diff --git a/src/pkg/syscall/zsyscall_dragonfly_amd64.go b/src/syscall/zsyscall_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_dragonfly_amd64.go
rename to src/syscall/zsyscall_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_386.go b/src/syscall/zsyscall_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_freebsd_386.go
rename to src/syscall/zsyscall_freebsd_386.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_amd64.go b/src/syscall/zsyscall_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_freebsd_amd64.go
rename to src/syscall/zsyscall_freebsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_freebsd_arm.go b/src/syscall/zsyscall_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_freebsd_arm.go
rename to src/syscall/zsyscall_freebsd_arm.go
diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/syscall/zsyscall_linux_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_386.go
rename to src/syscall/zsyscall_linux_386.go
diff --git a/src/pkg/syscall/zsyscall_linux_amd64.go b/src/syscall/zsyscall_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_amd64.go
rename to src/syscall/zsyscall_linux_amd64.go
diff --git a/src/pkg/syscall/zsyscall_linux_arm.go b/src/syscall/zsyscall_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_linux_arm.go
rename to src/syscall/zsyscall_linux_arm.go
diff --git a/src/pkg/syscall/zsyscall_nacl_386.go b/src/syscall/zsyscall_nacl_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_nacl_386.go
rename to src/syscall/zsyscall_nacl_386.go
diff --git a/src/pkg/syscall/zsyscall_nacl_amd64p32.go b/src/syscall/zsyscall_nacl_amd64p32.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_nacl_amd64p32.go
rename to src/syscall/zsyscall_nacl_amd64p32.go
diff --git a/src/pkg/syscall/zsyscall_nacl_arm.go b/src/syscall/zsyscall_nacl_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_nacl_arm.go
rename to src/syscall/zsyscall_nacl_arm.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_386.go b/src/syscall/zsyscall_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_netbsd_386.go
rename to src/syscall/zsyscall_netbsd_386.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_amd64.go b/src/syscall/zsyscall_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_netbsd_amd64.go
rename to src/syscall/zsyscall_netbsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_netbsd_arm.go b/src/syscall/zsyscall_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_netbsd_arm.go
rename to src/syscall/zsyscall_netbsd_arm.go
diff --git a/src/pkg/syscall/zsyscall_openbsd_386.go b/src/syscall/zsyscall_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_openbsd_386.go
rename to src/syscall/zsyscall_openbsd_386.go
diff --git a/src/pkg/syscall/zsyscall_openbsd_amd64.go b/src/syscall/zsyscall_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_openbsd_amd64.go
rename to src/syscall/zsyscall_openbsd_amd64.go
diff --git a/src/pkg/syscall/zsyscall_plan9_386.go b/src/syscall/zsyscall_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_plan9_386.go
rename to src/syscall/zsyscall_plan9_386.go
diff --git a/src/pkg/syscall/zsyscall_plan9_amd64.go b/src/syscall/zsyscall_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_plan9_amd64.go
rename to src/syscall/zsyscall_plan9_amd64.go
diff --git a/src/pkg/syscall/zsyscall_solaris_amd64.go b/src/syscall/zsyscall_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_solaris_amd64.go
rename to src/syscall/zsyscall_solaris_amd64.go
diff --git a/src/pkg/syscall/zsyscall_windows.go b/src/syscall/zsyscall_windows.go
similarity index 100%
rename from src/pkg/syscall/zsyscall_windows.go
rename to src/syscall/zsyscall_windows.go
diff --git a/src/pkg/syscall/zsysctl_openbsd.go b/src/syscall/zsysctl_openbsd.go
similarity index 100%
rename from src/pkg/syscall/zsysctl_openbsd.go
rename to src/syscall/zsysctl_openbsd.go
diff --git a/src/pkg/syscall/zsysnum_darwin_386.go b/src/syscall/zsysnum_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_darwin_386.go
rename to src/syscall/zsysnum_darwin_386.go
diff --git a/src/pkg/syscall/zsysnum_darwin_amd64.go b/src/syscall/zsysnum_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_darwin_amd64.go
rename to src/syscall/zsysnum_darwin_amd64.go
diff --git a/src/pkg/syscall/zsysnum_dragonfly_386.go b/src/syscall/zsysnum_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_dragonfly_386.go
rename to src/syscall/zsysnum_dragonfly_386.go
diff --git a/src/pkg/syscall/zsysnum_dragonfly_amd64.go b/src/syscall/zsysnum_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_dragonfly_amd64.go
rename to src/syscall/zsysnum_dragonfly_amd64.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_386.go b/src/syscall/zsysnum_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_freebsd_386.go
rename to src/syscall/zsysnum_freebsd_386.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_amd64.go b/src/syscall/zsysnum_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_freebsd_amd64.go
rename to src/syscall/zsysnum_freebsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_freebsd_arm.go b/src/syscall/zsysnum_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_freebsd_arm.go
rename to src/syscall/zsysnum_freebsd_arm.go
diff --git a/src/pkg/syscall/zsysnum_linux_386.go b/src/syscall/zsysnum_linux_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_386.go
rename to src/syscall/zsysnum_linux_386.go
diff --git a/src/pkg/syscall/zsysnum_linux_amd64.go b/src/syscall/zsysnum_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_amd64.go
rename to src/syscall/zsysnum_linux_amd64.go
diff --git a/src/pkg/syscall/zsysnum_linux_arm.go b/src/syscall/zsysnum_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_linux_arm.go
rename to src/syscall/zsysnum_linux_arm.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_386.go b/src/syscall/zsysnum_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_netbsd_386.go
rename to src/syscall/zsysnum_netbsd_386.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_amd64.go b/src/syscall/zsysnum_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_netbsd_amd64.go
rename to src/syscall/zsysnum_netbsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_netbsd_arm.go b/src/syscall/zsysnum_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_netbsd_arm.go
rename to src/syscall/zsysnum_netbsd_arm.go
diff --git a/src/pkg/syscall/zsysnum_openbsd_386.go b/src/syscall/zsysnum_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_openbsd_386.go
rename to src/syscall/zsysnum_openbsd_386.go
diff --git a/src/pkg/syscall/zsysnum_openbsd_amd64.go b/src/syscall/zsysnum_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_openbsd_amd64.go
rename to src/syscall/zsysnum_openbsd_amd64.go
diff --git a/src/pkg/syscall/zsysnum_plan9_386.go b/src/syscall/zsysnum_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_plan9_386.go
rename to src/syscall/zsysnum_plan9_386.go
diff --git a/src/pkg/syscall/zsysnum_plan9_amd64.go b/src/syscall/zsysnum_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_plan9_amd64.go
rename to src/syscall/zsysnum_plan9_amd64.go
diff --git a/src/pkg/syscall/zsysnum_solaris_amd64.go b/src/syscall/zsysnum_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_solaris_amd64.go
rename to src/syscall/zsysnum_solaris_amd64.go
diff --git a/src/pkg/syscall/zsysnum_windows_386.go b/src/syscall/zsysnum_windows_386.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_windows_386.go
rename to src/syscall/zsysnum_windows_386.go
diff --git a/src/pkg/syscall/zsysnum_windows_amd64.go b/src/syscall/zsysnum_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/zsysnum_windows_amd64.go
rename to src/syscall/zsysnum_windows_amd64.go
diff --git a/src/pkg/syscall/ztypes_darwin_386.go b/src/syscall/ztypes_darwin_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_darwin_386.go
rename to src/syscall/ztypes_darwin_386.go
diff --git a/src/pkg/syscall/ztypes_darwin_amd64.go b/src/syscall/ztypes_darwin_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_darwin_amd64.go
rename to src/syscall/ztypes_darwin_amd64.go
diff --git a/src/pkg/syscall/ztypes_dragonfly_386.go b/src/syscall/ztypes_dragonfly_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_dragonfly_386.go
rename to src/syscall/ztypes_dragonfly_386.go
diff --git a/src/pkg/syscall/ztypes_dragonfly_amd64.go b/src/syscall/ztypes_dragonfly_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_dragonfly_amd64.go
rename to src/syscall/ztypes_dragonfly_amd64.go
diff --git a/src/pkg/syscall/ztypes_freebsd_386.go b/src/syscall/ztypes_freebsd_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_freebsd_386.go
rename to src/syscall/ztypes_freebsd_386.go
diff --git a/src/pkg/syscall/ztypes_freebsd_amd64.go b/src/syscall/ztypes_freebsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_freebsd_amd64.go
rename to src/syscall/ztypes_freebsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_freebsd_arm.go b/src/syscall/ztypes_freebsd_arm.go
similarity index 100%
rename from src/pkg/syscall/ztypes_freebsd_arm.go
rename to src/syscall/ztypes_freebsd_arm.go
diff --git a/src/pkg/syscall/ztypes_linux_386.go b/src/syscall/ztypes_linux_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_386.go
rename to src/syscall/ztypes_linux_386.go
diff --git a/src/pkg/syscall/ztypes_linux_amd64.go b/src/syscall/ztypes_linux_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_amd64.go
rename to src/syscall/ztypes_linux_amd64.go
diff --git a/src/pkg/syscall/ztypes_linux_arm.go b/src/syscall/ztypes_linux_arm.go
similarity index 100%
rename from src/pkg/syscall/ztypes_linux_arm.go
rename to src/syscall/ztypes_linux_arm.go
diff --git a/src/pkg/syscall/ztypes_netbsd_386.go b/src/syscall/ztypes_netbsd_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_netbsd_386.go
rename to src/syscall/ztypes_netbsd_386.go
diff --git a/src/pkg/syscall/ztypes_netbsd_amd64.go b/src/syscall/ztypes_netbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_netbsd_amd64.go
rename to src/syscall/ztypes_netbsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_netbsd_arm.go b/src/syscall/ztypes_netbsd_arm.go
similarity index 100%
rename from src/pkg/syscall/ztypes_netbsd_arm.go
rename to src/syscall/ztypes_netbsd_arm.go
diff --git a/src/pkg/syscall/ztypes_openbsd_386.go b/src/syscall/ztypes_openbsd_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_openbsd_386.go
rename to src/syscall/ztypes_openbsd_386.go
diff --git a/src/pkg/syscall/ztypes_openbsd_amd64.go b/src/syscall/ztypes_openbsd_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_openbsd_amd64.go
rename to src/syscall/ztypes_openbsd_amd64.go
diff --git a/src/pkg/syscall/ztypes_plan9_386.go b/src/syscall/ztypes_plan9_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_plan9_386.go
rename to src/syscall/ztypes_plan9_386.go
diff --git a/src/pkg/syscall/ztypes_plan9_amd64.go b/src/syscall/ztypes_plan9_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_plan9_amd64.go
rename to src/syscall/ztypes_plan9_amd64.go
diff --git a/src/pkg/syscall/ztypes_solaris_amd64.go b/src/syscall/ztypes_solaris_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_solaris_amd64.go
rename to src/syscall/ztypes_solaris_amd64.go
diff --git a/src/pkg/syscall/ztypes_windows.go b/src/syscall/ztypes_windows.go
similarity index 100%
rename from src/pkg/syscall/ztypes_windows.go
rename to src/syscall/ztypes_windows.go
diff --git a/src/pkg/syscall/ztypes_windows_386.go b/src/syscall/ztypes_windows_386.go
similarity index 100%
rename from src/pkg/syscall/ztypes_windows_386.go
rename to src/syscall/ztypes_windows_386.go
diff --git a/src/pkg/syscall/ztypes_windows_amd64.go b/src/syscall/ztypes_windows_amd64.go
similarity index 100%
rename from src/pkg/syscall/ztypes_windows_amd64.go
rename to src/syscall/ztypes_windows_amd64.go
diff --git a/src/pkg/testing/allocs.go b/src/testing/allocs.go
similarity index 100%
rename from src/pkg/testing/allocs.go
rename to src/testing/allocs.go
diff --git a/src/pkg/testing/benchmark.go b/src/testing/benchmark.go
similarity index 100%
rename from src/pkg/testing/benchmark.go
rename to src/testing/benchmark.go
diff --git a/src/pkg/testing/benchmark_test.go b/src/testing/benchmark_test.go
similarity index 100%
rename from src/pkg/testing/benchmark_test.go
rename to src/testing/benchmark_test.go
diff --git a/src/pkg/testing/cover.go b/src/testing/cover.go
similarity index 100%
rename from src/pkg/testing/cover.go
rename to src/testing/cover.go
diff --git a/src/pkg/testing/example.go b/src/testing/example.go
similarity index 100%
rename from src/pkg/testing/example.go
rename to src/testing/example.go
diff --git a/src/pkg/testing/export_test.go b/src/testing/export_test.go
similarity index 100%
rename from src/pkg/testing/export_test.go
rename to src/testing/export_test.go
diff --git a/src/pkg/testing/iotest/logger.go b/src/testing/iotest/logger.go
similarity index 100%
rename from src/pkg/testing/iotest/logger.go
rename to src/testing/iotest/logger.go
diff --git a/src/pkg/testing/iotest/reader.go b/src/testing/iotest/reader.go
similarity index 100%
rename from src/pkg/testing/iotest/reader.go
rename to src/testing/iotest/reader.go
diff --git a/src/pkg/testing/iotest/writer.go b/src/testing/iotest/writer.go
similarity index 100%
rename from src/pkg/testing/iotest/writer.go
rename to src/testing/iotest/writer.go
diff --git a/src/pkg/testing/quick/quick.go b/src/testing/quick/quick.go
similarity index 100%
rename from src/pkg/testing/quick/quick.go
rename to src/testing/quick/quick.go
diff --git a/src/pkg/testing/quick/quick_test.go b/src/testing/quick/quick_test.go
similarity index 100%
rename from src/pkg/testing/quick/quick_test.go
rename to src/testing/quick/quick_test.go
diff --git a/src/pkg/testing/testing.go b/src/testing/testing.go
similarity index 100%
rename from src/pkg/testing/testing.go
rename to src/testing/testing.go
diff --git a/src/pkg/text/scanner/scanner.go b/src/text/scanner/scanner.go
similarity index 100%
rename from src/pkg/text/scanner/scanner.go
rename to src/text/scanner/scanner.go
diff --git a/src/pkg/text/scanner/scanner_test.go b/src/text/scanner/scanner_test.go
similarity index 100%
rename from src/pkg/text/scanner/scanner_test.go
rename to src/text/scanner/scanner_test.go
diff --git a/src/pkg/text/tabwriter/example_test.go b/src/text/tabwriter/example_test.go
similarity index 100%
rename from src/pkg/text/tabwriter/example_test.go
rename to src/text/tabwriter/example_test.go
diff --git a/src/pkg/text/tabwriter/tabwriter.go b/src/text/tabwriter/tabwriter.go
similarity index 100%
rename from src/pkg/text/tabwriter/tabwriter.go
rename to src/text/tabwriter/tabwriter.go
diff --git a/src/pkg/text/tabwriter/tabwriter_test.go b/src/text/tabwriter/tabwriter_test.go
similarity index 100%
rename from src/pkg/text/tabwriter/tabwriter_test.go
rename to src/text/tabwriter/tabwriter_test.go
diff --git a/src/pkg/text/template/doc.go b/src/text/template/doc.go
similarity index 100%
rename from src/pkg/text/template/doc.go
rename to src/text/template/doc.go
diff --git a/src/pkg/text/template/example_test.go b/src/text/template/example_test.go
similarity index 100%
rename from src/pkg/text/template/example_test.go
rename to src/text/template/example_test.go
diff --git a/src/pkg/text/template/examplefiles_test.go b/src/text/template/examplefiles_test.go
similarity index 100%
rename from src/pkg/text/template/examplefiles_test.go
rename to src/text/template/examplefiles_test.go
diff --git a/src/pkg/text/template/examplefunc_test.go b/src/text/template/examplefunc_test.go
similarity index 100%
rename from src/pkg/text/template/examplefunc_test.go
rename to src/text/template/examplefunc_test.go
diff --git a/src/pkg/text/template/exec.go b/src/text/template/exec.go
similarity index 100%
rename from src/pkg/text/template/exec.go
rename to src/text/template/exec.go
diff --git a/src/pkg/text/template/exec_test.go b/src/text/template/exec_test.go
similarity index 100%
rename from src/pkg/text/template/exec_test.go
rename to src/text/template/exec_test.go
diff --git a/src/pkg/text/template/funcs.go b/src/text/template/funcs.go
similarity index 100%
rename from src/pkg/text/template/funcs.go
rename to src/text/template/funcs.go
diff --git a/src/pkg/text/template/helper.go b/src/text/template/helper.go
similarity index 100%
rename from src/pkg/text/template/helper.go
rename to src/text/template/helper.go
diff --git a/src/pkg/text/template/multi_test.go b/src/text/template/multi_test.go
similarity index 100%
rename from src/pkg/text/template/multi_test.go
rename to src/text/template/multi_test.go
diff --git a/src/pkg/text/template/parse/lex.go b/src/text/template/parse/lex.go
similarity index 100%
rename from src/pkg/text/template/parse/lex.go
rename to src/text/template/parse/lex.go
diff --git a/src/pkg/text/template/parse/lex_test.go b/src/text/template/parse/lex_test.go
similarity index 100%
rename from src/pkg/text/template/parse/lex_test.go
rename to src/text/template/parse/lex_test.go
diff --git a/src/pkg/text/template/parse/node.go b/src/text/template/parse/node.go
similarity index 100%
rename from src/pkg/text/template/parse/node.go
rename to src/text/template/parse/node.go
diff --git a/src/pkg/text/template/parse/parse.go b/src/text/template/parse/parse.go
similarity index 100%
rename from src/pkg/text/template/parse/parse.go
rename to src/text/template/parse/parse.go
diff --git a/src/pkg/text/template/parse/parse_test.go b/src/text/template/parse/parse_test.go
similarity index 100%
rename from src/pkg/text/template/parse/parse_test.go
rename to src/text/template/parse/parse_test.go
diff --git a/src/pkg/text/template/template.go b/src/text/template/template.go
similarity index 100%
rename from src/pkg/text/template/template.go
rename to src/text/template/template.go
diff --git a/src/pkg/text/template/testdata/file1.tmpl b/src/text/template/testdata/file1.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/file1.tmpl
rename to src/text/template/testdata/file1.tmpl
diff --git a/src/pkg/text/template/testdata/file2.tmpl b/src/text/template/testdata/file2.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/file2.tmpl
rename to src/text/template/testdata/file2.tmpl
diff --git a/src/pkg/text/template/testdata/tmpl1.tmpl b/src/text/template/testdata/tmpl1.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/tmpl1.tmpl
rename to src/text/template/testdata/tmpl1.tmpl
diff --git a/src/pkg/text/template/testdata/tmpl2.tmpl b/src/text/template/testdata/tmpl2.tmpl
similarity index 100%
rename from src/pkg/text/template/testdata/tmpl2.tmpl
rename to src/text/template/testdata/tmpl2.tmpl
diff --git a/src/pkg/time/example_test.go b/src/time/example_test.go
similarity index 100%
rename from src/pkg/time/example_test.go
rename to src/time/example_test.go
diff --git a/src/pkg/time/export_test.go b/src/time/export_test.go
similarity index 100%
rename from src/pkg/time/export_test.go
rename to src/time/export_test.go
diff --git a/src/pkg/time/export_windows_test.go b/src/time/export_windows_test.go
similarity index 100%
rename from src/pkg/time/export_windows_test.go
rename to src/time/export_windows_test.go
diff --git a/src/pkg/time/format.go b/src/time/format.go
similarity index 100%
rename from src/pkg/time/format.go
rename to src/time/format.go
diff --git a/src/pkg/time/format_test.go b/src/time/format_test.go
similarity index 100%
rename from src/pkg/time/format_test.go
rename to src/time/format_test.go
diff --git a/src/pkg/time/genzabbrs.go b/src/time/genzabbrs.go
similarity index 100%
rename from src/pkg/time/genzabbrs.go
rename to src/time/genzabbrs.go
diff --git a/src/pkg/time/internal_test.go b/src/time/internal_test.go
similarity index 100%
rename from src/pkg/time/internal_test.go
rename to src/time/internal_test.go
diff --git a/src/pkg/time/sleep.go b/src/time/sleep.go
similarity index 100%
rename from src/pkg/time/sleep.go
rename to src/time/sleep.go
diff --git a/src/pkg/time/sleep_test.go b/src/time/sleep_test.go
similarity index 100%
rename from src/pkg/time/sleep_test.go
rename to src/time/sleep_test.go
diff --git a/src/pkg/time/sys_plan9.go b/src/time/sys_plan9.go
similarity index 100%
rename from src/pkg/time/sys_plan9.go
rename to src/time/sys_plan9.go
diff --git a/src/pkg/time/sys_unix.go b/src/time/sys_unix.go
similarity index 100%
rename from src/pkg/time/sys_unix.go
rename to src/time/sys_unix.go
diff --git a/src/pkg/time/sys_windows.go b/src/time/sys_windows.go
similarity index 100%
rename from src/pkg/time/sys_windows.go
rename to src/time/sys_windows.go
diff --git a/src/pkg/time/tick.go b/src/time/tick.go
similarity index 100%
rename from src/pkg/time/tick.go
rename to src/time/tick.go
diff --git a/src/pkg/time/tick_test.go b/src/time/tick_test.go
similarity index 100%
rename from src/pkg/time/tick_test.go
rename to src/time/tick_test.go
diff --git a/src/pkg/time/time.go b/src/time/time.go
similarity index 100%
rename from src/pkg/time/time.go
rename to src/time/time.go
diff --git a/src/pkg/time/time_test.go b/src/time/time_test.go
similarity index 100%
rename from src/pkg/time/time_test.go
rename to src/time/time_test.go
diff --git a/src/pkg/time/zoneinfo.go b/src/time/zoneinfo.go
similarity index 100%
rename from src/pkg/time/zoneinfo.go
rename to src/time/zoneinfo.go
diff --git a/src/pkg/time/zoneinfo_abbrs_windows.go b/src/time/zoneinfo_abbrs_windows.go
similarity index 100%
rename from src/pkg/time/zoneinfo_abbrs_windows.go
rename to src/time/zoneinfo_abbrs_windows.go
diff --git a/src/pkg/time/zoneinfo_plan9.go b/src/time/zoneinfo_plan9.go
similarity index 100%
rename from src/pkg/time/zoneinfo_plan9.go
rename to src/time/zoneinfo_plan9.go
diff --git a/src/pkg/time/zoneinfo_read.go b/src/time/zoneinfo_read.go
similarity index 100%
rename from src/pkg/time/zoneinfo_read.go
rename to src/time/zoneinfo_read.go
diff --git a/src/pkg/time/zoneinfo_test.go b/src/time/zoneinfo_test.go
similarity index 100%
rename from src/pkg/time/zoneinfo_test.go
rename to src/time/zoneinfo_test.go
diff --git a/src/pkg/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
similarity index 100%
rename from src/pkg/time/zoneinfo_unix.go
rename to src/time/zoneinfo_unix.go
diff --git a/src/pkg/time/zoneinfo_windows.go b/src/time/zoneinfo_windows.go
similarity index 100%
rename from src/pkg/time/zoneinfo_windows.go
rename to src/time/zoneinfo_windows.go
diff --git a/src/pkg/time/zoneinfo_windows_test.go b/src/time/zoneinfo_windows_test.go
similarity index 100%
rename from src/pkg/time/zoneinfo_windows_test.go
rename to src/time/zoneinfo_windows_test.go
diff --git a/src/pkg/unicode/casetables.go b/src/unicode/casetables.go
similarity index 100%
rename from src/pkg/unicode/casetables.go
rename to src/unicode/casetables.go
diff --git a/src/pkg/unicode/digit.go b/src/unicode/digit.go
similarity index 100%
rename from src/pkg/unicode/digit.go
rename to src/unicode/digit.go
diff --git a/src/pkg/unicode/digit_test.go b/src/unicode/digit_test.go
similarity index 100%
rename from src/pkg/unicode/digit_test.go
rename to src/unicode/digit_test.go
diff --git a/src/pkg/unicode/graphic.go b/src/unicode/graphic.go
similarity index 100%
rename from src/pkg/unicode/graphic.go
rename to src/unicode/graphic.go
diff --git a/src/pkg/unicode/graphic_test.go b/src/unicode/graphic_test.go
similarity index 100%
rename from src/pkg/unicode/graphic_test.go
rename to src/unicode/graphic_test.go
diff --git a/src/pkg/unicode/letter.go b/src/unicode/letter.go
similarity index 100%
rename from src/pkg/unicode/letter.go
rename to src/unicode/letter.go
diff --git a/src/pkg/unicode/letter_test.go b/src/unicode/letter_test.go
similarity index 100%
rename from src/pkg/unicode/letter_test.go
rename to src/unicode/letter_test.go
diff --git a/src/pkg/unicode/maketables.go b/src/unicode/maketables.go
similarity index 100%
rename from src/pkg/unicode/maketables.go
rename to src/unicode/maketables.go
diff --git a/src/pkg/unicode/script_test.go b/src/unicode/script_test.go
similarity index 100%
rename from src/pkg/unicode/script_test.go
rename to src/unicode/script_test.go
diff --git a/src/pkg/unicode/tables.go b/src/unicode/tables.go
similarity index 100%
rename from src/pkg/unicode/tables.go
rename to src/unicode/tables.go
diff --git a/src/pkg/unicode/utf16/export_test.go b/src/unicode/utf16/export_test.go
similarity index 100%
rename from src/pkg/unicode/utf16/export_test.go
rename to src/unicode/utf16/export_test.go
diff --git a/src/pkg/unicode/utf16/utf16.go b/src/unicode/utf16/utf16.go
similarity index 100%
rename from src/pkg/unicode/utf16/utf16.go
rename to src/unicode/utf16/utf16.go
diff --git a/src/pkg/unicode/utf16/utf16_test.go b/src/unicode/utf16/utf16_test.go
similarity index 100%
rename from src/pkg/unicode/utf16/utf16_test.go
rename to src/unicode/utf16/utf16_test.go
diff --git a/src/pkg/unicode/utf8/example_test.go b/src/unicode/utf8/example_test.go
similarity index 100%
rename from src/pkg/unicode/utf8/example_test.go
rename to src/unicode/utf8/example_test.go
diff --git a/src/pkg/unicode/utf8/utf8.go b/src/unicode/utf8/utf8.go
similarity index 100%
rename from src/pkg/unicode/utf8/utf8.go
rename to src/unicode/utf8/utf8.go
diff --git a/src/pkg/unicode/utf8/utf8_test.go b/src/unicode/utf8/utf8_test.go
similarity index 100%
rename from src/pkg/unicode/utf8/utf8_test.go
rename to src/unicode/utf8/utf8_test.go
diff --git a/src/pkg/unsafe/unsafe.go b/src/unsafe/unsafe.go
similarity index 100%
rename from src/pkg/unsafe/unsafe.go
rename to src/unsafe/unsafe.go