diff --git a/bootstrapped-primitives.rkt b/bootstrapped-primitives.rkt
index 40df432..8a75307 100644
--- a/bootstrapped-primitives.rkt
+++ b/bootstrapped-primitives.rkt
@@ -4,12 +4,12 @@
          "il-structs.rkt"
          "compiler.rkt"
          "compiler-structs.rkt"
-         "typed-parse.rkt"
+         "parser/typed-parse.rkt"
          "where-is-collects.rkt")
 
 (require/typed "parameters.rkt"
                (current-defined-name (Parameterof (U Symbol LamPositionalName))))
-(require/typed "parse-bytecode.rkt"
+(require/typed "parser/parse-bytecode.rkt"
                (parse-bytecode (Path -> Expression)))
 
 
diff --git a/make.rkt b/make.rkt
index 4c95f25..ce35cba 100644
--- a/make.rkt
+++ b/make.rkt
@@ -14,7 +14,7 @@
          racket/match)
 
 
-(require/typed "parse-bytecode.rkt"
+(require/typed "parser/parse-bytecode.rkt"
                [parse-bytecode (Any -> Expression)])
 
 (require/typed "get-module-bytecode.rkt"
diff --git a/parse-bytecode-5.1.1.rkt b/parser/parse-bytecode-5.1.1.rkt
similarity index 98%
rename from parse-bytecode-5.1.1.rkt
rename to parser/parse-bytecode-5.1.1.rkt
index 5db62fb..3d27d2b 100644
--- a/parse-bytecode-5.1.1.rkt
+++ b/parser/parse-bytecode-5.1.1.rkt
@@ -1,12 +1,12 @@
 #lang racket/base
 
-(require "expression-structs.rkt"
-         "lexical-structs.rkt"
-         "typed-module-path.rkt"
-         "path-rewriter.rkt"
-         "parameters.rkt"
-         "lam-entry-gensym.rkt"
-         "get-module-bytecode.rkt"
+(require "../expression-structs.rkt"
+         "../lexical-structs.rkt"
+         "../typed-module-path.rkt"
+         "../path-rewriter.rkt"
+         "../parameters.rkt"
+         "../lam-entry-gensym.rkt"
+         "../get-module-bytecode.rkt"
          racket/path
          syntax/modresolve)
 
diff --git a/parse-bytecode.rkt b/parser/parse-bytecode.rkt
similarity index 86%
rename from parse-bytecode.rkt
rename to parser/parse-bytecode.rkt
index 9857c37..7051e41 100644
--- a/parse-bytecode.rkt
+++ b/parser/parse-bytecode.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
-(require "version-case/version-case.rkt"
+(require "../version-case/version-case.rkt"
          racket/file
-         (prefix-in whalesong: "version.rkt")
+         (prefix-in whalesong: "../version.rkt")
          (for-syntax racket/base))
 
 (version-case
diff --git a/parse.rkt b/parser/parse.rkt
similarity index 99%
rename from parse.rkt
rename to parser/parse.rkt
index 903d591..c9c3ff5 100644
--- a/parse.rkt
+++ b/parser/parse.rkt
@@ -1,11 +1,11 @@
 #lang racket/base
 
-(require "expression-structs.rkt"
-         "lexical-env.rkt"
-         "lexical-structs.rkt"
-         "helpers.rkt"
-         "parameters.rkt"
-         "lam-entry-gensym.rkt"
+(require "../expression-structs.rkt"
+         "../lexical-env.rkt"
+         "../lexical-structs.rkt"
+         "../helpers.rkt"
+         "../parameters.rkt"
+         "../lam-entry-gensym.rkt"
          racket/list)
 
 (provide (rename-out (-parse parse)))
diff --git a/typed-parse.rkt b/parser/typed-parse.rkt
similarity index 64%
rename from typed-parse.rkt
rename to parser/typed-parse.rkt
index 6619c53..3167f5f 100644
--- a/typed-parse.rkt
+++ b/parser/typed-parse.rkt
@@ -1,5 +1,6 @@
 #lang typed/racket/base
-(require "expression-structs.rkt")
+(require "../expression-structs.rkt")
+
 (require/typed "parse.rkt"
                [parse (Any -> Expression)])
 
diff --git a/tests/test-get-dependencies.rkt b/tests/test-get-dependencies.rkt
index 6ace602..e2a328e 100644
--- a/tests/test-get-dependencies.rkt
+++ b/tests/test-get-dependencies.rkt
@@ -1,7 +1,7 @@
 #lang racket
 (require "../get-dependencies.rkt"
          "../get-module-bytecode.rkt"
-         "../parse-bytecode.rkt"
+         "../parser/parse-bytecode.rkt"
          "../lexical-structs.rkt"
          racket/path
          racket/runtime-path
diff --git a/tests/test-helpers.rkt b/tests/test-helpers.rkt
index 80240c0..2bd83e2 100644
--- a/tests/test-helpers.rkt
+++ b/tests/test-helpers.rkt
@@ -4,7 +4,7 @@
          racket/runtime-path
          "../compiler-structs.rkt"
          "../compiler.rkt"
-         "../parse-bytecode.rkt"
+         "../parser/parse-bytecode.rkt"
          "../get-module-bytecode.rkt"
          "../language-namespace.rkt")
 
diff --git a/tests/test-parse-bytecode-on-collects.rkt b/tests/test-parse-bytecode-on-collects.rkt
index 496a21a..f0a1207 100644
--- a/tests/test-parse-bytecode-on-collects.rkt
+++ b/tests/test-parse-bytecode-on-collects.rkt
@@ -6,7 +6,7 @@
 ;; collects/tests/matrix-test.rkt.  I'm seeing the following:
 ;; read-syntax: cannot load snip-class reader
 
-(require "../parse-bytecode.rkt"
+(require "../parser/parse-bytecode.rkt"
          racket/list
          racket/path)
 
diff --git a/tests/test-parse-bytecode.rkt b/tests/test-parse-bytecode.rkt
index b7b7e55..0f06c2b 100644
--- a/tests/test-parse-bytecode.rkt
+++ b/tests/test-parse-bytecode.rkt
@@ -5,7 +5,7 @@
          racket/match
          racket/path
          "../parameters.rkt"
-         "../parse-bytecode.rkt"
+         "../parser/parse-bytecode.rkt"
          "../lexical-structs.rkt"
          "../expression-structs.rkt"
          racket/runtime-path
diff --git a/tests/test-parse.rkt b/tests/test-parse.rkt
index 95496db..66719dd 100644
--- a/tests/test-parse.rkt
+++ b/tests/test-parse.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require "../parse.rkt"
+(require "../parser/parse.rkt"
          "../lexical-structs.rkt"
          "../expression-structs.rkt"
          "../lam-entry-gensym.rkt"