diff --git a/lens-data/lens/data.rkt b/lens-data/lens/data.rkt
new file mode 100644
index 0000000..fe5be90
--- /dev/null
+++ b/lens-data/lens/data.rkt
@@ -0,0 +1,8 @@
+#lang sweet-exp reprovide
+"data/dict.rkt"
+"data/hash.rkt"
+"data/list.rkt"
+"data/stream.rkt"
+"data/string.rkt"
+"data/struct.rkt"
+"data/vector.rkt"
diff --git a/lens-data/lens/data/dict.rkt b/lens-data/lens/data/dict.rkt
new file mode 100644
index 0000000..2d515cb
--- /dev/null
+++ b/lens-data/lens/data/dict.rkt
@@ -0,0 +1,2 @@
+#lang reprovide
+lens/private/dict/dict
diff --git a/lens-data/lens/data/hash.rkt b/lens-data/lens/data/hash.rkt
new file mode 100644
index 0000000..3f0684c
--- /dev/null
+++ b/lens-data/lens/data/hash.rkt
@@ -0,0 +1,2 @@
+#lang reprovide
+lens/private/hash/main
diff --git a/lens-data/lens/data/list.rkt b/lens-data/lens/data/list.rkt
new file mode 100644
index 0000000..aef9109
--- /dev/null
+++ b/lens-data/lens/data/list.rkt
@@ -0,0 +1,2 @@
+#lang reprovide
+lens/private/list/main
diff --git a/lens-data/lens/data/stream.rkt b/lens-data/lens/data/stream.rkt
new file mode 100644
index 0000000..e09f807
--- /dev/null
+++ b/lens-data/lens/data/stream.rkt
@@ -0,0 +1,2 @@
+#lang reprovide
+lens/private/stream/stream
diff --git a/lens-data/lens/data/string.rkt b/lens-data/lens/data/string.rkt
new file mode 100644
index 0000000..5d277ea
--- /dev/null
+++ b/lens-data/lens/data/string.rkt
@@ -0,0 +1,2 @@
+#lang reprovide
+lens/private/string/main
diff --git a/lens-data/lens/data/struct.rkt b/lens-data/lens/data/struct.rkt
new file mode 100644
index 0000000..376aaaa
--- /dev/null
+++ b/lens-data/lens/data/struct.rkt
@@ -0,0 +1,2 @@
+#lang reprovide
+lens/private/struct/main
diff --git a/lens-data/lens/data/vector.rkt b/lens-data/lens/data/vector.rkt
new file mode 100644
index 0000000..ffca753
--- /dev/null
+++ b/lens-data/lens/data/vector.rkt
@@ -0,0 +1,2 @@
+#lang reprovide
+lens/private/vector/main
diff --git a/lens-data/lens/private/list/main.rkt b/lens-data/lens/private/list/main.rkt
index fb7cf2b..56af8bf 100644
--- a/lens-data/lens/private/list/main.rkt
+++ b/lens-data/lens/private/list/main.rkt
@@ -1,6 +1,6 @@
 #lang reprovide
 "car-cdr.rkt"
-"list-ref-take-drop.rkt"
+(except-in "list-ref-take-drop.rkt" drop-lens take-lens)
 "cadr-etc.rkt"
 "multi.rkt"
 "join-list.rkt"
diff --git a/lens-data/lens/private/main.rkt b/lens-data/lens/private/main.rkt
deleted file mode 100644
index fc5b3a1..0000000
--- a/lens-data/lens/private/main.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#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-lib/lens/main.rkt b/lens-lib/lens/main.rkt
index 8f61327..704be48 100644
--- a/lens-lib/lens/main.rkt
+++ b/lens-lib/lens/main.rkt
@@ -1,6 +1,3 @@
 #lang sweet-exp reprovide
 lens/common
-except-in
-  lens/private/main
-  drop-lens
-  take-lens
+lens/data