diff --git a/main-base.rkt b/main-base.rkt
index 0bdb9b2..bf43939 100644
--- a/main-base.rkt
+++ b/main-base.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
-(require (for-syntax racket/base racket/syntax) "world.rkt")
+(require (for-syntax racket/base racket/syntax) pollen/world)
 
-(provide (all-defined-out) (all-from-out "world.rkt"))
+(provide (all-defined-out) (all-from-out pollen/world))
 
 (define-syntax (make-new-module-begin stx)
   (syntax-case stx ()
diff --git a/main.rkt b/main.rkt
index 7a22dde..16c12ee 100644
--- a/main.rkt
+++ b/main.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base))
-(require "main-base.rkt")
+(require pollen/main-base)
 
 (provide (except-out (all-from-out racket/base) #%module-begin)
          (rename-out [new-module-begin #%module-begin]))
diff --git a/markdown.rkt b/markdown.rkt
index a16dbdf..918d01b 100644
--- a/markdown.rkt
+++ b/markdown.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base))
-(require "main-base.rkt")
+(require pollen/main-base)
 
 (provide (except-out (all-from-out racket/base) #%module-begin)
          (rename-out [new-module-begin #%module-begin]))
diff --git a/markup.rkt b/markup.rkt
index 860ca27..7de633e 100644
--- a/markup.rkt
+++ b/markup.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base))
-(require "main-base.rkt")
+(require pollen/main-base)
 
 (provide (except-out (all-from-out racket/base) #%module-begin)
          (rename-out [new-module-begin #%module-begin]))
diff --git a/pre.rkt b/pre.rkt
index 7a22dde..16c12ee 100644
--- a/pre.rkt
+++ b/pre.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base))
-(require "main-base.rkt")
+(require pollen/main-base)
 
 (provide (except-out (all-from-out racket/base) #%module-begin)
          (rename-out [new-module-begin #%module-begin]))
diff --git a/ptree.rkt b/ptree.rkt
index f88cff5..814df8b 100644
--- a/ptree.rkt
+++ b/ptree.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base))
-(require "main-base.rkt")
+(require pollen/main-base)
 
 (provide (except-out (all-from-out racket/base) #%module-begin)
          (rename-out [new-module-begin #%module-begin]))
diff --git a/render.rkt b/render.rkt
index 9fe19f2..13cf267 100644
--- a/render.rkt
+++ b/render.rkt
@@ -52,8 +52,8 @@
 (define/contract+provide (render-pagetree pagetree-or-path)
   ((or/c pagetree? pathish?) . -> . void?)
   (define pagetree (if (pagetree? pagetree-or-path)
-                    pagetree-or-path
-                    (cached-require pagetree-or-path world:main-pollen-export)))
+                       pagetree-or-path
+                       (cached-require pagetree-or-path world:main-pollen-export)))
   (apply render-batch (pagetree->list pagetree)))
 
 
@@ -220,17 +220,19 @@
            racket/contract 
            racket/list
            racket/match
+           racket/syntax
+           pollen/cache
            pollen/debug
            pollen/decode
            pollen/file
            pollen/main
+           pollen/lang/reader-base
            pollen/pagetree
-           pollen/cache
-           sugar
-           txexpr
            pollen/template
            pollen/world
-           pollen/project-requires)
+           pollen/project-requires
+           sugar
+           txexpr)
   (define-namespace-anchor my-module-cache-ns-anchor)
   (provide my-module-cache-ns-anchor))
 
@@ -253,14 +255,17 @@
                 racket/contract 
                 racket/list
                 racket/match
+                racket/syntax
                 pollen/debug
+                pollen/cache
                 pollen/decode
-                pollen/file
+                pollen/file           
+                pollen/main
+                pollen/lang/reader-base
                 pollen/pagetree
-                pollen/cache
-                sugar
-                txexpr
+                pollen/project-requires
                 pollen/template
                 pollen/world
-                pollen/project-requires))   
+                sugar
+                txexpr))   
     (string->bytes/utf-8 (eval expr-to-eval (current-namespace)))))
\ No newline at end of file