diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/LICENSE.txt b/parser-tools-doc/LICENSE.txt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-doc/LICENSE.txt
rename to parser-tools-doc/LICENSE.txt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/info.rkt b/parser-tools-doc/info.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-doc/info.rkt
rename to parser-tools-doc/info.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/info.rkt b/parser-tools-doc/parser-tools/info.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/info.rkt
rename to parser-tools-doc/parser-tools/info.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/parser-tools.scrbl b/parser-tools-doc/parser-tools/parser-tools.scrbl
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-doc/parser-tools/parser-tools.scrbl
rename to parser-tools-doc/parser-tools/parser-tools.scrbl
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/LICENSE.txt b/parser-tools-lib/LICENSE.txt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/LICENSE.txt
rename to parser-tools-lib/LICENSE.txt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/info.rkt b/parser-tools-lib/info.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/info.rkt
rename to parser-tools-lib/info.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/cfg-parser.rkt b/parser-tools-lib/parser-tools/cfg-parser.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/cfg-parser.rkt
rename to parser-tools-lib/parser-tools/cfg-parser.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/calc.rkt b/parser-tools-lib/parser-tools/examples/calc.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/calc.rkt
rename to parser-tools-lib/parser-tools/examples/calc.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/read.rkt b/parser-tools-lib/parser-tools/examples/read.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/examples/read.rkt
rename to parser-tools-lib/parser-tools/examples/read.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/info.rkt b/parser-tools-lib/parser-tools/info.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/info.rkt
rename to parser-tools-lib/parser-tools/info.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-plt-v200.rkt b/parser-tools-lib/parser-tools/lex-plt-v200.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-plt-v200.rkt
rename to parser-tools-lib/parser-tools/lex-plt-v200.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-sre.rkt b/parser-tools-lib/parser-tools/lex-sre.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex-sre.rkt
rename to parser-tools-lib/parser-tools/lex-sre.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex.rkt b/parser-tools-lib/parser-tools/lex.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/lex.rkt
rename to parser-tools-lib/parser-tools/lex.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/actions.rkt b/parser-tools-lib/parser-tools/private-lex/actions.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/actions.rkt
rename to parser-tools-lib/parser-tools/private-lex/actions.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/deriv.rkt b/parser-tools-lib/parser-tools/private-lex/deriv.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/deriv.rkt
rename to parser-tools-lib/parser-tools/private-lex/deriv.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/error-tests.rkt b/parser-tools-lib/parser-tools/private-lex/error-tests.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/error-tests.rkt
rename to parser-tools-lib/parser-tools/private-lex/error-tests.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/front.rkt b/parser-tools-lib/parser-tools/private-lex/front.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/front.rkt
rename to parser-tools-lib/parser-tools/private-lex/front.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/re.rkt b/parser-tools-lib/parser-tools/private-lex/re.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/re.rkt
rename to parser-tools-lib/parser-tools/private-lex/re.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/stx.rkt b/parser-tools-lib/parser-tools/private-lex/stx.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/stx.rkt
rename to parser-tools-lib/parser-tools/private-lex/stx.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token-syntax.rkt b/parser-tools-lib/parser-tools/private-lex/token-syntax.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token-syntax.rkt
rename to parser-tools-lib/parser-tools/private-lex/token-syntax.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token.rkt b/parser-tools-lib/parser-tools/private-lex/token.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/token.rkt
rename to parser-tools-lib/parser-tools/private-lex/token.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/unicode-chars.rkt b/parser-tools-lib/parser-tools/private-lex/unicode-chars.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/unicode-chars.rkt
rename to parser-tools-lib/parser-tools/private-lex/unicode-chars.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/util.rkt b/parser-tools-lib/parser-tools/private-lex/util.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/util.rkt
rename to parser-tools-lib/parser-tools/private-lex/util.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/grammar.rkt b/parser-tools-lib/parser-tools/private-yacc/grammar.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/grammar.rkt
rename to parser-tools-lib/parser-tools/private-yacc/grammar.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/graph.rkt b/parser-tools-lib/parser-tools/private-yacc/graph.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/graph.rkt
rename to parser-tools-lib/parser-tools/private-yacc/graph.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/input-file-parser.rkt b/parser-tools-lib/parser-tools/private-yacc/input-file-parser.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/input-file-parser.rkt
rename to parser-tools-lib/parser-tools/private-yacc/input-file-parser.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lalr.rkt b/parser-tools-lib/parser-tools/private-yacc/lalr.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lalr.rkt
rename to parser-tools-lib/parser-tools/private-yacc/lalr.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lr0.rkt b/parser-tools-lib/parser-tools/private-yacc/lr0.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/lr0.rkt
rename to parser-tools-lib/parser-tools/private-yacc/lr0.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-actions.rkt b/parser-tools-lib/parser-tools/private-yacc/parser-actions.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-actions.rkt
rename to parser-tools-lib/parser-tools/private-yacc/parser-actions.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-builder.rkt b/parser-tools-lib/parser-tools/private-yacc/parser-builder.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/parser-builder.rkt
rename to parser-tools-lib/parser-tools/private-yacc/parser-builder.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/table.rkt b/parser-tools-lib/parser-tools/private-yacc/table.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/table.rkt
rename to parser-tools-lib/parser-tools/private-yacc/table.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/yacc-helper.rkt b/parser-tools-lib/parser-tools/private-yacc/yacc-helper.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-yacc/yacc-helper.rkt
rename to parser-tools-lib/parser-tools/private-yacc/yacc-helper.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc-to-scheme.rkt b/parser-tools-lib/parser-tools/yacc-to-scheme.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc-to-scheme.rkt
rename to parser-tools-lib/parser-tools/yacc-to-scheme.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc.rkt b/parser-tools-lib/parser-tools/yacc.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/yacc.rkt
rename to parser-tools-lib/parser-tools/yacc.rkt
diff --git a/pkgs/parser-tools-pkgs/parser-tools/LICENSE.txt b/parser-tools/LICENSE.txt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools/LICENSE.txt
rename to parser-tools/LICENSE.txt
diff --git a/pkgs/parser-tools-pkgs/parser-tools/info.rkt b/parser-tools/info.rkt
similarity index 100%
rename from pkgs/parser-tools-pkgs/parser-tools/info.rkt
rename to parser-tools/info.rkt