diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/LICENSE.txt b/macro-debugger-text-lib/LICENSE.txt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/LICENSE.txt
rename to macro-debugger-text-lib/LICENSE.txt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/info.rkt b/macro-debugger-text-lib/info.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/info.rkt
rename to macro-debugger-text-lib/info.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/check-requires.rkt b/macro-debugger-text-lib/macro-debugger/analysis/check-requires.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/check-requires.rkt
rename to macro-debugger-text-lib/macro-debugger/analysis/check-requires.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/get-references.rkt b/macro-debugger-text-lib/macro-debugger/analysis/private/get-references.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/get-references.rkt
rename to macro-debugger-text-lib/macro-debugger/analysis/private/get-references.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/moduledb.rkt b/macro-debugger-text-lib/macro-debugger/analysis/private/moduledb.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/moduledb.rkt
rename to macro-debugger-text-lib/macro-debugger/analysis/private/moduledb.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/nom-use-alg.rkt b/macro-debugger-text-lib/macro-debugger/analysis/private/nom-use-alg.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/nom-use-alg.rkt
rename to macro-debugger-text-lib/macro-debugger/analysis/private/nom-use-alg.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/refine-alg.rkt b/macro-debugger-text-lib/macro-debugger/analysis/private/refine-alg.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/refine-alg.rkt
rename to macro-debugger-text-lib/macro-debugger/analysis/private/refine-alg.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/util.rkt b/macro-debugger-text-lib/macro-debugger/analysis/private/util.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/private/util.rkt
rename to macro-debugger-text-lib/macro-debugger/analysis/private/util.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/show-dependencies.rkt b/macro-debugger-text-lib/macro-debugger/analysis/show-dependencies.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/analysis/show-dependencies.rkt
rename to macro-debugger-text-lib/macro-debugger/analysis/show-dependencies.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/expand.rkt b/macro-debugger-text-lib/macro-debugger/expand.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/expand.rkt
rename to macro-debugger-text-lib/macro-debugger/expand.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/info.rkt b/macro-debugger-text-lib/macro-debugger/info.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/info.rkt
rename to macro-debugger-text-lib/macro-debugger/info.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/context.rkt b/macro-debugger-text-lib/macro-debugger/model/context.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/context.rkt
rename to macro-debugger-text-lib/macro-debugger/model/context.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/debug.rkt b/macro-debugger-text-lib/macro-debugger/model/debug.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/debug.rkt
rename to macro-debugger-text-lib/macro-debugger/model/debug.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-c.rkt b/macro-debugger-text-lib/macro-debugger/model/deriv-c.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-c.rkt
rename to macro-debugger-text-lib/macro-debugger/model/deriv-c.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-parser.rkt b/macro-debugger-text-lib/macro-debugger/model/deriv-parser.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-parser.rkt
rename to macro-debugger-text-lib/macro-debugger/model/deriv-parser.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-tokens.rkt b/macro-debugger-text-lib/macro-debugger/model/deriv-tokens.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-tokens.rkt
rename to macro-debugger-text-lib/macro-debugger/model/deriv-tokens.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-util.rkt b/macro-debugger-text-lib/macro-debugger/model/deriv-util.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv-util.rkt
rename to macro-debugger-text-lib/macro-debugger/model/deriv-util.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv.rkt b/macro-debugger-text-lib/macro-debugger/model/deriv.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/deriv.rkt
rename to macro-debugger-text-lib/macro-debugger/model/deriv.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/hiding-policies.rkt b/macro-debugger-text-lib/macro-debugger/model/hiding-policies.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/hiding-policies.rkt
rename to macro-debugger-text-lib/macro-debugger/model/hiding-policies.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-config.rkt b/macro-debugger-text-lib/macro-debugger/model/reductions-config.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-config.rkt
rename to macro-debugger-text-lib/macro-debugger/model/reductions-config.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-engine.rkt b/macro-debugger-text-lib/macro-debugger/model/reductions-engine.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions-engine.rkt
rename to macro-debugger-text-lib/macro-debugger/model/reductions-engine.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions.rkt b/macro-debugger-text-lib/macro-debugger/model/reductions.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/reductions.rkt
rename to macro-debugger-text-lib/macro-debugger/model/reductions.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/steps.rkt b/macro-debugger-text-lib/macro-debugger/model/steps.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/steps.rkt
rename to macro-debugger-text-lib/macro-debugger/model/steps.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/stx-util.rkt b/macro-debugger-text-lib/macro-debugger/model/stx-util.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/stx-util.rkt
rename to macro-debugger-text-lib/macro-debugger/model/stx-util.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt b/macro-debugger-text-lib/macro-debugger/model/trace.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt
rename to macro-debugger-text-lib/macro-debugger/model/trace.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-ext.rkt b/macro-debugger-text-lib/macro-debugger/model/yacc-ext.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-ext.rkt
rename to macro-debugger-text-lib/macro-debugger/model/yacc-ext.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-interrupted.rkt b/macro-debugger-text-lib/macro-debugger/model/yacc-interrupted.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/yacc-interrupted.rkt
rename to macro-debugger-text-lib/macro-debugger/model/yacc-interrupted.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/stepper-text.rkt b/macro-debugger-text-lib/macro-debugger/stepper-text.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/stepper-text.rkt
rename to macro-debugger-text-lib/macro-debugger/stepper-text.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt b/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
rename to macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/partition.rkt b/macro-debugger-text-lib/macro-debugger/syntax-browser/partition.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/partition.rkt
rename to macro-debugger-text-lib/macro-debugger/syntax-browser/partition.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt b/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
rename to macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/eomap.rkt b/macro-debugger-text-lib/macro-debugger/util/eomap.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/eomap.rkt
rename to macro-debugger-text-lib/macro-debugger/util/eomap.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/mpi.rkt b/macro-debugger-text-lib/macro-debugger/util/mpi.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/mpi.rkt
rename to macro-debugger-text-lib/macro-debugger/util/mpi.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/stxobj.rkt b/macro-debugger-text-lib/macro-debugger/util/stxobj.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/util/stxobj.rkt
rename to macro-debugger-text-lib/macro-debugger/util/stxobj.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/view/debug-format.rkt b/macro-debugger-text-lib/macro-debugger/view/debug-format.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/view/debug-format.rkt
rename to macro-debugger-text-lib/macro-debugger/view/debug-format.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/LICENSE.txt b/macro-debugger/LICENSE.txt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/LICENSE.txt
rename to macro-debugger/LICENSE.txt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt b/macro-debugger/info.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
rename to macro-debugger/info.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/emit.rkt b/macro-debugger/macro-debugger/emit.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/emit.rkt
rename to macro-debugger/macro-debugger/emit.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/info.rkt b/macro-debugger/macro-debugger/info.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/info.rkt
rename to macro-debugger/macro-debugger/info.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/macro-debugger.scrbl b/macro-debugger/macro-debugger/macro-debugger.scrbl
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/macro-debugger.scrbl
rename to macro-debugger/macro-debugger/macro-debugger.scrbl
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/model/trace-raw.rkt b/macro-debugger/macro-debugger/model/trace-raw.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/model/trace-raw.rkt
rename to macro-debugger/macro-debugger/model/trace-raw.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/stepper.rkt b/macro-debugger/macro-debugger/stepper.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/stepper.rkt
rename to macro-debugger/macro-debugger/stepper.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser.rkt b/macro-debugger/macro-debugger/syntax-browser.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser.rkt
rename to macro-debugger/macro-debugger/syntax-browser.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/controller.rkt b/macro-debugger/macro-debugger/syntax-browser/controller.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/controller.rkt
rename to macro-debugger/macro-debugger/syntax-browser/controller.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/display.rkt b/macro-debugger/macro-debugger/syntax-browser/display.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/display.rkt
rename to macro-debugger/macro-debugger/syntax-browser/display.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/embed.rkt b/macro-debugger/macro-debugger/syntax-browser/embed.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/embed.rkt
rename to macro-debugger/macro-debugger/syntax-browser/embed.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/frame.rkt b/macro-debugger/macro-debugger/syntax-browser/frame.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/frame.rkt
rename to macro-debugger/macro-debugger/syntax-browser/frame.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/hrule-snip.rkt b/macro-debugger/macro-debugger/syntax-browser/hrule-snip.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/hrule-snip.rkt
rename to macro-debugger/macro-debugger/syntax-browser/hrule-snip.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/image.rkt b/macro-debugger/macro-debugger/syntax-browser/image.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/image.rkt
rename to macro-debugger/macro-debugger/syntax-browser/image.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/keymap.rkt b/macro-debugger/macro-debugger/syntax-browser/keymap.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/keymap.rkt
rename to macro-debugger/macro-debugger/syntax-browser/keymap.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/prefs.rkt b/macro-debugger/macro-debugger/syntax-browser/prefs.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/prefs.rkt
rename to macro-debugger/macro-debugger/syntax-browser/prefs.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/pretty-printer.rkt b/macro-debugger/macro-debugger/syntax-browser/pretty-printer.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/pretty-printer.rkt
rename to macro-debugger/macro-debugger/syntax-browser/pretty-printer.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/properties.rkt b/macro-debugger/macro-debugger/syntax-browser/properties.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/properties.rkt
rename to macro-debugger/macro-debugger/syntax-browser/properties.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt b/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
rename to macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip.rkt b/macro-debugger/macro-debugger/syntax-browser/snip.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/snip.rkt
rename to macro-debugger/macro-debugger/syntax-browser/snip.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/text.rkt b/macro-debugger/macro-debugger/syntax-browser/text.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/text.rkt
rename to macro-debugger/macro-debugger/syntax-browser/text.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/util.rkt b/macro-debugger/macro-debugger/syntax-browser/util.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/util.rkt
rename to macro-debugger/macro-debugger/syntax-browser/util.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/widget.rkt b/macro-debugger/macro-debugger/syntax-browser/widget.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/syntax-browser/widget.rkt
rename to macro-debugger/macro-debugger/syntax-browser/widget.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/tests/test-docs-complete.rkt b/macro-debugger/macro-debugger/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/tests/test-docs-complete.rkt
rename to macro-debugger/macro-debugger/tests/test-docs-complete.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/util/logger.rkt b/macro-debugger/macro-debugger/util/logger.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/util/logger.rkt
rename to macro-debugger/macro-debugger/util/logger.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/cursor.rkt b/macro-debugger/macro-debugger/view/cursor.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/cursor.rkt
rename to macro-debugger/macro-debugger/view/cursor.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/debug.rkt b/macro-debugger/macro-debugger/view/debug.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/debug.rkt
rename to macro-debugger/macro-debugger/view/debug.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/extensions.rkt b/macro-debugger/macro-debugger/view/extensions.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/extensions.rkt
rename to macro-debugger/macro-debugger/view/extensions.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/frame.rkt b/macro-debugger/macro-debugger/view/frame.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/frame.rkt
rename to macro-debugger/macro-debugger/view/frame.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/gui-util.rkt b/macro-debugger/macro-debugger/view/gui-util.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/gui-util.rkt
rename to macro-debugger/macro-debugger/view/gui-util.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/hiding-panel.rkt b/macro-debugger/macro-debugger/view/hiding-panel.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/hiding-panel.rkt
rename to macro-debugger/macro-debugger/view/hiding-panel.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/interfaces.rkt b/macro-debugger/macro-debugger/view/interfaces.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/interfaces.rkt
rename to macro-debugger/macro-debugger/view/interfaces.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/prefs.rkt b/macro-debugger/macro-debugger/view/prefs.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/prefs.rkt
rename to macro-debugger/macro-debugger/view/prefs.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/step-display.rkt b/macro-debugger/macro-debugger/view/step-display.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/step-display.rkt
rename to macro-debugger/macro-debugger/view/step-display.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/stepper.rkt b/macro-debugger/macro-debugger/view/stepper.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/stepper.rkt
rename to macro-debugger/macro-debugger/view/stepper.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/term-record.rkt b/macro-debugger/macro-debugger/view/term-record.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/term-record.rkt
rename to macro-debugger/macro-debugger/view/term-record.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/view.rkt b/macro-debugger/macro-debugger/view/view.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/macro-debugger/view/view.rkt
rename to macro-debugger/macro-debugger/view/view.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/all-tests.rkt b/macro-debugger/tests/macro-debugger/all-tests.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/all-tests.rkt
rename to macro-debugger/tests/macro-debugger/all-tests.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt b/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt
rename to macro-debugger/tests/macro-debugger/check-requires/src-a.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt b/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt
rename to macro-debugger/tests/macro-debugger/check-requires/src-b.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt b/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt
rename to macro-debugger/tests/macro-debugger/check-requires/src-c.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt b/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt
rename to macro-debugger/tests/macro-debugger/check-requires/use-a.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt b/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt
rename to macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentest-framework.rkt b/macro-debugger/tests/macro-debugger/gentest-framework.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentest-framework.rkt
rename to macro-debugger/tests/macro-debugger/gentest-framework.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentests.rkt b/macro-debugger/tests/macro-debugger/gentests.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentests.rkt
rename to macro-debugger/tests/macro-debugger/gentests.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gui-tests.rkt b/macro-debugger/tests/macro-debugger/gui-tests.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gui-tests.rkt
rename to macro-debugger/tests/macro-debugger/gui-tests.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/test-setup.rkt b/macro-debugger/tests/macro-debugger/test-setup.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/test-setup.rkt
rename to macro-debugger/tests/macro-debugger/test-setup.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/collects.rkt b/macro-debugger/tests/macro-debugger/tests/collects.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/collects.rkt
rename to macro-debugger/tests/macro-debugger/tests/collects.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/hiding.rkt b/macro-debugger/tests/macro-debugger/tests/hiding.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/hiding.rkt
rename to macro-debugger/tests/macro-debugger/tests/hiding.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/policy.rkt b/macro-debugger/tests/macro-debugger/tests/policy.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/policy.rkt
rename to macro-debugger/tests/macro-debugger/tests/policy.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt b/macro-debugger/tests/macro-debugger/tests/regression.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
rename to macro-debugger/tests/macro-debugger/tests/regression.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt b/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt
rename to macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt b/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt
rename to macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt b/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt
rename to macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt b/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt
rename to macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/find.rkt b/macro-debugger/unstable/find.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/unstable/find.rkt
rename to macro-debugger/unstable/find.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/info.rkt b/macro-debugger/unstable/info.rkt
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/unstable/info.rkt
rename to macro-debugger/unstable/info.rkt
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/unstable/unstable-find.scrbl b/macro-debugger/unstable/unstable-find.scrbl
similarity index 100%
rename from pkgs/macro-debugger-pkgs/macro-debugger/unstable/unstable-find.scrbl
rename to macro-debugger/unstable/unstable-find.scrbl