Normalized the hierarchy of the standard library modules.

54 files changed, 965 insertions, 911 deletions

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index 4cfc376d3..b046a7ace 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -1,44 +1,45 @@
 (.module:
-  [lux (#- Name)
-   [program (#+ program:)]
-   ["." debug]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ do>)]
-    ["." io (#+ IO)]
-    ["." try (#+ Try) ("#\." functor)]
-    ["." exception (#+ exception:)]
-    [parser
-     [environment (#+ Environment)]]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml]]
-    [collection
-     ["." set]
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." functor)]]]
-   [tool
-    [compiler
-     [language
-      [lux
-       ["." syntax]]]]]
-   [world
-    ["." shell (#+ Exit Shell)]
-    ["." console (#+ Console)]
-    ["." program (#+ Program)]
-    ["." file (#+ Path)
-     ["." watch]]
-    [net
-     ["." http #_
-      ["#" client]]]]]
+  [library
+   [lux (#- Name)
+    [program (#+ program:)]
+    ["." debug]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ do>)]
+     ["." io (#+ IO)]
+     ["." try (#+ Try) ("#\." functor)]
+     ["." exception (#+ exception:)]
+     [parser
+      [environment (#+ Environment)]]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml]]
+     [collection
+      ["." set]
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." functor)]]]
+    [tool
+     [compiler
+      [language
+       [lux
+        ["." syntax]]]]]
+    [world
+     ["." shell (#+ Exit Shell)]
+     ["." console (#+ Console)]
+     ["." program (#+ Program)]
+     ["." file (#+ Path)
+      ["." watch]]
+     [net
+      ["." http #_
+       ["#" client]]]]]]
   ["." / #_
    ["#" profile]
    ["#." action (#+ Action)]
diff --git a/stdlib/source/program/aedifex/action.lux b/stdlib/source/program/aedifex/action.lux
index e8a88facd..61c5ba3de 100644
--- a/stdlib/source/program/aedifex/action.lux
+++ b/stdlib/source/program/aedifex/action.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ Monad)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ Monad)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]]])
 
 (type: #export (Action a)
   (Promise (Try a)))
diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux
index e5d37f7bb..631de6ebe 100644
--- a/stdlib/source/program/aedifex/artifact.lux
+++ b/stdlib/source/program/aedifex/artifact.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [hash (#+ Hash)]]
-   [data
-    ["." product]
-    ["." text ("#\." order)
-     ["%" format (#+ Format)]]
-    [collection
-     ["." list ("#\." monoid)]]]
-   [world
-    ["." file (#+ Path)]
-    [net
-     ["." uri (#+ URI)]]]])
+  [library
+   [lux (#- Name)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [hash (#+ Hash)]]
+    [data
+     ["." product]
+     ["." text ("#\." order)
+      ["%" format (#+ Format)]]
+     [collection
+      ["." list ("#\." monoid)]]]
+    [world
+     ["." file (#+ Path)]
+     [net
+      ["." uri (#+ URI)]]]]])
 
 (type: #export Group
   Text)
diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux
index ad0122512..d1102437d 100644
--- a/stdlib/source/program/aedifex/artifact/extension.lux
+++ b/stdlib/source/program/aedifex/artifact/extension.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- type)
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [macro
-    ["." template]]]
+  [library
+   [lux (#- type)
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [macro
+     ["." template]]]]
   ["." // #_
    ["#" type]])
 
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 89897316d..b377c1b38 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Name Type)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." sum]
-    [format
-     ["." xml (#+ XML)]]]]
+  [library
+   [lux (#- Name Type)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." sum]
+     [format
+      ["." xml (#+ XML)]]]]]
   ["." / #_
    ["#." stamp (#+ Stamp)]])
 
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
index cd87c283e..0e8692054 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    [text
-     ["%" format]]
-    [format
-     ["." xml (#+ XML)]]]
-   [math
-    [number
-     ["." nat]]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     [text
+      ["%" format]]
+     [format
+      ["." xml (#+ XML)]]]
+    [math
+     [number
+      ["." nat]]]]])
 
 (type: #export Build
   Nat)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index 2d127af21..147369711 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." product]
-    [format
-     ["." xml (#+ XML)]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." product]
+     [format
+      ["." xml (#+ XML)]]]]]
   ["." // #_
    ["#." time (#+ Time)]
    ["#." build (#+ Build)]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index e0cb8c112..46c9b149e 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" text]
-     ["<.>" xml (#+ Parser)]]]
-   [data
-    [text
-     ["%" format]]
-    [format
-     ["." xml (#+ XML)]]]
-   [time
-    ["." instant (#+ Instant)]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" text]
+      ["<.>" xml (#+ Parser)]]]
+    [data
+     [text
+      ["%" format]]
+     [format
+      ["." xml (#+ XML)]]]
+    [time
+     ["." instant (#+ Instant)]]]]
   ["." /// #_
    ["#." time
     ["#/." date]
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 806d2b261..a1a50fcc2 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- Type)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." product]
-    ["." text]
-    [format
-     ["." xml (#+ XML)]]]]
+  [library
+   [lux (#- Type)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." product]
+     ["." text]
+     [format
+      ["." xml (#+ XML)]]]]]
   ["." /// #_
    ["#." type (#+ Type)]
    ["#." time (#+ Time)]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index 7356d897c..ce9a09f1a 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format]]]]]
   ["." /// (#+ Snapshot)
    ["#." time]
    ["#." stamp]])
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index b227c3954..41ee0d418 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["." time]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ Format)]]]
-   [time
-    ["." instant (#+ Instant)]]]
+  [library
+   [lux #*
+    ["." time]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ Format)]]]
+    [time
+     ["." instant (#+ Instant)]]]]
   ["." / #_
    ["#." date]
    ["#." time]])
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index 655b8f6c2..f6b8ae5a9 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    [text
-     ["%" format]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [time
-    ["." date ("#\." equivalence)]
-    ["." year]
-    ["." month]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     [text
+      ["%" format]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [time
+     ["." date ("#\." equivalence)]
+     ["." year]
+     ["." month]]
+    [type
+     abstract]]])
 
 (def: #export (pad value)
   (-> Nat Text)
diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux
index 5c074c20b..78b85f8cd 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["." time]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    [text
-     ["%" format]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["." time]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     [text
+      ["%" format]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    ["#" date]])
 
diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux
index cbf0a35ed..22cbd8253 100644
--- a/stdlib/source/program/aedifex/artifact/type.lux
+++ b/stdlib/source/program/aedifex/artifact/type.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux (#- Type)])
+  [library
+   [lux (#- Type)]])
 
 ## https://maven.apache.org/ref/3.6.3/maven-core/artifact-handlers.html
 (type: #export Type
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index be192e9a5..9fdc2d84d 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format]]
-    [format
-     ["." xml (#+ XML)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." time (#+ Time)
-    ["." date (#+ Date)]
-    ["." year]
-    ["." month]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format]]
+     [format
+      ["." xml (#+ XML)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." time (#+ Time)
+     ["." date (#+ Date)]
+     ["." year]
+     ["." month]]]]
   ["." // #_
    ["#." time]
    ["#." snapshot (#+ Snapshot)
diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux
index 0c943efc9..c763d572e 100644
--- a/stdlib/source/program/aedifex/cli.lux
+++ b/stdlib/source/program/aedifex/cli.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["<>" parser
-     ["." cli (#+ Parser)]]]
-   [data
-    ["." sum]
-    ["." product]
-    ["." text]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["<>" parser
+      ["." cli (#+ Parser)]]]
+    [data
+     ["." sum]
+     ["." product]
+     ["." text]]]]
   [//
    [repository
     [identity (#+ Identity)]]
diff --git a/stdlib/source/program/aedifex/command.lux b/stdlib/source/program/aedifex/command.lux
index 5248b0273..c8f8106b4 100644
--- a/stdlib/source/program/aedifex/command.lux
+++ b/stdlib/source/program/aedifex/command.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   ["." // #_
    ["#" profile]
    ["#." action (#+ Action)]])
diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux
index ee2ab4bbd..2460215b4 100644
--- a/stdlib/source/program/aedifex/command/auto.lux
+++ b/stdlib/source/program/aedifex/command/auto.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [collection
-     ["." list]
-     ["." set]]]
-   [world
-    [program (#+ Program)]
-    [shell (#+ Exit Shell)]
-    [console (#+ Console)]
-    ["." file
-     ["." watch (#+ Watcher)]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [collection
+      ["." list]
+      ["." set]]]
+    [world
+     [program (#+ Program)]
+     [shell (#+ Exit Shell)]
+     [console (#+ Console)]
+     ["." file
+      ["." watch (#+ Watcher)]]]]]
   ["." // #_
    ["/#" // #_
     [command (#+ Command)]
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 34351f636..c0f9566a8 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary]
-     ["." set]]]
-   [math
-    [number
-     ["i" int]]]
-   [world
-    ["." program (#+ Program)]
-    ["." file (#+ Path)]
-    ["." shell (#+ Exit Process Shell)]
-    ["." console (#+ Console)]
-    [net
-     ["." uri]]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary]
+      ["." set]]]
+    [math
+     [number
+      ["i" int]]]
+    [world
+     ["." program (#+ Program)]
+     ["." file (#+ Path)]
+     ["." shell (#+ Exit Process Shell)]
+     ["." console (#+ Console)]
+     [net
+      ["." uri]]]]]
   ["." /// #_
    ["#" profile]
    ["#." action]
diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux
index c37c46367..3a27e400a 100644
--- a/stdlib/source/program/aedifex/command/clean.lux
+++ b/stdlib/source/program/aedifex/command/clean.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [world
-    ["." file (#+ Path)]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [world
+     ["." file (#+ Path)]
+     ["." console (#+ Console)]]]]
   ["." /// #_
    [command (#+ Command)]
    ["#" profile]
diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux
index 5ec42be78..e70e6f762 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ do>)]
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]
-    ["<>" parser
-     ["<.>" xml]]]
-   [data
-    [binary (#+ Binary)]
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." set]]
-    [format
-     ["." binary]
-     ["." tar]
-     ["." xml]]]
-   [time
-    ["." instant (#+ Instant)]]
-   [world
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ do>)]
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]
+     ["<>" parser
+      ["<.>" xml]]]
+    [data
+     [binary (#+ Binary)]
+     [text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." set]]
+     [format
+      ["." binary]
+      ["." tar]
+      ["." xml]]]
+    [time
+     ["." instant (#+ Instant)]]
+    [world
+     ["." file]
+     ["." console (#+ Console)]]]]
   [program
    [compositor
     ["." export]]]
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index 416544e01..c2344ea80 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [collection
-     ["." set (#+ Set)]
-     ["." list ("#\." fold)]
-     ["." dictionary]]
-    [text
-     ["%" format]]]
-   [world
-    [net (#+ URL)]
-    [program (#+ Program)]
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [collection
+      ["." set (#+ Set)]
+      ["." list ("#\." fold)]
+      ["." dictionary]]
+     [text
+      ["%" format]]]
+    [world
+     [net (#+ URL)]
+     [program (#+ Program)]
+     ["." file]
+     ["." console (#+ Console)]]]]
   ["." // #_
    ["#." clean]
    ["/#" // #_
diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux
index 39bdea8b2..4cc4ede68 100644
--- a/stdlib/source/program/aedifex/command/install.lux
+++ b/stdlib/source/program/aedifex/command/install.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [binary (#+ Binary)]
-    [text
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." set]]
-    [format
-     ["." binary]
-     ["." tar]
-     ["." xml]]]
-   [world
-    [program (#+ Program)]
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [binary (#+ Binary)]
+     [text
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." set]]
+     [format
+      ["." binary]
+      ["." tar]
+      ["." xml]]]
+    [world
+     [program (#+ Program)]
+     ["." file]
+     ["." console (#+ Console)]]]]
   [program
    [compositor
     ["." export]]]
diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux
index 00427ee39..6d26f4792 100644
--- a/stdlib/source/program/aedifex/command/pom.lux
+++ b/stdlib/source/program/aedifex/command/pom.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml]]]
-   [world
-    ["." file]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     [text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml]]]
+    [world
+     ["." file]
+     ["." console (#+ Console)]]]]
   ["." /// #_
    [command (#+ Command)]
    ["#." action]
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index 55614ba80..15f8d6f22 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    [number
-     ["i" int]]]
-   [world
-    ["." program (#+ Program)]
-    ["." file]
-    ["." shell (#+ Exit Shell)]
-    ["." console (#+ Console)]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     [number
+      ["i" int]]]
+    [world
+     ["." program (#+ Program)]
+     ["." file]
+     ["." shell (#+ Exit Shell)]
+     ["." console (#+ Console)]]]]
   ["." // #_
    ["#." build]
    ["/#" // #_
diff --git a/stdlib/source/program/aedifex/command/version.lux b/stdlib/source/program/aedifex/command/version.lux
index be40d54eb..cd724843c 100644
--- a/stdlib/source/program/aedifex/command/version.lux
+++ b/stdlib/source/program/aedifex/command/version.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [control
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [tool
-    [compiler
-     ["." version]
-     ["." language #_
-      ["#/." lux #_
-       ["#" version]]]]]
-   [world
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [control
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [tool
+     [compiler
+      ["." version]
+      ["." language #_
+       ["#/." lux #_
+        ["#" version]]]]]
+    [world
+     ["." console (#+ Console)]]]]
   [///
    [command (#+ Command)]])
 
diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux
index f06b00260..1ac750d62 100644
--- a/stdlib/source/program/aedifex/dependency.lux
+++ b/stdlib/source/program/aedifex/dependency.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux (#- Type)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [hash (#+ Hash)]]
-   [data
-    ["." product]
-    ["." text ("#\." order)
-     ["%" format (#+ format)]]]]
+  [library
+   [lux (#- Type)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [hash (#+ Hash)]]
+    [data
+     ["." product]
+     ["." text ("#\." order)
+      ["%" format (#+ format)]]]]]
   ["." // #_
    ["#" artifact (#+ Artifact) ("#\." order)
     [type (#+ Type)]]])
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux
index edfa3142b..7939173dd 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   [abstract
-    [codec (#+ Codec)]
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." dictionary]
-     ["." set (#+ Set)]
-     ["." list ("#\." monoid)]]]
-   [time
-    ["." instant (#+ Instant)]]]
+  [library
+   [lux #*
+    [abstract
+     [codec (#+ Codec)]
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     [text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." dictionary]
+      ["." set (#+ Set)]
+      ["." list ("#\." monoid)]]]
+    [time
+     ["." instant (#+ Instant)]]]]
   ["." /// #_
    [repository (#+ Repository)]
    ["#." hash (#+ Hash)]
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index 698678f41..15a32959b 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -1,42 +1,43 @@
 (.module:
-  [lux (#- Name)
-   ["." debug]
-   ["." ffi (#+ import:)]
-   [abstract
-    [codec (#+ Codec)]
-    [equivalence (#+ Equivalence)]
-    [monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try) ("#\." functor)]
-    ["." exception (#+ Exception exception:)]
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." binary (#+ Binary)]
-    ["." name]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml (#+ Tag XML)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." set]
-     ["." list ("#\." functor monoid)]]]
-   [math
-    [number
-     ["n" nat]
-     ["." i64]]]
-   [world
-    [console (#+ Console)]
-    [net (#+ URL)
-     ["." uri]
-     ["." http #_
-      ["#" client]]]]]
+  [library
+   [lux (#- Name)
+    ["." debug]
+    ["." ffi (#+ import:)]
+    [abstract
+     [codec (#+ Codec)]
+     [equivalence (#+ Equivalence)]
+     [monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try) ("#\." functor)]
+     ["." exception (#+ Exception exception:)]
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." binary (#+ Binary)]
+     ["." name]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml (#+ Tag XML)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." set]
+      ["." list ("#\." functor monoid)]]]
+    [math
+     [number
+      ["n" nat]
+      ["." i64]]]
+    [world
+     [console (#+ Console)]
+     [net (#+ URL)
+      ["." uri]
+      ["." http #_
+       ["#" client]]]]]]
   ["." // (#+ Dependency)
    ["#." status (#+ Status)]
    ["/#" // #_
diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux
index f501ebc8b..db97f59b0 100644
--- a/stdlib/source/program/aedifex/dependency/status.lux
+++ b/stdlib/source/program/aedifex/dependency/status.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    [binary (#+ Binary)]
-    ["." sum]
-    ["." product]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     [binary (#+ Binary)]
+     ["." sum]
+     ["." product]]]]
   ["." /// #_
    ["#." hash (#+ Hash SHA-1 MD5)]])
 
diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux
index c7fc93b5a..1896415ea 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." functor)]
-     ["." set (#+ Set)]]]
-   [macro
-    ["." code]
-    ["." template]]]
+  [library
+   [lux #*
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." functor)]
+      ["." set (#+ Set)]]]
+    [macro
+     ["." code]
+     ["." template]]]]
   ["." // #_
    ["/" profile]
    ["#." runtime (#+ Runtime)]
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 2e0e35db0..760c05ce1 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["." ffi (#+ import:)]
-   [abstract
-    [codec (#+ Codec)]
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." binary (#+ Binary)]
-    ["." text
-     ["%" format (#+ Format format)]
-     ["." encoding]]]
-   [math
-    [number
-     ["n" nat]
-     ["." i64]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    ["." ffi (#+ import:)]
+    [abstract
+     [codec (#+ Codec)]
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." binary (#+ Binary)]
+     ["." text
+      ["%" format (#+ Format format)]
+      ["." encoding]]]
+    [math
+     [number
+      ["n" nat]
+      ["." i64]]]
+    [type
+     abstract]]])
 
 ## TODO: Replace with pure-Lux implementations of these algorithms
 ## https://en.wikipedia.org/wiki/SHA-1#SHA-1_pseudocode
diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux
index 606fefdeb..1ece2cf17 100644
--- a/stdlib/source/program/aedifex/input.lux
+++ b/stdlib/source/program/aedifex/input.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ Monad do)]]
-   [control
-    [pipe (#+ do>)]
-    ["." try (#+ Try)]
-    [parser
-     ["<.>" code]]]
-   [data
-    [binary (#+ Binary)]
-    ["." text
-     [encoding
-      ["." utf8]]]]
-   [meta
-    ["." location]]
-   [tool
-    [compiler
-     [language
-      [lux
-       ["." syntax]]]]]
-   [world
-    ["." file]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ Monad do)]]
+    [control
+     [pipe (#+ do>)]
+     ["." try (#+ Try)]
+     [parser
+      ["<.>" code]]]
+    [data
+     [binary (#+ Binary)]
+     ["." text
+      [encoding
+       ["." utf8]]]]
+    [meta
+     ["." location]]
+    [tool
+     [compiler
+      [language
+       [lux
+        ["." syntax]]]]]
+    [world
+     ["." file]]]]
   ["." // #_
    [profile (#+ Profile)]
    ["#." project (#+ Project)]
diff --git a/stdlib/source/program/aedifex/local.lux b/stdlib/source/program/aedifex/local.lux
index bf8c0f780..b3a358484 100644
--- a/stdlib/source/program/aedifex/local.lux
+++ b/stdlib/source/program/aedifex/local.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [world
-    [net
-     ["." uri (#+ URI)]]]]
+  [library
+   [lux #*
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [world
+     [net
+      ["." uri (#+ URI)]]]]]
   ["." // #_
    ["#." artifact (#+ Version Artifact)]])
 
diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux
index 843f2e056..40a7bd612 100644
--- a/stdlib/source/program/aedifex/metadata.lux
+++ b/stdlib/source/program/aedifex/metadata.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [world
-    [file (#+ Path)]
-    [net
-     ["." uri (#+ URI)]]]]
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [world
+     [file (#+ Path)]
+     [net
+      ["." uri (#+ URI)]]]]]
   ["." // #_
    ["#." artifact (#+ Artifact)]])
 
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 50f228e50..0f8a5737c 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -1,37 +1,38 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    [pipe (#+ do>)]
-    ["." try (#+ Try)]
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml (#+ XML)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." time (#+ Time)
-    ["." instant (#+ Instant)]
-    ["." date (#+ Date)]
-    ["." year]
-    ["." month]]
-   [world
-    [net
-     ["." uri (#+ URI)]]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     [pipe (#+ do>)]
+     ["." try (#+ Try)]
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml (#+ XML)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." time (#+ Time)
+     ["." instant (#+ Instant)]
+     ["." date (#+ Date)]
+     ["." year]
+     ["." month]]
+    [world
+     [net
+      ["." uri (#+ URI)]]]]]
   ["." //
    ["/#" // #_
     [repository (#+ Repository)]
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 41a0d9986..032214c90 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux (#- Name Type)
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    [pipe (#+ do> case>)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" xml (#+ Parser)]
-     ["<.>" text]]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml (#+ XML)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." time (#+ Time)
-    ["." instant (#+ Instant)]
-    ["." date (#+ Date)]
-    ["." year]
-    ["." month]]
-   [world
-    [net
-     ["." uri (#+ URI)]]]]
+  [library
+   [lux (#- Name Type)
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     [pipe (#+ do> case>)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" xml (#+ Parser)]
+      ["<.>" text]]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml (#+ XML)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." time (#+ Time)
+     ["." instant (#+ Instant)]
+     ["." date (#+ Date)]
+     ["." year]
+     ["." month]]
+    [world
+     [net
+      ["." uri (#+ URI)]]]]]
   ["." //
    ["/#" // #_
     [repository (#+ Repository)]
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index acfa7bd62..1144e8f4a 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." try (#+ Try) ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [data
-    ["." sum]
-    ["." product]
-    ["." binary (#+ Binary)]
-    [text
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml (#+ XML)]]
-    [collection
-     [set (#+ Set)]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." try (#+ Try) ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [data
+     ["." sum]
+     ["." product]
+     ["." binary (#+ Binary)]
+     [text
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml (#+ XML)]]
+     [collection
+      [set (#+ Set)]]]]]
   ["." // #_
    ["/" profile]
    ["#." hash]
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 6374f8807..d0dd59133 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux (#- Module type)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." text]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." set (#+ Set)]]]
-   [tool
-    [compiler
-     [meta
-      [archive
-       [descriptor (#+ Module)]]]]]
-   [world
-    [net (#+ URL)]]]
+  [library
+   [lux (#- Module type)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." text]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." set (#+ Set)]]]
+    [tool
+     [compiler
+      [meta
+       [archive
+        [descriptor (#+ Module)]]]]]
+    [world
+     [net (#+ URL)]]]]
   ["." // #_
    ["/" profile]
    ["#." runtime (#+ Runtime)]
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 8f45dda36..8f1dae1ea 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]
-    ["." exception]
-    ["<>" parser
-     ["<xml>" xml (#+ Parser)]]]
-   [data
-    ["." name]
-    ["." maybe ("#\." functor)]
-    ["." text]
-    [format
-     ["_" xml (#+ Tag XML)]]
-    [collection
-     ["." list ("#\." monoid functor fold)]
-     ["." set]
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try (#+ Try)]
+     ["." exception]
+     ["<>" parser
+      ["<xml>" xml (#+ Parser)]]]
+    [data
+     ["." name]
+     ["." maybe ("#\." functor)]
+     ["." text]
+     [format
+      ["_" xml (#+ Tag XML)]]
+     [collection
+      ["." list ("#\." monoid functor fold)]
+      ["." set]
+      ["." dictionary]]]]]
   ["." // #_
    ["/" profile]
    ["#." dependency (#+ Dependency)]
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 9fe05b10b..4953032a8 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux (#- Info Source Module Name)
-   [abstract
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." maybe ("#\." monoid)]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." monoid)]
-     ["." set (#+ Set)]]]
-   [macro
-    ["." template]]
-   [world
-    [net (#+ URL)]
-    [file (#+ Path)]]
-   [tool
-    [compiler
-     [meta
-      [archive
-       [descriptor (#+ Module)]]]]]]
+  [library
+   [lux (#- Info Source Module Name)
+    [abstract
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." maybe ("#\." monoid)]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." monoid)]
+      ["." set (#+ Set)]]]
+    [macro
+     ["." template]]
+    [world
+     [net (#+ URL)]
+     [file (#+ Path)]]
+    [tool
+     [compiler
+      [meta
+       [archive
+        [descriptor (#+ Module)]]]]]]]
   [//
    ["." runtime (#+ Runtime) ("#\." equivalence)]
    ["." dependency (#+ Dependency) ("#\." equivalence)]
diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux
index a35a3651c..321e86661 100644
--- a/stdlib/source/program/aedifex/project.lux
+++ b/stdlib/source/program/aedifex/project.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monoid (#+ Monoid)]
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." set (#+ Set)]
-     ["." list ("#\." fold)]]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monoid (#+ Monoid)]
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." set (#+ Set)]
+      ["." list ("#\." fold)]]]]]
   ["." // #_
    ["#" profile (#+ Name Profile)]])
 
diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux
index 05560c6c9..93e9096e7 100644
--- a/stdlib/source/program/aedifex/repository.lux
+++ b/stdlib/source/program/aedifex/repository.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [io (#+ IO)]
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]
-     ["." stm]]]
-   [data
-    [binary (#+ Binary)]]
-   [world
-    [net
-     [uri (#+ URI)]]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [io (#+ IO)]
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]
+      ["." stm]]]
+    [data
+     [binary (#+ Binary)]]
+    [world
+     [net
+      [uri (#+ URI)]]]]])
 
 (interface: #export (Repository !)
   (: Text
diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux
index ef7b0c934..dccecf291 100644
--- a/stdlib/source/program/aedifex/repository/identity.lux
+++ b/stdlib/source/program/aedifex/repository/identity.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   ["." ffi (#+ import:)]
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]]])
+  [library
+   [lux #*
+    ["." ffi (#+ import:)]
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]]]])
 
 (type: #export User
   Text)
diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux
index b68425609..e7dbb7d4d 100644
--- a/stdlib/source/program/aedifex/repository/local.lux
+++ b/stdlib/source/program/aedifex/repository/local.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [world
-    [program (#+ Program)]
-    ["." file]
-    [net
-     ["." uri (#+ URI)]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [world
+     [program (#+ Program)]
+     ["." file]
+     [net
+      ["." uri (#+ URI)]]]]]
   ["." //
    ["/#" // #_
     ["#." local]
diff --git a/stdlib/source/program/aedifex/repository/origin.lux b/stdlib/source/program/aedifex/repository/origin.lux
index ca97a8cff..be7d24a6e 100644
--- a/stdlib/source/program/aedifex/repository/origin.lux
+++ b/stdlib/source/program/aedifex/repository/origin.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." sum]
-    ["." text]]
-   [world
-    [file (#+ Path)]
-    [net (#+ URL)]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." sum]
+     ["." text]]
+    [world
+     [file (#+ Path)]
+     [net (#+ URL)]]]])
 
 (type: #export Origin
   (#Local Path)
diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux
index 7feaa9710..118085389 100644
--- a/stdlib/source/program/aedifex/repository/remote.lux
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]]
-   [tool
-    [compiler
-     ["." version]
-     ["." language #_
-      ["#/." lux #_
-       ["#" version]]]]]
-   [world
-    [net (#+ URL)
-     [uri (#+ URI)]
-     ["." http #_
-      ["#" client]
-      ["#/." status]
-      ["@#" /]]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]]
+    [tool
+     [compiler
+      ["." version]
+      ["." language #_
+       ["#/." lux #_
+        ["#" version]]]]]
+    [world
+     [net (#+ URL)
+      [uri (#+ URI)]
+      ["." http #_
+       ["#" client]
+       ["#/." status]
+       ["@#" /]]]]]]
   ["." //
    ["#." identity (#+ Identity)]
    ["/#" // #_
diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux
index 571a9fc43..f5aeef36a 100644
--- a/stdlib/source/program/aedifex/runtime.lux
+++ b/stdlib/source/program/aedifex/runtime.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- for)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monoid)]]]
-   [macro
-    ["." template]]
-   [world
-    ["." file]]])
+  [library
+   [lux (#- for)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monoid)]]]
+    [macro
+     ["." template]]
+    [world
+     ["." file]]]])
 
 (type: #export Runtime
   {#program Text
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index b964e6502..6c0f700c2 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -1,54 +1,55 @@
 (.module:
-  [lux (#- Module)
-   [type (#+ :share)]
-   ["." debug]
-   [abstract
-    [monad (#+ Monad do)]]
-   [control
-    ["." io (#+ IO io)]
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." row (#+ Row)]]]
-   [time
-    ["." instant]]
-   ["." world #_
-    ["." file]
-    ["#/." program]
-    ## ["." console]
-    ]
-   [tool
-    [compiler
-     ["." phase]
-     [default
-      ["." platform (#+ Platform)]]
-     [language
-      ["$" lux
-       ["#/." program (#+ Program)]
-       ["." syntax]
-       ["." analysis
-        [macro (#+ Expander)]]
-       ["." generation (#+ Buffer Context)]
-       ["." directive]
-       [phase
-        [extension (#+ Extender)]]]]
-     [meta
-      [packager (#+ Packager)]
-      [archive (#+ Archive)
-       [descriptor (#+ Module)]]
-      [cache
-       ["." dependency]]
-      [io
-       ["ioW" archive]]]]
-    ## ["." interpreter]
-    ]]
+  [library
+   [lux (#- Module)
+    [type (#+ :share)]
+    ["." debug]
+    [abstract
+     [monad (#+ Monad do)]]
+    [control
+     ["." io (#+ IO io)]
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." row (#+ Row)]]]
+    [time
+     ["." instant]]
+    ["." world #_
+     ["." file]
+     ["#/." program]
+     ## ["." console]
+     ]
+    [tool
+     [compiler
+      ["." phase]
+      [default
+       ["." platform (#+ Platform)]]
+      [language
+       ["$" lux
+        ["#/." program (#+ Program)]
+        ["." syntax]
+        ["." analysis
+         [macro (#+ Expander)]]
+        ["." generation (#+ Buffer Context)]
+        ["." directive]
+        [phase
+         [extension (#+ Extender)]]]]
+      [meta
+       [packager (#+ Packager)]
+       [archive (#+ Archive)
+        [descriptor (#+ Module)]]
+       [cache
+        ["." dependency]]
+       [io
+        ["ioW" archive]]]]
+     ## ["." interpreter]
+     ]]]
   ["." / #_
    ["#." cli (#+ Service)]
    ["#." static (#+ Static)]
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
diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux
index 0d86b0f1c..420b40a8b 100644
--- a/stdlib/source/program/scriptum.lux
+++ b/stdlib/source/program/scriptum.lux
@@ -272,8 +272,9 @@
 
 (def: (lux-module? module-name)
   (-> Text Bit)
-  (or (text\= "lux" module-name)
-      (text.starts-with? "lux/" module-name)))
+  (let [prefix (format .prelude_module "/")]
+    (or (text\= .prelude_module module-name)
+        (text.starts-with? prefix module-name))))
 
 (def: (add-definition [name [def-type def-annotations def-value]] organization)
   (-> [Text Definition] Organization Organization)