diff --git a/pkgs/scribble-pkgs/scribble-doc/LICENSE.txt b/scribble-doc/LICENSE.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/LICENSE.txt
rename to scribble-doc/LICENSE.txt
diff --git a/pkgs/scribble-pkgs/scribble-doc/info.rkt b/scribble-doc/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/info.rkt
rename to scribble-doc/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/base.scrbl b/scribble-doc/scribblings/scribble/base.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/base.scrbl
rename to scribble-doc/scribblings/scribble/base.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/basic.scrbl b/scribble-doc/scribblings/scribble/basic.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/basic.scrbl
rename to scribble-doc/scribblings/scribble/basic.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/blueboxes.scrbl b/scribble-doc/scribblings/scribble/blueboxes.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/blueboxes.scrbl
rename to scribble-doc/scribblings/scribble/blueboxes.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/bnf.scrbl b/scribble-doc/scribblings/scribble/bnf.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/bnf.scrbl
rename to scribble-doc/scribblings/scribble/bnf.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/book.scrbl b/scribble-doc/scribblings/scribble/book.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/book.scrbl
rename to scribble-doc/scribblings/scribble/book.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/class-diagrams.rkt b/scribble-doc/scribblings/scribble/class-diagrams.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/class-diagrams.rkt
rename to scribble-doc/scribblings/scribble/class-diagrams.rkt
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/compat.scrbl b/scribble-doc/scribblings/scribble/compat.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/compat.scrbl
rename to scribble-doc/scribblings/scribble/compat.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/config.scrbl b/scribble-doc/scribblings/scribble/config.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/config.scrbl
rename to scribble-doc/scribblings/scribble/config.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl b/scribble-doc/scribblings/scribble/core.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl
rename to scribble-doc/scribblings/scribble/core.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/decode.scrbl b/scribble-doc/scribblings/scribble/decode.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/decode.scrbl
rename to scribble-doc/scribblings/scribble/decode.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-class.scrbl b/scribble-doc/scribblings/scribble/demo-class.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-class.scrbl
rename to scribble-doc/scribblings/scribble/demo-class.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m1.scrbl b/scribble-doc/scribblings/scribble/demo-m1.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m1.scrbl
rename to scribble-doc/scribblings/scribble/demo-m1.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m2.scrbl b/scribble-doc/scribblings/scribble/demo-m2.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-m2.scrbl
rename to scribble-doc/scribblings/scribble/demo-m2.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m1.scrbl b/scribble-doc/scribblings/scribble/demo-manual-m1.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m1.scrbl
rename to scribble-doc/scribblings/scribble/demo-manual-m1.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m2.scrbl b/scribble-doc/scribblings/scribble/demo-manual-m2.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-m2.scrbl
rename to scribble-doc/scribblings/scribble/demo-manual-m2.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s1.scrbl b/scribble-doc/scribblings/scribble/demo-manual-s1.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s1.scrbl
rename to scribble-doc/scribblings/scribble/demo-manual-s1.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s2.scrbl b/scribble-doc/scribblings/scribble/demo-manual-s2.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual-s2.scrbl
rename to scribble-doc/scribblings/scribble/demo-manual-s2.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual.scrbl b/scribble-doc/scribblings/scribble/demo-manual.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-manual.scrbl
rename to scribble-doc/scribblings/scribble/demo-manual.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s1.scrbl b/scribble-doc/scribblings/scribble/demo-s1.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s1.scrbl
rename to scribble-doc/scribblings/scribble/demo-s1.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s2.scrbl b/scribble-doc/scribblings/scribble/demo-s2.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo-s2.scrbl
rename to scribble-doc/scribblings/scribble/demo-s2.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo.scrbl b/scribble-doc/scribblings/scribble/demo.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/demo.scrbl
rename to scribble-doc/scribblings/scribble/demo.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/doclang.scrbl b/scribble-doc/scribblings/scribble/doclang.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/doclang.scrbl
rename to scribble-doc/scribblings/scribble/doclang.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/docreader.scrbl b/scribble-doc/scribblings/scribble/docreader.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/docreader.scrbl
rename to scribble-doc/scribblings/scribble/docreader.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/eval.scrbl b/scribble-doc/scribblings/scribble/eval.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/eval.scrbl
rename to scribble-doc/scribblings/scribble/eval.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/generic.scrbl b/scribble-doc/scribblings/scribble/generic.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/generic.scrbl
rename to scribble-doc/scribblings/scribble/generic.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl b/scribble-doc/scribblings/scribble/getting-started.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl
rename to scribble-doc/scribblings/scribble/getting-started.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl b/scribble-doc/scribblings/scribble/how-to-paper.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl
rename to scribble-doc/scribblings/scribble/how-to-paper.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to.scrbl b/scribble-doc/scribblings/scribble/how-to.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to.scrbl
rename to scribble-doc/scribblings/scribble/how-to.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/html.scrbl b/scribble-doc/scribblings/scribble/html.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/html.scrbl
rename to scribble-doc/scribblings/scribble/html.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.css b/scribble-doc/scribblings/scribble/inbox.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.css
rename to scribble-doc/scribblings/scribble/inbox.css
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.tex b/scribble-doc/scribblings/scribble/inbox.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.tex
rename to scribble-doc/scribblings/scribble/inbox.tex
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/info.rkt b/scribble-doc/scribblings/scribble/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/info.rkt
rename to scribble-doc/scribblings/scribble/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/internals.scrbl b/scribble-doc/scribblings/scribble/internals.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/internals.scrbl
rename to scribble-doc/scribblings/scribble/internals.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/jfp.scrbl b/scribble-doc/scribblings/scribble/jfp.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/jfp.scrbl
rename to scribble-doc/scribblings/scribble/jfp.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/layers.scrbl b/scribble-doc/scribblings/scribble/layers.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/layers.scrbl
rename to scribble-doc/scribblings/scribble/layers.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lncs.scrbl b/scribble-doc/scribblings/scribble/lncs.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lncs.scrbl
rename to scribble-doc/scribblings/scribble/lncs.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl b/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl
rename to scribble-doc/scribblings/scribble/lp-ex-doc.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex.rkt b/scribble-doc/scribblings/scribble/lp-ex.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex.rkt
rename to scribble-doc/scribblings/scribble/lp-ex.rkt
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.css b/scribble-doc/scribblings/scribble/lp.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.css
rename to scribble-doc/scribblings/scribble/lp.css
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.scrbl b/scribble-doc/scribblings/scribble/lp.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.scrbl
rename to scribble-doc/scribblings/scribble/lp.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.tex b/scribble-doc/scribblings/scribble/lp.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.tex
rename to scribble-doc/scribblings/scribble/lp.tex
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual-stub.scrbl b/scribble-doc/scribblings/scribble/manual-stub.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual-stub.scrbl
rename to scribble-doc/scribblings/scribble/manual-stub.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl b/scribble-doc/scribblings/scribble/manual.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl
rename to scribble-doc/scribblings/scribble/manual.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/plt.scrbl b/scribble-doc/scribblings/scribble/plt.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/plt.scrbl
rename to scribble-doc/scribblings/scribble/plt.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader-internals.scrbl b/scribble-doc/scribblings/scribble/reader-internals.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader-internals.scrbl
rename to scribble-doc/scribblings/scribble/reader-internals.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader.scrbl b/scribble-doc/scribblings/scribble/reader.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader.scrbl
rename to scribble-doc/scribblings/scribble/reader.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/renderer.scrbl b/scribble-doc/scribblings/scribble/renderer.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/renderer.scrbl
rename to scribble-doc/scribblings/scribble/renderer.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/report.scrbl b/scribble-doc/scribblings/scribble/report.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/report.scrbl
rename to scribble-doc/scribblings/scribble/report.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/running.scrbl b/scribble-doc/scribblings/scribble/running.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/running.scrbl
rename to scribble-doc/scribblings/scribble/running.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scheme.scrbl b/scribble-doc/scribblings/scribble/scheme.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scheme.scrbl
rename to scribble-doc/scribblings/scribble/scheme.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble-pp.scrbl b/scribble-doc/scribblings/scribble/scribble-pp.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble-pp.scrbl
rename to scribble-doc/scribblings/scribble/scribble-pp.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble.scrbl b/scribble-doc/scribblings/scribble/scribble.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble.scrbl
rename to scribble-doc/scribblings/scribble/scribble.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.css b/scribble-doc/scribblings/scribble/shaded.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.css
rename to scribble-doc/scribblings/scribble/shaded.css
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.tex b/scribble-doc/scribblings/scribble/shaded.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.tex
rename to scribble-doc/scribblings/scribble/shaded.tex
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/sigplan.scrbl b/scribble-doc/scribblings/scribble/sigplan.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/sigplan.scrbl
rename to scribble-doc/scribblings/scribble/sigplan.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/srcdoc.scrbl b/scribble-doc/scribblings/scribble/srcdoc.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/srcdoc.scrbl
rename to scribble-doc/scribblings/scribble/srcdoc.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct-hierarchy.rkt b/scribble-doc/scribblings/scribble/struct-hierarchy.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct-hierarchy.rkt
rename to scribble-doc/scribblings/scribble/struct-hierarchy.rkt
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct.scrbl b/scribble-doc/scribblings/scribble/struct.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct.scrbl
rename to scribble-doc/scribblings/scribble/struct.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/style.scrbl b/scribble-doc/scribblings/scribble/style.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/style.scrbl
rename to scribble-doc/scribblings/scribble/style.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/tag.scrbl b/scribble-doc/scribblings/scribble/tag.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/tag.scrbl
rename to scribble-doc/scribblings/scribble/tag.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/text.scrbl b/scribble-doc/scribblings/scribble/text.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/text.scrbl
rename to scribble-doc/scribblings/scribble/text.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/utils.rkt b/scribble-doc/scribblings/scribble/utils.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/utils.rkt
rename to scribble-doc/scribblings/scribble/utils.rkt
diff --git a/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/xref.scrbl b/scribble-doc/scribblings/scribble/xref.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/xref.scrbl
rename to scribble-doc/scribblings/scribble/xref.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/autobib.scrbl b/scribble-doc/scriblib/scribblings/autobib.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/autobib.scrbl
rename to scribble-doc/scriblib/scribblings/autobib.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/bibtex.scrbl b/scribble-doc/scriblib/scribblings/bibtex.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/bibtex.scrbl
rename to scribble-doc/scriblib/scribblings/bibtex.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/figure.scrbl b/scribble-doc/scriblib/scribblings/figure.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/figure.scrbl
rename to scribble-doc/scriblib/scribblings/figure.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/footnote.scrbl b/scribble-doc/scriblib/scribblings/footnote.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/footnote.scrbl
rename to scribble-doc/scriblib/scribblings/footnote.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/gui-eval.scrbl b/scribble-doc/scriblib/scribblings/gui-eval.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/gui-eval.scrbl
rename to scribble-doc/scriblib/scribblings/gui-eval.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/info.rkt b/scribble-doc/scriblib/scribblings/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/info.rkt
rename to scribble-doc/scriblib/scribblings/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/render-cond.scrbl b/scribble-doc/scriblib/scribblings/render-cond.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/render-cond.scrbl
rename to scribble-doc/scriblib/scribblings/render-cond.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/scriblib.scrbl b/scribble-doc/scriblib/scribblings/scriblib.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-doc/scriblib/scribblings/scriblib.scrbl
rename to scribble-doc/scriblib/scribblings/scriblib.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/LICENSE.txt b/scribble-html-lib/LICENSE.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/LICENSE.txt
rename to scribble-html-lib/LICENSE.txt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/info.rkt b/scribble-html-lib/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/info.rkt
rename to scribble-html-lib/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html.rkt b/scribble-html-lib/scribble/html.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html.rkt
rename to scribble-html-lib/scribble/html.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/html.rkt b/scribble-html-lib/scribble/html/html.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html/html.rkt
rename to scribble-html-lib/scribble/html/html.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/info.rkt b/scribble-html-lib/scribble/html/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html/info.rkt
rename to scribble-html-lib/scribble/html/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang.rkt b/scribble-html-lib/scribble/html/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang.rkt
rename to scribble-html-lib/scribble/html/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang/reader.rkt b/scribble-html-lib/scribble/html/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html/lang/reader.rkt
rename to scribble-html-lib/scribble/html/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/main.rkt b/scribble-html-lib/scribble/html/main.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html/main.rkt
rename to scribble-html-lib/scribble/html/main.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/resource.rkt b/scribble-html-lib/scribble/html/resource.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html/resource.rkt
rename to scribble-html-lib/scribble/html/resource.rkt
diff --git a/pkgs/scribble-pkgs/scribble-html-lib/scribble/html/xml.rkt b/scribble-html-lib/scribble/html/xml.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-html-lib/scribble/html/xml.rkt
rename to scribble-html-lib/scribble/html/xml.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/LICENSE.txt b/scribble-lib/LICENSE.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/LICENSE.txt
rename to scribble-lib/LICENSE.txt
diff --git a/pkgs/scribble-pkgs/scribble-lib/help/help.rkt b/scribble-lib/help/help.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/help/help.rkt
rename to scribble-lib/help/help.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/help/info.rkt b/scribble-lib/help/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/help/info.rkt
rename to scribble-lib/help/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/help/search.rkt b/scribble-lib/help/search.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/help/search.rkt
rename to scribble-lib/help/search.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/info.rkt b/scribble-lib/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/info.rkt
rename to scribble-lib/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt b/scribble-lib/scribble/HISTORY.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/HISTORY.txt
rename to scribble-lib/scribble/HISTORY.txt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt b/scribble-lib/scribble/base-render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt
rename to scribble-lib/scribble/base-render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt b/scribble-lib/scribble/base.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt
rename to scribble-lib/scribble/base.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang.rkt b/scribble-lib/scribble/base/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/base/lang.rkt
rename to scribble-lib/scribble/base/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang/reader.rkt b/scribble-lib/scribble/base/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/base/lang/reader.rkt
rename to scribble-lib/scribble/base/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/basic.rkt b/scribble-lib/scribble/basic.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/basic.rkt
rename to scribble-lib/scribble/basic.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/blueboxes.rkt b/scribble-lib/scribble/blueboxes.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/blueboxes.rkt
rename to scribble-lib/scribble/blueboxes.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/bnf.rkt b/scribble-lib/scribble/bnf.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/bnf.rkt
rename to scribble-lib/scribble/bnf.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang.rkt b/scribble-lib/scribble/book/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/book/lang.rkt
rename to scribble-lib/scribble/book/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang/reader.rkt b/scribble-lib/scribble/book/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/book/lang/reader.rkt
rename to scribble-lib/scribble/book/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/book/style.tex b/scribble-lib/scribble/book/style.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/book/style.tex
rename to scribble-lib/scribble/book/style.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/comment-reader.rkt b/scribble-lib/scribble/comment-reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/comment-reader.rkt
rename to scribble-lib/scribble/comment-reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/config.rkt b/scribble-lib/scribble/config.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/config.rkt
rename to scribble-lib/scribble/config.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/contract-render.rkt b/scribble-lib/scribble/contract-render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/contract-render.rkt
rename to scribble-lib/scribble/contract-render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/core.rkt b/scribble-lib/scribble/core.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/core.rkt
rename to scribble-lib/scribble/core.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/decode-struct.rkt b/scribble-lib/scribble/decode-struct.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/decode-struct.rkt
rename to scribble-lib/scribble/decode-struct.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/decode.rkt b/scribble-lib/scribble/decode.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/decode.rkt
rename to scribble-lib/scribble/decode.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc.txt b/scribble-lib/scribble/doc.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/doc.txt
rename to scribble-lib/scribble/doc.txt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/lang/reader.rkt b/scribble-lib/scribble/doc/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/doc/lang/reader.rkt
rename to scribble-lib/scribble/doc/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/main.rkt b/scribble-lib/scribble/doc/main.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/doc/main.rkt
rename to scribble-lib/scribble/doc/main.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doc/reader.rkt b/scribble-lib/scribble/doc/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/doc/reader.rkt
rename to scribble-lib/scribble/doc/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doclang.rkt b/scribble-lib/scribble/doclang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/doclang.rkt
rename to scribble-lib/scribble/doclang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/doclang2.rkt b/scribble-lib/scribble/doclang2.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/doclang2.rkt
rename to scribble-lib/scribble/doclang2.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/eval.rkt b/scribble-lib/scribble/eval.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/eval.rkt
rename to scribble-lib/scribble/eval.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/extract.rkt b/scribble-lib/scribble/extract.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/extract.rkt
rename to scribble-lib/scribble/extract.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt b/scribble-lib/scribble/html-properties.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt
rename to scribble-lib/scribble/html-properties.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt b/scribble-lib/scribble/html-render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt
rename to scribble-lib/scribble/html-render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/info.rkt b/scribble-lib/scribble/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/info.rkt
rename to scribble-lib/scribble/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp.rkt b/scribble-lib/scribble/jfp.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/jfp.rkt
rename to scribble-lib/scribble/jfp.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/.gitignore b/scribble-lib/scribble/jfp/.gitignore
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/jfp/.gitignore
rename to scribble-lib/scribble/jfp/.gitignore
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.css b/scribble-lib/scribble/jfp/jfp.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.css
rename to scribble-lib/scribble/jfp/jfp.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.tex b/scribble-lib/scribble/jfp/jfp.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.tex
rename to scribble-lib/scribble/jfp/jfp.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang.rkt b/scribble-lib/scribble/jfp/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang.rkt
rename to scribble-lib/scribble/jfp/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang/reader.rkt b/scribble-lib/scribble/jfp/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang/reader.rkt
rename to scribble-lib/scribble/jfp/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/style.tex b/scribble-lib/scribble/jfp/style.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/jfp/style.tex
rename to scribble-lib/scribble/jfp/style.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-prefix.rkt b/scribble-lib/scribble/latex-prefix.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/latex-prefix.rkt
rename to scribble-lib/scribble/latex-prefix.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-properties.rkt b/scribble-lib/scribble/latex-properties.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/latex-properties.rkt
rename to scribble-lib/scribble/latex-properties.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/latex-render.rkt b/scribble-lib/scribble/latex-render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/latex-render.rkt
rename to scribble-lib/scribble/latex-render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/.gitignore b/scribble-lib/scribble/lncs/.gitignore
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lncs/.gitignore
rename to scribble-lib/scribble/lncs/.gitignore
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang.rkt b/scribble-lib/scribble/lncs/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang.rkt
rename to scribble-lib/scribble/lncs/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang/reader.rkt b/scribble-lib/scribble/lncs/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang/reader.rkt
rename to scribble-lib/scribble/lncs/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lncs.tex b/scribble-lib/scribble/lncs/lncs.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lncs.tex
rename to scribble-lib/scribble/lncs/lncs.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/style.tex b/scribble-lib/scribble/lncs/style.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lncs/style.tex
rename to scribble-lib/scribble/lncs/style.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp-include.rkt b/scribble-lib/scribble/lp-include.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lp-include.rkt
rename to scribble-lib/scribble/lp-include.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp.rkt b/scribble-lib/scribble/lp.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lp.rkt
rename to scribble-lib/scribble/lp.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/lang.rkt b/scribble-lib/scribble/lp/lang/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/lang.rkt
rename to scribble-lib/scribble/lp/lang/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/reader.rkt b/scribble-lib/scribble/lp/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/reader.rkt
rename to scribble-lib/scribble/lp/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-fonts.css b/scribble-lib/scribble/manual-fonts.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual-fonts.css
rename to scribble-lib/scribble/manual-fonts.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-prefix.tex b/scribble-lib/scribble/manual-prefix.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual-prefix.tex
rename to scribble-lib/scribble/manual-prefix.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.css b/scribble-lib/scribble/manual-racket.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.css
rename to scribble-lib/scribble/manual-racket.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.js b/scribble-lib/scribble/manual-racket.js
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual-racket.js
rename to scribble-lib/scribble/manual-racket.js
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-struct.rkt b/scribble-lib/scribble/manual-struct.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual-struct.rkt
rename to scribble-lib/scribble/manual-struct.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css b/scribble-lib/scribble/manual-style.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.css
rename to scribble-lib/scribble/manual-style.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.tex b/scribble-lib/scribble/manual-style.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.tex
rename to scribble-lib/scribble/manual-style.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt b/scribble-lib/scribble/manual.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt
rename to scribble-lib/scribble/manual.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt b/scribble-lib/scribble/manual/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt
rename to scribble-lib/scribble/manual/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang/reader.rkt b/scribble-lib/scribble/manual/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang/reader.rkt
rename to scribble-lib/scribble/manual/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/markdown-render.rkt b/scribble-lib/scribble/markdown-render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/markdown-render.rkt
rename to scribble-lib/scribble/markdown-render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/pdf-render.rkt b/scribble-lib/scribble/pdf-render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/pdf-render.rkt
rename to scribble-lib/scribble/pdf-render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt b/scribble-lib/scribble/private/defaults.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt
rename to scribble-lib/scribble/private/defaults.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/indirect-renderer.rkt b/scribble-lib/scribble/private/indirect-renderer.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/indirect-renderer.rkt
rename to scribble-lib/scribble/private/indirect-renderer.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/literal-anchor.rkt b/scribble-lib/scribble/private/literal-anchor.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/literal-anchor.rkt
rename to scribble-lib/scribble/private/literal-anchor.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/lp.rkt b/scribble-lib/scribble/private/lp.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/lp.rkt
rename to scribble-lib/scribble/private/lp.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bib.rkt b/scribble-lib/scribble/private/manual-bib.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bib.rkt
rename to scribble-lib/scribble/private/manual-bib.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt b/scribble-lib/scribble/private/manual-bind.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt
rename to scribble-lib/scribble/private/manual-bind.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class-struct.rkt b/scribble-lib/scribble/private/manual-class-struct.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class-struct.rkt
rename to scribble-lib/scribble/private/manual-class-struct.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt b/scribble-lib/scribble/private/manual-class.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt
rename to scribble-lib/scribble/private/manual-class.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-code.rkt b/scribble-lib/scribble/private/manual-code.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-code.rkt
rename to scribble-lib/scribble/private/manual-code.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt b/scribble-lib/scribble/private/manual-defaults.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-defaults.rkt
rename to scribble-lib/scribble/private/manual-defaults.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-ex.rkt b/scribble-lib/scribble/private/manual-ex.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-ex.rkt
rename to scribble-lib/scribble/private/manual-ex.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-form.rkt b/scribble-lib/scribble/private/manual-form.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-form.rkt
rename to scribble-lib/scribble/private/manual-form.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-history.rkt b/scribble-lib/scribble/private/manual-history.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-history.rkt
rename to scribble-lib/scribble/private/manual-history.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-method.rkt b/scribble-lib/scribble/private/manual-method.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-method.rkt
rename to scribble-lib/scribble/private/manual-method.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-mod.rkt b/scribble-lib/scribble/private/manual-mod.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-mod.rkt
rename to scribble-lib/scribble/private/manual-mod.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt b/scribble-lib/scribble/private/manual-proc.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt
rename to scribble-lib/scribble/private/manual-proc.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt b/scribble-lib/scribble/private/manual-scheme.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt
rename to scribble-lib/scribble/private/manual-scheme.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-sprop.rkt b/scribble-lib/scribble/private/manual-sprop.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-sprop.rkt
rename to scribble-lib/scribble/private/manual-sprop.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-style.rkt b/scribble-lib/scribble/private/manual-style.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-style.rkt
rename to scribble-lib/scribble/private/manual-style.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-tech.rkt b/scribble-lib/scribble/private/manual-tech.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-tech.rkt
rename to scribble-lib/scribble/private/manual-tech.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-unit.rkt b/scribble-lib/scribble/private/manual-unit.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-unit.rkt
rename to scribble-lib/scribble/private/manual-unit.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-utils.rkt b/scribble-lib/scribble/private/manual-utils.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-utils.rkt
rename to scribble-lib/scribble/private/manual-utils.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-vars.rkt b/scribble-lib/scribble/private/manual-vars.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-vars.rkt
rename to scribble-lib/scribble/private/manual-vars.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/on-demand.rkt b/scribble-lib/scribble/private/on-demand.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/on-demand.rkt
rename to scribble-lib/scribble/private/on-demand.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/provide-structs.rkt b/scribble-lib/scribble/private/provide-structs.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/provide-structs.rkt
rename to scribble-lib/scribble/private/provide-structs.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/qsloc.rkt b/scribble-lib/scribble/private/qsloc.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/qsloc.rkt
rename to scribble-lib/scribble/private/qsloc.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/render-utils.rkt b/scribble-lib/scribble/private/render-utils.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/render-utils.rkt
rename to scribble-lib/scribble/private/render-utils.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/run-pdflatex.rkt b/scribble-lib/scribble/private/run-pdflatex.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/run-pdflatex.rkt
rename to scribble-lib/scribble/private/run-pdflatex.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/serialize.rkt b/scribble-lib/scribble/private/serialize.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/private/serialize.rkt
rename to scribble-lib/scribble/private/serialize.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/provide-doc-transform.rkt b/scribble-lib/scribble/provide-doc-transform.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/provide-doc-transform.rkt
rename to scribble-lib/scribble/provide-doc-transform.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css b/scribble-lib/scribble/racket.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/racket.css
rename to scribble-lib/scribble/racket.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.rkt b/scribble-lib/scribble/racket.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/racket.rkt
rename to scribble-lib/scribble/racket.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/racket.tex b/scribble-lib/scribble/racket.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/racket.tex
rename to scribble-lib/scribble/racket.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/render-struct.rkt b/scribble-lib/scribble/render-struct.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/render-struct.rkt
rename to scribble-lib/scribble/render-struct.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/render.rkt b/scribble-lib/scribble/render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/render.rkt
rename to scribble-lib/scribble/render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang.rkt b/scribble-lib/scribble/report/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/report/lang.rkt
rename to scribble-lib/scribble/report/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang/reader.rkt b/scribble-lib/scribble/report/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/report/lang/reader.rkt
rename to scribble-lib/scribble/report/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/run.rkt b/scribble-lib/scribble/run.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/run.rkt
rename to scribble-lib/scribble/run.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scheme.rkt b/scribble-lib/scribble/scheme.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scheme.rkt
rename to scribble-lib/scribble/scheme.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js b/scribble-lib/scribble/scribble-common.js
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js
rename to scribble-lib/scribble/scribble-common.js
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.html b/scribble-lib/scribble/scribble-prefix.html
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.html
rename to scribble-lib/scribble/scribble-prefix.html
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.tex b/scribble-lib/scribble/scribble-prefix.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.tex
rename to scribble-lib/scribble/scribble-prefix.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-skull.tex b/scribble-lib/scribble/scribble-skull.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble-skull.tex
rename to scribble-lib/scribble/scribble-skull.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.css b/scribble-lib/scribble/scribble-style.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.css
rename to scribble-lib/scribble/scribble-style.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.tex b/scribble-lib/scribble/scribble-style.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.tex
rename to scribble-lib/scribble/scribble-style.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css b/scribble-lib/scribble/scribble.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css
rename to scribble-lib/scribble/scribble.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.tex b/scribble-lib/scribble/scribble.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/scribble.tex
rename to scribble-lib/scribble/scribble.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/search.rkt b/scribble-lib/scribble/search.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/search.rkt
rename to scribble-lib/scribble/search.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan.rkt b/scribble-lib/scribble/sigplan.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/sigplan.rkt
rename to scribble-lib/scribble/sigplan.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang.rkt b/scribble-lib/scribble/sigplan/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang.rkt
rename to scribble-lib/scribble/sigplan/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang/reader.rkt b/scribble-lib/scribble/sigplan/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang/reader.rkt
rename to scribble-lib/scribble/sigplan/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.css b/scribble-lib/scribble/sigplan/sigplan.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.css
rename to scribble-lib/scribble/sigplan/sigplan.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.tex b/scribble-lib/scribble/sigplan/sigplan.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.tex
rename to scribble-lib/scribble/sigplan/sigplan.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplanconf.cls b/scribble-lib/scribble/sigplan/sigplanconf.cls
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplanconf.cls
rename to scribble-lib/scribble/sigplan/sigplanconf.cls
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/style.tex b/scribble-lib/scribble/sigplan/style.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/style.tex
rename to scribble-lib/scribble/sigplan/style.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/srcdoc.rkt b/scribble-lib/scribble/srcdoc.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/srcdoc.rkt
rename to scribble-lib/scribble/srcdoc.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/struct.rkt b/scribble-lib/scribble/struct.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/struct.rkt
rename to scribble-lib/scribble/struct.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/tag.rkt b/scribble-lib/scribble/tag.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/tag.rkt
rename to scribble-lib/scribble/tag.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/text-render.rkt b/scribble-lib/scribble/text-render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/text-render.rkt
rename to scribble-lib/scribble/text-render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/urls.rkt b/scribble-lib/scribble/urls.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/urls.rkt
rename to scribble-lib/scribble/urls.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/xref.rkt b/scribble-lib/scribble/xref.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scribble/xref.rkt
rename to scribble-lib/scribble/xref.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.css b/scribble-lib/scriblib/autobib.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.css
rename to scribble-lib/scriblib/autobib.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.rkt b/scribble-lib/scriblib/autobib.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.rkt
rename to scribble-lib/scriblib/autobib.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.tex b/scribble-lib/scriblib/autobib.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/autobib.tex
rename to scribble-lib/scriblib/autobib.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/bibtex.rkt b/scribble-lib/scriblib/bibtex.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/bibtex.rkt
rename to scribble-lib/scriblib/bibtex.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.css b/scribble-lib/scriblib/figure.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/figure.css
rename to scribble-lib/scriblib/figure.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.js b/scribble-lib/scriblib/figure.js
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/figure.js
rename to scribble-lib/scriblib/figure.js
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.rkt b/scribble-lib/scriblib/figure.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/figure.rkt
rename to scribble-lib/scriblib/figure.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/figure.tex b/scribble-lib/scriblib/figure.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/figure.tex
rename to scribble-lib/scriblib/figure.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.css b/scribble-lib/scriblib/footnote.css
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.css
rename to scribble-lib/scriblib/footnote.css
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.rkt b/scribble-lib/scriblib/footnote.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.rkt
rename to scribble-lib/scriblib/footnote.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.tex b/scribble-lib/scriblib/footnote.tex
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/footnote.tex
rename to scribble-lib/scriblib/footnote.tex
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/gui-eval.rkt b/scribble-lib/scriblib/gui-eval.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/gui-eval.rkt
rename to scribble-lib/scriblib/gui-eval.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/info.rkt b/scribble-lib/scriblib/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/info.rkt
rename to scribble-lib/scriblib/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/private/counter.rkt b/scribble-lib/scriblib/private/counter.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/private/counter.rkt
rename to scribble-lib/scriblib/private/counter.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/private/gui-eval-exn.rkt b/scribble-lib/scriblib/private/gui-eval-exn.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/private/gui-eval-exn.rkt
rename to scribble-lib/scriblib/private/gui-eval-exn.rkt
diff --git a/pkgs/scribble-pkgs/scribble-lib/scriblib/render-cond.rkt b/scribble-lib/scriblib/render-cond.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-lib/scriblib/render-cond.rkt
rename to scribble-lib/scriblib/render-cond.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/LICENSE.txt b/scribble-test/LICENSE.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/LICENSE.txt
rename to scribble-test/LICENSE.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/info.rkt b/scribble-test/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/info.rkt
rename to scribble-test/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/help/test-docs-complete2.rkt b/scribble-test/tests/help/test-docs-complete2.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/help/test-docs-complete2.rkt
rename to scribble-test/tests/help/test-docs-complete2.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/decode.rkt b/scribble-test/tests/scribble/decode.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/decode.rkt
rename to scribble-test/tests/scribble/decode.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs.rkt b/scribble-test/tests/scribble/docs.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs.rkt
rename to scribble-test/tests/scribble/docs.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.scrbl b/scribble-test/tests/scribble/docs/autobib-broken.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.scrbl
rename to scribble-test/tests/scribble/docs/autobib-broken.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.txt b/scribble-test/tests/scribble/docs/autobib-broken.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-broken.txt
rename to scribble-test/tests/scribble/docs/autobib-broken.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl b/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl
rename to scribble-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.txt b/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-corner.txt
rename to scribble-test/tests/scribble/docs/autobib-disambiguation-corner.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.scrbl b/scribble-test/tests/scribble/docs/autobib-disambiguation-more.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.scrbl
rename to scribble-test/tests/scribble/docs/autobib-disambiguation-more.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.txt b/scribble-test/tests/scribble/docs/autobib-disambiguation-more.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation-more.txt
rename to scribble-test/tests/scribble/docs/autobib-disambiguation-more.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.scrbl b/scribble-test/tests/scribble/docs/autobib-disambiguation.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.scrbl
rename to scribble-test/tests/scribble/docs/autobib-disambiguation.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.txt b/scribble-test/tests/scribble/docs/autobib-disambiguation.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-disambiguation.txt
rename to scribble-test/tests/scribble/docs/autobib-disambiguation.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.scrbl b/scribble-test/tests/scribble/docs/autobib-numbered.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.scrbl
rename to scribble-test/tests/scribble/docs/autobib-numbered.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.txt b/scribble-test/tests/scribble/docs/autobib-numbered.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-numbered.txt
rename to scribble-test/tests/scribble/docs/autobib-numbered.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.scrbl b/scribble-test/tests/scribble/docs/autobib-order.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.scrbl
rename to scribble-test/tests/scribble/docs/autobib-order.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.txt b/scribble-test/tests/scribble/docs/autobib-order.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib-order.txt
rename to scribble-test/tests/scribble/docs/autobib-order.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.scrbl b/scribble-test/tests/scribble/docs/autobib.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.scrbl
rename to scribble-test/tests/scribble/docs/autobib.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.txt b/scribble-test/tests/scribble/docs/autobib.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/autobib.txt
rename to scribble-test/tests/scribble/docs/autobib.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.scrbl b/scribble-test/tests/scribble/docs/codeblock-quote.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.scrbl
rename to scribble-test/tests/scribble/docs/codeblock-quote.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.txt b/scribble-test/tests/scribble/docs/codeblock-quote.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-quote.txt
rename to scribble-test/tests/scribble/docs/codeblock-quote.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.scrbl b/scribble-test/tests/scribble/docs/codeblock-utf8.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.scrbl
rename to scribble-test/tests/scribble/docs/codeblock-utf8.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.txt b/scribble-test/tests/scribble/docs/codeblock-utf8.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/codeblock-utf8.txt
rename to scribble-test/tests/scribble/docs/codeblock-utf8.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.scrbl b/scribble-test/tests/scribble/docs/cond.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.scrbl
rename to scribble-test/tests/scribble/docs/cond.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.txt b/scribble-test/tests/scribble/docs/cond.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/cond.txt
rename to scribble-test/tests/scribble/docs/cond.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.scrbl b/scribble-test/tests/scribble/docs/decode.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.scrbl
rename to scribble-test/tests/scribble/docs/decode.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.txt b/scribble-test/tests/scribble/docs/decode.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/decode.txt
rename to scribble-test/tests/scribble/docs/decode.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.rkt b/scribble-test/tests/scribble/docs/diamond.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.rkt
rename to scribble-test/tests/scribble/docs/diamond.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.scrbl b/scribble-test/tests/scribble/docs/diamond.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.scrbl
rename to scribble-test/tests/scribble/docs/diamond.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.txt b/scribble-test/tests/scribble/docs/diamond.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/diamond.txt
rename to scribble-test/tests/scribble/docs/diamond.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.scrbl b/scribble-test/tests/scribble/docs/empty-onthispage.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.scrbl
rename to scribble-test/tests/scribble/docs/empty-onthispage.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.txt b/scribble-test/tests/scribble/docs/empty-onthispage.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/empty-onthispage.txt
rename to scribble-test/tests/scribble/docs/empty-onthispage.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.scrbl b/scribble-test/tests/scribble/docs/eval-false.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.scrbl
rename to scribble-test/tests/scribble/docs/eval-false.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.txt b/scribble-test/tests/scribble/docs/eval-false.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-false.txt
rename to scribble-test/tests/scribble/docs/eval-false.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.scrbl b/scribble-test/tests/scribble/docs/eval-special.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.scrbl
rename to scribble-test/tests/scribble/docs/eval-special.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.txt b/scribble-test/tests/scribble/docs/eval-special.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/eval-special.txt
rename to scribble-test/tests/scribble/docs/eval-special.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.scrbl b/scribble-test/tests/scribble/docs/figure.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.scrbl
rename to scribble-test/tests/scribble/docs/figure.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.txt b/scribble-test/tests/scribble/docs/figure.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/figure.txt
rename to scribble-test/tests/scribble/docs/figure.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.scrbl b/scribble-test/tests/scribble/docs/filebox.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.scrbl
rename to scribble-test/tests/scribble/docs/filebox.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.txt b/scribble-test/tests/scribble/docs/filebox.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/filebox.txt
rename to scribble-test/tests/scribble/docs/filebox.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.scrbl b/scribble-test/tests/scribble/docs/footnote.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.scrbl
rename to scribble-test/tests/scribble/docs/footnote.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.txt b/scribble-test/tests/scribble/docs/footnote.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/footnote.txt
rename to scribble-test/tests/scribble/docs/footnote.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.scrbl b/scribble-test/tests/scribble/docs/grouper-sub.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.scrbl
rename to scribble-test/tests/scribble/docs/grouper-sub.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.txt b/scribble-test/tests/scribble/docs/grouper-sub.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper-sub.txt
rename to scribble-test/tests/scribble/docs/grouper-sub.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.scrbl b/scribble-test/tests/scribble/docs/grouper.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.scrbl
rename to scribble-test/tests/scribble/docs/grouper.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.txt b/scribble-test/tests/scribble/docs/grouper.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/grouper.txt
rename to scribble-test/tests/scribble/docs/grouper.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.scrbl b/scribble-test/tests/scribble/docs/include-section.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.scrbl
rename to scribble-test/tests/scribble/docs/include-section.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.txt b/scribble-test/tests/scribble/docs/include-section.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/include-section.txt
rename to scribble-test/tests/scribble/docs/include-section.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.scrbl b/scribble-test/tests/scribble/docs/itemlist.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.scrbl
rename to scribble-test/tests/scribble/docs/itemlist.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.txt b/scribble-test/tests/scribble/docs/itemlist.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/itemlist.txt
rename to scribble-test/tests/scribble/docs/itemlist.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.scrbl b/scribble-test/tests/scribble/docs/list-section.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.scrbl
rename to scribble-test/tests/scribble/docs/list-section.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.txt b/scribble-test/tests/scribble/docs/list-section.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/list-section.txt
rename to scribble-test/tests/scribble/docs/list-section.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual-ex.rkt b/scribble-test/tests/scribble/docs/manual-ex.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual-ex.rkt
rename to scribble-test/tests/scribble/docs/manual-ex.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.scrbl b/scribble-test/tests/scribble/docs/manual.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.scrbl
rename to scribble-test/tests/scribble/docs/manual.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.txt b/scribble-test/tests/scribble/docs/manual.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/manual.txt
rename to scribble-test/tests/scribble/docs/manual.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.scrbl b/scribble-test/tests/scribble/docs/print-lines.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.scrbl
rename to scribble-test/tests/scribble/docs/print-lines.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.txt b/scribble-test/tests/scribble/docs/print-lines.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/print-lines.txt
rename to scribble-test/tests/scribble/docs/print-lines.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.scrbl b/scribble-test/tests/scribble/docs/read-alts.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.scrbl
rename to scribble-test/tests/scribble/docs/read-alts.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.txt b/scribble-test/tests/scribble/docs/read-alts.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/read-alts.txt
rename to scribble-test/tests/scribble/docs/read-alts.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.scrbl b/scribble-test/tests/scribble/docs/secref.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.scrbl
rename to scribble-test/tests/scribble/docs/secref.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.txt b/scribble-test/tests/scribble/docs/secref.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref.txt
rename to scribble-test/tests/scribble/docs/secref.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.scrbl b/scribble-test/tests/scribble/docs/secref2.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.scrbl
rename to scribble-test/tests/scribble/docs/secref2.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.txt b/scribble-test/tests/scribble/docs/secref2.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref2.txt
rename to scribble-test/tests/scribble/docs/secref2.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.scrbl b/scribble-test/tests/scribble/docs/secref3.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.scrbl
rename to scribble-test/tests/scribble/docs/secref3.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.txt b/scribble-test/tests/scribble/docs/secref3.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/secref3.txt
rename to scribble-test/tests/scribble/docs/secref3.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.rkt b/scribble-test/tests/scribble/docs/srcdoc.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.rkt
rename to scribble-test/tests/scribble/docs/srcdoc.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.scrbl b/scribble-test/tests/scribble/docs/srcdoc.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.scrbl
rename to scribble-test/tests/scribble/docs/srcdoc.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.txt b/scribble-test/tests/scribble/docs/srcdoc.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/srcdoc.txt
rename to scribble-test/tests/scribble/docs/srcdoc.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.scrbl b/scribble-test/tests/scribble/docs/stxobj.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.scrbl
rename to scribble-test/tests/scribble/docs/stxobj.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.txt b/scribble-test/tests/scribble/docs/stxobj.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/stxobj.txt
rename to scribble-test/tests/scribble/docs/stxobj.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.scrbl b/scribble-test/tests/scribble/docs/table-border.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.scrbl
rename to scribble-test/tests/scribble/docs/table-border.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.txt b/scribble-test/tests/scribble/docs/table-border.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table-border.txt
rename to scribble-test/tests/scribble/docs/table-border.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.scrbl b/scribble-test/tests/scribble/docs/table.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.scrbl
rename to scribble-test/tests/scribble/docs/table.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.txt b/scribble-test/tests/scribble/docs/table.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/table.txt
rename to scribble-test/tests/scribble/docs/table.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.scrbl b/scribble-test/tests/scribble/docs/tech.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.scrbl
rename to scribble-test/tests/scribble/docs/tech.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.txt b/scribble-test/tests/scribble/docs/tech.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/tech.txt
rename to scribble-test/tests/scribble/docs/tech.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.scrbl b/scribble-test/tests/scribble/docs/text.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.scrbl
rename to scribble-test/tests/scribble/docs/text.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.txt b/scribble-test/tests/scribble/docs/text.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/text.txt
rename to scribble-test/tests/scribble/docs/text.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.scrbl b/scribble-test/tests/scribble/docs/traverse.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.scrbl
rename to scribble-test/tests/scribble/docs/traverse.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.txt b/scribble-test/tests/scribble/docs/traverse.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/traverse.txt
rename to scribble-test/tests/scribble/docs/traverse.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.scrbl b/scribble-test/tests/scribble/docs/verbatim.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.scrbl
rename to scribble-test/tests/scribble/docs/verbatim.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.txt b/scribble-test/tests/scribble/docs/verbatim.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/verbatim.txt
rename to scribble-test/tests/scribble/docs/verbatim.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.scrbl b/scribble-test/tests/scribble/docs/wrap.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.scrbl
rename to scribble-test/tests/scribble/docs/wrap.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.txt b/scribble-test/tests/scribble/docs/wrap.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/docs/wrap.txt
rename to scribble-test/tests/scribble/docs/wrap.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/eval.rkt b/scribble-test/tests/scribble/eval.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/eval.rkt
rename to scribble-test/tests/scribble/eval.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/exe.rkt b/scribble-test/tests/scribble/exe.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/exe.rkt
rename to scribble-test/tests/scribble/exe.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/main.rkt b/scribble-test/tests/scribble/main.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/main.rkt
rename to scribble-test/tests/scribble/main.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.md b/scribble-test/tests/scribble/markdown-docs/example.md
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.md
rename to scribble-test/tests/scribble/markdown-docs/example.md
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.scrbl b/scribble-test/tests/scribble/markdown-docs/example.scrbl
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown-docs/example.scrbl
rename to scribble-test/tests/scribble/markdown-docs/example.scrbl
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown.rkt b/scribble-test/tests/scribble/markdown.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/markdown.rkt
rename to scribble-test/tests/scribble/markdown.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/reader.rkt b/scribble-test/tests/scribble/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/reader.rkt
rename to scribble-test/tests/scribble/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/render.rkt b/scribble-test/tests/scribble/render.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/render.rkt
rename to scribble-test/tests/scribble/render.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-collect.rkt b/scribble-test/tests/scribble/text-collect.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/text-collect.rkt
rename to scribble-test/tests/scribble/text-collect.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-lang.rkt b/scribble-test/tests/scribble/text-lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/text-lang.rkt
rename to scribble-test/tests/scribble/text-lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/text-wrap.rkt b/scribble-test/tests/scribble/text-wrap.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/text-wrap.rkt
rename to scribble-test/tests/scribble/text-wrap.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scribble/xref.rkt b/scribble-test/tests/scribble/xref.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scribble/xref.rkt
rename to scribble-test/tests/scribble/xref.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.normal.txt b/scribble-test/tests/scriblib/bibtex.normal.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.normal.txt
rename to scribble-test/tests/scriblib/bibtex.normal.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.number.txt b/scribble-test/tests/scriblib/bibtex.number.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.number.txt
rename to scribble-test/tests/scriblib/bibtex.number.txt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.rkt b/scribble-test/tests/scriblib/bibtex.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scriblib/bibtex.rkt
rename to scribble-test/tests/scriblib/bibtex.rkt
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/example.bib b/scribble-test/tests/scriblib/example.bib
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scriblib/example.bib
rename to scribble-test/tests/scriblib/example.bib
diff --git a/pkgs/scribble-pkgs/scribble-test/tests/scriblib/info.rkt b/scribble-test/tests/scriblib/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-test/tests/scriblib/info.rkt
rename to scribble-test/tests/scriblib/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/LICENSE.txt b/scribble-text-lib/LICENSE.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/LICENSE.txt
rename to scribble-text-lib/LICENSE.txt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/info.rkt b/scribble-text-lib/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/info.rkt
rename to scribble-text-lib/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/info.rkt b/scribble-text-lib/scribble/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/info.rkt
rename to scribble-text-lib/scribble/info.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text.rkt b/scribble-text-lib/scribble/text.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/text.rkt
rename to scribble-text-lib/scribble/text.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang.rkt b/scribble-text-lib/scribble/text/lang.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang.rkt
rename to scribble-text-lib/scribble/text/lang.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang/reader.rkt b/scribble-text-lib/scribble/text/lang/reader.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/text/lang/reader.rkt
rename to scribble-text-lib/scribble/text/lang/reader.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/main.rkt b/scribble-text-lib/scribble/text/main.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/text/main.rkt
rename to scribble-text-lib/scribble/text/main.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/output.rkt b/scribble-text-lib/scribble/text/output.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/text/output.rkt
rename to scribble-text-lib/scribble/text/output.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/syntax-utils.rkt b/scribble-text-lib/scribble/text/syntax-utils.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/text/syntax-utils.rkt
rename to scribble-text-lib/scribble/text/syntax-utils.rkt
diff --git a/pkgs/scribble-pkgs/scribble-text-lib/scribble/text/wrap.rkt b/scribble-text-lib/scribble/text/wrap.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble-text-lib/scribble/text/wrap.rkt
rename to scribble-text-lib/scribble/text/wrap.rkt
diff --git a/pkgs/scribble-pkgs/scribble/LICENSE.txt b/scribble/LICENSE.txt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble/LICENSE.txt
rename to scribble/LICENSE.txt
diff --git a/pkgs/scribble-pkgs/scribble/info.rkt b/scribble/info.rkt
similarity index 100%
rename from pkgs/scribble-pkgs/scribble/info.rkt
rename to scribble/info.rkt