diff --git a/lang/doclang-raw.rkt b/doclang-raw.rkt
similarity index 100%
rename from lang/doclang-raw.rkt
rename to doclang-raw.rkt
diff --git a/lang/reader.rkt b/lang/reader.rkt
deleted file mode 100644
index c443f35..0000000
--- a/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pollen/lang/reader-base)
-(define+provide-reader-in-mode world:mode-auto)
\ No newline at end of file
diff --git a/main-base.rkt b/main-base.rkt
index 397121f..adbfcf4 100644
--- a/main-base.rkt
+++ b/main-base.rkt
@@ -15,7 +15,7 @@
                [(_ body-exprs (... ...))
                 (syntax-protect 
                  #'(#%module-begin
-                    (module inner pollen/lang/doclang-raw
+                    (module inner pollen/doclang-raw
                       ;; doclang_raw is a version of scribble/doclang with the decoder disabled
                       ;; first three lines are positional arguments for doclang-raw
                       doc-raw ; id of export
diff --git a/main.rkt b/main.rkt
index 0db9baf..a2c66db 100644
--- a/main.rkt
+++ b/main.rkt
@@ -1,3 +1,7 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-module-begin-in-mode world:mode-preproc)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-preproc)
+
+(module reader racket/base
+  (require pollen/reader-base)
+  (define+provide-reader-in-mode world:mode-auto))
\ No newline at end of file
diff --git a/markdown.rkt b/markdown.rkt
index 176b1fa..ed652ef 100644
--- a/markdown.rkt
+++ b/markdown.rkt
@@ -1,3 +1,7 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-module-begin-in-mode world:mode-markdown)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-markdown)
+
+(module reader racket/base
+  (require pollen/reader-base)
+  (define+provide-reader-in-mode world:mode-markdown))
\ No newline at end of file
diff --git a/markdown/lang/reader.rkt b/markdown/lang/reader.rkt
deleted file mode 100644
index ddd711d..0000000
--- a/markdown/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pollen/lang/reader-base)
-(define+provide-reader-in-mode world:mode-markdown)
\ No newline at end of file
diff --git a/markup.rkt b/markup.rkt
index 6d4fee4..9e29ee0 100644
--- a/markup.rkt
+++ b/markup.rkt
@@ -1,3 +1,7 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-module-begin-in-mode world:mode-markup)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-markup)
+
+(module reader racket/base
+  (require pollen/reader-base)
+  (define+provide-reader-in-mode world:mode-markup))
\ No newline at end of file
diff --git a/markup/lang/reader.rkt b/markup/lang/reader.rkt
deleted file mode 100644
index 7f6545f..0000000
--- a/markup/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pollen/lang/reader-base)
-(define+provide-reader-in-mode world:mode-markup)
\ No newline at end of file
diff --git a/pagetree/lang/reader.rkt b/pagetree/lang/reader.rkt
deleted file mode 100644
index 222b526..0000000
--- a/pagetree/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pollen/lang/reader-base)
-(define+provide-reader-in-mode world:mode-pagetree)
\ No newline at end of file
diff --git a/pre.rkt b/pre.rkt
index 0db9baf..4d79def 100644
--- a/pre.rkt
+++ b/pre.rkt
@@ -1,3 +1,7 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-module-begin-in-mode world:mode-preproc)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-preproc)
+
+(module reader racket/base
+  (require pollen/reader-base)
+  (define+provide-reader-in-mode world:mode-preproc))
\ No newline at end of file
diff --git a/pre/lang/reader.rkt b/pre/lang/reader.rkt
deleted file mode 100644
index 07d4ced..0000000
--- a/pre/lang/reader.rkt
+++ /dev/null
@@ -1,3 +0,0 @@
-#lang racket/base
-(require pollen/lang/reader-base)
-(define+provide-reader-in-mode world:mode-preproc)
\ No newline at end of file
diff --git a/ptree.rkt b/ptree.rkt
index 6c03437..aa5be30 100644
--- a/ptree.rkt
+++ b/ptree.rkt
@@ -1,3 +1,7 @@
 #lang racket/base
 (require pollen/main-base)
-(define+provide-module-begin-in-mode world:mode-pagetree)
\ No newline at end of file
+(define+provide-module-begin-in-mode world:mode-pagetree)
+
+(module reader racket/base
+  (require pollen/reader-base)
+  (define+provide-reader-in-mode world:mode-pagetree))
\ No newline at end of file
diff --git a/lang/reader-base.rkt b/reader-base.rkt
similarity index 100%
rename from lang/reader-base.rkt
rename to reader-base.rkt
diff --git a/render.rkt b/render.rkt
index 13cf267..ce3e74d 100644
--- a/render.rkt
+++ b/render.rkt
@@ -226,7 +226,7 @@
            pollen/decode
            pollen/file
            pollen/main
-           pollen/lang/reader-base
+           pollen/reader-base
            pollen/pagetree
            pollen/template
            pollen/world
@@ -261,7 +261,7 @@
                 pollen/decode
                 pollen/file           
                 pollen/main
-                pollen/lang/reader-base
+                pollen/reader-base
                 pollen/pagetree
                 pollen/project-requires
                 pollen/template