diff --git a/pkgs/net-pkgs/net-doc/LICENSE.txt b/net-doc/LICENSE.txt
similarity index 100%
rename from pkgs/net-pkgs/net-doc/LICENSE.txt
rename to net-doc/LICENSE.txt
diff --git a/pkgs/net-pkgs/net-doc/info.rkt b/net-doc/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-doc/info.rkt
rename to net-doc/info.rkt
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/base64.scrbl b/net-doc/net/scribblings/base64.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/base64.scrbl
rename to net-doc/net/scribblings/base64.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/cgi.scrbl b/net-doc/net/scribblings/cgi.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/cgi.scrbl
rename to net-doc/net/scribblings/cgi.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/common.rkt b/net-doc/net/scribblings/common.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/common.rkt
rename to net-doc/net/scribblings/common.rkt
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/cookie.scrbl b/net-doc/net/scribblings/cookie.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/cookie.scrbl
rename to net-doc/net/scribblings/cookie.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/dns.scrbl b/net-doc/net/scribblings/dns.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/dns.scrbl
rename to net-doc/net/scribblings/dns.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/ftp.scrbl b/net-doc/net/scribblings/ftp.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/ftp.scrbl
rename to net-doc/net/scribblings/ftp.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/git-checkout.scrbl b/net-doc/net/scribblings/git-checkout.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/git-checkout.scrbl
rename to net-doc/net/scribblings/git-checkout.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/head.scrbl b/net-doc/net/scribblings/head.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/head.scrbl
rename to net-doc/net/scribblings/head.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/http-client.scrbl b/net-doc/net/scribblings/http-client.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/http-client.scrbl
rename to net-doc/net/scribblings/http-client.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/imap.scrbl b/net-doc/net/scribblings/imap.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/imap.scrbl
rename to net-doc/net/scribblings/imap.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/info.rkt b/net-doc/net/scribblings/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/info.rkt
rename to net-doc/net/scribblings/info.rkt
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/mime.scrbl b/net-doc/net/scribblings/mime.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/mime.scrbl
rename to net-doc/net/scribblings/mime.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/net.scrbl b/net-doc/net/scribblings/net.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/net.scrbl
rename to net-doc/net/scribblings/net.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/nntp.scrbl b/net-doc/net/scribblings/nntp.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/nntp.scrbl
rename to net-doc/net/scribblings/nntp.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/pop3.scrbl b/net-doc/net/scribblings/pop3.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/pop3.scrbl
rename to net-doc/net/scribblings/pop3.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/qp.scrbl b/net-doc/net/scribblings/qp.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/qp.scrbl
rename to net-doc/net/scribblings/qp.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/sendmail.scrbl b/net-doc/net/scribblings/sendmail.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/sendmail.scrbl
rename to net-doc/net/scribblings/sendmail.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/sendurl.scrbl b/net-doc/net/scribblings/sendurl.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/sendurl.scrbl
rename to net-doc/net/scribblings/sendurl.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/smtp.scrbl b/net-doc/net/scribblings/smtp.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/smtp.scrbl
rename to net-doc/net/scribblings/smtp.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/ssl-tcp-unit.scrbl b/net-doc/net/scribblings/ssl-tcp-unit.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/ssl-tcp-unit.scrbl
rename to net-doc/net/scribblings/ssl-tcp-unit.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/tcp-redirect.scrbl b/net-doc/net/scribblings/tcp-redirect.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/tcp-redirect.scrbl
rename to net-doc/net/scribblings/tcp-redirect.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/tcp.scrbl b/net-doc/net/scribblings/tcp.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/tcp.scrbl
rename to net-doc/net/scribblings/tcp.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/uri-codec.scrbl b/net-doc/net/scribblings/uri-codec.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/uri-codec.scrbl
rename to net-doc/net/scribblings/uri-codec.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/url.scrbl b/net-doc/net/scribblings/url.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/url.scrbl
rename to net-doc/net/scribblings/url.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/websocket.scrbl b/net-doc/net/scribblings/websocket.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/websocket.scrbl
rename to net-doc/net/scribblings/websocket.scrbl
diff --git a/pkgs/net-pkgs/net-doc/net/scribblings/win32-ssl.scrbl b/net-doc/net/scribblings/win32-ssl.scrbl
similarity index 100%
rename from pkgs/net-pkgs/net-doc/net/scribblings/win32-ssl.scrbl
rename to net-doc/net/scribblings/win32-ssl.scrbl
diff --git a/pkgs/net-pkgs/net-lib/LICENSE.txt b/net-lib/LICENSE.txt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/LICENSE.txt
rename to net-lib/LICENSE.txt
diff --git a/pkgs/net-pkgs/net-lib/info.rkt b/net-lib/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/info.rkt
rename to net-lib/info.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/cgi.rkt b/net-lib/net/cgi.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/cgi.rkt
rename to net-lib/net/cgi.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/cookie.rkt b/net-lib/net/cookie.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/cookie.rkt
rename to net-lib/net/cookie.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/dns.rkt b/net-lib/net/dns.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/dns.rkt
rename to net-lib/net/dns.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/ftp.rkt b/net-lib/net/ftp.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/ftp.rkt
rename to net-lib/net/ftp.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/imap.rkt b/net-lib/net/imap.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/imap.rkt
rename to net-lib/net/imap.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/mime-util.rkt b/net-lib/net/mime-util.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/mime-util.rkt
rename to net-lib/net/mime-util.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/mime.rkt b/net-lib/net/mime.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/mime.rkt
rename to net-lib/net/mime.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/nntp.rkt b/net-lib/net/nntp.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/nntp.rkt
rename to net-lib/net/nntp.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/pop3.rkt b/net-lib/net/pop3.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/pop3.rkt
rename to net-lib/net/pop3.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/private/ip.rkt b/net-lib/net/private/ip.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/private/ip.rkt
rename to net-lib/net/private/ip.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/private/rbtree.rkt b/net-lib/net/private/rbtree.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/private/rbtree.rkt
rename to net-lib/net/private/rbtree.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/qp.rkt b/net-lib/net/qp.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/qp.rkt
rename to net-lib/net/qp.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/sendmail.rkt b/net-lib/net/sendmail.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/sendmail.rkt
rename to net-lib/net/sendmail.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/sendurl.rkt b/net-lib/net/sendurl.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/sendurl.rkt
rename to net-lib/net/sendurl.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/smtp.rkt b/net-lib/net/smtp.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/smtp.rkt
rename to net-lib/net/smtp.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/ssl-tcp-unit.rkt b/net-lib/net/ssl-tcp-unit.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/ssl-tcp-unit.rkt
rename to net-lib/net/ssl-tcp-unit.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/tcp-redirect.rkt b/net-lib/net/tcp-redirect.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/tcp-redirect.rkt
rename to net-lib/net/tcp-redirect.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/tcp-sig.rkt b/net-lib/net/tcp-sig.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/tcp-sig.rkt
rename to net-lib/net/tcp-sig.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/tcp-unit.rkt b/net-lib/net/tcp-unit.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/tcp-unit.rkt
rename to net-lib/net/tcp-unit.rkt
diff --git a/pkgs/net-pkgs/net-lib/net/unihead.rkt b/net-lib/net/unihead.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-lib/net/unihead.rkt
rename to net-lib/net/unihead.rkt
diff --git a/pkgs/net-pkgs/net-test/LICENSE.txt b/net-test/LICENSE.txt
similarity index 100%
rename from pkgs/net-pkgs/net-test/LICENSE.txt
rename to net-test/LICENSE.txt
diff --git a/pkgs/net-pkgs/net-test/info.rkt b/net-test/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/info.rkt
rename to net-test/info.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/available.rkt b/net-test/tests/net/available.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/available.rkt
rename to net-test/tests/net/available.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/base64.rkt b/net-test/tests/net/base64.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/base64.rkt
rename to net-test/tests/net/base64.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/cgi.rkt b/net-test/tests/net/cgi.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/cgi.rkt
rename to net-test/tests/net/cgi.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/cookie.rkt b/net-test/tests/net/cookie.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/cookie.rkt
rename to net-test/tests/net/cookie.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/dns.rkt b/net-test/tests/net/dns.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/dns.rkt
rename to net-test/tests/net/dns.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/encoders.rkt b/net-test/tests/net/encoders.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/encoders.rkt
rename to net-test/tests/net/encoders.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/ftp.rkt b/net-test/tests/net/ftp.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/ftp.rkt
rename to net-test/tests/net/ftp.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/head.rkt b/net-test/tests/net/head.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/head.rkt
rename to net-test/tests/net/head.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/http-client.rkt b/net-test/tests/net/http-client.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/http-client.rkt
rename to net-test/tests/net/http-client.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/imap.rkt b/net-test/tests/net/imap.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/imap.rkt
rename to net-test/tests/net/imap.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/info.rkt b/net-test/tests/net/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/info.rkt
rename to net-test/tests/net/info.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/ip.rkt b/net-test/tests/net/ip.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/ip.rkt
rename to net-test/tests/net/ip.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/main.rkt b/net-test/tests/net/main.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/main.rkt
rename to net-test/tests/net/main.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/mime.rkt b/net-test/tests/net/mime.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/mime.rkt
rename to net-test/tests/net/mime.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/stress/info.rkt b/net-test/tests/net/stress/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/stress/info.rkt
rename to net-test/tests/net/stress/info.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/stress/websocket.rkt b/net-test/tests/net/stress/websocket.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/stress/websocket.rkt
rename to net-test/tests/net/stress/websocket.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/uri-codec.rkt b/net-test/tests/net/uri-codec.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/uri-codec.rkt
rename to net-test/tests/net/uri-codec.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/url-port.rkt b/net-test/tests/net/url-port.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/url-port.rkt
rename to net-test/tests/net/url-port.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/url.rkt b/net-test/tests/net/url.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/url.rkt
rename to net-test/tests/net/url.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket.rkt b/net-test/tests/net/websocket.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/websocket.rkt
rename to net-test/tests/net/websocket.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/example.rkt b/net-test/tests/net/websocket/example.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/websocket/example.rkt
rename to net-test/tests/net/websocket/example.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/index.html b/net-test/tests/net/websocket/index.html
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/websocket/index.html
rename to net-test/tests/net/websocket/index.html
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/info.rkt b/net-test/tests/net/websocket/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/websocket/info.rkt
rename to net-test/tests/net/websocket/info.rkt
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/script.js b/net-test/tests/net/websocket/script.js
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/websocket/script.js
rename to net-test/tests/net/websocket/script.js
diff --git a/pkgs/net-pkgs/net-test/tests/net/websocket/style.css b/net-test/tests/net/websocket/style.css
similarity index 100%
rename from pkgs/net-pkgs/net-test/tests/net/websocket/style.css
rename to net-test/tests/net/websocket/style.css
diff --git a/pkgs/net-pkgs/net/LICENSE.txt b/net/LICENSE.txt
similarity index 100%
rename from pkgs/net-pkgs/net/LICENSE.txt
rename to net/LICENSE.txt
diff --git a/pkgs/net-pkgs/net/info.rkt b/net/info.rkt
similarity index 100%
rename from pkgs/net-pkgs/net/info.rkt
rename to net/info.rkt