diff --git a/lens/private/define-nested.rkt b/lens/private/compound/define-nested.rkt
similarity index 98%
rename from lens/private/define-nested.rkt
rename to lens/private/compound/define-nested.rkt
index 67727da..36e0abf 100644
--- a/lens/private/define-nested.rkt
+++ b/lens/private/compound/define-nested.rkt
@@ -7,7 +7,7 @@ require lens/private/compound/thrush
                    racket/syntax
                    syntax/parse
                    syntax/srcloc
-                   "util/id-append.rkt"
+                   "../util/id-append.rkt"
 module+ test
   require lens/private/base/base
           lens/private/list/main
diff --git a/lens/private/dict/dict-nested.rkt b/lens/private/dict/dict-nested.rkt
index c54b362..8b34ffa 100644
--- a/lens/private/dict/dict-nested.rkt
+++ b/lens/private/dict/dict-nested.rkt
@@ -7,7 +7,7 @@ provide
 
 require lens/private/base/main
         lens/private/compound/thrush
-        lens/private/dict
+        lens/private/dict/dict
         lens/private/util/functional-dict
 module+ test
   require rackunit fancy-app
diff --git a/lens/private/dict.rkt b/lens/private/dict/dict.rkt
similarity index 96%
rename from lens/private/dict.rkt
rename to lens/private/dict/dict.rkt
index b6c1f06..913b083 100644
--- a/lens/private/dict.rkt
+++ b/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/util/functional-dict racket/dict fancy-app "../base/main.rkt")
 (module+ test
   (require rackunit))
 
diff --git a/lens/private/dict.scrbl b/lens/private/dict/dict.scrbl
similarity index 91%
rename from lens/private/dict.scrbl
rename to lens/private/dict/dict.scrbl
index 57f020a..5d5c2c6 100644
--- a/lens/private/dict.scrbl
+++ b/lens/private/dict/dict.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/manual
 
-@(require "doc-util/main.rkt")
+@(require "../doc-util/main.rkt")
 
 
 @title[#:tag "dict-reference"]{Dict lenses}
diff --git a/lens/private/main.rkt b/lens/private/main.rkt
index 3f42240..431d9b4 100644
--- a/lens/private/main.rkt
+++ b/lens/private/main.rkt
@@ -3,7 +3,7 @@ except-in
   combine-in
     "base/main.rkt"
     "compound/main.rkt"
-    "dict.rkt"
+    "dict/dict.rkt"
     "hash/main.rkt"
     "list/main.rkt"
     "stream.rkt"
diff --git a/lens/private/scribblings/reference.scrbl b/lens/private/scribblings/reference.scrbl
index 0eacb49..81b120d 100644
--- a/lens/private/scribblings/reference.scrbl
+++ b/lens/private/scribblings/reference.scrbl
@@ -12,5 +12,5 @@
 @include-section["../vector/main.scrbl"]
 @include-section["../string/main.scrbl"]
 @include-section["../stream.scrbl"]
-@include-section["../dict.scrbl"]
+@include-section["../dict/dict.scrbl"]
 @include-section["../../applicable.scrbl"]
diff --git a/unstable/lens/define-nested.rkt b/unstable/lens/define-nested.rkt
index 8f5fe62..41d979d 100644
--- a/unstable/lens/define-nested.rkt
+++ b/unstable/lens/define-nested.rkt
@@ -1,2 +1,2 @@
 #lang reprovide
-lens/private/define-nested
+lens/private/compound/define-nested