diff --git a/contrib/parser-combinators/lazy-examples.factor b/contrib/lazy-lists/examples.factor
similarity index 100%
rename from contrib/parser-combinators/lazy-examples.factor
rename to contrib/lazy-lists/examples.factor
diff --git a/contrib/parser-combinators/lazy.factor b/contrib/lazy-lists/lists.factor
similarity index 100%
rename from contrib/parser-combinators/lazy.factor
rename to contrib/lazy-lists/lists.factor
diff --git a/contrib/lazy-lists/load.factor b/contrib/lazy-lists/load.factor
new file mode 100644
index 0000000000..aa21a80788
--- /dev/null
+++ b/contrib/lazy-lists/load.factor
@@ -0,0 +1,7 @@
+PROVIDE: lazy-lists { 
+    "lists.factor"
+    "examples.factor"
+} {
+    "test/lists.factor"
+    "test/examples.factor"
+} ;
\ No newline at end of file
diff --git a/contrib/parser-combinators/lazy.html b/contrib/lazy-lists/old-doc.html
similarity index 100%
rename from contrib/parser-combinators/lazy.html
rename to contrib/lazy-lists/old-doc.html
diff --git a/contrib/lazy-lists/test/examples.factor b/contrib/lazy-lists/test/examples.factor
new file mode 100644
index 0000000000..e60305a71a
--- /dev/null
+++ b/contrib/lazy-lists/test/examples.factor
@@ -0,0 +1,6 @@
+USING: lazy-examples lazy-lists test ;
+IN: temporary
+
+[ { 1 3 5 7 } ] [ 4 odds ltake list>array ] unit-test
+[ { 0 1 4 9 16 } ] [ first-five-squares ] unit-test
+[ { 2 3 5 7 11 13 17 19 23 29 } ] [ first-ten-primes ] unit-test
diff --git a/contrib/parser-combinators/lazy-tests.factor b/contrib/lazy-lists/test/lists.factor
similarity index 100%
rename from contrib/parser-combinators/lazy-tests.factor
rename to contrib/lazy-lists/test/lists.factor