diff --git a/pkgs/datalog/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from pkgs/datalog/LICENSE.txt
rename to LICENSE.txt
diff --git a/pkgs/datalog/ast.rkt b/ast.rkt
similarity index 100%
rename from pkgs/datalog/ast.rkt
rename to ast.rkt
diff --git a/pkgs/datalog/eval.rkt b/eval.rkt
similarity index 100%
rename from pkgs/datalog/eval.rkt
rename to eval.rkt
diff --git a/pkgs/datalog/info.rkt b/info.rkt
similarity index 100%
rename from pkgs/datalog/info.rkt
rename to info.rkt
diff --git a/pkgs/datalog/lang/configure-runtime.rkt b/lang/configure-runtime.rkt
similarity index 100%
rename from pkgs/datalog/lang/configure-runtime.rkt
rename to lang/configure-runtime.rkt
diff --git a/pkgs/datalog/lang/lang-info.rkt b/lang/lang-info.rkt
similarity index 100%
rename from pkgs/datalog/lang/lang-info.rkt
rename to lang/lang-info.rkt
diff --git a/pkgs/datalog/lang/reader.rkt b/lang/reader.rkt
similarity index 100%
rename from pkgs/datalog/lang/reader.rkt
rename to lang/reader.rkt
diff --git a/pkgs/datalog/main.rkt b/main.rkt
similarity index 100%
rename from pkgs/datalog/main.rkt
rename to main.rkt
diff --git a/pkgs/datalog/parse.rkt b/parse.rkt
similarity index 100%
rename from pkgs/datalog/parse.rkt
rename to parse.rkt
diff --git a/pkgs/datalog/pretty.rkt b/pretty.rkt
similarity index 100%
rename from pkgs/datalog/pretty.rkt
rename to pretty.rkt
diff --git a/pkgs/datalog/private/compiler.rkt b/private/compiler.rkt
similarity index 100%
rename from pkgs/datalog/private/compiler.rkt
rename to private/compiler.rkt
diff --git a/pkgs/datalog/private/env.rkt b/private/env.rkt
similarity index 100%
rename from pkgs/datalog/private/env.rkt
rename to private/env.rkt
diff --git a/pkgs/datalog/private/lex.rkt b/private/lex.rkt
similarity index 100%
rename from pkgs/datalog/private/lex.rkt
rename to private/lex.rkt
diff --git a/pkgs/datalog/private/pprint.rkt b/private/pprint.rkt
similarity index 100%
rename from pkgs/datalog/private/pprint.rkt
rename to private/pprint.rkt
diff --git a/pkgs/datalog/private/subst.rkt b/private/subst.rkt
similarity index 100%
rename from pkgs/datalog/private/subst.rkt
rename to private/subst.rkt
diff --git a/pkgs/datalog/private/unify.rkt b/private/unify.rkt
similarity index 100%
rename from pkgs/datalog/private/unify.rkt
rename to private/unify.rkt
diff --git a/pkgs/datalog/private/variant.rkt b/private/variant.rkt
similarity index 100%
rename from pkgs/datalog/private/variant.rkt
rename to private/variant.rkt
diff --git a/pkgs/datalog/runtime.rkt b/runtime.rkt
similarity index 100%
rename from pkgs/datalog/runtime.rkt
rename to runtime.rkt
diff --git a/pkgs/datalog/scribblings/datalog.scrbl b/scribblings/datalog.scrbl
similarity index 100%
rename from pkgs/datalog/scribblings/datalog.scrbl
rename to scribblings/datalog.scrbl
diff --git a/pkgs/datalog/scribblings/racket.scrbl b/scribblings/racket.scrbl
similarity index 100%
rename from pkgs/datalog/scribblings/racket.scrbl
rename to scribblings/racket.scrbl
diff --git a/pkgs/datalog/scribblings/tutorial.scrbl b/scribblings/tutorial.scrbl
similarity index 100%
rename from pkgs/datalog/scribblings/tutorial.scrbl
rename to scribblings/tutorial.scrbl
diff --git a/pkgs/datalog/scribblings/utils.rkt b/scribblings/utils.rkt
similarity index 100%
rename from pkgs/datalog/scribblings/utils.rkt
rename to scribblings/utils.rkt
diff --git a/pkgs/datalog/serialize.rkt b/serialize.rkt
similarity index 100%
rename from pkgs/datalog/serialize.rkt
rename to serialize.rkt
diff --git a/pkgs/datalog/sexp/lang.rkt b/sexp/lang.rkt
similarity index 100%
rename from pkgs/datalog/sexp/lang.rkt
rename to sexp/lang.rkt
diff --git a/pkgs/datalog/sexp/lang/reader.rkt b/sexp/lang/reader.rkt
similarity index 100%
rename from pkgs/datalog/sexp/lang/reader.rkt
rename to sexp/lang/reader.rkt
diff --git a/pkgs/datalog/stx.rkt b/stx.rkt
similarity index 100%
rename from pkgs/datalog/stx.rkt
rename to stx.rkt
diff --git a/pkgs/datalog/tests/ast.rkt b/tests/ast.rkt
similarity index 100%
rename from pkgs/datalog/tests/ast.rkt
rename to tests/ast.rkt
diff --git a/pkgs/datalog/tests/eval.rkt b/tests/eval.rkt
similarity index 100%
rename from pkgs/datalog/tests/eval.rkt
rename to tests/eval.rkt
diff --git a/pkgs/datalog/tests/examples/ancestor.rkt b/tests/examples/ancestor.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/ancestor.rkt
rename to tests/examples/ancestor.rkt
diff --git a/pkgs/datalog/tests/examples/ancestor.txt b/tests/examples/ancestor.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/ancestor.txt
rename to tests/examples/ancestor.txt
diff --git a/pkgs/datalog/tests/examples/bidipath.rkt b/tests/examples/bidipath.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/bidipath.rkt
rename to tests/examples/bidipath.rkt
diff --git a/pkgs/datalog/tests/examples/bidipath.txt b/tests/examples/bidipath.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/bidipath.txt
rename to tests/examples/bidipath.txt
diff --git a/pkgs/datalog/tests/examples/empty.rkt b/tests/examples/empty.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/empty.rkt
rename to tests/examples/empty.rkt
diff --git a/pkgs/datalog/tests/examples/empty.txt b/tests/examples/empty.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/empty.txt
rename to tests/examples/empty.txt
diff --git a/pkgs/datalog/tests/examples/laps.rkt b/tests/examples/laps.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/laps.rkt
rename to tests/examples/laps.rkt
diff --git a/pkgs/datalog/tests/examples/laps.txt b/tests/examples/laps.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/laps.txt
rename to tests/examples/laps.txt
diff --git a/pkgs/datalog/tests/examples/long.rkt b/tests/examples/long.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/long.rkt
rename to tests/examples/long.rkt
diff --git a/pkgs/datalog/tests/examples/long.txt b/tests/examples/long.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/long.txt
rename to tests/examples/long.txt
diff --git a/pkgs/datalog/tests/examples/path.rkt b/tests/examples/path.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/path.rkt
rename to tests/examples/path.rkt
diff --git a/pkgs/datalog/tests/examples/path.txt b/tests/examples/path.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/path.txt
rename to tests/examples/path.txt
diff --git a/pkgs/datalog/tests/examples/pq.rkt b/tests/examples/pq.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/pq.rkt
rename to tests/examples/pq.rkt
diff --git a/pkgs/datalog/tests/examples/pq.txt b/tests/examples/pq.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/pq.txt
rename to tests/examples/pq.txt
diff --git a/pkgs/datalog/tests/examples/revpath.rkt b/tests/examples/revpath.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/revpath.rkt
rename to tests/examples/revpath.rkt
diff --git a/pkgs/datalog/tests/examples/revpath.txt b/tests/examples/revpath.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/revpath.txt
rename to tests/examples/revpath.txt
diff --git a/pkgs/datalog/tests/examples/says.rkt b/tests/examples/says.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/says.rkt
rename to tests/examples/says.rkt
diff --git a/pkgs/datalog/tests/examples/says.txt b/tests/examples/says.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/says.txt
rename to tests/examples/says.txt
diff --git a/pkgs/datalog/tests/examples/student.rkt b/tests/examples/student.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/student.rkt
rename to tests/examples/student.rkt
diff --git a/pkgs/datalog/tests/examples/student.txt b/tests/examples/student.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/student.txt
rename to tests/examples/student.txt
diff --git a/pkgs/datalog/tests/examples/sym.rkt b/tests/examples/sym.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/sym.rkt
rename to tests/examples/sym.rkt
diff --git a/pkgs/datalog/tests/examples/sym.txt b/tests/examples/sym.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/sym.txt
rename to tests/examples/sym.txt
diff --git a/pkgs/datalog/tests/examples/true.rkt b/tests/examples/true.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/true.rkt
rename to tests/examples/true.rkt
diff --git a/pkgs/datalog/tests/examples/true.txt b/tests/examples/true.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/true.txt
rename to tests/examples/true.txt
diff --git a/pkgs/datalog/tests/examples/tutorial.rkt b/tests/examples/tutorial.rkt
similarity index 100%
rename from pkgs/datalog/tests/examples/tutorial.rkt
rename to tests/examples/tutorial.rkt
diff --git a/pkgs/datalog/tests/examples/tutorial.txt b/tests/examples/tutorial.txt
similarity index 100%
rename from pkgs/datalog/tests/examples/tutorial.txt
rename to tests/examples/tutorial.txt
diff --git a/pkgs/datalog/tests/main.rkt b/tests/main.rkt
similarity index 100%
rename from pkgs/datalog/tests/main.rkt
rename to tests/main.rkt
diff --git a/pkgs/datalog/tests/paren-examples/add1.rkt b/tests/paren-examples/add1.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/add1.rkt
rename to tests/paren-examples/add1.rkt
diff --git a/pkgs/datalog/tests/paren-examples/add1.txt b/tests/paren-examples/add1.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/add1.txt
rename to tests/paren-examples/add1.txt
diff --git a/pkgs/datalog/tests/paren-examples/ancestor.rkt b/tests/paren-examples/ancestor.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/ancestor.rkt
rename to tests/paren-examples/ancestor.rkt
diff --git a/pkgs/datalog/tests/paren-examples/ancestor.txt b/tests/paren-examples/ancestor.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/ancestor.txt
rename to tests/paren-examples/ancestor.txt
diff --git a/pkgs/datalog/tests/paren-examples/bidipath.rkt b/tests/paren-examples/bidipath.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/bidipath.rkt
rename to tests/paren-examples/bidipath.rkt
diff --git a/pkgs/datalog/tests/paren-examples/bidipath.txt b/tests/paren-examples/bidipath.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/bidipath.txt
rename to tests/paren-examples/bidipath.txt
diff --git a/pkgs/datalog/tests/paren-examples/empty.rkt b/tests/paren-examples/empty.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/empty.rkt
rename to tests/paren-examples/empty.rkt
diff --git a/pkgs/datalog/tests/paren-examples/empty.txt b/tests/paren-examples/empty.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/empty.txt
rename to tests/paren-examples/empty.txt
diff --git a/pkgs/datalog/tests/paren-examples/laps.rkt b/tests/paren-examples/laps.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/laps.rkt
rename to tests/paren-examples/laps.rkt
diff --git a/pkgs/datalog/tests/paren-examples/laps.txt b/tests/paren-examples/laps.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/laps.txt
rename to tests/paren-examples/laps.txt
diff --git a/pkgs/datalog/tests/paren-examples/long.rkt b/tests/paren-examples/long.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/long.rkt
rename to tests/paren-examples/long.rkt
diff --git a/pkgs/datalog/tests/paren-examples/long.txt b/tests/paren-examples/long.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/long.txt
rename to tests/paren-examples/long.txt
diff --git a/pkgs/datalog/tests/paren-examples/path.rkt b/tests/paren-examples/path.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/path.rkt
rename to tests/paren-examples/path.rkt
diff --git a/pkgs/datalog/tests/paren-examples/path.txt b/tests/paren-examples/path.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/path.txt
rename to tests/paren-examples/path.txt
diff --git a/pkgs/datalog/tests/paren-examples/pq.rkt b/tests/paren-examples/pq.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/pq.rkt
rename to tests/paren-examples/pq.rkt
diff --git a/pkgs/datalog/tests/paren-examples/pq.txt b/tests/paren-examples/pq.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/pq.txt
rename to tests/paren-examples/pq.txt
diff --git a/pkgs/datalog/tests/paren-examples/req.rkt b/tests/paren-examples/req.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/req.rkt
rename to tests/paren-examples/req.rkt
diff --git a/pkgs/datalog/tests/paren-examples/req.txt b/tests/paren-examples/req.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/req.txt
rename to tests/paren-examples/req.txt
diff --git a/pkgs/datalog/tests/paren-examples/revpath.rkt b/tests/paren-examples/revpath.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/revpath.rkt
rename to tests/paren-examples/revpath.rkt
diff --git a/pkgs/datalog/tests/paren-examples/revpath.txt b/tests/paren-examples/revpath.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/revpath.txt
rename to tests/paren-examples/revpath.txt
diff --git a/pkgs/datalog/tests/paren-examples/says.rkt b/tests/paren-examples/says.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/says.rkt
rename to tests/paren-examples/says.rkt
diff --git a/pkgs/datalog/tests/paren-examples/says.txt b/tests/paren-examples/says.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/says.txt
rename to tests/paren-examples/says.txt
diff --git a/pkgs/datalog/tests/paren-examples/sym.rkt b/tests/paren-examples/sym.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/sym.rkt
rename to tests/paren-examples/sym.rkt
diff --git a/pkgs/datalog/tests/paren-examples/sym.txt b/tests/paren-examples/sym.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/sym.txt
rename to tests/paren-examples/sym.txt
diff --git a/pkgs/datalog/tests/paren-examples/true.rkt b/tests/paren-examples/true.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/true.rkt
rename to tests/paren-examples/true.rkt
diff --git a/pkgs/datalog/tests/paren-examples/true.txt b/tests/paren-examples/true.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/true.txt
rename to tests/paren-examples/true.txt
diff --git a/pkgs/datalog/tests/paren-examples/tutorial.rkt b/tests/paren-examples/tutorial.rkt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/tutorial.rkt
rename to tests/paren-examples/tutorial.rkt
diff --git a/pkgs/datalog/tests/paren-examples/tutorial.txt b/tests/paren-examples/tutorial.txt
similarity index 100%
rename from pkgs/datalog/tests/paren-examples/tutorial.txt
rename to tests/paren-examples/tutorial.txt
diff --git a/pkgs/datalog/tests/parse.rkt b/tests/parse.rkt
similarity index 100%
rename from pkgs/datalog/tests/parse.rkt
rename to tests/parse.rkt
diff --git a/pkgs/datalog/tests/pretty.rkt b/tests/pretty.rkt
similarity index 100%
rename from pkgs/datalog/tests/pretty.rkt
rename to tests/pretty.rkt
diff --git a/pkgs/datalog/tests/private/env.rkt b/tests/private/env.rkt
similarity index 100%
rename from pkgs/datalog/tests/private/env.rkt
rename to tests/private/env.rkt
diff --git a/pkgs/datalog/tests/private/lex.rkt b/tests/private/lex.rkt
similarity index 100%
rename from pkgs/datalog/tests/private/lex.rkt
rename to tests/private/lex.rkt
diff --git a/pkgs/datalog/tests/private/subst.rkt b/tests/private/subst.rkt
similarity index 100%
rename from pkgs/datalog/tests/private/subst.rkt
rename to tests/private/subst.rkt
diff --git a/pkgs/datalog/tests/private/unify.rkt b/tests/private/unify.rkt
similarity index 100%
rename from pkgs/datalog/tests/private/unify.rkt
rename to tests/private/unify.rkt
diff --git a/pkgs/datalog/tests/private/variant.rkt b/tests/private/variant.rkt
similarity index 100%
rename from pkgs/datalog/tests/private/variant.rkt
rename to tests/private/variant.rkt
diff --git a/pkgs/datalog/tests/racket.rkt b/tests/racket.rkt
similarity index 100%
rename from pkgs/datalog/tests/racket.rkt
rename to tests/racket.rkt
diff --git a/pkgs/datalog/tests/runtime.rkt b/tests/runtime.rkt
similarity index 100%
rename from pkgs/datalog/tests/runtime.rkt
rename to tests/runtime.rkt
diff --git a/pkgs/datalog/tests/test-docs-complete.rkt b/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/datalog/tests/test-docs-complete.rkt
rename to tests/test-docs-complete.rkt
diff --git a/pkgs/datalog/tests/tool/syntax-color.rkt b/tests/tool/syntax-color.rkt
similarity index 100%
rename from pkgs/datalog/tests/tool/syntax-color.rkt
rename to tests/tool/syntax-color.rkt
diff --git a/pkgs/datalog/tests/util.rkt b/tests/util.rkt
similarity index 100%
rename from pkgs/datalog/tests/util.rkt
rename to tests/util.rkt
diff --git a/pkgs/datalog/tool/datalog.png b/tool/datalog.png
similarity index 100%
rename from pkgs/datalog/tool/datalog.png
rename to tool/datalog.png
diff --git a/pkgs/datalog/tool/submit.rkt b/tool/submit.rkt
similarity index 100%
rename from pkgs/datalog/tool/submit.rkt
rename to tool/submit.rkt
diff --git a/pkgs/datalog/tool/syntax-color.rkt b/tool/syntax-color.rkt
similarity index 100%
rename from pkgs/datalog/tool/syntax-color.rkt
rename to tool/syntax-color.rkt