diff --git a/pkgs/redex/redex.scrbl b/pkgs/redex-pkgs/redex-doc/redex/redex.scrbl
similarity index 100%
rename from pkgs/redex/redex.scrbl
rename to pkgs/redex-pkgs/redex-doc/redex/redex.scrbl
diff --git a/pkgs/redex/scribblings/dynamic-typesetting-and-macros.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/dynamic-typesetting-and-macros.scrbl
similarity index 100%
rename from pkgs/redex/scribblings/dynamic-typesetting-and-macros.scrbl
rename to pkgs/redex-pkgs/redex-doc/redex/scribblings/dynamic-typesetting-and-macros.scrbl
diff --git a/pkgs/redex/scribblings/info.rkt b/pkgs/redex-pkgs/redex-doc/redex/scribblings/info.rkt
similarity index 100%
rename from pkgs/redex/scribblings/info.rkt
rename to pkgs/redex-pkgs/redex-doc/redex/scribblings/info.rkt
diff --git a/pkgs/redex/scribblings/ref.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/ref.scrbl
similarity index 100%
rename from pkgs/redex/scribblings/ref.scrbl
rename to pkgs/redex-pkgs/redex-doc/redex/scribblings/ref.scrbl
diff --git a/pkgs/redex/scribblings/tut-util.rkt b/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut-util.rkt
similarity index 100%
rename from pkgs/redex/scribblings/tut-util.rkt
rename to pkgs/redex-pkgs/redex-doc/redex/scribblings/tut-util.rkt
diff --git a/pkgs/redex/scribblings/tut.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/tut.scrbl
similarity index 100%
rename from pkgs/redex/scribblings/tut.scrbl
rename to pkgs/redex-pkgs/redex-doc/redex/scribblings/tut.scrbl
diff --git a/pkgs/redex/scribblings/typesetting-and-macros.scrbl b/pkgs/redex-pkgs/redex-doc/redex/scribblings/typesetting-and-macros.scrbl
similarity index 100%
rename from pkgs/redex/scribblings/typesetting-and-macros.scrbl
rename to pkgs/redex-pkgs/redex-doc/redex/scribblings/typesetting-and-macros.scrbl
diff --git a/pkgs/redex/examples/README b/pkgs/redex-pkgs/redex-examples/redex/examples/README
similarity index 100%
rename from pkgs/redex/examples/README
rename to pkgs/redex-pkgs/redex-examples/redex/examples/README
diff --git a/pkgs/redex/examples/arithmetic.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/arithmetic.rkt
similarity index 100%
rename from pkgs/redex/examples/arithmetic.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/arithmetic.rkt
diff --git a/pkgs/redex/examples/beginner.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/beginner.rkt
similarity index 100%
rename from pkgs/redex/examples/beginner.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/beginner.rkt
diff --git a/pkgs/redex/examples/cbn-letrec.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cbn-letrec.rkt
similarity index 100%
rename from pkgs/redex/examples/cbn-letrec.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cbn-letrec.rkt
diff --git a/pkgs/redex/examples/church.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/church.rkt
similarity index 100%
rename from pkgs/redex/examples/church.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/church.rkt
diff --git a/pkgs/redex/examples/combinators.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/combinators.rkt
similarity index 100%
rename from pkgs/redex/examples/combinators.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/combinators.rkt
diff --git a/pkgs/redex/examples/compatible-closure.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/compatible-closure.rkt
similarity index 100%
rename from pkgs/redex/examples/compatible-closure.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/compatible-closure.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/CMT-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT-test.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/CMT-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT-test.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/CMT.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/CMT.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/CMT.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/SL-semantics-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics-test.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/SL-semantics-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics-test.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/SL-semantics.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/SL-semantics.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-semantics.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/SL-syntax.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-syntax.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/SL-syntax.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/SL-syntax.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/TL-semantics-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics-test.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/TL-semantics-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics-test.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/TL-semantics.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/TL-semantics.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-semantics.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/TL-syntax.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-syntax.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/TL-syntax.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/TL-syntax.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/all-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/all-test.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/all-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/all-test.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/common.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/common.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/common.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/common.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/randomized-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/randomized-tests.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/randomized-tests.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/randomized-tests.rkt
diff --git a/pkgs/redex/examples/cont-mark-transform/test-util.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/test-util.rkt
similarity index 100%
rename from pkgs/redex/examples/cont-mark-transform/test-util.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/cont-mark-transform/test-util.rkt
diff --git a/pkgs/redex/examples/contracts.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/contracts.rkt
similarity index 100%
rename from pkgs/redex/examples/contracts.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/contracts.rkt
diff --git a/pkgs/redex/examples/define-judgment-form/multi-val.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/multi-val.rkt
similarity index 100%
rename from pkgs/redex/examples/define-judgment-form/multi-val.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/multi-val.rkt
diff --git a/pkgs/redex/examples/define-judgment-form/sos.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/sos.rkt
similarity index 100%
rename from pkgs/redex/examples/define-judgment-form/sos.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/sos.rkt
diff --git a/pkgs/redex/examples/define-judgment-form/typing-rules-no-ellipses.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules-no-ellipses.rkt
similarity index 100%
rename from pkgs/redex/examples/define-judgment-form/typing-rules-no-ellipses.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules-no-ellipses.rkt
diff --git a/pkgs/redex/examples/define-judgment-form/typing-rules.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules.rkt
similarity index 100%
rename from pkgs/redex/examples/define-judgment-form/typing-rules.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/define-judgment-form/typing-rules.rkt
diff --git a/pkgs/redex/examples/delim-cont/README.txt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/README.txt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/README.txt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/README.txt
diff --git a/pkgs/redex/examples/delim-cont/grammar.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/grammar.rkt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/grammar.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/grammar.rkt
diff --git a/pkgs/redex/examples/delim-cont/meta.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/meta.rkt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/meta.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/meta.rkt
diff --git a/pkgs/redex/examples/delim-cont/model-impl.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/model-impl.rkt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/model-impl.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/model-impl.rkt
diff --git a/pkgs/redex/examples/delim-cont/randomized-tests-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests-test.rkt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/randomized-tests-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests-test.rkt
diff --git a/pkgs/redex/examples/delim-cont/randomized-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests.rkt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/randomized-tests.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/randomized-tests.rkt
diff --git a/pkgs/redex/examples/delim-cont/reduce.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/reduce.rkt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/reduce.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/reduce.rkt
diff --git a/pkgs/redex/examples/delim-cont/test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/test.rkt
similarity index 100%
rename from pkgs/redex/examples/delim-cont/test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/delim-cont/test.rkt
diff --git a/pkgs/redex/examples/info.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/info.rkt
similarity index 100%
rename from pkgs/redex/examples/info.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/info.rkt
diff --git a/pkgs/redex/examples/letrec.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/letrec.rkt
similarity index 100%
rename from pkgs/redex/examples/letrec.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/letrec.rkt
diff --git a/pkgs/redex/examples/list-machine/README.txt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/README.txt
similarity index 100%
rename from pkgs/redex/examples/list-machine/README.txt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/README.txt
diff --git a/pkgs/redex/examples/list-machine/list-machine-typing.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine-typing.rkt
similarity index 100%
rename from pkgs/redex/examples/list-machine/list-machine-typing.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine-typing.rkt
diff --git a/pkgs/redex/examples/list-machine/list-machine.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine.rkt
similarity index 100%
rename from pkgs/redex/examples/list-machine/list-machine.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/list-machine.rkt
diff --git a/pkgs/redex/examples/list-machine/p-sample.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/p-sample.rkt
similarity index 100%
rename from pkgs/redex/examples/list-machine/p-sample.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/p-sample.rkt
diff --git a/pkgs/redex/examples/list-machine/slides.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/slides.rkt
similarity index 100%
rename from pkgs/redex/examples/list-machine/slides.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/slides.rkt
diff --git a/pkgs/redex/examples/list-machine/test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/test.rkt
similarity index 100%
rename from pkgs/redex/examples/list-machine/test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/list-machine/test.rkt
diff --git a/pkgs/redex/examples/omega.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/omega.rkt
similarity index 100%
rename from pkgs/redex/examples/omega.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/omega.rkt
diff --git a/pkgs/redex/examples/pi-calculus.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/pi-calculus.rkt
similarity index 100%
rename from pkgs/redex/examples/pi-calculus.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/pi-calculus.rkt
diff --git a/pkgs/redex/examples/r6rs/README b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/README
similarity index 100%
rename from pkgs/redex/examples/r6rs/README
rename to pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/README
diff --git a/pkgs/redex/examples/r6rs/r6rs-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs-tests.rkt
similarity index 100%
rename from pkgs/redex/examples/r6rs/r6rs-tests.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs-tests.rkt
diff --git a/pkgs/redex/examples/r6rs/r6rs.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs.rkt
similarity index 100%
rename from pkgs/redex/examples/r6rs/r6rs.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/r6rs.rkt
diff --git a/pkgs/redex/examples/r6rs/racket-vs-redex.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/racket-vs-redex.rkt
similarity index 100%
rename from pkgs/redex/examples/r6rs/racket-vs-redex.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/racket-vs-redex.rkt
diff --git a/pkgs/redex/examples/r6rs/show-examples.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/show-examples.rkt
similarity index 100%
rename from pkgs/redex/examples/r6rs/show-examples.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/show-examples.rkt
diff --git a/pkgs/redex/examples/r6rs/test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/test.rkt
similarity index 100%
rename from pkgs/redex/examples/r6rs/test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/r6rs/test.rkt
diff --git a/pkgs/redex/examples/racket-machine/examples.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/examples.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/examples.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/examples.rkt
diff --git a/pkgs/redex/examples/racket-machine/grammar.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/grammar.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/grammar.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/grammar.rkt
diff --git a/pkgs/redex/examples/racket-machine/impl-eval.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-eval.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/impl-eval.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-eval.rkt
diff --git a/pkgs/redex/examples/racket-machine/impl-exec.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-exec.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/impl-exec.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/impl-exec.rkt
diff --git a/pkgs/redex/examples/racket-machine/model-impl.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/model-impl.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/model-impl.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/model-impl.rkt
diff --git a/pkgs/redex/examples/racket-machine/randomized-tests-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests-test.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/randomized-tests-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests-test.rkt
diff --git a/pkgs/redex/examples/racket-machine/randomized-tests.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/randomized-tests.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/randomized-tests.rkt
diff --git a/pkgs/redex/examples/racket-machine/reduction-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction-test.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/reduction-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction-test.rkt
diff --git a/pkgs/redex/examples/racket-machine/reduction.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/reduction.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/reduction.rkt
diff --git a/pkgs/redex/examples/racket-machine/util.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/util.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/util.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/util.rkt
diff --git a/pkgs/redex/examples/racket-machine/verification-test.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification-test.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/verification-test.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification-test.rkt
diff --git a/pkgs/redex/examples/racket-machine/verification.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification.rkt
similarity index 100%
rename from pkgs/redex/examples/racket-machine/verification.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/racket-machine/verification.rkt
diff --git a/pkgs/redex/examples/semaphores.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/semaphores.rkt
similarity index 100%
rename from pkgs/redex/examples/semaphores.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/semaphores.rkt
diff --git a/pkgs/redex/examples/stlc.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/stlc.rkt
similarity index 100%
rename from pkgs/redex/examples/stlc.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/stlc.rkt
diff --git a/pkgs/redex/examples/subject-reduction.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/subject-reduction.rkt
similarity index 100%
rename from pkgs/redex/examples/subject-reduction.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/subject-reduction.rkt
diff --git a/pkgs/redex/examples/subst.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/subst.rkt
similarity index 100%
rename from pkgs/redex/examples/subst.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/subst.rkt
diff --git a/pkgs/redex/examples/threads.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/threads.rkt
similarity index 100%
rename from pkgs/redex/examples/threads.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/threads.rkt
diff --git a/pkgs/redex/examples/types.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/types.rkt
similarity index 100%
rename from pkgs/redex/examples/types.rkt
rename to pkgs/redex-pkgs/redex-examples/redex/examples/types.rkt
diff --git a/pkgs/redex/HISTORY.txt b/pkgs/redex-pkgs/redex-lib/redex/HISTORY.txt
similarity index 100%
rename from pkgs/redex/HISTORY.txt
rename to pkgs/redex-pkgs/redex-lib/redex/HISTORY.txt
diff --git a/pkgs/redex/gui.rkt b/pkgs/redex-pkgs/redex-lib/redex/gui.rkt
similarity index 100%
rename from pkgs/redex/gui.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/gui.rkt
diff --git a/pkgs/redex/info.rkt b/pkgs/redex-pkgs/redex-lib/redex/info.rkt
similarity index 100%
rename from pkgs/redex/info.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/info.rkt
diff --git a/pkgs/redex/main.rkt b/pkgs/redex-pkgs/redex-lib/redex/main.rkt
similarity index 100%
rename from pkgs/redex/main.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/main.rkt
diff --git a/pkgs/redex/pict.rkt b/pkgs/redex-pkgs/redex-lib/redex/pict.rkt
similarity index 100%
rename from pkgs/redex/pict.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/pict.rkt
diff --git a/pkgs/redex/private/arrow.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/arrow.rkt
similarity index 100%
rename from pkgs/redex/private/arrow.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/arrow.rkt
diff --git a/pkgs/redex/private/compiler/match.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/compiler/match.rkt
similarity index 100%
rename from pkgs/redex/private/compiler/match.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/compiler/match.rkt
diff --git a/pkgs/redex/private/compiler/redextomatrix.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/compiler/redextomatrix.rkt
similarity index 100%
rename from pkgs/redex/private/compiler/redextomatrix.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/compiler/redextomatrix.rkt
diff --git a/pkgs/redex/private/core-layout.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/core-layout.rkt
similarity index 100%
rename from pkgs/redex/private/core-layout.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/core-layout.rkt
diff --git a/pkgs/redex/private/cycle-check.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/cycle-check.rkt
similarity index 100%
rename from pkgs/redex/private/cycle-check.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/cycle-check.rkt
diff --git a/pkgs/redex/private/defined-checks.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/defined-checks.rkt
similarity index 100%
rename from pkgs/redex/private/defined-checks.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/defined-checks.rkt
diff --git a/pkgs/redex/private/dot.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/dot.rkt
similarity index 100%
rename from pkgs/redex/private/dot.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/dot.rkt
diff --git a/pkgs/redex/private/enum.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/enum.rkt
similarity index 100%
rename from pkgs/redex/private/enum.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/enum.rkt
diff --git a/pkgs/redex/private/enumerator.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt
similarity index 100%
rename from pkgs/redex/private/enumerator.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt
diff --git a/pkgs/redex/private/error.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/error.rkt
similarity index 100%
rename from pkgs/redex/private/error.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/error.rkt
diff --git a/pkgs/redex/private/extract-conditions.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/extract-conditions.rkt
similarity index 100%
rename from pkgs/redex/private/extract-conditions.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/extract-conditions.rkt
diff --git a/pkgs/redex/private/fresh.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/fresh.rkt
similarity index 100%
rename from pkgs/redex/private/fresh.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/fresh.rkt
diff --git a/pkgs/redex/private/gen-trace.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/gen-trace.rkt
similarity index 100%
rename from pkgs/redex/private/gen-trace.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/gen-trace.rkt
diff --git a/pkgs/redex/private/generate-term.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/generate-term.rkt
similarity index 100%
rename from pkgs/redex/private/generate-term.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/generate-term.rkt
diff --git a/pkgs/redex/private/jdg-gen.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/jdg-gen.rkt
similarity index 100%
rename from pkgs/redex/private/jdg-gen.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/jdg-gen.rkt
diff --git a/pkgs/redex/private/judgment-form.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/judgment-form.rkt
similarity index 100%
rename from pkgs/redex/private/judgment-form.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/judgment-form.rkt
diff --git a/pkgs/redex/private/keyword-macros.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/keyword-macros.rkt
similarity index 100%
rename from pkgs/redex/private/keyword-macros.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/keyword-macros.rkt
diff --git a/pkgs/redex/private/lang-struct.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/lang-struct.rkt
similarity index 100%
rename from pkgs/redex/private/lang-struct.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/lang-struct.rkt
diff --git a/pkgs/redex/private/loc-wrapper-ct.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-ct.rkt
similarity index 100%
rename from pkgs/redex/private/loc-wrapper-ct.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-ct.rkt
diff --git a/pkgs/redex/private/loc-wrapper-rt.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-rt.rkt
similarity index 100%
rename from pkgs/redex/private/loc-wrapper-rt.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper-rt.rkt
diff --git a/pkgs/redex/private/loc-wrapper.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper.rkt
similarity index 100%
rename from pkgs/redex/private/loc-wrapper.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/loc-wrapper.rkt
diff --git a/pkgs/redex/private/match-a-pattern.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/match-a-pattern.rkt
similarity index 100%
rename from pkgs/redex/private/match-a-pattern.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/match-a-pattern.rkt
diff --git a/pkgs/redex/private/matcher.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/matcher.rkt
similarity index 100%
rename from pkgs/redex/private/matcher.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/matcher.rkt
diff --git a/pkgs/redex/private/pat-unify.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/pat-unify.rkt
similarity index 100%
rename from pkgs/redex/private/pat-unify.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/pat-unify.rkt
diff --git a/pkgs/redex/private/pict.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/pict.rkt
similarity index 100%
rename from pkgs/redex/private/pict.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/pict.rkt
diff --git a/pkgs/redex/private/red-sem-macro-helpers.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/red-sem-macro-helpers.rkt
similarity index 100%
rename from pkgs/redex/private/red-sem-macro-helpers.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/red-sem-macro-helpers.rkt
diff --git a/pkgs/redex/private/reduction-semantics.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt
similarity index 100%
rename from pkgs/redex/private/reduction-semantics.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/reduction-semantics.rkt
diff --git a/pkgs/redex/private/rewrite-side-conditions.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt
similarity index 100%
rename from pkgs/redex/private/rewrite-side-conditions.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/rewrite-side-conditions.rkt
diff --git a/pkgs/redex/private/rg.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/rg.rkt
similarity index 100%
rename from pkgs/redex/private/rg.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/rg.rkt
diff --git a/pkgs/redex/private/search.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/search.rkt
similarity index 100%
rename from pkgs/redex/private/search.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/search.rkt
diff --git a/pkgs/redex/private/sexp-diffs.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/sexp-diffs.rkt
similarity index 100%
rename from pkgs/redex/private/sexp-diffs.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/sexp-diffs.rkt
diff --git a/pkgs/redex/private/show-derivations.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/show-derivations.rkt
similarity index 100%
rename from pkgs/redex/private/show-derivations.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/show-derivations.rkt
diff --git a/pkgs/redex/private/size-snip.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/size-snip.rkt
similarity index 100%
rename from pkgs/redex/private/size-snip.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/size-snip.rkt
diff --git a/pkgs/redex/private/stepper.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/stepper.rkt
similarity index 100%
rename from pkgs/redex/private/stepper.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/stepper.rkt
diff --git a/pkgs/redex/private/struct.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/struct.rkt
similarity index 100%
rename from pkgs/redex/private/struct.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/struct.rkt
diff --git a/pkgs/redex/private/term-fn.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/term-fn.rkt
similarity index 100%
rename from pkgs/redex/private/term-fn.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/term-fn.rkt
diff --git a/pkgs/redex/private/term.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/term.rkt
similarity index 100%
rename from pkgs/redex/private/term.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/term.rkt
diff --git a/pkgs/redex/private/trace-layout.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/trace-layout.rkt
similarity index 100%
rename from pkgs/redex/private/trace-layout.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/trace-layout.rkt
diff --git a/pkgs/redex/private/traces.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/traces.rkt
similarity index 100%
rename from pkgs/redex/private/traces.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/traces.rkt
diff --git a/pkgs/redex/private/underscore-allowed.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/underscore-allowed.rkt
similarity index 100%
rename from pkgs/redex/private/underscore-allowed.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/private/underscore-allowed.rkt
diff --git a/pkgs/redex/reduction-semantics.rkt b/pkgs/redex-pkgs/redex-lib/redex/reduction-semantics.rkt
similarity index 100%
rename from pkgs/redex/reduction-semantics.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/reduction-semantics.rkt
diff --git a/pkgs/redex/tut-subst.rkt b/pkgs/redex-pkgs/redex-lib/redex/tut-subst.rkt
similarity index 100%
rename from pkgs/redex/tut-subst.rkt
rename to pkgs/redex-pkgs/redex-lib/redex/tut-subst.rkt
diff --git a/pkgs/redex/tests/bitmap-test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt
similarity index 100%
rename from pkgs/redex/tests/bitmap-test-util.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test-util.rkt
diff --git a/pkgs/redex/tests/bitmap-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt
similarity index 100%
rename from pkgs/redex/tests/bitmap-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/bitmap-test.rkt
diff --git a/pkgs/redex/tests/bmps-macosx/extended-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-language.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/extended-language.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-language.png
diff --git a/pkgs/redex/tests/bmps-macosx/extended-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-reduction-relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/extended-reduction-relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/extended-reduction-relation.png
diff --git a/pkgs/redex/tests/bmps-macosx/holes.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/holes.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/holes.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/holes.png
diff --git a/pkgs/redex/tests/bmps-macosx/judgment-form-examples.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/judgment-form-examples.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/judgment-form-examples.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/judgment-form-examples.png
diff --git a/pkgs/redex/tests/bmps-macosx/language-nox.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language-nox.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/language-nox.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language-nox.png
diff --git a/pkgs/redex/tests/bmps-macosx/language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/language.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/language.png
diff --git a/pkgs/redex/tests/bmps-macosx/lw.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/lw.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/lw.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/lw.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-Name-horizontal.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-horizontal.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-Name-horizontal.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-horizontal.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-Name-vertical.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-vertical.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-Name-vertical.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name-vertical.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-Name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-Name.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-Name.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-T.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-T.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-T.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-T.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-TL.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-TL.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-TL.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-TL.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-judgment-holds.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-judgment-holds.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-judgment-holds.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-judgment-holds.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-multi-arg.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-multi-arg.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-multi-arg.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-multi-arg.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction-subst.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-subst.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction-subst.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction-subst.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunction.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunction.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunction.png
diff --git a/pkgs/redex/tests/bmps-macosx/metafunctions-multiple.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunctions-multiple.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/metafunctions-multiple.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/metafunctions-multiple.png
diff --git a/pkgs/redex/tests/bmps-macosx/mf-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/mf-hidden.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/mf-hidden.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/mf-hidden.png
diff --git a/pkgs/redex/tests/bmps-macosx/rdups-delimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-delimited.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/rdups-delimited.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-delimited.png
diff --git a/pkgs/redex/tests/bmps-macosx/rdups-undelimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-undelimited.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/rdups-undelimited.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rdups-undelimited.png
diff --git a/pkgs/redex/tests/bmps-macosx/red-with-where-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red-with-where-name.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/red-with-where-name.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red-with-where-name.png
diff --git a/pkgs/redex/tests/bmps-macosx/red2.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red2.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/red2.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/red2.png
diff --git a/pkgs/redex/tests/bmps-macosx/reduction-relation-with-computed-labels-and-hiding.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels-and-hiding.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/reduction-relation-with-computed-labels-and-hiding.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels-and-hiding.png
diff --git a/pkgs/redex/tests/bmps-macosx/reduction-relation-with-computed-labels.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/reduction-relation-with-computed-labels.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation-with-computed-labels.png
diff --git a/pkgs/redex/tests/bmps-macosx/reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/reduction-relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/reduction-relation.png
diff --git a/pkgs/redex/tests/bmps-macosx/relation-with-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation-with-name.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/relation-with-name.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation-with-name.png
diff --git a/pkgs/redex/tests/bmps-macosx/relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/relation.png
diff --git a/pkgs/redex/tests/bmps-macosx/rr-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rr-hidden.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/rr-hidden.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/rr-hidden.png
diff --git a/pkgs/redex/tests/bmps-macosx/stlc.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/stlc.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/stlc.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/stlc.png
diff --git a/pkgs/redex/tests/bmps-macosx/superscripts.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/superscripts.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/superscripts.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/superscripts.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-extended-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-language.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-extended-language.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-language.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-extended-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-reduction-relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-extended-reduction-relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-extended-reduction-relation.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-language-nox.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language-nox.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-language-nox.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language-nox.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-language.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-language.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-lw.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-lw.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-lw.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-lw.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunction-Name-vertical.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name-vertical.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunction-Name-vertical.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name-vertical.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunction-Name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunction-Name.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-Name.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunction-T.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-T.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunction-T.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-T.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunction-TL.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-TL.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunction-TL.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-TL.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunction-multi-arg.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-multi-arg.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunction-multi-arg.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-multi-arg.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunction-subst.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-subst.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunction-subst.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction-subst.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunction.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunction.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunction.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-metafunctions-multiple.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunctions-multiple.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-metafunctions-multiple.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-metafunctions-multiple.png
diff --git a/pkgs/redex/tests/bmps-macosx/unix-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-reduction-relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/unix-reduction-relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/unix-reduction-relation.png
diff --git a/pkgs/redex/tests/bmps-macosx/var-not-in-rebound.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in-rebound.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/var-not-in-rebound.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in-rebound.png
diff --git a/pkgs/redex/tests/bmps-macosx/var-not-in.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in.png
similarity index 100%
rename from pkgs/redex/tests/bmps-macosx/var-not-in.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-macosx/var-not-in.png
diff --git a/pkgs/redex/tests/bmps-unix/extended-language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-language.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/extended-language.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-language.png
diff --git a/pkgs/redex/tests/bmps-unix/extended-reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-reduction-relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/extended-reduction-relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/extended-reduction-relation.png
diff --git a/pkgs/redex/tests/bmps-unix/holes.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/holes.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/holes.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/holes.png
diff --git a/pkgs/redex/tests/bmps-unix/judgment-form-examples.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/judgment-form-examples.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/judgment-form-examples.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/judgment-form-examples.png
diff --git a/pkgs/redex/tests/bmps-unix/language-nox.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language-nox.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/language-nox.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language-nox.png
diff --git a/pkgs/redex/tests/bmps-unix/language.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/language.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/language.png
diff --git a/pkgs/redex/tests/bmps-unix/lw.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/lw.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/lw.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/lw.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-Name-horizontal.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-horizontal.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-Name-horizontal.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-horizontal.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-Name-vertical.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-vertical.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-Name-vertical.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name-vertical.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-Name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-Name.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-Name.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-T.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-T.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-T.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-T.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-TL.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-TL.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-TL.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-TL.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-judgment-holds.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-judgment-holds.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-judgment-holds.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-judgment-holds.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-multi-arg.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-multi-arg.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-multi-arg.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-multi-arg.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction-subst.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-subst.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction-subst.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction-subst.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunction.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunction.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunction.png
diff --git a/pkgs/redex/tests/bmps-unix/metafunctions-multiple.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunctions-multiple.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/metafunctions-multiple.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/metafunctions-multiple.png
diff --git a/pkgs/redex/tests/bmps-unix/mf-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/mf-hidden.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/mf-hidden.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/mf-hidden.png
diff --git a/pkgs/redex/tests/bmps-unix/rdups-delimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-delimited.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/rdups-delimited.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-delimited.png
diff --git a/pkgs/redex/tests/bmps-unix/rdups-undelimited.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-undelimited.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/rdups-undelimited.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rdups-undelimited.png
diff --git a/pkgs/redex/tests/bmps-unix/red-with-where-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red-with-where-name.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/red-with-where-name.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red-with-where-name.png
diff --git a/pkgs/redex/tests/bmps-unix/red2.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red2.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/red2.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/red2.png
diff --git a/pkgs/redex/tests/bmps-unix/reduction-relation-with-computed-labels-and-hiding.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels-and-hiding.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/reduction-relation-with-computed-labels-and-hiding.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels-and-hiding.png
diff --git a/pkgs/redex/tests/bmps-unix/reduction-relation-with-computed-labels.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/reduction-relation-with-computed-labels.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation-with-computed-labels.png
diff --git a/pkgs/redex/tests/bmps-unix/reduction-relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/reduction-relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/reduction-relation.png
diff --git a/pkgs/redex/tests/bmps-unix/relation-with-name.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation-with-name.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/relation-with-name.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation-with-name.png
diff --git a/pkgs/redex/tests/bmps-unix/relation.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/relation.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/relation.png
diff --git a/pkgs/redex/tests/bmps-unix/rr-hidden.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rr-hidden.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/rr-hidden.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/rr-hidden.png
diff --git a/pkgs/redex/tests/bmps-unix/stlc.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/stlc.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/stlc.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/stlc.png
diff --git a/pkgs/redex/tests/bmps-unix/superscripts.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/superscripts.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/superscripts.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/superscripts.png
diff --git a/pkgs/redex/tests/bmps-unix/var-not-in-rebound.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in-rebound.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/var-not-in-rebound.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in-rebound.png
diff --git a/pkgs/redex/tests/bmps-unix/var-not-in.png b/pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in.png
similarity index 100%
rename from pkgs/redex/tests/bmps-unix/var-not-in.png
rename to pkgs/redex-pkgs/redex-test/redex/tests/bmps-unix/var-not-in.png
diff --git a/pkgs/redex/tests/check-syntax-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/check-syntax-test.rkt
similarity index 100%
rename from pkgs/redex/tests/check-syntax-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/check-syntax-test.rkt
diff --git a/pkgs/redex/tests/color-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt
similarity index 100%
rename from pkgs/redex/tests/color-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/color-test.rkt
diff --git a/pkgs/redex/tests/compiler/matrix-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt
similarity index 100%
rename from pkgs/redex/tests/compiler/matrix-tests.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/compiler/matrix-tests.rkt
diff --git a/pkgs/redex/tests/compiler/redex-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt
similarity index 100%
rename from pkgs/redex/tests/compiler/redex-tests.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/compiler/redex-tests.rkt
diff --git a/pkgs/redex/tests/core-layout-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt
similarity index 100%
rename from pkgs/redex/tests/core-layout-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/core-layout-test.rkt
diff --git a/pkgs/redex/tests/defined-checks-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/defined-checks-test.rkt
similarity index 100%
rename from pkgs/redex/tests/defined-checks-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/defined-checks-test.rkt
diff --git a/pkgs/redex/tests/enum-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/enum-test.rkt
similarity index 100%
rename from pkgs/redex/tests/enum-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/enum-test.rkt
diff --git a/pkgs/redex/tests/gen-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt
similarity index 100%
rename from pkgs/redex/tests/gen-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/gen-test.rkt
diff --git a/pkgs/redex/tests/hole-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/hole-test.rkt
similarity index 100%
rename from pkgs/redex/tests/hole-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/hole-test.rkt
diff --git a/pkgs/redex/tests/keyword-macros-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt
similarity index 100%
rename from pkgs/redex/tests/keyword-macros-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/keyword-macros-test.rkt
diff --git a/pkgs/redex/tests/lw-test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt
similarity index 100%
rename from pkgs/redex/tests/lw-test-util.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/lw-test-util.rkt
diff --git a/pkgs/redex/tests/lw-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt
similarity index 100%
rename from pkgs/redex/tests/lw-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/lw-test.rkt
diff --git a/pkgs/redex/tests/matcher-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt
similarity index 100%
rename from pkgs/redex/tests/matcher-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/matcher-test.rkt
diff --git a/pkgs/redex/tests/pict-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt
similarity index 100%
rename from pkgs/redex/tests/pict-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/pict-test.rkt
diff --git a/pkgs/redex/tests/rewrite-side-condition-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt
similarity index 100%
rename from pkgs/redex/tests/rewrite-side-condition-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/rewrite-side-condition-test.rkt
diff --git a/pkgs/redex/tests/rg-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt
similarity index 100%
rename from pkgs/redex/tests/rg-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt
diff --git a/pkgs/redex/tests/run-err-tests/define-union-language.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/define-union-language.rktd
similarity index 100%
rename from pkgs/redex/tests/run-err-tests/define-union-language.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/define-union-language.rktd
diff --git a/pkgs/redex/tests/run-err-tests/judgment-form-contracts.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-contracts.rktd
similarity index 100%
rename from pkgs/redex/tests/run-err-tests/judgment-form-contracts.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-contracts.rktd
diff --git a/pkgs/redex/tests/run-err-tests/judgment-form-ellipses.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-ellipses.rktd
similarity index 100%
rename from pkgs/redex/tests/run-err-tests/judgment-form-ellipses.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-ellipses.rktd
diff --git a/pkgs/redex/tests/run-err-tests/judgment-form-undefined.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-undefined.rktd
similarity index 100%
rename from pkgs/redex/tests/run-err-tests/judgment-form-undefined.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/judgment-form-undefined.rktd
diff --git a/pkgs/redex/tests/run-err-tests/metafunction-undefined.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-undefined.rktd
similarity index 100%
rename from pkgs/redex/tests/run-err-tests/metafunction-undefined.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/metafunction-undefined.rktd
diff --git a/pkgs/redex/tests/run-err-tests/term.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/term.rktd
similarity index 100%
rename from pkgs/redex/tests/run-err-tests/term.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/run-err-tests/term.rktd
diff --git a/pkgs/redex/tests/run-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt
similarity index 100%
rename from pkgs/redex/tests/run-tests.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt
diff --git a/pkgs/redex/tests/ryr-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/ryr-test.rkt
similarity index 100%
rename from pkgs/redex/tests/ryr-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/ryr-test.rkt
diff --git a/pkgs/redex/tests/stepper-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt
similarity index 100%
rename from pkgs/redex/tests/stepper-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/stepper-test.rkt
diff --git a/pkgs/redex/tests/syn-err-tests/judgment-form-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-form-definition.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/judgment-form-definition.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-form-definition.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/judgment-holds.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-holds.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/judgment-holds.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/judgment-holds.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/language-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/language-definition.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/language-definition.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/language-definition.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/metafunction-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/metafunction-definition.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/metafunction-definition.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/metafunction-definition.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/redex-let.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/redex-let.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/redex-let.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/redex-let.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/reduction-relation-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/reduction-relation-definition.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/reduction-relation-definition.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/reduction-relation-definition.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/relation-definition.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/relation-definition.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/relation-definition.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/relation-definition.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/term-lang.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term-lang.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/term-lang.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term-lang.rktd
diff --git a/pkgs/redex/tests/syn-err-tests/term.rktd b/pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term.rktd
similarity index 100%
rename from pkgs/redex/tests/syn-err-tests/term.rktd
rename to pkgs/redex-pkgs/redex-test/redex/tests/syn-err-tests/term.rktd
diff --git a/pkgs/redex/tests/term-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt
similarity index 100%
rename from pkgs/redex/tests/term-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/term-test.rkt
diff --git a/pkgs/redex/tests/test-docs-complete.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/redex/tests/test-docs-complete.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/test-docs-complete.rkt
diff --git a/pkgs/redex/tests/test-util.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt
similarity index 100%
rename from pkgs/redex/tests/test-util.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/test-util.rkt
diff --git a/pkgs/redex/tests/tl-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt
similarity index 100%
rename from pkgs/redex/tests/tl-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/tl-test.rkt
diff --git a/pkgs/redex/tests/tut-subst-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt
similarity index 100%
rename from pkgs/redex/tests/tut-subst-test.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/tut-subst-test.rkt
diff --git a/pkgs/redex/tests/unify-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt
similarity index 100%
rename from pkgs/redex/tests/unify-tests.rkt
rename to pkgs/redex-pkgs/redex-test/redex/tests/unify-tests.rkt