diff --git a/collects/meta/drdr2/analyzer/analyzer.rkt b/collects/meta/drdr2/analyzer/analyzer.rkt
deleted file mode 100644
index 6f1f7b4de3..0000000000
--- a/collects/meta/drdr2/analyzer/analyzer.rkt
+++ /dev/null
@@ -1 +0,0 @@
-#lang racket
diff --git a/collects/meta/drdr2/master/master.rkt b/pkgs/plt-services/meta/drdr2/master/master.rkt
similarity index 100%
rename from collects/meta/drdr2/master/master.rkt
rename to pkgs/plt-services/meta/drdr2/master/master.rkt
diff --git a/collects/tests/pkg/test-pkgs/pkg-z/info.rkt b/pkgs/racket-pkgs/at-exp-lib/info.rkt
similarity index 95%
rename from collects/tests/pkg/test-pkgs/pkg-z/info.rkt
rename to pkgs/racket-pkgs/at-exp-lib/info.rkt
index 13a63c4835..c14a2ca411 100644
--- a/collects/tests/pkg/test-pkgs/pkg-z/info.rkt
+++ b/pkgs/racket-pkgs/at-exp-lib/info.rkt
@@ -1,2 +1 @@
 #lang setup/infotab
-
diff --git a/collects/tests/compiler/collection-zos.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/collection-zos.rkt
similarity index 100%
rename from collects/tests/compiler/collection-zos.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/collection-zos.rkt
diff --git a/collects/tests/compiler/demodularizer/demod-test.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/demod-test.rkt
similarity index 100%
rename from collects/tests/compiler/demodularizer/demod-test.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/demod-test.rkt
diff --git a/collects/tests/compiler/demodularizer/tests/kernel-5.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/tests/kernel-5.rkt
similarity index 100%
rename from collects/tests/compiler/demodularizer/tests/kernel-5.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/tests/kernel-5.rkt
diff --git a/collects/tests/compiler/demodularizer/tests/racket-5.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/tests/racket-5.rkt
similarity index 100%
rename from collects/tests/compiler/demodularizer/tests/racket-5.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/demodularizer/tests/racket-5.rkt
diff --git a/collects/tests/compiler/regression.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/regression.rkt
similarity index 100%
rename from collects/tests/compiler/regression.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/regression.rkt
diff --git a/collects/tests/compiler/test/a.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/test/a.rkt
similarity index 100%
rename from collects/tests/compiler/test/a.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/test/a.rkt
diff --git a/collects/tests/compiler/test/b.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/test/b.rkt
similarity index 100%
rename from collects/tests/compiler/test/b.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/test/b.rkt
diff --git a/collects/tests/compiler/test/d/c.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/test/d/c.rkt
similarity index 100%
rename from collects/tests/compiler/test/d/c.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/test/d/c.rkt
diff --git a/collects/tests/compiler/test/d/d.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/test/d/d.rkt
similarity index 100%
rename from collects/tests/compiler/test/d/d.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/test/d/d.rkt
diff --git a/collects/tests/compiler/zo-exs.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/zo-exs.rkt
similarity index 100%
rename from collects/tests/compiler/zo-exs.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/zo-exs.rkt
diff --git a/collects/tests/compiler/zo-test-util.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/zo-test-util.rkt
similarity index 100%
rename from collects/tests/compiler/zo-test-util.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/zo-test-util.rkt
diff --git a/collects/tests/compiler/zo-test-worker.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/zo-test-worker.rkt
similarity index 100%
rename from collects/tests/compiler/zo-test-worker.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/zo-test-worker.rkt
diff --git a/collects/tests/compiler/zo-test.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/zo-test.rkt
similarity index 100%
rename from collects/tests/compiler/zo-test.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/zo-test.rkt
diff --git a/collects/tests/compiler/zo.rkt b/pkgs/racket-pkgs/racket-test/tests/compiler/zo.rkt
similarity index 100%
rename from collects/tests/compiler/zo.rkt
rename to pkgs/racket-pkgs/racket-test/tests/compiler/zo.rkt
diff --git a/collects/tests/racket/benchmarks/shootout/nothing.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/shootout/nothing.rkt
similarity index 100%
rename from collects/tests/racket/benchmarks/shootout/nothing.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/shootout/nothing.rkt
diff --git a/collects/tests/racket/ctool.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/ctool.rkt
similarity index 100%
rename from collects/tests/racket/ctool.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/ctool.rkt
diff --git a/collects/tests/racket/embed-asl.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-asl.rkt
similarity index 100%
rename from collects/tests/racket/embed-asl.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-asl.rkt
diff --git a/collects/tests/racket/embed-bsl.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-bsl.rkt
similarity index 100%
rename from collects/tests/racket/embed-bsl.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-bsl.rkt
diff --git a/collects/tests/racket/embed-bsla.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-bsla.rkt
similarity index 100%
rename from collects/tests/racket/embed-bsla.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-bsla.rkt
diff --git a/collects/tests/racket/embed-isl.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-isl.rkt
similarity index 100%
rename from collects/tests/racket/embed-isl.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-isl.rkt
diff --git a/collects/tests/racket/embed-isll.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-isll.rkt
similarity index 100%
rename from collects/tests/racket/embed-isll.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-isll.rkt
diff --git a/collects/tests/racket/embed-me1.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me1.rkt
similarity index 100%
rename from collects/tests/racket/embed-me1.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me1.rkt
diff --git a/collects/tests/racket/embed-me10.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me10.rkt
similarity index 100%
rename from collects/tests/racket/embed-me10.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me10.rkt
diff --git a/collects/tests/racket/embed-me11-rd.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me11-rd.rkt
similarity index 100%
rename from collects/tests/racket/embed-me11-rd.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me11-rd.rkt
diff --git a/collects/tests/racket/embed-me12-rd.ss b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me12-rd.ss
similarity index 100%
rename from collects/tests/racket/embed-me12-rd.ss
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me12-rd.ss
diff --git a/collects/tests/racket/embed-me13.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me13.rkt
similarity index 100%
rename from collects/tests/racket/embed-me13.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me13.rkt
diff --git a/collects/tests/racket/embed-me14.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me14.rkt
similarity index 100%
rename from collects/tests/racket/embed-me14.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me14.rkt
diff --git a/collects/tests/racket/embed-me15-one.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me15-one.rkt
similarity index 100%
rename from collects/tests/racket/embed-me15-one.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me15-one.rkt
diff --git a/collects/tests/racket/embed-me15.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me15.rkt
similarity index 100%
rename from collects/tests/racket/embed-me15.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me15.rkt
diff --git a/collects/tests/racket/embed-me16.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me16.rkt
similarity index 100%
rename from collects/tests/racket/embed-me16.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me16.rkt
diff --git a/collects/tests/racket/embed-me17.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me17.rkt
similarity index 100%
rename from collects/tests/racket/embed-me17.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me17.rkt
diff --git a/collects/tests/racket/embed-me17a.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me17a.rkt
similarity index 100%
rename from collects/tests/racket/embed-me17a.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me17a.rkt
diff --git a/collects/tests/racket/embed-me18a.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me18a.rkt
similarity index 100%
rename from collects/tests/racket/embed-me18a.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me18a.rkt
diff --git a/collects/tests/racket/embed-me19.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me19.rkt
similarity index 100%
rename from collects/tests/racket/embed-me19.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me19.rkt
diff --git a/collects/tests/racket/embed-me1b.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me1b.rkt
similarity index 100%
rename from collects/tests/racket/embed-me1b.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me1b.rkt
diff --git a/collects/tests/racket/embed-me1c.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me1c.rkt
similarity index 100%
rename from collects/tests/racket/embed-me1c.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me1c.rkt
diff --git a/collects/tests/racket/embed-me1d.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me1d.rkt
similarity index 100%
rename from collects/tests/racket/embed-me1d.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me1d.rkt
diff --git a/collects/tests/racket/embed-me1e.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me1e.rkt
similarity index 100%
rename from collects/tests/racket/embed-me1e.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me1e.rkt
diff --git a/collects/tests/racket/embed-me2.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me2.rkt
similarity index 100%
rename from collects/tests/racket/embed-me2.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me2.rkt
diff --git a/collects/tests/racket/embed-me20.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me20.rkt
similarity index 100%
rename from collects/tests/racket/embed-me20.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me20.rkt
diff --git a/collects/tests/racket/embed-me21.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me21.rkt
similarity index 100%
rename from collects/tests/racket/embed-me21.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me21.rkt
diff --git a/collects/tests/racket/embed-me22.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me22.rkt
similarity index 100%
rename from collects/tests/racket/embed-me22.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me22.rkt
diff --git a/collects/tests/racket/embed-me3.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me3.rkt
similarity index 100%
rename from collects/tests/racket/embed-me3.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me3.rkt
diff --git a/collects/tests/racket/embed-me4.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me4.rktl
similarity index 100%
rename from collects/tests/racket/embed-me4.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me4.rktl
diff --git a/collects/tests/racket/embed-me5.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me5.rkt
similarity index 100%
rename from collects/tests/racket/embed-me5.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me5.rkt
diff --git a/collects/tests/racket/embed-me6.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me6.rkt
similarity index 100%
rename from collects/tests/racket/embed-me6.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me6.rkt
diff --git a/collects/tests/racket/embed-me8.c b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me8.c
similarity index 100%
rename from collects/tests/racket/embed-me8.c
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me8.c
diff --git a/collects/tests/racket/embed-me9.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-me9.rkt
similarity index 100%
rename from collects/tests/racket/embed-me9.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-me9.rkt
diff --git a/collects/tests/racket/embed-place.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-place.rkt
similarity index 100%
rename from collects/tests/racket/embed-place.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-place.rkt
diff --git a/collects/tests/racket/embed-planet-1/alt.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/alt.rkt
similarity index 100%
rename from collects/tests/racket/embed-planet-1/alt.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/alt.rkt
diff --git a/collects/tests/racket/embed-planet-1/dyn-sub.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/dyn-sub.rkt
similarity index 100%
rename from collects/tests/racket/embed-planet-1/dyn-sub.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/dyn-sub.rkt
diff --git a/collects/tests/racket/embed-planet-1/has-sub.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/has-sub.rkt
similarity index 100%
rename from collects/tests/racket/embed-planet-1/has-sub.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/has-sub.rkt
diff --git a/collects/tests/racket/embed-planet-1/main.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/main.rkt
similarity index 100%
rename from collects/tests/racket/embed-planet-1/main.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/main.rkt
diff --git a/collects/tests/racket/embed-planet-1/other.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/other.rkt
similarity index 100%
rename from collects/tests/racket/embed-planet-1/other.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-1/other.rkt
diff --git a/collects/tests/racket/embed-planet-2/main.ss b/pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-2/main.ss
similarity index 100%
rename from collects/tests/racket/embed-planet-2/main.ss
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-2/main.ss
diff --git a/collects/tests/racket/embed-planet-2/private/sub.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-2/private/sub.rkt
similarity index 100%
rename from collects/tests/racket/embed-planet-2/private/sub.rkt
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed-planet-2/private/sub.rkt
diff --git a/collects/tests/racket/embed.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/embed.rktl
similarity index 100%
rename from collects/tests/racket/embed.rktl
rename to pkgs/racket-pkgs/racket-test/tests/racket/embed.rktl
diff --git a/collects/compiler/bundle-dist.rkt b/racket/lib/collects/compiler/bundle-dist.rkt
similarity index 100%
rename from collects/compiler/bundle-dist.rkt
rename to racket/lib/collects/compiler/bundle-dist.rkt
diff --git a/collects/compiler/commands/decompile.rkt b/racket/lib/collects/compiler/commands/decompile.rkt
similarity index 100%
rename from collects/compiler/commands/decompile.rkt
rename to racket/lib/collects/compiler/commands/decompile.rkt
diff --git a/collects/compiler/commands/exe-dir.rkt b/racket/lib/collects/compiler/commands/exe-dir.rkt
similarity index 100%
rename from collects/compiler/commands/exe-dir.rkt
rename to racket/lib/collects/compiler/commands/exe-dir.rkt
diff --git a/collects/compiler/commands/exe.rkt b/racket/lib/collects/compiler/commands/exe.rkt
similarity index 100%
rename from collects/compiler/commands/exe.rkt
rename to racket/lib/collects/compiler/commands/exe.rkt
diff --git a/collects/compiler/commands/expand.rkt b/racket/lib/collects/compiler/commands/expand.rkt
similarity index 100%
rename from collects/compiler/commands/expand.rkt
rename to racket/lib/collects/compiler/commands/expand.rkt
diff --git a/collects/compiler/commands/info.rkt b/racket/lib/collects/compiler/commands/info.rkt
similarity index 100%
rename from collects/compiler/commands/info.rkt
rename to racket/lib/collects/compiler/commands/info.rkt
diff --git a/collects/compiler/commands/make.rkt b/racket/lib/collects/compiler/commands/make.rkt
similarity index 100%
rename from collects/compiler/commands/make.rkt
rename to racket/lib/collects/compiler/commands/make.rkt
diff --git a/collects/compiler/commands/pack.rkt b/racket/lib/collects/compiler/commands/pack.rkt
similarity index 100%
rename from collects/compiler/commands/pack.rkt
rename to racket/lib/collects/compiler/commands/pack.rkt
diff --git a/collects/compiler/commands/test.rkt b/racket/lib/collects/compiler/commands/test.rkt
similarity index 100%
rename from collects/compiler/commands/test.rkt
rename to racket/lib/collects/compiler/commands/test.rkt
diff --git a/collects/compiler/commands/unpack.rkt b/racket/lib/collects/compiler/commands/unpack.rkt
similarity index 100%
rename from collects/compiler/commands/unpack.rkt
rename to racket/lib/collects/compiler/commands/unpack.rkt
diff --git a/collects/compiler/decompile.rkt b/racket/lib/collects/compiler/decompile.rkt
similarity index 100%
rename from collects/compiler/decompile.rkt
rename to racket/lib/collects/compiler/decompile.rkt
diff --git a/collects/compiler/demodularizer/alpha.rkt b/racket/lib/collects/compiler/demodularizer/alpha.rkt
similarity index 100%
rename from collects/compiler/demodularizer/alpha.rkt
rename to racket/lib/collects/compiler/demodularizer/alpha.rkt
diff --git a/collects/compiler/demodularizer/batch.rkt b/racket/lib/collects/compiler/demodularizer/batch.rkt
similarity index 100%
rename from collects/compiler/demodularizer/batch.rkt
rename to racket/lib/collects/compiler/demodularizer/batch.rkt
diff --git a/collects/compiler/demodularizer/gc-toplevels.rkt b/racket/lib/collects/compiler/demodularizer/gc-toplevels.rkt
similarity index 100%
rename from collects/compiler/demodularizer/gc-toplevels.rkt
rename to racket/lib/collects/compiler/demodularizer/gc-toplevels.rkt
diff --git a/collects/compiler/demodularizer/main.rkt b/racket/lib/collects/compiler/demodularizer/main.rkt
similarity index 100%
rename from collects/compiler/demodularizer/main.rkt
rename to racket/lib/collects/compiler/demodularizer/main.rkt
diff --git a/collects/compiler/demodularizer/merge.rkt b/racket/lib/collects/compiler/demodularizer/merge.rkt
similarity index 100%
rename from collects/compiler/demodularizer/merge.rkt
rename to racket/lib/collects/compiler/demodularizer/merge.rkt
diff --git a/collects/compiler/demodularizer/module.rkt b/racket/lib/collects/compiler/demodularizer/module.rkt
similarity index 100%
rename from collects/compiler/demodularizer/module.rkt
rename to racket/lib/collects/compiler/demodularizer/module.rkt
diff --git a/collects/compiler/demodularizer/mpi.rkt b/racket/lib/collects/compiler/demodularizer/mpi.rkt
similarity index 100%
rename from collects/compiler/demodularizer/mpi.rkt
rename to racket/lib/collects/compiler/demodularizer/mpi.rkt
diff --git a/collects/compiler/demodularizer/nodep.rkt b/racket/lib/collects/compiler/demodularizer/nodep.rkt
similarity index 100%
rename from collects/compiler/demodularizer/nodep.rkt
rename to racket/lib/collects/compiler/demodularizer/nodep.rkt
diff --git a/collects/compiler/demodularizer/replace-modidx.rkt b/racket/lib/collects/compiler/demodularizer/replace-modidx.rkt
similarity index 100%
rename from collects/compiler/demodularizer/replace-modidx.rkt
rename to racket/lib/collects/compiler/demodularizer/replace-modidx.rkt
diff --git a/collects/compiler/demodularizer/update-toplevels.rkt b/racket/lib/collects/compiler/demodularizer/update-toplevels.rkt
similarity index 100%
rename from collects/compiler/demodularizer/update-toplevels.rkt
rename to racket/lib/collects/compiler/demodularizer/update-toplevels.rkt
diff --git a/collects/compiler/demodularizer/util.rkt b/racket/lib/collects/compiler/demodularizer/util.rkt
similarity index 100%
rename from collects/compiler/demodularizer/util.rkt
rename to racket/lib/collects/compiler/demodularizer/util.rkt
diff --git a/collects/compiler/embed-sig.rkt b/racket/lib/collects/compiler/embed-sig.rkt
similarity index 100%
rename from collects/compiler/embed-sig.rkt
rename to racket/lib/collects/compiler/embed-sig.rkt
diff --git a/collects/compiler/sig.rkt b/racket/lib/collects/compiler/sig.rkt
similarity index 100%
rename from collects/compiler/sig.rkt
rename to racket/lib/collects/compiler/sig.rkt
diff --git a/collects/compiler/zo-marshal.rkt b/racket/lib/collects/compiler/zo-marshal.rkt
similarity index 100%
rename from collects/compiler/zo-marshal.rkt
rename to racket/lib/collects/compiler/zo-marshal.rkt
diff --git a/collects/compiler/zo-parse.rkt b/racket/lib/collects/compiler/zo-parse.rkt
similarity index 100%
rename from collects/compiler/zo-parse.rkt
rename to racket/lib/collects/compiler/zo-parse.rkt
diff --git a/collects/compiler/zo-structs.rkt b/racket/lib/collects/compiler/zo-structs.rkt
similarity index 100%
rename from collects/compiler/zo-structs.rkt
rename to racket/lib/collects/compiler/zo-structs.rkt
diff --git a/collects/launcher/launcher-sig.rkt b/racket/lib/collects/launcher/launcher-sig.rkt
similarity index 100%
rename from collects/launcher/launcher-sig.rkt
rename to racket/lib/collects/launcher/launcher-sig.rkt
diff --git a/collects/setup/option-sig.rkt b/racket/lib/collects/setup/option-sig.rkt
similarity index 100%
rename from collects/setup/option-sig.rkt
rename to racket/lib/collects/setup/option-sig.rkt