diff --git a/bootstrapped-primitives.rkt b/bootstrapped-primitives.rkt
index 8a75307..700b512 100644
--- a/bootstrapped-primitives.rkt
+++ b/bootstrapped-primitives.rkt
@@ -4,7 +4,6 @@
          "il-structs.rkt"
          "compiler.rkt"
          "compiler-structs.rkt"
-         "parser/typed-parse.rkt"
          "where-is-collects.rkt")
 
 (require/typed "parameters.rkt"
@@ -12,6 +11,9 @@
 (require/typed "parser/parse-bytecode.rkt"
                (parse-bytecode (Path -> Expression)))
 
+(require/typed "parser/baby-parser.rkt"
+               [parse (Any -> Expression)])
+
 
 
 (provide get-bootstrapping-code)
diff --git a/parser/parse.rkt b/parser/baby-parser.rkt
similarity index 99%
rename from parser/parse.rkt
rename to parser/baby-parser.rkt
index c9c3ff5..2c7b36f 100644
--- a/parser/parse.rkt
+++ b/parser/baby-parser.rkt
@@ -5,7 +5,7 @@
          "../lexical-structs.rkt"
          "../helpers.rkt"
          "../parameters.rkt"
-         "../lam-entry-gensym.rkt"
+         "lam-entry-gensym.rkt"
          racket/list)
 
 (provide (rename-out (-parse parse)))
diff --git a/lam-entry-gensym.rkt b/parser/lam-entry-gensym.rkt
similarity index 100%
rename from lam-entry-gensym.rkt
rename to parser/lam-entry-gensym.rkt
diff --git a/parser/parse-bytecode-5.1.1.rkt b/parser/parse-bytecode-5.1.1.rkt
index 3d27d2b..ffb173d 100644
--- a/parser/parse-bytecode-5.1.1.rkt
+++ b/parser/parse-bytecode-5.1.1.rkt
@@ -1,19 +1,16 @@
 #lang racket/base
 
-(require "../expression-structs.rkt"
+;; Parsing Racket 5.1.1 bytecode structures into our own structures.
+(require "typed-module-path.rkt"
+         "lam-entry-gensym.rkt"
+         "../expression-structs.rkt"
          "../lexical-structs.rkt"
-         "../typed-module-path.rkt"
          "../path-rewriter.rkt"
          "../parameters.rkt"
-         "../lam-entry-gensym.rkt"
          "../get-module-bytecode.rkt"
+         syntax/modresolve
+         compiler/zo-parse
          racket/path
-         syntax/modresolve)
-
-
-;; Parsing Racket 5.1.1 bytecode structures into our own structures.
-
-(require compiler/zo-parse
          racket/match
          racket/list)
 
diff --git a/typed-module-path.rkt b/parser/typed-module-path.rkt
similarity index 100%
rename from typed-module-path.rkt
rename to parser/typed-module-path.rkt
diff --git a/parser/typed-parse.rkt b/parser/typed-parse.rkt
deleted file mode 100644
index 3167f5f..0000000
--- a/parser/typed-parse.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang typed/racket/base
-(require "../expression-structs.rkt")
-
-(require/typed "parse.rkt"
-               [parse (Any -> Expression)])
-
-(provide parse)
\ No newline at end of file
diff --git a/tests/test-parse.rkt b/tests/test-parse.rkt
index 66719dd..de996f3 100644
--- a/tests/test-parse.rkt
+++ b/tests/test-parse.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require "../parser/parse.rkt"
+(require "../parser/baby-parser.rkt"
          "../lexical-structs.rkt"
          "../expression-structs.rkt"
          "../lam-entry-gensym.rkt"