10 files changed, 228 insertions, 218 deletions
diff --git a/stdlib/source/test/aedifex/command.lux b/stdlib/source/test/aedifex/command.lux
index 1ba7e6319..fe760258b 100644
--- a/stdlib/source/test/aedifex/command.lux
+++ b/stdlib/source/test/aedifex/command.lux
@@ -1,6 +1,7 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
   ["." / #_
    ["#." version]
    ["#." pom]
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index 193a5b8d8..8539ce672 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -1,36 +1,37 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    [parser
-     ["." environment]]
-    [concurrency
-     ["." atom (#+ Atom)]
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." binary]
-    ["." text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." set]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]
-   [time
-    ["." instant]]
-   [world
-    [console (#+ Console)]
-    ["." shell (#+ Exit Shell)]
-    ["." program (#+ Program)]
-    ["." file
-     ["." watch]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     [parser
+      ["." environment]]
+     [concurrency
+      ["." atom (#+ Atom)]
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." binary]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." set]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]
+    [time
+     ["." instant]]
+    [world
+     [console (#+ Console)]
+     ["." shell (#+ Exit Shell)]
+     ["." program (#+ Program)]
+     ["." file
+      ["." watch]]]]]
   ["." // #_
    ["$." version]
    ["$." build]]
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 191ac1039..a702d4c3d 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [io (#+ IO)]
-    ["." try]
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]
-    [parser
-     ["." environment]]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." dictionary]]]
-   [math
-    ["." random (#+ Random)]]
-   [world
-    ["." file]
-    ["." shell (#+ Shell)]
-    ["." program]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [io (#+ IO)]
+     ["." try]
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]
+     [parser
+      ["." environment]]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." dictionary]]]
+    [math
+     ["." random (#+ Random)]]
+    [world
+     ["." file]
+     ["." shell (#+ Shell)]
+     ["." program]]]]
   ["." // #_
    ["@." version]
    ["$/#" // #_
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index 6ee155b33..f0a5f4b58 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." set]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]
-   [world
-    ["." file (#+ Path)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." set]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]
+    [world
+     ["." file (#+ Path)]]]]
   [//
    ["@." version]
    [//
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index 7b3664da8..d1b955c77 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]
-    [parser
-     ["." environment]]]
-   [data
-    ["." maybe]
-    ["." binary ("#\." equivalence)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    ["." format #_
-     ["#" binary]
-     ["." tar]
-     ["." xml]]
-    [collection
-     ["." set]]]
-   [math
-    ["." random]]
-   [world
-    ["." file]
-    ["." program (#+ Program)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]
+     [parser
+      ["." environment]]]
+    [data
+     ["." maybe]
+     ["." binary ("#\." equivalence)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     ["." format #_
+      ["#" binary]
+      ["." tar]
+      ["." xml]]
+     [collection
+      ["." set]]]
+    [math
+     ["." random]]
+    [world
+     ["." file]
+     ["." program (#+ Program)]]]]
   [program
    [compositor
     ["." export]]]
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 63561542d..738cd5090 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." predicate]]
-   [control
-    ["." try]
-    [concurrency
-     ["." promise]]
-    [parser
-     ["." environment]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." dictionary]
-     ["." set]]
-    [format
-     ["." xml]]]
-   [math
-    ["." random (#+ Random)]]
-   [world
-    ["." program]
-    ["." file]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." predicate]]
+    [control
+     ["." try]
+     [concurrency
+      ["." promise]]
+     [parser
+      ["." environment]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." dictionary]
+      ["." set]]
+     [format
+      ["." xml]]]
+    [math
+     ["." random (#+ Random)]]
+    [world
+     ["." program]
+     ["." file]]]]
   ["." // #_
    ["@." version]
    ["$/#" // #_
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index ae9885401..70df9b7a3 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try) ("#\." functor)]
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]
-    [parser
-     ["." environment]]]
-   [data
-    ["." binary]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." set (#+ Set)]]]
-   [math
-    ["." random]]
-   [world
-    ["." file]
-    ["." program (#+ Program)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try) ("#\." functor)]
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]
+     [parser
+      ["." environment]]]
+    [data
+     ["." binary]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." set (#+ Set)]]]
+    [math
+     ["." random]]
+    [world
+     ["." file]
+     ["." program (#+ Program)]]]]
   [//
    ["$." version]
    [//
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 39e2eecfc..624be95bd 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [concurrency
-     ["." promise]]]
-   [data
-    ["." binary ("#\." equivalence)]
-    ["." text ("#\." equivalence)
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml]]]
-   [math
-    ["." random]]
-   [world
-    ["." file]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [concurrency
+      ["." promise]]]
+    [data
+     ["." binary ("#\." equivalence)]
+     ["." text ("#\." equivalence)
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml]]]
+    [math
+     ["." random]]
+    [world
+     ["." file]]]]
   [//
    ["@." version]
    [//
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index a6029ba8c..4621028ae 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]
-    [concurrency
-     ["." promise]]
-    [parser
-     ["." environment]]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." dictionary]
-     ["." list]]]
-   [math
-    ["." random]]
-   [world
-    ["." file]
-    ["." shell]
-    ["." program]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]
+     [concurrency
+      ["." promise]]
+     [parser
+      ["." environment]]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." dictionary]
+      ["." list]]]
+    [math
+     ["." random]]
+    [world
+     ["." file]
+     ["." shell]
+     ["." program]]]]
   ["." // #_
    ["@." version]
    ["@." build]
diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux
index d3f815ed1..4a8ccc1be 100644
--- a/stdlib/source/test/aedifex/command/version.lux
+++ b/stdlib/source/test/aedifex/command/version.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random]]
-   [tool
-    [compiler
-     ["." version]
-     ["." language #_
-      ["#/." lux #_
-       ["#" version]]]]]
-   [world
-    ["." console (#+ Console Mock)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random]]
+    [tool
+     [compiler
+      ["." version]
+      ["." language #_
+       ["#/." lux #_
+        ["#" version]]]]]
+    [world
+     ["." console (#+ Console Mock)]]]]
   [///
    ["@." profile]]
   [\\program