diff --git a/lens/applicable.rkt b/lens/applicable.rkt
index bcd4bca..5e4a41a 100644
--- a/lens/applicable.rkt
+++ b/lens/applicable.rkt
@@ -3,7 +3,7 @@
 (provide (all-from-out "main.rkt"))
 
 (require "main.rkt"
-         (only-in "base/base.rkt" use-applicable-lenses!))
+         (only-in "private/base/base.rkt" use-applicable-lenses!))
 
 (module+ test
   (require rackunit))
diff --git a/lens/applicable.scrbl b/lens/applicable.scrbl
index 19bf516..c9245e3 100644
--- a/lens/applicable.scrbl
+++ b/lens/applicable.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "doc-util/main.rkt")
+@(require "private/doc-util/main.rkt")
 
 
 @title{Applicable lenses}
diff --git a/lens/main.rkt b/lens/main.rkt
index c70847d..ee68c5e 100644
--- a/lens/main.rkt
+++ b/lens/main.rkt
@@ -1,30 +1,7 @@
 #lang sweet-exp racket/base
 
-require
-  "base/main.rkt"
-  "compound/main.rkt"
-  "dict.rkt"
-  "hash/main.rkt"
-  "list/main.rkt"
-  "stream.rkt"
-  "string.rkt"
-  "struct/main.rkt"
-  "vector/main.rkt"
+require "private/main.rkt"
 
 provide
-  except-out
-    all-from-out
-      "base/main.rkt"
-      "compound/main.rkt"
-      "dict.rkt"
-      "hash/main.rkt"
-      "list/main.rkt"
-      "stream.rkt"
-      "string.rkt"
-      "struct/main.rkt"
-      "vector/main.rkt"
-    gen:lens
-    focus-lens
-    drop-lens
-    take-lens
-    use-applicable-lenses!
+  all-from-out
+    "private/main.rkt"
diff --git a/lens/main.scrbl b/lens/main.scrbl
index b26241a..3a39180 100644
--- a/lens/main.scrbl
+++ b/lens/main.scrbl
@@ -16,13 +16,13 @@ source code: @url["https://github.com/jackfirth/lens"]
 
 @local-table-of-contents[]
 
-@include-section["base/main.scrbl"]
-@include-section["compound/main.scrbl"]
-@include-section["list/main.scrbl"]
-@include-section["hash/main.scrbl"]
-@include-section["struct/main.scrbl"]
-@include-section["vector/main.scrbl"]
-@include-section["string.scrbl"]
-@include-section["stream.scrbl"]
-@include-section["dict.scrbl"]
+@include-section["private/base/main.scrbl"]
+@include-section["private/compound/main.scrbl"]
+@include-section["private/list/main.scrbl"]
+@include-section["private/hash/main.scrbl"]
+@include-section["private/struct/main.scrbl"]
+@include-section["private/vector/main.scrbl"]
+@include-section["private/string.scrbl"]
+@include-section["private/stream.scrbl"]
+@include-section["private/dict.scrbl"]
 @include-section["applicable.scrbl"]
diff --git a/lens/base/base.rkt b/lens/private/base/base.rkt
similarity index 100%
rename from lens/base/base.rkt
rename to lens/private/base/base.rkt
diff --git a/lens/base/base.scrbl b/lens/private/base/base.scrbl
similarity index 100%
rename from lens/base/base.scrbl
rename to lens/private/base/base.scrbl
diff --git a/lens/base/contract.rkt b/lens/private/base/contract.rkt
similarity index 100%
rename from lens/base/contract.rkt
rename to lens/private/base/contract.rkt
diff --git a/lens/base/contract.scrbl b/lens/private/base/contract.scrbl
similarity index 94%
rename from lens/base/contract.scrbl
rename to lens/private/base/contract.scrbl
index 2cd367f..584cd45 100644
--- a/lens/base/contract.scrbl
+++ b/lens/private/base/contract.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require "../doc-util/main.rkt")
 
 @title{Lens Contracts}
 
diff --git a/lens/base/gen-lens.rkt b/lens/private/base/gen-lens.rkt
similarity index 100%
rename from lens/base/gen-lens.rkt
rename to lens/private/base/gen-lens.rkt
diff --git a/lens/base/laws.scrbl b/lens/private/base/laws.scrbl
similarity index 100%
rename from lens/base/laws.scrbl
rename to lens/private/base/laws.scrbl
diff --git a/lens/base/main.rkt b/lens/private/base/main.rkt
similarity index 100%
rename from lens/base/main.rkt
rename to lens/private/base/main.rkt
diff --git a/lens/base/main.scrbl b/lens/private/base/main.scrbl
similarity index 100%
rename from lens/base/main.scrbl
rename to lens/private/base/main.scrbl
diff --git a/lens/base/make-lens.rkt b/lens/private/base/make-lens.rkt
similarity index 100%
rename from lens/base/make-lens.rkt
rename to lens/private/base/make-lens.rkt
diff --git a/lens/base/transform.rkt b/lens/private/base/transform.rkt
similarity index 100%
rename from lens/base/transform.rkt
rename to lens/private/base/transform.rkt
diff --git a/lens/base/transform.scrbl b/lens/private/base/transform.scrbl
similarity index 100%
rename from lens/base/transform.scrbl
rename to lens/private/base/transform.scrbl
diff --git a/lens/base/view-set.rkt b/lens/private/base/view-set.rkt
similarity index 100%
rename from lens/base/view-set.rkt
rename to lens/private/base/view-set.rkt
diff --git a/lens/base/view-set.scrbl b/lens/private/base/view-set.scrbl
similarity index 100%
rename from lens/base/view-set.scrbl
rename to lens/private/base/view-set.scrbl
diff --git a/lens/compound/compose.rkt b/lens/private/compound/compose.rkt
similarity index 100%
rename from lens/compound/compose.rkt
rename to lens/private/compound/compose.rkt
diff --git a/lens/compound/compose.scrbl b/lens/private/compound/compose.scrbl
similarity index 100%
rename from lens/compound/compose.scrbl
rename to lens/private/compound/compose.scrbl
diff --git a/lens/compound/identity.rkt b/lens/private/compound/identity.rkt
similarity index 100%
rename from lens/compound/identity.rkt
rename to lens/private/compound/identity.rkt
diff --git a/lens/compound/join-hash.rkt b/lens/private/compound/join-hash.rkt
similarity index 100%
rename from lens/compound/join-hash.rkt
rename to lens/private/compound/join-hash.rkt
diff --git a/lens/compound/join-hash.scrbl b/lens/private/compound/join-hash.scrbl
similarity index 100%
rename from lens/compound/join-hash.scrbl
rename to lens/private/compound/join-hash.scrbl
diff --git a/lens/compound/join-list.rkt b/lens/private/compound/join-list.rkt
similarity index 100%
rename from lens/compound/join-list.rkt
rename to lens/private/compound/join-list.rkt
diff --git a/lens/compound/join-list.scrbl b/lens/private/compound/join-list.scrbl
similarity index 100%
rename from lens/compound/join-list.scrbl
rename to lens/private/compound/join-list.scrbl
diff --git a/lens/compound/join-string.rkt b/lens/private/compound/join-string.rkt
similarity index 100%
rename from lens/compound/join-string.rkt
rename to lens/private/compound/join-string.rkt
diff --git a/lens/compound/join-string.scrbl b/lens/private/compound/join-string.scrbl
similarity index 100%
rename from lens/compound/join-string.scrbl
rename to lens/private/compound/join-string.scrbl
diff --git a/lens/compound/join-vector.rkt b/lens/private/compound/join-vector.rkt
similarity index 100%
rename from lens/compound/join-vector.rkt
rename to lens/private/compound/join-vector.rkt
diff --git a/lens/compound/join-vector.scrbl b/lens/private/compound/join-vector.scrbl
similarity index 100%
rename from lens/compound/join-vector.scrbl
rename to lens/private/compound/join-vector.scrbl
diff --git a/lens/compound/main.rkt b/lens/private/compound/main.rkt
similarity index 94%
rename from lens/compound/main.rkt
rename to lens/private/compound/main.rkt
index 5b115b3..ba9703c 100644
--- a/lens/compound/main.rkt
+++ b/lens/private/compound/main.rkt
@@ -12,6 +12,7 @@ require
 provide
   all-from-out
     "compose.rkt"
+    "identity.rkt"
     "join-hash.rkt"
     "join-list.rkt"
     "join-string.rkt"
diff --git a/lens/compound/main.scrbl b/lens/private/compound/main.scrbl
similarity index 100%
rename from lens/compound/main.scrbl
rename to lens/private/compound/main.scrbl
diff --git a/lens/compound/thrush.rkt b/lens/private/compound/thrush.rkt
similarity index 100%
rename from lens/compound/thrush.rkt
rename to lens/private/compound/thrush.rkt
diff --git a/lens/compound/thrush.scrbl b/lens/private/compound/thrush.scrbl
similarity index 100%
rename from lens/compound/thrush.scrbl
rename to lens/private/compound/thrush.scrbl
diff --git a/lens/dict.rkt b/lens/private/dict.rkt
similarity index 100%
rename from lens/dict.rkt
rename to lens/private/dict.rkt
diff --git a/lens/dict.scrbl b/lens/private/dict.scrbl
similarity index 100%
rename from lens/dict.scrbl
rename to lens/private/dict.scrbl
diff --git a/lens/doc-util/deflenses.rkt b/lens/private/doc-util/deflenses.rkt
similarity index 100%
rename from lens/doc-util/deflenses.rkt
rename to lens/private/doc-util/deflenses.rkt
diff --git a/lens/doc-util/lenses-examples.rkt b/lens/private/doc-util/lenses-examples.rkt
similarity index 100%
rename from lens/doc-util/lenses-examples.rkt
rename to lens/private/doc-util/lenses-examples.rkt
diff --git a/lens/doc-util/main.rkt b/lens/private/doc-util/main.rkt
similarity index 100%
rename from lens/doc-util/main.rkt
rename to lens/private/doc-util/main.rkt
diff --git a/lens/doc-util/scribble-include-no-subsection.rkt b/lens/private/doc-util/scribble-include-no-subsection.rkt
similarity index 100%
rename from lens/doc-util/scribble-include-no-subsection.rkt
rename to lens/private/doc-util/scribble-include-no-subsection.rkt
diff --git a/lens/hash/main.rkt b/lens/private/hash/main.rkt
similarity index 100%
rename from lens/hash/main.rkt
rename to lens/private/hash/main.rkt
diff --git a/lens/hash/main.scrbl b/lens/private/hash/main.scrbl
similarity index 100%
rename from lens/hash/main.scrbl
rename to lens/private/hash/main.scrbl
diff --git a/lens/hash/nested.rkt b/lens/private/hash/nested.rkt
similarity index 100%
rename from lens/hash/nested.rkt
rename to lens/private/hash/nested.rkt
diff --git a/lens/hash/nested.scrbl b/lens/private/hash/nested.scrbl
similarity index 100%
rename from lens/hash/nested.scrbl
rename to lens/private/hash/nested.scrbl
diff --git a/lens/hash/pick.rkt b/lens/private/hash/pick.rkt
similarity index 100%
rename from lens/hash/pick.rkt
rename to lens/private/hash/pick.rkt
diff --git a/lens/hash/pick.scrbl b/lens/private/hash/pick.scrbl
similarity index 100%
rename from lens/hash/pick.scrbl
rename to lens/private/hash/pick.scrbl
diff --git a/lens/hash/ref.rkt b/lens/private/hash/ref.rkt
similarity index 100%
rename from lens/hash/ref.rkt
rename to lens/private/hash/ref.rkt
diff --git a/lens/hash/ref.scrbl b/lens/private/hash/ref.scrbl
similarity index 100%
rename from lens/hash/ref.scrbl
rename to lens/private/hash/ref.scrbl
diff --git a/lens/list/assoc.rkt b/lens/private/list/assoc.rkt
similarity index 100%
rename from lens/list/assoc.rkt
rename to lens/private/list/assoc.rkt
diff --git a/lens/list/assoc.scrbl b/lens/private/list/assoc.scrbl
similarity index 100%
rename from lens/list/assoc.scrbl
rename to lens/private/list/assoc.scrbl
diff --git a/lens/list/cadr-etc.rkt b/lens/private/list/cadr-etc.rkt
similarity index 100%
rename from lens/list/cadr-etc.rkt
rename to lens/private/list/cadr-etc.rkt
diff --git a/lens/list/car-cdr.rkt b/lens/private/list/car-cdr.rkt
similarity index 100%
rename from lens/list/car-cdr.rkt
rename to lens/private/list/car-cdr.rkt
diff --git a/lens/list/car-cdr.scrbl b/lens/private/list/car-cdr.scrbl
similarity index 100%
rename from lens/list/car-cdr.scrbl
rename to lens/private/list/car-cdr.scrbl
diff --git a/lens/list/list-ref-take-drop.rkt b/lens/private/list/list-ref-take-drop.rkt
similarity index 100%
rename from lens/list/list-ref-take-drop.rkt
rename to lens/private/list/list-ref-take-drop.rkt
diff --git a/lens/list/list-ref-take-drop.scrbl b/lens/private/list/list-ref-take-drop.scrbl
similarity index 100%
rename from lens/list/list-ref-take-drop.scrbl
rename to lens/private/list/list-ref-take-drop.scrbl
diff --git a/lens/list/main.rkt b/lens/private/list/main.rkt
similarity index 100%
rename from lens/list/main.rkt
rename to lens/private/list/main.rkt
diff --git a/lens/list/main.scrbl b/lens/private/list/main.scrbl
similarity index 100%
rename from lens/list/main.scrbl
rename to lens/private/list/main.scrbl
diff --git a/lens/list/multi.rkt b/lens/private/list/multi.rkt
similarity index 100%
rename from lens/list/multi.rkt
rename to lens/private/list/multi.rkt
diff --git a/lens/list/multi.scrbl b/lens/private/list/multi.scrbl
similarity index 100%
rename from lens/list/multi.scrbl
rename to lens/private/list/multi.scrbl
diff --git a/lens/private/main.rkt b/lens/private/main.rkt
new file mode 100644
index 0000000..c70847d
--- /dev/null
+++ b/lens/private/main.rkt
@@ -0,0 +1,30 @@
+#lang sweet-exp racket/base
+
+require
+  "base/main.rkt"
+  "compound/main.rkt"
+  "dict.rkt"
+  "hash/main.rkt"
+  "list/main.rkt"
+  "stream.rkt"
+  "string.rkt"
+  "struct/main.rkt"
+  "vector/main.rkt"
+
+provide
+  except-out
+    all-from-out
+      "base/main.rkt"
+      "compound/main.rkt"
+      "dict.rkt"
+      "hash/main.rkt"
+      "list/main.rkt"
+      "stream.rkt"
+      "string.rkt"
+      "struct/main.rkt"
+      "vector/main.rkt"
+    gen:lens
+    focus-lens
+    drop-lens
+    take-lens
+    use-applicable-lenses!
diff --git a/lens/stream.rkt b/lens/private/stream.rkt
similarity index 100%
rename from lens/stream.rkt
rename to lens/private/stream.rkt
diff --git a/lens/stream.scrbl b/lens/private/stream.scrbl
similarity index 100%
rename from lens/stream.scrbl
rename to lens/private/stream.scrbl
diff --git a/lens/string.rkt b/lens/private/string.rkt
similarity index 100%
rename from lens/string.rkt
rename to lens/private/string.rkt
diff --git a/lens/string.scrbl b/lens/private/string.scrbl
similarity index 100%
rename from lens/string.scrbl
rename to lens/private/string.scrbl
diff --git a/lens/struct/field.rkt b/lens/private/struct/field.rkt
similarity index 100%
rename from lens/struct/field.rkt
rename to lens/private/struct/field.rkt
diff --git a/lens/struct/field.scrbl b/lens/private/struct/field.scrbl
similarity index 100%
rename from lens/struct/field.scrbl
rename to lens/private/struct/field.scrbl
diff --git a/lens/struct/main.rkt b/lens/private/struct/main.rkt
similarity index 100%
rename from lens/struct/main.rkt
rename to lens/private/struct/main.rkt
diff --git a/lens/struct/main.scrbl b/lens/private/struct/main.scrbl
similarity index 100%
rename from lens/struct/main.scrbl
rename to lens/private/struct/main.scrbl
diff --git a/lens/struct/struct.rkt b/lens/private/struct/struct.rkt
similarity index 98%
rename from lens/struct/struct.rkt
rename to lens/private/struct/struct.rkt
index ee9d694..794c174 100644
--- a/lens/struct/struct.rkt
+++ b/lens/private/struct/struct.rkt
@@ -1,8 +1,8 @@
 #lang racket/base
 
 (require syntax/parse/define
-         lens/base/main
          alexis/util/struct
+         "../base/main.rkt"
          (submod alexis/util/struct get-struct-accessors)
          (for-syntax racket/base
                      syntax/parse
diff --git a/lens/struct/struct.scrbl b/lens/private/struct/struct.scrbl
similarity index 100%
rename from lens/struct/struct.scrbl
rename to lens/private/struct/struct.scrbl
diff --git a/lens/test-util/test-lens.rkt b/lens/private/test-util/test-lens.rkt
similarity index 100%
rename from lens/test-util/test-lens.rkt
rename to lens/private/test-util/test-lens.rkt
diff --git a/lens/tests/doc-coverage.rkt b/lens/private/tests/doc-coverage.rkt
similarity index 100%
rename from lens/tests/doc-coverage.rkt
rename to lens/private/tests/doc-coverage.rkt
diff --git a/lens/util/immutable.rkt b/lens/private/util/immutable.rkt
similarity index 100%
rename from lens/util/immutable.rkt
rename to lens/private/util/immutable.rkt
diff --git a/lens/util/improper-list-length.rkt b/lens/private/util/improper-list-length.rkt
similarity index 100%
rename from lens/util/improper-list-length.rkt
rename to lens/private/util/improper-list-length.rkt
diff --git a/lens/util/list-pair-contract.rkt b/lens/private/util/list-pair-contract.rkt
similarity index 100%
rename from lens/util/list-pair-contract.rkt
rename to lens/private/util/list-pair-contract.rkt
diff --git a/lens/util/rest-contract.rkt b/lens/private/util/rest-contract.rkt
similarity index 100%
rename from lens/util/rest-contract.rkt
rename to lens/private/util/rest-contract.rkt
diff --git a/lens/vector/main.rkt b/lens/private/vector/main.rkt
similarity index 100%
rename from lens/vector/main.rkt
rename to lens/private/vector/main.rkt
diff --git a/lens/vector/main.scrbl b/lens/private/vector/main.scrbl
similarity index 100%
rename from lens/vector/main.scrbl
rename to lens/private/vector/main.scrbl
diff --git a/lens/vector/nested.rkt b/lens/private/vector/nested.rkt
similarity index 100%
rename from lens/vector/nested.rkt
rename to lens/private/vector/nested.rkt
diff --git a/lens/vector/nested.scrbl b/lens/private/vector/nested.scrbl
similarity index 100%
rename from lens/vector/nested.scrbl
rename to lens/private/vector/nested.scrbl
diff --git a/lens/vector/pick.rkt b/lens/private/vector/pick.rkt
similarity index 100%
rename from lens/vector/pick.rkt
rename to lens/private/vector/pick.rkt
diff --git a/lens/vector/pick.scrbl b/lens/private/vector/pick.scrbl
similarity index 100%
rename from lens/vector/pick.scrbl
rename to lens/private/vector/pick.scrbl
diff --git a/lens/vector/ref.rkt b/lens/private/vector/ref.rkt
similarity index 100%
rename from lens/vector/ref.rkt
rename to lens/private/vector/ref.rkt
diff --git a/lens/vector/ref.scrbl b/lens/private/vector/ref.scrbl
similarity index 100%
rename from lens/vector/ref.scrbl
rename to lens/private/vector/ref.scrbl
diff --git a/unstable/lens/arrow.scrbl b/unstable/lens/arrow.scrbl
index e479352..db3ca89 100644
--- a/unstable/lens/arrow.scrbl
+++ b/unstable/lens/arrow.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{lens-view/thrush, lens-set/thrush, and lens-transform/thrush}
 
diff --git a/unstable/lens/if.rkt b/unstable/lens/if.rkt
index d12aec7..6b4f287 100644
--- a/unstable/lens/if.rkt
+++ b/unstable/lens/if.rkt
@@ -5,13 +5,13 @@
          lens-match
          )
 
-(require lens/base/main
+(require lens/private/base/main
          racket/match
          (for-syntax racket/base
                      syntax/parse
                      ))
 (module+ test
-  (require rackunit lens/list/main lens/vector/main lens/string))
+  (require rackunit lens/private/list/main lens/private/vector/main lens/private/string))
 
 (define (lens-if pred lens1 lens2)
   (make-lens
diff --git a/unstable/lens/isomorphism.scrbl b/unstable/lens/isomorphism.scrbl
index 80705c2..2f9097e 100644
--- a/unstable/lens/isomorphism.scrbl
+++ b/unstable/lens/isomorphism.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Isomorphisms}
 
diff --git a/unstable/lens/isomorphism/base.rkt b/unstable/lens/isomorphism/base.rkt
index 98eae5d..bb84405 100644
--- a/unstable/lens/isomorphism/base.rkt
+++ b/unstable/lens/isomorphism/base.rkt
@@ -1,3 +1,4 @@
+
 #lang sweet-exp racket/base
 
 provide isomorphism-lens?
@@ -6,7 +7,7 @@ provide isomorphism-lens?
                    [isomorphism-lenses make-isomorphism-lenses]
 
 require racket/match
-        lens/base/gen-lens
+        lens/private/base/gen-lens
 
 
 (struct isomorphism-lens (f inv) #:transparent
diff --git a/unstable/lens/isomorphism/data.rkt b/unstable/lens/isomorphism/data.rkt
index c82f242..e7ea405 100644
--- a/unstable/lens/isomorphism/data.rkt
+++ b/unstable/lens/isomorphism/data.rkt
@@ -9,7 +9,7 @@ provide string->symbol-lens
         list->string-lens
         string->list-lens
 
-require lens/base/main
+require lens/private/base/main
         "base.rkt"
 
 module+ test
diff --git a/unstable/lens/list.rkt b/unstable/lens/list.rkt
index 1fd9f56..f71beae 100644
--- a/unstable/lens/list.rkt
+++ b/unstable/lens/list.rkt
@@ -7,9 +7,9 @@ provide
     reverse-lens (lens/c list? list?)
     last-lens (lens/c list? any/c)
 
-require lens/base/main
-        lens/list/main
-        lens/compound/main
+require lens/private/base/main
+        lens/private/list/main
+        lens/private/compound/main
         "isomorphism/base.rkt"
 
 module+ test
diff --git a/unstable/lens/mapper.rkt b/unstable/lens/mapper.rkt
index 12ade24..cebedd7 100644
--- a/unstable/lens/mapper.rkt
+++ b/unstable/lens/mapper.rkt
@@ -8,13 +8,13 @@
            (-> lens? (lens/c immutable-vector? immutable-vector?))]
           ))
 
-(require lens/base/main
-         lens/util/immutable
+(require lens/private/base/main
+         lens/private/util/immutable
          racket/vector
          fancy-app
          )
 (module+ test
-  (require rackunit lens/list/main))
+  (require rackunit lens/private/list/main))
 
 (define (mapper-lens lens)
   (make-lens
diff --git a/unstable/lens/mapper.scrbl b/unstable/lens/mapper.scrbl
index 7e0a2ba..98855ad 100644
--- a/unstable/lens/mapper.scrbl
+++ b/unstable/lens/mapper.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Lenses that map over lists and vectors}
 
diff --git a/unstable/lens/match.rkt b/unstable/lens/match.rkt
index ba2cc30..c68fa78 100644
--- a/unstable/lens/match.rkt
+++ b/unstable/lens/match.rkt
@@ -5,10 +5,10 @@
 (require racket/match
          racket/local
          syntax/parse/define
-         lens/base/main
+         lens/private/base/main
          )
 (module+ test
-  (require rackunit lens/test-util/test-lens))
+  (require rackunit lens/private/test-util/test-lens))
 
 (define-simple-macro (match-lens a:id pat:expr replacement:expr)
   (local [(define (get target)
diff --git a/unstable/lens/match.scrbl b/unstable/lens/match.scrbl
index 2cf028d..7c36db4 100644
--- a/unstable/lens/match.scrbl
+++ b/unstable/lens/match.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Lenses based on match patterns}
 
diff --git a/unstable/lens/set-filterer.rkt b/unstable/lens/set-filterer.rkt
index 9000163..10a4873 100644
--- a/unstable/lens/set-filterer.rkt
+++ b/unstable/lens/set-filterer.rkt
@@ -6,7 +6,7 @@
            (-> predicate/c (lens/c functional-set? functional-set?))]
           ))
 
-(require lens/base/main
+(require lens/private/base/main
          racket/list
          racket/set
          fancy-app
diff --git a/unstable/lens/set-filterer.scrbl b/unstable/lens/set-filterer.scrbl
index c19cb49..8c35820 100644
--- a/unstable/lens/set-filterer.scrbl
+++ b/unstable/lens/set-filterer.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Filtering sets}
 
diff --git a/unstable/lens/string-split.rkt b/unstable/lens/string-split.rkt
index 5bb84d6..70779d6 100644
--- a/unstable/lens/string-split.rkt
+++ b/unstable/lens/string-split.rkt
@@ -9,8 +9,8 @@
 
 (require racket/match
          racket/string
-         lens/base/main
-         lens/util/immutable
+         lens/private/base/main
+         lens/private/util/immutable
          )
 (module+ test
   (require rackunit))
diff --git a/unstable/lens/string-split.scrbl b/unstable/lens/string-split.scrbl
index 40f613f..e50e5da 100644
--- a/unstable/lens/string-split.scrbl
+++ b/unstable/lens/string-split.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Splitting Strings}
 
diff --git a/unstable/lens/struct-nested.scrbl b/unstable/lens/struct-nested.scrbl
index e7bc608..82a1d6b 100644
--- a/unstable/lens/struct-nested.scrbl
+++ b/unstable/lens/struct-nested.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Nested struct lenses}
 
diff --git a/unstable/lens/sublist.rkt b/unstable/lens/sublist.rkt
index 7bf5ab3..ba9d411 100644
--- a/unstable/lens/sublist.rkt
+++ b/unstable/lens/sublist.rkt
@@ -3,7 +3,7 @@
 (provide sublist-lens)
 
 (require lens
-         lens/list/list-ref-take-drop)
+         lens/private/list/list-ref-take-drop)
 
 (module+ test
   (require rackunit))
diff --git a/unstable/lens/sublist.scrbl b/unstable/lens/sublist.scrbl
index c78be0b..0bfa88b 100644
--- a/unstable/lens/sublist.scrbl
+++ b/unstable/lens/sublist.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 @title{Sublist lenses}
 
diff --git a/unstable/lens/syntax.scrbl b/unstable/lens/syntax.scrbl
index e15f7ea..301db7b 100644
--- a/unstable/lens/syntax.scrbl
+++ b/unstable/lens/syntax.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 
 @title{Syntax Lenses}
diff --git a/unstable/lens/view-set.scrbl b/unstable/lens/view-set.scrbl
index 7164099..0c37157 100644
--- a/unstable/lens/view-set.scrbl
+++ b/unstable/lens/view-set.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require lens/doc-util/main)
+@(require lens/private/doc-util/main)
 
 
 @title{More Viewing and Setting}