diff --git a/.travis.yml b/.travis.yml
index b4213dd..0266d06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,8 @@ before_install:
   - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco pkg install --deps search-auto cover-coveralls; fi
 
 install:
- - raco pkg install --deps search-auto $TRAVIS_BUILD_DIR
+ - raco pkg install --deps search-auto lens-common/ lens-data/ lens-lib/ lens-unstable/ lens-doc/ lens/
 
 script:
- - raco test $TRAVIS_BUILD_DIR
- - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage .; fi
+ - raco test -p lens-common lens-data lens-lib lens-unstable lens-doc lens
+ - if [ "${VERSION_TO_COVER}" == "${RACKET_VERSION}" ]; then raco cover -f coveralls -d $TRAVIS_BUILD_DIR/coverage -p lens-common lens-data lens-lib lens-unstable lens-doc lens; fi
diff --git a/info.rkt b/info.rkt
deleted file mode 100644
index b6df132..0000000
--- a/info.rkt
+++ /dev/null
@@ -1,41 +0,0 @@
-#lang info
-
-(define collection 'multi)
-
-
-(define version "2.0")
-
-
-(define deps
-  '("jack-scribble-example"
-    "base"
-    "rackunit-lib"
-    "unstable-lib"
-    "unstable-list-lib"
-    "unstable-contract-lib"
-    "fancy-app"
-    "syntax-classes-lib"
-    "struct-update-lib"
-    "sweet-exp-lib"
-    "kw-make-struct"
-    "reprovide-lang"
-    "scribble-lib"))
-
-
-(define build-deps
-  '("at-exp-lib"
-    "rackunit-lib"
-    "racket-doc"
-    "jack-scribble-example"
-    "doc-coverage"))
-
-(define cover-omit-paths
-  '(#rx".*\\.scrbl"
-    #rx"main\\.rkt"
-    #rx"info\\.rkt"
-    "lens/private/doc-util"
-    "lens/private/test-util"
-    "lens/private/util"
-    "unstable/lens/struct-provide.rkt"
-    "unstable/lens/syntax.rkt"
-    "unstable/lens/zoom.rkt"))
diff --git a/lens-common/info.rkt b/lens-common/info.rkt
new file mode 100644
index 0000000..8f5cd07
--- /dev/null
+++ b/lens-common/info.rkt
@@ -0,0 +1,26 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "fancy-app"
+    "rackunit-lib"
+    "reprovide-lang"
+    "unstable-contract-lib"
+    "unstable-lib"
+    ))
+
+(define build-deps
+  '("lens-data"
+    "sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx"info\\.rkt"
+    #rx"main\\.rkt"
+    "lens/common.rkt"
+    "lens/private/test-util"
+    "lens/private/util"
+    ))
+
diff --git a/lens-common/lens/common.rkt b/lens-common/lens/common.rkt
new file mode 100644
index 0000000..0acea0d
--- /dev/null
+++ b/lens-common/lens/common.rkt
@@ -0,0 +1,8 @@
+#lang sweet-exp reprovide
+except-in
+  combine-in
+    lens/private/base/main
+    lens/private/compound/main
+  gen:lens
+  focus-lens
+  use-applicable-lenses!
diff --git a/lens-common/lens/common/applicable.rkt b/lens-common/lens/common/applicable.rkt
new file mode 100644
index 0000000..8e7261b
--- /dev/null
+++ b/lens-common/lens/common/applicable.rkt
@@ -0,0 +1,19 @@
+#lang racket/base
+
+(require reprovide/reprovide)
+(reprovide lens/common)
+
+(require (only-in lens/private/base/base use-applicable-lenses!))
+
+(module+ test
+  (require rackunit))
+
+(use-applicable-lenses!)
+
+(module+ test
+  (define (set-car p a)
+    (cons a (cdr p)))
+  (define car-lens (make-lens car set-car))
+  (check-equal? (car-lens '(a b c)) 'a)
+  (check-equal? (lens-view car-lens '(a b c)) 'a)
+  (check-equal? (lens-set car-lens '(a b c) 97) '(97 b c)))
diff --git a/lens/private/base/base.rkt b/lens-common/lens/private/base/base.rkt
similarity index 100%
rename from lens/private/base/base.rkt
rename to lens-common/lens/private/base/base.rkt
diff --git a/lens/private/base/contract.rkt b/lens-common/lens/private/base/contract.rkt
similarity index 100%
rename from lens/private/base/contract.rkt
rename to lens-common/lens/private/base/contract.rkt
diff --git a/lens/private/base/gen-lens.rkt b/lens-common/lens/private/base/gen-lens.rkt
similarity index 100%
rename from lens/private/base/gen-lens.rkt
rename to lens-common/lens/private/base/gen-lens.rkt
diff --git a/lens/private/base/main.rkt b/lens-common/lens/private/base/main.rkt
similarity index 67%
rename from lens/private/base/main.rkt
rename to lens-common/lens/private/base/main.rkt
index 97b6a0e..de7791e 100644
--- a/lens/private/base/main.rkt
+++ b/lens-common/lens/private/base/main.rkt
@@ -1,4 +1,4 @@
 #lang reprovide
-"base.rkt"
+lens/private/base/base
 "view-set.rkt"
 "transform.rkt"
diff --git a/lens/private/base/make-lens.rkt b/lens-common/lens/private/base/make-lens.rkt
similarity index 100%
rename from lens/private/base/make-lens.rkt
rename to lens-common/lens/private/base/make-lens.rkt
diff --git a/lens/private/base/transform.rkt b/lens-common/lens/private/base/transform.rkt
similarity index 97%
rename from lens/private/base/transform.rkt
rename to lens-common/lens/private/base/transform.rkt
index 3217eb7..b924934 100644
--- a/lens/private/base/transform.rkt
+++ b/lens-common/lens/private/base/transform.rkt
@@ -3,7 +3,7 @@
 (require unstable/sequence
          racket/match
          racket/contract/base
-         "base.rkt"
+         lens/private/base/base
          "../util/list-pair-contract.rkt")
 
 (module+ test
diff --git a/lens/private/base/view-set.rkt b/lens-common/lens/private/base/view-set.rkt
similarity index 97%
rename from lens/private/base/view-set.rkt
rename to lens-common/lens/private/base/view-set.rkt
index 02d39af..380149e 100644
--- a/lens/private/base/view-set.rkt
+++ b/lens-common/lens/private/base/view-set.rkt
@@ -4,7 +4,7 @@
          racket/match
          racket/contract/base
          fancy-app
-         "base.rkt"
+         lens/private/base/base
          "../util/list-pair-contract.rkt")
 
 (module+ test
diff --git a/lens/private/compound/arrow.rkt b/lens-common/lens/private/compound/arrow.rkt
similarity index 94%
rename from lens/private/compound/arrow.rkt
rename to lens-common/lens/private/compound/arrow.rkt
index 40b91c7..5ed6bf1 100644
--- a/lens/private/compound/arrow.rkt
+++ b/lens-common/lens/private/compound/arrow.rkt
@@ -7,7 +7,8 @@
          lens-set/thrush
          lens-transform/thrush)
 
-(require lens)
+(require lens/private/base/main
+         lens/private/compound/main)
 
 (module+ test
   (require rackunit racket/list fancy-app))
diff --git a/lens/private/compound/compose.rkt b/lens-common/lens/private/compound/compose.rkt
similarity index 100%
rename from lens/private/compound/compose.rkt
rename to lens-common/lens/private/compound/compose.rkt
diff --git a/lens/private/compound/define-nested.rkt b/lens-common/lens/private/compound/define-nested.rkt
similarity index 100%
rename from lens/private/compound/define-nested.rkt
rename to lens-common/lens/private/compound/define-nested.rkt
diff --git a/lens/private/compound/identity.rkt b/lens-common/lens/private/compound/identity.rkt
similarity index 100%
rename from lens/private/compound/identity.rkt
rename to lens-common/lens/private/compound/identity.rkt
diff --git a/lens/private/compound/if.rkt b/lens-common/lens/private/compound/if.rkt
similarity index 100%
rename from lens/private/compound/if.rkt
rename to lens-common/lens/private/compound/if.rkt
diff --git a/lens/private/compound/lazy.rkt b/lens-common/lens/private/compound/lazy.rkt
similarity index 100%
rename from lens/private/compound/lazy.rkt
rename to lens-common/lens/private/compound/lazy.rkt
diff --git a/lens/private/compound/main.rkt b/lens-common/lens/private/compound/main.rkt
similarity index 100%
rename from lens/private/compound/main.rkt
rename to lens-common/lens/private/compound/main.rkt
diff --git a/lens/private/compound/thrush.rkt b/lens-common/lens/private/compound/thrush.rkt
similarity index 95%
rename from lens/private/compound/thrush.rkt
rename to lens-common/lens/private/compound/thrush.rkt
index c59d0dc..6ebb23c 100644
--- a/lens/private/compound/thrush.rkt
+++ b/lens-common/lens/private/compound/thrush.rkt
@@ -8,7 +8,6 @@
 
 (module+ test
   (require rackunit
-           "../list/list-ref-take-drop.rkt"
            "../test-util/test-lens.rkt"))
 
 (provide
diff --git a/lens/private/compound/zoom.rkt b/lens-common/lens/private/compound/zoom.rkt
similarity index 100%
rename from lens/private/compound/zoom.rkt
rename to lens-common/lens/private/compound/zoom.rkt
diff --git a/lens/private/isomorphism/base.rkt b/lens-common/lens/private/isomorphism/base.rkt
similarity index 100%
rename from lens/private/isomorphism/base.rkt
rename to lens-common/lens/private/isomorphism/base.rkt
diff --git a/lens/private/isomorphism/compound.rkt b/lens-common/lens/private/isomorphism/compound.rkt
similarity index 95%
rename from lens/private/isomorphism/compound.rkt
rename to lens-common/lens/private/isomorphism/compound.rkt
index c14bd1b..f673a62 100644
--- a/lens/private/isomorphism/compound.rkt
+++ b/lens-common/lens/private/isomorphism/compound.rkt
@@ -14,8 +14,8 @@ require racket/match
 module+ test
   require lens/private/base/main
           lens/private/compound/identity
+          lens/private/isomorphism/data
           rackunit
-          "data.rkt"
 
 (define (isomorphism-compose . args)
   (match args
diff --git a/lens/private/test-util/test-lens.rkt b/lens-common/lens/private/test-util/test-lens.rkt
similarity index 98%
rename from lens/private/test-util/test-lens.rkt
rename to lens-common/lens/private/test-util/test-lens.rkt
index 1dc3d5e..3526bb3 100644
--- a/lens/private/test-util/test-lens.rkt
+++ b/lens-common/lens/private/test-util/test-lens.rkt
@@ -3,7 +3,7 @@
 (require racket/contract
          rackunit
          fancy-app
-         "../base/base.rkt"
+         lens/private/base/base
          "../base/view-set.rkt")
 
 (provide
diff --git a/lens/private/test-util/test-multi.rkt b/lens-common/lens/private/test-util/test-multi.rkt
similarity index 100%
rename from lens/private/test-util/test-multi.rkt
rename to lens-common/lens/private/test-util/test-multi.rkt
diff --git a/lens/private/util/id-append.rkt b/lens-common/lens/private/util/id-append.rkt
similarity index 100%
rename from lens/private/util/id-append.rkt
rename to lens-common/lens/private/util/id-append.rkt
diff --git a/lens/private/util/list-pair-contract.rkt b/lens-common/lens/private/util/list-pair-contract.rkt
similarity index 100%
rename from lens/private/util/list-pair-contract.rkt
rename to lens-common/lens/private/util/list-pair-contract.rkt
diff --git a/lens/private/util/rest-contract.rkt b/lens-common/lens/private/util/rest-contract.rkt
similarity index 100%
rename from lens/private/util/rest-contract.rkt
rename to lens-common/lens/private/util/rest-contract.rkt
diff --git a/lens-data/info.rkt b/lens-data/info.rkt
new file mode 100644
index 0000000..94eef54
--- /dev/null
+++ b/lens-data/info.rkt
@@ -0,0 +1,27 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "lens-common"
+    "rackunit-lib"
+    "unstable-lib"
+    "unstable-list-lib"
+    "unstable-contract-lib"
+    "fancy-app"
+    "syntax-classes-lib"
+    "struct-update-lib"
+    "kw-make-struct"
+    "reprovide-lang"
+    ))
+
+(define build-deps
+  '("sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx"info\\.rkt"
+    #rx"main\\.rkt"
+    ))
+
diff --git a/lens/private/dict/dict-nested.rkt b/lens-data/lens/private/dict/dict-nested.rkt
similarity index 100%
rename from lens/private/dict/dict-nested.rkt
rename to lens-data/lens/private/dict/dict-nested.rkt
diff --git a/lens/private/dict/dict.rkt b/lens-data/lens/private/dict/dict.rkt
similarity index 83%
rename from lens/private/dict/dict.rkt
rename to lens-data/lens/private/dict/dict.rkt
index 913b083..76524cc 100644
--- a/lens/private/dict/dict.rkt
+++ b/lens-data/lens/private/dict/dict.rkt
@@ -6,7 +6,7 @@
            (-> any/c (lens/c functional-dict? any/c))]
           ))
 
-(require lens/private/util/functional-dict racket/dict fancy-app "../base/main.rkt")
+(require lens/private/base/main lens/private/util/functional-dict racket/dict fancy-app)
 (module+ test
   (require rackunit))
 
diff --git a/lens/private/hash/hash-filterer.rkt b/lens-data/lens/private/hash/hash-filterer.rkt
similarity index 100%
rename from lens/private/hash/hash-filterer.rkt
rename to lens-data/lens/private/hash/hash-filterer.rkt
diff --git a/lens/private/hash/join-hash.rkt b/lens-data/lens/private/hash/join-hash.rkt
similarity index 87%
rename from lens/private/hash/join-hash.rkt
rename to lens-data/lens/private/hash/join-hash.rkt
index 23603eb..069f276 100644
--- a/lens/private/hash/join-hash.rkt
+++ b/lens-data/lens/private/hash/join-hash.rkt
@@ -4,16 +4,16 @@
          racket/match
          unstable/sequence
          fancy-app
-         "../base/main.rkt"
-         "../util/alternating-list.rkt"
+         lens/private/base/main
+         lens/private/util/alternating-list
+         lens/private/util/list-pair-contract
          "../util/immutable.rkt"
-         "../util/list-pair-contract.rkt"
          "../list/join-list.rkt")
 
 (module+ test
   (require rackunit
            "../list/list-ref-take-drop.rkt"
-           "../test-util/test-lens.rkt"))
+           lens/private/test-util/test-lens))
 
 (provide
  (contract-out
diff --git a/lens/private/hash/main.rkt b/lens-data/lens/private/hash/main.rkt
similarity index 100%
rename from lens/private/hash/main.rkt
rename to lens-data/lens/private/hash/main.rkt
diff --git a/lens/private/hash/nested.rkt b/lens-data/lens/private/hash/nested.rkt
similarity index 86%
rename from lens/private/hash/nested.rkt
rename to lens-data/lens/private/hash/nested.rkt
index e19cc8e..ebc7352 100644
--- a/lens/private/hash/nested.rkt
+++ b/lens-data/lens/private/hash/nested.rkt
@@ -1,10 +1,10 @@
 #lang racket/base
 
 (require racket/contract/base
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "ref.rkt")
 
 (module+ test
diff --git a/lens/private/hash/pick.rkt b/lens-data/lens/private/hash/pick.rkt
similarity index 84%
rename from lens/private/hash/pick.rkt
rename to lens-data/lens/private/hash/pick.rkt
index 179d70a..d44989c 100644
--- a/lens/private/hash/pick.rkt
+++ b/lens-data/lens/private/hash/pick.rkt
@@ -2,14 +2,14 @@
 
 (require racket/contract
          racket/list
-         "../base/main.rkt"
+         lens/private/base/main
+         lens/private/util/rest-contract
          "../hash/join-hash.rkt"
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "ref.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out
diff --git a/lens/private/hash/ref.rkt b/lens-data/lens/private/hash/ref.rkt
similarity index 94%
rename from lens/private/hash/ref.rkt
rename to lens-data/lens/private/hash/ref.rkt
index 1beeee7..61be0a0 100644
--- a/lens/private/hash/ref.rkt
+++ b/lens-data/lens/private/hash/ref.rkt
@@ -2,7 +2,7 @@
 
 (require racket/contract
          fancy-app
-         "../base/main.rkt"
+         lens/private/base/main
          "../util/immutable.rkt")
 
 (module+ test
diff --git a/lens/private/isomorphism/data.rkt b/lens-data/lens/private/isomorphism/data.rkt
similarity index 98%
rename from lens/private/isomorphism/data.rkt
rename to lens-data/lens/private/isomorphism/data.rkt
index 1187443..b896d45 100644
--- a/lens/private/isomorphism/data.rkt
+++ b/lens-data/lens/private/isomorphism/data.rkt
@@ -11,7 +11,7 @@ provide string->symbol-lens
 
 require lens/private/base/main
         lens/private/util/alternating-list
-        "base.rkt"
+        lens/private/isomorphism/base
 
 module+ test
   require rackunit
diff --git a/lens-data/lens/private/isomorphism/main.rkt b/lens-data/lens/private/isomorphism/main.rkt
new file mode 100644
index 0000000..ec7c960
--- /dev/null
+++ b/lens-data/lens/private/isomorphism/main.rkt
@@ -0,0 +1,4 @@
+#lang reprovide
+lens/private/isomorphism/base
+lens/private/isomorphism/compound
+"data.rkt"
diff --git a/lens/private/list/append.rkt b/lens-data/lens/private/list/append.rkt
similarity index 100%
rename from lens/private/list/append.rkt
rename to lens-data/lens/private/list/append.rkt
diff --git a/lens/private/list/assoc.rkt b/lens-data/lens/private/list/assoc.rkt
similarity index 95%
rename from lens/private/list/assoc.rkt
rename to lens-data/lens/private/list/assoc.rkt
index 4020e8c..60a4827 100644
--- a/lens/private/list/assoc.rkt
+++ b/lens-data/lens/private/list/assoc.rkt
@@ -12,10 +12,10 @@
           ))
 
 (require fancy-app
-         "../base/main.rkt")
+         lens/private/base/main)
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt")
+  (require rackunit lens/private/test-util/test-lens)
   (define assoc-list '((a . 1) (b . 2) (c . 3))))
 
 
diff --git a/lens/private/list/cadr-etc.rkt b/lens-data/lens/private/list/cadr-etc.rkt
similarity index 95%
rename from lens/private/list/cadr-etc.rkt
rename to lens-data/lens/private/list/cadr-etc.rkt
index 04a8d44..d1d50f8 100644
--- a/lens/private/list/cadr-etc.rkt
+++ b/lens-data/lens/private/list/cadr-etc.rkt
@@ -2,8 +2,8 @@
 
 (require racket/contract
          syntax/parse/define
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
          "car-cdr.rkt"
          (for-syntax racket/base
                      racket/syntax))
diff --git a/lens/private/list/car-cdr.rkt b/lens-data/lens/private/list/car-cdr.rkt
similarity index 89%
rename from lens/private/list/car-cdr.rkt
rename to lens-data/lens/private/list/car-cdr.rkt
index 5d6c92d..9e64446 100644
--- a/lens/private/list/car-cdr.rkt
+++ b/lens-data/lens/private/list/car-cdr.rkt
@@ -5,11 +5,11 @@
  (contract-out [car-lens (lens/c pair? any/c)]
                [cdr-lens (lens/c pair? any/c)]))
 
-(require "../base/main.rkt")
+(require lens/private/base/main)
 
 (module+ test
   (require rackunit
-           "../test-util/test-lens.rkt"))
+           lens/private/test-util/test-lens))
 
 
 (define (set-car pair v)
diff --git a/lens/private/list/flatten.rkt b/lens-data/lens/private/list/flatten.rkt
similarity index 100%
rename from lens/private/list/flatten.rkt
rename to lens-data/lens/private/list/flatten.rkt
diff --git a/lens/private/list/join-assoc.rkt b/lens-data/lens/private/list/join-assoc.rkt
similarity index 100%
rename from lens/private/list/join-assoc.rkt
rename to lens-data/lens/private/list/join-assoc.rkt
diff --git a/lens/private/list/join-list.rkt b/lens-data/lens/private/list/join-list.rkt
similarity index 83%
rename from lens/private/list/join-list.rkt
rename to lens-data/lens/private/list/join-list.rkt
index 816acce..01a765e 100644
--- a/lens/private/list/join-list.rkt
+++ b/lens-data/lens/private/list/join-list.rkt
@@ -2,14 +2,14 @@
 
 require racket/list
         racket/contract
-        "../base/main.rkt"
-        "../util/alternating-list.rkt"
-        "../util/rest-contract.rkt"
+        lens/private/base/main
+        lens/private/util/alternating-list
+        lens/private/util/rest-contract
 
 module+ test
   require rackunit
           "../list/list-ref-take-drop.rkt"
-          "../test-util/test-lens.rkt"
+          lens/private/test-util/test-lens
 
 provide
   contract-out
diff --git a/lens/private/list/list-ref-take-drop.rkt b/lens-data/lens/private/list/list-ref-take-drop.rkt
similarity index 95%
rename from lens/private/list/list-ref-take-drop.rkt
rename to lens-data/lens/private/list/list-ref-take-drop.rkt
index 6e25dee..5c3cc05 100644
--- a/lens/private/list/list-ref-take-drop.rkt
+++ b/lens-data/lens/private/list/list-ref-take-drop.rkt
@@ -26,12 +26,12 @@
 (require racket/list
          fancy-app
          "../util/improper-list-length.rkt"
-         "../base/main.rkt"
-         "../compound/compose.rkt"
+         lens/private/base/main
+         lens/private/compound/compose
          "car-cdr.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 
 (define (set-take n lst new-head)
diff --git a/lens/private/list/main.rkt b/lens-data/lens/private/list/main.rkt
similarity index 100%
rename from lens/private/list/main.rkt
rename to lens-data/lens/private/list/main.rkt
diff --git a/lens/private/list/map.rkt b/lens-data/lens/private/list/map.rkt
similarity index 100%
rename from lens/private/list/map.rkt
rename to lens-data/lens/private/list/map.rkt
diff --git a/lens/private/list/multi.rkt b/lens-data/lens/private/list/multi.rkt
similarity index 83%
rename from lens/private/list/multi.rkt
rename to lens-data/lens/private/list/multi.rkt
index f8419b1..6015df1 100644
--- a/lens/private/list/multi.rkt
+++ b/lens-data/lens/private/list/multi.rkt
@@ -1,14 +1,14 @@
 #lang racket/base
 
 (require racket/contract
-         "../base/main.rkt"
-         "../compound/main.rkt"
-         "../util/rest-contract.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "join-list.rkt"
          "list-ref-take-drop.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out
diff --git a/lens/private/list/reverse.rkt b/lens-data/lens/private/list/reverse.rkt
similarity index 100%
rename from lens/private/list/reverse.rkt
rename to lens-data/lens/private/list/reverse.rkt
diff --git a/lens/private/list/sublist.rkt b/lens-data/lens/private/list/sublist.rkt
similarity index 100%
rename from lens/private/list/sublist.rkt
rename to lens-data/lens/private/list/sublist.rkt
diff --git a/lens-data/lens/private/main.rkt b/lens-data/lens/private/main.rkt
new file mode 100644
index 0000000..fc5b3a1
--- /dev/null
+++ b/lens-data/lens/private/main.rkt
@@ -0,0 +1,8 @@
+#lang sweet-exp reprovide
+"dict/dict.rkt"
+"hash/main.rkt"
+"list/main.rkt"
+"stream/stream.rkt"
+"string/main.rkt"
+"struct/main.rkt"
+"vector/main.rkt"
diff --git a/lens/private/match.rkt b/lens-data/lens/private/match.rkt
similarity index 100%
rename from lens/private/match.rkt
rename to lens-data/lens/private/match.rkt
diff --git a/lens/private/set/set-filterer.rkt b/lens-data/lens/private/set/set-filterer.rkt
similarity index 100%
rename from lens/private/set/set-filterer.rkt
rename to lens-data/lens/private/set/set-filterer.rkt
diff --git a/lens/private/set/set-member.rkt b/lens-data/lens/private/set/set-member.rkt
similarity index 100%
rename from lens/private/set/set-member.rkt
rename to lens-data/lens/private/set/set-member.rkt
diff --git a/lens/private/stream/stream.rkt b/lens-data/lens/private/stream/stream.rkt
similarity index 94%
rename from lens/private/stream/stream.rkt
rename to lens-data/lens/private/stream/stream.rkt
index f20de63..276e4ec 100644
--- a/lens/private/stream/stream.rkt
+++ b/lens-data/lens/private/stream/stream.rkt
@@ -10,12 +10,12 @@ provide
 
 require racket/stream
         fancy-app
-        "../base/main.rkt"
-        "../compound/main.rkt"
+        lens/private/base/main
+        lens/private/compound/main
 
 module+ test
   require rackunit
-          "../test-util/test-lens.rkt"
+          lens/private/test-util/test-lens
 
 
 module+ test
diff --git a/lens/private/string/join-string.rkt b/lens-data/lens/private/string/join-string.rkt
similarity index 86%
rename from lens/private/string/join-string.rkt
rename to lens-data/lens/private/string/join-string.rkt
index 96e3454..a92b11a 100644
--- a/lens/private/string/join-string.rkt
+++ b/lens-data/lens/private/string/join-string.rkt
@@ -1,17 +1,17 @@
 #lang sweet-exp racket/base
 
 require racket/contract
+        lens/private/base/main
         lens/private/isomorphism/base
-        "../base/main.rkt"
+        lens/private/compound/compose
+        lens/private/util/rest-contract
         "../util/immutable.rkt"
-        "../util/rest-contract.rkt"
-        "../compound/compose.rkt"
         "../list/join-list.rkt"
 
 module+ test
   require rackunit
+          lens/private/test-util/test-lens
           "../list/list-ref-take-drop.rkt"
-          "../test-util/test-lens.rkt"
 
 provide
   contract-out
diff --git a/lens/private/string/main.rkt b/lens-data/lens/private/string/main.rkt
similarity index 100%
rename from lens/private/string/main.rkt
rename to lens-data/lens/private/string/main.rkt
diff --git a/lens/private/string/string-split.rkt b/lens-data/lens/private/string/string-split.rkt
similarity index 100%
rename from lens/private/string/string-split.rkt
rename to lens-data/lens/private/string/string-split.rkt
diff --git a/lens/private/string/string.rkt b/lens-data/lens/private/string/string.rkt
similarity index 86%
rename from lens/private/string/string.rkt
rename to lens-data/lens/private/string/string.rkt
index 84fc394..6e42c4a 100644
--- a/lens/private/string/string.rkt
+++ b/lens-data/lens/private/string/string.rkt
@@ -11,13 +11,13 @@
           ))
 
 (require fancy-app
-         "../base/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
          "../util/immutable.rkt"
-         "../string/join-string.rkt"
-         "../compound/main.rkt")
+         "../string/join-string.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 
 (define (string-ref-lens i)
diff --git a/lens/private/string/substring.rkt b/lens-data/lens/private/string/substring.rkt
similarity index 100%
rename from lens/private/string/substring.rkt
rename to lens-data/lens/private/string/substring.rkt
diff --git a/lens/private/struct/field.rkt b/lens-data/lens/private/struct/field.rkt
similarity index 96%
rename from lens/private/struct/field.rkt
rename to lens-data/lens/private/struct/field.rkt
index 533b366..5698db2 100644
--- a/lens/private/struct/field.rkt
+++ b/lens-data/lens/private/struct/field.rkt
@@ -3,7 +3,7 @@
 (require racket/local
          syntax/parse/define
          struct-update
-         "../base/main.rkt"
+         lens/private/base/main
          (for-syntax racket/base
                      syntax/parse
                      racket/syntax))
diff --git a/lens/private/struct/main.rkt b/lens-data/lens/private/struct/main.rkt
similarity index 100%
rename from lens/private/struct/main.rkt
rename to lens-data/lens/private/struct/main.rkt
diff --git a/lens/private/struct/struct-join.rkt b/lens-data/lens/private/struct/struct-join.rkt
similarity index 100%
rename from lens/private/struct/struct-join.rkt
rename to lens-data/lens/private/struct/struct-join.rkt
diff --git a/lens/private/struct/struct-list.rkt b/lens-data/lens/private/struct/struct-list.rkt
similarity index 100%
rename from lens/private/struct/struct-list.rkt
rename to lens-data/lens/private/struct/struct-list.rkt
diff --git a/lens/private/struct/struct-nested.rkt b/lens-data/lens/private/struct/struct-nested.rkt
similarity index 100%
rename from lens/private/struct/struct-nested.rkt
rename to lens-data/lens/private/struct/struct-nested.rkt
diff --git a/lens/private/struct/struct.rkt b/lens-data/lens/private/struct/struct.rkt
similarity index 96%
rename from lens/private/struct/struct.rkt
rename to lens-data/lens/private/struct/struct.rkt
index 874b2d7..08c0a38 100644
--- a/lens/private/struct/struct.rkt
+++ b/lens-data/lens/private/struct/struct.rkt
@@ -3,7 +3,7 @@
 (require syntax/parse/define
          struct-update
          racket/provide-syntax
-         "../base/main.rkt"
+         lens/private/base/main
          (for-syntax racket/base
                      syntax/parse
                      syntax/parse/class/struct-id
@@ -13,7 +13,7 @@
 (module+ test
   (require rackunit
            fancy-app
-           "../test-util/test-lens.rkt"))
+           lens/private/test-util/test-lens))
 
 (provide define-struct-lenses
          struct/lens
diff --git a/lens/private/syntax/main.rkt b/lens-data/lens/private/syntax/main.rkt
similarity index 100%
rename from lens/private/syntax/main.rkt
rename to lens-data/lens/private/syntax/main.rkt
diff --git a/lens/private/syntax/stx.rkt b/lens-data/lens/private/syntax/stx.rkt
similarity index 100%
rename from lens/private/syntax/stx.rkt
rename to lens-data/lens/private/syntax/stx.rkt
diff --git a/lens/private/syntax/syntax-keyword.rkt b/lens-data/lens/private/syntax/syntax-keyword.rkt
similarity index 100%
rename from lens/private/syntax/syntax-keyword.rkt
rename to lens-data/lens/private/syntax/syntax-keyword.rkt
diff --git a/lens/private/syntax/syntax.rkt b/lens-data/lens/private/syntax/syntax.rkt
similarity index 100%
rename from lens/private/syntax/syntax.rkt
rename to lens-data/lens/private/syntax/syntax.rkt
diff --git a/lens/private/tests/gen-lens-fallback-loop.rkt b/lens-data/lens/private/tests/gen-lens-fallback-loop.rkt
similarity index 100%
rename from lens/private/tests/gen-lens-fallback-loop.rkt
rename to lens-data/lens/private/tests/gen-lens-fallback-loop.rkt
diff --git a/lens/private/util/alternating-list.rkt b/lens-data/lens/private/util/alternating-list.rkt
similarity index 100%
rename from lens/private/util/alternating-list.rkt
rename to lens-data/lens/private/util/alternating-list.rkt
diff --git a/lens/private/util/functional-dict.rkt b/lens-data/lens/private/util/functional-dict.rkt
similarity index 100%
rename from lens/private/util/functional-dict.rkt
rename to lens-data/lens/private/util/functional-dict.rkt
diff --git a/lens/private/util/functional-set.rkt b/lens-data/lens/private/util/functional-set.rkt
similarity index 100%
rename from lens/private/util/functional-set.rkt
rename to lens-data/lens/private/util/functional-set.rkt
diff --git a/lens/private/util/immutable.rkt b/lens-data/lens/private/util/immutable.rkt
similarity index 100%
rename from lens/private/util/immutable.rkt
rename to lens-data/lens/private/util/immutable.rkt
diff --git a/lens/private/util/improper-list-length.rkt b/lens-data/lens/private/util/improper-list-length.rkt
similarity index 100%
rename from lens/private/util/improper-list-length.rkt
rename to lens-data/lens/private/util/improper-list-length.rkt
diff --git a/lens/private/vector/join-vector.rkt b/lens-data/lens/private/vector/join-vector.rkt
similarity index 86%
rename from lens/private/vector/join-vector.rkt
rename to lens-data/lens/private/vector/join-vector.rkt
index 9844a82..02dc50f 100644
--- a/lens/private/vector/join-vector.rkt
+++ b/lens-data/lens/private/vector/join-vector.rkt
@@ -1,17 +1,17 @@
 #lang sweet-exp racket/base
 
 require racket/contract
+        lens/private/base/main
         lens/private/isomorphism/base
-        "../base/main.rkt"
+        lens/private/compound/compose
+        lens/private/util/rest-contract
         "../util/immutable.rkt"
-        "../util/rest-contract.rkt"
-        "../compound/compose.rkt"
         "../list/join-list.rkt"
 
 module+ test
   require rackunit
+          lens/private/test-util/test-lens
           "../list/list-ref-take-drop.rkt"
-          "../test-util/test-lens.rkt"
 
 provide
   contract-out
diff --git a/lens/private/vector/main.rkt b/lens-data/lens/private/vector/main.rkt
similarity index 100%
rename from lens/private/vector/main.rkt
rename to lens-data/lens/private/vector/main.rkt
diff --git a/lens/private/vector/nested.rkt b/lens-data/lens/private/vector/nested.rkt
similarity index 84%
rename from lens/private/vector/nested.rkt
rename to lens-data/lens/private/vector/nested.rkt
index 1a610e8..1562196 100644
--- a/lens/private/vector/nested.rkt
+++ b/lens-data/lens/private/vector/nested.rkt
@@ -1,10 +1,10 @@
 #lang racket/base
 
 (require racket/contract
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "ref.rkt")
 
 (module+ test
diff --git a/lens/private/vector/pick.rkt b/lens-data/lens/private/vector/pick.rkt
similarity index 79%
rename from lens/private/vector/pick.rkt
rename to lens-data/lens/private/vector/pick.rkt
index 1e64ebf..f8eba0f 100644
--- a/lens/private/vector/pick.rkt
+++ b/lens-data/lens/private/vector/pick.rkt
@@ -1,15 +1,15 @@
 #lang racket/base
 
 (require racket/contract
-         "../base/main.rkt"
-         "../compound/main.rkt"
+         lens/private/base/main
+         lens/private/compound/main
+         lens/private/util/rest-contract
          "../util/immutable.rkt"
-         "../util/rest-contract.rkt"
          "../vector/join-vector.rkt"
          "ref.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out
diff --git a/lens/private/vector/ref.rkt b/lens-data/lens/private/vector/ref.rkt
similarity index 87%
rename from lens/private/vector/ref.rkt
rename to lens-data/lens/private/vector/ref.rkt
index 1f41abe..fd1934b 100644
--- a/lens/private/vector/ref.rkt
+++ b/lens-data/lens/private/vector/ref.rkt
@@ -2,11 +2,11 @@
 
 (require racket/contract
          fancy-app
-         "../base/main.rkt"
+         lens/private/base/main
          "../util/immutable.rkt")
 
 (module+ test
-  (require rackunit "../test-util/test-lens.rkt"))
+  (require rackunit lens/private/test-util/test-lens))
 
 (provide
  (contract-out
diff --git a/lens/private/view-set/set-all.rkt b/lens-data/lens/private/view-set/set-all.rkt
similarity index 100%
rename from lens/private/view-set/set-all.rkt
rename to lens-data/lens/private/view-set/set-all.rkt
diff --git a/lens-doc/info.rkt b/lens-doc/info.rkt
new file mode 100644
index 0000000..a71bff6
--- /dev/null
+++ b/lens-doc/info.rkt
@@ -0,0 +1,26 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "lens-lib"
+    "lens-unstable"
+    "scribble-lib"
+    "reprovide-lang"
+    "jack-scribble-example"
+    ))
+
+(define build-deps
+  '("at-exp-lib"
+    "doc-coverage"
+    "racket-doc"
+    "sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx".*\\.scrbl"
+    #rx"info\\.rkt"
+    "lens/private/doc-util"
+    ))
+
diff --git a/lens/applicable.scrbl b/lens-doc/lens/applicable.scrbl
similarity index 93%
rename from lens/applicable.scrbl
rename to lens-doc/lens/applicable.scrbl
index 343853c..371467b 100644
--- a/lens/applicable.scrbl
+++ b/lens-doc/lens/applicable.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "private/doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title{Applicable lenses}
diff --git a/lens-doc/lens/info.rkt b/lens-doc/lens/info.rkt
new file mode 100644
index 0000000..f113e7c
--- /dev/null
+++ b/lens-doc/lens/info.rkt
@@ -0,0 +1,4 @@
+#lang info
+
+(define scribblings '(["main.scrbl" (multi-page) (library) "lens"]))
+
diff --git a/lens/main.scrbl b/lens-doc/lens/main.scrbl
similarity index 94%
rename from lens/main.scrbl
rename to lens-doc/lens/main.scrbl
index ed25b26..ed9f1ba 100644
--- a/lens/main.scrbl
+++ b/lens-doc/lens/main.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "private/doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:style '(toc)]{Lenses}
 
diff --git a/lens/private/base/base.scrbl b/lens-doc/lens/private/base/base.scrbl
similarity index 97%
rename from lens/private/base/base.scrbl
rename to lens-doc/lens/private/base/base.scrbl
index 099ce3f..4233fce 100644
--- a/lens/private/base/base.scrbl
+++ b/lens-doc/lens/private/base/base.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title{Lens Construction}
 
diff --git a/lens/private/base/contract.scrbl b/lens-doc/lens/private/base/contract.scrbl
similarity index 95%
rename from lens/private/base/contract.scrbl
rename to lens-doc/lens/private/base/contract.scrbl
index 3ff04f2..c1beb76 100644
--- a/lens/private/base/contract.scrbl
+++ b/lens-doc/lens/private/base/contract.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title{Lens Contracts}
 
diff --git a/lens/private/base/laws.scrbl b/lens-doc/lens/private/base/laws.scrbl
similarity index 98%
rename from lens/private/base/laws.scrbl
rename to lens-doc/lens/private/base/laws.scrbl
index 352ec01..6a1498a 100644
--- a/lens/private/base/laws.scrbl
+++ b/lens-doc/lens/private/base/laws.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:tag "laws"]{Lens Laws}
 
diff --git a/lens/private/base/main.scrbl b/lens-doc/lens/private/base/main.scrbl
similarity index 100%
rename from lens/private/base/main.scrbl
rename to lens-doc/lens/private/base/main.scrbl
diff --git a/lens/private/base/transform.scrbl b/lens-doc/lens/private/base/transform.scrbl
similarity index 96%
rename from lens/private/base/transform.scrbl
rename to lens-doc/lens/private/base/transform.scrbl
index 57ef8b8..6ca7ba8 100644
--- a/lens/private/base/transform.scrbl
+++ b/lens-doc/lens/private/base/transform.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title{Transforming Values With Lenses}
diff --git a/lens/private/base/view-set.scrbl b/lens-doc/lens/private/base/view-set.scrbl
similarity index 97%
rename from lens/private/base/view-set.scrbl
rename to lens-doc/lens/private/base/view-set.scrbl
index fbacd4f..5c64f9d 100644
--- a/lens/private/base/view-set.scrbl
+++ b/lens-doc/lens/private/base/view-set.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title{Viewing and Setting}
diff --git a/lens/private/compound/compose.scrbl b/lens-doc/lens/private/compound/compose.scrbl
similarity index 96%
rename from lens/private/compound/compose.scrbl
rename to lens-doc/lens/private/compound/compose.scrbl
index ed6872d..25caa34 100644
--- a/lens/private/compound/compose.scrbl
+++ b/lens-doc/lens/private/compound/compose.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(lens-compose [lens lens?] ...) lens?]{
diff --git a/lens/private/compound/main.scrbl b/lens-doc/lens/private/compound/main.scrbl
similarity index 74%
rename from lens/private/compound/main.scrbl
rename to lens-doc/lens/private/compound/main.scrbl
index 6455888..ca6ce28 100644
--- a/lens/private/compound/main.scrbl
+++ b/lens-doc/lens/private/compound/main.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/scribble-include-no-subsection.rkt")
+@(require lens/private/doc-util/scribble-include-no-subsection)
 
 @title[#:tag "composing-lenses"]{Joining and Composing Lenses}
 
diff --git a/lens/private/compound/thrush.scrbl b/lens-doc/lens/private/compound/thrush.scrbl
similarity index 92%
rename from lens/private/compound/thrush.scrbl
rename to lens-doc/lens/private/compound/thrush.scrbl
index 4bbf7f7..164eb8a 100644
--- a/lens/private/compound/thrush.scrbl
+++ b/lens-doc/lens/private/compound/thrush.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(lens-thrush [lens lens?] ...) lens?]{
diff --git a/lens/private/dict/dict.scrbl b/lens-doc/lens/private/dict/dict.scrbl
similarity index 91%
rename from lens/private/dict/dict.scrbl
rename to lens-doc/lens/private/dict/dict.scrbl
index 5d5c2c6..88c43fc 100644
--- a/lens/private/dict/dict.scrbl
+++ b/lens-doc/lens/private/dict/dict.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title[#:tag "dict-reference"]{Dict lenses}
diff --git a/lens/private/doc-util/deflenses.rkt b/lens-doc/lens/private/doc-util/deflenses.rkt
similarity index 86%
rename from lens/private/doc-util/deflenses.rkt
rename to lens-doc/lens/private/doc-util/deflenses.rkt
index 81f5882..adc9c88 100644
--- a/lens/private/doc-util/deflenses.rkt
+++ b/lens-doc/lens/private/doc-util/deflenses.rkt
@@ -1,7 +1,7 @@
 #lang racket
 
 (require scribble/manual
-         (for-label lens))
+         (for-label lens/private/base/main))
 
 (provide deflens
          deflenses)
diff --git a/lens/private/doc-util/include-sections.rkt b/lens-doc/lens/private/doc-util/include-sections.rkt
similarity index 100%
rename from lens/private/doc-util/include-sections.rkt
rename to lens-doc/lens/private/doc-util/include-sections.rkt
diff --git a/lens/private/doc-util/lens-tech.rkt b/lens-doc/lens/private/doc-util/lens-tech.rkt
similarity index 100%
rename from lens/private/doc-util/lens-tech.rkt
rename to lens-doc/lens/private/doc-util/lens-tech.rkt
diff --git a/lens/private/doc-util/lenses-examples.rkt b/lens-doc/lens/private/doc-util/lenses-examples.rkt
similarity index 100%
rename from lens/private/doc-util/lenses-examples.rkt
rename to lens-doc/lens/private/doc-util/lenses-examples.rkt
diff --git a/lens/private/doc-util/main.rkt b/lens-doc/lens/private/doc-util/main.rkt
similarity index 54%
rename from lens/private/doc-util/main.rkt
rename to lens-doc/lens/private/doc-util/main.rkt
index fd7b347..7f362fd 100644
--- a/lens/private/doc-util/main.rkt
+++ b/lens-doc/lens/private/doc-util/main.rkt
@@ -1,11 +1,11 @@
 #lang sweet-exp reprovide
 syntax/parse/define
-"deflenses.rkt"
-"include-sections.rkt"
-"lens-tech.rkt"
-"lenses-examples.rkt"
-"other-reference.rkt"
-"stability-notice.rkt"
+lens/private/doc-util/deflenses
+lens/private/doc-util/include-sections
+lens/private/doc-util/lens-tech
+lens/private/doc-util/lenses-examples
+lens/private/doc-util/other-reference
+lens/private/doc-util/stability-notice
 for-label
   lens
   unstable/lens
diff --git a/lens/private/doc-util/other-reference.css b/lens-doc/lens/private/doc-util/other-reference.css
similarity index 100%
rename from lens/private/doc-util/other-reference.css
rename to lens-doc/lens/private/doc-util/other-reference.css
diff --git a/lens/private/doc-util/other-reference.rkt b/lens-doc/lens/private/doc-util/other-reference.rkt
similarity index 100%
rename from lens/private/doc-util/other-reference.rkt
rename to lens-doc/lens/private/doc-util/other-reference.rkt
diff --git a/lens/private/doc-util/scribble-include-no-subsection.rkt b/lens-doc/lens/private/doc-util/scribble-include-no-subsection.rkt
similarity index 100%
rename from lens/private/doc-util/scribble-include-no-subsection.rkt
rename to lens-doc/lens/private/doc-util/scribble-include-no-subsection.rkt
diff --git a/lens/private/doc-util/stability-notice.rkt b/lens-doc/lens/private/doc-util/stability-notice.rkt
similarity index 100%
rename from lens/private/doc-util/stability-notice.rkt
rename to lens-doc/lens/private/doc-util/stability-notice.rkt
diff --git a/lens/private/hash/join-hash.scrbl b/lens-doc/lens/private/hash/join-hash.scrbl
similarity index 93%
rename from lens/private/hash/join-hash.scrbl
rename to lens-doc/lens/private/hash/join-hash.scrbl
index 2b57ce7..57aaa5d 100644
--- a/lens/private/hash/join-hash.scrbl
+++ b/lens-doc/lens/private/hash/join-hash.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(lens-join/hash [key any/c] [lens lens?] ... ...) lens?]{
diff --git a/lens/private/hash/main.scrbl b/lens-doc/lens/private/hash/main.scrbl
similarity index 75%
rename from lens/private/hash/main.scrbl
rename to lens-doc/lens/private/hash/main.scrbl
index 758a3f0..a01f2e0 100644
--- a/lens/private/hash/main.scrbl
+++ b/lens-doc/lens/private/hash/main.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt"
-          "../doc-util/scribble-include-no-subsection.rkt")
+@(require lens/private/doc-util/main
+          lens/private/doc-util/scribble-include-no-subsection)
 
 @title[#:tag "hash-reference"]{Hash Lenses}
 
diff --git a/lens/private/hash/nested.scrbl b/lens-doc/lens/private/hash/nested.scrbl
similarity index 91%
rename from lens/private/hash/nested.scrbl
rename to lens-doc/lens/private/hash/nested.scrbl
index 995ad7d..86d86f4 100644
--- a/lens/private/hash/nested.scrbl
+++ b/lens-doc/lens/private/hash/nested.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(hash-ref-nested-lens [key any/c] ...) lens?]{
diff --git a/lens/private/hash/pick.scrbl b/lens-doc/lens/private/hash/pick.scrbl
similarity index 92%
rename from lens/private/hash/pick.scrbl
rename to lens-doc/lens/private/hash/pick.scrbl
index f0c89d3..a289f10 100644
--- a/lens/private/hash/pick.scrbl
+++ b/lens-doc/lens/private/hash/pick.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(hash-pick-lens [key any/c] ...) lens?]{
diff --git a/lens/private/hash/ref.scrbl b/lens-doc/lens/private/hash/ref.scrbl
similarity index 89%
rename from lens/private/hash/ref.scrbl
rename to lens-doc/lens/private/hash/ref.scrbl
index 5f575bd..e6c24c6 100644
--- a/lens/private/hash/ref.scrbl
+++ b/lens-doc/lens/private/hash/ref.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(hash-ref-lens [key any/c]) lens?]{
diff --git a/lens/private/list/assoc.scrbl b/lens-doc/lens/private/list/assoc.scrbl
similarity index 96%
rename from lens/private/list/assoc.scrbl
rename to lens-doc/lens/private/list/assoc.scrbl
index 40a4369..c1e7d81 100644
--- a/lens/private/list/assoc.scrbl
+++ b/lens-doc/lens/private/list/assoc.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title{Association List Lenses}
diff --git a/lens/private/list/car-cdr.scrbl b/lens-doc/lens/private/list/car-cdr.scrbl
similarity index 96%
rename from lens/private/list/car-cdr.scrbl
rename to lens-doc/lens/private/list/car-cdr.scrbl
index 5b29144..de41d77 100644
--- a/lens/private/list/car-cdr.scrbl
+++ b/lens-doc/lens/private/list/car-cdr.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:tag "pair-lenses"]{Pair lenses}
 
diff --git a/lens/private/list/flatten.scrbl b/lens-doc/lens/private/list/flatten.scrbl
similarity index 99%
rename from lens/private/list/flatten.scrbl
rename to lens-doc/lens/private/list/flatten.scrbl
index a1e6ea0..2e03096 100644
--- a/lens/private/list/flatten.scrbl
+++ b/lens-doc/lens/private/list/flatten.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title{Flattening and unflattening lists}
 
diff --git a/lens/private/list/join-list.scrbl b/lens-doc/lens/private/list/join-list.scrbl
similarity index 94%
rename from lens/private/list/join-list.scrbl
rename to lens-doc/lens/private/list/join-list.scrbl
index f80316e..2cff7db 100644
--- a/lens/private/list/join-list.scrbl
+++ b/lens-doc/lens/private/list/join-list.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title{Joining lenses to view lists}
 
diff --git a/lens/private/list/list-ref-take-drop.scrbl b/lens-doc/lens/private/list/list-ref-take-drop.scrbl
similarity index 89%
rename from lens/private/list/list-ref-take-drop.scrbl
rename to lens-doc/lens/private/list/list-ref-take-drop.scrbl
index 0968779..bfd4d50 100644
--- a/lens/private/list/list-ref-take-drop.scrbl
+++ b/lens-doc/lens/private/list/list-ref-take-drop.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt"
-          "../doc-util/scribble-include-no-subsection.rkt")
+@(require lens/private/doc-util/main
+          lens/private/doc-util/scribble-include-no-subsection)
 
 
 @title{List lenses}
diff --git a/lens/private/list/main.scrbl b/lens-doc/lens/private/list/main.scrbl
similarity index 88%
rename from lens/private/list/main.scrbl
rename to lens-doc/lens/private/list/main.scrbl
index b8427ef..483225d 100644
--- a/lens/private/list/main.scrbl
+++ b/lens-doc/lens/private/list/main.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:tag "pair-list-reference"]{Pair and List Lenses}
 
diff --git a/lens/private/list/multi.scrbl b/lens-doc/lens/private/list/multi.scrbl
similarity index 95%
rename from lens/private/list/multi.scrbl
rename to lens-doc/lens/private/list/multi.scrbl
index 566a211..df09739 100644
--- a/lens/private/list/multi.scrbl
+++ b/lens-doc/lens/private/list/multi.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(list-ref-nested-lens [index exact-nonnegative-integer?] ...) lens?]{
diff --git a/lens/private/scribblings/guide.scrbl b/lens-doc/lens/private/scribblings/guide.scrbl
similarity index 100%
rename from lens/private/scribblings/guide.scrbl
rename to lens-doc/lens/private/scribblings/guide.scrbl
diff --git a/lens/private/scribblings/guide/built-in.scrbl b/lens-doc/lens/private/scribblings/guide/built-in.scrbl
similarity index 93%
rename from lens/private/scribblings/guide/built-in.scrbl
rename to lens-doc/lens/private/scribblings/guide/built-in.scrbl
index 8a675fc..b5356fa 100644
--- a/lens/private/scribblings/guide/built-in.scrbl
+++ b/lens-doc/lens/private/scribblings/guide/built-in.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:tag "built-in-lenses" #:style 'toc]{Lenses on Built-In Datatypes}
 
diff --git a/lens/private/scribblings/guide/built-in/key-value.scrbl b/lens-doc/lens/private/scribblings/guide/built-in/key-value.scrbl
similarity index 98%
rename from lens/private/scribblings/guide/built-in/key-value.scrbl
rename to lens-doc/lens/private/scribblings/guide/built-in/key-value.scrbl
index fffc7c4..013e94f 100644
--- a/lens/private/scribblings/guide/built-in/key-value.scrbl
+++ b/lens-doc/lens/private/scribblings/guide/built-in/key-value.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/manual
 
 @(require scribble/eval
-          "../../../doc-util/main.rkt")
+          lens/private/doc-util/main)
 
 @(define make-lens-eval
    (make-eval-factory '(racket/base lens)))
diff --git a/lens/private/scribblings/guide/built-in/ordered.scrbl b/lens-doc/lens/private/scribblings/guide/built-in/ordered.scrbl
similarity index 99%
rename from lens/private/scribblings/guide/built-in/ordered.scrbl
rename to lens-doc/lens/private/scribblings/guide/built-in/ordered.scrbl
index ba93cfd..a12a637 100644
--- a/lens/private/scribblings/guide/built-in/ordered.scrbl
+++ b/lens-doc/lens/private/scribblings/guide/built-in/ordered.scrbl
@@ -2,7 +2,7 @@
 #lang scribble/manual
 
 @(require scribble/eval
-          "../../../doc-util/main.rkt")
+          lens/private/doc-util/main)
 
 @(define make-lens-eval
    (make-eval-factory '(racket/base racket/function racket/list racket/stream lens)))
diff --git a/lens/private/scribblings/guide/introduction.scrbl b/lens-doc/lens/private/scribblings/guide/introduction.scrbl
similarity index 99%
rename from lens/private/scribblings/guide/introduction.scrbl
rename to lens-doc/lens/private/scribblings/guide/introduction.scrbl
index 5ecc032..8b9fbc2 100644
--- a/lens/private/scribblings/guide/introduction.scrbl
+++ b/lens-doc/lens/private/scribblings/guide/introduction.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/manual
 
 @(require scribble/eval
-          "../../doc-util/main.rkt")
+          lens/private/doc-util/main)
 
 @(define introduction-eval ((make-eval-factory '(racket/base lens))))
 
diff --git a/lens/private/scribblings/guide/user-defined.scrbl b/lens-doc/lens/private/scribblings/guide/user-defined.scrbl
similarity index 100%
rename from lens/private/scribblings/guide/user-defined.scrbl
rename to lens-doc/lens/private/scribblings/guide/user-defined.scrbl
diff --git a/lens/private/scribblings/guide/user-defined/custom.scrbl b/lens-doc/lens/private/scribblings/guide/user-defined/custom.scrbl
similarity index 98%
rename from lens/private/scribblings/guide/user-defined/custom.scrbl
rename to lens-doc/lens/private/scribblings/guide/user-defined/custom.scrbl
index e0d9a78..f9f25db 100644
--- a/lens/private/scribblings/guide/user-defined/custom.scrbl
+++ b/lens-doc/lens/private/scribblings/guide/user-defined/custom.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/manual
 
 @(require scribble/eval
-          "../../../doc-util/main.rkt")
+          lens/private/doc-util/main)
 
 @(define make-lens-eval
    (make-eval-factory '(racket/base lens)))
diff --git a/lens/private/scribblings/guide/user-defined/struct.scrbl b/lens-doc/lens/private/scribblings/guide/user-defined/struct.scrbl
similarity index 98%
rename from lens/private/scribblings/guide/user-defined/struct.scrbl
rename to lens-doc/lens/private/scribblings/guide/user-defined/struct.scrbl
index 348ac66..d3e4f0c 100644
--- a/lens/private/scribblings/guide/user-defined/struct.scrbl
+++ b/lens-doc/lens/private/scribblings/guide/user-defined/struct.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/manual
 
 @(require scribble/eval
-          "../../../doc-util/main.rkt")
+          lens/private/doc-util/main)
 
 @(define make-lens-eval
    (make-eval-factory '(racket/base lens)))
diff --git a/lens/private/scribblings/reference.scrbl b/lens-doc/lens/private/scribblings/reference.scrbl
similarity index 79%
rename from lens/private/scribblings/reference.scrbl
rename to lens-doc/lens/private/scribblings/reference.scrbl
index 07c9ce7..047968d 100644
--- a/lens/private/scribblings/reference.scrbl
+++ b/lens-doc/lens/private/scribblings/reference.scrbl
@@ -4,8 +4,8 @@
 
 @local-table-of-contents[]
 
-@include-section["../base/main.scrbl"]
-@include-section["../compound/main.scrbl"]
+@include-section[(lib "lens/private/base/main.scrbl")]
+@include-section[(lib "lens/private/compound/main.scrbl")]
 @include-section["../list/main.scrbl"]
 @include-section["../hash/main.scrbl"]
 @include-section["../struct/main.scrbl"]
diff --git a/lens/private/stream/stream.scrbl b/lens-doc/lens/private/stream/stream.scrbl
similarity index 95%
rename from lens/private/stream/stream.scrbl
rename to lens-doc/lens/private/stream/stream.scrbl
index a8bb890..a33ca06 100644
--- a/lens/private/stream/stream.scrbl
+++ b/lens-doc/lens/private/stream/stream.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @title[#:tag "streams-reference"]{Stream Lenses}
diff --git a/lens/private/string/join-string.scrbl b/lens-doc/lens/private/string/join-string.scrbl
similarity index 93%
rename from lens/private/string/join-string.scrbl
rename to lens-doc/lens/private/string/join-string.scrbl
index 8db5482..5eb9dc5 100644
--- a/lens/private/string/join-string.scrbl
+++ b/lens-doc/lens/private/string/join-string.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(lens-join/string [lens lens?] ...) lens?]{
diff --git a/lens/private/string/main.scrbl b/lens-doc/lens/private/string/main.scrbl
similarity index 100%
rename from lens/private/string/main.scrbl
rename to lens-doc/lens/private/string/main.scrbl
diff --git a/lens/private/string/string.scrbl b/lens-doc/lens/private/string/string.scrbl
similarity index 94%
rename from lens/private/string/string.scrbl
rename to lens-doc/lens/private/string/string.scrbl
index c5ef421..d089613 100644
--- a/lens/private/string/string.scrbl
+++ b/lens-doc/lens/private/string/string.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 @title[#:tag "strings-reference"]{String Lenses}
 
diff --git a/lens/private/struct/field.scrbl b/lens-doc/lens/private/struct/field.scrbl
similarity index 89%
rename from lens/private/struct/field.scrbl
rename to lens-doc/lens/private/struct/field.scrbl
index 38ea288..d442b7c 100644
--- a/lens/private/struct/field.scrbl
+++ b/lens-doc/lens/private/struct/field.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defform[(struct-lens struct-id field-id)]{
diff --git a/lens/private/struct/main.scrbl b/lens-doc/lens/private/struct/main.scrbl
similarity index 68%
rename from lens/private/struct/main.scrbl
rename to lens-doc/lens/private/struct/main.scrbl
index 84a8350..c317648 100644
--- a/lens/private/struct/main.scrbl
+++ b/lens-doc/lens/private/struct/main.scrbl
@@ -1,7 +1,7 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt"
-          "../doc-util/scribble-include-no-subsection.rkt")
+@(require lens/private/doc-util/main
+          lens/private/doc-util/scribble-include-no-subsection)
 
 @title[#:tag "struct-reference"]{Struct Lenses}
 
diff --git a/lens/private/struct/struct.scrbl b/lens-doc/lens/private/struct/struct.scrbl
similarity index 94%
rename from lens/private/struct/struct.scrbl
rename to lens-doc/lens/private/struct/struct.scrbl
index dbf7cbc..9df9c36 100644
--- a/lens/private/struct/struct.scrbl
+++ b/lens-doc/lens/private/struct/struct.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defform[(define-struct-lenses struct-id)]{
diff --git a/lens/private/syntax/stx.scrbl b/lens-doc/lens/private/syntax/stx.scrbl
similarity index 98%
rename from lens/private/syntax/stx.scrbl
rename to lens-doc/lens/private/syntax/stx.scrbl
index d41d747..b5cad9a 100644
--- a/lens/private/syntax/stx.scrbl
+++ b/lens-doc/lens/private/syntax/stx.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt" (for-label syntax/stx))
+@(require lens/private/doc-util/main (for-label syntax/stx))
 
 @title{Syntax object lenses based on @racketmodname[syntax/stx]}
 
diff --git a/lens/private/tests/doc-coverage.rkt b/lens-doc/lens/private/tests/doc-coverage.rkt
similarity index 100%
rename from lens/private/tests/doc-coverage.rkt
rename to lens-doc/lens/private/tests/doc-coverage.rkt
diff --git a/lens/private/vector/join-vector.scrbl b/lens-doc/lens/private/vector/join-vector.scrbl
similarity index 92%
rename from lens/private/vector/join-vector.scrbl
rename to lens-doc/lens/private/vector/join-vector.scrbl
index d8ea98f..03d979e 100644
--- a/lens/private/vector/join-vector.scrbl
+++ b/lens-doc/lens/private/vector/join-vector.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(lens-join/vector [lens lens?] ...) lens?]{
diff --git a/lens/private/vector/main.scrbl b/lens-doc/lens/private/vector/main.scrbl
similarity index 80%
rename from lens/private/vector/main.scrbl
rename to lens-doc/lens/private/vector/main.scrbl
index d410d3a..f21b4b6 100644
--- a/lens/private/vector/main.scrbl
+++ b/lens-doc/lens/private/vector/main.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/scribble-include-no-subsection.rkt")
+@(require lens/private/doc-util/scribble-include-no-subsection)
 
 @title[#:tag "vectors-reference"]{Vector lenses}
 
diff --git a/lens/private/vector/nested.scrbl b/lens-doc/lens/private/vector/nested.scrbl
similarity index 90%
rename from lens/private/vector/nested.scrbl
rename to lens-doc/lens/private/vector/nested.scrbl
index 0d662af..b2ffeb5 100644
--- a/lens/private/vector/nested.scrbl
+++ b/lens-doc/lens/private/vector/nested.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(vector-ref-nested-lens [i exact-nonnegative-integer?] ...) lens?]{
diff --git a/lens/private/vector/pick.scrbl b/lens-doc/lens/private/vector/pick.scrbl
similarity index 90%
rename from lens/private/vector/pick.scrbl
rename to lens-doc/lens/private/vector/pick.scrbl
index 614d248..b3036e3 100644
--- a/lens/private/vector/pick.scrbl
+++ b/lens-doc/lens/private/vector/pick.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(vector-pick-lens [i exact-nonnegative-integer?] ...) lens?]{
diff --git a/lens/private/vector/ref.scrbl b/lens-doc/lens/private/vector/ref.scrbl
similarity index 87%
rename from lens/private/vector/ref.scrbl
rename to lens-doc/lens/private/vector/ref.scrbl
index 8c9e299..9583d60 100644
--- a/lens/private/vector/ref.scrbl
+++ b/lens-doc/lens/private/vector/ref.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "../doc-util/main.rkt")
+@(require lens/private/doc-util/main)
 
 
 @defproc[(vector-ref-lens [i exact-nonnegative-integer?]) lens?]{
diff --git a/lens-doc/unstable/info.rkt b/lens-doc/unstable/info.rkt
new file mode 100644
index 0000000..84582b6
--- /dev/null
+++ b/lens-doc/unstable/info.rkt
@@ -0,0 +1,4 @@
+#lang info
+
+(define scribblings '(["lens/main.scrbl" () (experimental) "unstable-lens"]))
+
diff --git a/unstable/lens/arrow.scrbl b/lens-doc/unstable/lens/arrow.scrbl
similarity index 100%
rename from unstable/lens/arrow.scrbl
rename to lens-doc/unstable/lens/arrow.scrbl
diff --git a/unstable/lens/define-nested.scrbl b/lens-doc/unstable/lens/define-nested.scrbl
similarity index 100%
rename from unstable/lens/define-nested.scrbl
rename to lens-doc/unstable/lens/define-nested.scrbl
diff --git a/unstable/lens/dict-nested.scrbl b/lens-doc/unstable/lens/dict-nested.scrbl
similarity index 100%
rename from unstable/lens/dict-nested.scrbl
rename to lens-doc/unstable/lens/dict-nested.scrbl
diff --git a/unstable/lens/hash-filterer.scrbl b/lens-doc/unstable/lens/hash-filterer.scrbl
similarity index 100%
rename from unstable/lens/hash-filterer.scrbl
rename to lens-doc/unstable/lens/hash-filterer.scrbl
diff --git a/unstable/lens/if.scrbl b/lens-doc/unstable/lens/if.scrbl
similarity index 100%
rename from unstable/lens/if.scrbl
rename to lens-doc/unstable/lens/if.scrbl
diff --git a/unstable/lens/isomorphism.scrbl b/lens-doc/unstable/lens/isomorphism.scrbl
similarity index 100%
rename from unstable/lens/isomorphism.scrbl
rename to lens-doc/unstable/lens/isomorphism.scrbl
diff --git a/unstable/lens/join-assoc.scrbl b/lens-doc/unstable/lens/join-assoc.scrbl
similarity index 100%
rename from unstable/lens/join-assoc.scrbl
rename to lens-doc/unstable/lens/join-assoc.scrbl
diff --git a/unstable/lens/lazy.scrbl b/lens-doc/unstable/lens/lazy.scrbl
similarity index 100%
rename from unstable/lens/lazy.scrbl
rename to lens-doc/unstable/lens/lazy.scrbl
diff --git a/unstable/lens/main.scrbl b/lens-doc/unstable/lens/main.scrbl
similarity index 100%
rename from unstable/lens/main.scrbl
rename to lens-doc/unstable/lens/main.scrbl
diff --git a/unstable/lens/map.scrbl b/lens-doc/unstable/lens/map.scrbl
similarity index 100%
rename from unstable/lens/map.scrbl
rename to lens-doc/unstable/lens/map.scrbl
diff --git a/unstable/lens/match.scrbl b/lens-doc/unstable/lens/match.scrbl
similarity index 100%
rename from unstable/lens/match.scrbl
rename to lens-doc/unstable/lens/match.scrbl
diff --git a/unstable/lens/set-all.scrbl b/lens-doc/unstable/lens/set-all.scrbl
similarity index 100%
rename from unstable/lens/set-all.scrbl
rename to lens-doc/unstable/lens/set-all.scrbl
diff --git a/unstable/lens/set-filterer.scrbl b/lens-doc/unstable/lens/set-filterer.scrbl
similarity index 100%
rename from unstable/lens/set-filterer.scrbl
rename to lens-doc/unstable/lens/set-filterer.scrbl
diff --git a/unstable/lens/set-member.scrbl b/lens-doc/unstable/lens/set-member.scrbl
similarity index 100%
rename from unstable/lens/set-member.scrbl
rename to lens-doc/unstable/lens/set-member.scrbl
diff --git a/unstable/lens/string-split.scrbl b/lens-doc/unstable/lens/string-split.scrbl
similarity index 100%
rename from unstable/lens/string-split.scrbl
rename to lens-doc/unstable/lens/string-split.scrbl
diff --git a/unstable/lens/struct-join.scrbl b/lens-doc/unstable/lens/struct-join.scrbl
similarity index 100%
rename from unstable/lens/struct-join.scrbl
rename to lens-doc/unstable/lens/struct-join.scrbl
diff --git a/unstable/lens/struct-list.scrbl b/lens-doc/unstable/lens/struct-list.scrbl
similarity index 100%
rename from unstable/lens/struct-list.scrbl
rename to lens-doc/unstable/lens/struct-list.scrbl
diff --git a/unstable/lens/struct-nested.scrbl b/lens-doc/unstable/lens/struct-nested.scrbl
similarity index 100%
rename from unstable/lens/struct-nested.scrbl
rename to lens-doc/unstable/lens/struct-nested.scrbl
diff --git a/unstable/lens/struct-provide.scrbl b/lens-doc/unstable/lens/struct-provide.scrbl
similarity index 100%
rename from unstable/lens/struct-provide.scrbl
rename to lens-doc/unstable/lens/struct-provide.scrbl
diff --git a/unstable/lens/sublist.scrbl b/lens-doc/unstable/lens/sublist.scrbl
similarity index 100%
rename from unstable/lens/sublist.scrbl
rename to lens-doc/unstable/lens/sublist.scrbl
diff --git a/unstable/lens/substring.scrbl b/lens-doc/unstable/lens/substring.scrbl
similarity index 100%
rename from unstable/lens/substring.scrbl
rename to lens-doc/unstable/lens/substring.scrbl
diff --git a/unstable/lens/syntax.scrbl b/lens-doc/unstable/lens/syntax.scrbl
similarity index 100%
rename from unstable/lens/syntax.scrbl
rename to lens-doc/unstable/lens/syntax.scrbl
diff --git a/unstable/lens/tests/doc-coverage.rkt b/lens-doc/unstable/lens/tests/doc-coverage.rkt
similarity index 100%
rename from unstable/lens/tests/doc-coverage.rkt
rename to lens-doc/unstable/lens/tests/doc-coverage.rkt
diff --git a/unstable/lens/zoom.scrbl b/lens-doc/unstable/lens/zoom.scrbl
similarity index 100%
rename from unstable/lens/zoom.scrbl
rename to lens-doc/unstable/lens/zoom.scrbl
diff --git a/lens-lib/info.rkt b/lens-lib/info.rkt
new file mode 100644
index 0000000..2e55c56
--- /dev/null
+++ b/lens-lib/info.rkt
@@ -0,0 +1,32 @@
+#lang info
+
+(define collection 'multi)
+
+(define version "2.0")
+
+(define deps
+  '("base"
+    "lens-common"
+    "lens-data"
+    "reprovide-lang"
+    ))
+
+(define implies
+  '("lens-common"
+    "lens-data"
+    ))
+
+(define update-implies
+  '("lens-common"
+    "lens-data"
+    ))
+
+(define build-deps
+  '("sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx"info\\.rkt"
+    #rx"main\\.rkt"
+    ))
+
diff --git a/lens-lib/lens/applicable.rkt b/lens-lib/lens/applicable.rkt
new file mode 100644
index 0000000..3000c40
--- /dev/null
+++ b/lens-lib/lens/applicable.rkt
@@ -0,0 +1,10 @@
+#lang racket/base
+
+(require reprovide/reprovide)
+(reprovide lens/common/applicable lens)
+
+(module+ test
+  (require rackunit)
+  (check-equal? (first-lens '(a b c)) 'a)
+  (check-equal? (lens-view first-lens '(a b c)) 'a)
+  (check-equal? (lens-set first-lens '(a b c) 97) '(97 b c)))
diff --git a/lens-lib/lens/info.rkt b/lens-lib/lens/info.rkt
new file mode 100644
index 0000000..0a453c7
--- /dev/null
+++ b/lens-lib/lens/info.rkt
@@ -0,0 +1,4 @@
+#lang info
+
+(define name "lens")
+
diff --git a/lens-lib/lens/main.rkt b/lens-lib/lens/main.rkt
new file mode 100644
index 0000000..8f61327
--- /dev/null
+++ b/lens-lib/lens/main.rkt
@@ -0,0 +1,6 @@
+#lang sweet-exp reprovide
+lens/common
+except-in
+  lens/private/main
+  drop-lens
+  take-lens
diff --git a/lens-unstable/info.rkt b/lens-unstable/info.rkt
new file mode 100644
index 0000000..284491d
--- /dev/null
+++ b/lens-unstable/info.rkt
@@ -0,0 +1,22 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "lens-lib"
+    "reprovide-lang"
+    ))
+
+(define build-deps
+  '("sweet-exp-lib"
+    ))
+
+(define cover-omit-paths
+  '(#rx"info\\.rkt"
+    #rx"main\\.rkt"
+    "unstable/lens/struct-provide.rkt"
+    "unstable/lens/syntax.rkt"
+    "unstable/lens/zoom.rkt"
+    ))
+
diff --git a/lens-unstable/unstable/info.rkt b/lens-unstable/unstable/info.rkt
new file mode 100644
index 0000000..cd29c9d
--- /dev/null
+++ b/lens-unstable/unstable/info.rkt
@@ -0,0 +1,4 @@
+#lang info
+
+(define name "unstable lens")
+
diff --git a/unstable/lens.rkt b/lens-unstable/unstable/lens.rkt
similarity index 100%
rename from unstable/lens.rkt
rename to lens-unstable/unstable/lens.rkt
diff --git a/unstable/lens/arrow.rkt b/lens-unstable/unstable/lens/arrow.rkt
similarity index 100%
rename from unstable/lens/arrow.rkt
rename to lens-unstable/unstable/lens/arrow.rkt
diff --git a/unstable/lens/define-nested.rkt b/lens-unstable/unstable/lens/define-nested.rkt
similarity index 100%
rename from unstable/lens/define-nested.rkt
rename to lens-unstable/unstable/lens/define-nested.rkt
diff --git a/unstable/lens/dict-nested.rkt b/lens-unstable/unstable/lens/dict-nested.rkt
similarity index 100%
rename from unstable/lens/dict-nested.rkt
rename to lens-unstable/unstable/lens/dict-nested.rkt
diff --git a/unstable/lens/flatten.rkt b/lens-unstable/unstable/lens/flatten.rkt
similarity index 100%
rename from unstable/lens/flatten.rkt
rename to lens-unstable/unstable/lens/flatten.rkt
diff --git a/unstable/lens/hash-filterer.rkt b/lens-unstable/unstable/lens/hash-filterer.rkt
similarity index 100%
rename from unstable/lens/hash-filterer.rkt
rename to lens-unstable/unstable/lens/hash-filterer.rkt
diff --git a/unstable/lens/if.rkt b/lens-unstable/unstable/lens/if.rkt
similarity index 100%
rename from unstable/lens/if.rkt
rename to lens-unstable/unstable/lens/if.rkt
diff --git a/unstable/lens/isomorphism.rkt b/lens-unstable/unstable/lens/isomorphism.rkt
similarity index 100%
rename from unstable/lens/isomorphism.rkt
rename to lens-unstable/unstable/lens/isomorphism.rkt
diff --git a/unstable/lens/join-assoc.rkt b/lens-unstable/unstable/lens/join-assoc.rkt
similarity index 100%
rename from unstable/lens/join-assoc.rkt
rename to lens-unstable/unstable/lens/join-assoc.rkt
diff --git a/unstable/lens/lazy.rkt b/lens-unstable/unstable/lens/lazy.rkt
similarity index 100%
rename from unstable/lens/lazy.rkt
rename to lens-unstable/unstable/lens/lazy.rkt
diff --git a/unstable/lens/main.rkt b/lens-unstable/unstable/lens/main.rkt
similarity index 100%
rename from unstable/lens/main.rkt
rename to lens-unstable/unstable/lens/main.rkt
diff --git a/unstable/lens/map.rkt b/lens-unstable/unstable/lens/map.rkt
similarity index 100%
rename from unstable/lens/map.rkt
rename to lens-unstable/unstable/lens/map.rkt
diff --git a/unstable/lens/match.rkt b/lens-unstable/unstable/lens/match.rkt
similarity index 100%
rename from unstable/lens/match.rkt
rename to lens-unstable/unstable/lens/match.rkt
diff --git a/unstable/lens/reverse.rkt b/lens-unstable/unstable/lens/reverse.rkt
similarity index 100%
rename from unstable/lens/reverse.rkt
rename to lens-unstable/unstable/lens/reverse.rkt
diff --git a/unstable/lens/set-all.rkt b/lens-unstable/unstable/lens/set-all.rkt
similarity index 100%
rename from unstable/lens/set-all.rkt
rename to lens-unstable/unstable/lens/set-all.rkt
diff --git a/unstable/lens/set-filterer.rkt b/lens-unstable/unstable/lens/set-filterer.rkt
similarity index 100%
rename from unstable/lens/set-filterer.rkt
rename to lens-unstable/unstable/lens/set-filterer.rkt
diff --git a/unstable/lens/set-member.rkt b/lens-unstable/unstable/lens/set-member.rkt
similarity index 100%
rename from unstable/lens/set-member.rkt
rename to lens-unstable/unstable/lens/set-member.rkt
diff --git a/unstable/lens/string-split.rkt b/lens-unstable/unstable/lens/string-split.rkt
similarity index 100%
rename from unstable/lens/string-split.rkt
rename to lens-unstable/unstable/lens/string-split.rkt
diff --git a/unstable/lens/struct-join.rkt b/lens-unstable/unstable/lens/struct-join.rkt
similarity index 100%
rename from unstable/lens/struct-join.rkt
rename to lens-unstable/unstable/lens/struct-join.rkt
diff --git a/unstable/lens/struct-list.rkt b/lens-unstable/unstable/lens/struct-list.rkt
similarity index 100%
rename from unstable/lens/struct-list.rkt
rename to lens-unstable/unstable/lens/struct-list.rkt
diff --git a/unstable/lens/struct-nested.rkt b/lens-unstable/unstable/lens/struct-nested.rkt
similarity index 100%
rename from unstable/lens/struct-nested.rkt
rename to lens-unstable/unstable/lens/struct-nested.rkt
diff --git a/unstable/lens/struct-provide.rkt b/lens-unstable/unstable/lens/struct-provide.rkt
similarity index 100%
rename from unstable/lens/struct-provide.rkt
rename to lens-unstable/unstable/lens/struct-provide.rkt
diff --git a/unstable/lens/sublist.rkt b/lens-unstable/unstable/lens/sublist.rkt
similarity index 100%
rename from unstable/lens/sublist.rkt
rename to lens-unstable/unstable/lens/sublist.rkt
diff --git a/unstable/lens/substring.rkt b/lens-unstable/unstable/lens/substring.rkt
similarity index 100%
rename from unstable/lens/substring.rkt
rename to lens-unstable/unstable/lens/substring.rkt
diff --git a/unstable/lens/syntax.rkt b/lens-unstable/unstable/lens/syntax.rkt
similarity index 100%
rename from unstable/lens/syntax.rkt
rename to lens-unstable/unstable/lens/syntax.rkt
diff --git a/unstable/lens/syntax/stx.rkt b/lens-unstable/unstable/lens/syntax/stx.rkt
similarity index 100%
rename from unstable/lens/syntax/stx.rkt
rename to lens-unstable/unstable/lens/syntax/stx.rkt
diff --git a/unstable/lens/zoom.rkt b/lens-unstable/unstable/lens/zoom.rkt
similarity index 100%
rename from unstable/lens/zoom.rkt
rename to lens-unstable/unstable/lens/zoom.rkt
diff --git a/lens/applicable.rkt b/lens/applicable.rkt
deleted file mode 100644
index fa25474..0000000
--- a/lens/applicable.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-
-(require reprovide/reprovide)
-(reprovide "main.rkt")
-
-(require (only-in "private/base/base.rkt" use-applicable-lenses!))
-
-(module+ test
-  (require rackunit))
-
-
-(use-applicable-lenses!)
-
-(module+ test
-  (check-equal? (first-lens '(a b c)) 'a))
diff --git a/lens/info.rkt b/lens/info.rkt
index 0a38845..e4b3108 100644
--- a/lens/info.rkt
+++ b/lens/info.rkt
@@ -1,4 +1,33 @@
 #lang info
 
-(define name "lens")
-(define scribblings '(("main.scrbl" (multi-page) (library) "lens")))
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "lens-common"
+    "lens-data"
+    "lens-lib"
+    "lens-unstable"
+    "lens-doc"
+    ))
+
+(define implies
+  '("lens-common"
+    "lens-data"
+    "lens-lib"
+    "lens-unstable"
+    "lens-doc"
+    ))
+
+(define update-implies
+  '("lens-common"
+    "lens-data"
+    "lens-lib"
+    "lens-unstable"
+    "lens-doc"
+    ))
+
+(define cover-omit-paths
+  '(#rx"info\\.rkt"
+    ))
+
diff --git a/lens/main.rkt b/lens/main.rkt
deleted file mode 100644
index 70d4906..0000000
--- a/lens/main.rkt
+++ /dev/null
@@ -1,2 +0,0 @@
-#lang reprovide
-"private/main.rkt"
diff --git a/lens/private/isomorphism/main.rkt b/lens/private/isomorphism/main.rkt
deleted file mode 100644
index 0128d82..0000000
--- a/lens/private/isomorphism/main.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang reprovide
-"base.rkt"
-"compound.rkt"
-"data.rkt"
diff --git a/lens/private/main.rkt b/lens/private/main.rkt
deleted file mode 100644
index 44f337a..0000000
--- a/lens/private/main.rkt
+++ /dev/null
@@ -1,17 +0,0 @@
-#lang sweet-exp reprovide
-except-in
-  combine-in
-    "base/main.rkt"
-    "compound/main.rkt"
-    "dict/dict.rkt"
-    "hash/main.rkt"
-    "list/main.rkt"
-    "stream/stream.rkt"
-    "string/main.rkt"
-    "struct/main.rkt"
-    "vector/main.rkt"
-  gen:lens
-  focus-lens
-  drop-lens
-  take-lens
-  use-applicable-lenses!
diff --git a/unstable/info.rkt b/unstable/info.rkt
deleted file mode 100644
index c87eaae..0000000
--- a/unstable/info.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang info
-
-(define name "unstable")
-(define scribblings '(("lens/main.scrbl" () (experimental) "unstable-lens")))