diff --git a/pkgs/compatibility-pkgs/compatibility-doc/LICENSE.txt b/compatibility-doc/LICENSE.txt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/LICENSE.txt
rename to compatibility-doc/LICENSE.txt
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/info.rkt b/compatibility-doc/info.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/info.rkt
rename to compatibility-doc/info.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/info.rkt b/compatibility-doc/mzlib/info.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/info.rkt
rename to compatibility-doc/mzlib/info.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/awk.scrbl b/compatibility-doc/mzlib/scribblings/awk.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/awk.scrbl
rename to compatibility-doc/mzlib/scribblings/awk.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cmdline.scrbl b/compatibility-doc/mzlib/scribblings/cmdline.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cmdline.scrbl
rename to compatibility-doc/mzlib/scribblings/cmdline.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cml.scrbl b/compatibility-doc/mzlib/scribblings/cml.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/cml.scrbl
rename to compatibility-doc/mzlib/scribblings/cml.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/common.rkt b/compatibility-doc/mzlib/scribblings/common.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/common.rkt
rename to compatibility-doc/mzlib/scribblings/common.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compat.scrbl b/compatibility-doc/mzlib/scribblings/compat.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compat.scrbl
rename to compatibility-doc/mzlib/scribblings/compat.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compile.scrbl b/compatibility-doc/mzlib/scribblings/compile.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/compile.scrbl
rename to compatibility-doc/mzlib/scribblings/compile.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract-label.rkt b/compatibility-doc/mzlib/scribblings/contract-label.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract-label.rkt
rename to compatibility-doc/mzlib/scribblings/contract-label.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract.scrbl b/compatibility-doc/mzlib/scribblings/contract.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/contract.scrbl
rename to compatibility-doc/mzlib/scribblings/contract.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/etc.scrbl b/compatibility-doc/mzlib/scribblings/etc.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/etc.scrbl
rename to compatibility-doc/mzlib/scribblings/etc.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/file.scrbl b/compatibility-doc/mzlib/scribblings/file.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/file.scrbl
rename to compatibility-doc/mzlib/scribblings/file.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/for.scrbl b/compatibility-doc/mzlib/scribblings/for.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/for.scrbl
rename to compatibility-doc/mzlib/scribblings/for.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/include.scrbl b/compatibility-doc/mzlib/scribblings/include.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/include.scrbl
rename to compatibility-doc/mzlib/scribblings/include.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/info.rkt b/compatibility-doc/mzlib/scribblings/info.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/info.rkt
rename to compatibility-doc/mzlib/scribblings/info.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/integer-set.scrbl b/compatibility-doc/mzlib/scribblings/integer-set.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/integer-set.scrbl
rename to compatibility-doc/mzlib/scribblings/integer-set.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/kw.scrbl b/compatibility-doc/mzlib/scribblings/kw.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/kw.scrbl
rename to compatibility-doc/mzlib/scribblings/kw.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/list.scrbl b/compatibility-doc/mzlib/scribblings/list.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/list.scrbl
rename to compatibility-doc/mzlib/scribblings/list.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match-grammar.rkt b/compatibility-doc/mzlib/scribblings/match-grammar.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match-grammar.rkt
rename to compatibility-doc/mzlib/scribblings/match-grammar.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match.scrbl b/compatibility-doc/mzlib/scribblings/match.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/match.scrbl
rename to compatibility-doc/mzlib/scribblings/match.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/math.scrbl b/compatibility-doc/mzlib/scribblings/math.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/math.scrbl
rename to compatibility-doc/mzlib/scribblings/math.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/mzlib.scrbl b/compatibility-doc/mzlib/scribblings/mzlib.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/mzlib.scrbl
rename to compatibility-doc/mzlib/scribblings/mzlib.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/os.scrbl b/compatibility-doc/mzlib/scribblings/os.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/os.scrbl
rename to compatibility-doc/mzlib/scribblings/os.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert-prop.scrbl b/compatibility-doc/mzlib/scribblings/pconvert-prop.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert-prop.scrbl
rename to compatibility-doc/mzlib/scribblings/pconvert-prop.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert.scrbl b/compatibility-doc/mzlib/scribblings/pconvert.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pconvert.scrbl
rename to compatibility-doc/mzlib/scribblings/pconvert.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/plt-match.scrbl b/compatibility-doc/mzlib/scribblings/plt-match.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/plt-match.scrbl
rename to compatibility-doc/mzlib/scribblings/plt-match.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/port.scrbl b/compatibility-doc/mzlib/scribblings/port.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/port.scrbl
rename to compatibility-doc/mzlib/scribblings/port.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pregexp.scrbl b/compatibility-doc/mzlib/scribblings/pregexp.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/pregexp.scrbl
rename to compatibility-doc/mzlib/scribblings/pregexp.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/restart.scrbl b/compatibility-doc/mzlib/scribblings/restart.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/restart.scrbl
rename to compatibility-doc/mzlib/scribblings/restart.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sandbox.scrbl b/compatibility-doc/mzlib/scribblings/sandbox.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sandbox.scrbl
rename to compatibility-doc/mzlib/scribblings/sandbox.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sendevent.scrbl b/compatibility-doc/mzlib/scribblings/sendevent.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/sendevent.scrbl
rename to compatibility-doc/mzlib/scribblings/sendevent.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/serialize.scrbl b/compatibility-doc/mzlib/scribblings/serialize.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/serialize.scrbl
rename to compatibility-doc/mzlib/scribblings/serialize.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/string.scrbl b/compatibility-doc/mzlib/scribblings/string.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/string.scrbl
rename to compatibility-doc/mzlib/scribblings/string.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/struct.scrbl b/compatibility-doc/mzlib/scribblings/struct.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/struct.scrbl
rename to compatibility-doc/mzlib/scribblings/struct.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/thread.scrbl b/compatibility-doc/mzlib/scribblings/thread.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/thread.scrbl
rename to compatibility-doc/mzlib/scribblings/thread.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/traceld.scrbl b/compatibility-doc/mzlib/scribblings/traceld.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/traceld.scrbl
rename to compatibility-doc/mzlib/scribblings/traceld.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/transcr.scrbl b/compatibility-doc/mzlib/scribblings/transcr.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/transcr.scrbl
rename to compatibility-doc/mzlib/scribblings/transcr.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/unit.scrbl b/compatibility-doc/mzlib/scribblings/unit.scrbl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-doc/mzlib/scribblings/unit.scrbl
rename to compatibility-doc/mzlib/scribblings/unit.scrbl
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/LICENSE.txt b/compatibility-lib/LICENSE.txt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/LICENSE.txt
rename to compatibility-lib/LICENSE.txt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/defmacro.rkt b/compatibility-lib/compatibility/defmacro.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/compatibility/defmacro.rkt
rename to compatibility-lib/compatibility/defmacro.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/mlist.rkt b/compatibility-lib/compatibility/mlist.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/compatibility/mlist.rkt
rename to compatibility-lib/compatibility/mlist.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/compatibility/package.rkt b/compatibility-lib/compatibility/package.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/compatibility/package.rkt
rename to compatibility-lib/compatibility/package.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/info.rkt b/compatibility-lib/info.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/info.rkt
rename to compatibility-lib/info.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/lazy/mz-without-promises.rkt b/compatibility-lib/lazy/mz-without-promises.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/lazy/mz-without-promises.rkt
rename to compatibility-lib/lazy/mz-without-promises.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-signature.rkt b/compatibility-lib/mzlib/a-signature.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-signature.rkt
rename to compatibility-lib/mzlib/a-signature.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-unit.rkt b/compatibility-lib/mzlib/a-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/a-unit.rkt
rename to compatibility-lib/mzlib/a-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/async-channel.rkt b/compatibility-lib/mzlib/async-channel.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/async-channel.rkt
rename to compatibility-lib/mzlib/async-channel.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/awk.rkt b/compatibility-lib/mzlib/awk.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/awk.rkt
rename to compatibility-lib/mzlib/awk.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/class.rkt b/compatibility-lib/mzlib/class.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/class.rkt
rename to compatibility-lib/mzlib/class.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm-accomplice.rkt b/compatibility-lib/mzlib/cm-accomplice.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm-accomplice.rkt
rename to compatibility-lib/mzlib/cm-accomplice.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm.rkt b/compatibility-lib/mzlib/cm.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/cm.rkt
rename to compatibility-lib/mzlib/cm.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cmdline.rkt b/compatibility-lib/mzlib/cmdline.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/cmdline.rkt
rename to compatibility-lib/mzlib/cmdline.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/cml.rkt b/compatibility-lib/mzlib/cml.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/cml.rkt
rename to compatibility-lib/mzlib/cml.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compat.rkt b/compatibility-lib/mzlib/compat.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/compat.rkt
rename to compatibility-lib/mzlib/compat.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/compile.rkt b/compatibility-lib/mzlib/compile.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/compile.rkt
rename to compatibility-lib/mzlib/compile.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/contract.rkt b/compatibility-lib/mzlib/contract.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/contract.rkt
rename to compatibility-lib/mzlib/contract.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/control.rkt b/compatibility-lib/mzlib/control.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/control.rkt
rename to compatibility-lib/mzlib/control.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/date.rkt b/compatibility-lib/mzlib/date.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/date.rkt
rename to compatibility-lib/mzlib/date.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/deflate.rkt b/compatibility-lib/mzlib/deflate.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/deflate.rkt
rename to compatibility-lib/mzlib/deflate.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/defmacro.rkt b/compatibility-lib/mzlib/defmacro.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/defmacro.rkt
rename to compatibility-lib/mzlib/defmacro.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/etc.rkt b/compatibility-lib/mzlib/etc.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/etc.rkt
rename to compatibility-lib/mzlib/etc.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/file.rkt b/compatibility-lib/mzlib/file.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/file.rkt
rename to compatibility-lib/mzlib/file.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/for.rkt b/compatibility-lib/mzlib/for.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/for.rkt
rename to compatibility-lib/mzlib/for.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/foreign.rkt b/compatibility-lib/mzlib/foreign.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/foreign.rkt
rename to compatibility-lib/mzlib/foreign.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/include.rkt b/compatibility-lib/mzlib/include.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/include.rkt
rename to compatibility-lib/mzlib/include.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/inflate.rkt b/compatibility-lib/mzlib/inflate.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/inflate.rkt
rename to compatibility-lib/mzlib/inflate.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/info.rkt b/compatibility-lib/mzlib/info.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/info.rkt
rename to compatibility-lib/mzlib/info.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/integer-set.rkt b/compatibility-lib/mzlib/integer-set.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/integer-set.rkt
rename to compatibility-lib/mzlib/integer-set.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/kw.rkt b/compatibility-lib/mzlib/kw.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/kw.rkt
rename to compatibility-lib/mzlib/kw.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/list.rkt b/compatibility-lib/mzlib/list.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/list.rkt
rename to compatibility-lib/mzlib/list.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/match.rkt b/compatibility-lib/mzlib/match.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/match.rkt
rename to compatibility-lib/mzlib/match.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/math.rkt b/compatibility-lib/mzlib/math.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/math.rkt
rename to compatibility-lib/mzlib/math.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/md5.rkt b/compatibility-lib/mzlib/md5.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/md5.rkt
rename to compatibility-lib/mzlib/md5.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/os.rkt b/compatibility-lib/mzlib/os.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/os.rkt
rename to compatibility-lib/mzlib/os.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/plt-match.rkt b/compatibility-lib/mzlib/plt-match.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/plt-match.rkt
rename to compatibility-lib/mzlib/plt-match.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/port.rkt b/compatibility-lib/mzlib/port.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/port.rkt
rename to compatibility-lib/mzlib/port.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pregexp.rkt b/compatibility-lib/mzlib/pregexp.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/pregexp.rkt
rename to compatibility-lib/mzlib/pregexp.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/pretty.rkt b/compatibility-lib/mzlib/pretty.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/pretty.rkt
rename to compatibility-lib/mzlib/pretty.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-checks.rkt b/compatibility-lib/mzlib/private/contract-arr-checks.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-checks.rkt
rename to compatibility-lib/mzlib/private/contract-arr-checks.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-obj-helpers.rkt b/compatibility-lib/mzlib/private/contract-arr-obj-helpers.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arr-obj-helpers.rkt
rename to compatibility-lib/mzlib/private/contract-arr-obj-helpers.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arrow.rkt b/compatibility-lib/mzlib/private/contract-arrow.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-arrow.rkt
rename to compatibility-lib/mzlib/private/contract-arrow.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-define.rkt b/compatibility-lib/mzlib/private/contract-define.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-define.rkt
rename to compatibility-lib/mzlib/private/contract-define.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-mutable.rkt b/compatibility-lib/mzlib/private/contract-mutable.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-mutable.rkt
rename to compatibility-lib/mzlib/private/contract-mutable.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-object.rkt b/compatibility-lib/mzlib/private/contract-object.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-object.rkt
rename to compatibility-lib/mzlib/private/contract-object.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-struct.rkt b/compatibility-lib/mzlib/private/contract-struct.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/contract-struct.rkt
rename to compatibility-lib/mzlib/private/contract-struct.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/package-helper.rkt b/compatibility-lib/mzlib/private/package-helper.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/package-helper.rkt
rename to compatibility-lib/mzlib/private/package-helper.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigmatch.rkt b/compatibility-lib/mzlib/private/sigmatch.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigmatch.rkt
rename to compatibility-lib/mzlib/private/sigmatch.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigutil.rkt b/compatibility-lib/mzlib/private/sigutil.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/sigutil.rkt
rename to compatibility-lib/mzlib/private/sigutil.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/structure-helper.rkt b/compatibility-lib/mzlib/private/structure-helper.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/structure-helper.rkt
rename to compatibility-lib/mzlib/private/structure-helper.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxparamkey.rkt b/compatibility-lib/mzlib/private/stxparamkey.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxparamkey.rkt
rename to compatibility-lib/mzlib/private/stxparamkey.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxset.rkt b/compatibility-lib/mzlib/private/stxset.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/stxset.rkt
rename to compatibility-lib/mzlib/private/stxset.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/unitidmap.rkt b/compatibility-lib/mzlib/private/unitidmap.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/private/unitidmap.rkt
rename to compatibility-lib/mzlib/private/unitidmap.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/process.rkt b/compatibility-lib/mzlib/process.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/process.rkt
rename to compatibility-lib/mzlib/process.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/restart.rkt b/compatibility-lib/mzlib/restart.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/restart.rkt
rename to compatibility-lib/mzlib/restart.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/runtime-path.rkt b/compatibility-lib/mzlib/runtime-path.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/runtime-path.rkt
rename to compatibility-lib/mzlib/runtime-path.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sandbox.rkt b/compatibility-lib/mzlib/sandbox.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/sandbox.rkt
rename to compatibility-lib/mzlib/sandbox.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/sendevent.rkt b/compatibility-lib/mzlib/sendevent.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/sendevent.rkt
rename to compatibility-lib/mzlib/sendevent.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/serialize.rkt b/compatibility-lib/mzlib/serialize.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/serialize.rkt
rename to compatibility-lib/mzlib/serialize.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/shared.rkt b/compatibility-lib/mzlib/shared.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/shared.rkt
rename to compatibility-lib/mzlib/shared.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/string.rkt b/compatibility-lib/mzlib/string.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/string.rkt
rename to compatibility-lib/mzlib/string.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/struct.rkt b/compatibility-lib/mzlib/struct.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/struct.rkt
rename to compatibility-lib/mzlib/struct.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/stxparam.rkt b/compatibility-lib/mzlib/stxparam.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/stxparam.rkt
rename to compatibility-lib/mzlib/stxparam.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/surrogate.rkt b/compatibility-lib/mzlib/surrogate.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/surrogate.rkt
rename to compatibility-lib/mzlib/surrogate.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/tar.rkt b/compatibility-lib/mzlib/tar.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/tar.rkt
rename to compatibility-lib/mzlib/tar.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/thread.rkt b/compatibility-lib/mzlib/thread.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/thread.rkt
rename to compatibility-lib/mzlib/thread.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trace.rkt b/compatibility-lib/mzlib/trace.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/trace.rkt
rename to compatibility-lib/mzlib/trace.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/traceld.rkt b/compatibility-lib/mzlib/traceld.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/traceld.rkt
rename to compatibility-lib/mzlib/traceld.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/trait.rkt b/compatibility-lib/mzlib/trait.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/trait.rkt
rename to compatibility-lib/mzlib/trait.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/transcr.rkt b/compatibility-lib/mzlib/transcr.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/transcr.rkt
rename to compatibility-lib/mzlib/transcr.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit-exptime.rkt b/compatibility-lib/mzlib/unit-exptime.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit-exptime.rkt
rename to compatibility-lib/mzlib/unit-exptime.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit.rkt b/compatibility-lib/mzlib/unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit.rkt
rename to compatibility-lib/mzlib/unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit200.rkt b/compatibility-lib/mzlib/unit200.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/unit200.rkt
rename to compatibility-lib/mzlib/unit200.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig.rkt b/compatibility-lib/mzlib/unitsig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig.rkt
rename to compatibility-lib/mzlib/unitsig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig200.rkt b/compatibility-lib/mzlib/unitsig200.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/unitsig200.rkt
rename to compatibility-lib/mzlib/unitsig200.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzlib/zip.rkt b/compatibility-lib/mzlib/zip.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzlib/zip.rkt
rename to compatibility-lib/mzlib/zip.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/lang/reader.rkt b/compatibility-lib/mzscheme/lang/reader.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzscheme/lang/reader.rkt
rename to compatibility-lib/mzscheme/lang/reader.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/main.rkt b/compatibility-lib/mzscheme/main.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzscheme/main.rkt
rename to compatibility-lib/mzscheme/main.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-ds.rkt b/compatibility-lib/mzscheme/private/old-ds.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-ds.rkt
rename to compatibility-lib/mzscheme/private/old-ds.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-if.rkt b/compatibility-lib/mzscheme/private/old-if.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-if.rkt
rename to compatibility-lib/mzscheme/private/old-if.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt b/compatibility-lib/mzscheme/private/old-procs.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-procs.rkt
rename to compatibility-lib/mzscheme/private/old-procs.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-rp.rkt b/compatibility-lib/mzscheme/private/old-rp.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/old-rp.rkt
rename to compatibility-lib/mzscheme/private/old-rp.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/stxmz-body.rkt b/compatibility-lib/mzscheme/private/stxmz-body.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/mzscheme/private/stxmz-body.rkt
rename to compatibility-lib/mzscheme/private/stxmz-body.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt b/compatibility-lib/net/base64-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/base64-sig.rkt
rename to compatibility-lib/net/base64-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt b/compatibility-lib/net/base64-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/base64-unit.rkt
rename to compatibility-lib/net/base64-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt b/compatibility-lib/net/cgi-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/cgi-sig.rkt
rename to compatibility-lib/net/cgi-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt b/compatibility-lib/net/cgi-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/cgi-unit.rkt
rename to compatibility-lib/net/cgi-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt b/compatibility-lib/net/cookie-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/cookie-sig.rkt
rename to compatibility-lib/net/cookie-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt b/compatibility-lib/net/cookie-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/cookie-unit.rkt
rename to compatibility-lib/net/cookie-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt b/compatibility-lib/net/dns-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/dns-sig.rkt
rename to compatibility-lib/net/dns-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt b/compatibility-lib/net/dns-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/dns-unit.rkt
rename to compatibility-lib/net/dns-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt b/compatibility-lib/net/ftp-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/ftp-sig.rkt
rename to compatibility-lib/net/ftp-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt b/compatibility-lib/net/ftp-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/ftp-unit.rkt
rename to compatibility-lib/net/ftp-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt b/compatibility-lib/net/head-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/head-sig.rkt
rename to compatibility-lib/net/head-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt b/compatibility-lib/net/head-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/head-unit.rkt
rename to compatibility-lib/net/head-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt b/compatibility-lib/net/imap-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/imap-sig.rkt
rename to compatibility-lib/net/imap-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt b/compatibility-lib/net/imap-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/imap-unit.rkt
rename to compatibility-lib/net/imap-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt b/compatibility-lib/net/mime-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/mime-sig.rkt
rename to compatibility-lib/net/mime-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt b/compatibility-lib/net/mime-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/mime-unit.rkt
rename to compatibility-lib/net/mime-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt b/compatibility-lib/net/nntp-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/nntp-sig.rkt
rename to compatibility-lib/net/nntp-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt b/compatibility-lib/net/nntp-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/nntp-unit.rkt
rename to compatibility-lib/net/nntp-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt b/compatibility-lib/net/pop3-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/pop3-sig.rkt
rename to compatibility-lib/net/pop3-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt b/compatibility-lib/net/pop3-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/pop3-unit.rkt
rename to compatibility-lib/net/pop3-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt b/compatibility-lib/net/qp-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/qp-sig.rkt
rename to compatibility-lib/net/qp-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt b/compatibility-lib/net/qp-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/qp-unit.rkt
rename to compatibility-lib/net/qp-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt b/compatibility-lib/net/sendmail-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-sig.rkt
rename to compatibility-lib/net/sendmail-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt b/compatibility-lib/net/sendmail-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/sendmail-unit.rkt
rename to compatibility-lib/net/sendmail-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt b/compatibility-lib/net/smtp-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/smtp-sig.rkt
rename to compatibility-lib/net/smtp-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt b/compatibility-lib/net/smtp-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/smtp-unit.rkt
rename to compatibility-lib/net/smtp-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt b/compatibility-lib/net/uri-codec-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-sig.rkt
rename to compatibility-lib/net/uri-codec-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt b/compatibility-lib/net/uri-codec-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/uri-codec-unit.rkt
rename to compatibility-lib/net/uri-codec-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt b/compatibility-lib/net/url-sig.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/url-sig.rkt
rename to compatibility-lib/net/url-sig.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt b/compatibility-lib/net/url-unit.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/net/url-unit.rkt
rename to compatibility-lib/net/url-unit.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/racket/mpair.rkt b/compatibility-lib/racket/mpair.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/racket/mpair.rkt
rename to compatibility-lib/racket/mpair.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/racket/package.rkt b/compatibility-lib/racket/package.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/racket/package.rkt
rename to compatibility-lib/racket/package.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/scheme/mpair.rkt b/compatibility-lib/scheme/mpair.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/scheme/mpair.rkt
rename to compatibility-lib/scheme/mpair.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-lib/scheme/package.rkt b/compatibility-lib/scheme/package.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-lib/scheme/package.rkt
rename to compatibility-lib/scheme/package.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt b/compatibility-test/LICENSE.txt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/LICENSE.txt
rename to compatibility-test/LICENSE.txt
diff --git a/pkgs/compatibility-pkgs/compatibility-test/info.rkt b/compatibility-test/info.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/info.rkt
rename to compatibility-test/info.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl b/compatibility-test/tests/mzlib/awk.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/awk.rktl
rename to compatibility-test/tests/mzlib/awk.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/binc.rktl b/compatibility-test/tests/mzlib/binc.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/binc.rktl
rename to compatibility-test/tests/mzlib/binc.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl b/compatibility-test/tests/mzlib/cmdline.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/cmdline.rktl
rename to compatibility-test/tests/mzlib/cmdline.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/compat.rktl b/compatibility-test/tests/mzlib/compat.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/compat.rktl
rename to compatibility-test/tests/mzlib/compat.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl b/compatibility-test/tests/mzlib/contract-mzlib-test.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl
rename to compatibility-test/tests/mzlib/contract-mzlib-test.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl b/compatibility-test/tests/mzlib/etc.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/etc.rktl
rename to compatibility-test/tests/mzlib/etc.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/kw.rktl b/compatibility-test/tests/mzlib/kw.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/kw.rktl
rename to compatibility-test/tests/mzlib/kw.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl b/compatibility-test/tests/mzlib/loadtest.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/loadtest.rktl
rename to compatibility-test/tests/mzlib/loadtest.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl b/compatibility-test/tests/mzlib/macrolib.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl
rename to compatibility-test/tests/mzlib/macrolib.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/pconvert.rktl b/compatibility-test/tests/mzlib/pconvert.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/pconvert.rktl
rename to compatibility-test/tests/mzlib/pconvert.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/restart.rktl b/compatibility-test/tests/mzlib/restart.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/restart.rktl
rename to compatibility-test/tests/mzlib/restart.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl b/compatibility-test/tests/mzlib/serialize.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/serialize.rktl
rename to compatibility-test/tests/mzlib/serialize.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/string-mzlib.rktl b/compatibility-test/tests/mzlib/string-mzlib.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/string-mzlib.rktl
rename to compatibility-test/tests/mzlib/string-mzlib.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/structlib.rktl b/compatibility-test/tests/mzlib/structlib.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/structlib.rktl
rename to compatibility-test/tests/mzlib/structlib.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt b/compatibility-test/tests/mzlib/test.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/test.rkt
rename to compatibility-test/tests/mzlib/test.rkt
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl b/compatibility-test/tests/mzlib/testing.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/testing.rktl
rename to compatibility-test/tests/mzlib/testing.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl b/compatibility-test/tests/mzlib/tests.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/tests.rktl
rename to compatibility-test/tests/mzlib/tests.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/threadlib.rktl b/compatibility-test/tests/mzlib/threadlib.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/threadlib.rktl
rename to compatibility-test/tests/mzlib/threadlib.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/ttt/uinc4.rktl b/compatibility-test/tests/mzlib/ttt/uinc4.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/ttt/uinc4.rktl
rename to compatibility-test/tests/mzlib/ttt/uinc4.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc.rktl b/compatibility-test/tests/mzlib/uinc.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc.rktl
rename to compatibility-test/tests/mzlib/uinc.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc2.rktl b/compatibility-test/tests/mzlib/uinc2.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc2.rktl
rename to compatibility-test/tests/mzlib/uinc2.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc3.rktl b/compatibility-test/tests/mzlib/uinc3.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/uinc3.rktl
rename to compatibility-test/tests/mzlib/uinc3.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unit.rktl b/compatibility-test/tests/mzlib/unit.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unit.rktl
rename to compatibility-test/tests/mzlib/unit.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl b/compatibility-test/tests/mzlib/unitsig.rktl
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl
rename to compatibility-test/tests/mzlib/unitsig.rktl
diff --git a/pkgs/compatibility-pkgs/compatibility/LICENSE.txt b/compatibility/LICENSE.txt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility/LICENSE.txt
rename to compatibility/LICENSE.txt
diff --git a/pkgs/compatibility-pkgs/compatibility/info.rkt b/compatibility/info.rkt
similarity index 100%
rename from pkgs/compatibility-pkgs/compatibility/info.rkt
rename to compatibility/info.rkt