diff --git a/collects/tests/pkg/test-pkgs/pkg-z/info.rkt b/pkgs/html-pkgs/html-lib/info.rkt
similarity index 95%
rename from collects/tests/pkg/test-pkgs/pkg-z/info.rkt
rename to pkgs/html-pkgs/html-lib/info.rkt
index 13a63c4..c14a2ca 100644
--- a/collects/tests/pkg/test-pkgs/pkg-z/info.rkt
+++ b/pkgs/html-pkgs/html-lib/info.rkt
@@ -1,2 +1 @@
 #lang setup/infotab
-
diff --git a/collects/lazy/mz-without-promises.rkt b/pkgs/lazy/mz-without-promises.rkt
similarity index 100%
rename from collects/lazy/mz-without-promises.rkt
rename to pkgs/lazy/mz-without-promises.rkt
diff --git a/collects/tests/racket/awk.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/awk.rktl
similarity index 100%
rename from collects/tests/racket/awk.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/awk.rktl
diff --git a/collects/tests/racket/binc.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/binc.rktl
similarity index 100%
rename from collects/tests/racket/binc.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/binc.rktl
diff --git a/collects/tests/racket/compat.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/compat.rktl
similarity index 100%
rename from collects/tests/racket/compat.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/compat.rktl
diff --git a/collects/tests/racket/contract-mzlib-test.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/contract-mzlib-test.rktl
similarity index 100%
rename from collects/tests/racket/contract-mzlib-test.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/contract-mzlib-test.rktl
diff --git a/collects/tests/racket/etc.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/etc.rktl
similarity index 100%
rename from collects/tests/racket/etc.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/etc.rktl
diff --git a/collects/tests/racket/kw.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/kw.rktl
similarity index 100%
rename from collects/tests/racket/kw.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/kw.rktl
diff --git a/collects/tests/racket/macrolib.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/macrolib.rktl
similarity index 100%
rename from collects/tests/racket/macrolib.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/macrolib.rktl
diff --git a/collects/tests/racket/pconvert.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/pconvert.rktl
similarity index 100%
rename from collects/tests/racket/pconvert.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/pconvert.rktl
diff --git a/collects/tests/racket/restart.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/restart.rktl
similarity index 100%
rename from collects/tests/racket/restart.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/restart.rktl
diff --git a/collects/tests/racket/string-mzlib.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/string-mzlib.rktl
similarity index 100%
rename from collects/tests/racket/string-mzlib.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/string-mzlib.rktl
diff --git a/collects/tests/racket/structlib.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/structlib.rktl
similarity index 100%
rename from collects/tests/racket/structlib.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/structlib.rktl
diff --git a/collects/tests/racket/threadlib.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/threadlib.rktl
similarity index 100%
rename from collects/tests/racket/threadlib.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/threadlib.rktl
diff --git a/collects/tests/racket/ttt/uinc4.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/ttt/uinc4.rktl
similarity index 100%
rename from collects/tests/racket/ttt/uinc4.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/ttt/uinc4.rktl
diff --git a/collects/tests/racket/uinc.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/uinc.rktl
similarity index 100%
rename from collects/tests/racket/uinc.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/uinc.rktl
diff --git a/collects/tests/racket/uinc2.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/uinc2.rktl
similarity index 100%
rename from collects/tests/racket/uinc2.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/uinc2.rktl
diff --git a/collects/tests/racket/uinc3.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/uinc3.rktl
similarity index 100%
rename from collects/tests/racket/uinc3.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/uinc3.rktl
diff --git a/collects/tests/racket/unit.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/unit.rktl
similarity index 100%
rename from collects/tests/racket/unit.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/unit.rktl
diff --git a/collects/tests/racket/unitsig.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/unitsig.rktl
similarity index 100%
rename from collects/tests/racket/unitsig.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/unitsig.rktl
diff --git a/pkgs/slideshow-pkgs/slideshow-exe/info.rkt b/pkgs/slideshow-pkgs/slideshow-exe/info.rkt
new file mode 100644
index 0000000..37f4228
--- /dev/null
+++ b/pkgs/slideshow-pkgs/slideshow-exe/info.rkt
@@ -0,0 +1,3 @@
+#lang setup/infotab
+
+(define deps '("slideshow-lib"))
diff --git a/collects/compatibility/defmacro.rkt b/racket/lib/collects/compatibility/defmacro.rkt
similarity index 100%
rename from collects/compatibility/defmacro.rkt
rename to racket/lib/collects/compatibility/defmacro.rkt
diff --git a/collects/compatibility/mlist.rkt b/racket/lib/collects/compatibility/mlist.rkt
similarity index 100%
rename from collects/compatibility/mlist.rkt
rename to racket/lib/collects/compatibility/mlist.rkt
diff --git a/collects/compatibility/package.rkt b/racket/lib/collects/compatibility/package.rkt
similarity index 100%
rename from collects/compatibility/package.rkt
rename to racket/lib/collects/compatibility/package.rkt
diff --git a/collects/mzlib/a-signature.rkt b/racket/lib/collects/mzlib/a-signature.rkt
similarity index 100%
rename from collects/mzlib/a-signature.rkt
rename to racket/lib/collects/mzlib/a-signature.rkt
diff --git a/collects/mzlib/a-unit.rkt b/racket/lib/collects/mzlib/a-unit.rkt
similarity index 100%
rename from collects/mzlib/a-unit.rkt
rename to racket/lib/collects/mzlib/a-unit.rkt
diff --git a/collects/mzlib/async-channel.rkt b/racket/lib/collects/mzlib/async-channel.rkt
similarity index 100%
rename from collects/mzlib/async-channel.rkt
rename to racket/lib/collects/mzlib/async-channel.rkt
diff --git a/collects/mzlib/awk.rkt b/racket/lib/collects/mzlib/awk.rkt
similarity index 100%
rename from collects/mzlib/awk.rkt
rename to racket/lib/collects/mzlib/awk.rkt
diff --git a/collects/mzlib/class.rkt b/racket/lib/collects/mzlib/class.rkt
similarity index 100%
rename from collects/mzlib/class.rkt
rename to racket/lib/collects/mzlib/class.rkt
diff --git a/collects/mzlib/cm-accomplice.rkt b/racket/lib/collects/mzlib/cm-accomplice.rkt
similarity index 100%
rename from collects/mzlib/cm-accomplice.rkt
rename to racket/lib/collects/mzlib/cm-accomplice.rkt
diff --git a/collects/mzlib/cm.rkt b/racket/lib/collects/mzlib/cm.rkt
similarity index 100%
rename from collects/mzlib/cm.rkt
rename to racket/lib/collects/mzlib/cm.rkt
diff --git a/collects/mzlib/cmdline.rkt b/racket/lib/collects/mzlib/cmdline.rkt
similarity index 100%
rename from collects/mzlib/cmdline.rkt
rename to racket/lib/collects/mzlib/cmdline.rkt
diff --git a/collects/mzlib/cml.rkt b/racket/lib/collects/mzlib/cml.rkt
similarity index 100%
rename from collects/mzlib/cml.rkt
rename to racket/lib/collects/mzlib/cml.rkt
diff --git a/collects/mzlib/compat.rkt b/racket/lib/collects/mzlib/compat.rkt
similarity index 100%
rename from collects/mzlib/compat.rkt
rename to racket/lib/collects/mzlib/compat.rkt
diff --git a/collects/mzlib/contract.rkt b/racket/lib/collects/mzlib/contract.rkt
similarity index 100%
rename from collects/mzlib/contract.rkt
rename to racket/lib/collects/mzlib/contract.rkt
diff --git a/collects/mzlib/control.rkt b/racket/lib/collects/mzlib/control.rkt
similarity index 100%
rename from collects/mzlib/control.rkt
rename to racket/lib/collects/mzlib/control.rkt
diff --git a/collects/mzlib/date.rkt b/racket/lib/collects/mzlib/date.rkt
similarity index 100%
rename from collects/mzlib/date.rkt
rename to racket/lib/collects/mzlib/date.rkt
diff --git a/collects/mzlib/deflate.rkt b/racket/lib/collects/mzlib/deflate.rkt
similarity index 100%
rename from collects/mzlib/deflate.rkt
rename to racket/lib/collects/mzlib/deflate.rkt
diff --git a/collects/mzlib/defmacro.rkt b/racket/lib/collects/mzlib/defmacro.rkt
similarity index 100%
rename from collects/mzlib/defmacro.rkt
rename to racket/lib/collects/mzlib/defmacro.rkt
diff --git a/collects/mzlib/etc.rkt b/racket/lib/collects/mzlib/etc.rkt
similarity index 100%
rename from collects/mzlib/etc.rkt
rename to racket/lib/collects/mzlib/etc.rkt
diff --git a/collects/mzlib/file.rkt b/racket/lib/collects/mzlib/file.rkt
similarity index 100%
rename from collects/mzlib/file.rkt
rename to racket/lib/collects/mzlib/file.rkt
diff --git a/collects/mzlib/for.rkt b/racket/lib/collects/mzlib/for.rkt
similarity index 100%
rename from collects/mzlib/for.rkt
rename to racket/lib/collects/mzlib/for.rkt
diff --git a/collects/mzlib/foreign.rkt b/racket/lib/collects/mzlib/foreign.rkt
similarity index 100%
rename from collects/mzlib/foreign.rkt
rename to racket/lib/collects/mzlib/foreign.rkt
diff --git a/collects/mzlib/include.rkt b/racket/lib/collects/mzlib/include.rkt
similarity index 100%
rename from collects/mzlib/include.rkt
rename to racket/lib/collects/mzlib/include.rkt
diff --git a/collects/mzlib/inflate.rkt b/racket/lib/collects/mzlib/inflate.rkt
similarity index 100%
rename from collects/mzlib/inflate.rkt
rename to racket/lib/collects/mzlib/inflate.rkt
diff --git a/collects/mzlib/integer-set.rkt b/racket/lib/collects/mzlib/integer-set.rkt
similarity index 100%
rename from collects/mzlib/integer-set.rkt
rename to racket/lib/collects/mzlib/integer-set.rkt
diff --git a/collects/mzlib/kw.rkt b/racket/lib/collects/mzlib/kw.rkt
similarity index 100%
rename from collects/mzlib/kw.rkt
rename to racket/lib/collects/mzlib/kw.rkt
diff --git a/collects/mzlib/list.rkt b/racket/lib/collects/mzlib/list.rkt
similarity index 100%
rename from collects/mzlib/list.rkt
rename to racket/lib/collects/mzlib/list.rkt
diff --git a/collects/mzlib/match.rkt b/racket/lib/collects/mzlib/match.rkt
similarity index 100%
rename from collects/mzlib/match.rkt
rename to racket/lib/collects/mzlib/match.rkt
diff --git a/collects/mzlib/math.rkt b/racket/lib/collects/mzlib/math.rkt
similarity index 100%
rename from collects/mzlib/math.rkt
rename to racket/lib/collects/mzlib/math.rkt
diff --git a/collects/mzlib/md5.rkt b/racket/lib/collects/mzlib/md5.rkt
similarity index 100%
rename from collects/mzlib/md5.rkt
rename to racket/lib/collects/mzlib/md5.rkt
diff --git a/collects/mzlib/os.rkt b/racket/lib/collects/mzlib/os.rkt
similarity index 100%
rename from collects/mzlib/os.rkt
rename to racket/lib/collects/mzlib/os.rkt
diff --git a/collects/mzlib/plt-match.rkt b/racket/lib/collects/mzlib/plt-match.rkt
similarity index 100%
rename from collects/mzlib/plt-match.rkt
rename to racket/lib/collects/mzlib/plt-match.rkt
diff --git a/collects/mzlib/port.rkt b/racket/lib/collects/mzlib/port.rkt
similarity index 100%
rename from collects/mzlib/port.rkt
rename to racket/lib/collects/mzlib/port.rkt
diff --git a/collects/mzlib/pregexp.rkt b/racket/lib/collects/mzlib/pregexp.rkt
similarity index 100%
rename from collects/mzlib/pregexp.rkt
rename to racket/lib/collects/mzlib/pregexp.rkt
diff --git a/collects/mzlib/pretty.rkt b/racket/lib/collects/mzlib/pretty.rkt
similarity index 100%
rename from collects/mzlib/pretty.rkt
rename to racket/lib/collects/mzlib/pretty.rkt
diff --git a/collects/mzlib/private/contract-arr-checks.rkt b/racket/lib/collects/mzlib/private/contract-arr-checks.rkt
similarity index 100%
rename from collects/mzlib/private/contract-arr-checks.rkt
rename to racket/lib/collects/mzlib/private/contract-arr-checks.rkt
diff --git a/collects/mzlib/private/contract-arr-obj-helpers.rkt b/racket/lib/collects/mzlib/private/contract-arr-obj-helpers.rkt
similarity index 100%
rename from collects/mzlib/private/contract-arr-obj-helpers.rkt
rename to racket/lib/collects/mzlib/private/contract-arr-obj-helpers.rkt
diff --git a/collects/mzlib/private/contract-arrow.rkt b/racket/lib/collects/mzlib/private/contract-arrow.rkt
similarity index 100%
rename from collects/mzlib/private/contract-arrow.rkt
rename to racket/lib/collects/mzlib/private/contract-arrow.rkt
diff --git a/collects/mzlib/private/contract-define.rkt b/racket/lib/collects/mzlib/private/contract-define.rkt
similarity index 100%
rename from collects/mzlib/private/contract-define.rkt
rename to racket/lib/collects/mzlib/private/contract-define.rkt
diff --git a/collects/mzlib/private/contract-mutable.rkt b/racket/lib/collects/mzlib/private/contract-mutable.rkt
similarity index 100%
rename from collects/mzlib/private/contract-mutable.rkt
rename to racket/lib/collects/mzlib/private/contract-mutable.rkt
diff --git a/collects/mzlib/private/contract-object.rkt b/racket/lib/collects/mzlib/private/contract-object.rkt
similarity index 100%
rename from collects/mzlib/private/contract-object.rkt
rename to racket/lib/collects/mzlib/private/contract-object.rkt
diff --git a/collects/mzlib/private/contract-struct.rkt b/racket/lib/collects/mzlib/private/contract-struct.rkt
similarity index 100%
rename from collects/mzlib/private/contract-struct.rkt
rename to racket/lib/collects/mzlib/private/contract-struct.rkt
diff --git a/collects/mzlib/private/package-helper.rkt b/racket/lib/collects/mzlib/private/package-helper.rkt
similarity index 100%
rename from collects/mzlib/private/package-helper.rkt
rename to racket/lib/collects/mzlib/private/package-helper.rkt
diff --git a/collects/mzlib/private/sigmatch.rkt b/racket/lib/collects/mzlib/private/sigmatch.rkt
similarity index 100%
rename from collects/mzlib/private/sigmatch.rkt
rename to racket/lib/collects/mzlib/private/sigmatch.rkt
diff --git a/collects/mzlib/private/sigutil.rkt b/racket/lib/collects/mzlib/private/sigutil.rkt
similarity index 100%
rename from collects/mzlib/private/sigutil.rkt
rename to racket/lib/collects/mzlib/private/sigutil.rkt
diff --git a/collects/mzlib/private/structure-helper.rkt b/racket/lib/collects/mzlib/private/structure-helper.rkt
similarity index 100%
rename from collects/mzlib/private/structure-helper.rkt
rename to racket/lib/collects/mzlib/private/structure-helper.rkt
diff --git a/collects/mzlib/private/stxparamkey.rkt b/racket/lib/collects/mzlib/private/stxparamkey.rkt
similarity index 100%
rename from collects/mzlib/private/stxparamkey.rkt
rename to racket/lib/collects/mzlib/private/stxparamkey.rkt
diff --git a/collects/mzlib/private/stxset.rkt b/racket/lib/collects/mzlib/private/stxset.rkt
similarity index 100%
rename from collects/mzlib/private/stxset.rkt
rename to racket/lib/collects/mzlib/private/stxset.rkt
diff --git a/collects/mzlib/private/unitidmap.rkt b/racket/lib/collects/mzlib/private/unitidmap.rkt
similarity index 100%
rename from collects/mzlib/private/unitidmap.rkt
rename to racket/lib/collects/mzlib/private/unitidmap.rkt
diff --git a/collects/mzlib/process.rkt b/racket/lib/collects/mzlib/process.rkt
similarity index 100%
rename from collects/mzlib/process.rkt
rename to racket/lib/collects/mzlib/process.rkt
diff --git a/collects/mzlib/runtime-path.rkt b/racket/lib/collects/mzlib/runtime-path.rkt
similarity index 100%
rename from collects/mzlib/runtime-path.rkt
rename to racket/lib/collects/mzlib/runtime-path.rkt
diff --git a/collects/mzlib/sandbox.rkt b/racket/lib/collects/mzlib/sandbox.rkt
similarity index 100%
rename from collects/mzlib/sandbox.rkt
rename to racket/lib/collects/mzlib/sandbox.rkt
diff --git a/collects/mzlib/sendevent.rkt b/racket/lib/collects/mzlib/sendevent.rkt
similarity index 100%
rename from collects/mzlib/sendevent.rkt
rename to racket/lib/collects/mzlib/sendevent.rkt
diff --git a/collects/mzlib/serialize.rkt b/racket/lib/collects/mzlib/serialize.rkt
similarity index 100%
rename from collects/mzlib/serialize.rkt
rename to racket/lib/collects/mzlib/serialize.rkt
diff --git a/collects/mzlib/shared.rkt b/racket/lib/collects/mzlib/shared.rkt
similarity index 100%
rename from collects/mzlib/shared.rkt
rename to racket/lib/collects/mzlib/shared.rkt
diff --git a/collects/mzlib/string.rkt b/racket/lib/collects/mzlib/string.rkt
similarity index 100%
rename from collects/mzlib/string.rkt
rename to racket/lib/collects/mzlib/string.rkt
diff --git a/collects/mzlib/struct.rkt b/racket/lib/collects/mzlib/struct.rkt
similarity index 100%
rename from collects/mzlib/struct.rkt
rename to racket/lib/collects/mzlib/struct.rkt
diff --git a/collects/mzlib/stxparam.rkt b/racket/lib/collects/mzlib/stxparam.rkt
similarity index 100%
rename from collects/mzlib/stxparam.rkt
rename to racket/lib/collects/mzlib/stxparam.rkt
diff --git a/collects/mzlib/surrogate.rkt b/racket/lib/collects/mzlib/surrogate.rkt
similarity index 100%
rename from collects/mzlib/surrogate.rkt
rename to racket/lib/collects/mzlib/surrogate.rkt
diff --git a/collects/mzlib/tar.rkt b/racket/lib/collects/mzlib/tar.rkt
similarity index 100%
rename from collects/mzlib/tar.rkt
rename to racket/lib/collects/mzlib/tar.rkt
diff --git a/collects/mzlib/thread.rkt b/racket/lib/collects/mzlib/thread.rkt
similarity index 100%
rename from collects/mzlib/thread.rkt
rename to racket/lib/collects/mzlib/thread.rkt
diff --git a/collects/mzlib/trace.rkt b/racket/lib/collects/mzlib/trace.rkt
similarity index 100%
rename from collects/mzlib/trace.rkt
rename to racket/lib/collects/mzlib/trace.rkt
diff --git a/collects/mzlib/traceld.rkt b/racket/lib/collects/mzlib/traceld.rkt
similarity index 100%
rename from collects/mzlib/traceld.rkt
rename to racket/lib/collects/mzlib/traceld.rkt
diff --git a/collects/mzlib/trait.rkt b/racket/lib/collects/mzlib/trait.rkt
similarity index 100%
rename from collects/mzlib/trait.rkt
rename to racket/lib/collects/mzlib/trait.rkt
diff --git a/collects/mzlib/transcr.rkt b/racket/lib/collects/mzlib/transcr.rkt
similarity index 100%
rename from collects/mzlib/transcr.rkt
rename to racket/lib/collects/mzlib/transcr.rkt
diff --git a/collects/mzlib/unit-exptime.rkt b/racket/lib/collects/mzlib/unit-exptime.rkt
similarity index 100%
rename from collects/mzlib/unit-exptime.rkt
rename to racket/lib/collects/mzlib/unit-exptime.rkt
diff --git a/collects/mzlib/unit.rkt b/racket/lib/collects/mzlib/unit.rkt
similarity index 100%
rename from collects/mzlib/unit.rkt
rename to racket/lib/collects/mzlib/unit.rkt
diff --git a/collects/mzlib/unit200.rkt b/racket/lib/collects/mzlib/unit200.rkt
similarity index 100%
rename from collects/mzlib/unit200.rkt
rename to racket/lib/collects/mzlib/unit200.rkt
diff --git a/collects/mzlib/unitsig.rkt b/racket/lib/collects/mzlib/unitsig.rkt
similarity index 100%
rename from collects/mzlib/unitsig.rkt
rename to racket/lib/collects/mzlib/unitsig.rkt
diff --git a/collects/mzlib/unitsig200.rkt b/racket/lib/collects/mzlib/unitsig200.rkt
similarity index 100%
rename from collects/mzlib/unitsig200.rkt
rename to racket/lib/collects/mzlib/unitsig200.rkt
diff --git a/collects/mzlib/zip.rkt b/racket/lib/collects/mzlib/zip.rkt
similarity index 100%
rename from collects/mzlib/zip.rkt
rename to racket/lib/collects/mzlib/zip.rkt
diff --git a/collects/mzscheme/lang/reader.rkt b/racket/lib/collects/mzscheme/lang/reader.rkt
similarity index 100%
rename from collects/mzscheme/lang/reader.rkt
rename to racket/lib/collects/mzscheme/lang/reader.rkt
diff --git a/collects/mzscheme/main.rkt b/racket/lib/collects/mzscheme/main.rkt
similarity index 100%
rename from collects/mzscheme/main.rkt
rename to racket/lib/collects/mzscheme/main.rkt
diff --git a/collects/net/base64-sig.rkt b/racket/lib/collects/net/base64-sig.rkt
similarity index 100%
rename from collects/net/base64-sig.rkt
rename to racket/lib/collects/net/base64-sig.rkt
diff --git a/collects/net/base64-unit.rkt b/racket/lib/collects/net/base64-unit.rkt
similarity index 100%
rename from collects/net/base64-unit.rkt
rename to racket/lib/collects/net/base64-unit.rkt
diff --git a/collects/net/cgi-sig.rkt b/racket/lib/collects/net/cgi-sig.rkt
similarity index 100%
rename from collects/net/cgi-sig.rkt
rename to racket/lib/collects/net/cgi-sig.rkt
diff --git a/collects/net/cgi-unit.rkt b/racket/lib/collects/net/cgi-unit.rkt
similarity index 100%
rename from collects/net/cgi-unit.rkt
rename to racket/lib/collects/net/cgi-unit.rkt
diff --git a/collects/net/cookie-sig.rkt b/racket/lib/collects/net/cookie-sig.rkt
similarity index 100%
rename from collects/net/cookie-sig.rkt
rename to racket/lib/collects/net/cookie-sig.rkt
diff --git a/collects/net/cookie-unit.rkt b/racket/lib/collects/net/cookie-unit.rkt
similarity index 100%
rename from collects/net/cookie-unit.rkt
rename to racket/lib/collects/net/cookie-unit.rkt
diff --git a/collects/net/dns-sig.rkt b/racket/lib/collects/net/dns-sig.rkt
similarity index 100%
rename from collects/net/dns-sig.rkt
rename to racket/lib/collects/net/dns-sig.rkt
diff --git a/collects/net/dns-unit.rkt b/racket/lib/collects/net/dns-unit.rkt
similarity index 100%
rename from collects/net/dns-unit.rkt
rename to racket/lib/collects/net/dns-unit.rkt
diff --git a/collects/net/ftp-sig.rkt b/racket/lib/collects/net/ftp-sig.rkt
similarity index 100%
rename from collects/net/ftp-sig.rkt
rename to racket/lib/collects/net/ftp-sig.rkt
diff --git a/collects/net/ftp-unit.rkt b/racket/lib/collects/net/ftp-unit.rkt
similarity index 100%
rename from collects/net/ftp-unit.rkt
rename to racket/lib/collects/net/ftp-unit.rkt
diff --git a/collects/net/head-sig.rkt b/racket/lib/collects/net/head-sig.rkt
similarity index 100%
rename from collects/net/head-sig.rkt
rename to racket/lib/collects/net/head-sig.rkt
diff --git a/collects/net/head-unit.rkt b/racket/lib/collects/net/head-unit.rkt
similarity index 100%
rename from collects/net/head-unit.rkt
rename to racket/lib/collects/net/head-unit.rkt
diff --git a/collects/net/imap-sig.rkt b/racket/lib/collects/net/imap-sig.rkt
similarity index 100%
rename from collects/net/imap-sig.rkt
rename to racket/lib/collects/net/imap-sig.rkt
diff --git a/collects/net/imap-unit.rkt b/racket/lib/collects/net/imap-unit.rkt
similarity index 100%
rename from collects/net/imap-unit.rkt
rename to racket/lib/collects/net/imap-unit.rkt
diff --git a/collects/net/mime-sig.rkt b/racket/lib/collects/net/mime-sig.rkt
similarity index 100%
rename from collects/net/mime-sig.rkt
rename to racket/lib/collects/net/mime-sig.rkt
diff --git a/collects/net/mime-unit.rkt b/racket/lib/collects/net/mime-unit.rkt
similarity index 100%
rename from collects/net/mime-unit.rkt
rename to racket/lib/collects/net/mime-unit.rkt
diff --git a/collects/net/nntp-sig.rkt b/racket/lib/collects/net/nntp-sig.rkt
similarity index 100%
rename from collects/net/nntp-sig.rkt
rename to racket/lib/collects/net/nntp-sig.rkt
diff --git a/collects/net/nntp-unit.rkt b/racket/lib/collects/net/nntp-unit.rkt
similarity index 100%
rename from collects/net/nntp-unit.rkt
rename to racket/lib/collects/net/nntp-unit.rkt
diff --git a/collects/net/pop3-sig.rkt b/racket/lib/collects/net/pop3-sig.rkt
similarity index 100%
rename from collects/net/pop3-sig.rkt
rename to racket/lib/collects/net/pop3-sig.rkt
diff --git a/collects/net/pop3-unit.rkt b/racket/lib/collects/net/pop3-unit.rkt
similarity index 100%
rename from collects/net/pop3-unit.rkt
rename to racket/lib/collects/net/pop3-unit.rkt
diff --git a/collects/net/qp-sig.rkt b/racket/lib/collects/net/qp-sig.rkt
similarity index 100%
rename from collects/net/qp-sig.rkt
rename to racket/lib/collects/net/qp-sig.rkt
diff --git a/collects/net/qp-unit.rkt b/racket/lib/collects/net/qp-unit.rkt
similarity index 100%
rename from collects/net/qp-unit.rkt
rename to racket/lib/collects/net/qp-unit.rkt
diff --git a/collects/net/sendmail-sig.rkt b/racket/lib/collects/net/sendmail-sig.rkt
similarity index 100%
rename from collects/net/sendmail-sig.rkt
rename to racket/lib/collects/net/sendmail-sig.rkt
diff --git a/collects/net/sendmail-unit.rkt b/racket/lib/collects/net/sendmail-unit.rkt
similarity index 100%
rename from collects/net/sendmail-unit.rkt
rename to racket/lib/collects/net/sendmail-unit.rkt
diff --git a/collects/net/smtp-sig.rkt b/racket/lib/collects/net/smtp-sig.rkt
similarity index 100%
rename from collects/net/smtp-sig.rkt
rename to racket/lib/collects/net/smtp-sig.rkt
diff --git a/collects/net/smtp-unit.rkt b/racket/lib/collects/net/smtp-unit.rkt
similarity index 100%
rename from collects/net/smtp-unit.rkt
rename to racket/lib/collects/net/smtp-unit.rkt
diff --git a/collects/net/uri-codec-sig.rkt b/racket/lib/collects/net/uri-codec-sig.rkt
similarity index 100%
rename from collects/net/uri-codec-sig.rkt
rename to racket/lib/collects/net/uri-codec-sig.rkt
diff --git a/collects/net/uri-codec-unit.rkt b/racket/lib/collects/net/uri-codec-unit.rkt
similarity index 100%
rename from collects/net/uri-codec-unit.rkt
rename to racket/lib/collects/net/uri-codec-unit.rkt
diff --git a/collects/net/url-sig.rkt b/racket/lib/collects/net/url-sig.rkt
similarity index 100%
rename from collects/net/url-sig.rkt
rename to racket/lib/collects/net/url-sig.rkt
diff --git a/collects/net/url-unit.rkt b/racket/lib/collects/net/url-unit.rkt
similarity index 100%
rename from collects/net/url-unit.rkt
rename to racket/lib/collects/net/url-unit.rkt
diff --git a/collects/racket/mpair.rkt b/racket/lib/collects/racket/mpair.rkt
similarity index 100%
rename from collects/racket/mpair.rkt
rename to racket/lib/collects/racket/mpair.rkt
diff --git a/collects/racket/package.rkt b/racket/lib/collects/racket/package.rkt
similarity index 100%
rename from collects/racket/package.rkt
rename to racket/lib/collects/racket/package.rkt
diff --git a/collects/racket/private/old-ds.rkt b/racket/lib/collects/racket/private/old-ds.rkt
similarity index 100%
rename from collects/racket/private/old-ds.rkt
rename to racket/lib/collects/racket/private/old-ds.rkt
diff --git a/collects/racket/private/old-if.rkt b/racket/lib/collects/racket/private/old-if.rkt
similarity index 100%
rename from collects/racket/private/old-if.rkt
rename to racket/lib/collects/racket/private/old-if.rkt
diff --git a/collects/racket/private/old-procs.rkt b/racket/lib/collects/racket/private/old-procs.rkt
similarity index 100%
rename from collects/racket/private/old-procs.rkt
rename to racket/lib/collects/racket/private/old-procs.rkt
diff --git a/collects/racket/private/old-rp.rkt b/racket/lib/collects/racket/private/old-rp.rkt
similarity index 100%
rename from collects/racket/private/old-rp.rkt
rename to racket/lib/collects/racket/private/old-rp.rkt
diff --git a/collects/racket/private/stxmz-body.rkt b/racket/lib/collects/racket/private/stxmz-body.rkt
similarity index 100%
rename from collects/racket/private/stxmz-body.rkt
rename to racket/lib/collects/racket/private/stxmz-body.rkt
diff --git a/collects/scheme/mpair.rkt b/racket/lib/collects/scheme/mpair.rkt
similarity index 100%
rename from collects/scheme/mpair.rkt
rename to racket/lib/collects/scheme/mpair.rkt
diff --git a/collects/scheme/package.rkt b/racket/lib/collects/scheme/package.rkt
similarity index 100%
rename from collects/scheme/package.rkt
rename to racket/lib/collects/scheme/package.rkt