diff --git a/pkgs/typed-racket-more/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt similarity index 100% rename from pkgs/typed-racket-more/info.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/info.rkt diff --git a/pkgs/typed-racket-more/typed/file/gif.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/file/gif.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/file/gif.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/file/gif.rkt diff --git a/pkgs/typed-racket-more/typed/framework/framework.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/framework.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/framework/framework.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/framework.rkt diff --git a/pkgs/typed-racket-more/typed/framework/prefs-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/framework/prefs-contract.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt diff --git a/pkgs/typed-racket-more/typed/mred/mred.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/mred/mred.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt diff --git a/pkgs/typed-racket-more/typed/net/base64.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/base64.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/base64.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/base64.rkt diff --git a/pkgs/typed-racket-more/typed/net/cgi.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cgi.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/cgi.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cgi.rkt diff --git a/pkgs/typed-racket-more/typed/net/cookie.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cookie.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/cookie.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/cookie.rkt diff --git a/pkgs/typed-racket-more/typed/net/dns.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/dns.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/dns.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/dns.rkt diff --git a/pkgs/typed-racket-more/typed/net/ftp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/ftp.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/ftp.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/ftp.rkt diff --git a/pkgs/typed-racket-more/typed/net/gifwrite.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/gifwrite.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/gifwrite.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/gifwrite.rkt diff --git a/pkgs/typed-racket-more/typed/net/head.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/head.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/head.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/head.rkt diff --git a/pkgs/typed-racket-more/typed/net/imap.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/imap.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/imap.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/imap.rkt diff --git a/pkgs/typed-racket-more/typed/net/mime.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/mime.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/mime.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/mime.rkt diff --git a/pkgs/typed-racket-more/typed/net/nntp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/nntp.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/nntp.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/nntp.rkt diff --git a/pkgs/typed-racket-more/typed/net/pop3.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/pop3.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/pop3.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/pop3.rkt diff --git a/pkgs/typed-racket-more/typed/net/qp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/qp.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/qp.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/qp.rkt diff --git a/pkgs/typed-racket-more/typed/net/sendmail.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendmail.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/sendmail.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendmail.rkt diff --git a/pkgs/typed-racket-more/typed/net/sendurl.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendurl.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/sendurl.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/sendurl.rkt diff --git a/pkgs/typed-racket-more/typed/net/smtp.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/smtp.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/smtp.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/smtp.rkt diff --git a/pkgs/typed-racket-more/typed/net/uri-codec.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/uri-codec.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/uri-codec.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/uri-codec.rkt diff --git a/pkgs/typed-racket-more/typed/net/url.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/net/url.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/net/url.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/net/url.rkt diff --git a/pkgs/typed-racket-more/typed/rackunit.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/rackunit.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit.rkt diff --git a/pkgs/typed-racket-more/typed/rackunit/gui.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/rackunit/gui.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt diff --git a/pkgs/typed-racket-more/typed/rackunit/main.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/rackunit/main.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt diff --git a/pkgs/typed-racket-more/typed/rackunit/text-ui.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/rackunit/text-ui.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt diff --git a/pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt diff --git a/pkgs/typed-racket-more/typed/srfi/14.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/srfi/14.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/srfi/14.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/srfi/14.rkt diff --git a/pkgs/typed-racket-more/typed/tests/test-docs-complete.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/tests/test-docs-complete.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/tests/test-docs-complete.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/tests/test-docs-complete.rkt diff --git a/pkgs/typed-racket-more/typed/untyped-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/untyped-utils.rkt similarity index 100% rename from pkgs/typed-racket-more/typed/untyped-utils.rkt rename to pkgs/typed-racket-pkgs/typed-racket-more/typed/untyped-utils.rkt