Normalized the hierarchy of the standard library modules.

4 files changed, 71 insertions, 67 deletions

diff --git a/stdlib/source/program/compositor/cli.lux b/stdlib/source/program/compositor/cli.lux
index 4c4384636..d3b61640b 100644
--- a/stdlib/source/program/compositor/cli.lux
+++ b/stdlib/source/program/compositor/cli.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Module Source)
-   [control
-    [pipe (#+ case>)]
-    ["<>" parser
-     ["." cli (#+ Parser)]]]
-   [tool
-    [compiler
-     [meta
-      [archive
-       [descriptor (#+ Module)]]]]]
-   [world
-    [file (#+ Path)]]])
+  [library
+   [lux (#- Module Source)
+    [control
+     [pipe (#+ case>)]
+     ["<>" parser
+      ["." cli (#+ Parser)]]]
+    [tool
+     [compiler
+      [meta
+       [archive
+        [descriptor (#+ Module)]]]]]
+    [world
+     [file (#+ Path)]]]])
 
 (type: #export Source
   Path)
diff --git a/stdlib/source/program/compositor/export.lux b/stdlib/source/program/compositor/export.lux
index 24ba3492c..9c2bdef52 100644
--- a/stdlib/source/program/compositor/export.lux
+++ b/stdlib/source/program/compositor/export.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- Source)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." row]]
-    [format
-     ["." binary]
-     ["." tar]]]
-   [time
-    ["." instant]]
-   [tool
-    [compiler
-     [meta
-      ["." io #_
-       ["#" context (#+ Extension)]]]]]
-   [world
-    ["." file]]]
+  [library
+   [lux (#- Source)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." row]]
+     [format
+      ["." binary]
+      ["." tar]]]
+    [time
+     ["." instant]]
+    [tool
+     [compiler
+      [meta
+       ["." io #_
+        ["#" context (#+ Extension)]]]]]
+    [world
+     ["." file]]]]
   [//
    [cli (#+ Source Export)]])
 
diff --git a/stdlib/source/program/compositor/import.lux b/stdlib/source/program/compositor/import.lux
index f91ad03e7..4edb82a5e 100644
--- a/stdlib/source/program/compositor/import.lux
+++ b/stdlib/source/program/compositor/import.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux (#- Module)
-   [abstract
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]
-    ["<>" parser
-     ["<.>" binary]]]
-   [data
-    [binary (#+ Binary)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." row]]
-    [format
-     ["." tar]]]
-   [tool
-    [compiler
-     [meta
-      [archive
-       [descriptor (#+ Module)]]]]]
-   [world
-    ["." file]]]
+  [library
+   [lux (#- Module)
+    [abstract
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]
+     ["<>" parser
+      ["<.>" binary]]]
+    [data
+     [binary (#+ Binary)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." row]]
+     [format
+      ["." tar]]]
+    [tool
+     [compiler
+      [meta
+       [archive
+        [descriptor (#+ Module)]]]]]
+    [world
+     ["." file]]]]
   [//
    [cli (#+ Library)]])
 
diff --git a/stdlib/source/program/compositor/static.lux b/stdlib/source/program/compositor/static.lux
index d5e100f30..ee65f9f72 100644
--- a/stdlib/source/program/compositor/static.lux
+++ b/stdlib/source/program/compositor/static.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [target (#+ Target)]
-   [world
-    [file (#+ Path)]]])
+  [library
+   [lux #*
+    [target (#+ Target)]
+    [world
+     [file (#+ Path)]]]])
 
 (type: #export Static
   {#host Target