diff --git a/pkgs/htdp/graphics/scribblings/common.rkt b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/common.rkt
similarity index 100%
rename from pkgs/htdp/graphics/scribblings/common.rkt
rename to pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/common.rkt
diff --git a/pkgs/htdp/graphics/scribblings/graphics.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/graphics.scrbl
similarity index 100%
rename from pkgs/htdp/graphics/scribblings/graphics.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/graphics.scrbl
diff --git a/pkgs/htdp/graphics/scribblings/info.rkt b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/info.rkt
similarity index 100%
rename from pkgs/htdp/graphics/scribblings/info.rkt
rename to pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/info.rkt
diff --git a/pkgs/htdp/graphics/scribblings/traditional-turtles.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/traditional-turtles.scrbl
similarity index 100%
rename from pkgs/htdp/graphics/scribblings/traditional-turtles.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/traditional-turtles.scrbl
diff --git a/pkgs/htdp/graphics/scribblings/turtles.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/turtles.scrbl
similarity index 100%
rename from pkgs/htdp/graphics/scribblings/turtles.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/turtles.scrbl
diff --git a/pkgs/htdp/graphics/scribblings/value-turtles.scrbl b/pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/value-turtles.scrbl
similarity index 100%
rename from pkgs/htdp/graphics/scribblings/value-turtles.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/graphics/scribblings/value-turtles.scrbl
diff --git a/pkgs/htdp/htdp/error-composition.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/error-composition.scrbl
similarity index 100%
rename from pkgs/htdp/htdp/error-composition.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/htdp/error-composition.scrbl
diff --git a/pkgs/htdp/htdp/error-reporting.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/error-reporting.scrbl
similarity index 100%
rename from pkgs/htdp/htdp/error-reporting.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/htdp/error-reporting.scrbl
diff --git a/pkgs/htdp/htdp/htdp-lib.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/htdp-lib.scrbl
similarity index 100%
rename from pkgs/htdp/htdp/htdp-lib.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/htdp/htdp-lib.scrbl
diff --git a/pkgs/htdp/htdp/htdp.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/htdp.scrbl
similarity index 100%
rename from pkgs/htdp/htdp/htdp.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/htdp/htdp.scrbl
diff --git a/pkgs/htdp/htdp/testing.scrbl b/pkgs/htdp-pkgs/htdp-doc/htdp/testing.scrbl
similarity index 100%
rename from pkgs/htdp/htdp/testing.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/htdp/testing.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/advanced.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/advanced.scrbl
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/advanced.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/advanced.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/beginner-abbr.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner-abbr.scrbl
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/beginner-abbr.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner-abbr.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/beginner.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner.scrbl
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/beginner.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/beginner.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/common.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/common.rkt
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/common.rkt
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/common.rkt
diff --git a/pkgs/htdp/scribblings/htdp-langs/htdp-langs.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-langs.scrbl
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/htdp-langs.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-langs.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/htdp-ptr.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-ptr.scrbl
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/htdp-ptr.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/htdp-ptr.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/info.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/info.rkt
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/info.rkt
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/info.rkt
diff --git a/pkgs/htdp/scribblings/htdp-langs/intermediate-lambda.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate-lambda.scrbl
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/intermediate-lambda.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate-lambda.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/intermediate.scrbl b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate.scrbl
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/intermediate.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/intermediate.scrbl
diff --git a/pkgs/htdp/scribblings/htdp-langs/prim-ops.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/prim-ops.rkt
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/prim-ops.rkt
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/prim-ops.rkt
diff --git a/pkgs/htdp/scribblings/htdp-langs/std-grammar.rkt b/pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/std-grammar.rkt
similarity index 100%
rename from pkgs/htdp/scribblings/htdp-langs/std-grammar.rkt
rename to pkgs/htdp-pkgs/htdp-doc/scribblings/htdp-langs/std-grammar.rkt
diff --git a/pkgs/htdp/stepper/scribblings/stepper.scrbl b/pkgs/htdp-pkgs/htdp-doc/stepper/scribblings/stepper.scrbl
similarity index 100%
rename from pkgs/htdp/stepper/scribblings/stepper.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/stepper/scribblings/stepper.scrbl
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/2htdp.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/2htdp.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/2htdp.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/2htdp.scrbl
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow1.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow1.png
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow1.png
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow1.png
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow2.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2.png
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow2.png
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2.png
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow2b.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2b.png
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow2b.png
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow2b.png
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow3.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow3.png
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadow3.png
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadow3.png
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadowMockup.jpg b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadowMockup.jpg
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/PlanetCuteShadowMockup.jpg
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/PlanetCuteShadowMockup.jpg
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/batch-io.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/batch-io.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/batch-io.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/batch-io.scrbl
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/data.csv b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.csv
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/data.csv
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.csv
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/data.txt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.txt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/data.txt
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/data.txt
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/image-guide.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-guide.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/image-guide.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-guide.scrbl
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/image-util.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-util.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/image-util.rkt
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image-util.rkt
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/image.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/image.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/image.scrbl
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/img-eval.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/img-eval.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/img-eval.rkt
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/img-eval.rkt
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/io.css b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.css
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/io.css
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.css
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/io.tex b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.tex
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/io.tex
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/io.tex
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/ligature.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/ligature.png
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/ligature.png
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/ligature.png
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/planetcute.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/planetcute.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/planetcute.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/planetcute.scrbl
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/port.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/port.rkt
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.rkt
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/port.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/port.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/port.scrbl
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/shared.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/shared.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/shared.rkt
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/shared.rkt
diff --git a/pkgs/htdp/teachpack/2htdp/scribblings/universe.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/universe.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/scribblings/universe.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/2htdp/scribblings/universe.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/arrow-gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow-gui.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/arrow-gui.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow-gui.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/arrow.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/arrow.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/arrow.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/convert.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/convert.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/convert.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/convert.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/dir.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/dir.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/dir.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/dir.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/docs.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/docs.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/docs.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/docs.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/draw.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/draw.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/draw.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/draw.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/elevator.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/elevator.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/elevator.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/elevator.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/graphing.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/graphing.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/graphing.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/graphing.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/guess-gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess-gui.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/guess-gui.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess-gui.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/guess.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/guess.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/guess.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/gui.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/gui.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/gui.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/hangman-play.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman-play.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/hangman-play.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman-play.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/hangman.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/hangman.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/hangman.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/htdp.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/htdp.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/htdp.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/htdp.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/image.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/image.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/image.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/image.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/lkup-gui.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/lkup-gui.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/lkup-gui.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/lkup-gui.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/master-play.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master-play.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/master-play.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master-play.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/master.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/master.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/master.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/matrix.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/matrix.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/matrix.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/matrix.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/servlet.thtml b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet.thtml
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/servlet.thtml
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet.thtml
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/servlet2.thtml b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet2.thtml
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/servlet2.thtml
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/servlet2.thtml
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/shared.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/shared.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/shared.rkt
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/shared.rkt
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/show-queen.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/show-queen.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/show-queen.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/show-queen.scrbl
diff --git a/pkgs/htdp/teachpack/htdp/scribblings/world.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/world.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/scribblings/world.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/htdp/scribblings/world.scrbl
diff --git a/pkgs/htdp/teachpack/teachpack.scrbl b/pkgs/htdp-pkgs/htdp-doc/teachpack/teachpack.scrbl
similarity index 100%
rename from pkgs/htdp/teachpack/teachpack.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/teachpack.scrbl
diff --git a/pkgs/htdp/teachpack/world.png b/pkgs/htdp-pkgs/htdp-doc/teachpack/world.png
similarity index 100%
rename from pkgs/htdp/teachpack/world.png
rename to pkgs/htdp-pkgs/htdp-doc/teachpack/world.png
diff --git a/pkgs/htdp/test-engine/test-engine.scrbl b/pkgs/htdp-pkgs/htdp-doc/test-engine/test-engine.scrbl
similarity index 100%
rename from pkgs/htdp/test-engine/test-engine.scrbl
rename to pkgs/htdp-pkgs/htdp-doc/test-engine/test-engine.scrbl
diff --git a/pkgs/htdp/2htdp/TESTME.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/TESTME.txt
similarity index 100%
rename from pkgs/htdp/2htdp/TESTME.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/TESTME.txt
diff --git a/pkgs/htdp/2htdp/batch-io.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/batch-io.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/batch-io.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/batch-io.rkt
diff --git a/pkgs/htdp/2htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/image.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/image.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/image.rkt
diff --git a/pkgs/htdp/2htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/info.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/info.rkt
diff --git a/pkgs/htdp/2htdp/langs.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/langs.txt
similarity index 100%
rename from pkgs/htdp/2htdp/langs.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/langs.txt
diff --git a/pkgs/htdp/2htdp/planetcute.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/brown-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/brown-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/brown-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/brown-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/brown-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/character-boy.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-boy.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.png
diff --git a/pkgs/htdp/2htdp/planetcute/character-boy.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-boy.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-boy.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/character-cat-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-cat-girl.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.png
diff --git a/pkgs/htdp/2htdp/planetcute/character-cat-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-cat-girl.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-cat-girl.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/character-horn-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-horn-girl.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.png
diff --git a/pkgs/htdp/2htdp/planetcute/character-horn-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-horn-girl.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-horn-girl.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/character-pink-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-pink-girl.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.png
diff --git a/pkgs/htdp/2htdp/planetcute/character-pink-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-pink-girl.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-pink-girl.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/character-princess-girl.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-princess-girl.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.png
diff --git a/pkgs/htdp/2htdp/planetcute/character-princess-girl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/character-princess-girl.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/character-princess-girl.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/chest-closed.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/chest-closed.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.png
diff --git a/pkgs/htdp/2htdp/planetcute/chest-closed.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/chest-closed.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-closed.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/chest-lid.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/chest-lid.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.png
diff --git a/pkgs/htdp/2htdp/planetcute/chest-lid.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/chest-lid.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-lid.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/chest-open.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/chest-open.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.png
diff --git a/pkgs/htdp/2htdp/planetcute/chest-open.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/chest-open.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/chest-open.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/dirt-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/dirt-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/dirt-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/dirt-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/dirt-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/door-tall-closed.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/door-tall-closed.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.png
diff --git a/pkgs/htdp/2htdp/planetcute/door-tall-closed.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/door-tall-closed.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-closed.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/door-tall-open.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/door-tall-open.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.png
diff --git a/pkgs/htdp/2htdp/planetcute/door-tall-open.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/door-tall-open.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/door-tall-open.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/enemy-bug.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/enemy-bug.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.png
diff --git a/pkgs/htdp/2htdp/planetcute/enemy-bug.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/enemy-bug.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/enemy-bug.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/gem-blue.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/gem-blue.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.png
diff --git a/pkgs/htdp/2htdp/planetcute/gem-blue.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/gem-blue.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-blue.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/gem-green.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/gem-green.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.png
diff --git a/pkgs/htdp/2htdp/planetcute/gem-green.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/gem-green.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-green.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/gem-orange.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/gem-orange.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.png
diff --git a/pkgs/htdp/2htdp/planetcute/gem-orange.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/gem-orange.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/gem-orange.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/grass-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/grass-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/grass-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/grass-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/grass-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/heart.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/heart.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.png
diff --git a/pkgs/htdp/2htdp/planetcute/heart.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/heart.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/heart.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/key.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/key.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.png
diff --git a/pkgs/htdp/2htdp/planetcute/key.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/key.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/key.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/plain-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/plain-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/plain-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/plain-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/plain-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-east.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.png
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-east.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-east.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-north.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-north.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.png
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-north.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-north.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-north.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-south.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-south.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.png
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-south.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-south.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-south.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/ramp-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/ramp-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/ramp-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/rock.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/rock.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.png
diff --git a/pkgs/htdp/2htdp/planetcute/rock.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/rock.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/rock.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-east.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-east.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-east.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-north-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-north-east.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-north-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-north-east.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-east.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-north-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-north-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-north-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-north-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-north.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-north.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-north.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-north.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-north.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-south-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-south-east.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-south-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-south-east.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-east.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-south-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-south-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-south-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-south-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-south.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-south.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-south.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-south.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-south.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/roof-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/roof-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/roof-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/roof-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/selector.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/selector.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.png
diff --git a/pkgs/htdp/2htdp/planetcute/selector.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/selector.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/selector.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-east.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-east.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-east.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-north-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-north-east.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-north-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-north-east.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-east.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-north-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-north-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-north-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-north-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-north.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-north.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-north.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-north.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-north.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-side-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-side-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-side-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-side-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-side-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-south-east.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-south-east.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-south-east.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-south-east.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-east.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-south-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-south-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-south-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-south-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-south.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-south.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-south.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-south.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-south.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-west.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-west.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.png
diff --git a/pkgs/htdp/2htdp/planetcute/shadow-west.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/shadow-west.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/shadow-west.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/speech-bubble.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/speech-bubble.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.png
diff --git a/pkgs/htdp/2htdp/planetcute/speech-bubble.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/speech-bubble.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/speech-bubble.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/stone-block-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/stone-block-tall.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.png
diff --git a/pkgs/htdp/2htdp/planetcute/stone-block-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/stone-block-tall.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block-tall.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/stone-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/stone-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/stone-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/stone-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/stone-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/tree-short.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/tree-short.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.png
diff --git a/pkgs/htdp/2htdp/planetcute/tree-short.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/tree-short.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-short.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/tree-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/tree-tall.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.png
diff --git a/pkgs/htdp/2htdp/planetcute/tree-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/tree-tall.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-tall.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/tree-ugly.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/tree-ugly.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.png
diff --git a/pkgs/htdp/2htdp/planetcute/tree-ugly.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/tree-ugly.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/tree-ugly.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/wall-block-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/wall-block-tall.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.png
diff --git a/pkgs/htdp/2htdp/planetcute/wall-block-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/wall-block-tall.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block-tall.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/wall-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/wall-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/wall-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/wall-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wall-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/water-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/water-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/water-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/water-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/water-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/window-tall.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/window-tall.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.png
diff --git a/pkgs/htdp/2htdp/planetcute/window-tall.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/window-tall.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/window-tall.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/wood-block.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/wood-block.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.png
diff --git a/pkgs/htdp/2htdp/planetcute/wood-block.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/wood-block.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/wood-block.rkt
diff --git a/pkgs/htdp/2htdp/planetcute/yellow-star.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.png
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/yellow-star.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.png
diff --git a/pkgs/htdp/2htdp/planetcute/yellow-star.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/planetcute/yellow-star.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/planetcute/yellow-star.rkt
diff --git a/pkgs/htdp/2htdp/private/check-aux.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/check-aux.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/check-aux.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/check-aux.rkt
diff --git a/pkgs/htdp/2htdp/private/checked-cell.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/checked-cell.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/checked-cell.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/checked-cell.rkt
diff --git a/pkgs/htdp/2htdp/private/clauses-spec-and-process.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-and-process.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/clauses-spec-and-process.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-and-process.rkt
diff --git a/pkgs/htdp/2htdp/private/clauses-spec-aux.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/clauses-spec-aux.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt
diff --git a/pkgs/htdp/2htdp/private/csv/csv.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/csv.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/csv/csv.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/csv.rkt
diff --git a/pkgs/htdp/2htdp/private/csv/friends.csv b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/friends.csv
similarity index 100%
rename from pkgs/htdp/2htdp/private/csv/friends.csv
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/friends.csv
diff --git a/pkgs/htdp/2htdp/private/csv/fruit.csv b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/fruit.csv
similarity index 100%
rename from pkgs/htdp/2htdp/private/csv/fruit.csv
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/fruit.csv
diff --git a/pkgs/htdp/2htdp/private/csv/permission.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/permission.txt
similarity index 100%
rename from pkgs/htdp/2htdp/private/csv/permission.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/csv/permission.txt
diff --git a/pkgs/htdp/2htdp/private/define-keywords.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/define-keywords.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/define-keywords.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/define-keywords.rkt
diff --git a/pkgs/htdp/2htdp/private/design.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/design.txt
similarity index 100%
rename from pkgs/htdp/2htdp/private/design.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/design.txt
diff --git a/pkgs/htdp/2htdp/private/gamepad.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/gamepad.png
similarity index 100%
rename from pkgs/htdp/2htdp/private/gamepad.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/gamepad.png
diff --git a/pkgs/htdp/2htdp/private/image-core.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-core.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/image-core.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-core.rkt
diff --git a/pkgs/htdp/2htdp/private/image-more.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-more.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/image-more.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-more.rkt
diff --git a/pkgs/htdp/2htdp/private/img-err.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/img-err.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/img-err.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/img-err.rkt
diff --git a/pkgs/htdp/2htdp/private/last.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/last.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/last.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/last.rkt
diff --git a/pkgs/htdp/2htdp/private/launch-many-worlds.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/launch-many-worlds.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/launch-many-worlds.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/launch-many-worlds.rkt
diff --git a/pkgs/htdp/2htdp/private/pad.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/pad.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/pad.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/pad.rkt
diff --git a/pkgs/htdp/2htdp/private/planetcute-image-list.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/planetcute-image-list.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/planetcute-image-list.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/planetcute-image-list.rkt
diff --git a/pkgs/htdp/2htdp/private/stop.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/stop.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/stop.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/stop.rkt
diff --git a/pkgs/htdp/2htdp/private/timer.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/timer.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/timer.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/timer.rkt
diff --git a/pkgs/htdp/2htdp/private/universe-image.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe-image.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/universe-image.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe-image.rkt
diff --git a/pkgs/htdp/2htdp/private/universe.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/universe.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/universe.rkt
diff --git a/pkgs/htdp/2htdp/private/utilities.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/utilities.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/utilities.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/utilities.rkt
diff --git a/pkgs/htdp/2htdp/private/world.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/world.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/private/world.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/private/world.rkt
diff --git a/pkgs/htdp/2htdp/tests/.gitignore b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/.gitignore
similarity index 100%
rename from pkgs/htdp/2htdp/tests/.gitignore
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/.gitignore
diff --git a/pkgs/htdp/2htdp/tests/bad-draw.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/bad-draw.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/bad-draw.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/bad-draw.rkt
diff --git a/pkgs/htdp/2htdp/tests/batch-io-csv-ho.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io-csv-ho.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/batch-io-csv-ho.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io-csv-ho.rkt
diff --git a/pkgs/htdp/2htdp/tests/batch-io-csv-ho.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io-csv-ho.txt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/batch-io-csv-ho.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io-csv-ho.txt
diff --git a/pkgs/htdp/2htdp/tests/batch-io.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/batch-io.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io.rkt
diff --git a/pkgs/htdp/2htdp/tests/batch-io2.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io2.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/batch-io2.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io2.rkt
diff --git a/pkgs/htdp/2htdp/tests/batch-io3.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io3.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/batch-io3.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/batch-io3.rkt
diff --git a/pkgs/htdp/2htdp/tests/bmp-5.0.1.rktd b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/bmp-5.0.1.rktd
similarity index 100%
rename from pkgs/htdp/2htdp/tests/bmp-5.0.1.rktd
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/bmp-5.0.1.rktd
diff --git a/pkgs/htdp/2htdp/tests/bmp-5.1.3.rktd b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/bmp-5.1.3.rktd
similarity index 100%
rename from pkgs/htdp/2htdp/tests/bmp-5.1.3.rktd
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/bmp-5.1.3.rktd
diff --git a/pkgs/htdp/2htdp/tests/clause-once.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/clause-once.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/clause-once.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/clause-once.rkt
diff --git a/pkgs/htdp/2htdp/tests/error-in-draw.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/error-in-draw.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/error-in-draw.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/error-in-draw.rkt
diff --git a/pkgs/htdp/2htdp/tests/error-in-tick.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/error-in-tick.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/error-in-tick.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/error-in-tick.rkt
diff --git a/pkgs/htdp/2htdp/tests/error-messages.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/error-messages.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/error-messages.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/error-messages.rkt
diff --git a/pkgs/htdp/2htdp/tests/full-scene-visible.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/full-scene-visible.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/full-scene-visible.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/full-scene-visible.rkt
diff --git a/pkgs/htdp/2htdp/tests/image-equality-performance-htdp.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-equality-performance-htdp.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/image-equality-performance-htdp.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-equality-performance-htdp.rkt
diff --git a/pkgs/htdp/2htdp/tests/image-equality-performance.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-equality-performance.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/image-equality-performance.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-equality-performance.rkt
diff --git a/pkgs/htdp/2htdp/tests/image-too-large.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-too-large.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/image-too-large.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-too-large.rkt
diff --git a/pkgs/htdp/2htdp/tests/jpr-bug.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/jpr-bug.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/jpr-bug.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/jpr-bug.rkt
diff --git a/pkgs/htdp/2htdp/tests/key-error.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/key-error.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/key-error.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/key-error.rkt
diff --git a/pkgs/htdp/2htdp/tests/lauch-many-worlds-proc.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/lauch-many-worlds-proc.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/lauch-many-worlds-proc.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/lauch-many-worlds-proc.rkt
diff --git a/pkgs/htdp/2htdp/tests/mouse-evt.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/mouse-evt.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/mouse-evt.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/mouse-evt.rkt
diff --git a/pkgs/htdp/2htdp/tests/mp.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/mp.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/mp.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/mp.rkt
diff --git a/pkgs/htdp/2htdp/tests/name.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/name.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/name.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/name.rkt
diff --git a/pkgs/htdp/2htdp/tests/on-release-no-key.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-release-no-key.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/on-release-no-key.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-release-no-key.rkt
diff --git a/pkgs/htdp/2htdp/tests/on-tick-defined.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-tick-defined.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/on-tick-defined.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-tick-defined.rkt
diff --git a/pkgs/htdp/2htdp/tests/on-tick-universe-with-limit.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-tick-universe-with-limit.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/on-tick-universe-with-limit.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-tick-universe-with-limit.rkt
diff --git a/pkgs/htdp/2htdp/tests/on-tick-with-limit.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-tick-with-limit.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/on-tick-with-limit.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-tick-with-limit.rkt
diff --git a/pkgs/htdp/2htdp/tests/pad1-handler.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/pad1-handler.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/pad1-handler.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/pad1-handler.rkt
diff --git a/pkgs/htdp/2htdp/tests/pad1-in-bsl.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/pad1-in-bsl.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/pad1-in-bsl.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/pad1-in-bsl.rkt
diff --git a/pkgs/htdp/2htdp/tests/pad1.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/pad1.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/pad1.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/pad1.rkt
diff --git a/pkgs/htdp/2htdp/tests/perform-record.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-record.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/perform-record.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-record.rkt
diff --git a/pkgs/htdp/2htdp/tests/perform-record.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-record.txt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/perform-record.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-record.txt
diff --git a/pkgs/htdp/2htdp/tests/perform-robby.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-robby.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/perform-robby.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-robby.rkt
diff --git a/pkgs/htdp/2htdp/tests/perform-whack.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-whack.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/perform-whack.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-whack.rkt
diff --git a/pkgs/htdp/2htdp/tests/profile-robby.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/profile-robby.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/profile-robby.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/profile-robby.rkt
diff --git a/pkgs/htdp/2htdp/tests/record-stop-when.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/record-stop-when.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/record-stop-when.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/record-stop-when.rkt
diff --git a/pkgs/htdp/2htdp/tests/record.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/record.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/record.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/record.rkt
diff --git a/pkgs/htdp/2htdp/tests/release.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/release.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/release.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/release.rkt
diff --git a/pkgs/htdp/2htdp/tests/run-movie.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/run-movie.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/run-movie.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/run-movie.rkt
diff --git a/pkgs/htdp/2htdp/tests/server-rename.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/server-rename.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/server-rename.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/server-rename.rkt
diff --git a/pkgs/htdp/2htdp/tests/stop-when-crash.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/stop-when-crash.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/stop-when-crash.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/stop-when-crash.rkt
diff --git a/pkgs/htdp/2htdp/tests/stop.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/stop.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/stop.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/stop.rkt
diff --git a/pkgs/htdp/2htdp/tests/struct-universe.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/struct-universe.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/struct-universe.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/struct-universe.rkt
diff --git a/pkgs/htdp/2htdp/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/test-docs-complete.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/test-docs-complete.rkt
diff --git a/pkgs/htdp/2htdp/tests/test-image.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/test-image.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/test-image.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/test-image.rkt
diff --git a/pkgs/htdp/2htdp/tests/u.png b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/u.png
similarity index 100%
rename from pkgs/htdp/2htdp/tests/u.png
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/u.png
diff --git a/pkgs/htdp/2htdp/tests/ufo-rename.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/ufo-rename.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/ufo-rename.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/ufo-rename.rkt
diff --git a/pkgs/htdp/2htdp/tests/universe-receive.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/universe-receive.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/universe-receive.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/universe-receive.rkt
diff --git a/pkgs/htdp/2htdp/tests/universe-restart.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/universe-restart.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/universe-restart.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/universe-restart.rkt
diff --git a/pkgs/htdp/2htdp/tests/world0-stops.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/tests/world0-stops.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/tests/world0-stops.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/tests/world0-stops.rkt
diff --git a/pkgs/htdp/2htdp/uchat/auxiliaries.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/auxiliaries.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/uchat/auxiliaries.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/auxiliaries.rkt
diff --git a/pkgs/htdp/2htdp/uchat/chatter.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/chatter.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/uchat/chatter.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/chatter.rkt
diff --git a/pkgs/htdp/2htdp/uchat/readme b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/readme
similarity index 100%
rename from pkgs/htdp/2htdp/uchat/readme
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/readme
diff --git a/pkgs/htdp/2htdp/uchat/server.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/server.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/uchat/server.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/server.rkt
diff --git a/pkgs/htdp/2htdp/uchat/xrun b/pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/xrun
similarity index 100%
rename from pkgs/htdp/2htdp/uchat/xrun
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/xrun
diff --git a/pkgs/htdp/2htdp/universe-request.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-request.txt
similarity index 100%
rename from pkgs/htdp/2htdp/universe-request.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/universe-request.txt
diff --git a/pkgs/htdp/2htdp/universe-syntax-parse.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe-syntax-parse.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/universe-syntax-parse.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/universe-syntax-parse.rkt
diff --git a/pkgs/htdp/2htdp/universe.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/universe.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt
diff --git a/pkgs/htdp/2htdp/utest/README b/pkgs/htdp-pkgs/htdp-lib/2htdp/utest/README
similarity index 100%
rename from pkgs/htdp/2htdp/utest/README
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/utest/README
diff --git a/pkgs/htdp/2htdp/utest/balls.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/utest/balls.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/utest/balls.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/utest/balls.rkt
diff --git a/pkgs/htdp/2htdp/utest/design.txt b/pkgs/htdp-pkgs/htdp-lib/2htdp/utest/design.txt
similarity index 100%
rename from pkgs/htdp/2htdp/utest/design.txt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/utest/design.txt
diff --git a/pkgs/htdp/2htdp/utest/player b/pkgs/htdp-pkgs/htdp-lib/2htdp/utest/player
similarity index 100%
rename from pkgs/htdp/2htdp/utest/player
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/utest/player
diff --git a/pkgs/htdp/2htdp/utest/sam.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/utest/sam.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/utest/sam.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/utest/sam.rkt
diff --git a/pkgs/htdp/2htdp/utest/shared.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/utest/shared.rkt
similarity index 100%
rename from pkgs/htdp/2htdp/utest/shared.rkt
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/utest/shared.rkt
diff --git a/pkgs/htdp/2htdp/utest/xrun b/pkgs/htdp-pkgs/htdp-lib/2htdp/utest/xrun
similarity index 100%
rename from pkgs/htdp/2htdp/utest/xrun
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/utest/xrun
diff --git a/pkgs/htdp/2htdp/xtest b/pkgs/htdp-pkgs/htdp-lib/2htdp/xtest
similarity index 100%
rename from pkgs/htdp/2htdp/xtest
rename to pkgs/htdp-pkgs/htdp-lib/2htdp/xtest
diff --git a/pkgs/htdp/graphics/graphics-posn-less-unit.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-posn-less-unit.rkt
similarity index 100%
rename from pkgs/htdp/graphics/graphics-posn-less-unit.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/graphics-posn-less-unit.rkt
diff --git a/pkgs/htdp/graphics/graphics-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-sig.rkt
similarity index 100%
rename from pkgs/htdp/graphics/graphics-sig.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/graphics-sig.rkt
diff --git a/pkgs/htdp/graphics/graphics-unit.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics-unit.rkt
similarity index 100%
rename from pkgs/htdp/graphics/graphics-unit.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/graphics-unit.rkt
diff --git a/pkgs/htdp/graphics/graphics.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/graphics.rkt
similarity index 100%
rename from pkgs/htdp/graphics/graphics.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/graphics.rkt
diff --git a/pkgs/htdp/graphics/main.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/main.rkt
similarity index 100%
rename from pkgs/htdp/graphics/main.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/main.rkt
diff --git a/pkgs/htdp/graphics/tests/sixlib.rktl b/pkgs/htdp-pkgs/htdp-lib/graphics/tests/sixlib.rktl
similarity index 100%
rename from pkgs/htdp/graphics/tests/sixlib.rktl
rename to pkgs/htdp-pkgs/htdp-lib/graphics/tests/sixlib.rktl
diff --git a/pkgs/htdp/graphics/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/htdp/graphics/tests/test-docs-complete.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/tests/test-docs-complete.rkt
diff --git a/pkgs/htdp/graphics/turtle-examples.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-examples.rkt
similarity index 100%
rename from pkgs/htdp/graphics/turtle-examples.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/turtle-examples.rkt
diff --git a/pkgs/htdp/graphics/turtle-test.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/turtle-test.rkt
similarity index 100%
rename from pkgs/htdp/graphics/turtle-test.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/turtle-test.rkt
diff --git a/pkgs/htdp/graphics/turtles.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/turtles.rkt
similarity index 100%
rename from pkgs/htdp/graphics/turtles.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/turtles.rkt
diff --git a/pkgs/htdp/graphics/value-turtles-examples.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-examples.rkt
similarity index 100%
rename from pkgs/htdp/graphics/value-turtles-examples.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-examples.rkt
diff --git a/pkgs/htdp/graphics/value-turtles-test.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-test.rkt
similarity index 100%
rename from pkgs/htdp/graphics/value-turtles-test.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-test.rkt
diff --git a/pkgs/htdp/graphics/value-turtles.rkt b/pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles.rkt
similarity index 100%
rename from pkgs/htdp/graphics/value-turtles.rkt
rename to pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles.rkt
diff --git a/pkgs/htdp/htdp/arrow-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/arrow-gui.rkt
similarity index 100%
rename from pkgs/htdp/htdp/arrow-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/arrow-gui.rkt
diff --git a/pkgs/htdp/htdp/arrow.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/arrow.rkt
similarity index 100%
rename from pkgs/htdp/htdp/arrow.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/arrow.rkt
diff --git a/pkgs/htdp/htdp/asl/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/asl/lang/reader.rkt
similarity index 100%
rename from pkgs/htdp/htdp/asl/lang/reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/asl/lang/reader.rkt
diff --git a/pkgs/htdp/htdp/big-draw.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/big-draw.rkt
similarity index 100%
rename from pkgs/htdp/htdp/big-draw.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/big-draw.rkt
diff --git a/pkgs/htdp/htdp/bsl+/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl+/lang/reader.rkt
similarity index 100%
rename from pkgs/htdp/htdp/bsl+/lang/reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/bsl+/lang/reader.rkt
diff --git a/pkgs/htdp/htdp/bsl/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/lang/reader.rkt
similarity index 100%
rename from pkgs/htdp/htdp/bsl/lang/reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/bsl/lang/reader.rkt
diff --git a/pkgs/htdp/htdp/bsl/language-info.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/language-info.rkt
similarity index 100%
rename from pkgs/htdp/htdp/bsl/language-info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/bsl/language-info.rkt
diff --git a/pkgs/htdp/htdp/bsl/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/reader.rkt
similarity index 100%
rename from pkgs/htdp/htdp/bsl/reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/bsl/reader.rkt
diff --git a/pkgs/htdp/htdp/bsl/runtime.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/bsl/runtime.rkt
similarity index 100%
rename from pkgs/htdp/htdp/bsl/runtime.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/bsl/runtime.rkt
diff --git a/pkgs/htdp/htdp/color-structs.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/color-structs.rkt
similarity index 100%
rename from pkgs/htdp/htdp/color-structs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/color-structs.rkt
diff --git a/pkgs/htdp/htdp/convert.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/convert.rkt
similarity index 100%
rename from pkgs/htdp/htdp/convert.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/convert.rkt
diff --git a/pkgs/htdp/htdp/dir.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/dir.rkt
similarity index 100%
rename from pkgs/htdp/htdp/dir.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/dir.rkt
diff --git a/pkgs/htdp/htdp/docs.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/docs.rkt
similarity index 100%
rename from pkgs/htdp/htdp/docs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/docs.rkt
diff --git a/pkgs/htdp/htdp/draw-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/draw-sig.rkt
similarity index 100%
rename from pkgs/htdp/htdp/draw-sig.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/draw-sig.rkt
diff --git a/pkgs/htdp/htdp/draw.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/draw.rkt
similarity index 100%
rename from pkgs/htdp/htdp/draw.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/draw.rkt
diff --git a/pkgs/htdp/htdp/elevator.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/elevator.rkt
similarity index 100%
rename from pkgs/htdp/htdp/elevator.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/elevator.rkt
diff --git a/pkgs/htdp/htdp/error.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/error.rkt
similarity index 100%
rename from pkgs/htdp/htdp/error.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/error.rkt
diff --git a/pkgs/htdp/htdp/error.txt b/pkgs/htdp-pkgs/htdp-lib/htdp/error.txt
similarity index 100%
rename from pkgs/htdp/htdp/error.txt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/error.txt
diff --git a/pkgs/htdp/htdp/graphing.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/graphing.rkt
similarity index 100%
rename from pkgs/htdp/htdp/graphing.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/graphing.rkt
diff --git a/pkgs/htdp/htdp/guess-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/guess-gui.rkt
similarity index 100%
rename from pkgs/htdp/htdp/guess-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/guess-gui.rkt
diff --git a/pkgs/htdp/htdp/guess.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/guess.rkt
similarity index 100%
rename from pkgs/htdp/htdp/guess.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/guess.rkt
diff --git a/pkgs/htdp/htdp/gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/gui.rkt
similarity index 100%
rename from pkgs/htdp/htdp/gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/gui.rkt
diff --git a/pkgs/htdp/htdp/hangman-play.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/hangman-play.rkt
similarity index 100%
rename from pkgs/htdp/htdp/hangman-play.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/hangman-play.rkt
diff --git a/pkgs/htdp/htdp/hangman.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/hangman.rkt
similarity index 100%
rename from pkgs/htdp/htdp/hangman.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/hangman.rkt
diff --git a/pkgs/htdp/htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/image.rkt
similarity index 100%
rename from pkgs/htdp/htdp/image.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/image.rkt
diff --git a/pkgs/htdp/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt
similarity index 100%
rename from pkgs/htdp/htdp/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt
diff --git a/pkgs/htdp/htdp/isl+/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/isl+/lang/reader.rkt
similarity index 100%
rename from pkgs/htdp/htdp/isl+/lang/reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/isl+/lang/reader.rkt
diff --git a/pkgs/htdp/htdp/isl/lang/reader.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/isl/lang/reader.rkt
similarity index 100%
rename from pkgs/htdp/htdp/isl/lang/reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/isl/lang/reader.rkt
diff --git a/pkgs/htdp/htdp/lkup-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/lkup-gui.rkt
similarity index 100%
rename from pkgs/htdp/htdp/lkup-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/lkup-gui.rkt
diff --git a/pkgs/htdp/htdp/master-play.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/master-play.rkt
similarity index 100%
rename from pkgs/htdp/htdp/master-play.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/master-play.rkt
diff --git a/pkgs/htdp/htdp/master.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/master.rkt
similarity index 100%
rename from pkgs/htdp/htdp/master.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/master.rkt
diff --git a/pkgs/htdp/htdp/matrix-invisible.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-invisible.rkt
similarity index 100%
rename from pkgs/htdp/htdp/matrix-invisible.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/matrix-invisible.rkt
diff --git a/pkgs/htdp/htdp/matrix-render-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-render-sig.rkt
similarity index 100%
rename from pkgs/htdp/htdp/matrix-render-sig.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/matrix-render-sig.rkt
diff --git a/pkgs/htdp/htdp/matrix-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-sig.rkt
similarity index 100%
rename from pkgs/htdp/htdp/matrix-sig.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/matrix-sig.rkt
diff --git a/pkgs/htdp/htdp/matrix-unit.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix-unit.rkt
similarity index 100%
rename from pkgs/htdp/htdp/matrix-unit.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/matrix-unit.rkt
diff --git a/pkgs/htdp/htdp/matrix.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.rkt
similarity index 100%
rename from pkgs/htdp/htdp/matrix.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/matrix.rkt
diff --git a/pkgs/htdp/htdp/matrix.txt b/pkgs/htdp-pkgs/htdp-lib/htdp/matrix.txt
similarity index 100%
rename from pkgs/htdp/htdp/matrix.txt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/matrix.txt
diff --git a/pkgs/htdp/htdp/servlet.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/servlet.rkt
similarity index 100%
rename from pkgs/htdp/htdp/servlet.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/servlet.rkt
diff --git a/pkgs/htdp/htdp/servlet2.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/servlet2.rkt
similarity index 100%
rename from pkgs/htdp/htdp/servlet2.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/servlet2.rkt
diff --git a/pkgs/htdp/htdp/show-queen.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/show-queen.rkt
similarity index 100%
rename from pkgs/htdp/htdp/show-queen.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/show-queen.rkt
diff --git a/pkgs/htdp/htdp/testing.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/testing.rkt
similarity index 100%
rename from pkgs/htdp/htdp/testing.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/testing.rkt
diff --git a/pkgs/htdp/htdp/tests/TEST b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/TEST
similarity index 100%
rename from pkgs/htdp/htdp/tests/TEST
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/TEST
diff --git a/pkgs/htdp/htdp/tests/TODO b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/TODO
similarity index 100%
rename from pkgs/htdp/htdp/tests/TODO
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/TODO
diff --git a/pkgs/htdp/htdp/tests/arrow-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow-gui.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/arrow-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow-gui.rkt
diff --git a/pkgs/htdp/htdp/tests/arrow.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/arrow.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow.rkt
diff --git a/pkgs/htdp/htdp/tests/convert-drracket-error.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/convert-drracket-error.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.rkt
diff --git a/pkgs/htdp/htdp/tests/convert-drracket-error.txt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.txt
similarity index 100%
rename from pkgs/htdp/htdp/tests/convert-drracket-error.txt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.txt
diff --git a/pkgs/htdp/htdp/tests/convert-drracket-non-error.txt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-non-error.txt
similarity index 100%
rename from pkgs/htdp/htdp/tests/convert-drracket-non-error.txt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-non-error.txt
diff --git a/pkgs/htdp/htdp/tests/convert.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/convert.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert.rkt
diff --git a/pkgs/htdp/htdp/tests/dir.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/dir.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/dir.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/dir.rkt
diff --git a/pkgs/htdp/htdp/tests/docs.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/docs.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/docs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/docs.rkt
diff --git a/pkgs/htdp/htdp/tests/draw.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/draw.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/draw.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/draw.rkt
diff --git a/pkgs/htdp/htdp/tests/elevator.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/elevator.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/elevator.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/elevator.rkt
diff --git a/pkgs/htdp/htdp/tests/graphing.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/graphing.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/graphing.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/graphing.rkt
diff --git a/pkgs/htdp/htdp/tests/guess1.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess1.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/guess1.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess1.rkt
diff --git a/pkgs/htdp/htdp/tests/guess2.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess2.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/guess2.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess2.rkt
diff --git a/pkgs/htdp/htdp/tests/guess3.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess3.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/guess3.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess3.rkt
diff --git a/pkgs/htdp/htdp/tests/gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/gui.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/gui.rkt
diff --git a/pkgs/htdp/htdp/tests/hangman-error.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman-error.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/hangman-error.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman-error.rkt
diff --git a/pkgs/htdp/htdp/tests/hangman1.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman1.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/hangman1.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman1.rkt
diff --git a/pkgs/htdp/htdp/tests/lkup-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/lkup-gui.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/lkup-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/lkup-gui.rkt
diff --git a/pkgs/htdp/htdp/tests/master.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/master.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/master.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/master.rkt
diff --git a/pkgs/htdp/htdp/tests/matrix-client.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-client.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/matrix-client.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-client.rkt
diff --git a/pkgs/htdp/htdp/tests/matrix-example.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-example.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/matrix-example.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-example.rkt
diff --git a/pkgs/htdp/htdp/tests/matrix-test.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-test.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/matrix-test.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-test.rkt
diff --git a/pkgs/htdp/htdp/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/test-docs-complete.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/test-docs-complete.rkt
diff --git a/pkgs/htdp/htdp/tests/tester.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/tester.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/tester.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/tester.rkt
diff --git a/pkgs/htdp/htdp/tests/world-add-line.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-add-line.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/world-add-line.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-add-line.rkt
diff --git a/pkgs/htdp/htdp/tests/world-mouse.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-mouse.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/world-mouse.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-mouse.rkt
diff --git a/pkgs/htdp/htdp/tests/world.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/tests/world.rkt
similarity index 100%
rename from pkgs/htdp/htdp/tests/world.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/tests/world.rkt
diff --git a/pkgs/htdp/htdp/world.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/world.rkt
similarity index 100%
rename from pkgs/htdp/htdp/world.rkt
rename to pkgs/htdp-pkgs/htdp-lib/htdp/world.rkt
diff --git a/pkgs/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/info.rkt
similarity index 100%
rename from pkgs/htdp/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/info.rkt
diff --git a/pkgs/htdp/lang/doc.txt b/pkgs/htdp-pkgs/htdp-lib/lang/doc.txt
similarity index 100%
rename from pkgs/htdp/lang/doc.txt
rename to pkgs/htdp-pkgs/htdp-lib/lang/doc.txt
diff --git a/pkgs/htdp/lang/error.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/error.rkt
similarity index 100%
rename from pkgs/htdp/lang/error.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/error.rkt
diff --git a/pkgs/htdp/lang/htdp-advanced-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced-reader.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-advanced-reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced-reader.rkt
diff --git a/pkgs/htdp/lang/htdp-advanced.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-advanced.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-advanced.rkt
diff --git a/pkgs/htdp/lang/htdp-beginner-abbr-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr-reader.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-beginner-abbr-reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr-reader.rkt
diff --git a/pkgs/htdp/lang/htdp-beginner-abbr.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-beginner-abbr.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-abbr.rkt
diff --git a/pkgs/htdp/lang/htdp-beginner-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-reader.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-beginner-reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner-reader.rkt
diff --git a/pkgs/htdp/lang/htdp-beginner.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-beginner.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-beginner.rkt
diff --git a/pkgs/htdp/lang/htdp-intermediate-lambda-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda-reader.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-intermediate-lambda-reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda-reader.rkt
diff --git a/pkgs/htdp/lang/htdp-intermediate-lambda.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-intermediate-lambda.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-lambda.rkt
diff --git a/pkgs/htdp/lang/htdp-intermediate-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-reader.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-intermediate-reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate-reader.rkt
diff --git a/pkgs/htdp/lang/htdp-intermediate.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-intermediate.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-intermediate.rkt
diff --git a/pkgs/htdp/lang/htdp-langs-save-file-prefix.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs-save-file-prefix.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-langs-save-file-prefix.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs-save-file-prefix.rkt
diff --git a/pkgs/htdp/lang/htdp-langs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-langs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-langs.rkt
diff --git a/pkgs/htdp/lang/htdp-reader.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/htdp-reader.rkt
similarity index 100%
rename from pkgs/htdp/lang/htdp-reader.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/htdp-reader.rkt
diff --git a/pkgs/htdp/lang/imageeq.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/imageeq.rkt
similarity index 100%
rename from pkgs/htdp/lang/imageeq.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/imageeq.rkt
diff --git a/pkgs/htdp/lang/info.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/info.rkt
similarity index 100%
rename from pkgs/htdp/lang/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/info.rkt
diff --git a/pkgs/htdp/lang/plt-pretty-big-text.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big-text.rkt
similarity index 100%
rename from pkgs/htdp/lang/plt-pretty-big-text.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big-text.rkt
diff --git a/pkgs/htdp/lang/plt-pretty-big.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big.rkt
similarity index 100%
rename from pkgs/htdp/lang/plt-pretty-big.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/plt-pretty-big.rkt
diff --git a/pkgs/htdp/lang/posn.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/posn.rkt
similarity index 100%
rename from pkgs/htdp/lang/posn.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/posn.rkt
diff --git a/pkgs/htdp/lang/prim.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/prim.rkt
similarity index 100%
rename from pkgs/htdp/lang/prim.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/prim.rkt
diff --git a/pkgs/htdp/lang/private/advanced-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/advanced-funs.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/advanced-funs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/advanced-funs.rkt
diff --git a/pkgs/htdp/lang/private/and-or-map.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/and-or-map.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/and-or-map.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/and-or-map.rkt
diff --git a/pkgs/htdp/lang/private/beginner-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/beginner-funs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt
diff --git a/pkgs/htdp/lang/private/continuation-mark-key.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/continuation-mark-key.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/continuation-mark-key.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/continuation-mark-key.rkt
diff --git a/pkgs/htdp/lang/private/create-htdp-executable.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/create-htdp-executable.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/create-htdp-executable.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/create-htdp-executable.rkt
diff --git a/pkgs/htdp/lang/private/firstorder.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/firstorder.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/firstorder.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/firstorder.rkt
diff --git a/pkgs/htdp/lang/private/imageeq.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/imageeq.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/imageeq.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/imageeq.rkt
diff --git a/pkgs/htdp/lang/private/intermediate-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/intermediate-funs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt
diff --git a/pkgs/htdp/lang/private/provide-and-scribble.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/provide-and-scribble.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/provide-and-scribble.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/provide-and-scribble.rkt
diff --git a/pkgs/htdp/lang/private/rewrite-error-message.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/rewrite-error-message.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/rewrite-error-message.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/rewrite-error-message.rkt
diff --git a/pkgs/htdp/lang/private/set-result.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/set-result.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/set-result.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/set-result.rkt
diff --git a/pkgs/htdp/lang/private/signature-syntax.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/signature-syntax.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/signature-syntax.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/signature-syntax.rkt
diff --git a/pkgs/htdp/lang/private/sl-eval.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/sl-eval.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/sl-eval.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/sl-eval.rkt
diff --git a/pkgs/htdp/lang/private/teach-module-begin.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-module-begin.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/teach-module-begin.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/teach-module-begin.rkt
diff --git a/pkgs/htdp/lang/private/teach-shared.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teach-shared.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/teach-shared.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/teach-shared.rkt
diff --git a/pkgs/htdp/lang/private/teach.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teach.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/teach.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/teach.rkt
diff --git a/pkgs/htdp/lang/private/teachhelp.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teachhelp.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/teachhelp.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/teachhelp.rkt
diff --git a/pkgs/htdp/lang/private/teachprims.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/teachprims.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/teachprims.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/teachprims.rkt
diff --git a/pkgs/htdp/lang/private/textbook-pls-spec.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/textbook-pls-spec.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/textbook-pls-spec.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/textbook-pls-spec.rkt
diff --git a/pkgs/htdp/lang/private/todo.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/todo.rkt
similarity index 100%
rename from pkgs/htdp/lang/private/todo.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/private/todo.rkt
diff --git a/pkgs/htdp/lang/r5rs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/r5rs.rkt
similarity index 100%
rename from pkgs/htdp/lang/r5rs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/r5rs.rkt
diff --git a/pkgs/htdp/lang/run-teaching-program.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/run-teaching-program.rkt
similarity index 100%
rename from pkgs/htdp/lang/run-teaching-program.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/run-teaching-program.rkt
diff --git a/pkgs/htdp/lang/stepper-language-interface.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/stepper-language-interface.rkt
similarity index 100%
rename from pkgs/htdp/lang/stepper-language-interface.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/stepper-language-interface.rkt
diff --git a/pkgs/htdp/lang/test-error.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/test-error.rkt
similarity index 100%
rename from pkgs/htdp/lang/test-error.rkt
rename to pkgs/htdp-pkgs/htdp-lib/lang/test-error.rkt
diff --git a/pkgs/htdp/stepper/DESIGN-NOTES b/pkgs/htdp-pkgs/htdp-lib/stepper/DESIGN-NOTES
similarity index 100%
rename from pkgs/htdp/stepper/DESIGN-NOTES
rename to pkgs/htdp-pkgs/htdp-lib/stepper/DESIGN-NOTES
diff --git a/pkgs/htdp/stepper/HISTORY.txt b/pkgs/htdp-pkgs/htdp-lib/stepper/HISTORY.txt
similarity index 100%
rename from pkgs/htdp/stepper/HISTORY.txt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/HISTORY.txt
diff --git a/pkgs/htdp/stepper/command-line-debugger-example.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/command-line-debugger-example.rkt
similarity index 100%
rename from pkgs/htdp/stepper/command-line-debugger-example.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/command-line-debugger-example.rkt
diff --git a/pkgs/htdp/stepper/doc.txt b/pkgs/htdp-pkgs/htdp-lib/stepper/doc.txt
similarity index 100%
rename from pkgs/htdp/stepper/doc.txt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/doc.txt
diff --git a/pkgs/htdp/stepper/drracket-button.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/drracket-button.rkt
similarity index 100%
rename from pkgs/htdp/stepper/drracket-button.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/drracket-button.rkt
diff --git a/pkgs/htdp/stepper/examples/bobby.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/examples/bobby.rkt
similarity index 100%
rename from pkgs/htdp/stepper/examples/bobby.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/examples/bobby.rkt
diff --git a/pkgs/htdp/stepper/examples/external-interface-example.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/examples/external-interface-example.rkt
similarity index 100%
rename from pkgs/htdp/stepper/examples/external-interface-example.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/examples/external-interface-example.rkt
diff --git a/pkgs/htdp/stepper/external-interface.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/external-interface.rkt
similarity index 100%
rename from pkgs/htdp/stepper/external-interface.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/external-interface.rkt
diff --git a/pkgs/htdp/stepper/info.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt
similarity index 100%
rename from pkgs/htdp/stepper/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt
diff --git a/pkgs/htdp/stepper/internal-docs.txt b/pkgs/htdp-pkgs/htdp-lib/stepper/internal-docs.txt
similarity index 100%
rename from pkgs/htdp/stepper/internal-docs.txt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/internal-docs.txt
diff --git a/pkgs/htdp/stepper/private/annotate.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/annotate.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/annotate.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/annotate.rkt
diff --git a/pkgs/htdp/stepper/private/beginner-defined.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/beginner-defined.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/beginner-defined.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/beginner-defined.rkt
diff --git a/pkgs/htdp/stepper/private/display-break-stuff.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/display-break-stuff.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/display-break-stuff.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/display-break-stuff.rkt
diff --git a/pkgs/htdp/stepper/private/find-tag.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/find-tag.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/find-tag.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/find-tag.rkt
diff --git a/pkgs/htdp/stepper/private/lifting.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/lifting.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/lifting.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/lifting.rkt
diff --git a/pkgs/htdp/stepper/private/macro-unwind.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/macro-unwind.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/macro-unwind.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/macro-unwind.rkt
diff --git a/pkgs/htdp/stepper/private/marks.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/marks.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/marks.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/marks.rkt
diff --git a/pkgs/htdp/stepper/private/model-settings.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/model-settings.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/model-settings.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/model-settings.rkt
diff --git a/pkgs/htdp/stepper/private/model.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/model.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/model.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/model.rkt
diff --git a/pkgs/htdp/stepper/private/mred-extensions.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/mred-extensions.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/mred-extensions.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/mred-extensions.rkt
diff --git a/pkgs/htdp/stepper/private/my-macros.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/my-macros.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/my-macros.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/my-macros.rkt
diff --git a/pkgs/htdp/stepper/private/reconstruct.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/reconstruct.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/reconstruct.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/reconstruct.rkt
diff --git a/pkgs/htdp/stepper/private/shared.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/shared.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/shared.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/shared.rkt
diff --git a/pkgs/htdp/stepper/private/syntax-property.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/syntax-property.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/syntax-property.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/syntax-property.rkt
diff --git a/pkgs/htdp/stepper/private/vertical-separator-snip.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/vertical-separator-snip.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/vertical-separator-snip.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/vertical-separator-snip.rkt
diff --git a/pkgs/htdp/stepper/private/view-controller.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/view-controller.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/view-controller.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/view-controller.rkt
diff --git a/pkgs/htdp/stepper/private/xml-box.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-box.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/xml-box.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-box.rkt
diff --git a/pkgs/htdp/stepper/private/xml-sig.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-sig.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/xml-sig.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-sig.rkt
diff --git a/pkgs/htdp/stepper/private/xml-snip-helpers.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-snip-helpers.rkt
similarity index 100%
rename from pkgs/htdp/stepper/private/xml-snip-helpers.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/private/xml-snip-helpers.rkt
diff --git a/pkgs/htdp/stepper/stepper+xml-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/stepper+xml-tool.rkt
similarity index 100%
rename from pkgs/htdp/stepper/stepper+xml-tool.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/stepper+xml-tool.rkt
diff --git a/pkgs/htdp/stepper/stepper-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/stepper-tool.rkt
similarity index 100%
rename from pkgs/htdp/stepper/stepper-tool.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/stepper-tool.rkt
diff --git a/pkgs/htdp/stepper/xml-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/xml-tool.rkt
similarity index 100%
rename from pkgs/htdp/stepper/xml-tool.rkt
rename to pkgs/htdp-pkgs/htdp-lib/stepper/xml-tool.rkt
diff --git a/pkgs/htdp/teachpack/2htdp/batch-io.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/batch-io.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/batch-io.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/batch-io.rkt
diff --git a/pkgs/htdp/teachpack/2htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/image.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/image.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/image.rkt
diff --git a/pkgs/htdp/teachpack/2htdp/universe.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/universe.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/2htdp/universe.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/2htdp/universe.rkt
diff --git a/pkgs/htdp/teachpack/HISTORY.txt b/pkgs/htdp-pkgs/htdp-lib/teachpack/HISTORY.txt
similarity index 100%
rename from pkgs/htdp/teachpack/HISTORY.txt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/HISTORY.txt
diff --git a/pkgs/htdp/teachpack/balls.gif b/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.gif
similarity index 100%
rename from pkgs/htdp/teachpack/balls.gif
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/balls.gif
diff --git a/pkgs/htdp/teachpack/balls.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.png
similarity index 100%
rename from pkgs/htdp/teachpack/balls.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/balls.png
diff --git a/pkgs/htdp/teachpack/balls.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/balls.ss
similarity index 100%
rename from pkgs/htdp/teachpack/balls.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/balls.ss
diff --git a/pkgs/htdp/teachpack/data.csv b/pkgs/htdp-pkgs/htdp-lib/teachpack/data.csv
similarity index 100%
rename from pkgs/htdp/teachpack/data.csv
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/data.csv
diff --git a/pkgs/htdp/teachpack/data.txt b/pkgs/htdp-pkgs/htdp-lib/teachpack/data.txt
similarity index 100%
rename from pkgs/htdp/teachpack/data.txt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/data.txt
diff --git a/pkgs/htdp/teachpack/deinprogramm/image.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/image.ss
similarity index 100%
rename from pkgs/htdp/teachpack/deinprogramm/image.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/image.ss
diff --git a/pkgs/htdp/teachpack/deinprogramm/image2.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/image2.ss
similarity index 100%
rename from pkgs/htdp/teachpack/deinprogramm/image2.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/image2.ss
diff --git a/pkgs/htdp/teachpack/deinprogramm/line3d.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/line3d.ss
similarity index 100%
rename from pkgs/htdp/teachpack/deinprogramm/line3d.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/line3d.ss
diff --git a/pkgs/htdp/teachpack/deinprogramm/sound.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/sound.ss
similarity index 100%
rename from pkgs/htdp/teachpack/deinprogramm/sound.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/sound.ss
diff --git a/pkgs/htdp/teachpack/deinprogramm/turtle.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/turtle.ss
similarity index 100%
rename from pkgs/htdp/teachpack/deinprogramm/turtle.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/turtle.ss
diff --git a/pkgs/htdp/teachpack/deinprogramm/universe.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/universe.ss
similarity index 100%
rename from pkgs/htdp/teachpack/deinprogramm/universe.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/universe.ss
diff --git a/pkgs/htdp/teachpack/deinprogramm/world.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/world.ss
similarity index 100%
rename from pkgs/htdp/teachpack/deinprogramm/world.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm/world.ss
diff --git a/pkgs/htdp/teachpack/door-real.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/door-real.png
similarity index 100%
rename from pkgs/htdp/teachpack/door-real.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/door-real.png
diff --git a/pkgs/htdp/teachpack/door-sim.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/door-sim.png
similarity index 100%
rename from pkgs/htdp/teachpack/door-sim.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/door-sim.png
diff --git a/pkgs/htdp/teachpack/door.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/door.ss
similarity index 100%
rename from pkgs/htdp/teachpack/door.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/door.ss
diff --git a/pkgs/htdp/teachpack/gamepad.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/gamepad.png
similarity index 100%
rename from pkgs/htdp/teachpack/gamepad.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/gamepad.png
diff --git a/pkgs/htdp/teachpack/htdp/arrow-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow-gui.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/arrow-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow-gui.rkt
diff --git a/pkgs/htdp/teachpack/htdp/arrow.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/arrow.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/arrow.rkt
diff --git a/pkgs/htdp/teachpack/htdp/convert.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/convert.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/convert.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/convert.rkt
diff --git a/pkgs/htdp/teachpack/htdp/dir.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/dir.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/dir.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/dir.rkt
diff --git a/pkgs/htdp/teachpack/htdp/docs.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/docs.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/docs.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/docs.rkt
diff --git a/pkgs/htdp/teachpack/htdp/draw.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/draw.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/draw.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/draw.rkt
diff --git a/pkgs/htdp/teachpack/htdp/elevator.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/elevator.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/elevator.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/elevator.rkt
diff --git a/pkgs/htdp/teachpack/htdp/graphing.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/graphing.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/graphing.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/graphing.rkt
diff --git a/pkgs/htdp/teachpack/htdp/guess-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess-gui.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/guess-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess-gui.rkt
diff --git a/pkgs/htdp/teachpack/htdp/guess.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/guess.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/guess.rkt
diff --git a/pkgs/htdp/teachpack/htdp/gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/gui.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/gui.rkt
diff --git a/pkgs/htdp/teachpack/htdp/hangman.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/hangman.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/hangman.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/hangman.rkt
diff --git a/pkgs/htdp/teachpack/htdp/image.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/image.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/image.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/image.rkt
diff --git a/pkgs/htdp/teachpack/htdp/lkup-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/lkup-gui.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/lkup-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/lkup-gui.rkt
diff --git a/pkgs/htdp/teachpack/htdp/master.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/master.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/master.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/master.rkt
diff --git a/pkgs/htdp/teachpack/htdp/matrix.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/matrix.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/matrix.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/matrix.rkt
diff --git a/pkgs/htdp/teachpack/htdp/servlet.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/servlet.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet.rkt
diff --git a/pkgs/htdp/teachpack/htdp/servlet2.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet2.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/servlet2.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/servlet2.rkt
diff --git a/pkgs/htdp/teachpack/htdp/show-queen.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/show-queen.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/show-queen.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/show-queen.rkt
diff --git a/pkgs/htdp/teachpack/htdp/testing.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/testing.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/testing.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/testing.rkt
diff --git a/pkgs/htdp/teachpack/htdp/world.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/world.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/htdp/world.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/world.rkt
diff --git a/pkgs/htdp/teachpack/info.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt
diff --git a/pkgs/htdp/teachpack/nuworld.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/nuworld.png
similarity index 100%
rename from pkgs/htdp/teachpack/nuworld.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/nuworld.png
diff --git a/pkgs/htdp/teachpack/nuworld.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/nuworld.ss
similarity index 100%
rename from pkgs/htdp/teachpack/nuworld.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/nuworld.ss
diff --git a/pkgs/htdp/teachpack/server.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/server.png
similarity index 100%
rename from pkgs/htdp/teachpack/server.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/server.png
diff --git a/pkgs/htdp/teachpack/server.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/server.ss
similarity index 100%
rename from pkgs/htdp/teachpack/server.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/server.ss
diff --git a/pkgs/htdp/teachpack/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/htdp/teachpack/tests/test-docs-complete.rkt
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/tests/test-docs-complete.rkt
diff --git a/pkgs/htdp/teachpack/triangle-xxx.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/triangle-xxx.png
similarity index 100%
rename from pkgs/htdp/teachpack/triangle-xxx.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/triangle-xxx.png
diff --git a/pkgs/htdp/teachpack/turtles.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/turtles.ss
similarity index 100%
rename from pkgs/htdp/teachpack/turtles.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/turtles.ss
diff --git a/pkgs/htdp/teachpack/universe.png b/pkgs/htdp-pkgs/htdp-lib/teachpack/universe.png
similarity index 100%
rename from pkgs/htdp/teachpack/universe.png
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/universe.png
diff --git a/pkgs/htdp/teachpack/value-turtles.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/value-turtles.ss
similarity index 100%
rename from pkgs/htdp/teachpack/value-turtles.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/value-turtles.ss
diff --git a/pkgs/htdp/teachpack/world.ss b/pkgs/htdp-pkgs/htdp-lib/teachpack/world.ss
similarity index 100%
rename from pkgs/htdp/teachpack/world.ss
rename to pkgs/htdp-pkgs/htdp-lib/teachpack/world.ss
diff --git a/pkgs/htdp/test-engine/info.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt
similarity index 100%
rename from pkgs/htdp/test-engine/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt
diff --git a/pkgs/htdp/test-engine/print.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/print.rkt
similarity index 100%
rename from pkgs/htdp/test-engine/print.rkt
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/print.rkt
diff --git a/pkgs/htdp/test-engine/racket-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-gui.rkt
similarity index 100%
rename from pkgs/htdp/test-engine/racket-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/racket-gui.rkt
diff --git a/pkgs/htdp/test-engine/racket-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/racket-tests.rkt
similarity index 100%
rename from pkgs/htdp/test-engine/racket-tests.rkt
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/racket-tests.rkt
diff --git a/pkgs/htdp/test-engine/scheme-gui.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-gui.rkt
similarity index 100%
rename from pkgs/htdp/test-engine/scheme-gui.rkt
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-gui.rkt
diff --git a/pkgs/htdp/test-engine/scheme-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-tests.rkt
similarity index 100%
rename from pkgs/htdp/test-engine/scheme-tests.rkt
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/scheme-tests.rkt
diff --git a/pkgs/htdp/test-engine/test-coverage.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-coverage.scm
similarity index 100%
rename from pkgs/htdp/test-engine/test-coverage.scm
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/test-coverage.scm
diff --git a/pkgs/htdp/test-engine/test-display.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-display.scm
similarity index 100%
rename from pkgs/htdp/test-engine/test-display.scm
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/test-display.scm
diff --git a/pkgs/htdp/test-engine/test-engine.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-engine.rkt
similarity index 100%
rename from pkgs/htdp/test-engine/test-engine.rkt
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/test-engine.rkt
diff --git a/pkgs/htdp/test-engine/test-info.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-info.scm
similarity index 100%
rename from pkgs/htdp/test-engine/test-info.scm
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/test-info.scm
diff --git a/pkgs/htdp/test-engine/test-tool.scm b/pkgs/htdp-pkgs/htdp-lib/test-engine/test-tool.scm
similarity index 100%
rename from pkgs/htdp/test-engine/test-tool.scm
rename to pkgs/htdp-pkgs/htdp-lib/test-engine/test-tool.scm
diff --git a/pkgs/htdp/typed/test-engine/racket-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/racket-tests.rkt
similarity index 100%
rename from pkgs/htdp/typed/test-engine/racket-tests.rkt
rename to pkgs/htdp-pkgs/htdp-lib/typed/test-engine/racket-tests.rkt
diff --git a/pkgs/htdp/typed/test-engine/scheme-tests.rkt b/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/scheme-tests.rkt
similarity index 100%
rename from pkgs/htdp/typed/test-engine/scheme-tests.rkt
rename to pkgs/htdp-pkgs/htdp-lib/typed/test-engine/scheme-tests.rkt
diff --git a/pkgs/htdp/typed/test-engine/type-env-ext.rkt b/pkgs/htdp-pkgs/htdp-lib/typed/test-engine/type-env-ext.rkt
similarity index 100%
rename from pkgs/htdp/typed/test-engine/type-env-ext.rkt
rename to pkgs/htdp-pkgs/htdp-lib/typed/test-engine/type-env-ext.rkt
diff --git a/pkgs/htdp/xml/info.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/info.rkt
similarity index 100%
rename from pkgs/htdp/xml/info.rkt
rename to pkgs/htdp-pkgs/htdp-lib/xml/info.rkt
diff --git a/pkgs/htdp/xml/scheme-snipclass.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/scheme-snipclass.rkt
similarity index 100%
rename from pkgs/htdp/xml/scheme-snipclass.rkt
rename to pkgs/htdp-pkgs/htdp-lib/xml/scheme-snipclass.rkt
diff --git a/pkgs/htdp/xml/text-box-tool.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/text-box-tool.rkt
similarity index 100%
rename from pkgs/htdp/xml/text-box-tool.rkt
rename to pkgs/htdp-pkgs/htdp-lib/xml/text-box-tool.rkt
diff --git a/pkgs/htdp/xml/text-snipclass.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/text-snipclass.rkt
similarity index 100%
rename from pkgs/htdp/xml/text-snipclass.rkt
rename to pkgs/htdp-pkgs/htdp-lib/xml/text-snipclass.rkt
diff --git a/pkgs/htdp/xml/xml-snipclass.rkt b/pkgs/htdp-pkgs/htdp-lib/xml/xml-snipclass.rkt
similarity index 100%
rename from pkgs/htdp/xml/xml-snipclass.rkt
rename to pkgs/htdp-pkgs/htdp-lib/xml/xml-snipclass.rkt
diff --git a/pkgs/htdp/xml/xml.png b/pkgs/htdp-pkgs/htdp-lib/xml/xml.png
similarity index 100%
rename from pkgs/htdp/xml/xml.png
rename to pkgs/htdp-pkgs/htdp-lib/xml/xml.png