Normalized the hierarchy of the standard library modules.

19 files changed, 229 insertions, 211 deletions

diff --git a/stdlib/source/spec/aedifex/repository.lux b/stdlib/source/spec/aedifex/repository.lux
index 882937a0b..de9a05fde 100644
--- a/stdlib/source/spec/aedifex/repository.lux
+++ b/stdlib/source/spec/aedifex/repository.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." binary
-     ["_#" \test]]]
-   [math
-    ["." random]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." binary
+      ["_#" \\test]]]
+    [math
+     ["." random]]]]
   [\\program
    ["." /
     ["#." remote]
diff --git a/stdlib/source/spec/compositor/generation/case.lux b/stdlib/source/spec/compositor/generation/case.lux
index 4f45a480c..2424aa330 100644
--- a/stdlib/source/spec/compositor/generation/case.lux
+++ b/stdlib/source/spec/compositor/generation/case.lux
@@ -140,7 +140,7 @@
 (def: special-input
   Synthesis
   (let [_cursor_ (: Synthesis
-                    (synthesis.tuple (list (synthesis.text "lux")
+                    (synthesis.tuple (list (synthesis.text .prelude_module)
                                            (synthesis.i64 +901)
                                            (synthesis.i64 +13))))
         _code_ (: (-> Synthesis Synthesis)
@@ -178,7 +178,7 @@
       (|> _nil_
           (_cons_ (__apply__ (__identifier__ ["" "form$"])
                              (__list__ (list (__apply__ (__identifier__ ["" "tag$"])
-                                                        (__tuple__ (list (__text__ "lux")
+                                                        (__tuple__ (list (__text__ .prelude_module)
                                                                          (__text__ "Cons"))))
                                              (__identifier__ ["" "export?-meta"])
                                              (__identifier__ ["" "tail"])))))
diff --git a/stdlib/source/spec/lux/abstract/apply.lux b/stdlib/source/spec/lux/abstract/apply.lux
index 749d82a28..691e8c01c 100644
--- a/stdlib/source/spec/lux/abstract/apply.lux
+++ b/stdlib/source/spec/lux/abstract/apply.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Apply)]]
   [//
    [functor (#+ Injection Comparison)]])
diff --git a/stdlib/source/spec/lux/abstract/codec.lux b/stdlib/source/spec/lux/abstract/codec.lux
index d892436f3..f58f6ce91 100644
--- a/stdlib/source/spec/lux/abstract/codec.lux
+++ b/stdlib/source/spec/lux/abstract/codec.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      [equivalence (#+ Equivalence)]]]])
diff --git a/stdlib/source/spec/lux/abstract/comonad.lux b/stdlib/source/spec/lux/abstract/comonad.lux
index 7d68d7a24..85d00b8f2 100644
--- a/stdlib/source/spec/lux/abstract/comonad.lux
+++ b/stdlib/source/spec/lux/abstract/comonad.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ CoMonad)]]
   [//
    [functor (#+ Injection Comparison)]])
diff --git a/stdlib/source/spec/lux/abstract/enum.lux b/stdlib/source/spec/lux/abstract/enum.lux
index 2823c7b38..ddb2a80f1 100644
--- a/stdlib/source/spec/lux/abstract/enum.lux
+++ b/stdlib/source/spec/lux/abstract/enum.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /]])
 
 (def: #export (spec (^open "\.") gen-sample)
diff --git a/stdlib/source/spec/lux/abstract/equivalence.lux b/stdlib/source/spec/lux/abstract/equivalence.lux
index 14e84c05b..4d6d0900a 100644
--- a/stdlib/source/spec/lux/abstract/equivalence.lux
+++ b/stdlib/source/spec/lux/abstract/equivalence.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." / (#+ Equivalence)]])
 
 (def: #export (spec (^open "_//.") random)
diff --git a/stdlib/source/spec/lux/abstract/fold.lux b/stdlib/source/spec/lux/abstract/fold.lux
index 204987ded..2b4a7617f 100644
--- a/stdlib/source/spec/lux/abstract/fold.lux
+++ b/stdlib/source/spec/lux/abstract/fold.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
   [//
    [functor (#+ Injection Comparison)]]
-  [\\
+  [\\library
    ["." /]])
 
 (def: #export (spec injection comparison (^open "@//."))
diff --git a/stdlib/source/spec/lux/abstract/functor.lux b/stdlib/source/spec/lux/abstract/functor.lux
index 8aa3b5e95..cfa6cc2ff 100644
--- a/stdlib/source/spec/lux/abstract/functor.lux
+++ b/stdlib/source/spec/lux/abstract/functor.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." function]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." function]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Functor)]])
 
 (type: #export (Injection f)
diff --git a/stdlib/source/spec/lux/abstract/functor/contravariant.lux b/stdlib/source/spec/lux/abstract/functor/contravariant.lux
index 21a2a62c6..cba839e94 100644
--- a/stdlib/source/spec/lux/abstract/functor/contravariant.lux
+++ b/stdlib/source/spec/lux/abstract/functor/contravariant.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." function]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." function]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Functor)]])
 
 (def: (identity equivalence value (^open "@//."))
diff --git a/stdlib/source/spec/lux/abstract/hash.lux b/stdlib/source/spec/lux/abstract/hash.lux
index 94b9cf92b..4722a48a0 100644
--- a/stdlib/source/spec/lux/abstract/hash.lux
+++ b/stdlib/source/spec/lux/abstract/hash.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export (spec (^open "\.") random)
diff --git a/stdlib/source/spec/lux/abstract/interval.lux b/stdlib/source/spec/lux/abstract/interval.lux
index a3735f50f..5b74bc34d 100644
--- a/stdlib/source/spec/lux/abstract/interval.lux
+++ b/stdlib/source/spec/lux/abstract/interval.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." order]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." order]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /]])
 
 (def: #export (spec (^open "@//.") gen-sample)
diff --git a/stdlib/source/spec/lux/abstract/monad.lux b/stdlib/source/spec/lux/abstract/monad.lux
index 4d79a43b0..869eb24c7 100644
--- a/stdlib/source/spec/lux/abstract/monad.lux
+++ b/stdlib/source/spec/lux/abstract/monad.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ do)]]
   [//
    [functor (#+ Injection Comparison)]])
diff --git a/stdlib/source/spec/lux/abstract/monoid.lux b/stdlib/source/spec/lux/abstract/monoid.lux
index a590f09a1..f8626fe74 100644
--- a/stdlib/source/spec/lux/abstract/monoid.lux
+++ b/stdlib/source/spec/lux/abstract/monoid.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      [equivalence (#+ Equivalence)]]]])
diff --git a/stdlib/source/spec/lux/abstract/order.lux b/stdlib/source/spec/lux/abstract/order.lux
index e1a9eea1b..61fc22611 100644
--- a/stdlib/source/spec/lux/abstract/order.lux
+++ b/stdlib/source/spec/lux/abstract/order.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /]])
 
 (def: #export (spec (^open "@//.") generator)
diff --git a/stdlib/source/spec/lux/world/console.lux b/stdlib/source/spec/lux/world/console.lux
index cda425364..f454b61c9 100644
--- a/stdlib/source/spec/lux/world/console.lux
+++ b/stdlib/source/spec/lux/world/console.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [io (#+ IO)]
-    ["." try]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [io (#+ IO)]
+     ["." try]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]])
 
 (def: #export (spec console)
diff --git a/stdlib/source/spec/lux/world/file.lux b/stdlib/source/spec/lux/world/file.lux
index a207817f1..7bdefb173 100644
--- a/stdlib/source/spec/lux/world/file.lux
+++ b/stdlib/source/spec/lux/world/file.lux
@@ -1,33 +1,34 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." predicate]]
-   [control
-    [pipe (#+ case>)]
-    [io (#+ IO)]
-    ["." try ("#\." functor)]
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8 ("#\." codec)]]]
-    ["." binary (#+ Binary) ("#\." equivalence monoid)
-     ["$#" \test]]
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]
-   [time
-    ["." instant (#+ Instant) ("#\." equivalence)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." predicate]]
+    [control
+     [pipe (#+ case>)]
+     [io (#+ IO)]
+     ["." try ("#\." functor)]
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8 ("#\." codec)]]]
+     ["." binary (#+ Binary) ("#\." equivalence monoid)
+      ["$#" \\test]]
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]
+    [time
+     ["." instant (#+ Instant) ("#\." equivalence)]]]]
+  [\\library
    ["." /]])
 
 (def: (for_path fs)
diff --git a/stdlib/source/spec/lux/world/program.lux b/stdlib/source/spec/lux/world/program.lux
index cf413ed55..e79429627 100644
--- a/stdlib/source/spec/lux/world/program.lux
+++ b/stdlib/source/spec/lux/world/program.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." text]
-    [collection
-     ["." dictionary]
-     ["." list]]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." text]
+     [collection
+      ["." dictionary]
+      ["." list]]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]])
 
 (def: #export (spec subject)
diff --git a/stdlib/source/spec/lux/world/shell.lux b/stdlib/source/spec/lux/world/shell.lux
index 78bbd5521..c4fc51b99 100644
--- a/stdlib/source/spec/lux/world/shell.lux
+++ b/stdlib/source/spec/lux/world/shell.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]
-    [parser
-     ["." environment (#+ Environment)]]]
-   [data
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]
+     [parser
+      ["." environment (#+ Environment)]]]
+    [data
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /
     [//
      [file (#+ Path)]]]])