diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/autosave-recovery-gui.rkt b/pkgs/drracket/tests/drracket/autosave-recovery-gui.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/autosave-recovery-gui.rkt
rename to pkgs/drracket/tests/drracket/autosave-recovery-gui.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/easter-egg.rkt b/pkgs/drracket/tests/drracket/easter-egg.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/easter-egg.rkt
rename to pkgs/drracket/tests/drracket/easter-egg.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/example-tool.rkt b/pkgs/drracket/tests/drracket/example-tool.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/example-tool.rkt
rename to pkgs/drracket/tests/drracket/example-tool.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/follow-log.rkt b/pkgs/drracket/tests/drracket/follow-log.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/follow-log.rkt
rename to pkgs/drracket/tests/drracket/follow-log.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/get-defs-test.rkt b/pkgs/drracket/tests/drracket/get-defs-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/get-defs-test.rkt
rename to pkgs/drracket/tests/drracket/get-defs-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/hangman.rkt b/pkgs/drracket/tests/drracket/hangman.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/hangman.rkt
rename to pkgs/drracket/tests/drracket/hangman.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/image-and-comment-box.rkt b/pkgs/drracket/tests/drracket/image-and-comment-box.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/image-and-comment-box.rkt
rename to pkgs/drracket/tests/drracket/image-and-comment-box.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/incremental-keybindings-test.rkt b/pkgs/drracket/tests/drracket/incremental-keybindings-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/incremental-keybindings-test.rkt
rename to pkgs/drracket/tests/drracket/incremental-keybindings-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/info.rkt b/pkgs/drracket/tests/drracket/info.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/info.rkt
rename to pkgs/drracket/tests/drracket/info.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/io.rkt b/pkgs/drracket/tests/drracket/io.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/io.rkt
rename to pkgs/drracket/tests/drracket/io.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/language-test.rkt b/pkgs/drracket/tests/drracket/language-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/language-test.rkt
rename to pkgs/drracket/tests/drracket/language-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/memory-log.rkt b/pkgs/drracket/tests/drracket/memory-log.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/memory-log.rkt
rename to pkgs/drracket/tests/drracket/memory-log.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/module-lang-test.rkt b/pkgs/drracket/tests/drracket/module-lang-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/module-lang-test.rkt
rename to pkgs/drracket/tests/drracket/module-lang-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/no-write-and-frame-leak.rkt b/pkgs/drracket/tests/drracket/no-write-and-frame-leak.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/no-write-and-frame-leak.rkt
rename to pkgs/drracket/tests/drracket/no-write-and-frame-leak.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/online-compilation-zo-creation.rkt b/pkgs/drracket/tests/drracket/online-compilation-zo-creation.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/online-compilation-zo-creation.rkt
rename to pkgs/drracket/tests/drracket/online-compilation-zo-creation.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/populate-compiled.rkt b/pkgs/drracket/tests/drracket/populate-compiled.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/populate-compiled.rkt
rename to pkgs/drracket/tests/drracket/populate-compiled.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/private/drracket-test-util.rkt b/pkgs/drracket/tests/drracket/private/drracket-test-util.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/private/drracket-test-util.rkt
rename to pkgs/drracket/tests/drracket/private/drracket-test-util.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/private/easter-egg-lib.rkt b/pkgs/drracket/tests/drracket/private/easter-egg-lib.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/private/easter-egg-lib.rkt
rename to pkgs/drracket/tests/drracket/private/easter-egg-lib.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/utils/gui.rkt b/pkgs/drracket/tests/drracket/private/gui.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/utils/gui.rkt
rename to pkgs/drracket/tests/drracket/private/gui.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/private/module-lang-test-utils.rkt b/pkgs/drracket/tests/drracket/private/module-lang-test-utils.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/private/module-lang-test-utils.rkt
rename to pkgs/drracket/tests/drracket/private/module-lang-test-utils.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/private/randomly-click.rkt b/pkgs/drracket/tests/drracket/private/randomly-click.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/private/randomly-click.rkt
rename to pkgs/drracket/tests/drracket/private/randomly-click.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/private/repl-test.rkt b/pkgs/drracket/tests/drracket/private/repl-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/private/repl-test.rkt
rename to pkgs/drracket/tests/drracket/private/repl-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/private/run-example-tool.rkt b/pkgs/drracket/tests/drracket/private/run-example-tool.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/private/run-example-tool.rkt
rename to pkgs/drracket/tests/drracket/private/run-example-tool.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/randomly-click-language-dialog.rkt b/pkgs/drracket/tests/drracket/randomly-click-language-dialog.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/randomly-click-language-dialog.rkt
rename to pkgs/drracket/tests/drracket/randomly-click-language-dialog.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/randomly-click-preferences.rkt b/pkgs/drracket/tests/drracket/randomly-click-preferences.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/randomly-click-preferences.rkt
rename to pkgs/drracket/tests/drracket/randomly-click-preferences.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-debug.rkt b/pkgs/drracket/tests/drracket/repl-test-debug.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-debug.rkt
rename to pkgs/drracket/tests/drracket/repl-test-debug.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-debugprofile.rkt b/pkgs/drracket/tests/drracket/repl-test-debugprofile.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-debugprofile.rkt
rename to pkgs/drracket/tests/drracket/repl-test-debugprofile.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-misc.rkt b/pkgs/drracket/tests/drracket/repl-test-misc.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-misc.rkt
rename to pkgs/drracket/tests/drracket/repl-test-misc.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-raw.rkt b/pkgs/drracket/tests/drracket/repl-test-raw.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/repl-test-raw.rkt
rename to pkgs/drracket/tests/drracket/repl-test-raw.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/run.sh b/pkgs/drracket/tests/drracket/run.sh
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/run.sh
rename to pkgs/drracket/tests/drracket/run.sh
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/sample-solutions-one-window.rkt b/pkgs/drracket/tests/drracket/sample-solutions-one-window.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/sample-solutions-one-window.rkt
rename to pkgs/drracket/tests/drracket/sample-solutions-one-window.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/sample-solutions-testsuite-tp.scm b/pkgs/drracket/tests/drracket/sample-solutions-testsuite-tp.scm
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/sample-solutions-testsuite-tp.scm
rename to pkgs/drracket/tests/drracket/sample-solutions-testsuite-tp.scm
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/2htdpimage.rkt b/pkgs/drracket/tests/drracket/snip/2htdpimage.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/2htdpimage.rkt
rename to pkgs/drracket/tests/drracket/snip/2htdpimage.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/collapsed-nested.rkt b/pkgs/drracket/tests/drracket/snip/collapsed-nested.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/collapsed-nested.rkt
rename to pkgs/drracket/tests/drracket/snip/collapsed-nested.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/collapsed.rkt b/pkgs/drracket/tests/drracket/snip/collapsed.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/collapsed.rkt
rename to pkgs/drracket/tests/drracket/snip/collapsed.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/collapsed2.rkt b/pkgs/drracket/tests/drracket/snip/collapsed2.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/collapsed2.rkt
rename to pkgs/drracket/tests/drracket/snip/collapsed2.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/commentbox.rkt b/pkgs/drracket/tests/drracket/snip/commentbox.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/commentbox.rkt
rename to pkgs/drracket/tests/drracket/snip/commentbox.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/image.rkt b/pkgs/drracket/tests/drracket/snip/image.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/image.rkt
rename to pkgs/drracket/tests/drracket/snip/image.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/number-snip.rkt b/pkgs/drracket/tests/drracket/snip/number-snip.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/number-snip.rkt
rename to pkgs/drracket/tests/drracket/snip/number-snip.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/pict-snip.rkt b/pkgs/drracket/tests/drracket/snip/pict-snip.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/pict-snip.rkt
rename to pkgs/drracket/tests/drracket/snip/pict-snip.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snip/run-all.rkt b/pkgs/drracket/tests/drracket/snip/run-all.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snip/run-all.rkt
rename to pkgs/drracket/tests/drracket/snip/run-all.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/snips.rkt b/pkgs/drracket/tests/drracket/snips.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/snips.rkt
rename to pkgs/drracket/tests/drracket/snips.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/stepper-test.rkt b/pkgs/drracket/tests/drracket/stepper-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/stepper-test.rkt
rename to pkgs/drracket/tests/drracket/stepper-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/syncheck-direct.rkt b/pkgs/drracket/tests/drracket/syncheck-direct.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/syncheck-direct.rkt
rename to pkgs/drracket/tests/drracket/syncheck-direct.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/syncheck-eval-compile-time.rkt b/pkgs/drracket/tests/drracket/syncheck-eval-compile-time.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/syncheck-eval-compile-time.rkt
rename to pkgs/drracket/tests/drracket/syncheck-eval-compile-time.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/syncheck-test.rkt b/pkgs/drracket/tests/drracket/syncheck-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/syncheck-test.rkt
rename to pkgs/drracket/tests/drracket/syncheck-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-coverage.rkt b/pkgs/drracket/tests/drracket/teaching-lang-coverage.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-coverage.rkt
rename to pkgs/drracket/tests/drracket/teaching-lang-coverage.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-executable-creation.rkt b/pkgs/drracket/tests/drracket/teaching-lang-executable-creation.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-executable-creation.rkt
rename to pkgs/drracket/tests/drracket/teaching-lang-executable-creation.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-save-file.rkt b/pkgs/drracket/tests/drracket/teaching-lang-save-file.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-save-file.rkt
rename to pkgs/drracket/tests/drracket/teaching-lang-save-file.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-sharing-modules.rkt b/pkgs/drracket/tests/drracket/teaching-lang-sharing-modules.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/teaching-lang-sharing-modules.rkt
rename to pkgs/drracket/tests/drracket/teaching-lang-sharing-modules.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/teachpack.rkt b/pkgs/drracket/tests/drracket/teachpack.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/teachpack.rkt
rename to pkgs/drracket/tests/drracket/teachpack.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/test-docs-complete.rkt b/pkgs/drracket/tests/drracket/test-docs-complete.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/test-docs-complete.rkt
rename to pkgs/drracket/tests/drracket/test-docs-complete.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/test-engine-test.rkt b/pkgs/drracket/tests/drracket/test-engine-test.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/test-engine-test.rkt
rename to pkgs/drracket/tests/drracket/test-engine-test.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/drracket/time-keystrokes.rkt b/pkgs/drracket/tests/drracket/time-keystrokes.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/drracket/time-keystrokes.rkt
rename to pkgs/drracket/tests/drracket/time-keystrokes.rkt