79 files changed, 57 insertions, 39 deletions
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 036e9cae8b..691eda4a08 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -105,11 +105,6 @@ DIRS=\
 	hash/fnv\
 	html\
 	html/template\
-	http\
-	http/cgi\
-	http/fcgi\
-	http/pprof\
-	http/httptest\
 	image\
 	image/bmp\
 	image/color\
@@ -124,7 +119,6 @@ DIRS=\
 	io/ioutil\
 	log\
 	log/syslog\
-	mail\
 	math\
 	math/big\
 	math/cmplx\
@@ -133,7 +127,17 @@ DIRS=\
 	mime/multipart\
 	net\
 	net/dict\
+	net/http\
+	net/http/cgi\
+	net/http/fcgi\
+	net/mail\
+	net/http/pprof\
+	net/http/httptest\
+	net/rpc\
+	net/rpc/jsonrpc\
+	net/smtp\
 	net/textproto\
+	net/url\
 	old/netchan\
 	old/regexp\
 	old/template\
@@ -146,14 +150,11 @@ DIRS=\
 	reflect\
 	regexp\
 	regexp/syntax\
-	rpc\
-	rpc/jsonrpc\
 	runtime\
 	runtime/cgo\
 	runtime/debug\
 	runtime/pprof\
 	scanner\
-	smtp\
 	sort\
 	strconv\
 	strings\
@@ -169,7 +170,6 @@ DIRS=\
 	testing/script\
 	time\
 	unicode\
-	url\
 	utf16\
 	utf8\
 	websocket\
@@ -205,13 +205,12 @@ NOTEST+=\
 	exp/gui/x11\
 	go/doc\
 	hash\
-	http/pprof\
-	http/httptest\
 	image/bmp\
 	image/color\
 	image/gif\
 	net/dict\
-	rand\
+	net/http/pprof\
+	net/http/httptest\
 	runtime/cgo\
 	syscall\
 	testing\
diff --git a/src/pkg/deps.bash b/src/pkg/deps.bash
index 3f2a3abc66..d17e1c7cf1 100755
--- a/src/pkg/deps.bash
+++ b/src/pkg/deps.bash
@@ -31,9 +31,18 @@ dirpat="$dirpat
 /^(csv)$/
 /^(exp\/template\/html)$/
 /^(gob)$/
+/^(http)/
+/^(http\/cgi)$/
+/^(http\/fcgi)$/
+/^(http\/httptest)$/
+/^(http\/pprof)$/
 /^(json)$/
+/^(mail)$/
 /^(rand)$/
+/^(rpc)$/
+/^(smtp)$/
 /^(syslog)$/
+/^(url)$/
 /^(xml)$/
 "
 
@@ -60,9 +69,19 @@ for dir in $dirs; do (
 		s;^csv.install$;encoding/csv.install;
 		s;^exp/template/html.install$;html/template.install;
 		s;^gob.install$;encoding/gob.install;
+		s;^http.install$;net/http.install;
+		s;^http/cgi.install$;net/http/cgi.install;
+		s;^http/fcgi.install$;net/http/fcgi.install;
+		s;^http/httptest.install$;net/http/httptest.install;
+		s;^http/pprof.install$;net/http/pprof.install;
 		s;^json.install$;encoding/json.install;
+		s;^mail.install$;net/mail.install;
+		s;^rpc.install$;net/rpc.install;
+		s;^rpc/jsonrpc.install$;net/rpc/jsonrpc.install;
+		s;^smtp.install$;net/smtp.install;
 		s;^syslog.install$;log/syslog.install;
 		s;^rand.install$;math/rand.install;
+		s;^url.install$;net/url.install;
 		s;^xml.install$;encoding/xml.install;' |
 		# TODO: end of renamings.
 		sed 's;^C\.install;runtime/cgo.install;' |
diff --git a/src/pkg/http/Makefile b/src/pkg/net/http/Makefile
index bde50cf7a2..1fde30cf36 100644
--- a/src/pkg/http/Makefile
+++ b/src/pkg/net/http/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=http
 GOFILES=\
@@ -29,4 +29,4 @@ GOFILES_windows=\
 	
 GOFILES+=$(GOFILES_$(GOOS))
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/mail/Makefile b/src/pkg/net/http/cgi/Makefile
index e4de5428ee..fce7aed41b 100644
--- a/src/pkg/mail/Makefile
+++ b/src/pkg/net/http/cgi/Makefile
@@ -2,10 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../../Make.inc
 
-TARG=mail
+TARG=http/cgi
 GOFILES=\
-	message.go\
+	child.go\
+	host.go\
 
-include ../../Make.pkg
+include ../../../../Make.pkg
diff --git a/src/pkg/http/cgi/child.go b/src/pkg/net/http/cgi/child.go
index 1618268914..1618268914 100644
--- a/src/pkg/http/cgi/child.go
+++ b/src/pkg/net/http/cgi/child.go
diff --git a/src/pkg/http/cgi/child_test.go b/src/pkg/net/http/cgi/child_test.go
index ec53ab851b..ec53ab851b 100644
--- a/src/pkg/http/cgi/child_test.go
+++ b/src/pkg/net/http/cgi/child_test.go
diff --git a/src/pkg/http/cgi/host.go b/src/pkg/net/http/cgi/host.go
index 8c999c0a36..8c999c0a36 100644
--- a/src/pkg/http/cgi/host.go
+++ b/src/pkg/net/http/cgi/host.go
diff --git a/src/pkg/http/cgi/host_test.go b/src/pkg/net/http/cgi/host_test.go
index fd0e099371..fd0e099371 100644
--- a/src/pkg/http/cgi/host_test.go
+++ b/src/pkg/net/http/cgi/host_test.go
diff --git a/src/pkg/http/cgi/matryoshka_test.go b/src/pkg/net/http/cgi/matryoshka_test.go
index 3e4a6addfa..3e4a6addfa 100644
--- a/src/pkg/http/cgi/matryoshka_test.go
+++ b/src/pkg/net/http/cgi/matryoshka_test.go
diff --git a/src/pkg/http/cgi/testdata/test.cgi b/src/pkg/net/http/cgi/testdata/test.cgi
index b46b1330f3..b46b1330f3 100755
--- a/src/pkg/http/cgi/testdata/test.cgi
+++ b/src/pkg/net/http/cgi/testdata/test.cgi
diff --git a/src/pkg/http/chunked.go b/src/pkg/net/http/chunked.go
index 157e1c46c3..157e1c46c3 100644
--- a/src/pkg/http/chunked.go
+++ b/src/pkg/net/http/chunked.go
diff --git a/src/pkg/http/client.go b/src/pkg/net/http/client.go
index 503cc897a1..503cc897a1 100644
--- a/src/pkg/http/client.go
+++ b/src/pkg/net/http/client.go
diff --git a/src/pkg/http/client_test.go b/src/pkg/net/http/client_test.go
index fdad2cdf54..fdad2cdf54 100644
--- a/src/pkg/http/client_test.go
+++ b/src/pkg/net/http/client_test.go
diff --git a/src/pkg/http/cookie.go b/src/pkg/net/http/cookie.go
index 6935014324..6935014324 100644
--- a/src/pkg/http/cookie.go
+++ b/src/pkg/net/http/cookie.go
diff --git a/src/pkg/http/cookie_test.go b/src/pkg/net/http/cookie_test.go
index 9a537f90cb..9a537f90cb 100644
--- a/src/pkg/http/cookie_test.go
+++ b/src/pkg/net/http/cookie_test.go
diff --git a/src/pkg/http/doc.go b/src/pkg/net/http/doc.go
index 9c47ac7823..9c47ac7823 100644
--- a/src/pkg/http/doc.go
+++ b/src/pkg/net/http/doc.go
diff --git a/src/pkg/http/dump.go b/src/pkg/net/http/dump.go
index b85feea3ae..b85feea3ae 100644
--- a/src/pkg/http/dump.go
+++ b/src/pkg/net/http/dump.go
diff --git a/src/pkg/http/export_test.go b/src/pkg/net/http/export_test.go
index 3fe658641f..3fe658641f 100644
--- a/src/pkg/http/export_test.go
+++ b/src/pkg/net/http/export_test.go
diff --git a/src/pkg/http/fcgi/Makefile b/src/pkg/net/http/fcgi/Makefile
index bc01cdea9e..65914361b9 100644
--- a/src/pkg/http/fcgi/Makefile
+++ b/src/pkg/net/http/fcgi/Makefile
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+include ../../../../Make.inc
 
 TARG=http/fcgi
 GOFILES=\
 	child.go\
 	fcgi.go\
 
-include ../../../Make.pkg
+include ../../../../Make.pkg
diff --git a/src/pkg/http/fcgi/child.go b/src/pkg/net/http/fcgi/child.go
index f6591e081e..f6591e081e 100644
--- a/src/pkg/http/fcgi/child.go
+++ b/src/pkg/net/http/fcgi/child.go
diff --git a/src/pkg/http/fcgi/fcgi.go b/src/pkg/net/http/fcgi/fcgi.go
index 70cf781e22..70cf781e22 100644
--- a/src/pkg/http/fcgi/fcgi.go
+++ b/src/pkg/net/http/fcgi/fcgi.go
diff --git a/src/pkg/http/fcgi/fcgi_test.go b/src/pkg/net/http/fcgi/fcgi_test.go
index e42f8efd65..e42f8efd65 100644
--- a/src/pkg/http/fcgi/fcgi_test.go
+++ b/src/pkg/net/http/fcgi/fcgi_test.go
diff --git a/src/pkg/http/filetransport.go b/src/pkg/net/http/filetransport.go
index 821787e0c4..821787e0c4 100644
--- a/src/pkg/http/filetransport.go
+++ b/src/pkg/net/http/filetransport.go
diff --git a/src/pkg/http/filetransport_test.go b/src/pkg/net/http/filetransport_test.go
index aaee73e9c3..aaee73e9c3 100644
--- a/src/pkg/http/filetransport_test.go
+++ b/src/pkg/net/http/filetransport_test.go
diff --git a/src/pkg/http/fs.go b/src/pkg/net/http/fs.go
index eb0c67dfa1..eb0c67dfa1 100644
--- a/src/pkg/http/fs.go
+++ b/src/pkg/net/http/fs.go
diff --git a/src/pkg/http/fs_test.go b/src/pkg/net/http/fs_test.go
index 76312e8bf0..76312e8bf0 100644
--- a/src/pkg/http/fs_test.go
+++ b/src/pkg/net/http/fs_test.go
diff --git a/src/pkg/http/header.go b/src/pkg/net/http/header.go
index 6be6016641..6be6016641 100644
--- a/src/pkg/http/header.go
+++ b/src/pkg/net/http/header.go
diff --git a/src/pkg/http/header_test.go b/src/pkg/net/http/header_test.go
index ccdee8a97b..ccdee8a97b 100644
--- a/src/pkg/http/header_test.go
+++ b/src/pkg/net/http/header_test.go
diff --git a/src/pkg/http/httptest/Makefile b/src/pkg/net/http/httptest/Makefile
index eb35d8aec6..217cb9bbd6 100644
--- a/src/pkg/http/httptest/Makefile
+++ b/src/pkg/net/http/httptest/Makefile
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+include ../../../../Make.inc
 
 TARG=http/httptest
 GOFILES=\
 	recorder.go\
 	server.go\
 
-include ../../../Make.pkg
+include ../../../../Make.pkg
diff --git a/src/pkg/http/httptest/recorder.go b/src/pkg/net/http/httptest/recorder.go
index f69279f7c1..f69279f7c1 100644
--- a/src/pkg/http/httptest/recorder.go
+++ b/src/pkg/net/http/httptest/recorder.go
diff --git a/src/pkg/http/httptest/server.go b/src/pkg/net/http/httptest/server.go
index ea719cfbd5..ea719cfbd5 100644
--- a/src/pkg/http/httptest/server.go
+++ b/src/pkg/net/http/httptest/server.go
diff --git a/src/pkg/http/lex.go b/src/pkg/net/http/lex.go
index 93b67e7017..93b67e7017 100644
--- a/src/pkg/http/lex.go
+++ b/src/pkg/net/http/lex.go
diff --git a/src/pkg/http/lex_test.go b/src/pkg/net/http/lex_test.go
index 5386f7534d..5386f7534d 100644
--- a/src/pkg/http/lex_test.go
+++ b/src/pkg/net/http/lex_test.go
diff --git a/src/pkg/http/persist.go b/src/pkg/net/http/persist.go
index 7d84e96f2b..7d84e96f2b 100644
--- a/src/pkg/http/persist.go
+++ b/src/pkg/net/http/persist.go
diff --git a/src/pkg/smtp/Makefile b/src/pkg/net/http/pprof/Makefile
index 0e7d8d5f7b..9b60273bf8 100644
--- a/src/pkg/smtp/Makefile
+++ b/src/pkg/net/http/pprof/Makefile
@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../../Make.inc
 
-TARG=smtp
+TARG=http/pprof
 GOFILES=\
-	auth.go\
-	smtp.go\
+	pprof.go\
 
-include ../../Make.pkg
+include ../../../../Make.pkg
diff --git a/src/pkg/http/pprof/pprof.go b/src/pkg/net/http/pprof/pprof.go
index a118a259b6..a118a259b6 100644
--- a/src/pkg/http/pprof/pprof.go
+++ b/src/pkg/net/http/pprof/pprof.go
diff --git a/src/pkg/http/proxy_test.go b/src/pkg/net/http/proxy_test.go
index 9b320b3aa5..9b320b3aa5 100644
--- a/src/pkg/http/proxy_test.go
+++ b/src/pkg/net/http/proxy_test.go
diff --git a/src/pkg/http/range_test.go b/src/pkg/net/http/range_test.go
index 5274a81fa3..5274a81fa3 100644
--- a/src/pkg/http/range_test.go
+++ b/src/pkg/net/http/range_test.go
diff --git a/src/pkg/http/readrequest_test.go b/src/pkg/net/http/readrequest_test.go
index d62133df43..d62133df43 100644
--- a/src/pkg/http/readrequest_test.go
+++ b/src/pkg/net/http/readrequest_test.go
diff --git a/src/pkg/http/request.go b/src/pkg/net/http/request.go
index d9a04efe3e..d9a04efe3e 100644
--- a/src/pkg/http/request.go
+++ b/src/pkg/net/http/request.go
diff --git a/src/pkg/http/request_test.go b/src/pkg/net/http/request_test.go
index 9be9efcc87..9be9efcc87 100644
--- a/src/pkg/http/request_test.go
+++ b/src/pkg/net/http/request_test.go
diff --git a/src/pkg/http/requestwrite_test.go b/src/pkg/net/http/requestwrite_test.go
index 16593e987a..16593e987a 100644
--- a/src/pkg/http/requestwrite_test.go
+++ b/src/pkg/net/http/requestwrite_test.go
diff --git a/src/pkg/http/response.go b/src/pkg/net/http/response.go
index 7be7150ef1..7be7150ef1 100644
--- a/src/pkg/http/response.go
+++ b/src/pkg/net/http/response.go
diff --git a/src/pkg/http/response_test.go b/src/pkg/net/http/response_test.go
index 6a141796bb..6a141796bb 100644
--- a/src/pkg/http/response_test.go
+++ b/src/pkg/net/http/response_test.go
diff --git a/src/pkg/http/responsewrite_test.go b/src/pkg/net/http/responsewrite_test.go
index f8e63acf4f..f8e63acf4f 100644
--- a/src/pkg/http/responsewrite_test.go
+++ b/src/pkg/net/http/responsewrite_test.go
diff --git a/src/pkg/http/reverseproxy.go b/src/pkg/net/http/reverseproxy.go
index 9cd359f16b..9cd359f16b 100644
--- a/src/pkg/http/reverseproxy.go
+++ b/src/pkg/net/http/reverseproxy.go
diff --git a/src/pkg/http/reverseproxy_test.go b/src/pkg/net/http/reverseproxy_test.go
index 663218d61b..663218d61b 100644
--- a/src/pkg/http/reverseproxy_test.go
+++ b/src/pkg/net/http/reverseproxy_test.go
diff --git a/src/pkg/http/serve_test.go b/src/pkg/net/http/serve_test.go
index 98e10d433e..98e10d433e 100644
--- a/src/pkg/http/serve_test.go
+++ b/src/pkg/net/http/serve_test.go
diff --git a/src/pkg/http/server.go b/src/pkg/net/http/server.go
index f2a4f01ad8..f2a4f01ad8 100644
--- a/src/pkg/http/server.go
+++ b/src/pkg/net/http/server.go
diff --git a/src/pkg/http/sniff.go b/src/pkg/net/http/sniff.go
index 690b1ac9fb..690b1ac9fb 100644
--- a/src/pkg/http/sniff.go
+++ b/src/pkg/net/http/sniff.go
diff --git a/src/pkg/http/sniff_test.go b/src/pkg/net/http/sniff_test.go
index faf05e405a..faf05e405a 100644
--- a/src/pkg/http/sniff_test.go
+++ b/src/pkg/net/http/sniff_test.go
diff --git a/src/pkg/http/status.go b/src/pkg/net/http/status.go
index b6e2d65c6a..b6e2d65c6a 100644
--- a/src/pkg/http/status.go
+++ b/src/pkg/net/http/status.go
diff --git a/src/pkg/http/testdata/file b/src/pkg/net/http/testdata/file
index 11f11f9be3..11f11f9be3 100644
--- a/src/pkg/http/testdata/file
+++ b/src/pkg/net/http/testdata/file
diff --git a/src/pkg/http/testdata/index.html b/src/pkg/net/http/testdata/index.html
index da8e1e93d1..da8e1e93d1 100644
--- a/src/pkg/http/testdata/index.html
+++ b/src/pkg/net/http/testdata/index.html
diff --git a/src/pkg/http/testdata/style.css b/src/pkg/net/http/testdata/style.css
index 208d16d421..208d16d421 100644
--- a/src/pkg/http/testdata/style.css
+++ b/src/pkg/net/http/testdata/style.css
diff --git a/src/pkg/http/transfer.go b/src/pkg/net/http/transfer.go
index 94772183f0..94772183f0 100644
--- a/src/pkg/http/transfer.go
+++ b/src/pkg/net/http/transfer.go
diff --git a/src/pkg/http/transport.go b/src/pkg/net/http/transport.go
index 5e167fef8e..5e167fef8e 100644
--- a/src/pkg/http/transport.go
+++ b/src/pkg/net/http/transport.go
diff --git a/src/pkg/http/transport_test.go b/src/pkg/net/http/transport_test.go
index b2d0ebaf6b..b2d0ebaf6b 100644
--- a/src/pkg/http/transport_test.go
+++ b/src/pkg/net/http/transport_test.go
diff --git a/src/pkg/http/transport_windows.go b/src/pkg/net/http/transport_windows.go
index 2a20d2224a..2a20d2224a 100644
--- a/src/pkg/http/transport_windows.go
+++ b/src/pkg/net/http/transport_windows.go
diff --git a/src/pkg/http/triv.go b/src/pkg/net/http/triv.go
index a8fd99aa4b..a8fd99aa4b 100644
--- a/src/pkg/http/triv.go
+++ b/src/pkg/net/http/triv.go
diff --git a/src/pkg/http/cgi/Makefile b/src/pkg/net/mail/Makefile
index 19b1039c26..5ab8acfa1c 100644
--- a/src/pkg/http/cgi/Makefile
+++ b/src/pkg/net/mail/Makefile
@@ -4,9 +4,8 @@
 
 include ../../../Make.inc
 
-TARG=http/cgi
+TARG=mail
 GOFILES=\
-	child.go\
-	host.go\
+	message.go\
 
 include ../../../Make.pkg
diff --git a/src/pkg/mail/message.go b/src/pkg/net/mail/message.go
index 95246b2fa1..95246b2fa1 100644
--- a/src/pkg/mail/message.go
+++ b/src/pkg/net/mail/message.go
diff --git a/src/pkg/mail/message_test.go b/src/pkg/net/mail/message_test.go
index 5653647b8c..5653647b8c 100644
--- a/src/pkg/mail/message_test.go
+++ b/src/pkg/net/mail/message_test.go
diff --git a/src/pkg/rpc/Makefile b/src/pkg/net/rpc/Makefile
index 191b10d054..b1872d6d09 100644
--- a/src/pkg/rpc/Makefile
+++ b/src/pkg/net/rpc/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=rpc
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	debug.go\
 	server.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/rpc/client.go b/src/pkg/net/rpc/client.go
index ecc84decf2..ecc84decf2 100644
--- a/src/pkg/rpc/client.go
+++ b/src/pkg/net/rpc/client.go
diff --git a/src/pkg/rpc/debug.go b/src/pkg/net/rpc/debug.go
index 02d577f677..02d577f677 100644
--- a/src/pkg/rpc/debug.go
+++ b/src/pkg/net/rpc/debug.go
diff --git a/src/pkg/rpc/jsonrpc/Makefile b/src/pkg/net/rpc/jsonrpc/Makefile
index b9a1ac2f77..1bb2a0d0e3 100644
--- a/src/pkg/rpc/jsonrpc/Makefile
+++ b/src/pkg/net/rpc/jsonrpc/Makefile
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+include ../../../../Make.inc
 
 TARG=rpc/jsonrpc
 GOFILES=\
 	client.go\
 	server.go\
 
-include ../../../Make.pkg
+include ../../../../Make.pkg
diff --git a/src/pkg/rpc/jsonrpc/all_test.go b/src/pkg/net/rpc/jsonrpc/all_test.go
index 1451a0fed8..1451a0fed8 100644
--- a/src/pkg/rpc/jsonrpc/all_test.go
+++ b/src/pkg/net/rpc/jsonrpc/all_test.go
diff --git a/src/pkg/rpc/jsonrpc/client.go b/src/pkg/net/rpc/jsonrpc/client.go
index f0475f060a..f0475f060a 100644
--- a/src/pkg/rpc/jsonrpc/client.go
+++ b/src/pkg/net/rpc/jsonrpc/client.go
diff --git a/src/pkg/rpc/jsonrpc/server.go b/src/pkg/net/rpc/jsonrpc/server.go
index 9fe3470c02..9fe3470c02 100644
--- a/src/pkg/rpc/jsonrpc/server.go
+++ b/src/pkg/net/rpc/jsonrpc/server.go
diff --git a/src/pkg/rpc/server.go b/src/pkg/net/rpc/server.go
index d03153305c..d03153305c 100644
--- a/src/pkg/rpc/server.go
+++ b/src/pkg/net/rpc/server.go
diff --git a/src/pkg/rpc/server_test.go b/src/pkg/net/rpc/server_test.go
index 119de7f89b..119de7f89b 100644
--- a/src/pkg/rpc/server_test.go
+++ b/src/pkg/net/rpc/server_test.go
diff --git a/src/pkg/http/pprof/Makefile b/src/pkg/net/smtp/Makefile
index 5858a0efa7..810f3ff914 100644
--- a/src/pkg/http/pprof/Makefile
+++ b/src/pkg/net/smtp/Makefile
@@ -4,8 +4,9 @@
 
 include ../../../Make.inc
 
-TARG=http/pprof
+TARG=smtp
 GOFILES=\
-	pprof.go\
+	auth.go\
+	smtp.go\
 
 include ../../../Make.pkg
diff --git a/src/pkg/smtp/auth.go b/src/pkg/net/smtp/auth.go
index 10a757fc64..10a757fc64 100644
--- a/src/pkg/smtp/auth.go
+++ b/src/pkg/net/smtp/auth.go
diff --git a/src/pkg/smtp/smtp.go b/src/pkg/net/smtp/smtp.go
index 8d935ffb7a..8d935ffb7a 100644
--- a/src/pkg/smtp/smtp.go
+++ b/src/pkg/net/smtp/smtp.go
diff --git a/src/pkg/smtp/smtp_test.go b/src/pkg/net/smtp/smtp_test.go
index d4e9c38bf4..d4e9c38bf4 100644
--- a/src/pkg/smtp/smtp_test.go
+++ b/src/pkg/net/smtp/smtp_test.go
diff --git a/src/pkg/url/Makefile b/src/pkg/net/url/Makefile
index b9267bd085..f583cdf636 100644
--- a/src/pkg/url/Makefile
+++ b/src/pkg/net/url/Makefile
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=url
 GOFILES=\
 	url.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/url/url.go b/src/pkg/net/url/url.go
index 11fa18961a..11fa18961a 100644
--- a/src/pkg/url/url.go
+++ b/src/pkg/net/url/url.go
diff --git a/src/pkg/url/url_test.go b/src/pkg/net/url/url_test.go
index dab3bfa1bb..dab3bfa1bb 100644
--- a/src/pkg/url/url_test.go
+++ b/src/pkg/net/url/url_test.go