Normalized the hierarchy of the standard library modules.

41 files changed, 863 insertions, 817 deletions

diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index ba5e36662..347d9080b 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]
-    ["." enum]
-    [\spec
-     ["$." equivalence]
-     ["$." monoid]]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ Exception)]]
-   [data
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." i64]
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]
+     ["." enum]
+     [\\spec
+      ["$." equivalence]
+      ["$." monoid]]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ Exception)]]
+    [data
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." i64]
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Binary)]])
 
 (def: (succeed result)
diff --git a/stdlib/source/test/lux/data/bit.lux b/stdlib/source/test/lux/data/bit.lux
index 341da9beb..499b32779 100644
--- a/stdlib/source/test/lux/data/bit.lux
+++ b/stdlib/source/test/lux/data/bit.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [math
-    ["." random]]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]
-     ["$." codec]]]
-   [control
-    ["." function]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]
+      ["$." codec]]]
+    [control
+     ["." function]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/data/collection.lux b/stdlib/source/test/lux/data/collection.lux
index bcbda46b9..b30d8181f 100644
--- a/stdlib/source/test/lux/data/collection.lux
+++ b/stdlib/source/test/lux/data/collection.lux
@@ -1,6 +1,7 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
   ["." / #_
    ["#." array]
    ["#." bits]
diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux
index e99478ee8..20d554bea 100644
--- a/stdlib/source/test/lux/data/collection/array.lux
+++ b/stdlib/source/test/lux/data/collection/array.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." monoid]
-     ["$." fold]
-     ["$." functor (#+ Injection)]]]
-   [data
-    ["." bit]
-    ["." maybe]
-    [collection
-     ["." list]
-     ["." set]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." monoid]
+      ["$." fold]
+      ["$." functor (#+ Injection)]]]
+    [data
+     ["." bit]
+     ["." maybe]
+     [collection
+      ["." list]
+      ["." set]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Array)]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux
index 258c84107..f505b0fce 100644
--- a/stdlib/source/test/lux/data/collection/bits.lux
+++ b/stdlib/source/test/lux/data/collection/bits.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." predicate]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." predicate]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Bits)]])
 
 (def: (size min max)
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux
index d68b421d9..c28ff6f51 100644
--- a/stdlib/source/test/lux/data/collection/dictionary.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [hash (#+ Hash)]
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." functor (#+ Injection)]]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [hash (#+ Hash)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." functor (#+ Injection)]]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
index a004e5c97..66d8098d3 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." product]
-    ["." bit ("#\." equivalence)]
-    ["." maybe ("#\." monad)]
-    [collection
-     ["." set]
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." product]
+     ["." bit ("#\." equivalence)]
+     ["." maybe ("#\." monad)]
+     [collection
+      ["." set]
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export (dictionary order gen_key gen_value size)
diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
index 4811b1162..3d24c3943 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." maybe ("#\." monad)]
-    ["." text]
-    [collection
-     ["." set]
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." maybe ("#\." monad)]
+     ["." text]
+     [collection
+      ["." set]
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export (random size gen_key gen_value)
diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux
index 625ce2bad..c46ccb681 100644
--- a/stdlib/source/test/lux/data/collection/list.lux
+++ b/stdlib/source/test/lux/data/collection/list.lux
@@ -1,34 +1,35 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." enum]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]
-     ["$." fold]
-     ["$." functor]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    pipe
-    ["." io]
-    ["." function]]
-   [data
-    ["." bit]
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." set]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." enum]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]
+      ["$." fold]
+      ["$." functor]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     pipe
+     ["." io]
+     ["." function]]
+    [data
+     ["." bit]
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." set]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." int]]]]]
+  [\\library
    ["." / ("#\." monad)]])
 
 (def: bounded_size
diff --git a/stdlib/source/test/lux/data/collection/queue.lux b/stdlib/source/test/lux/data/collection/queue.lux
index 8ddd0533a..93dd8828f 100644
--- a/stdlib/source/test/lux/data/collection/queue.lux
+++ b/stdlib/source/test/lux/data/collection/queue.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." functor (#+ Injection)]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." set]
-     ["." list ("#\." monoid)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." functor (#+ Injection)]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." set]
+      ["." list ("#\." monoid)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux
index 653e0ca52..55d643aa8 100644
--- a/stdlib/source/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/test/lux/data/collection/queue/priority.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Queue)]])
 
 (def: #export (random size)
diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux
index e523fd656..6f858efe6 100644
--- a/stdlib/source/test/lux/data/collection/row.lux
+++ b/stdlib/source/test/lux/data/collection/row.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." monoid]
-     ["$." fold]
-     ["$." functor (#+ Injection)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." list ("#\." fold)]
-     ["." set]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." monoid]
+      ["$." fold]
+      ["$." functor (#+ Injection)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." list ("#\." fold)]
+      ["." set]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / ("#\." monad)]])
 
 (def: signatures
diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux
index 1d5e111af..bbac12c34 100644
--- a/stdlib/source/test/lux/data/collection/sequence.lux
+++ b/stdlib/source/test/lux/data/collection/sequence.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    ["." enum]
-    [\spec
-     ["$." functor]
-     ["$." comonad]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     ["." enum]
+     [\\spec
+      ["$." functor]
+      ["$." comonad]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (implementation: (equivalence super)
diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux
index f577ce59f..e543dce57 100644
--- a/stdlib/source/test/lux/data/collection/set.lux
+++ b/stdlib/source/test/lux/data/collection/set.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [hash (#+ Hash)]
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [hash (#+ Hash)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / ("\." equivalence)]])
 
 (def: gen_nat
diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux
index 4e1cd4f48..a6f95a3f0 100644
--- a/stdlib/source/test/lux/data/collection/set/multi.lux
+++ b/stdlib/source/test/lux/data/collection/set/multi.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [hash (#+ Hash)]
-    [monad (#+ do)]
-    ["." predicate]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." set]
-     ["." list ("#\." fold)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [hash (#+ Hash)]
+     [monad (#+ do)]
+     ["." predicate]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." set]
+      ["." list ("#\." fold)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: count
diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux
index 385bc3c4a..0a6b441b7 100644
--- a/stdlib/source/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/set/ordered.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [order (#+ Order)]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [order (#+ Order)]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Set)
     ["." //]]])
 
diff --git a/stdlib/source/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux
index 317911b6b..e671b3cee 100644
--- a/stdlib/source/test/lux/data/collection/stack.lux
+++ b/stdlib/source/test/lux/data/collection/stack.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." functor (#+ Injection)]]]
-   [data
-    ["." maybe]
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." functor (#+ Injection)]]]
+    [data
+     ["." maybe]
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: (injection value)
diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux
index 91817180d..ed27499c3 100644
--- a/stdlib/source/test/lux/data/collection/tree.lux
+++ b/stdlib/source/test/lux/data/collection/tree.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." fold]
-     ["$." functor]]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." fold]
+      ["$." functor]]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Tree)]])
 
 (def: #export (tree gen-value)
diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux
index 2c4c83466..c34449027 100644
--- a/stdlib/source/test/lux/data/collection/tree/finger.lux
+++ b/stdlib/source/test/lux/data/collection/tree/finger.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text ("#\." equivalence monoid)]
-    [collection
-     ["." list ("#\." fold)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]
-   [type (#+ :by_example)]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text ("#\." equivalence monoid)]
+     [collection
+      ["." list ("#\." fold)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]
+    [type (#+ :by_example)]]]
+  [\\library
    ["." /]])
 
 (def: builder
diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux
index 6a7832736..b45e96213 100644
--- a/stdlib/source/test/lux/data/collection/tree/zipper.lux
+++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." functor]
-     ["$." comonad]]]
-   [control
-    pipe]
-   [data
-    ["." product]
-    ["." maybe ("#\." functor)]
-    ["." text]
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." functor]
+      ["$." comonad]]]
+    [control
+     pipe]
+    [data
+     ["." product]
+     ["." maybe ("#\." functor)]
+     ["." text]
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
   ["." //]
-  [\\
+  [\\library
    ["." / (#+ Zipper)
     ["tree" //]]])
 
diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux
index 2877af081..b218a15ed 100644
--- a/stdlib/source/test/lux/data/color.lux
+++ b/stdlib/source/test/lux/data/color.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]]]
-   [data
-    [collection
-     ["." list]]]
-   [macro
-    ["." template]]
-   ["." math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." int]
-     ["f" frac]
-     ["r" rev]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]]]
+    [data
+     [collection
+      ["." list]]]
+    [macro
+     ["." template]]
+    ["." math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." int]
+      ["f" frac]
+      ["r" rev]]]]]
+  [\\library
    ["." /]])
 
 (def: #export random
diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux
index bddd74593..9e027d74d 100644
--- a/stdlib/source/test/lux/data/color/named.lux
+++ b/stdlib/source/test/lux/data/color/named.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    [collection
-     ["." list]
-     ["." set]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     [collection
+      ["." list]
+      ["." set]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     ["/#" //]]])
 
diff --git a/stdlib/source/test/lux/data/format/binary.lux b/stdlib/source/test/lux/data/format/binary.lux
index 8912ae845..3457833ae 100644
--- a/stdlib/source/test/lux/data/format/binary.lux
+++ b/stdlib/source/test/lux/data/format/binary.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]
-    [\spec
-     ["$." monoid]]]
-   [data
-    ["." binary ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." monoid]]]
+    [data
+     ["." binary ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /]])
 
 (implementation: equivalence
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index 5e425db79..8fa74ed9e 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -1,33 +1,34 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." codec]]]
-   [control
-    ["." try ("#\." functor)]]
-   [data
-    ["." product]
-    ["." bit]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." row]
-     ["." dictionary]
-     ["." set]
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." frac]]]
-   ["." macro
-    ["." syntax (#+ syntax:)]
-    ["." code]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." codec]]]
+    [control
+     ["." try ("#\." functor)]]
+    [data
+     ["." product]
+     ["." bit]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." row]
+      ["." dictionary]
+      ["." set]
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." frac]]]
+    ["." macro
+     ["." syntax (#+ syntax:)]
+     ["." code]]]]
+  [\\library
    ["." / (#+ JSON) ("\." equivalence)]])
 
 (def: #export random
diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux
index 540eb2af1..8b0655555 100644
--- a/stdlib/source/test/lux/data/format/tar.lux
+++ b/stdlib/source/test/lux/data/format/tar.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]
-    ["<>" parser
-     ["<b>" binary]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." binary ("#\." equivalence monoid)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]
-     ["." unicode #_
-      ["#" set]
-      ["#/." block]]]
-    [collection
-     ["." row]
-     ["." list ("#\." fold)]]
-    ["." format #_
-     ["#" binary]]]
-   [time
-    ["." instant (#+ Instant)]
-    ["." duration]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]
+     ["<>" parser
+      ["<b>" binary]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." binary ("#\." equivalence monoid)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]
+      ["." unicode #_
+       ["#" set]
+       ["#/." block]]]
+     [collection
+      ["." row]
+      ["." list ("#\." fold)]]
+     ["." format #_
+      ["#" binary]]]
+    [time
+     ["." instant (#+ Instant)]
+     ["." duration]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /]])
 
 (def: path
diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux
index 95a06127f..5e4585d7f 100644
--- a/stdlib/source/test/lux/data/format/xml.lux
+++ b/stdlib/source/test/lux/data/format/xml.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- char)
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ Monad do)]
-    [\spec
-     ["$." equivalence]
-     ["$." codec]]]
-   [control
-    pipe
-    ["." try]
-    ["p" parser
-     ["</>" xml]]]
-   [data
-    ["." name]
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux (#- char)
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ Monad do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." codec]]]
+    [control
+     pipe
+     ["." try]
+     ["p" parser
+      ["</>" xml]]]
+    [data
+     ["." name]
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ XML)]])
 
 (def: char_range
diff --git a/stdlib/source/test/lux/data/identity.lux b/stdlib/source/test/lux/data/identity.lux
index 918eb10f6..c1359fd42 100644
--- a/stdlib/source/test/lux/data/identity.lux
+++ b/stdlib/source/test/lux/data/identity.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]
-     ["$." comonad]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]
+      ["$." comonad]]]]]
+  [\\library
    ["." / (#+ Identity)]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/data/lazy.lux b/stdlib/source/test/lux/data/lazy.lux
index 87d77ca68..9972de30d 100644
--- a/stdlib/source/test/lux/data/lazy.lux
+++ b/stdlib/source/test/lux/data/lazy.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]
-     ["$." equivalence]]]
-   [data
-    ["." product]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]
+      ["$." equivalence]]]
+    [data
+     ["." product]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Lazy)]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux
index eea0e3f32..51388c7a2 100644
--- a/stdlib/source/test/lux/data/maybe.lux
+++ b/stdlib/source/test/lux/data/maybe.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]
-     ["$." functor]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." io ("#\." monad)]
-    pipe]
-   [data
-    ["." text]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]
+      ["$." functor]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." io ("#\." monad)]
+     pipe]
+    [data
+     ["." text]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / ("#\." monoid monad)]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux
index 8c2722466..958d236bf 100644
--- a/stdlib/source/test/lux/data/name.lux
+++ b/stdlib/source/test/lux/data/name.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." codec]]]
-   [control
-    pipe]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." codec]]]
+    [control
+     pipe]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export (random module_size short_size)
@@ -57,18 +58,17 @@
                    (_.cover [/.module /.short]
                             (and (is? module1 (/.module name1))
                                  (is? short1 (/.short name1))))
-                   
                    (_.for [.name_of]
                           (let [(^open "/\.") /.equivalence]
                             ($_ _.and
                                 (_.test "Can obtain Name from identifier."
-                                        (and (/\= ["lux" "yolo"] (.name_of .yolo))
+                                        (and (/\= [.prelude_module "yolo"] (.name_of .yolo))
                                              (/\= ["test/lux/data/name" "yolo"] (.name_of ..yolo))
                                              (/\= ["" "yolo"] (.name_of yolo))
-                                             (/\= ["lux/test" "yolo"] (.name_of lux/test.yolo))))
+                                             (/\= ["library/lux/test" "yolo"] (.name_of library/lux/test.yolo))))
                                 (_.test "Can obtain Name from tag."
-                                        (and (/\= ["lux" "yolo"] (.name_of #.yolo))
+                                        (and (/\= [.prelude_module "yolo"] (.name_of #.yolo))
                                              (/\= ["test/lux/data/name" "yolo"] (.name_of #..yolo))
                                              (/\= ["" "yolo"] (.name_of #yolo))
-                                             (/\= ["lux/test" "yolo"] (.name_of #lux/test.yolo)))))))
+                                             (/\= ["library/lux/test" "yolo"] (.name_of #library/lux/test.yolo)))))))
                    )))))
diff --git a/stdlib/source/test/lux/data/product.lux b/stdlib/source/test/lux/data/product.lux
index 3e8124dde..ed086d66a 100644
--- a/stdlib/source/test/lux/data/product.lux
+++ b/stdlib/source/test/lux/data/product.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux
index 6725a7a24..b06d4ea79 100644
--- a/stdlib/source/test/lux/data/sum.lux
+++ b/stdlib/source/test/lux/data/sum.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    pipe]
-   [data
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     pipe]
+    [data
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index 1838206a8..5b13a9076 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- char)
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." monoid]]]
-   [control
-    pipe]
-   [data
-    ["." maybe]
-    [collection
-     ["." list]
-     ["." set]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- char)
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." monoid]]]
+    [control
+     pipe]
+    [data
+     ["." maybe]
+     [collection
+      ["." list]
+      ["." set]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
   ["." / #_
    ["#." buffer]
    ["#." encoding]
@@ -27,7 +28,7 @@
    ["#." escape]
    ["#." unicode #_
     ["#" set]]]
-  [\\
+  [\\library
    ["." /]])
 
 (def: bounded_size
diff --git a/stdlib/source/test/lux/data/text/buffer.lux b/stdlib/source/test/lux/data/text/buffer.lux
index 551d7943f..0f6e73d35 100644
--- a/stdlib/source/test/lux/data/text/buffer.lux
+++ b/stdlib/source/test/lux/data/text/buffer.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: part
diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux
index 981fb2d22..53bc78299 100644
--- a/stdlib/source/test/lux/data/text/encoding.lux
+++ b/stdlib/source/test/lux/data/text/encoding.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." codec]]]
-   [control
-    ["." try]]
-   [data
-    ["." maybe]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list ("#\." fold)]
-     ["." set]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." codec]]]
+    [control
+     ["." try]]
+    [data
+     ["." maybe]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list ("#\." fold)]
+      ["." set]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]]
   ["." / #_
    ["#." utf8]])
diff --git a/stdlib/source/test/lux/data/text/encoding/utf8.lux b/stdlib/source/test/lux/data/text/encoding/utf8.lux
index 7f83f745d..222e6e19b 100644
--- a/stdlib/source/test/lux/data/text/encoding/utf8.lux
+++ b/stdlib/source/test/lux/data/text/encoding/utf8.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [\spec
-     ["$." codec]]]
-   [data
-    ["." text]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [\\spec
+      ["$." codec]]]
+    [data
+     ["." text]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux
index 7cef235cd..bee4a7560 100644
--- a/stdlib/source/test/lux/data/text/escape.lux
+++ b/stdlib/source/test/lux/data/text/escape.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." debug]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." text (#+ Char) ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." set (#+ Set)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number (#+ hex)
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." debug]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." text (#+ Char) ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." set (#+ Set)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number (#+ hex)
+      ["n" nat]]]]]
+  [\\library
    ["." /
     [//
      ["." unicode #_
diff --git a/stdlib/source/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux
index 54176cda3..f35683b33 100644
--- a/stdlib/source/test/lux/data/text/format.lux
+++ b/stdlib/source/test/lux/data/text/format.lux
@@ -1,44 +1,45 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    [functor
-     [\spec
-      ["$." contravariant]]]]
-   [control
-    ["." try]]
-   [data
-    ["." text ("#\." equivalence)]
-    ["." bit]
-    ["." name]
-    [format
-     ["." xml]
-     ["." json]]
-    [collection
-     ["." list ("#\." functor)]]]
-   ["." time
-    ["." day]
-    ["." month]
-    ["." instant]
-    ["." duration]
-    ["." date]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    ["." modulus]
-    ["." modular]
-    [number
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]
-     ["." ratio]]]
-   [macro
-    ["." code]]
-   [meta
-    ["." location]]
-   ["." type]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     [functor
+      [\\spec
+       ["$." contravariant]]]]
+    [control
+     ["." try]]
+    [data
+     ["." text ("#\." equivalence)]
+     ["." bit]
+     ["." name]
+     [format
+      ["." xml]
+      ["." json]]
+     [collection
+      ["." list ("#\." functor)]]]
+    ["." time
+     ["." day]
+     ["." month]
+     ["." instant]
+     ["." duration]
+     ["." date]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     ["." modulus]
+     ["." modular]
+     [number
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]
+      ["." ratio]]]
+    [macro
+     ["." code]]
+    [meta
+     ["." location]]
+    ["." type]]]
   ["$." /// #_
    [format
     ["#." xml]
@@ -48,7 +49,7 @@
     ["#." type]
     [macro
      ["#." code]]]]
-  [\\
+  [\\library
    ["." /]])
 
 (implementation: (equivalence example)
@@ -68,6 +69,54 @@
       (random\wrap [/.frac random.frac])
       ))
 
+(def: codec
+  Test
+  (`` ($_ _.and
+          (~~ (template [<format> <codec> <random>]
+                [(do random.monad
+                   [sample <random>]
+                   (_.cover [<format>]
+                            (text\= (\ <codec> encode sample)
+                                    (<format> sample))))]
+
+                [/.bit bit.codec random.bit]
+                [/.nat nat.decimal random.nat]
+                [/.int int.decimal random.int]
+                [/.rev rev.decimal random.rev]
+                [/.frac frac.decimal random.frac]
+                [/.ratio ratio.codec random.ratio]
+                [/.name name.codec ($///name.random 5 5)]
+                [/.xml xml.codec $///xml.random]
+                [/.json json.codec $///json.random]
+                [/.day day.codec random.day]
+                [/.month month.codec random.month]
+                [/.instant instant.codec random.instant]
+                [/.duration duration.codec random.duration]
+                [/.date date.codec random.date]
+                [/.time time.codec random.time]
+                
+                [/.nat/2 nat.binary random.nat]
+                [/.nat/8 nat.octal random.nat]
+                [/.nat/10 nat.decimal random.nat]
+                [/.nat/16 nat.hex random.nat]
+                
+                [/.int/2 int.binary random.int]
+                [/.int/8 int.octal random.int]
+                [/.int/10 int.decimal random.int]
+                [/.int/16 int.hex random.int]
+                
+                [/.rev/2 rev.binary random.rev]
+                [/.rev/8 rev.octal random.rev]
+                [/.rev/10 rev.decimal random.rev]
+                [/.rev/16 rev.hex random.rev]
+                
+                [/.frac/2 frac.binary random.frac]
+                [/.frac/8 frac.octal random.frac]
+                [/.frac/10 frac.decimal random.frac]
+                [/.frac/16 frac.hex random.frac]
+                ))
+          )))
+
 (def: #export test
   Test
   (<| (_.covering /._)
@@ -88,49 +137,7 @@
                 (_.cover [/.format]
                          (text\= (/.format left mid right)
                                  ($_ "lux text concat" left mid right))))
-              (~~ (template [<format> <codec> <random>]
-                    [(do random.monad
-                       [sample <random>]
-                       (_.cover [<format>]
-                                (text\= (\ <codec> encode sample)
-                                        (<format> sample))))]
-
-                    [/.bit bit.codec random.bit]
-                    [/.nat nat.decimal random.nat]
-                    [/.int int.decimal random.int]
-                    [/.rev rev.decimal random.rev]
-                    [/.frac frac.decimal random.frac]
-                    [/.ratio ratio.codec random.ratio]
-                    [/.name name.codec ($///name.random 5 5)]
-                    [/.xml xml.codec $///xml.random]
-                    [/.json json.codec $///json.random]
-                    [/.day day.codec random.day]
-                    [/.month month.codec random.month]
-                    [/.instant instant.codec random.instant]
-                    [/.duration duration.codec random.duration]
-                    [/.date date.codec random.date]
-                    [/.time time.codec random.time]
-                    
-                    [/.nat/2 nat.binary random.nat]
-                    [/.nat/8 nat.octal random.nat]
-                    [/.nat/10 nat.decimal random.nat]
-                    [/.nat/16 nat.hex random.nat]
-                    
-                    [/.int/2 int.binary random.int]
-                    [/.int/8 int.octal random.int]
-                    [/.int/10 int.decimal random.int]
-                    [/.int/16 int.hex random.int]
-                    
-                    [/.rev/2 rev.binary random.rev]
-                    [/.rev/8 rev.octal random.rev]
-                    [/.rev/10 rev.decimal random.rev]
-                    [/.rev/16 rev.hex random.rev]
-                    
-                    [/.frac/2 frac.binary random.frac]
-                    [/.frac/8 frac.octal random.frac]
-                    [/.frac/10 frac.decimal random.frac]
-                    [/.frac/16 frac.hex random.frac]
-                    ))
+              ..codec
               (~~ (template [<format> <alias> <random>]
                     [(do random.monad
                        [sample <random>]
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index 481dcd17f..cb481b97a 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    pipe
-    ["." try]
-    ["p" parser
-     ["<.>" text (#+ Parser)]
-     ["s" code]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    [number (#+ hex)]
-    ["." random]]
-   ["." macro
-    [syntax (#+ syntax:)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     pipe
+     ["." try]
+     ["p" parser
+      ["<.>" text (#+ Parser)]
+      ["s" code]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     [number (#+ hex)]
+     ["." random]]
+    ["." macro
+     [syntax (#+ syntax:)]]]]
+  [\\library
    ["." /]])
 
 (def: (should_pass regex input)
diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux
index 8a41eeca2..e4affc97a 100644
--- a/stdlib/source/test/lux/data/text/unicode/block.lux
+++ b/stdlib/source/test/lux/data/text/unicode/block.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]]]
-   [data
-    ["." text]
-    [collection
-     ["." set]
-     ["." list]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number (#+ hex)
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]]]
+    [data
+     ["." text]
+     [collection
+      ["." set]
+      ["." list]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number (#+ hex)
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export random
diff --git a/stdlib/source/test/lux/data/text/unicode/set.lux b/stdlib/source/test/lux/data/text/unicode/set.lux
index 631d3b511..3ef15de08 100644
--- a/stdlib/source/test/lux/data/text/unicode/set.lux
+++ b/stdlib/source/test/lux/data/text/unicode/set.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." product]
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." set ("#\." equivalence)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." product]
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." set ("#\." equivalence)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
   ["." / #_
    ["/#" // #_
     ["#." block]]]
-  [\\
+  [\\library
    ["." /
     [//
      ["." block]]]])