diff --git a/yaragg-lib/yaragg/codegen/expander.rkt b/yaragg-lib/yaragg/codegen/expander.rkt
index 6eb156d..db84c7d 100755
--- a/yaragg-lib/yaragg/codegen/expander.rkt
+++ b/yaragg-lib/yaragg/codegen/expander.rkt
@@ -4,8 +4,8 @@
                      yaragg/codegen/codegen
                      yaragg/codegen/runtime
                      yaragg/codegen/flatten)
-         yaragg-parser-tools/lex
-         yaragg-parser-tools/cfg-parser
+         yaragg/parser-tools/lex
+         yaragg/parser-tools/cfg-parser
          (prefix-in bs: yaragg/support)
          racket/set)
 
diff --git a/yaragg-lib/yaragg/codegen/runtime.rkt b/yaragg-lib/yaragg/codegen/runtime.rkt
index e7e4b19..aaa95e9 100755
--- a/yaragg-lib/yaragg/codegen/runtime.rkt
+++ b/yaragg-lib/yaragg/codegen/runtime.rkt
@@ -2,7 +2,7 @@
 (require racket/match 
          racket/list
          racket/generator
-         (prefix-in lex: yaragg-parser-tools/lex) 
+         (prefix-in lex: yaragg/parser-tools/lex) 
          yaragg/support
          yaragg/private/internal-support)
 
diff --git a/yaragg-lib/yaragg/examples/simple-line-drawing/lexer.rkt b/yaragg-lib/yaragg/examples/simple-line-drawing/lexer.rkt
index 02d3e43..954aa5e 100755
--- a/yaragg-lib/yaragg/examples/simple-line-drawing/lexer.rkt
+++ b/yaragg-lib/yaragg/examples/simple-line-drawing/lexer.rkt
@@ -4,7 +4,7 @@
 
 ;; A simple lexer for simple-line-drawing.
 (require yaragg/support
-         yaragg-parser-tools/lex)
+         yaragg/parser-tools/lex)
 
 (define (tokenize ip)
   (port-count-lines! ip)
diff --git a/yaragg-lib/yaragg/rules/lexer.rkt b/yaragg-lib/yaragg/rules/lexer.rkt
index 1bdd590..1efe66c 100755
--- a/yaragg-lib/yaragg/rules/lexer.rkt
+++ b/yaragg-lib/yaragg/rules/lexer.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require (for-syntax racket/base yaragg/rules/parser))
-(require yaragg-parser-tools/lex
-         (prefix-in : yaragg-parser-tools/lex-sre)
+(require yaragg/parser-tools/lex
+         (prefix-in : yaragg/parser-tools/lex-sre)
          yaragg/rules/parser
          yaragg/rules/rule-structs
          (only-in yaragg/support from/to)
@@ -163,7 +163,7 @@
     (values "" end-pos)]))
 
 ;; position->pos: position -> pos
-;; Converts position structures from yaragg-parser-tools/lex to our own pos structures.
+;; Converts position structures from yaragg/parser-tools/lex to our own pos structures.
 (define (position->pos a-pos)
   (pos (position-offset a-pos)
        (position-line a-pos)
diff --git a/yaragg-lib/yaragg/rules/parser.rkt b/yaragg-lib/yaragg/rules/parser.rkt
index 46b8345..4e8f6c8 100755
--- a/yaragg-lib/yaragg/rules/parser.rkt
+++ b/yaragg-lib/yaragg/rules/parser.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
-(require yaragg-parser-tools/yacc
-         yaragg-parser-tools/lex
+(require yaragg/parser-tools/yacc
+         yaragg/parser-tools/lex
          racket/list
          racket/match
          yaragg/rules/rule-structs)
@@ -265,7 +265,7 @@
 
 
 ;; position->pos: position -> pos
-;; Coerses position structures from yaragg-parser-tools/lex to our own pos structures.
+;; Coerses position structures from yaragg/parser-tools/lex to our own pos structures.
 (define (position->pos a-pos)
   (pos (position-offset a-pos)
        (position-line a-pos)
diff --git a/yaragg-lib/yaragg/rules/rule-structs.rkt b/yaragg-lib/yaragg/rules/rule-structs.rkt
index c5d1ed9..ce5c8a1 100755
--- a/yaragg-lib/yaragg/rules/rule-structs.rkt
+++ b/yaragg-lib/yaragg/rules/rule-structs.rkt
@@ -2,7 +2,7 @@
 (provide (all-defined-out))
 
 
-;; We keep our own position structure because yaragg-parser-tools/lex's position
+;; We keep our own position structure because yaragg/parser-tools/lex's position
 ;; structure is non-transparent, hence highly resistant to unit testing.
 (struct pos (offset line col)
         #:transparent)
diff --git a/yaragg-lib/yaragg/rules/stx.rkt b/yaragg-lib/yaragg/rules/stx.rkt
index ebaef81..1e4e4eb 100755
--- a/yaragg-lib/yaragg/rules/stx.rkt
+++ b/yaragg-lib/yaragg/rules/stx.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require yaragg/rules/rule-structs
-         yaragg-parser-tools/lex
+         yaragg/parser-tools/lex
          racket/match
          syntax/strip-context)
 
diff --git a/yaragg-lib/yaragg/support.rkt b/yaragg-lib/yaragg/support.rkt
index 5a7f867..440006e 100755
--- a/yaragg-lib/yaragg/support.rkt
+++ b/yaragg-lib/yaragg/support.rkt
@@ -1,11 +1,11 @@
 #lang racket/base
-(require yaragg-parser-tools/lex
+(require yaragg/parser-tools/lex
          racket/string
          racket/struct
-         (prefix-in : yaragg-parser-tools/lex-sre)
+         (prefix-in : yaragg/parser-tools/lex-sre)
          (for-syntax racket/base))
-(provide (all-from-out yaragg-parser-tools/lex)
-         (all-from-out yaragg-parser-tools/lex-sre)
+(provide (all-from-out yaragg/parser-tools/lex)
+         (all-from-out yaragg/parser-tools/lex-sre)
          [struct-out token-struct]
          token
          [struct-out exn:fail:parsing])
diff --git a/yaragg-lib/yaragg/test/test-lexer.rkt b/yaragg-lib/yaragg/test/test-lexer.rkt
index c0f9f25..c6d37ee 100755
--- a/yaragg-lib/yaragg/test/test-lexer.rkt
+++ b/yaragg-lib/yaragg/test/test-lexer.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require yaragg/rules/lexer
          rackunit
-         yaragg-parser-tools/lex)
+         yaragg/parser-tools/lex)
 
 (define (l s)
   (define t (lex/1 (open-input-string s)))
diff --git a/yaragg-lib/yaragg/test/test-old-token.rkt b/yaragg-lib/yaragg/test/test-old-token.rkt
index 8f01876..123fedd 100755
--- a/yaragg-lib/yaragg/test/test-old-token.rkt
+++ b/yaragg-lib/yaragg/test/test-old-token.rkt
@@ -5,8 +5,8 @@
 (require yaragg/examples/simple-line-drawing
          yaragg/support
          racket/list
-         yaragg-parser-tools/lex
-         (prefix-in : yaragg-parser-tools/lex-sre)
+         yaragg/parser-tools/lex
+         (prefix-in : yaragg/parser-tools/lex-sre)
          rackunit)
 
 (define-tokens tokens (INTEGER STRING |;| EOF))
@@ -72,5 +72,5 @@ EOF
 ;; FIXME: add tests to make sure location is as we expect.
 ;;
 ;; FIXME: handle the EOF issue better.  Something in cfg-parser
-;; appears to deviate from yaragg-parser-tools/yacc with regards to the stop
+;; appears to deviate from yaragg/parser-tools/yacc with regards to the stop
 ;; token.
diff --git a/yaragg-lib/yaragg/test/test-parser.rkt b/yaragg-lib/yaragg/test/test-parser.rkt
index 3d6b750..cb02b0f 100755
--- a/yaragg-lib/yaragg/test/test-parser.rkt
+++ b/yaragg-lib/yaragg/test/test-parser.rkt
@@ -2,7 +2,7 @@
 
 
 (require rackunit
-         yaragg-parser-tools/lex
+         yaragg/parser-tools/lex
          yaragg/rules/parser
          yaragg/rules/lexer
          yaragg/rules/rule-structs)
diff --git a/yaragg-lib/yaragg/test/test-simple-arithmetic-grammar.rkt b/yaragg-lib/yaragg/test/test-simple-arithmetic-grammar.rkt
index 2f14be4..f5b7444 100755
--- a/yaragg-lib/yaragg/test/test-simple-arithmetic-grammar.rkt
+++ b/yaragg-lib/yaragg/test/test-simple-arithmetic-grammar.rkt
@@ -2,7 +2,7 @@
 (require yaragg/examples/simple-arithmetic-grammar
          yaragg/support
          racket/set
-         yaragg-parser-tools/lex
+         yaragg/parser-tools/lex
          racket/list
          rackunit)
 
diff --git a/yaragg-lib/yaragg/test/test-simple-line-drawing.rkt b/yaragg-lib/yaragg/test/test-simple-line-drawing.rkt
index 1f592ef..e9b3a98 100755
--- a/yaragg-lib/yaragg/test/test-simple-line-drawing.rkt
+++ b/yaragg-lib/yaragg/test/test-simple-line-drawing.rkt
@@ -3,8 +3,8 @@
 (require yaragg/examples/simple-line-drawing
          yaragg/support
          racket/list
-         yaragg-parser-tools/lex
-         (prefix-in : yaragg-parser-tools/lex-sre)
+         yaragg/parser-tools/lex
+         (prefix-in : yaragg/parser-tools/lex-sre)
          rackunit)
 
 (define (make-tokenizer ip)
@@ -68,5 +68,5 @@ EOF
 ;; FIXME: add tests to make sure location is as we expect.
 ;;
 ;; FIXME: handle the EOF issue better.  Something in cfg-parser
-;; appears to deviate from yaragg-parser-tools/yacc with regards to the stop
+;; appears to deviate from yaragg/parser-tools/yacc with regards to the stop
 ;; token.
diff --git a/yaragg-parser-tools-doc/yaragg-parser-tools/info.rkt b/yaragg-parser-tools-doc/yaragg-parser-tools/info.rkt
deleted file mode 100644
index ecaff49..0000000
--- a/yaragg-parser-tools-doc/yaragg-parser-tools/info.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang info
-
-(define scribblings '(("yaragg-parser-tools.scrbl" (multi-page) (parsing-library))))
diff --git a/yaragg-parser-tools-doc/yaragg/parser-tools/info.rkt b/yaragg-parser-tools-doc/yaragg/parser-tools/info.rkt
new file mode 100644
index 0000000..1f0237f
--- /dev/null
+++ b/yaragg-parser-tools-doc/yaragg/parser-tools/info.rkt
@@ -0,0 +1,3 @@
+#lang info
+
+(define scribblings '(("yaragg/parser-tools.scrbl" (multi-page) (parsing-library))))
diff --git a/yaragg-parser-tools-doc/yaragg-parser-tools/yaragg-parser-tools.scrbl b/yaragg-parser-tools-doc/yaragg/parser-tools/yaragg-parser-tools.scrbl
similarity index 96%
rename from yaragg-parser-tools-doc/yaragg-parser-tools/yaragg-parser-tools.scrbl
rename to yaragg-parser-tools-doc/yaragg/parser-tools/yaragg-parser-tools.scrbl
index e624dd0..1beb411 100644
--- a/yaragg-parser-tools-doc/yaragg-parser-tools/yaragg-parser-tools.scrbl
+++ b/yaragg-parser-tools-doc/yaragg/parser-tools/yaragg-parser-tools.scrbl
@@ -2,10 +2,10 @@
 @(require scribble/manual scribble/struct scribble/xref scribble/bnf
           (for-label scheme/base
                      scheme/contract
-                     yaragg-parser-tools/lex
-                     (prefix-in : yaragg-parser-tools/lex-sre)
-                     yaragg-parser-tools/yacc
-                     yaragg-parser-tools/cfg-parser))
+                     yaragg/parser-tools/lex
+                     (prefix-in : yaragg/parser-tools/lex-sre)
+                     yaragg/parser-tools/yacc
+                     yaragg/parser-tools/cfg-parser))
 
 @title{Parser Tools: @exec{lex} and @exec{yacc}-style Parsing (BR edition)}
 
@@ -26,7 +26,7 @@ This documentation assumes familiarity with @exec{lex}- and @exec{yacc}-style le
 @section-index["scanning"]
 @section-index["scanner"]
 
-@defmodule[yaragg-parser-tools/lex]
+@defmodule[yaragg/parser-tools/lex]
 
 @; ----------------------------------------
 
@@ -69,7 +69,7 @@ This documentation assumes familiarity with @exec{lex}- and @exec{yacc}-style le
    @itemize[
     @item{@racket[id] --- expands to the named @deftech{lexer abbreviation};
           abbreviations are defined via @racket[define-lex-abbrev] or supplied by modules
-          like @racketmodname[yaragg-parser-tools/lex-sre].}
+          like @racketmodname[yaragg/parser-tools/lex-sre].}
     @item{@racket[string] --- matches the sequence of characters in @racket[string].}
     @item{@racket[character] --- matches a literal @racket[character].}
     @item{@racket[(repetition lo hi re)] --- matches @racket[re] repeated between @racket[lo]
@@ -94,15 +94,15 @@ empty string, @racket[(union)] matches nothing,
 The regular expression language is not designed to be used directly,
 but rather as a basis for a user-friendly notation written with
 regular expression macros.  For example,
-@racketmodname[yaragg-parser-tools/lex-sre] supplies operators from Olin
-Shivers's SREs, and @racketmodname[yaragg-parser-tools/lex-plt-v200] supplies
+@racketmodname[yaragg/parser-tools/lex-sre] supplies operators from Olin
+Shivers's SREs, and @racketmodname[yaragg/parser-tools/lex-plt-v200] supplies
 (deprecated) operators from the previous version of this library.
 Since those libraries provide operators whose names match other Racket
 bindings, such as @racket[*] and @racket[+], they normally must be
 imported using a prefix:
 
 @racketblock[
-(require (prefix-in : yaragg-parser-tools/lex-sre))
+(require (prefix-in : yaragg/parser-tools/lex-sre))
 ]
 
 The suggested prefix is @racket[:], so that @racket[:*] and
@@ -360,14 +360,14 @@ characters, @racket[char-lower-case?] characters, etc.}
 
 @subsection{Lexer SRE Operators}
 
-@defmodule[yaragg-parser-tools/lex-sre]
+@defmodule[yaragg/parser-tools/lex-sre]
 
 @; Put the docs in a macro, so that we can bound the scope of
 @; the import of `*', etc.:
 @(define-syntax-rule (lex-sre-doc)
    (...
     (begin
-      (require (for-label yaragg-parser-tools/lex-sre))
+      (require (for-label yaragg/parser-tools/lex-sre))
 
 @defform[(* re ...)]{
 
@@ -437,16 +437,16 @@ characters.}
 
 @subsection{Lexer Legacy Operators}
 
-@defmodule[yaragg-parser-tools/lex-plt-v200]
+@defmodule[yaragg/parser-tools/lex-plt-v200]
 
 @(define-syntax-rule (lex-v200-doc)
    (...
     (begin
-      (require (for-label yaragg-parser-tools/lex-plt-v200))
+      (require (for-label yaragg/parser-tools/lex-plt-v200))
 
-@t{The @racketmodname[yaragg-parser-tools/lex-plt-v200] module re-exports
+@t{The @racketmodname[yaragg/parser-tools/lex-plt-v200] module re-exports
    @racket[*], @racket[+], @racket[?], and @racket[&] from
-   @racketmodname[yaragg-parser-tools/lex-sre]. It also re-exports
+   @racketmodname[yaragg/parser-tools/lex-sre]. It also re-exports
    @racket[:or] as @racket[:], @racket[::] as @racket[|@|], @racket[:~]
    as @racket[^], and @racket[:/] as @racket[-].}
 
@@ -467,7 +467,7 @@ The same as @racket[(complement re ...)].})))
 Each @racket[_action-expr] in a @racket[lexer] form can produce any
 kind of value, but for many purposes, producing a @deftech{token}
 value is useful. Tokens are usually necessary for inter-operating with
-a parser generated by @racket[yaragg-parser-tools/parser], but tokens may not
+a parser generated by @racket[yaragg/parser-tools/parser], but tokens may not
 be the right choice when using @racket[lexer] in other situations.
 
 @defform[(define-tokens group-id (token-id ...))]{
@@ -513,7 +513,7 @@ be the right choice when using @racket[lexer] in other situations.
 
 @section-index["yacc"]
 
-@defmodule[yaragg-parser-tools/yacc]
+@defmodule[yaragg/parser-tools/yacc]
 
 @defform/subs[#:literals (grammar tokens start end precs src-pos
                           suppress debug yacc-output prec)
@@ -712,9 +712,9 @@ be the right choice when using @racket[lexer] in other situations.
 
 @section-index["cfg-parser"]
 
-@defmodule[yaragg-parser-tools/cfg-parser]{The @racketmodname[yaragg-parser-tools/cfg-parser]
+@defmodule[yaragg/parser-tools/cfg-parser]{The @racketmodname[yaragg/parser-tools/cfg-parser]
 library provides a parser generator that is an alternative to that of 
-@racketmodname[yaragg-parser-tools/yacc].}
+@racketmodname[yaragg/parser-tools/yacc].}
 
 @defform/subs[#:literals (grammar tokens start end precs src-pos
                           suppress debug yacc-output prec)
@@ -731,7 +731,7 @@ library provides a parser generator that is an alternative to that of
 
     Creates a parser similar to that of @racket[parser].  Unlike @racket[parser],
     @racket[cfg-parser], can consume arbitrary and potentially ambiguous context-free
-    grammars. Its interface is a subset of @racketmodname[yaragg-parser-tools/yacc], with
+    grammars. Its interface is a subset of @racketmodname[yaragg/parser-tools/yacc], with
     the following differences:
                                         
     @itemize[
@@ -751,7 +751,7 @@ library provides a parser generator that is an alternative to that of
 
 @section{Converting @exec{yacc} or @exec{bison} Grammars}
 
-@defmodule[yaragg-parser-tools/yacc-to-scheme]
+@defmodule[yaragg/parser-tools/yacc-to-scheme]
 
 @defproc[(trans [file path-string?]) any/c]{
 
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/cfg-parser.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/cfg-parser.rkt
similarity index 99%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/cfg-parser.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/cfg-parser.rkt
index a0bd2d7..2fa37cc 100755
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/cfg-parser.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/cfg-parser.rkt
@@ -31,12 +31,12 @@
 
 
 
-(require yaragg-parser-tools/yacc
-         yaragg-parser-tools/lex)
+(require yaragg/parser-tools/yacc
+         yaragg/parser-tools/lex)
 
 (require (for-syntax racket/base
                      syntax/boundmap
-                     yaragg-parser-tools/private-lex/token-syntax))
+                     yaragg/parser-tools/private-lex/token-syntax))
 
 (provide cfg-parser)
 
@@ -752,7 +752,7 @@
 
 (module* test racket/base
   (require (submod "..")
-           yaragg-parser-tools/lex
+           yaragg/parser-tools/lex
            racket/block
            rackunit)
 
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/examples/calc.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/examples/calc.rkt
similarity index 95%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/examples/calc.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/examples/calc.rkt
index 7d86837..7ab406f 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/examples/calc.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/examples/calc.rkt
@@ -4,9 +4,9 @@
 
 
 ;; Import the parser and lexer generators.
-(require yaragg-parser-tools/yacc
-         yaragg-parser-tools/lex
-         (prefix-in : yaragg-parser-tools/lex-sre))
+(require yaragg/parser-tools/yacc
+         yaragg/parser-tools/lex
+         (prefix-in : yaragg/parser-tools/lex-sre))
 
 (define-tokens value-tokens (NUM VAR FNCT))
 (define-empty-tokens op-tokens (newline = OP CP + - * / ^ EOF NEG))
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/examples/read.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/examples/read.rkt
similarity index 98%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/examples/read.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/examples/read.rkt
index 992b561..c461a22 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/examples/read.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/examples/read.rkt
@@ -4,9 +4,9 @@
 ;; list of syntax objects, instead of returning one syntax object at a time
   
 (require (for-syntax racket/base)
-         yaragg-parser-tools/lex
-         (prefix-in : yaragg-parser-tools/lex-sre)
-         yaragg-parser-tools/yacc
+         yaragg/parser-tools/lex
+         (prefix-in : yaragg/parser-tools/lex-sre)
+         yaragg/parser-tools/yacc
          syntax/readerr)
   
 (define-tokens data (DATUM))
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/info.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/info.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/info.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/info.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/lex-plt-v200.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/lex-plt-v200.rkt
similarity index 84%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/lex-plt-v200.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/lex-plt-v200.rkt
index 486cc26..1bb0a11 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/lex-plt-v200.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/lex-plt-v200.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require (for-syntax racket/base)
-         yaragg-parser-tools/lex
-         (prefix-in : yaragg-parser-tools/lex-sre))
+         yaragg/parser-tools/lex
+         (prefix-in : yaragg/parser-tools/lex-sre))
   
 (provide epsilon ~
          (rename-out [:* *]
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/lex-sre.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/lex-sre.rkt
similarity index 98%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/lex-sre.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/lex-sre.rkt
index 172c55d..ec3bd6a 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/lex-sre.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/lex-sre.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base)
-         yaragg-parser-tools/lex)
+         yaragg/parser-tools/lex)
     
 (provide (rename-out [sre-* *]
                      [sre-+ +]
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/lex.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/lex.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/lex.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/lex.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/actions.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/actions.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/actions.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/actions.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/deriv.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/deriv.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/deriv.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/deriv.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/error-tests.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/error-tests.rkt
similarity index 99%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/error-tests.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/error-tests.rkt
index a879a08..7e9726c 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/error-tests.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/error-tests.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base)
-         yaragg-parser-tools/lex
+         yaragg/parser-tools/lex
          rackunit)
 
 (define-syntax (catch-syn-error stx)
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/front.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/front.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/front.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/front.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/re.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/re.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/re.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/re.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/stx.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/stx.rkt
similarity index 99%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/stx.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/stx.rkt
index ed01dea..e1f2136 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/stx.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/stx.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require yaragg-parser-tools/private-lex/util syntax/id-table racket/syntax)
+(require yaragg/parser-tools/private-lex/util syntax/id-table racket/syntax)
 (provide parse)
   
 (define (bad-args stx num)
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/token-syntax.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/token-syntax.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/token-syntax.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/token-syntax.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/token.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/token.rkt
similarity index 97%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/token.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/token.rkt
index 8139668..afc22c7 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/token.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/token.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require (for-syntax racket/base yaragg-parser-tools/private-lex/token-syntax))
+(require (for-syntax racket/base yaragg/parser-tools/private-lex/token-syntax))
   
 ;; Defining tokens
   
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/unicode-chars.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/unicode-chars.rkt
similarity index 97%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/unicode-chars.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/unicode-chars.rkt
index 56a6b1a..f10d05e 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/unicode-chars.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/unicode-chars.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/promise yaragg-parser-tools/private-lex/util)
+(require racket/promise yaragg/parser-tools/private-lex/util)
 
 (provide (all-defined-out))
 
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/util.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/util.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-lex/util.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-lex/util.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/grammar.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/grammar.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/grammar.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/grammar.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/graph.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/graph.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/graph.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/graph.rkt
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/input-file-parser.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/input-file-parser.rkt
similarity index 98%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/input-file-parser.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/input-file-parser.rkt
index 40eaeda..8dfb6d7 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/input-file-parser.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/input-file-parser.rkt
@@ -1,7 +1,7 @@
 #lang racket/base  
-(require yaragg-parser-tools/private-yacc/yacc-helper
-         yaragg-parser-tools/private-lex/token-syntax
-         yaragg-parser-tools/private-yacc/grammar
+(require yaragg/parser-tools/private-yacc/yacc-helper
+         yaragg/parser-tools/private-lex/token-syntax
+         yaragg/parser-tools/private-yacc/grammar
          racket/class
          racket/contract
          (for-template racket/base))
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/lalr.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/lalr.rkt
similarity index 99%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/lalr.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/lalr.rkt
index 91a6b6a..25fbdf2 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/lalr.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/lalr.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
-(require yaragg-parser-tools/private-yacc/lr0
-         yaragg-parser-tools/private-yacc/grammar
+(require yaragg/parser-tools/private-yacc/lr0
+         yaragg/parser-tools/private-yacc/grammar
          racket/list
          racket/class)
 
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/lr0.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/lr0.rkt
similarity index 99%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/lr0.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/lr0.rkt
index f6e13a7..a98fa9e 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/lr0.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/lr0.rkt
@@ -1,6 +1,6 @@
 #lang racket/base  
-(require yaragg-parser-tools/private-yacc/grammar
-         yaragg-parser-tools/private-yacc/graph
+(require yaragg/parser-tools/private-yacc/grammar
+         yaragg/parser-tools/private-yacc/graph
          racket/list
          racket/class)
 
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/parser-actions.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/parser-actions.rkt
similarity index 97%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/parser-actions.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/parser-actions.rkt
index 16c7857..37699b9 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/parser-actions.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/parser-actions.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require yaragg-parser-tools/private-yacc/grammar)
+(require yaragg/parser-tools/private-yacc/grammar)
 (provide (except-out (all-defined-out) make-reduce make-reduce*)
          (rename-out [make-reduce* make-reduce]))
 
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/parser-builder.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/parser-builder.rkt
similarity index 96%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/parser-builder.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/parser-builder.rkt
index 95a9aee..a7cf01c 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/parser-builder.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/parser-builder.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
-(require yaragg-parser-tools/private-yacc/input-file-parser
-         yaragg-parser-tools/private-yacc/grammar
-         yaragg-parser-tools/private-yacc/table
+(require yaragg/parser-tools/private-yacc/input-file-parser
+         yaragg/parser-tools/private-yacc/grammar
+         yaragg/parser-tools/private-yacc/table
          racket/class
          racket/contract)
 (require (for-template racket/base))
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/table.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/table.rkt
similarity index 98%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/table.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/table.rkt
index 971cfb4..e096315 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/table.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/table.rkt
@@ -1,8 +1,8 @@
 #lang racket/base
-(require yaragg-parser-tools/private-yacc/grammar
-         yaragg-parser-tools/private-yacc/lr0
-         yaragg-parser-tools/private-yacc/lalr
-         yaragg-parser-tools/private-yacc/parser-actions
+(require yaragg/parser-tools/private-yacc/grammar
+         yaragg/parser-tools/private-yacc/lr0
+         yaragg/parser-tools/private-yacc/lalr
+         yaragg/parser-tools/private-yacc/parser-actions
          racket/contract
          racket/list
          racket/class)
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/yacc-helper.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/yacc-helper.rkt
similarity index 97%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/yacc-helper.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/yacc-helper.rkt
index a101f12..e8c9663 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/private-yacc/yacc-helper.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/private-yacc/yacc-helper.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (prefix-in rl: racket/list)
-         yaragg-parser-tools/private-lex/token-syntax)
+         yaragg/parser-tools/private-lex/token-syntax)
 
 ;; General helper routines
 (provide duplicate-list? remove-duplicates overlap? vector-andmap display-yacc)
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/yacc-to-scheme.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/yacc-to-scheme.rkt
similarity index 97%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/yacc-to-scheme.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/yacc-to-scheme.rkt
index 630b5a6..6fd6480 100644
--- a/yaragg-parser-tools-lib/yaragg-parser-tools/yacc-to-scheme.rkt
+++ b/yaragg-parser-tools-lib/yaragg/parser-tools/yacc-to-scheme.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
-(require yaragg-parser-tools/lex
-         (prefix-in : yaragg-parser-tools/lex-sre)
-         yaragg-parser-tools/yacc
+(require yaragg/parser-tools/lex
+         (prefix-in : yaragg/parser-tools/lex-sre)
+         yaragg/parser-tools/yacc
          syntax/readerr
          racket/list)
 (provide trans)
diff --git a/yaragg-parser-tools-lib/yaragg-parser-tools/yacc.rkt b/yaragg-parser-tools-lib/yaragg/parser-tools/yacc.rkt
similarity index 100%
rename from yaragg-parser-tools-lib/yaragg-parser-tools/yacc.rkt
rename to yaragg-parser-tools-lib/yaragg/parser-tools/yacc.rkt
diff --git a/yaragg/yaragg/yaragg.scrbl b/yaragg/yaragg/yaragg.scrbl
index 587df27..712dcb0 100755
--- a/yaragg/yaragg/yaragg.scrbl
+++ b/yaragg/yaragg/yaragg.scrbl
@@ -5,7 +5,7 @@
           (for-label racket
                      yaragg
                      yaragg/support
-                     (only-in yaragg-parser-tools/lex lexer-src-pos)
+                     (only-in yaragg/parser-tools/lex lexer-src-pos)
                      (only-in syntax/parse syntax-parse ~literal)))
 
 
@@ -264,11 +264,11 @@ A @emph{token} is the smallest meaningful element of a source program. Tokens ca
 
 If possible, we also want to attach source location information to each token. Why? Because this information will be incorporated into the syntax objects produced by @racket[parse].
 
-A parser often works in conjunction with a helper function called a @emph{lexer} that converts the raw code of the source program into tokens. The @racketmodname[yaragg-parser-tools/lex] library can help us write a position-sensitive
+A parser often works in conjunction with a helper function called a @emph{lexer} that converts the raw code of the source program into tokens. The @racketmodname[yaragg/parser-tools/lex] library can help us write a position-sensitive
 tokenizer:
 
 @interaction[#:eval my-eval
-             (require yaragg-parser-tools/lex)
+             (require yaragg/parser-tools/lex)
              (define (tokenize ip)
                (port-count-lines! ip)
                (define my-lexer
@@ -307,7 +307,7 @@ Note also from this lexer example:
  @item{@racket[parse] accepts as input either a sequence of tokens, or a
   function that produces tokens (which @racket[parse] will call repeatedly to get the next token).}
 
- @item{As an alternative to the basic @racket[token] structure, a token can also be an instance of the @racket[position-token] structure (also found in @racketmodname[yaragg-parser-tools/lex]). In that case, the token will try to derive its position from that of the position-token.}
+ @item{As an alternative to the basic @racket[token] structure, a token can also be an instance of the @racket[position-token] structure (also found in @racketmodname[yaragg/parser-tools/lex]). In that case, the token will try to derive its position from that of the position-token.}
 
  @item{@racket[parse] will stop if it gets @racket[void] (or @racket['eof]) as a token.}
 
@@ -939,8 +939,8 @@ bindings. The most important of these is @racket[parse]:
  @item{a string}
  @item{a symbol}
  @item{an instance produced by @racket[token]}
- @item{an instance produced by the token constructors of @racketmodname[yaragg-parser-tools/lex]}
- @item{an instance of @racketmodname[yaragg-parser-tools/lex]'s @racket[position-token] whose 
+ @item{an instance produced by the token constructors of @racketmodname[yaragg/parser-tools/lex]}
+ @item{an instance of @racketmodname[yaragg/parser-tools/lex]'s @racket[position-token] whose 
    @racket[position-token-token] is a @tech{token}.}
  ]
 
@@ -1045,7 +1045,7 @@ The @racketmodname[yaragg/support] module provides functions to interact with
 @tt{brag} programs. The most useful is the @racket[token] function, which
 produces tokens to be parsed.
 
-In addition to the exports shown below, the @racketmodname[yaragg/support] module also provides everything from @racketmodname[yaragg/support], and everything from @racketmodname[yaragg-parser-tools/lex].
+In addition to the exports shown below, the @racketmodname[yaragg/support] module also provides everything from @racketmodname[yaragg/support], and everything from @racketmodname[yaragg/parser-tools/lex].
 
 
 @defproc[(token [type (or/c string? symbol?)]