Normalized the hierarchy of the standard library modules.

750 files changed, 12767 insertions, 11819 deletions

diff --git a/stdlib/source/lux.lux b/stdlib/source/library/lux.lux
index da491b2c8..3a7fa442b 100644
--- a/stdlib/source/lux.lux
+++ b/stdlib/source/library/lux.lux
@@ -18,14 +18,19 @@
  [dummy_location (9 #1 (0 #0))]
  #0)
 
+("lux def" prelude_module
+ "library/lux"
+ [dummy_location (9 #1 (0 #0))]
+ #1)
+
 ## (type: Any
 ##   (Ex [a] a))
 ("lux def" Any
  ("lux type check type"
-  (9 #1 ["lux" "Any"]
+  (9 #1 [..prelude_module "Any"]
      (8 #0 (0 #0) (4 #0 1))))
  [dummy_location
-  (9 #1 (0 #1 [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (0 #1 [[dummy_location (7 #0 [..prelude_module "doc"])]
                [dummy_location (5 #0 ("lux text concat"
                                       ("lux text concat" "The type of things whose type is irrelevant." __paragraph)
                                       "It can be used to write functions or data-structures that can take, or return, anything."))]]
@@ -36,10 +41,10 @@
 ##   (All [a] a))
 ("lux def" Nothing
  ("lux type check type"
-  (9 #1 ["lux" "Nothing"]
+  (9 #1 [..prelude_module "Nothing"]
      (7 #0 (0 #0) (4 #0 1))))
  [dummy_location
-  (9 #1 (0 #1 [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (0 #1 [[dummy_location (7 #0 [..prelude_module "doc"])]
                [dummy_location (5 #0 ("lux text concat"
                                       ("lux text concat" "The type of things whose type is undefined." __paragraph)
                                       "Useful for expressions that cause errors or other 'extraordinary' conditions."))]]
@@ -50,7 +55,7 @@
 ##   #Nil
 ##   (#Cons a (List a)))
 ("lux def type tagged" List
- (9 #1 ["lux" "List"]
+ (9 #1 [..prelude_module "List"]
     (7 #0 (0 #0)
        (1 #0 ## "lux.Nil"
           Any
@@ -58,9 +63,9 @@
           (2 #0 (4 #0 1)
              (9 #0 (4 #0 1) (4 #0 0))))))
  [dummy_location
-  (9 #1 (0 #1 [[dummy_location (7 #0 ["lux" "type-args"])]
+  (9 #1 (0 #1 [[dummy_location (7 #0 [..prelude_module "type-args"])]
                [dummy_location (9 #0 (0 #1 [dummy_location (5 #0 "a")] (0 #0)))]]
-           (0 #1 [[dummy_location (7 #0 ["lux" "doc"])]
+           (0 #1 [[dummy_location (7 #0 [..prelude_module "doc"])]
                   [dummy_location (5 #0 "A potentially empty list of values.")]]
               (0 #0))))]
  ["Nil" "Cons"]
@@ -68,31 +73,31 @@
 
 ("lux def" Bit
  ("lux type check type"
-  (9 #1 ["lux" "Bit"]
+  (9 #1 [..prelude_module "Bit"]
      (0 #0 "#Bit" #Nil)))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "Your standard, run-of-the-mill boolean values (as bits).")]]
                #Nil))]
  #1)
 
 ("lux def" I64
  ("lux type check type"
-  (9 #1 ["lux" "I64"]
+  (9 #1 [..prelude_module "I64"]
      (7 #0 (0 #0)
         (0 #0 "#I64" (#Cons (4 #0 1) #Nil)))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "64-bit integers without any semantics.")]]
                #Nil))]
  #1)
 
 ("lux def" Nat
  ("lux type check type"
-  (9 #1 ["lux" "Nat"]
+  (9 #1 [..prelude_module "Nat"]
      (0 #0 "#I64" (#Cons (0 #0 "#Nat" #Nil) #Nil))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 ("lux text concat"
                                        ("lux text concat" "Natural numbers (unsigned integers)." __paragraph)
                                        "They start at zero (0) and extend in the positive direction."))]]
@@ -101,20 +106,20 @@
 
 ("lux def" Int
  ("lux type check type"
-  (9 #1 ["lux" "Int"]
+  (9 #1 [..prelude_module "Int"]
      (0 #0 "#I64" (#Cons (0 #0 "#Int" #Nil) #Nil))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "Your standard, run-of-the-mill integer numbers.")]]
                #Nil))]
  #1)
 
 ("lux def" Rev
  ("lux type check type"
-  (9 #1 ["lux" "Rev"]
+  (9 #1 [..prelude_module "Rev"]
      (0 #0 "#I64" (#Cons (0 #0 "#Rev" #Nil) #Nil))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 ("lux text concat"
                                        ("lux text concat" "Fractional numbers that live in the interval [0,1)." __paragraph)
                                        "Useful for probability, and other domains that work within that interval."))]]
@@ -123,30 +128,30 @@
 
 ("lux def" Frac
  ("lux type check type"
-  (9 #1 ["lux" "Frac"]
+  (9 #1 [..prelude_module "Frac"]
      (0 #0 "#Frac" #Nil)))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "Your standard, run-of-the-mill floating-point (fractional) numbers.")]]
                #Nil))]
  #1)
 
 ("lux def" Text
  ("lux type check type"
-  (9 #1 ["lux" "Text"]
+  (9 #1 [..prelude_module "Text"]
      (0 #0 "#Text" #Nil)))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "Your standard, run-of-the-mill string values.")]]
                #Nil))]
  #1)
 
 ("lux def" Name
  ("lux type check type"
-  (9 #1 ["lux" "Name"]
+  (9 #1 [..prelude_module "Name"]
      (2 #0 Text Text)))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "A name. It is used as part of Lux syntax to represent identifiers and tags.")]]
                #Nil))]
  #1)
@@ -155,16 +160,16 @@
 ##   #None
 ##   (#Some a))
 ("lux def type tagged" Maybe
- (9 #1 ["lux" "Maybe"]
+ (9 #1 [..prelude_module "Maybe"]
     (7 #0 #Nil
        (1 #0 ## "lux.None"
           Any
           ## "lux.Some"
           (4 #0 1))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "type-args"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "type-args"])]
                 [dummy_location (9 #0 (#Cons [dummy_location (5 #0 "a")] #Nil))]]
-               (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+               (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                        [dummy_location (5 #0 "A potentially missing value.")]]
                       #Nil)))]
  ["None" "Some"]
@@ -184,7 +189,7 @@
 ##   (#Named Name Type)
 ##   )
 ("lux def type tagged" Type
- (9 #1 ["lux" "Type"]
+ (9 #1 [..prelude_module "Type"]
     ({Type
       ({Type_List
         ({Type_Pair
@@ -216,9 +221,9 @@
        ("lux type check type" (9 #0 Type List)))}
      ("lux type check type" (9 #0 (4 #0 1) (4 #0 0)))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "This type represents the data-structures that are used to specify types themselves.")]]
-               (#Cons [[dummy_location (7 #0 ["lux" "type-rec?"])]
+               (#Cons [[dummy_location (7 #0 [..prelude_module "type-rec?"])]
                        [dummy_location (0 #0 #1)]]
                       #Nil)))]
  ["Primitive" "Sum" "Product" "Function" "Parameter" "Var" "Ex" "UnivQ" "ExQ" "Apply" "Named"]
@@ -229,10 +234,10 @@
 ##    #line   Nat
 ##    #column Nat})
 ("lux def type tagged" Location
- (#Named ["lux" "Location"]
+ (#Named [..prelude_module "Location"]
          (#Product Text (#Product Nat Nat)))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "Locations are for specifying the location of Code nodes in Lux files during compilation.")]]
                #Nil))]
  ["module" "line" "column"]
@@ -242,15 +247,15 @@
 ##   {#meta  m
 ##    #datum v})
 ("lux def type tagged" Ann
- (#Named ["lux" "Ann"]
+ (#Named [..prelude_module "Ann"]
          (#UnivQ #Nil
                  (#UnivQ #Nil
                          (#Product (#Parameter 3)
                                    (#Parameter 1)))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "doc"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "doc"])]
                 [dummy_location (5 #0 "The type of things that can be annotated with meta-data of arbitrary types.")]]
-               (#Cons [[dummy_location (7 #0 ["lux" "type-args"])]
+               (#Cons [[dummy_location (7 #0 [..prelude_module "type-args"])]
                        [dummy_location (9 #0 (#Cons [dummy_location (5 #0 "m")] (#Cons [dummy_location (5 #0 "v")] #Nil)))]]
                       #Nil)))]
  ["meta" "datum"]
@@ -269,7 +274,7 @@
 ##   (#Tuple (List (w (Code' w))))
 ##   (#Record (List [(w (Code' w)) (w (Code' w))])))
 ("lux def type tagged" Code'
- (#Named ["lux" "Code'"]
+ (#Named [..prelude_module "Code'"]
          ({Code
            ({Code_List
              (#UnivQ #Nil
@@ -302,7 +307,7 @@
                                                  (#Parameter 0))
                                          (#Parameter 1)))))
  [dummy_location
-  (9 #1 (#Cons [[dummy_location (7 #0 ["lux" "type-args"])]
+  (9 #1 (#Cons [[dummy_location (7 #0 [..prelude_module "type-args"])]
                 [dummy_location (9 #0 (#Cons [dummy_location (5 #0 "w")] #Nil))]]
                #Nil))]
  ["Bit" "Nat" "Int" "Rev" "Frac" "Text" "Identifier" "Tag" "Form" "Tuple" "Record"]
@@ -311,12 +316,12 @@
 ## (type: Code
 ##   (Ann Location (Code' (Ann Location))))
 ("lux def" Code
- (#Named ["lux" "Code"]
+ (#Named [..prelude_module "Code"]
          ({w
            (#Apply (#Apply w Code') w)}
           ("lux type check type" (#Apply Location Ann))))
  [dummy_location
-  (#Record (#Cons [[dummy_location (#Tag ["lux" "doc"])]
+  (#Record (#Cons [[dummy_location (#Tag [..prelude_module "doc"])]
                    [dummy_location (#Text "The type of Code nodes for Lux syntax.")]]
                   #Nil))]
  #1)
@@ -413,9 +418,9 @@
 ##   [Bit Type Code Any])
 ("lux def" Definition
  ("lux type check type"
-  (#Named ["lux" "Definition"]
+  (#Named [..prelude_module "Definition"]
           (#Product Bit (#Product Type (#Product Code Any)))))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ "Represents all the data associated with a definition: its type, its annotations, and its value.")]
                  #Nil))
  #1)
@@ -424,7 +429,7 @@
 ##   Name)
 ("lux def" Alias
  ("lux type check type"
-  (#Named ["lux" "Alias"]
+  (#Named [..prelude_module "Alias"]
           Name))
  (record$ #Nil)
  #1)
@@ -433,10 +438,10 @@
 ##   (#Alias Alias)
 ##   (#Definition Definition))
 ("lux def type tagged" Global
- (#Named ["lux" "Global"]
+ (#Named [..prelude_module "Global"]
          (#Sum Alias
                Definition))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ "Represents all the data associated with a global constant.")]
                  #Nil))
  ["Alias" "Definition"]
@@ -446,7 +451,7 @@
 ##   {#counter Nat
 ##    #mappings (List [k v])})
 ("lux def type tagged" Bindings
- (#Named ["lux" "Bindings"]
+ (#Named [..prelude_module "Bindings"]
          (#UnivQ #Nil
                  (#UnivQ #Nil
                          (#Product ## "lux.counter"
@@ -455,7 +460,7 @@
                           (#Apply (#Product (#Parameter 3)
                                             (#Parameter 1))
                                   List)))))
- (record$ (#Cons [(tag$ ["lux" "type-args"])
+ (record$ (#Cons [(tag$ [..prelude_module "type-args"])
                   (tuple$ (#Cons (text$ "k") (#Cons (text$ "v") #Nil)))]
                  #Nil))
  ["counter" "mappings"]
@@ -465,7 +470,7 @@
 ##   (#Local Nat)
 ##   (#Captured Nat))
 ("lux def type tagged" Ref
- (#Named ["lux" "Ref"]
+ (#Named [..prelude_module "Ref"]
          (#Sum ## Local
           Nat
           ## Captured
@@ -480,7 +485,7 @@
 ##    #locals   (Bindings Text [Type Nat])
 ##    #captured (Bindings Text [Type Ref])})
 ("lux def type tagged" Scope
- (#Named ["lux" "Scope"]
+ (#Named [..prelude_module "Scope"]
          (#Product ## name
           (#Apply Text List)
           (#Product ## inner
@@ -503,16 +508,16 @@
 ##   (#Left l)
 ##   (#Right r))
 ("lux def type tagged" Either
- (#Named ["lux" "Either"]
+ (#Named [..prelude_module "Either"]
          (#UnivQ #Nil
                  (#UnivQ #Nil
                          (#Sum ## "lux.Left"
                           (#Parameter 3)
                           ## "lux.Right"
                           (#Parameter 1)))))
- (record$ (#Cons [(tag$ ["lux" "type-args"])
+ (record$ (#Cons [(tag$ [..prelude_module "type-args"])
                   (tuple$ (#Cons (text$ "l") (#Cons (text$ "r") #Nil)))]
-                 (#Cons [(tag$ ["lux" "doc"])
+                 (#Cons [(tag$ [..prelude_module "doc"])
                          (text$ "A choice between two values of different types.")]
                         #Nil)))
  ["Left" "Right"]
@@ -522,7 +527,7 @@
 ##   [Location Nat Text])
 ("lux def" Source
  ("lux type check type"
-  (#Named ["lux" "Source"]
+  (#Named [..prelude_module "Source"]
           (#Product Location (#Product Nat Text))))
  (record$ #Nil)
  #1)
@@ -532,7 +537,7 @@
 ##   #Compiled
 ##   #Cached)
 ("lux def type tagged" Module_State
- (#Named ["lux" "Module_State"]
+ (#Named [..prelude_module "Module_State"]
          (#Sum
           ## #Active
           Any
@@ -555,7 +560,7 @@
 ##    #module_annotations (Maybe Code)
 ##    #module_state       Module_State})
 ("lux def type tagged" Module
- (#Named ["lux" "Module"]
+ (#Named [..prelude_module "Module"]
          (#Product ## "lux.module_hash"
           Nat
           (#Product ## "lux.module_aliases"
@@ -581,7 +586,7 @@
                 (#Apply Code Maybe)
                 Module_State))
               ))))))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ "All the information contained within a Lux module.")]
                  #Nil))
  ["module_hash" "module_aliases" "definitions" "imports" "tags" "types" "module_annotations" "module_state"]
@@ -592,7 +597,7 @@
 ##    #var_counter Nat
 ##    #var_bindings (List [Nat (Maybe Type)])})
 ("lux def type tagged" Type_Context
- (#Named ["lux" "Type_Context"]
+ (#Named [..prelude_module "Type_Context"]
          (#Product ## ex_counter
           Nat
           (#Product ## var_counter
@@ -609,14 +614,14 @@
 ##   #Eval
 ##   #Interpreter)
 ("lux def type tagged" Mode
- (#Named ["lux" "Mode"]
+ (#Named [..prelude_module "Mode"]
          (#Sum ## Build
           Any
           (#Sum ## Eval
            Any
            ## Interpreter
            Any)))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ "A sign that shows the conditions under which the compiler is running.")]
                  #Nil))
  ["Build" "Eval" "Interpreter"]
@@ -627,7 +632,7 @@
 ##    #version Text
 ##    #mode    Mode})
 ("lux def type tagged" Info
- (#Named ["lux" "Info"]
+ (#Named [..prelude_module "Info"]
          (#Product
           ## target
           Text
@@ -636,7 +641,7 @@
            Text
            ## mode
            Mode)))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ "Information about the current version and type of compiler that is running.")]
                  #Nil))
  ["target" "version" "mode"]
@@ -656,7 +661,7 @@
 ##    #extensions      Any
 ##    #host            Any})
 ("lux def type tagged" Lux
- (#Named ["lux" "Lux"]
+ (#Named [..prelude_module "Lux"]
          (#Product ## "lux.info"
           Info
           (#Product ## "lux.source"
@@ -681,7 +686,7 @@
                     Any
                     ## "lux.host"
                     Any))))))))))))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ ("lux text concat"
                           ("lux text concat" "Represents the state of the Lux compiler during a run." __paragraph)
                           ("lux text concat"
@@ -695,16 +700,16 @@
 ##   (-> Lux (Either Text [Lux a])))
 ("lux def" Meta
  ("lux type check type"
-  (#Named ["lux" "Meta"]
+  (#Named [..prelude_module "Meta"]
           (#UnivQ #Nil
                   (#Function Lux
                              (#Apply (#Product Lux (#Parameter 1))
                                      (#Apply Text Either))))))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ ("lux text concat"
                           ("lux text concat" "Computations that can have access to the state of the compiler." __paragraph)
                           "These computations may fail, or modify the state of the compiler."))]
-                 (#Cons [(tag$ ["lux" "type-args"])
+                 (#Cons [(tag$ [..prelude_module "type-args"])
                          (tuple$ (#Cons (text$ "a") #Nil))]
                         #Nil)))
  #1)
@@ -713,7 +718,7 @@
 ##   (-> (List Code) (Meta (List Code))))
 ("lux def" Macro'
  ("lux type check type"
-  (#Named ["lux" "Macro'"]
+  (#Named [..prelude_module "Macro'"]
           (#Function Code_List (#Apply Code_List Meta))))
  (record$ #Nil)
  #1)
@@ -722,9 +727,9 @@
 ##   (primitive "#Macro"))
 ("lux def" Macro
  ("lux type check type"
-  (#Named ["lux" "Macro"]
+  (#Named [..prelude_module "Macro"]
           (#Primitive "#Macro" #Nil)))
- (record$ (#Cons [(tag$ ["lux" "doc"])
+ (record$ (#Cons [(tag$ [..prelude_module "doc"])
                   (text$ "Functions that run at compile-time and allow you to transform and extend the language in powerful ways.")]
                  #Nil))
  #1)
@@ -781,7 +786,7 @@
                                                  body
 
                                                  _
-                                                 (_ann (#Form (#Cons (_ann (#Identifier ["lux" "function''"]))
+                                                 (_ann (#Form (#Cons (_ann (#Identifier [..prelude_module "function''"]))
                                                                      (#Cons (_ann (#Tuple args'))
                                                                             (#Cons body #Nil)))))}
                                                 args')
@@ -795,7 +800,7 @@
                                                  body
 
                                                  _
-                                                 (_ann (#Form (#Cons (_ann (#Identifier ["lux" "function''"]))
+                                                 (_ann (#Form (#Cons (_ann (#Identifier [..prelude_module "function''"]))
                                                                      (#Cons (_ann (#Tuple args'))
                                                                             (#Cons body #Nil)))))}
                                                 args')
@@ -827,15 +832,15 @@
 ("lux def" flag_meta
  ("lux type check" (#Function Text Code)
   ([_ tag]
-   (tuple$ (#Cons [(meta_code ["lux" "Tag"] (tuple$ (#Cons (text$ "lux") (#Cons (text$ tag) #Nil))))
-                   (#Cons [(meta_code ["lux" "Bit"] (bit$ #1))
+   (tuple$ (#Cons [(meta_code [..prelude_module "Tag"] (tuple$ (#Cons (text$ ..prelude_module) (#Cons (text$ tag) #Nil))))
+                   (#Cons [(meta_code [..prelude_module "Bit"] (bit$ #1))
                            #Nil])]))))
  (record$ #Nil)
  #0)
 
 ("lux def" doc_meta
  ("lux type check" (#Function Text (#Product Code Code))
-  (function'' [doc] [(tag$ ["lux" "doc"]) (text$ doc)]))
+  (function'' [doc] [(tag$ [..prelude_module "doc"]) (text$ doc)]))
  (record$ #Nil)
  #0)
 
@@ -856,7 +861,7 @@
 ("lux def" as_function
  ("lux type check" (#Function Code (#Function (#Apply Code List) (#Function Code Code)))
   (function'' [self inputs output]
-              (form$ (#Cons (identifier$ ["lux" "function''"])
+              (form$ (#Cons (identifier$ [..prelude_module "function''"])
                             (#Cons self
                                    (#Cons (tuple$ inputs)
                                           (#Cons output #Nil)))))))
@@ -879,7 +884,7 @@
                         (#Cons [[_ (#Form (#Cons [name args]))]
                                 (#Cons [meta (#Cons [type (#Cons [body #Nil])])])])])
                 (return (#Cons [(as_def name (as_checked type (as_function name args body))
-                                        (form$ (#Cons (identifier$ ["lux" "record$"])
+                                        (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                       (#Cons meta
                                                              #Nil)))
                                         #1)
@@ -887,7 +892,7 @@
 
                 (#Cons [[_ (#Tag ["" "export"])] (#Cons [name (#Cons [meta (#Cons [type (#Cons [body #Nil])])])])])
                 (return (#Cons [(as_def name (as_checked type body)
-                                        (form$ (#Cons (identifier$ ["lux" "record$"])
+                                        (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                       (#Cons meta
                                                              #Nil)))
                                         #1)
@@ -896,7 +901,7 @@
                 (#Cons [[_ (#Form (#Cons [name args]))]
                         (#Cons [meta (#Cons [type (#Cons [body #Nil])])])])
                 (return (#Cons [(as_def name (as_checked type (as_function name args body))
-                                        (form$ (#Cons (identifier$ ["lux" "record$"])
+                                        (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                       (#Cons meta
                                                              #Nil)))
                                         #0)
@@ -904,7 +909,7 @@
 
                 (#Cons [name (#Cons [meta (#Cons [type (#Cons [body #Nil])])])])
                 (return (#Cons [(as_def name (as_checked type body)
-                                        (form$ (#Cons (identifier$ ["lux" "record$"])
+                                        (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                       (#Cons meta
                                                              #Nil)))
                                         #0)
@@ -921,23 +926,23 @@
   (function'' [tokens]
               ({(#Cons [_ (#Form (#Cons name args))] (#Cons body #Nil))
                 (return (#Cons (as_def name (as_macro (as_function name args body))
-                                       (form$ (#Cons (identifier$ ["lux" "record$"])
-                                                     (#Cons (tag$ ["lux" "Nil"])
+                                       (form$ (#Cons (identifier$ [..prelude_module "record$"])
+                                                     (#Cons (tag$ [..prelude_module "Nil"])
                                                             #Nil)))
                                        #0)
                                #Nil))
 
                 (#Cons [_ (#Tag ["" "export"])] (#Cons [_ (#Form (#Cons name args))] (#Cons body #Nil)))
                 (return (#Cons (as_def name (as_macro (as_function name args body))
-                                       (form$ (#Cons (identifier$ ["lux" "record$"])
-                                                     (#Cons (tag$ ["lux" "Nil"])
+                                       (form$ (#Cons (identifier$ [..prelude_module "record$"])
+                                                     (#Cons (tag$ [..prelude_module "Nil"])
                                                             #Nil)))
                                        #1)
                                #Nil))
 
                 (#Cons [_ (#Tag ["" "export"])] (#Cons [_ (#Form (#Cons name args))] (#Cons meta_data (#Cons body #Nil))))
                 (return (#Cons (as_def name (as_macro (as_function name args body))
-                                       (form$ (#Cons (identifier$ ["lux" "record$"])
+                                       (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                      (#Cons meta_data
                                                             #Nil)))
                                        #1)
@@ -950,7 +955,7 @@
  #0)
 
 (macro:' #export (comment tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Throws away any code given to it." __paragraph)
                          ("lux text concat"
@@ -964,8 +969,8 @@
            (return tokens)
 
            (#Cons x (#Cons y xs))
-           (return (#Cons (form$ (#Cons (identifier$ ["lux" "$'"])
-                                        (#Cons (form$ (#Cons (tag$ ["lux" "Apply"])
+           (return (#Cons (form$ (#Cons (identifier$ [..prelude_module "$'"])
+                                        (#Cons (form$ (#Cons (tag$ [..prelude_module "Apply"])
                                                              (#Cons y (#Cons x #Nil))))
                                                xs)))
                           #Nil))
@@ -1073,8 +1078,8 @@
                                                  [name (update_parameters val)])))
                              pairs))
 
-          [_ (#Form (#Cons [_ (#Tag "lux" "Parameter")] (#Cons [_ (#Nat idx)] #Nil)))]
-          (form$ (#Cons (tag$ ["lux" "Parameter"]) (#Cons (nat$ ("lux i64 +" 2 idx)) #Nil)))
+          [_ (#Form (#Cons [_ (#Tag "library/lux" "Parameter")] (#Cons [_ (#Nat idx)] #Nil)))]
+          (form$ (#Cons (tag$ [..prelude_module "Parameter"]) (#Cons (nat$ ("lux i64 +" 2 idx)) #Nil)))
 
           [_ (#Form members)]
           (form$ (list\map update_parameters members))
@@ -1103,7 +1108,7 @@
 (def:'' (make_parameter idx)
         #Nil
         (#Function Nat Code)
-        (form$ (#Cons (tag$ ["lux" "Parameter"]) (#Cons (nat$ idx) #Nil))))
+        (form$ (#Cons (tag$ [..prelude_module "Parameter"]) (#Cons (nat$ idx) #Nil))))
 
 (def:'' (list\fold f init xs)
         #Nil
@@ -1128,7 +1133,7 @@
         (list\fold (function'' [_ acc] ("lux i64 +" 1 acc)) 0 list))
 
 (macro:' #export (All tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Universal quantification." __paragraph)
                          ("lux text concat"
@@ -1148,8 +1153,8 @@
                                          (function'' [names]
                                                      (let'' body' (list\fold ("lux type check" (#Function Text (#Function Code Code))
                                                                               (function'' [name' body']
-                                                                                          (form$ (#Cons (tag$ ["lux" "UnivQ"])
-                                                                                                        (#Cons (tag$ ["lux" "Nil"])
+                                                                                          (form$ (#Cons (tag$ [..prelude_module "UnivQ"])
+                                                                                                        (#Cons (tag$ [..prelude_module "Nil"])
                                                                                                                (#Cons (replace_syntax (#Cons [name' (make_parameter 1)] #Nil)
                                                                                                                                       (update_parameters body')) #Nil))))))
                                                                              body
@@ -1172,7 +1177,7 @@
                  tokens)))
 
 (macro:' #export (Ex tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Existential quantification." __paragraph)
                          ("lux text concat"
@@ -1192,8 +1197,8 @@
                                          (function'' [names]
                                                      (let'' body' (list\fold ("lux type check" (#Function Text (#Function Code Code))
                                                                               (function'' [name' body']
-                                                                                          (form$ (#Cons (tag$ ["lux" "ExQ"])
-                                                                                                        (#Cons (tag$ ["lux" "Nil"])
+                                                                                          (form$ (#Cons (tag$ [..prelude_module "ExQ"])
+                                                                                                        (#Cons (tag$ [..prelude_module "Nil"])
                                                                                                                (#Cons (replace_syntax (#Cons [name' (make_parameter 1)] #Nil)
                                                                                                                                       (update_parameters body')) #Nil))))))
                                                                              body
@@ -1224,7 +1229,7 @@
                    list))
 
 (macro:' #export (-> tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Function types:" __paragraph)
                          ("lux text concat"
@@ -1233,7 +1238,7 @@
                 #Nil)
          ({(#Cons output inputs)
            (return (#Cons (list\fold ("lux type check" (#Function Code (#Function Code Code))
-                                      (function'' [i o] (form$ (#Cons (tag$ ["lux" "Function"]) (#Cons i (#Cons o #Nil))))))
+                                      (function'' [i o] (form$ (#Cons (tag$ [..prelude_module "Function"]) (#Cons i (#Cons o #Nil))))))
                                      output
                                      inputs)
                           #Nil))
@@ -1243,21 +1248,21 @@
           (list\reverse tokens)))
 
 (macro:' #export (list xs)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## List-construction macro." __paragraph)
                          "(list +1 +2 +3)"))]
                 #Nil)
          (return (#Cons (list\fold (function'' [head tail]
-                                               (form$ (#Cons (tag$ ["lux" "Cons"])
+                                               (form$ (#Cons (tag$ [..prelude_module "Cons"])
                                                              (#Cons (tuple$ (#Cons [head (#Cons [tail #Nil])]))
                                                                     #Nil))))
-                                   (tag$ ["lux" "Nil"])
+                                   (tag$ [..prelude_module "Nil"])
                                    (list\reverse xs))
                         #Nil)))
 
 (macro:' #export (list& xs)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## List-construction macro, with the last element being a tail-list." __paragraph)
                          ("lux text concat"
@@ -1266,7 +1271,7 @@
                 #Nil)
          ({(#Cons last init)
            (return (list (list\fold (function'' [head tail]
-                                                (form$ (list (tag$ ["lux" "Cons"])
+                                                (form$ (list (tag$ [..prelude_module "Cons"])
                                                              (tuple$ (list head tail)))))
                                     last
                                     init)))
@@ -1276,7 +1281,7 @@
           (list\reverse xs)))
 
 (macro:' #export (& tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Tuple types:" __paragraph)
                          ("lux text concat"
@@ -1286,16 +1291,16 @@
                            "(&)"))))]
                 #Nil)
          ({#Nil
-           (return (list (identifier$ ["lux" "Any"])))
+           (return (list (identifier$ [..prelude_module "Any"])))
 
            (#Cons last prevs)
-           (return (list (list\fold (function'' [left right] (form$ (list (tag$ ["lux" "Product"]) left right)))
+           (return (list (list\fold (function'' [left right] (form$ (list (tag$ [..prelude_module "Product"]) left right)))
                                     last
                                     prevs)))}
           (list\reverse tokens)))
 
 (macro:' #export (| tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Variant types:" __paragraph)
                          ("lux text concat"
@@ -1305,10 +1310,10 @@
                            "(|)"))))]
                 #Nil)
          ({#Nil
-           (return (list (identifier$ ["lux" "Nothing"])))
+           (return (list (identifier$ [..prelude_module "Nothing"])))
 
            (#Cons last prevs)
-           (return (list (list\fold (function'' [left right] (form$ (list (tag$ ["lux" "Sum"]) left right)))
+           (return (list (list\fold (function'' [left right] (form$ (list (tag$ [..prelude_module "Sum"]) left right)))
                                     last
                                     prevs)))}
           (list\reverse tokens)))
@@ -1347,11 +1352,11 @@
                                       name
                                       (form$ (list (text$ "lux type check")
                                                    type
-                                                   (form$ (list (identifier$ ["lux" "function'"])
+                                                   (form$ (list (identifier$ [..prelude_module "function'"])
                                                                 name
                                                                 (tuple$ args)
                                                                 body))))
-                                      (form$ (#Cons (identifier$ ["lux" "record$"])
+                                      (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                     (#Cons meta
                                                            #Nil)))
                                       (bit$ #1)))))
@@ -1362,7 +1367,7 @@
                                       (form$ (list (text$ "lux type check")
                                                    type
                                                    body))
-                                      (form$ (#Cons (identifier$ ["lux" "record$"])
+                                      (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                     (#Cons meta
                                                            #Nil)))
                                       (bit$ #1)))))
@@ -1373,11 +1378,11 @@
                                       name
                                       (form$ (list (text$ "lux type check")
                                                    type
-                                                   (form$ (list (identifier$ ["lux" "function'"])
+                                                   (form$ (list (identifier$ [..prelude_module "function'"])
                                                                 name
                                                                 (tuple$ args)
                                                                 body))))
-                                      (form$ (#Cons (identifier$ ["lux" "record$"])
+                                      (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                     (#Cons meta
                                                            #Nil)))
                                       (bit$ #0)))))
@@ -1386,7 +1391,7 @@
            (return (list (form$ (list (text$ "lux def")
                                       name
                                       (form$ (list (text$ "lux type check") type body))
-                                      (form$ (#Cons (identifier$ ["lux" "record$"])
+                                      (form$ (#Cons (identifier$ [..prelude_module "record$"])
                                                     (#Cons meta
                                                            #Nil)))
                                       (bit$ #0)))))
@@ -1443,10 +1448,10 @@
          #Nil
          (-> ($' List Code) Code)
          ({#Nil
-           (_ann (#Tag ["lux" "Nil"]))
+           (_ann (#Tag [..prelude_module "Nil"]))
 
            (#Cons [token tokens'])
-           (_ann (#Form (list (_ann (#Tag ["lux" "Cons"])) token (untemplate_list tokens'))))}
+           (_ann (#Form (list (_ann (#Tag [..prelude_module "Cons"])) token (untemplate_list tokens'))))}
           tokens))
 
 (def:''' (list\compose xs ys)
@@ -1477,7 +1482,7 @@
                     (func left right)))
 
 (macro:' #export (_$ tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Left-association for the application of binary functions over variadic arguments." ..\n)
                          ("lux text concat"
@@ -1499,7 +1504,7 @@
           tokens))
 
 (macro:' #export ($_ tokens)
-         (#Cons [(tag$ ["lux" "doc"])
+         (#Cons [(tag$ [..prelude_module "doc"])
                  (text$ ("lux text concat"
                          ("lux text concat" "## Right-association for the application of binary functions over variadic arguments." ..\n)
                          ("lux text concat"
@@ -1526,7 +1531,7 @@
 ##   (: (All [a b] (-> (-> a (m b)) (m a) (m b)))
 ##      bind))
 ("lux def type tagged" Monad
- (#Named ["lux" "Monad"]
+ (#Named [..prelude_module "Monad"]
          (All [m]
            (& (All [a] (-> a ($' m a)))
               (All [a b] (-> (-> a ($' m b))
@@ -1574,7 +1579,7 @@
                                     (function' [binding body']
                                                (let' [[var value] binding]
                                                      ({[_ (#Tag "" "let")]
-                                                       (form$ (list (identifier$ ["lux" "let'"]) value body'))
+                                                       (form$ (list (identifier$ [..prelude_module "let'"]) value body'))
 
                                                        _
                                                        (form$ (list g!bind
@@ -1583,7 +1588,7 @@
                                                       var))))
                                    body
                                    (list\reverse (as_pairs bindings)))]
-                 (return (list (form$ (list (record$ (list [(record$ (list [(tag$ ["lux" "wrap"]) g!wrap] [(tag$ ["lux" "bind"]) g!bind]))
+                 (return (list (form$ (list (record$ (list [(record$ (list [(tag$ [..prelude_module "wrap"]) g!wrap] [(tag$ [..prelude_module "bind"]) g!bind]))
                                                             body']))
                                             monad)))))
 
@@ -1632,7 +1637,7 @@
                 xs)))
 
 (macro:' #export (if tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "Picks which expression to evaluate based on a bit test value." __paragraph
                            "(if #1 ''Oh, yeah!'' ''Aw hell naw!'')" __paragraph
@@ -1740,9 +1745,9 @@
 (def:''' (as_code_list expression)
          #Nil
          (-> Code Code)
-         (let' [type (form$ (list (tag$ ["lux" "Apply"])
-                                  (identifier$ ["lux" "Code"])
-                                  (identifier$ ["lux" "List"])))]
+         (let' [type (form$ (list (tag$ [..prelude_module "Apply"])
+                                  (identifier$ [..prelude_module "Code"])
+                                  (identifier$ [..prelude_module "List"])))]
                (form$ (list (text$ "lux type check") type expression))))
 
 (def:''' (splice replace? untemplate elems)
@@ -1750,7 +1755,7 @@
          (-> Bit (-> Code ($' Meta Code)) ($' List Code) ($' Meta Code))
          ({#1
            ({#Nil
-             (return (tag$ ["lux" "Nil"]))
+             (return (tag$ [..prelude_module "Nil"]))
              
              (#Cons lastI inits)
              (do meta_monad
@@ -1760,21 +1765,21 @@
                         _
                         (do meta_monad
                           [lastO (untemplate lastI)]
-                          (wrap (as_code_list (form$ (list (tag$ ["lux" "Cons"])
-                                                           (tuple$ (list lastO (tag$ ["lux" "Nil"]))))))))}
+                          (wrap (as_code_list (form$ (list (tag$ [..prelude_module "Cons"])
+                                                           (tuple$ (list lastO (tag$ [..prelude_module "Nil"]))))))))}
                        lastI)]
                (monad\fold meta_monad
                            (function' [leftI rightO]
                                       ({[_ (#Form (#Cons [[_ (#Identifier ["" "~+"])] (#Cons [spliced #Nil])]))]
                                         (let' [g!in-module (form$ (list (text$ "lux in-module")
-                                                                        (text$ "lux")
-                                                                        (identifier$ ["lux" "list\compose"])))]
+                                                                        (text$ ..prelude_module)
+                                                                        (identifier$ [..prelude_module "list\compose"])))]
                                               (wrap (form$ (list g!in-module (as_code_list spliced) rightO))))
 
                                         _
                                         (do meta_monad
                                           [leftO (untemplate leftI)]
-                                          (wrap (form$ (list (tag$ ["lux" "Cons"]) (tuple$ (list leftO rightO))))))}
+                                          (wrap (form$ (list (tag$ [..prelude_module "Cons"]) (tuple$ (list leftO rightO))))))}
                                        leftI))
                            lastO
                            inits))}
@@ -1788,31 +1793,31 @@
 (def:''' (untemplate_text value)
          #Nil
          (-> Text Code)
-         (wrap_meta (form$ (list (tag$ ["lux" "Text"]) (text$ value)))))
+         (wrap_meta (form$ (list (tag$ [..prelude_module "Text"]) (text$ value)))))
 
 (def:''' (untemplate replace? subst token)
          #Nil
          (-> Bit Text Code ($' Meta Code))
          ({[_ [_ (#Bit value)]]
-           (return (wrap_meta (form$ (list (tag$ ["lux" "Bit"]) (bit$ value)))))
+           (return (wrap_meta (form$ (list (tag$ [..prelude_module "Bit"]) (bit$ value)))))
 
            [_ [_ (#Nat value)]]
-           (return (wrap_meta (form$ (list (tag$ ["lux" "Nat"]) (nat$ value)))))
+           (return (wrap_meta (form$ (list (tag$ [..prelude_module "Nat"]) (nat$ value)))))
 
            [_ [_ (#Int value)]]
-           (return (wrap_meta (form$ (list (tag$ ["lux" "Int"]) (int$ value)))))
+           (return (wrap_meta (form$ (list (tag$ [..prelude_module "Int"]) (int$ value)))))
 
            [_ [_ (#Rev value)]]
-           (return (wrap_meta (form$ (list (tag$ ["lux" "Rev"]) (rev$ value)))))
+           (return (wrap_meta (form$ (list (tag$ [..prelude_module "Rev"]) (rev$ value)))))
            
            [_ [_ (#Frac value)]]
-           (return (wrap_meta (form$ (list (tag$ ["lux" "Frac"]) (frac$ value)))))
+           (return (wrap_meta (form$ (list (tag$ [..prelude_module "Frac"]) (frac$ value)))))
 
            [_ [_ (#Text value)]]
            (return (untemplate_text value))
 
            [#0 [_ (#Tag [module name])]]
-           (return (wrap_meta (form$ (list (tag$ ["lux" "Tag"]) (tuple$ (list (text$ module) (text$ name)))))))
+           (return (wrap_meta (form$ (list (tag$ [..prelude_module "Tag"]) (tuple$ (list (text$ module) (text$ name)))))))
 
            [#1 [_ (#Tag [module name])]]
            (let' [module' ({""
@@ -1821,7 +1826,7 @@
                             _
                             module}
                            module)]
-                 (return (wrap_meta (form$ (list (tag$ ["lux" "Tag"]) (tuple$ (list (text$ module') (text$ name))))))))
+                 (return (wrap_meta (form$ (list (tag$ [..prelude_module "Tag"]) (tuple$ (list (text$ module') (text$ name))))))))
 
            [#1 [_ (#Identifier [module name])]]
            (do meta_monad
@@ -1834,20 +1839,20 @@
                           (wrap [module name])}
                          module)
               #let [[module name] real_name]]
-             (return (wrap_meta (form$ (list (tag$ ["lux" "Identifier"]) (tuple$ (list (text$ module) (text$ name))))))))
+             (return (wrap_meta (form$ (list (tag$ [..prelude_module "Identifier"]) (tuple$ (list (text$ module) (text$ name))))))))
 
            [#0 [_ (#Identifier [module name])]]
-           (return (wrap_meta (form$ (list (tag$ ["lux" "Identifier"]) (tuple$ (list (text$ module) (text$ name)))))))
+           (return (wrap_meta (form$ (list (tag$ [..prelude_module "Identifier"]) (tuple$ (list (text$ module) (text$ name)))))))
 
            [#1 [_ (#Form (#Cons [[_ (#Identifier ["" "~"])] (#Cons [unquoted #Nil])]))]]
            (return (form$ (list (text$ "lux type check")
-                                (identifier$ ["lux" "Code"])
+                                (identifier$ [..prelude_module "Code"])
                                 unquoted)))
 
            [#1 [_ (#Form (#Cons [[_ (#Identifier ["" "~!"])] (#Cons [dependent #Nil])]))]]
            (do meta_monad
              [independent (untemplate replace? subst dependent)]
-             (wrap (wrap_meta (form$ (list (tag$ ["lux" "Form"])
+             (wrap (wrap_meta (form$ (list (tag$ [..prelude_module "Form"])
                                            (untemplate_list (list (untemplate_text "lux in-module")
                                                                   (untemplate_text subst)
                                                                   independent)))))))
@@ -1858,13 +1863,13 @@
            [_ [meta (#Form elems)]]
            (do meta_monad
              [output (splice replace? (untemplate replace? subst) elems)
-              #let [[_ output'] (wrap_meta (form$ (list (tag$ ["lux" "Form"]) output)))]]
+              #let [[_ output'] (wrap_meta (form$ (list (tag$ [..prelude_module "Form"]) output)))]]
              (wrap [meta output']))
 
            [_ [meta (#Tuple elems)]]
            (do meta_monad
              [output (splice replace? (untemplate replace? subst) elems)
-              #let [[_ output'] (wrap_meta (form$ (list (tag$ ["lux" "Tuple"]) output)))]]
+              #let [[_ output'] (wrap_meta (form$ (list (tag$ [..prelude_module "Tuple"]) output)))]]
              (wrap [meta output']))
 
            [_ [_ (#Record fields)]]
@@ -1878,20 +1883,20 @@
                                                       =v (untemplate replace? subst v)]
                                                      (wrap (tuple$ (list =k =v)))))))
                                  fields)]
-             (wrap (wrap_meta (form$ (list (tag$ ["lux" "Record"]) (untemplate_list =fields))))))}
+             (wrap (wrap_meta (form$ (list (tag$ [..prelude_module "Record"]) (untemplate_list =fields))))))}
           [replace? token]))
 
 (macro:' #export (primitive tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Macro to treat define new primitive types." __paragraph
                            "(primitive ''java.lang.Object'')" __paragraph
                            "(primitive ''java.util.List'' [(primitive ''java.lang.Long'')])"))])
          ({(#Cons [_ (#Text class_name)] #Nil)
-           (return (list (form$ (list (tag$ ["lux" "Primitive"]) (text$ class_name) (tag$ ["lux" "Nil"])))))
+           (return (list (form$ (list (tag$ [..prelude_module "Primitive"]) (text$ class_name) (tag$ [..prelude_module "Nil"])))))
 
            (#Cons [_ (#Text class_name)] (#Cons [_ (#Tuple params)] #Nil))
-           (return (list (form$ (list (tag$ ["lux" "Primitive"]) (text$ class_name) (untemplate_list params)))))
+           (return (list (form$ (list (tag$ [..prelude_module "Primitive"]) (text$ class_name) (untemplate_list params)))))
 
            _
            (fail "Wrong syntax for primitive")}
@@ -1913,7 +1918,7 @@
          state))
 
 (macro:' #export (` tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Hygienic quasi-quotation as a macro. Unquote (~) and unquote-splice (~+) must also be used as forms." __paragraph
                            "## All unprefixed macros will receive their parent module's prefix if imported; otherwise will receive the prefix of the module on which the quasi-quote is being used." __paragraph
@@ -1923,7 +1928,7 @@
              [current_module current_module_name
               =template (untemplate #1 current_module template)]
              (wrap (list (form$ (list (text$ "lux type check")
-                                      (identifier$ ["lux" "Code"])
+                                      (identifier$ [..prelude_module "Code"])
                                       =template)))))
 
            _
@@ -1931,35 +1936,35 @@
           tokens))
 
 (macro:' #export (`' tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Unhygienic quasi-quotation as a macro. Unquote (~) and unquote-splice (~+) must also be used as forms." __paragraph
                            "(`' (def: (~ name) (function (_ (~+ args)) (~ body))))"))])
          ({(#Cons template #Nil)
            (do meta_monad
              [=template (untemplate #1 "" template)]
-             (wrap (list (form$ (list (text$ "lux type check") (identifier$ ["lux" "Code"]) =template)))))
+             (wrap (list (form$ (list (text$ "lux type check") (identifier$ [..prelude_module "Code"]) =template)))))
 
            _
            (fail "Wrong syntax for `")}
           tokens))
 
 (macro:' #export (' tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Quotation as a macro." __paragraph
                            "(' YOLO)"))])
          ({(#Cons template #Nil)
            (do meta_monad
              [=template (untemplate #0 "" template)]
-             (wrap (list (form$ (list (text$ "lux type check") (identifier$ ["lux" "Code"]) =template)))))
+             (wrap (list (form$ (list (text$ "lux type check") (identifier$ [..prelude_module "Code"]) =template)))))
 
            _
            (fail "Wrong syntax for '")}
           tokens))
 
 (macro:' #export (|> tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Piping macro." __paragraph
                            "(|> elems (list\map int\encode) (interpose '' '') (fold text\compose ''''))" __paragraph
@@ -1985,7 +1990,7 @@
           tokens))
 
 (macro:' #export (<| tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Reverse piping macro." __paragraph
                            "(<| (fold text\compose '''') (interpose '' '') (list\map int\encode) elems)" __paragraph
@@ -2011,7 +2016,7 @@
           (list\reverse tokens)))
 
 (def:''' (compose f g)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ "Function composition.")])
          (All [a b c]
            (-> (-> b c) (-> a b) (-> a c)))
@@ -2133,7 +2138,7 @@
          (list\fold list\compose #Nil (list\reverse xs)))
 
 (macro:' #export (template tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## By specifying a pattern (with holes), and the input data to fill those holes, repeats the pattern as many times as necessary." __paragraph
                            "(template [<name> <diff>]" ..\n
@@ -2264,7 +2269,7 @@
          (|> n (n/% div) ("lux i64 =" 0)))
 
 (def:''' #export (not x)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Bit negation." __paragraph
                            "(not #1) => #0" __paragraph
@@ -2275,7 +2280,7 @@
 (def:''' (macro_type? type)
          (list)
          (-> Type Bit)
-         ({(#Named ["lux" "Macro"] (#Primitive "#Macro" #Nil))
+         ({(#Named ["library/lux" "Macro"] (#Primitive "#Macro" #Nil))
            #1
 
            _
@@ -2472,7 +2477,7 @@
           type))
 
 (macro:' #export (type tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Takes a type expression and returns it's representation as data-structure." __paragraph
                            "(type (All [a] (Maybe (List a))))"))])
@@ -2491,7 +2496,7 @@
           tokens))
 
 (macro:' #export (: tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## The type-annotation macro." __paragraph
                            "(: (List Int) (list +1 +2 +3))"))])
@@ -2503,7 +2508,7 @@
           tokens))
 
 (macro:' #export (:as tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## The type-coercion macro." __paragraph
                            "(:as Dinosaur (list +1 +2 +3))"))])
@@ -2601,7 +2606,7 @@
           state))
 
 (macro:' #export (Rec tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Parameter-less recursive types." __paragraph
                            "## A name has to be given to the whole type, to use it within its body." __paragraph
@@ -2616,7 +2621,7 @@
           tokens))
 
 (macro:' #export (exec tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Sequential execution of expressions (great for side-effects)." __paragraph
                            "(exec" ..\n
@@ -2778,7 +2783,7 @@
         branches))
 
 (macro:' #export (case tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## The pattern-matching macro." ..\n
                            "## Allows the usage of macros within the patterns to provide custom syntax." ..\n
@@ -2797,7 +2802,7 @@
           tokens))
 
 (macro:' #export (^ tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Macro-expanding patterns." ..\n
                            "## It's a special macro meant to be used with 'case'." ..\n
@@ -2822,7 +2827,7 @@
            (fail "Wrong syntax for ^ macro")))
 
 (macro:' #export (^or tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Or-patterns." ..\n
                            "## It's a special macro meant to be used with 'case'." ..\n
@@ -2860,7 +2865,7 @@
          #0))
 
 (macro:' #export (let tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Creates local bindings." ..\n
                            "## Can (optionally) use pattern-matching macros when binding." ..\n
@@ -2886,7 +2891,7 @@
            (fail "Wrong syntax for let")))
 
 (macro:' #export (function tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Syntax for creating functions." ..\n
                            "## Allows for giving the function itself a name, for the sake of recursion." ..\n
@@ -2921,25 +2926,25 @@
        (-> Code Code)
        (case code
          [_ (#Bit value)]
-         (meta_code ["lux" "Bit"] (bit$ value))
+         (meta_code [..prelude_module "Bit"] (bit$ value))
          
          [_ (#Nat value)]
-         (meta_code ["lux" "Nat"] (nat$ value))
+         (meta_code [..prelude_module "Nat"] (nat$ value))
 
          [_ (#Int value)]
-         (meta_code ["lux" "Int"] (int$ value))
+         (meta_code [..prelude_module "Int"] (int$ value))
 
          [_ (#Rev value)]
-         (meta_code ["lux" "Rev"] (rev$ value))
+         (meta_code [..prelude_module "Rev"] (rev$ value))
 
          [_ (#Frac value)]
-         (meta_code ["lux" "Frac"] (frac$ value))
+         (meta_code [..prelude_module "Frac"] (frac$ value))
 
          [_ (#Text value)]
-         (meta_code ["lux" "Text"] (text$ value))
+         (meta_code [..prelude_module "Text"] (text$ value))
 
          [_ (#Tag [prefix name])]
-         (meta_code ["lux" "Tag"] (` [(~ (text$ prefix)) (~ (text$ name))]))
+         (meta_code [..prelude_module "Tag"] (` [(~ (text$ prefix)) (~ (text$ name))]))
 
          (^or [_ (#Form _)] [_ (#Identifier _)])
          code
@@ -2948,7 +2953,7 @@
          (|> xs
              (list\map process_def_meta_value)
              untemplate_list
-             (meta_code ["lux" "Tuple"]))
+             (meta_code [..prelude_module "Tuple"]))
 
          [_ (#Record kvs)]
          (|> kvs
@@ -2957,7 +2962,7 @@
                             (` [(~ (process_def_meta_value k))
                                 (~ (process_def_meta_value v))]))))
              untemplate_list
-             (meta_code ["lux" "Record"]))
+             (meta_code [..prelude_module "Record"]))
          ))
 
 (def:' (process_def_meta kvs)
@@ -2975,7 +2980,7 @@
          meta
 
          _
-         (` (#.Cons [[(~ location_code) (#.Tag ["lux" "func-args"])]
+         (` (#.Cons [[(~ location_code) (#.Tag [..prelude_module "func-args"])]
                      [(~ location_code) (#.Tuple (.list (~+ (list\map (function (_ arg)
                                                                         (` [(~ location_code) (#.Text (~ (text$ (code\encode arg))))]))
                                                                       args))))]]
@@ -3002,7 +3007,7 @@
          (list)))
 
 (macro:' #export (def: tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Defines global constants/functions." ..\n
                            "(def: (rejoin_pair pair)" ..\n
@@ -3085,7 +3090,7 @@
     base))
 
 (macro:' #export (macro: tokens)
-         (list [(tag$ ["lux" "doc"])
+         (list [(tag$ [..prelude_module "doc"])
                 (text$ ($_ "lux text concat"
                            "## Macro-definition macro." ..\n
                            "(macro: #export (name_of tokens)" ..\n
@@ -5241,7 +5246,7 @@
   (-> Type Type)
   (case type
     (^template [<name>]
-      [(#Named ["lux" <name>] _)
+      [(#Named ["library/lux" <name>] _)
        type])
     (["Bit"]
      ["Nat"]
@@ -5263,7 +5268,7 @@
      #let [[type value] type+value]]
     (case (flatten_alias type)
       (^template [<name> <type> <wrapper>]
-        [(#Named ["lux" <name>] _)
+        [(#Named ["library/lux" <name>] _)
          (wrap (<wrapper> (:as <type> value)))])
       (["Bit"  Bit  bit$]
        ["Nat"  Nat  nat$]
@@ -5426,7 +5431,7 @@
   {#.doc (doc "Given an identifier or a tag, gives back a 2 tuple with the prefix and name parts, both as Text."
               (name_of #.doc)
               "=>"
-              ["lux" "doc"])}
+              [..prelude_module "doc"])}
   (case tokens
     (^template [<tag>]
       [(^ (list [_ (<tag> [prefix name])]))
@@ -5434,7 +5439,7 @@
     ([#Identifier] [#Tag])
     
     _
-    (fail (..wrong_syntax_error ["lux" "name_of"]))))
+    (fail (..wrong_syntax_error [..prelude_module "name_of"]))))
 
 (def: (get_scope_type_vars state)
   (Meta (List Nat))
@@ -5715,7 +5720,7 @@
        #let [[type value] type+value]]
       (case (..flatten_alias type)
         (^or (#Primitive "#Text" #Nil)
-             (#Named ["lux" "Text"] (#Primitive "#Text" #Nil)))
+             (#Named ["library/lux" "Text"] (#Primitive "#Text" #Nil)))
         (wrap (:as ..Text value))
 
         _
diff --git a/stdlib/source/lux/abstract/algebra.lux b/stdlib/source/library/lux/abstract/algebra.lux
index 14d29bf16..8e611b513 100644
--- a/stdlib/source/lux/abstract/algebra.lux
+++ b/stdlib/source/library/lux/abstract/algebra.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [control
-    [functor (#+ Fix)]]])
+  [library
+   [lux #*
+    [control
+     [functor (#+ Fix)]]]])
 
 (type: #export (Algebra f a)
   (-> (f a) a))
diff --git a/stdlib/source/lux/abstract/apply.lux b/stdlib/source/library/lux/abstract/apply.lux
index 6f0e61ba8..0f63efc65 100644
--- a/stdlib/source/lux/abstract/apply.lux
+++ b/stdlib/source/library/lux/abstract/apply.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    [monad (#+ Monad)]
    ["." functor (#+ Functor)]])
diff --git a/stdlib/source/lux/abstract/codec.lux b/stdlib/source/library/lux/abstract/codec.lux
index 454b64cb5..2d734673f 100644
--- a/stdlib/source/lux/abstract/codec.lux
+++ b/stdlib/source/library/lux/abstract/codec.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [control
-    ["." try (#+ Try)]]]
+  [library
+   [lux #*
+    [control
+     ["." try (#+ Try)]]]]
   [//
    [monad (#+ do)]
    ["." functor]])
diff --git a/stdlib/source/lux/abstract/comonad.lux b/stdlib/source/library/lux/abstract/comonad.lux
index 63565bd3a..362556f50 100644
--- a/stdlib/source/lux/abstract/comonad.lux
+++ b/stdlib/source/library/lux/abstract/comonad.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." list ("#\." fold)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [meta
-    ["." location]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." list ("#\." fold)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [meta
+     ["." location]]]]
   [//
    [functor (#+ Functor)]])
 
diff --git a/stdlib/source/lux/abstract/comonad/cofree.lux b/stdlib/source/library/lux/abstract/comonad/cofree.lux
index 64413f1ce..c0236f079 100644
--- a/stdlib/source/lux/abstract/comonad/cofree.lux
+++ b/stdlib/source/library/lux/abstract/comonad/cofree.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [// (#+ CoMonad)
    [//
     [functor (#+ Functor)]]])
diff --git a/stdlib/source/lux/abstract/enum.lux b/stdlib/source/library/lux/abstract/enum.lux
index d98848f78..e80975172 100644
--- a/stdlib/source/lux/abstract/enum.lux
+++ b/stdlib/source/library/lux/abstract/enum.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    ["." order (#+ Order)]])
 
diff --git a/stdlib/source/lux/abstract/equivalence.lux b/stdlib/source/library/lux/abstract/equivalence.lux
index 58d644c9b..bb21f7711 100644
--- a/stdlib/source/lux/abstract/equivalence.lux
+++ b/stdlib/source/library/lux/abstract/equivalence.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    [functor
     ["." contravariant]]])
diff --git a/stdlib/source/lux/abstract/fold.lux b/stdlib/source/library/lux/abstract/fold.lux
index 3f957bb55..168d743be 100644
--- a/stdlib/source/lux/abstract/fold.lux
+++ b/stdlib/source/library/lux/abstract/fold.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    [monoid (#+ Monoid)]])
 
diff --git a/stdlib/source/lux/abstract/functor.lux b/stdlib/source/library/lux/abstract/functor.lux
index d3012b686..fb56625e8 100644
--- a/stdlib/source/lux/abstract/functor.lux
+++ b/stdlib/source/library/lux/abstract/functor.lux
@@ -1,4 +1,5 @@
-(.module: lux)
+(.module: [library
+           lux])
 
 (interface: #export (Functor f)
   (: (All [a b]
diff --git a/stdlib/source/lux/abstract/functor/contravariant.lux b/stdlib/source/library/lux/abstract/functor/contravariant.lux
index d91813e1f..db66f1265 100644
--- a/stdlib/source/lux/abstract/functor/contravariant.lux
+++ b/stdlib/source/library/lux/abstract/functor/contravariant.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*])
+  [library
+   [lux #*]])
 
 (interface: #export (Functor f)
   (: (All [a b]
diff --git a/stdlib/source/lux/abstract/hash.lux b/stdlib/source/library/lux/abstract/hash.lux
index 14857ef18..2cc18f3e4 100644
--- a/stdlib/source/lux/abstract/hash.lux
+++ b/stdlib/source/library/lux/abstract/hash.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    ["." equivalence (#+ Equivalence)]
    [functor
diff --git a/stdlib/source/lux/abstract/interval.lux b/stdlib/source/library/lux/abstract/interval.lux
index e43529890..5fbf26109 100644
--- a/stdlib/source/lux/abstract/interval.lux
+++ b/stdlib/source/library/lux/abstract/interval.lux
@@ -1,6 +1,7 @@
 ## https://en.wikipedia.org/wiki/Interval_(mathematics)
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    [equivalence (#+ Equivalence)]
    ["." order]
diff --git a/stdlib/source/lux/abstract/monad.lux b/stdlib/source/library/lux/abstract/monad.lux
index d32bdacbb..a99baf75b 100644
--- a/stdlib/source/lux/abstract/monad.lux
+++ b/stdlib/source/library/lux/abstract/monad.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [meta
-    ["." location]]]
+  [library
+   [lux #*
+    [meta
+     ["." location]]]]
   [//
    [functor (#+ Functor)]])
 
diff --git a/stdlib/source/lux/abstract/monad/free.lux b/stdlib/source/library/lux/abstract/monad/free.lux
index 7a9efbeea..9648fbc8e 100644
--- a/stdlib/source/lux/abstract/monad/free.lux
+++ b/stdlib/source/library/lux/abstract/monad/free.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [///
    [functor (#+ Functor)]
    [apply (#+ Apply)]
diff --git a/stdlib/source/lux/abstract/monad/indexed.lux b/stdlib/source/library/lux/abstract/monad/indexed.lux
index 5a5a63b27..92db5f045 100644
--- a/stdlib/source/lux/abstract/monad/indexed.lux
+++ b/stdlib/source/library/lux/abstract/monad/indexed.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [control
-    [monad]
-    ["p" parser
-     ["s" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." list ("#\." functor fold)]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]])
+  [library
+   [lux #*
+    [control
+     [monad]
+     ["p" parser
+      ["s" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." list ("#\." functor fold)]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]]])
 
 (interface: #export (IxMonad m)
   (: (All [p a]
diff --git a/stdlib/source/lux/abstract/monoid.lux b/stdlib/source/library/lux/abstract/monoid.lux
index 2b5560421..87f155848 100644
--- a/stdlib/source/lux/abstract/monoid.lux
+++ b/stdlib/source/library/lux/abstract/monoid.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*])
+  [library
+   [lux #*]])
 
 (interface: #export (Monoid a)
   {#.doc (doc "A way to compose values."
diff --git a/stdlib/source/lux/abstract/order.lux b/stdlib/source/library/lux/abstract/order.lux
index 9d031bca2..3eaafaf3a 100644
--- a/stdlib/source/lux/abstract/order.lux
+++ b/stdlib/source/library/lux/abstract/order.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [control
-    ["." function]]]
+  [library
+   [lux #*
+    [control
+     ["." function]]]]
   [//
    ["." equivalence (#+ Equivalence)]
    [functor
diff --git a/stdlib/source/lux/abstract/predicate.lux b/stdlib/source/library/lux/abstract/predicate.lux
index 841865c10..205ccc316 100644
--- a/stdlib/source/lux/abstract/predicate.lux
+++ b/stdlib/source/library/lux/abstract/predicate.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [control
-    ["." function]]]
+  [library
+   [lux #*
+    [control
+     ["." function]]]]
   [//
    [monoid (#+ Monoid)]
    [functor
diff --git a/stdlib/source/lux/control/concatenative.lux b/stdlib/source/library/lux/control/concatenative.lux
index 51c2604b6..2143a0c97 100644
--- a/stdlib/source/lux/control/concatenative.lux
+++ b/stdlib/source/library/lux/control/concatenative.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- Alias if loop)
-   ["." meta]
-   [abstract
-    ["." monad]]
-   [data
-    ["." maybe ("#\." monad)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold functor)]]]
-   ["." macro (#+ with_gensyms)
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" export]
-     ["|.|" annotations]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]
-     ["r" rev]
-     ["f" frac]]]]
+  [library
+   [lux (#- Alias if loop)
+    ["." meta]
+    [abstract
+     ["." monad]]
+    [data
+     ["." maybe ("#\." monad)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold functor)]]]
+    ["." macro (#+ with_gensyms)
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" export]
+      ["|.|" annotations]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]
+      ["r" rev]
+      ["f" frac]]]]]
   [//
    ["<>" parser ("#\." monad)
     ["<c>" code (#+ Parser)]]])
diff --git a/stdlib/source/lux/control/concurrency/actor.lux b/stdlib/source/library/lux/control/concurrency/actor.lux
index 9e17193b2..a12e65471 100644
--- a/stdlib/source/lux/control/concurrency/actor.lux
+++ b/stdlib/source/library/lux/control/concurrency/actor.lux
@@ -1,34 +1,35 @@
 (.module: {#.doc "The actor model of concurrency."}
-  [lux #*
-   [abstract
-    monad]
-   [control
-    [pipe (#+ case>)]
-    ["." function]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monoid monad fold)]]]
-   ["." macro (#+ with_gensyms)
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" input]
-     ["|.|" export]
-     ["|.|" annotations]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." meta (#+ monad)
-    ["." annotation]]
-   [type (#+ :share)
-    ["." abstract (#+ abstract: :representation :abstraction)]]]
+  [library
+   [lux #*
+    [abstract
+     monad]
+    [control
+     [pipe (#+ case>)]
+     ["." function]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monoid monad fold)]]]
+    ["." macro (#+ with_gensyms)
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" input]
+      ["|.|" export]
+      ["|.|" annotations]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." meta (#+ monad)
+     ["." annotation]]
+    [type (#+ :share)
+     ["." abstract (#+ abstract: :representation :abstraction)]]]]
   [//
    ["." atom (#+ Atom atom)]
    ["." promise (#+ Promise Resolver) ("#\." monad)]
diff --git a/stdlib/source/lux/control/concurrency/atom.lux b/stdlib/source/library/lux/control/concurrency/atom.lux
index e3b711785..057bfd5b2 100644
--- a/stdlib/source/lux/control/concurrency/atom.lux
+++ b/stdlib/source/library/lux/control/concurrency/atom.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." io (#- run) ("#\." functor)]]
-   [data
-    ["." product]
-    [collection
-     ["." array]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    ["." ffi]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." io (#- run) ("#\." functor)]]
+    [data
+     ["." product]
+     [collection
+      ["." array]]]
+    [type
+     abstract]]])
 
 (with_expansions [<jvm> (as_is (ffi.import: (java/util/concurrent/atomic/AtomicReference a)
                                  ["#::."
diff --git a/stdlib/source/lux/control/concurrency/frp.lux b/stdlib/source/library/lux/control/concurrency/frp.lux
index 452c153f1..416b8c7c4 100644
--- a/stdlib/source/lux/control/concurrency/frp.lux
+++ b/stdlib/source/library/lux/control/concurrency/frp.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [predicate (#+ Predicate)]
-    [equivalence (#+ Equivalence)]
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]]
-   [data
-    ["." maybe ("#\." functor)]]
-   [type (#+ :share)
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [predicate (#+ Predicate)]
+     [equivalence (#+ Equivalence)]
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]]
+    [data
+     ["." maybe ("#\." functor)]]
+    [type (#+ :share)
+     abstract]]]
   [//
    ["." atom (#+ Atom)]
    ["." promise (#+ Promise) ("#\." functor)]])
diff --git a/stdlib/source/lux/control/concurrency/promise.lux b/stdlib/source/library/lux/control/concurrency/promise.lux
index 8e0acf8b9..ad94bbff8 100644
--- a/stdlib/source/lux/control/concurrency/promise.lux
+++ b/stdlib/source/library/lux/control/concurrency/promise.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- and or)
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." function]
-    ["." io (#+ IO io)]]
-   [data
-    ["." product]]
-   [type (#+ :share)
-    abstract]]
+  [library
+   [lux (#- and or)
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." function]
+     ["." io (#+ IO io)]]
+    [data
+     ["." product]]
+    [type (#+ :share)
+     abstract]]]
   [//
    ["." thread]
    ["." atom (#+ Atom atom)]])
diff --git a/stdlib/source/lux/control/concurrency/semaphore.lux b/stdlib/source/library/lux/control/concurrency/semaphore.lux
index 0e8fa2b94..597e96306 100644
--- a/stdlib/source/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/library/lux/control/concurrency/semaphore.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ if>)]
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." queue (#+ Queue)]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [type
-    abstract
-    ["." refinement]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ if>)]
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." queue (#+ Queue)]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [type
+     abstract
+     ["." refinement]]]]
   [//
    ["." atom (#+ Atom)]
    ["." promise (#+ Promise Resolver)]])
diff --git a/stdlib/source/lux/control/concurrency/stm.lux b/stdlib/source/library/lux/control/concurrency/stm.lux
index d375059a4..081d2f3d9 100644
--- a/stdlib/source/lux/control/concurrency/stm.lux
+++ b/stdlib/source/library/lux/control/concurrency/stm.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." io (#+ IO io)]
-    ["." try]]
-   [data
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." io (#+ IO io)]
+     ["." try]]
+    [data
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list]]]
+    [type
+     abstract]]]
   [//
    ["." atom (#+ Atom atom)]
    ["." promise (#+ Promise Resolver)]
diff --git a/stdlib/source/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux
index d6dc71c37..9c9bf6549 100644
--- a/stdlib/source/lux/control/concurrency/thread.lux
+++ b/stdlib/source/library/lux/control/concurrency/thread.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]]
-   [data
-    ["." text]
-    [collection
-     ["." list]]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac]]]
-   [time
-    ["." instant]]]
+  [library
+   [lux #*
+    ["@" target]
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]]
+    [data
+     ["." text]
+     [collection
+      ["." list]]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac]]]
+    [time
+     ["." instant]]]]
   [//
    ["." atom (#+ Atom)]])
 
diff --git a/stdlib/source/lux/control/continuation.lux b/stdlib/source/library/lux/control/continuation.lux
index 03a9607ce..8b9b5a24f 100644
--- a/stdlib/source/lux/control/continuation.lux
+++ b/stdlib/source/library/lux/control/continuation.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]]
-   [control
-    ["." function]
-    [parser
-     ["s" code]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]]
+    [control
+     ["." function]
+     [parser
+      ["s" code]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]]])
 
 (type: #export (Cont i o)
   {#.doc "Continuations."}
diff --git a/stdlib/source/lux/control/exception.lux b/stdlib/source/library/lux/control/exception.lux
index 0f5f62aa3..405c858a5 100644
--- a/stdlib/source/lux/control/exception.lux
+++ b/stdlib/source/library/lux/control/exception.lux
@@ -1,28 +1,29 @@
 (.module: {#.doc "Exception-handling functionality."}
-  [lux #*
-   ["." macro]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["p" parser
-     ["s" code (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." product]
-    ["." text ("#\." monoid)]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [macro
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" export]
-     ["|.|" input]
-     ["." type #_
-      ["|#_.|" variable]]]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]]]]
+  [library
+   [lux #*
+    ["." macro]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["p" parser
+      ["s" code (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." product]
+     ["." text ("#\." monoid)]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [macro
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" export]
+      ["|.|" input]
+      ["." type #_
+       ["|#_.|" variable]]]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]]]]]
   [//
    ["//" try (#+ Try)]])
 
diff --git a/stdlib/source/lux/control/function.lux b/stdlib/source/library/lux/control/function.lux
index 56e54509c..2f880a872 100644
--- a/stdlib/source/lux/control/function.lux
+++ b/stdlib/source/library/lux/control/function.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [abstract
-    [monoid (#+ Monoid)]]])
+  [library
+   [lux #*
+    [abstract
+     [monoid (#+ Monoid)]]]])
 
 (def: #export identity
   {#.doc (doc "Identity function."
diff --git a/stdlib/source/lux/control/function/contract.lux b/stdlib/source/library/lux/control/function/contract.lux
index fef0280c7..149053230 100644
--- a/stdlib/source/lux/control/function/contract.lux
+++ b/stdlib/source/library/lux/control/function/contract.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [control
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["i" int]]]])
+  [library
+   [lux #*
+    [control
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["i" int]]]]])
 
 (template [<name>]
   [(exception: (<name> {condition Code})
diff --git a/stdlib/source/lux/control/function/memo.lux b/stdlib/source/library/lux/control/function/memo.lux
index 324fae7d1..5ab6c2b3b 100644
--- a/stdlib/source/lux/control/function/memo.lux
+++ b/stdlib/source/library/lux/control/function/memo.lux
@@ -2,16 +2,17 @@
 ## "The Different Aspects of Monads and Mixins" by Bruno C. d. S. Oliveira
 
 (.module:
-  [lux #*
-   [abstract
-    [hash (#+ Hash)]
-    [monad (#+ do)]]
-   [control
-    ["." state (#+ State)]]
-   [data
-    ["." product]
-    [collection
-     ["." dictionary (#+ Dictionary)]]]]
+  [library
+   [lux #*
+    [abstract
+     [hash (#+ Hash)]
+     [monad (#+ do)]]
+    [control
+     ["." state (#+ State)]]
+    [data
+     ["." product]
+     [collection
+      ["." dictionary (#+ Dictionary)]]]]]
   ["." // #_
    ["#" mixin (#+ Mixin Recursive)]])
 
diff --git a/stdlib/source/lux/control/function/mixin.lux b/stdlib/source/library/lux/control/function/mixin.lux
index 4d1c9fcb8..f70b2f9c3 100644
--- a/stdlib/source/lux/control/function/mixin.lux
+++ b/stdlib/source/library/lux/control/function/mixin.lux
@@ -2,11 +2,12 @@
 ## "The Different Aspects of Monads and Mixins" by Bruno C. d. S. Oliveira
 
 (.module:
-  [lux #*
-   [abstract
-    [monoid (#+ Monoid)]
-    [predicate (#+ Predicate)]
-    [monad (#+ Monad do)]]])
+  [library
+   [lux #*
+    [abstract
+     [monoid (#+ Monoid)]
+     [predicate (#+ Predicate)]
+     [monad (#+ Monad do)]]]])
 
 (type: #export (Mixin i o)
   (-> (-> i o) (-> i o) (-> i o)))
diff --git a/stdlib/source/lux/control/function/mutual.lux b/stdlib/source/library/lux/control/function/mutual.lux
index c1960253a..dcc4791e1 100644
--- a/stdlib/source/lux/control/function/mutual.lux
+++ b/stdlib/source/library/lux/control/function/mutual.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux (#- Definition let def:)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     [dictionary
-      ["." plist (#+ PList)]]]]
-   ["." macro
-    ["." local]
-    ["." code]
-    [syntax (#+ syntax:)
-     ["." export]
-     ["." declaration (#+ Declaration)]]]]
+  [library
+   [lux (#- Definition let def:)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      [dictionary
+       ["." plist (#+ PList)]]]]
+    ["." macro
+     ["." local]
+     ["." code]
+     [syntax (#+ syntax:)
+      ["." export]
+      ["." declaration (#+ Declaration)]]]]]
   ["." //])
 
 (type: Mutual
diff --git a/stdlib/source/lux/control/io.lux b/stdlib/source/library/lux/control/io.lux
index fea9083ec..a4773cd0d 100644
--- a/stdlib/source/lux/control/io.lux
+++ b/stdlib/source/library/lux/control/io.lux
@@ -1,17 +1,18 @@
 (.module: {#.doc "A method for abstracting I/O and effectful computations to make it safe while writing pure functional code."}
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]]
-   [control
-    [parser
-     ["s" code]]]
-   [type
-    abstract]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." template]]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]]
+    [control
+     [parser
+      ["s" code]]]
+    [type
+     abstract]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." template]]]])
 
 (abstract: #export (IO a)
   (-> Any a)
diff --git a/stdlib/source/lux/control/parser.lux b/stdlib/source/library/lux/control/parser.lux
index fb8e856ae..fad957e27 100644
--- a/stdlib/source/lux/control/parser.lux
+++ b/stdlib/source/library/lux/control/parser.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- or and not)
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]
-    [codec (#+ Codec)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#\." functor monoid)]]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux (#- or and not)
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]
+     [codec (#+ Codec)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#\." functor monoid)]]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export (Parser s a)
   {#.doc "A generic parser."}
diff --git a/stdlib/source/lux/control/parser/analysis.lux b/stdlib/source/library/lux/control/parser/analysis.lux
index b825354c1..cdfb18504 100644
--- a/stdlib/source/lux/control/parser/analysis.lux
+++ b/stdlib/source/library/lux/control/parser/analysis.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux (#- nat int rev)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." bit]
-    ["." name]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["." i64]
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]]]
-   [tool
-    [compiler
-     [arity (#+ Arity)]
-     [reference (#+)
-      [variable (#+)]]
-     [language
-      [lux
-       ["/" analysis (#+ Variant Tuple Environment Analysis)]]]]]]
+  [library
+   [lux (#- nat int rev)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." bit]
+     ["." name]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["." i64]
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]]]
+    [tool
+     [compiler
+      [arity (#+ Arity)]
+      [reference (#+)
+       [variable (#+)]]
+      [language
+       [lux
+        ["/" analysis (#+ Variant Tuple Environment Analysis)]]]]]]]
   ["." //])
 
 (def: (remaining_inputs asts)
diff --git a/stdlib/source/lux/control/parser/binary.lux b/stdlib/source/library/lux/control/parser/binary.lux
index 37423b091..af28caeae 100644
--- a/stdlib/source/lux/control/parser/binary.lux
+++ b/stdlib/source/library/lux/control/parser/binary.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux (#- and or nat int rev list type)
-   [type (#+ :share)]
-   [abstract
-    [hash (#+ Hash)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["/" binary (#+ Binary)]
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list]
-     ["." row (#+ Row)]
-     ["." set (#+ Set)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]
-     ["." frac]]]]
+  [library
+   [lux (#- and or nat int rev list type)
+    [type (#+ :share)]
+    [abstract
+     [hash (#+ Hash)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["/" binary (#+ Binary)]
+     [text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list]
+      ["." row (#+ Row)]
+      ["." set (#+ Set)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]
+      ["." frac]]]]]
   ["." // ("#\." monad)])
 
 (type: #export Offset Nat)
diff --git a/stdlib/source/lux/control/parser/cli.lux b/stdlib/source/library/lux/control/parser/cli.lux
index b39b4234c..34b061afc 100644
--- a/stdlib/source/lux/control/parser/cli.lux
+++ b/stdlib/source/library/lux/control/parser/cli.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]]]
   ["." //])
 
 (type: #export (Parser a)
diff --git a/stdlib/source/lux/control/parser/code.lux b/stdlib/source/library/lux/control/parser/code.lux
index 86ee0a1d8..bb37c1faf 100644
--- a/stdlib/source/lux/control/parser/code.lux
+++ b/stdlib/source/library/lux/control/parser/code.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux (#- nat int rev)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." bit]
-    ["." text ("#\." monoid)]
-    ["." name]
-    [collection
-     ["." list ("#\." functor)]]]
-   [macro
-    ["." code ("#\." equivalence)]]
-   [math
-    [number
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]]]]
+  [library
+   [lux (#- nat int rev)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." bit]
+     ["." text ("#\." monoid)]
+     ["." name]
+     [collection
+      ["." list ("#\." functor)]]]
+    [macro
+     ["." code ("#\." equivalence)]]
+    [math
+     [number
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]]]]]
   ["." //])
 
 (def: (join_pairs pairs)
diff --git a/stdlib/source/lux/control/parser/environment.lux b/stdlib/source/library/lux/control/parser/environment.lux
index 509369d68..c0ced37c2 100644
--- a/stdlib/source/lux/control/parser/environment.lux
+++ b/stdlib/source/library/lux/control/parser/environment.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]]]]
+  [library
+   [lux #*
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]]]]]
   ["." //])
 
 (type: #export Property
diff --git a/stdlib/source/lux/control/parser/json.lux b/stdlib/source/library/lux/control/parser/json.lux
index abc3ded7c..12fb90dd3 100644
--- a/stdlib/source/lux/control/parser/json.lux
+++ b/stdlib/source/library/lux/control/parser/json.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." bit]
-    ["." text ("#\." equivalence monoid)]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]
-     ["." dictionary (#+ Dictionary)]]
-    [format
-     ["/" json (#+ JSON)]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["." frac]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." bit]
+     ["." text ("#\." equivalence monoid)]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]
+      ["." dictionary (#+ Dictionary)]]
+     [format
+      ["/" json (#+ JSON)]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["." frac]]]]]
   ["." // ("#\." functor)])
 
 (type: #export (Parser a)
diff --git a/stdlib/source/lux/control/parser/synthesis.lux b/stdlib/source/library/lux/control/parser/synthesis.lux
index f6ae1c1ae..9c8f76143 100644
--- a/stdlib/source/lux/control/parser/synthesis.lux
+++ b/stdlib/source/library/lux/control/parser/synthesis.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- function loop i64)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." bit]
-    ["." name]
-    ["." text
-     ["%" format (#+ format)]]]
-   [math
-    [number
-     ["n" nat]
-     ["." i64]
-     ["." frac]]]
-   [tool
-    [compiler
-     [reference (#+)
-      [variable (#+ Register)]]
-     [arity (#+ Arity)]
-     [language
-      [lux
-       [analysis (#+ Variant Tuple Environment)]
-       ["/" synthesis (#+ Synthesis Abstraction)]]]]]]
+  [library
+   [lux (#- function loop i64)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." bit]
+     ["." name]
+     ["." text
+      ["%" format (#+ format)]]]
+    [math
+     [number
+      ["n" nat]
+      ["." i64]
+      ["." frac]]]
+    [tool
+     [compiler
+      [reference (#+)
+       [variable (#+ Register)]]
+      [arity (#+ Arity)]
+      [language
+       [lux
+        [analysis (#+ Variant Tuple Environment)]
+        ["/" synthesis (#+ Synthesis Abstraction)]]]]]]]
   ["." //])
 
 ## TODO: Use "type:" ASAP.
diff --git a/stdlib/source/lux/control/parser/text.lux b/stdlib/source/library/lux/control/parser/text.lux
index 7dc6001b5..cfd1ab891 100644
--- a/stdlib/source/lux/control/parser/text.lux
+++ b/stdlib/source/library/lux/control/parser/text.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- or and not)
-   [abstract
-    [monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["/" text (#+ Char) ("#\." monoid)]
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list ("#\." fold)]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]]]]
+  [library
+   [lux (#- or and not)
+    [abstract
+     [monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["/" text (#+ Char) ("#\." monoid)]
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list ("#\." fold)]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]]]]]
   ["." //])
 
 (type: #export Offset Nat)
diff --git a/stdlib/source/lux/control/parser/tree.lux b/stdlib/source/library/lux/control/parser/tree.lux
index ac824638a..5834c69e8 100644
--- a/stdlib/source/lux/control/parser/tree.lux
+++ b/stdlib/source/library/lux/control/parser/tree.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [collection
-     [tree (#+ Tree)
-      ["." zipper (#+ Zipper)]]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [collection
+      [tree (#+ Tree)
+       ["." zipper (#+ Zipper)]]]]]]
   ["." //])
 
 (type: #export (Parser t a)
diff --git a/stdlib/source/lux/control/parser/type.lux b/stdlib/source/library/lux/control/parser/type.lux
index ce58c5ce3..1e2c037d5 100644
--- a/stdlib/source/lux/control/parser/type.lux
+++ b/stdlib/source/library/lux/control/parser/type.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." function]]
-   [data
-    ["." text ("#\." monoid)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]]]
-   ["." type ("#\." equivalence)
-    ["." check]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." function]]
+    [data
+     ["." text ("#\." monoid)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]]]
+    ["." type ("#\." equivalence)
+     ["." check]]]]
   ["." //])
 
 (template [<name>]
@@ -300,10 +301,10 @@
       _
       (//.fail (exception.construct ..not_named inputT)))))
 
-(template: (|nothing|)
-  (#.Named ["lux" "Nothing"]
-           (#.UnivQ #.Nil
-                    (#.Parameter 1))))
+(`` (template: (|nothing|)
+      (#.Named [(~~ (static .prelude_module)) "Nothing"]
+               (#.UnivQ #.Nil
+                        (#.Parameter 1)))))
 
 (def: #export (recursive poly)
   (All [a] (-> (Parser a) (Parser [Code a])))
diff --git a/stdlib/source/lux/control/parser/xml.lux b/stdlib/source/library/lux/control/parser/xml.lux
index 9eb794c2d..3fed4030e 100644
--- a/stdlib/source/lux/control/parser/xml.lux
+++ b/stdlib/source/library/lux/control/parser/xml.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try) ("#\." functor)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." name ("#\." equivalence codec)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]
-     ["." dictionary]]
-    [format
-     ["/" xml (#+ Attribute Attrs Tag XML)]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try) ("#\." functor)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." name ("#\." equivalence codec)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]
+      ["." dictionary]]
+     [format
+      ["/" xml (#+ Attribute Attrs Tag XML)]]]]]
   ["." //])
 
 (type: #export (Parser a)
diff --git a/stdlib/source/lux/control/pipe.lux b/stdlib/source/library/lux/control/pipe.lux
index 3453b1779..cac70fe6b 100644
--- a/stdlib/source/lux/control/pipe.lux
+++ b/stdlib/source/library/lux/control/pipe.lux
@@ -1,22 +1,23 @@
 (.module: {#.doc "Composable extensions to the piping macros (|> and <|) that enhance them with various abilities."}
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["e" try]
-    ["p" parser
-     ["s" code (#+ Parser)]]]
-   [data
-    ["." identity]
-    [collection
-     ["." list ("#\." fold monad)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["e" try]
+     ["p" parser
+      ["s" code (#+ Parser)]]]
+    [data
+     ["." identity]
+     [collection
+      ["." list ("#\." fold monad)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]]])
 
 (def: body^
   (Parser (List Code))
diff --git a/stdlib/source/lux/control/reader.lux b/stdlib/source/library/lux/control/reader.lux
index 615bdfe80..95662b8ba 100644
--- a/stdlib/source/lux/control/reader.lux
+++ b/stdlib/source/library/lux/control/reader.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]])
+  [library
+   [lux #*
+    [abstract
+     ["." functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]]])
 
 (type: #export (Reader r a)
   {#.doc "Computations that have access to some environmental value."}
diff --git a/stdlib/source/lux/control/region.lux b/stdlib/source/library/lux/control/region.lux
index 5b2a6fef1..ff6247418 100644
--- a/stdlib/source/lux/control/region.lux
+++ b/stdlib/source/library/lux/control/region.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold)]]]]
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold)]]]]]
   [//
    ["." exception (#+ Exception exception:)]])
 
diff --git a/stdlib/source/lux/control/remember.lux b/stdlib/source/library/lux/control/remember.lux
index aeda22262..86f9cb7a1 100644
--- a/stdlib/source/lux/control/remember.lux
+++ b/stdlib/source/library/lux/control/remember.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["<>" parser ("#\." functor)
-     ["<c>" code (#+ Parser)]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [time
-    ["." instant]
-    ["." date (#+ Date) ("#\." order)]]
-   ["." meta]
-   [macro
-    ["." code]
-    [syntax (#+ syntax:)]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["<>" parser ("#\." functor)
+      ["<c>" code (#+ Parser)]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [time
+     ["." instant]
+     ["." date (#+ Date) ("#\." order)]]
+    ["." meta]
+    [macro
+     ["." code]
+     [syntax (#+ syntax:)]]]])
 
 (exception: #export (must_remember {deadline Date} {today Date} {message Text} {focus (Maybe Code)})
   (exception.report
diff --git a/stdlib/source/lux/control/security/capability.lux b/stdlib/source/library/lux/control/security/capability.lux
index db3e38c26..13ae40d15 100644
--- a/stdlib/source/lux/control/security/capability.lux
+++ b/stdlib/source/library/lux/control/security/capability.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code]]
-    ["." io (#+ IO)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [type
-    abstract]
-   ["." meta]
-   ["." macro
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" export]
-     ["|.|" declaration]
-     ["|.|" annotations]]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code]]
+     ["." io (#+ IO)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [type
+     abstract]
+    ["." meta]
+    ["." macro
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" export]
+      ["|.|" declaration]
+      ["|.|" annotations]]]]])
 
 (abstract: #export (Capability brand input output)
   (-> input output)
diff --git a/stdlib/source/lux/control/security/policy.lux b/stdlib/source/library/lux/control/security/policy.lux
index 1d3c0e43e..3c1eb579e 100644
--- a/stdlib/source/lux/control/security/policy.lux
+++ b/stdlib/source/library/lux/control/security/policy.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad)]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad)]]
+    [type
+     abstract]]])
 
 (abstract: #export (Policy brand value label)
   value
diff --git a/stdlib/source/lux/control/state.lux b/stdlib/source/library/lux/control/state.lux
index 0914f5dde..ef0e2dbb7 100644
--- a/stdlib/source/lux/control/state.lux
+++ b/stdlib/source/library/lux/control/state.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]]]])
 
 (type: #export (State s a)
   {#.doc "Stateful computations."}
diff --git a/stdlib/source/lux/control/thread.lux b/stdlib/source/library/lux/control/thread.lux
index 153fdc0ba..818c38298 100644
--- a/stdlib/source/lux/control/thread.lux
+++ b/stdlib/source/library/lux/control/thread.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]]
-   [control
-    ["." io (#+ IO)]]
-   [data
-    [collection
-     ["." array (#+ Array)]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]]
+    [control
+     ["." io (#+ IO)]]
+    [data
+     [collection
+      ["." array (#+ Array)]]]
+    [type
+     abstract]]])
 
 (type: #export (Thread ! a)
   (-> ! a))
diff --git a/stdlib/source/lux/control/try.lux b/stdlib/source/library/lux/control/try.lux
index e60068cb1..013553b04 100644
--- a/stdlib/source/lux/control/try.lux
+++ b/stdlib/source/library/lux/control/try.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    [apply (#+ Apply)]
-    [equivalence (#+ Equivalence)]
-    ["." functor (#+ Functor)]
-    ["." monad (#+ Monad do)]]
-   [meta
-    ["." location]]])
+  [library
+   [lux #*
+    [abstract
+     [apply (#+ Apply)]
+     [equivalence (#+ Equivalence)]
+     ["." functor (#+ Functor)]
+     ["." monad (#+ Monad do)]]
+    [meta
+     ["." location]]]])
 
 (type: #export (Try a)
   (#Failure Text)
@@ -128,7 +129,8 @@
     (#Success value)
 
     #.None
-    (#Failure (("lux in-module" "lux" .name\encode) (name_of ..from_maybe)))))
+    (#Failure (`` (("lux in-module" (~~ (static .prelude_module)) .name\encode)
+                   (name_of ..from_maybe))))))
 
 (macro: #export (default tokens compiler)
   {#.doc (doc "Allows you to provide a default value that will be used"
diff --git a/stdlib/source/lux/control/writer.lux b/stdlib/source/library/lux/control/writer.lux
index 92ab8f751..2ddf343df 100644
--- a/stdlib/source/lux/control/writer.lux
+++ b/stdlib/source/library/lux/control/writer.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    monoid
-    [apply (#+ Apply)]
-    ["." functor (#+ Functor)]
-    ["." monad (#+ Monad do)]]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     monoid
+     [apply (#+ Apply)]
+     ["." functor (#+ Functor)]
+     ["." monad (#+ Monad do)]]]])
 
 (type: #export (Writer l a)
   {#.doc "Represents a value with an associated 'log' value to record arbitrary information."}
diff --git a/stdlib/source/lux/data/binary.lux b/stdlib/source/library/lux/data/binary.lux
index a6f11ff5b..11bc86754 100644
--- a/stdlib/source/lux/data/binary.lux
+++ b/stdlib/source/library/lux/data/binary.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- i64)
-   ["@" target]
-   ["." ffi]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    [monoid (#+ Monoid)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." maybe]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." array]]]
-   [math
-    [number (#+ hex)
-     ["n" nat]
-     ["f" frac]
-     ["." i64]]]])
+  [library
+   [lux (#- i64)
+    ["@" target]
+    ["." ffi]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     [monoid (#+ Monoid)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." maybe]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." array]]]
+    [math
+     [number (#+ hex)
+      ["n" nat]
+      ["f" frac]
+      ["." i64]]]]])
 
 (exception: #export (index_out_of_bounds {size Nat} {index Nat})
   (exception.report
diff --git a/stdlib/source/lux/data/bit.lux b/stdlib/source/library/lux/data/bit.lux
index 88c9b4bd7..5a62ecce5 100644
--- a/stdlib/source/lux/data/bit.lux
+++ b/stdlib/source/library/lux/data/bit.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]
-    hash
-    [codec (#+ Codec)]]
-   [control
-    ["." function]]])
+  [library
+   [lux #*
+    [abstract
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]
+     hash
+     [codec (#+ Codec)]]
+    [control
+     ["." function]]]])
 
 (implementation: #export equivalence
   (Equivalence Bit)
diff --git a/stdlib/source/lux/data/collection/array.lux b/stdlib/source/library/lux/data/collection/array.lux
index 0b2911c3e..66a3abb6e 100644
--- a/stdlib/source/lux/data/collection/array.lux
+++ b/stdlib/source/library/lux/data/collection/array.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [monoid (#+ Monoid)]
-    [functor (#+ Functor)]
-    [equivalence (#+ Equivalence)]
-    [fold (#+ Fold)]
-    [predicate (#+ Predicate)]]
-   [data
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list ("#\." fold)]]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [monoid (#+ Monoid)]
+     [functor (#+ Functor)]
+     [equivalence (#+ Equivalence)]
+     [fold (#+ Fold)]
+     [predicate (#+ Predicate)]]
+    [data
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list ("#\." fold)]]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (def: #export type_name
   "#Array")
diff --git a/stdlib/source/lux/data/collection/bits.lux b/stdlib/source/library/lux/data/collection/bits.lux
index 78d7df988..63e90f7c8 100644
--- a/stdlib/source/lux/data/collection/bits.lux
+++ b/stdlib/source/library/lux/data/collection/bits.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- not and or)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    pipe]
-   [data
-    ["." maybe]
-    [collection
-     ["." array (#+ Array) ("#\." fold)]]]
-   [math
-    [number
-     ["n" nat]
-     ["." i64]]]])
+  [library
+   [lux (#- not and or)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     pipe]
+    [data
+     ["." maybe]
+     [collection
+      ["." array (#+ Array) ("#\." fold)]]]
+    [math
+     [number
+      ["n" nat]
+      ["." i64]]]]])
 
 (type: #export Chunk
   I64)
diff --git a/stdlib/source/lux/data/collection/dictionary.lux b/stdlib/source/library/lux/data/collection/dictionary.lux
index 4aa50c9a7..3ae286db8 100644
--- a/stdlib/source/lux/data/collection/dictionary.lux
+++ b/stdlib/source/library/lux/data/collection/dictionary.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    [hash (#+ Hash)]
-    [equivalence (#+ Equivalence)]
-    [functor (#+ Functor)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." maybe]
-    ["." product]
-    [collection
-     ["." list ("#\." fold functor monoid)]
-     ["." array (#+ Array) ("#\." functor fold)]]]
-   [math
-    ["." number
-     ["n" nat]
-     ["." i64]]]])
+  [library
+   [lux #*
+    [abstract
+     [hash (#+ Hash)]
+     [equivalence (#+ Equivalence)]
+     [functor (#+ Functor)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." maybe]
+     ["." product]
+     [collection
+      ["." list ("#\." fold functor monoid)]
+      ["." array (#+ Array) ("#\." functor fold)]]]
+    [math
+     ["." number
+      ["n" nat]
+      ["." i64]]]]])
 
 ## This implementation of Hash Array Mapped Trie (HAMT) is based on
 ## Clojure's PersistentHashMap implementation.
diff --git a/stdlib/source/lux/data/collection/dictionary/ordered.lux b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux
index 618c5ccf6..5c8b82ebd 100644
--- a/stdlib/source/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    equivalence
-    [monad (#+ Monad do)]
-    ["." order (#+ Order)]]
-   [data
-    ["p" product]
-    ["." maybe]
-    [collection
-     ["." list ("#\." monoid fold)]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    [abstract
+     equivalence
+     [monad (#+ Monad do)]
+     ["." order (#+ Order)]]
+    [data
+     ["p" product]
+     ["." maybe]
+     [collection
+      ["." list ("#\." monoid fold)]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (def: error_message
   "Invariant violation")
diff --git a/stdlib/source/lux/data/collection/dictionary/plist.lux b/stdlib/source/library/lux/data/collection/dictionary/plist.lux
index 320bf2f51..f3f51c779 100644
--- a/stdlib/source/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/library/lux/data/collection/dictionary/plist.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export (PList a)
   (List [Text a]))
diff --git a/stdlib/source/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux
index 7bb2d4468..166b4c87b 100644
--- a/stdlib/source/lux/data/collection/list.lux
+++ b/stdlib/source/library/lux/data/collection/list.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [monoid (#+ Monoid)]
-    [apply (#+ Apply)]
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [fold (#+ Fold)]
-    [predicate (#+ Predicate)]
-    ["." functor (#+ Functor)]
-    ["." monad (#+ do Monad)]
-    ["." enum]]
-   [data
-    ["." bit]
-    ["." product]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [monoid (#+ Monoid)]
+     [apply (#+ Apply)]
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [fold (#+ Fold)]
+     [predicate (#+ Predicate)]
+     ["." functor (#+ Functor)]
+     ["." monad (#+ do Monad)]
+     ["." enum]]
+    [data
+     ["." bit]
+     ["." product]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 ## (type: (List a)
 ##   #Nil
diff --git a/stdlib/source/lux/data/collection/queue.lux b/stdlib/source/library/lux/data/collection/queue.lux
index 32ed05c64..cb4d9106f 100644
--- a/stdlib/source/lux/data/collection/queue.lux
+++ b/stdlib/source/library/lux/data/collection/queue.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [functor (#+ Functor)]]
-   [data
-    [collection
-     ["." list ("#\." monoid functor)]]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [functor (#+ Functor)]]
+    [data
+     [collection
+      ["." list ("#\." monoid functor)]]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export (Queue a)
   {#front (List a)
diff --git a/stdlib/source/lux/data/collection/queue/priority.lux b/stdlib/source/library/lux/data/collection/queue/priority.lux
index b7f971dd2..d044a5023 100644
--- a/stdlib/source/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/library/lux/data/collection/queue/priority.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do Monad)]]
-   [data
-    ["." maybe]
-    [collection
-     ["." tree #_
-      ["#" finger (#+ Tree)]]]]
-   [math
-    [number
-     ["n" nat ("#\." interval)]]]
-   [type (#+ :by_example)
-    [abstract (#+ abstract: :abstraction :representation)]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do Monad)]]
+    [data
+     ["." maybe]
+     [collection
+      ["." tree #_
+       ["#" finger (#+ Tree)]]]]
+    [math
+     [number
+      ["n" nat ("#\." interval)]]]
+    [type (#+ :by_example)
+     [abstract (#+ abstract: :abstraction :representation)]]]])
 
 (type: #export Priority
   Nat)
diff --git a/stdlib/source/lux/data/collection/row.lux b/stdlib/source/library/lux/data/collection/row.lux
index abadcfd7a..0bb304c35 100644
--- a/stdlib/source/lux/data/collection/row.lux
+++ b/stdlib/source/library/lux/data/collection/row.lux
@@ -2,34 +2,35 @@
 ## https://hypirion.com/musings/understanding-persistent-vector-pt-2
 ## https://hypirion.com/musings/understanding-persistent-vector-pt-3
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]
-    [equivalence (#+ Equivalence)]
-    [monoid (#+ Monoid)]
-    [fold (#+ Fold)]
-    [predicate (#+ Predicate)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["p" parser
-     ["s" code (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." product]
-    [collection
-     ["." list ("#\." fold functor monoid)]
-     ["." array (#+ Array) ("#\." functor fold)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["." i64]
-     ["n" nat]]]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]
+     [equivalence (#+ Equivalence)]
+     [monoid (#+ Monoid)]
+     [fold (#+ Fold)]
+     [predicate (#+ Predicate)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["p" parser
+      ["s" code (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." product]
+     [collection
+      ["." list ("#\." fold functor monoid)]
+      ["." array (#+ Array) ("#\." functor fold)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["." i64]
+      ["n" nat]]]]])
 
 (type: (Node a)
   (#Base (Array a))
diff --git a/stdlib/source/lux/data/collection/sequence.lux b/stdlib/source/library/lux/data/collection/sequence.lux
index c3d2a5e33..a7fa5cb75 100644
--- a/stdlib/source/lux/data/collection/sequence.lux
+++ b/stdlib/source/library/lux/data/collection/sequence.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [comonad (#+ CoMonad)]]
-   [control
-    ["//" continuation (#+ Cont)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [data
-    ["." bit]
-    [collection
-     ["." list ("#\." monad)]]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [comonad (#+ CoMonad)]]
+    [control
+     ["//" continuation (#+ Cont)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [data
+     ["." bit]
+     [collection
+      ["." list ("#\." monad)]]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export (Sequence a)
   {#.doc "An infinite sequence of values."}
diff --git a/stdlib/source/lux/data/collection/set.lux b/stdlib/source/library/lux/data/collection/set.lux
index 4c1fabde0..0ae6cee25 100644
--- a/stdlib/source/lux/data/collection/set.lux
+++ b/stdlib/source/library/lux/data/collection/set.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [predicate (#+ Predicate)]
-    [monoid (#+ Monoid)]]
-   [data
-    [collection
-     ["." list ("#\." fold)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [predicate (#+ Predicate)]
+     [monoid (#+ Monoid)]]
+    [data
+     [collection
+      ["." list ("#\." fold)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    ["#" dictionary (#+ Dictionary)]])
 
diff --git a/stdlib/source/lux/data/collection/set/multi.lux b/stdlib/source/library/lux/data/collection/set/multi.lux
index 9e494608e..efd266c18 100644
--- a/stdlib/source/lux/data/collection/set/multi.lux
+++ b/stdlib/source/library/lux/data/collection/set/multi.lux
@@ -1,16 +1,17 @@
 ## https://en.wikipedia.org/wiki/Multiset
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [control
-    ["." function]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    [abstract (#+ abstract: :abstraction :representation ^:representation)]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [control
+     ["." function]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     [abstract (#+ abstract: :abstraction :representation ^:representation)]]]]
   ["." //
    [//
     ["." list ("#\." fold monoid)]
diff --git a/stdlib/source/lux/data/collection/set/ordered.lux b/stdlib/source/library/lux/data/collection/set/ordered.lux
index 1b57ac87d..b61bfb546 100644
--- a/stdlib/source/lux/data/collection/set/ordered.lux
+++ b/stdlib/source/library/lux/data/collection/set/ordered.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]]
-   [data
-    [collection
-     ["." list ("#\." fold)]
-     [dictionary
-      ["/" ordered]]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]]
+    [data
+     [collection
+      ["." list ("#\." fold)]
+      [dictionary
+       ["/" ordered]]]]
+    [type
+     abstract]]])
 
 (abstract: #export (Set a)
   (/.Dictionary a a)
diff --git a/stdlib/source/lux/data/collection/stack.lux b/stdlib/source/library/lux/data/collection/stack.lux
index 68d514331..c81240c29 100644
--- a/stdlib/source/lux/data/collection/stack.lux
+++ b/stdlib/source/library/lux/data/collection/stack.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [functor (#+ Functor)]]
-   [data
-    [collection
-     ["//" list]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [functor (#+ Functor)]]
+    [data
+     [collection
+      ["//" list]]]
+    [type
+     abstract]]])
 
 (abstract: #export (Stack a)
   (List a)
diff --git a/stdlib/source/lux/data/collection/tree.lux b/stdlib/source/library/lux/data/collection/tree.lux
index 5aa6f9c36..f6b3746e7 100644
--- a/stdlib/source/lux/data/collection/tree.lux
+++ b/stdlib/source/library/lux/data/collection/tree.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [equivalence (#+ Equivalence)]
-    [fold (#+ Fold)]
-    [monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." list ("#\." monad fold)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [equivalence (#+ Equivalence)]
+     [fold (#+ Fold)]
+     [monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." list ("#\." monad fold)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]]])
 
 (type: #export (Tree a)
   {#value a
diff --git a/stdlib/source/lux/data/collection/tree/finger.lux b/stdlib/source/library/lux/data/collection/tree/finger.lux
index d28e69a3c..a3b1be634 100644
--- a/stdlib/source/lux/data/collection/tree/finger.lux
+++ b/stdlib/source/library/lux/data/collection/tree/finger.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    [predicate (#+ Predicate)]
-    ["." monoid (#+ Monoid)]]
-   [data
-    [collection
-     ["." list ("#\." monoid)]]]
-   [type
-    [abstract (#+ abstract: :abstraction :representation)]]])
+  [library
+   [lux #*
+    [abstract
+     [predicate (#+ Predicate)]
+     ["." monoid (#+ Monoid)]]
+    [data
+     [collection
+      ["." list ("#\." monoid)]]]
+    [type
+     [abstract (#+ abstract: :abstraction :representation)]]]])
 
 (abstract: #export (Tree @ t v)
   {#monoid (Monoid t)
diff --git a/stdlib/source/lux/data/collection/tree/zipper.lux b/stdlib/source/library/lux/data/collection/tree/zipper.lux
index be2f7b4bd..bb36e3e38 100644
--- a/stdlib/source/lux/data/collection/tree/zipper.lux
+++ b/stdlib/source/library/lux/data/collection/tree/zipper.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [functor (#+ Functor)]
-    [comonad (#+ CoMonad)]
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." maybe ("#\." monad)]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold monoid)]]]]
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [functor (#+ Functor)]
+     [comonad (#+ CoMonad)]
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." maybe ("#\." monad)]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold monoid)]]]]]
   ["." // (#+ Tree) ("#\." functor)])
 
 (type: (Family Zipper a)
diff --git a/stdlib/source/lux/data/color.lux b/stdlib/source/library/lux/data/color.lux
index 921137d9a..72847c91d 100644
--- a/stdlib/source/lux/data/color.lux
+++ b/stdlib/source/library/lux/data/color.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monoid (#+ Monoid)]
-    ["." hash (#+ Hash)]]
-   [data
-    [collection
-     ["." list ("#\." functor)]]]
-   ["." math
-    [number
-     ["n" nat]
-     ["f" frac]
-     ["." int]
-     ["." rev ("#\." interval)]
-     ["." i64]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monoid (#+ Monoid)]
+     ["." hash (#+ Hash)]]
+    [data
+     [collection
+      ["." list ("#\." functor)]]]
+    ["." math
+     [number
+      ["n" nat]
+      ["f" frac]
+      ["." int]
+      ["." rev ("#\." interval)]
+      ["." i64]]]
+    [type
+     abstract]]])
 
 (def: rgb 256)
 (def: top (dec rgb))
diff --git a/stdlib/source/lux/data/color/named.lux b/stdlib/source/library/lux/data/color/named.lux
index 54c9a4563..a9a9ab4ab 100644
--- a/stdlib/source/lux/data/color/named.lux
+++ b/stdlib/source/library/lux/data/color/named.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [math
-    [number (#+ hex)]]]
+  [library
+   [lux #*
+    [math
+     [number (#+ hex)]]]]
   ["." // (#+ Color)])
 
 (template [<red> <green> <blue> <name>]
diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/library/lux/data/format/binary.lux
index 25b7b69e5..7103f7d9d 100644
--- a/stdlib/source/lux/data/format/binary.lux
+++ b/stdlib/source/library/lux/data/format/binary.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux (#- and or nat int rev list type)
-   [type (#+ :share)]
-   [abstract
-    [monoid (#+ Monoid)]
-    [monad (#+ Monad do)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    [pipe (#+ case>)]
-    ["." function]
-    ["." try (#+ Try)]
-    ["<>" parser ("#\." monad)
-     ["/" binary (#+ Offset Size Parser)]]]
-   [data
-    ["." product]
-    ["." binary (#+ Binary)]
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list]
-     ["." row (#+ Row) ("#\." functor)]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["." i64]
-     ["n" nat]
-     ["." frac]]]])
+  [library
+   [lux (#- and or nat int rev list type)
+    [type (#+ :share)]
+    [abstract
+     [monoid (#+ Monoid)]
+     [monad (#+ Monad do)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     [pipe (#+ case>)]
+     ["." function]
+     ["." try (#+ Try)]
+     ["<>" parser ("#\." monad)
+      ["/" binary (#+ Offset Size Parser)]]]
+    [data
+     ["." product]
+     ["." binary (#+ Binary)]
+     [text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list]
+      ["." row (#+ Row) ("#\." functor)]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["." i64]
+      ["n" nat]
+      ["." frac]]]]])
 
 (def: mask
   (-> Size (I64 Any))
diff --git a/stdlib/source/lux/data/format/css.lux b/stdlib/source/library/lux/data/format/css.lux
index d172c7742..041feace9 100644
--- a/stdlib/source/lux/data/format/css.lux
+++ b/stdlib/source/library/lux/data/format/css.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- and)
-   [data
-    ["." maybe]
-    [number
-     ["." nat]]
-    ["." text
-     ["%" format (#+ format)]
-     ["." encoding (#+ Encoding)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [type
-    abstract]
-   [world
-    [net (#+ URL)]]]
+  [library
+   [lux (#- and)
+    [data
+     ["." maybe]
+     [number
+      ["." nat]]
+     ["." text
+      ["%" format (#+ format)]
+      ["." encoding (#+ Encoding)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [type
+     abstract]
+    [world
+     [net (#+ URL)]]]]
   ["." / #_
    ["#." selector (#+ Selector Combinator)]
    ["#." value (#+ Value Animation Percentage)]
diff --git a/stdlib/source/lux/data/format/css/font.lux b/stdlib/source/library/lux/data/format/css/font.lux
index b809f45e6..c153ec0b8 100644
--- a/stdlib/source/lux/data/format/css/font.lux
+++ b/stdlib/source/library/lux/data/format/css/font.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [type
-    abstract]
-   [control
-    [parser
-     ["s" code]]]
-   ["." macro
-    [syntax (#+ syntax:)]]
-   [world
-    [net (#+ URL)]]]
+  [library
+   [lux #*
+    [type
+     abstract]
+    [control
+     [parser
+      ["s" code]]]
+    ["." macro
+     [syntax (#+ syntax:)]]
+    [world
+     [net (#+ URL)]]]]
   ["." // #_
    ["#." value (#+ Value Font-Stretch Font-Style Font-Weight)]])
 
diff --git a/stdlib/source/lux/data/format/css/property.lux b/stdlib/source/library/lux/data/format/css/property.lux
index bbfdd1930..273ab75b8 100644
--- a/stdlib/source/lux/data/format/css/property.lux
+++ b/stdlib/source/library/lux/data/format/css/property.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux (#- All Cursor)
-   [control
-    [parser
-     ["s" code]]]
-   [type
-    abstract]
-   [macro
-    ["." template]
-    ["." code]
-    [syntax (#+ syntax:)]]]
+  [library
+   [lux (#- All Cursor)
+    [control
+     [parser
+      ["s" code]]]
+    [type
+     abstract]
+    [macro
+     ["." template]
+     ["." code]
+     [syntax (#+ syntax:)]]]]
   [//
    [value (#+ All
               Number
diff --git a/stdlib/source/lux/data/format/css/query.lux b/stdlib/source/library/lux/data/format/css/query.lux
index 6b1e57554..3e40701eb 100644
--- a/stdlib/source/lux/data/format/css/query.lux
+++ b/stdlib/source/library/lux/data/format/css/query.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- and or not)
-   [control
-    [parser
-     ["s" code]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [macro
-    ["." template]
-    ["." code]
-    [syntax (#+ syntax:)]]
-   [type
-    abstract]]
+  [library
+   [lux (#- and or not)
+    [control
+     [parser
+      ["s" code]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [macro
+     ["." template]
+     ["." code]
+     [syntax (#+ syntax:)]]
+    [type
+     abstract]]]
   ["." // #_
    ["#." value (#+ Value Length Count Resolution Ratio
                    Orientation Scan Boolean Update
diff --git a/stdlib/source/lux/data/format/css/selector.lux b/stdlib/source/library/lux/data/format/css/selector.lux
index 1c0f4b566..2a0210f7a 100644
--- a/stdlib/source/lux/data/format/css/selector.lux
+++ b/stdlib/source/library/lux/data/format/css/selector.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- or and for is? not)
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [number
-     ["i" int]]]
-   [type
-    abstract]
-   [macro
-    ["." template]]
-   ["." locale (#+ Locale)]])
+  [library
+   [lux (#- or and for is? not)
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [number
+      ["i" int]]]
+    [type
+     abstract]
+    [macro
+     ["." template]]
+    ["." locale (#+ Locale)]]])
 
 (type: #export Label Text)
 
diff --git a/stdlib/source/lux/data/format/css/style.lux b/stdlib/source/library/lux/data/format/css/style.lux
index 487ad5e9d..5f2c68888 100644
--- a/stdlib/source/lux/data/format/css/style.lux
+++ b/stdlib/source/library/lux/data/format/css/style.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [type
+     abstract]]]
   ["." // #_
    ["#." value (#+ Value)]
    ["#." property (#+ Property)]])
diff --git a/stdlib/source/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux
index 3691bb2e4..f85272a04 100644
--- a/stdlib/source/lux/data/format/css/value.lux
+++ b/stdlib/source/library/lux/data/format/css/value.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- All Cursor and static false true)
-   [control
-    [parser
-     ["s" code]]]
-   [data
-    ["." color]
-    ["." product]
-    ["." maybe]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["r" rev]
-     ["f" frac]]
-    ["." text
-     ["%" format (#+ Format format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [type
-    abstract]
-   [macro
-    ["." template]
-    ["." code]
-    [syntax (#+ syntax:)]]
-   [world
-    [net (#+ URL)]]]
+  [library
+   [lux (#- All Cursor and static false true)
+    [control
+     [parser
+      ["s" code]]]
+    [data
+     ["." color]
+     ["." product]
+     ["." maybe]
+     [number
+      ["n" nat]
+      ["i" int]
+      ["r" rev]
+      ["f" frac]]
+     ["." text
+      ["%" format (#+ Format format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [type
+     abstract]
+    [macro
+     ["." template]
+     ["." code]
+     [syntax (#+ syntax:)]]
+    [world
+     [net (#+ URL)]]]]
   [//
    [selector (#+ Label)]])
 
diff --git a/stdlib/source/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux
index a33182f19..6a8e0b24f 100644
--- a/stdlib/source/lux/data/format/html.lux
+++ b/stdlib/source/library/lux/data/format/html.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- Meta Source comment and)
-   ["." function]
-   [data
-    ["." product]
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [type
-    abstract]
-   [host
-    ["." js]]
-   [macro
-    ["." template]]
-   [world
-    [net (#+ URL)]]]
+  [library
+   [lux (#- Meta Source comment and)
+    ["." function]
+    [data
+     ["." product]
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [type
+     abstract]
+    [host
+     ["." js]]
+    [macro
+     ["." template]]
+    [world
+     [net (#+ URL)]]]]
   [//
    [css
     ["." selector]
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux
index a9986822f..142a15610 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/library/lux/data/format/json.lux
@@ -1,33 +1,34 @@
 (.module: {#.doc (.doc "Functionality for reading and writing values in the JSON format."
                        "For more information, please see: http://www.json.org/")}
-  [lux #*
-   ["." meta (#+ monad)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [codec (#+ Codec)]
-    [predicate (#+ Predicate)]
-    ["." monad (#+ do)]]
-   [control
-    pipe
-    ["." try (#+ Try)]
-    ["<>" parser ("#\." monad)
-     ["<.>" text (#+ Parser)]]]
-   [data
-    ["." bit]
-    ["." maybe]
-    ["." product]
-    ["." text ("#\." equivalence monoid)]
-    [collection
-     ["." list ("#\." fold functor)]
-     ["." row (#+ Row row) ("#\." monad)]
-     ["." dictionary (#+ Dictionary)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac ("#\." decimal)]]]])
+  [library
+   [lux #*
+    ["." meta (#+ monad)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [codec (#+ Codec)]
+     [predicate (#+ Predicate)]
+     ["." monad (#+ do)]]
+    [control
+     pipe
+     ["." try (#+ Try)]
+     ["<>" parser ("#\." monad)
+      ["<.>" text (#+ Parser)]]]
+    [data
+     ["." bit]
+     ["." maybe]
+     ["." product]
+     ["." text ("#\." equivalence monoid)]
+     [collection
+      ["." list ("#\." fold functor)]
+      ["." row (#+ Row row) ("#\." monad)]
+      ["." dictionary (#+ Dictionary)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac ("#\." decimal)]]]]])
 
 (template [<name> <type>]
   [(type: #export <name>
diff --git a/stdlib/source/lux/data/format/markdown.lux b/stdlib/source/library/lux/data/format/markdown.lux
index 5cdc68865..05a8ed94a 100644
--- a/stdlib/source/lux/data/format/markdown.lux
+++ b/stdlib/source/library/lux/data/format/markdown.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux (#- and)
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [type
-    abstract]
-   [world
-    [net (#+ URL)]]])
+  [library
+   [lux (#- and)
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [type
+     abstract]
+    [world
+     [net (#+ URL)]]]])
 
 ## https://www.markdownguide.org/basic-syntax/
 
diff --git a/stdlib/source/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux
index 504b7f5ac..f95b29334 100644
--- a/stdlib/source/lux/data/format/tar.lux
+++ b/stdlib/source/library/lux/data/format/tar.lux
@@ -1,36 +1,37 @@
 (.module:
-  [lux (#- Mode Name and)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<b>" binary (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." binary (#+ Binary)]
-    ["." text (#+ Char)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    ["." format #_
-     ["#" binary (#+ Writer) ("#\." monoid)]]
-    [collection
-     ["." list ("#\." fold)]
-     ["." row (#+ Row) ("#\." fold)]]]
-   [math
-    ["." number
-     ["n" nat]
-     ["." i64]]]
-   [time
-    ["." instant (#+ Instant)]
-    ["." duration]]
-   [world
-    ["." file]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Mode Name and)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<b>" binary (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." binary (#+ Binary)]
+     ["." text (#+ Char)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     ["." format #_
+      ["#" binary (#+ Writer) ("#\." monoid)]]
+     [collection
+      ["." list ("#\." fold)]
+      ["." row (#+ Row) ("#\." fold)]]]
+    [math
+     ["." number
+      ["n" nat]
+      ["." i64]]]
+    [time
+     ["." instant (#+ Instant)]
+     ["." duration]]
+    [world
+     ["." file]]
+    [type
+     abstract]]])
 
 (type: Size Nat)
 
diff --git a/stdlib/source/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux
index 4097d1171..56d394490 100644
--- a/stdlib/source/lux/data/format/xml.lux
+++ b/stdlib/source/library/lux/data/format/xml.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    [codec (#+ Codec)]]
-   [control
-    [try (#+ Try)]
-    ["<>" parser ("#\." monad)
-     ["<.>" text (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." name ("#\." equivalence codec)]
-    ["." text ("#\." equivalence monoid)]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    [number
-     ["n" nat]
-     ["." int]]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     [codec (#+ Codec)]]
+    [control
+     [try (#+ Try)]
+     ["<>" parser ("#\." monad)
+      ["<.>" text (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." name ("#\." equivalence codec)]
+     ["." text ("#\." equivalence monoid)]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     [number
+      ["n" nat]
+      ["." int]]]]])
 
 (type: #export Tag
   Name)
diff --git a/stdlib/source/lux/data/identity.lux b/stdlib/source/library/lux/data/identity.lux
index 35b44ec62..c0a39ab5e 100644
--- a/stdlib/source/lux/data/identity.lux
+++ b/stdlib/source/library/lux/data/identity.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad)]
-    [comonad (#+ CoMonad)]]
-   [control
-    ["." function]]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad)]
+     [comonad (#+ CoMonad)]]
+    [control
+     ["." function]]]])
 
 (type: #export (Identity a)
   a)
diff --git a/stdlib/source/lux/data/lazy.lux b/stdlib/source/library/lux/data/lazy.lux
index adc8458e6..c9a6ae18c 100644
--- a/stdlib/source/lux/data/lazy.lux
+++ b/stdlib/source/library/lux/data/lazy.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." io]
-    [parser
-     ["s" code]]
-    [concurrency
-     ["." atom]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." io]
+     [parser
+      ["s" code]]
+     [concurrency
+      ["." atom]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]]
+    [type
+     abstract]]])
 
 (abstract: #export (Lazy a)
   (-> [] a)
diff --git a/stdlib/source/lux/data/maybe.lux b/stdlib/source/library/lux/data/maybe.lux
index 6376cfebf..d7f010f13 100644
--- a/stdlib/source/lux/data/maybe.lux
+++ b/stdlib/source/library/lux/data/maybe.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [apply (#+ Apply)]
-    ["." functor (#+ Functor)]
-    ["." monad (#+ Monad do)]]
-   [meta
-    ["." location]]])
+  [library
+   [lux #*
+    [abstract
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [apply (#+ Apply)]
+     ["." functor (#+ Functor)]
+     ["." monad (#+ Monad do)]]
+    [meta
+     ["." location]]]])
 
 ## (type: (Maybe a)
 ##   #.None
diff --git a/stdlib/source/lux/data/name.lux b/stdlib/source/library/lux/data/name.lux
index 539b9a99f..6a89a1aa6 100644
--- a/stdlib/source/lux/data/name.lux
+++ b/stdlib/source/library/lux/data/name.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [order (#+ Order)]
-    [codec (#+ Codec)]]
-   [data
-    ["." text ("#\." equivalence monoid)]
-    ["." product]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [order (#+ Order)]
+     [codec (#+ Codec)]]
+    [data
+     ["." text ("#\." equivalence monoid)]
+     ["." product]]]])
 
 ## (type: Name
 ##   [Text Text])
diff --git a/stdlib/source/lux/data/product.lux b/stdlib/source/library/lux/data/product.lux
index 9a8c37fb2..6cf05ac83 100644
--- a/stdlib/source/lux/data/product.lux
+++ b/stdlib/source/library/lux/data/product.lux
@@ -1,9 +1,10 @@
 (.module:
   {#.doc "Functionality for working with tuples (particularly 2-tuples)."}
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]]])
 
 (template [<name> <type> <output>]
   [(def: #export (<name> xy)
diff --git a/stdlib/source/lux/data/store.lux b/stdlib/source/library/lux/data/store.lux
index 52842eac9..3a6d73386 100644
--- a/stdlib/source/lux/data/store.lux
+++ b/stdlib/source/library/lux/data/store.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    comonad]
-   [type
-    implicit]])
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     comonad]
+    [type
+     implicit]]])
 
 (type: #export (Store s a)
   {#cursor s
diff --git a/stdlib/source/lux/data/sum.lux b/stdlib/source/library/lux/data/sum.lux
index bb0e6d0e7..7a439fc54 100644
--- a/stdlib/source/lux/data/sum.lux
+++ b/stdlib/source/library/lux/data/sum.lux
@@ -1,9 +1,10 @@
 (.module:
   {#.doc "Functionality for working with variants (particularly 2-variants)."}
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]]])
 
 (template [<name> <type> <right?>]
   [(def: #export (<name> value)
diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/library/lux/data/text.lux
index 1c54218f9..6acc3233c 100644
--- a/stdlib/source/lux/data/text.lux
+++ b/stdlib/source/library/lux/data/text.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [hash (#+ Hash)]
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [monad (#+ Monad do)]
-    [codec (#+ Codec)]]
-   [data
-    ["." maybe]
-    [collection
-     ["." list ("#\." fold)]]]
-   [math
-    [number
-     ["n" nat]
-     ["." i64]]]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [hash (#+ Hash)]
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [monad (#+ Monad do)]
+     [codec (#+ Codec)]]
+    [data
+     ["." maybe]
+     [collection
+      ["." list ("#\." fold)]]]
+    [math
+     [number
+      ["n" nat]
+      ["." i64]]]]])
 
 (type: #export Char
   Nat)
diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/library/lux/data/text/buffer.lux
index d07b10567..5766d25ef 100644
--- a/stdlib/source/lux/data/text/buffer.lux
+++ b/stdlib/source/library/lux/data/text/buffer.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [ffi (#+ import:)]
-   ["@" target]
-   [control
-    ["." function]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." array]
-     ["." row (#+ Row) ("#\." fold)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [ffi (#+ import:)]
+    ["@" target]
+    [control
+     ["." function]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." array]
+      ["." row (#+ Row) ("#\." fold)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     abstract]]]
   ["." //])
 
 (with_expansions [<jvm> (as_is (import: java/lang/CharSequence)
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/library/lux/data/text/encoding.lux
index 92f68dfe0..3ecb5b4e0 100644
--- a/stdlib/source/lux/data/text/encoding.lux
+++ b/stdlib/source/library/lux/data/text/encoding.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [type
+     abstract]]])
 
 ## https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
 
diff --git a/stdlib/source/lux/data/text/encoding/utf8.lux b/stdlib/source/library/lux/data/text/encoding/utf8.lux
index 7b9e75524..b24c88837 100644
--- a/stdlib/source/lux/data/text/encoding/utf8.lux
+++ b/stdlib/source/library/lux/data/text/encoding/utf8.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["." ffi]
-   [abstract
-    [codec (#+ Codec)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." binary (#+ Binary)]]]
+  [library
+   [lux #*
+    ["@" target]
+    ["." ffi]
+    [abstract
+     [codec (#+ Codec)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." binary (#+ Binary)]]]]
   ["." //])
 
 (with_expansions [<jvm> (as_is (ffi.import: java/lang/String
diff --git a/stdlib/source/lux/data/text/escape.lux b/stdlib/source/library/lux/data/text/escape.lux
index 7a710ae74..2e9883c78 100644
--- a/stdlib/source/lux/data/text/escape.lux
+++ b/stdlib/source/library/lux/data/text/escape.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." maybe]]
-   [math
-    [number (#+ hex)
-     ["n" nat]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]]
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." maybe]]
+    [math
+     [number (#+ hex)
+      ["n" nat]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]]]
   ["." // (#+ Char)
    ["%" format (#+ format)]])
 
diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/library/lux/data/text/format.lux
index 6deb80074..a80503d36 100644
--- a/stdlib/source/lux/data/text/format.lux
+++ b/stdlib/source/library/lux/data/text/format.lux
@@ -1,42 +1,43 @@
 (.module:
-  [lux (#- list nat int rev type)
-   [abstract
-    [monad (#+ do)]
-    [functor
-     ["." contravariant]]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    ["." bit]
-    ["." name]
-    ["." text]
-    [format
-     ["." xml]
-     ["." json]]
-    [collection
-     ["." list ("#\." monad)]]]
-   ["." time
-    ["." instant]
-    ["." duration]
-    ["." date]
-    ["." day]
-    ["." month]]
-   [math
-    ["." modular]
-    [number
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]
-     ["." ratio]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]
-   [meta
-    ["." location]]
-   ["." type]])
+  [library
+   [lux (#- list nat int rev type)
+    [abstract
+     [monad (#+ do)]
+     [functor
+      ["." contravariant]]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     ["." bit]
+     ["." name]
+     ["." text]
+     [format
+      ["." xml]
+      ["." json]]
+     [collection
+      ["." list ("#\." monad)]]]
+    ["." time
+     ["." instant]
+     ["." duration]
+     ["." date]
+     ["." day]
+     ["." month]]
+    [math
+     ["." modular]
+     [number
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]
+      ["." ratio]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]
+    [meta
+     ["." location]]
+    ["." type]]])
 
 (type: #export (Format a)
   {#.doc "A way to produce readable text from values."}
diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/library/lux/data/text/regex.lux
index 47b559d15..38f4155ab 100644
--- a/stdlib/source/lux/data/text/regex.lux
+++ b/stdlib/source/library/lux/data/text/regex.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    monad]
-   [control
-    ["." try]
-    ["<>" parser ("#\." monad)
-     ["<t>" text (#+ Parser)]
-     ["<c>" code]]]
-   [data
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list ("#\." fold monad)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["n" nat ("#\." decimal)]]]]
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     monad]
+    [control
+     ["." try]
+     ["<>" parser ("#\." monad)
+      ["<t>" text (#+ Parser)]
+      ["<c>" code]]]
+    [data
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list ("#\." fold monad)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["n" nat ("#\." decimal)]]]]]
   ["." //
    ["%" format (#+ format)]])
 
@@ -73,7 +74,7 @@
   ($_ <>.either
       (<>.and (<>\wrap current_module) (<>.after (<t>.this "..") name_part^))
       (<>.and name_part^ (<>.after (<t>.this ".") name_part^))
-      (<>.and (<>\wrap "lux") (<>.after (<t>.this ".") name_part^))
+      (<>.and (<>\wrap .prelude_module) (<>.after (<t>.this ".") name_part^))
       (<>.and (<>\wrap "") name_part^)))
 
 (def: (re_var^ current_module)
diff --git a/stdlib/source/lux/data/text/unicode/block.lux b/stdlib/source/library/lux/data/text/unicode/block.lux
index 76fe97b78..24ddb34e2 100644
--- a/stdlib/source/lux/data/text/unicode/block.lux
+++ b/stdlib/source/library/lux/data/text/unicode/block.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [monoid (#+ Monoid)]
-    ["." interval (#+ Interval)]]
-   [math
-    [number (#+ hex)
-     ["n" nat ("#\." interval)]
-     ["." i64]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [monoid (#+ Monoid)]
+     ["." interval (#+ Interval)]]
+    [math
+     [number (#+ hex)
+      ["n" nat ("#\." interval)]
+      ["." i64]]]
+    [type
+     abstract]]]
   [/// (#+ Char)])
 
 (abstract: #export Block
diff --git a/stdlib/source/lux/data/text/unicode/set.lux b/stdlib/source/library/lux/data/text/unicode/set.lux
index 117df224c..2c48aed41 100644
--- a/stdlib/source/lux/data/text/unicode/set.lux
+++ b/stdlib/source/library/lux/data/text/unicode/set.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    [collection
-     ["." list ("#\." fold functor)]
-     ["." set ("#\." equivalence)]
-     ["." tree #_
-      ["#" finger (#+ Tree)]]]]
-   [type (#+ :by_example)
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     [collection
+      ["." list ("#\." fold functor)]
+      ["." set ("#\." equivalence)]
+      ["." tree #_
+       ["#" finger (#+ Tree)]]]]
+    [type (#+ :by_example)
+     abstract]]]
   ["." / #_
    ["/#" // #_
     [// (#+ Char)]
diff --git a/stdlib/source/lux/data/trace.lux b/stdlib/source/library/lux/data/trace.lux
index 1b2f87ddf..0edcff430 100644
--- a/stdlib/source/lux/data/trace.lux
+++ b/stdlib/source/library/lux/data/trace.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monoid (#+ Monoid)]
-    [functor (#+ Functor)]
-    comonad]
-   function])
+  [library
+   [lux #*
+    [abstract
+     ["." monoid (#+ Monoid)]
+     [functor (#+ Functor)]
+     comonad]
+    function]])
 
 (type: #export (Trace t a)
   {#monoid (Monoid t)
diff --git a/stdlib/source/lux/debug.lux b/stdlib/source/library/lux/debug.lux
index cf6fb803c..b73b92035 100644
--- a/stdlib/source/lux/debug.lux
+++ b/stdlib/source/library/lux/debug.lux
@@ -1,44 +1,45 @@
 (.module:
-  [lux (#- type)
-   ["@" target]
-   ["." type]
-   ["." ffi (#+ import:)]
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ new>)]
-    ["." function]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" type (#+ Parser)]
-     ["<.>" code]]]
-   [data
-    ["." text
-     ["%" format (#+ Format)]]
-    [format
-     [xml (#+ XML)]
-     ["." json]]
-    [collection
-     ["." array]
-     ["." list ("#\." functor)]
-     ["." dictionary]]]
-   [macro
-    ["." template]
-    ["." syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     [ratio (#+ Ratio)]
-     ["n" nat]
-     ["i" int]]]
-   [time (#+ Time)
-    [instant (#+ Instant)]
-    [duration (#+ Duration)]
-    [date (#+ Date)]
-    [month (#+ Month)]
-    [day (#+ Day)]]])
+  [library
+   [lux (#- type)
+    ["@" target]
+    ["." type]
+    ["." ffi (#+ import:)]
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ new>)]
+     ["." function]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" type (#+ Parser)]
+      ["<.>" code]]]
+    [data
+     ["." text
+      ["%" format (#+ Format)]]
+     [format
+      [xml (#+ XML)]
+      ["." json]]
+     [collection
+      ["." array]
+      ["." list ("#\." functor)]
+      ["." dictionary]]]
+    [macro
+     ["." template]
+     ["." syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      [ratio (#+ Ratio)]
+      ["n" nat]
+      ["i" int]]]
+    [time (#+ Time)
+     [instant (#+ Instant)]
+     [duration (#+ Duration)]
+     [date (#+ Date)]
+     [month (#+ Month)]
+     [day (#+ Day)]]]])
 
 (with_expansions [<jvm> (as_is (import: java/lang/String)
 
diff --git a/stdlib/source/lux/extension.lux b/stdlib/source/library/lux/extension.lux
index 4f02d6ebe..5cad0158c 100644
--- a/stdlib/source/lux/extension.lux
+++ b/stdlib/source/library/lux/extension.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad]]
-   [control
-    ["<>" parser ("#\." monad)
-     ["<c>" code (#+ Parser)]
-     ["<a>" analysis]
-     ["<s>" synthesis]]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#\." functor)]]]
-   [macro (#+ with_gensyms)
-    ["." code]
-    [syntax (#+ syntax:)]]
-   [tool
-    [compiler
-     ["." phase]]]])
+  [library
+   [lux #*
+    [abstract
+     ["." monad]]
+    [control
+     ["<>" parser ("#\." monad)
+      ["<c>" code (#+ Parser)]
+      ["<a>" analysis]
+      ["<s>" synthesis]]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#\." functor)]]]
+    [macro (#+ with_gensyms)
+     ["." code]
+     [syntax (#+ syntax:)]]
+    [tool
+     [compiler
+      ["." phase]]]]])
 
 (type: Input
   {#variable Text
diff --git a/stdlib/source/lux/ffi.js.lux b/stdlib/source/library/lux/ffi.js.lux
index dd5f584c5..aae11fc1d 100644
--- a/stdlib/source/lux/ffi.js.lux
+++ b/stdlib/source/library/lux/ffi.js.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [type
-    abstract]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]])
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [type
+     abstract]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]]])
 
 (abstract: #export (Object brand)
   Any)
diff --git a/stdlib/source/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux
index 8e58c5e50..881c3f79d 100644
--- a/stdlib/source/lux/ffi.jvm.lux
+++ b/stdlib/source/library/lux/ffi.jvm.lux
@@ -1,42 +1,43 @@
 (.module:
-  ["." lux (#- Type type int char interface:)
-   ["#_." type ("#\." equivalence)]
-   [abstract
-    ["." monad (#+ Monad do)]
-    ["." enum]]
-   [control
-    ["." function]
-    ["." io]
-    ["." try (#+ Try)]
-    ["." exception (#+ Exception exception:)]
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." array]
-     ["." list ("#\." monad fold monoid)]
-     ["." dictionary (#+ Dictionary)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]
-   ["." meta
-    ["." annotation]]
-   [target
-    [jvm
-     [encoding
-      ["." name (#+ External)]]
-     ["." type (#+ Type Argument Typed)
-      ["." category (#+ Void Value' Value Return' Return Method Primitive Object Class Array Var Parameter Declaration)]
-      ["." box]
-      ["." descriptor]
-      ["." signature]
-      ["." reflection]
-      ["." parser]]]]])
+  [library
+   ["." lux (#- Type type int char interface:)
+    ["#_." type ("#\." equivalence)]
+    [abstract
+     ["." monad (#+ Monad do)]
+     ["." enum]]
+    [control
+     ["." function]
+     ["." io]
+     ["." try (#+ Try)]
+     ["." exception (#+ Exception exception:)]
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." array]
+      ["." list ("#\." monad fold monoid)]
+      ["." dictionary (#+ Dictionary)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]
+    ["." meta
+     ["." annotation]]
+    [target
+     [jvm
+      [encoding
+       ["." name (#+ External)]]
+      ["." type (#+ Type Argument Typed)
+       ["." category (#+ Void Value' Value Return' Return Method Primitive Object Class Array Var Parameter Declaration)]
+       ["." box]
+       ["." descriptor]
+       ["." signature]
+       ["." reflection]
+       ["." parser]]]]]])
 
 (def: internal
   (-> External Text)
diff --git a/stdlib/source/lux/ffi.lua.lux b/stdlib/source/library/lux/ffi.lua.lux
index 61ee5b35c..0099865f5 100644
--- a/stdlib/source/lux/ffi.lua.lux
+++ b/stdlib/source/library/lux/ffi.lua.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["." meta]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [type
-    abstract]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]])
+  [library
+   [lux #*
+    ["." meta]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [type
+     abstract]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]]])
 
 (abstract: #export (Object brand) Any)
 
diff --git a/stdlib/source/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux
index 9e6a642ed..fdb5d1412 100644
--- a/stdlib/source/lux/ffi.old.lux
+++ b/stdlib/source/library/lux/ffi.old.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- type interface:)
-   ["." type ("#\." equivalence)]
-   [abstract
-    ["." monad (#+ Monad do)]
-    ["." enum]]
-   [control
-    ["." function]
-    ["." io]
-    ["." try (#+ Try)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." product]
-    ["." bit ("#\." codec)]
-    ["." text ("#\." equivalence monoid)
-     ["%" format (#+ format)]]
-    [collection
-     ["." array (#+ Array)]
-     ["." list ("#\." monad fold monoid)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   ["." meta
-    ["." annotation]]])
+  [library
+   [lux (#- type interface:)
+    ["." type ("#\." equivalence)]
+    [abstract
+     ["." monad (#+ Monad do)]
+     ["." enum]]
+    [control
+     ["." function]
+     ["." io]
+     ["." try (#+ Try)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." product]
+     ["." bit ("#\." codec)]
+     ["." text ("#\." equivalence monoid)
+      ["%" format (#+ format)]]
+     [collection
+      ["." array (#+ Array)]
+      ["." list ("#\." monad fold monoid)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    ["." meta
+     ["." annotation]]]])
 
 (template [<name> <op> <from> <to>]
   [(def: #export (<name> value)
diff --git a/stdlib/source/lux/ffi.php.lux b/stdlib/source/library/lux/ffi.php.lux
index 08a837c44..eb9b5fbed 100644
--- a/stdlib/source/lux/ffi.php.lux
+++ b/stdlib/source/library/lux/ffi.php.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux (#- Alias)
-   ["." meta]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [type
-    abstract]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]])
+  [library
+   [lux (#- Alias)
+    ["." meta]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [type
+     abstract]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]]])
 
 (abstract: #export (Object brand) Any)
 
diff --git a/stdlib/source/lux/ffi.py.lux b/stdlib/source/library/lux/ffi.py.lux
index 396cebf5c..737cfefd8 100644
--- a/stdlib/source/lux/ffi.py.lux
+++ b/stdlib/source/library/lux/ffi.py.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux #*
-   ["." meta]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [type
-    abstract]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]])
+  [library
+   [lux #*
+    ["." meta]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [type
+     abstract]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]]])
 
 (abstract: #export (Object brand) Any)
 
 (template [<name>]
   [(with_expansions [<brand> (template.identifier [<name> "'"])]
-     (abstract: #export <brand> Any)
+     (abstract: <brand> Any)
      (type: #export <name>
        (..Object <brand>)))]
 
   [None]
-  [Function]
   [Dict]
+  [Function]
   )
 
 (template [<name> <type>]
diff --git a/stdlib/source/lux/ffi.rb.lux b/stdlib/source/library/lux/ffi.rb.lux
index df71dcc18..511351bad 100644
--- a/stdlib/source/lux/ffi.rb.lux
+++ b/stdlib/source/library/lux/ffi.rb.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux (#- Alias)
-   ["@" target]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [type
-    abstract]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]])
+  [library
+   [lux (#- Alias)
+    ["@" target]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [type
+     abstract]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]]])
 
 (abstract: #export (Object brand) Any)
 
diff --git a/stdlib/source/lux/ffi.scm.lux b/stdlib/source/library/lux/ffi.scm.lux
index c6c447b72..85370fcf6 100644
--- a/stdlib/source/lux/ffi.scm.lux
+++ b/stdlib/source/library/lux/ffi.scm.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux (#- Alias)
-   ["@" target]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [type
-    abstract]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]])
+  [library
+   [lux (#- Alias)
+    ["@" target]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [type
+     abstract]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]]])
 
 (abstract: #export (Object brand) Any)
 
diff --git a/stdlib/source/lux/locale.lux b/stdlib/source/library/lux/locale.lux
index 38b11fd6b..381938c74 100644
--- a/stdlib/source/lux/locale.lux
+++ b/stdlib/source/library/lux/locale.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    ["." hash (#+ Hash)]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format (#+ format)]
-     ["." encoding (#+ Encoding)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     ["." hash (#+ Hash)]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format (#+ format)]
+      ["." encoding (#+ Encoding)]]]
+    [type
+     abstract]]]
   [/
    ["." language (#+ Language)]
    ["." territory (#+ Territory)]])
diff --git a/stdlib/source/lux/locale/language.lux b/stdlib/source/library/lux/locale/language.lux
index 7dd4b22e0..554606609 100644
--- a/stdlib/source/lux/locale/language.lux
+++ b/stdlib/source/library/lux/locale/language.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [data
-    ["." text]]
-   [type
-    abstract]
-   [macro
-    ["." template]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [data
+     ["." text]]
+    [type
+     abstract]
+    [macro
+     ["." template]]]])
 
 ## https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes
 (abstract: #export Language
diff --git a/stdlib/source/lux/locale/territory.lux b/stdlib/source/library/lux/locale/territory.lux
index dfb20896c..be60b6734 100644
--- a/stdlib/source/lux/locale/territory.lux
+++ b/stdlib/source/library/lux/locale/territory.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [data
-    ["." text]]
-   [type
-    abstract]
-   [macro
-    ["." template]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [data
+     ["." text]]
+    [type
+     abstract]
+    [macro
+     ["." template]]]])
 
 ## https://en.wikipedia.org/wiki/ISO_3166-1
 (abstract: #export Territory
diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/library/lux/macro.lux
index 1b83d179a..c446dfa70 100644
--- a/stdlib/source/lux/macro.lux
+++ b/stdlib/source/library/lux/macro.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." text ("#\." monoid)]
-    ["." name ("#\." codec)]
-    [collection
-     ["." list ("#\." monoid monad)]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["." nat]
-     ["." int]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." text ("#\." monoid)]
+     ["." name ("#\." codec)]
+     [collection
+      ["." list ("#\." monoid monad)]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["." nat]
+      ["." int]]]]]
   ["." // #_
    ["#" meta
     ["." location]]])
diff --git a/stdlib/source/lux/macro/code.lux b/stdlib/source/library/lux/macro/code.lux
index a17b38233..ec99f68a4 100644
--- a/stdlib/source/lux/macro/code.lux
+++ b/stdlib/source/library/lux/macro/code.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux (#- nat int rev)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." bit]
-    ["." name]
-    ["." text ("#\." monoid equivalence)]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]]]
-   [meta
-    ["." location]]])
+  [library
+   [lux (#- nat int rev)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." bit]
+     ["." name]
+     ["." text ("#\." monoid equivalence)]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]]]
+    [meta
+     ["." location]]]])
 
 ## (type: (Code' w)
 ##   (#.Bit Bit)
diff --git a/stdlib/source/lux/macro/local.lux b/stdlib/source/library/lux/macro/local.lux
index fc9e8bef5..4eb9c35c6 100644
--- a/stdlib/source/lux/macro/local.lux
+++ b/stdlib/source/library/lux/macro/local.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]
-     [dictionary
-      ["." plist (#+ PList)]]]]]
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]
+      [dictionary
+       ["." plist (#+ PList)]]]]]]
   ["." //
    ["#." code]])
 
diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/library/lux/macro/poly.lux
index d29966a87..5ce420e7a 100644
--- a/stdlib/source/lux/macro/poly.lux
+++ b/stdlib/source/library/lux/macro/poly.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["." meta]
-   ["." type]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["p" parser
-     ["<.>" type (#+ Env)]
-     ["s" code]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text]
-    [collection
-     ["." list ("#\." fold functor)]
-     ["." dictionary]]]
-   [macro (#+ with_gensyms)
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" export]]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    ["." meta]
+    ["." type]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["p" parser
+      ["<.>" type (#+ Env)]
+      ["s" code]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text]
+     [collection
+      ["." list ("#\." fold functor)]
+      ["." dictionary]]]
+    [macro (#+ with_gensyms)
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" export]]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (syntax: #export (poly: {export |export|.parser}
                    {name s.local_identifier}
@@ -82,46 +83,46 @@
 
 (def: #export (to_code env type)
   (-> Env Type Code)
-  (case type
-    (#.Primitive name params)
-    (` (#.Primitive (~ (code.text name))
-                    (list (~+ (list\map (to_code env) params)))))
+  (`` (case type
+        (#.Primitive name params)
+        (` (#.Primitive (~ (code.text name))
+                        (list (~+ (list\map (to_code env) params)))))
 
-    (^template [<tag>]
-      [(<tag> idx)
-       (` (<tag> (~ (code.nat idx))))])
-    ([#.Var] [#.Ex])
+        (^template [<tag>]
+          [(<tag> idx)
+           (` (<tag> (~ (code.nat idx))))])
+        ([#.Var] [#.Ex])
 
-    (#.Parameter idx)
-    (let [idx (<type>.adjusted_idx env idx)]
-      (if (n.= 0 idx)
-        (|> (dictionary.get idx env) maybe.assume product.left (to_code env))
-        (` (.$ (~ (code.nat (dec idx)))))))
+        (#.Parameter idx)
+        (let [idx (<type>.adjusted_idx env idx)]
+          (if (n.= 0 idx)
+            (|> (dictionary.get idx env) maybe.assume product.left (to_code env))
+            (` (.$ (~ (code.nat (dec idx)))))))
 
-    (#.Apply (#.Named ["lux" "Nothing"] _) (#.Parameter idx))
-    (let [idx (<type>.adjusted_idx env idx)]
-      (if (n.= 0 idx)
-        (|> (dictionary.get idx env) maybe.assume product.left (to_code env))
-        (undefined)))
-    
-    (^template [<tag>]
-      [(<tag> left right)
-       (` (<tag> (~ (to_code env left))
-                 (~ (to_code env right))))])
-    ([#.Function] [#.Apply])
+        (#.Apply (#.Named [(~~ (static .prelude_module)) "Nothing"] _) (#.Parameter idx))
+        (let [idx (<type>.adjusted_idx env idx)]
+          (if (n.= 0 idx)
+            (|> (dictionary.get idx env) maybe.assume product.left (to_code env))
+            (undefined)))
+        
+        (^template [<tag>]
+          [(<tag> left right)
+           (` (<tag> (~ (to_code env left))
+                     (~ (to_code env right))))])
+        ([#.Function] [#.Apply])
 
-    (^template [<macro> <tag> <flattener>]
-      [(<tag> left right)
-       (` (<macro> (~+ (list\map (to_code env) (<flattener> type)))))])
-    ([| #.Sum type.flatten_variant]
-     [& #.Product type.flatten_tuple])
+        (^template [<macro> <tag> <flattener>]
+          [(<tag> left right)
+           (` (<macro> (~+ (list\map (to_code env) (<flattener> type)))))])
+        ([| #.Sum type.flatten_variant]
+         [& #.Product type.flatten_tuple])
 
-    (#.Named name sub_type)
-    (code.identifier name)
+        (#.Named name sub_type)
+        (code.identifier name)
 
-    (^template [<tag>]
-      [(<tag> scope body)
-       (` (<tag> (list (~+ (list\map (to_code env) scope)))
-                 (~ (to_code env body))))])
-    ([#.UnivQ] [#.ExQ])
-    ))
+        (^template [<tag>]
+          [(<tag> scope body)
+           (` (<tag> (list (~+ (list\map (to_code env) scope)))
+                     (~ (to_code env body))))])
+        ([#.UnivQ] [#.ExQ])
+        )))
diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/library/lux/macro/syntax.lux
index 738ae2a22..c2ddeefe5 100644
--- a/stdlib/source/lux/macro/syntax.lux
+++ b/stdlib/source/library/lux/macro/syntax.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["." macro (#+ with_gensyms)]
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["</>" code (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." text ("#\." monoid)]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]]]]
+  [library
+   [lux #*
+    ["." macro (#+ with_gensyms)]
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["</>" code (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." text ("#\." monoid)]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]]]]]
   [//
    ["." code]])
 
diff --git a/stdlib/source/lux/macro/syntax/annotations.lux b/stdlib/source/library/lux/macro/syntax/annotations.lux
index a0453771a..28f5a233e 100644
--- a/stdlib/source/lux/macro/syntax/annotations.lux
+++ b/stdlib/source/library/lux/macro/syntax/annotations.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." name]
-    [collection
-     ["." list ("#\." functor)]]]
-   [macro
-    ["." code]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." name]
+     [collection
+      ["." list ("#\." functor)]]]
+    [macro
+     ["." code]]]])
 
 (type: #export Annotations
   (List [Name Code]))
diff --git a/stdlib/source/lux/macro/syntax/check.lux b/stdlib/source/library/lux/macro/syntax/check.lux
index d3007b2b8..bd4214eab 100644
--- a/stdlib/source/lux/macro/syntax/check.lux
+++ b/stdlib/source/library/lux/macro/syntax/check.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]]
-   [macro
-    ["." code]]])
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]]
+    [macro
+     ["." code]]]])
 
 (def: extension
   "lux check")
diff --git a/stdlib/source/lux/macro/syntax/declaration.lux b/stdlib/source/library/lux/macro/syntax/declaration.lux
index 92158b842..d1c7d94c6 100644
--- a/stdlib/source/lux/macro/syntax/declaration.lux
+++ b/stdlib/source/library/lux/macro/syntax/declaration.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]]]
-   [macro
-    ["." code]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]]]
+    [macro
+     ["." code]]]])
 
 (type: #export Declaration
   {#name Text
diff --git a/stdlib/source/lux/macro/syntax/definition.lux b/stdlib/source/library/lux/macro/syntax/definition.lux
index bbb72fb37..1e309a306 100644
--- a/stdlib/source/lux/macro/syntax/definition.lux
+++ b/stdlib/source/library/lux/macro/syntax/definition.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- Definition)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." sum]
-    ["." product]
-    ["." bit]
-    ["." name]
-    ["." text
-     ["%" format]]
-    [collection
-     ["." list]]]
-   ["." macro
-    ["." code]]
-   ["." meta
-    ["." location]]]
+  [library
+   [lux (#- Definition)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." sum]
+     ["." product]
+     ["." bit]
+     ["." name]
+     ["." text
+      ["%" format]]
+     [collection
+      ["." list]]]
+    ["." macro
+     ["." code]]
+    ["." meta
+     ["." location]]]]
   ["." //
    ["#." annotations (#+ Annotations)]
    ["#." check (#+ Check)]])
diff --git a/stdlib/source/lux/macro/syntax/export.lux b/stdlib/source/library/lux/macro/syntax/export.lux
index fceecc6e7..d76aa6fcc 100644
--- a/stdlib/source/lux/macro/syntax/export.lux
+++ b/stdlib/source/library/lux/macro/syntax/export.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [control
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]])
+  [library
+   [lux #*
+    [control
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]]])
 
 (def: token
   (' #export))
diff --git a/stdlib/source/lux/macro/syntax/input.lux b/stdlib/source/library/lux/macro/syntax/input.lux
index 9b9fcb576..9307322d9 100644
--- a/stdlib/source/lux/macro/syntax/input.lux
+++ b/stdlib/source/library/lux/macro/syntax/input.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]]
-   [macro
-    ["." code]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]]
+    [macro
+     ["." code]]]])
 
 (type: #export Input
   {#binding Code
diff --git a/stdlib/source/lux/macro/syntax/type/variable.lux b/stdlib/source/library/lux/macro/syntax/type/variable.lux
index 22f37a35c..e73020c42 100644
--- a/stdlib/source/lux/macro/syntax/type/variable.lux
+++ b/stdlib/source/library/lux/macro/syntax/type/variable.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    [parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." text]]
-   [macro
-    ["." code]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     [parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." text]]
+    [macro
+     ["." code]]]])
 
 (type: #export Variable
   Text)
diff --git a/stdlib/source/lux/macro/template.lux b/stdlib/source/library/lux/macro/template.lux
index b970cae05..c489703fc 100644
--- a/stdlib/source/lux/macro/template.lux
+++ b/stdlib/source/library/lux/macro/template.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- let)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser ("#\." functor)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." bit ("#\." codec)]
-    ["." text]
-    [collection
-     ["." list ("#\." monad)]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    [number
-     ["." nat ("#\." decimal)]
-     ["." int ("#\." decimal)]
-     ["." rev ("#\." decimal)]
-     ["." frac ("#\." decimal)]]]]
+  [library
+   [lux (#- let)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser ("#\." functor)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." bit ("#\." codec)]
+     ["." text]
+     [collection
+      ["." list ("#\." monad)]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     [number
+      ["." nat ("#\." decimal)]
+      ["." int ("#\." decimal)]
+      ["." rev ("#\." decimal)]
+      ["." frac ("#\." decimal)]]]]]
   ["." //
    [syntax (#+ syntax:)]
    ["." code]
diff --git a/stdlib/source/lux/math.lux b/stdlib/source/library/lux/math.lux
index c7e709578..0070bcfa3 100644
--- a/stdlib/source/lux/math.lux
+++ b/stdlib/source/library/lux/math.lux
@@ -1,10 +1,11 @@
 (.module: {#.doc "Common mathematical constants and functions."}
-  [lux #*
-   ["@" target]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]])
+  [library
+   [lux #*
+    ["@" target]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]]])
 
 (template [<name> <value> <doc>]
   [(def: #export <name>
diff --git a/stdlib/source/lux/math/infix.lux b/stdlib/source/library/lux/math/infix.lux
index 674544ae8..a8fd881aa 100644
--- a/stdlib/source/lux/math/infix.lux
+++ b/stdlib/source/library/lux/math/infix.lux
@@ -1,21 +1,22 @@
 (.module: {#.doc "Common mathematical constants and functions."}
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["<>" parser ("#\." functor)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#\." fold)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["<>" parser ("#\." functor)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#\." fold)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]]])
 
 (type: #rec Infix
   (#Const Code)
diff --git a/stdlib/source/lux/math/logic/continuous.lux b/stdlib/source/library/lux/math/logic/continuous.lux
index 445bd8447..631219671 100644
--- a/stdlib/source/lux/math/logic/continuous.lux
+++ b/stdlib/source/library/lux/math/logic/continuous.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- false true or and not)
-   [abstract
-    [monoid (#+ Monoid)]]
-   [math
-    [number
-     ["r" rev ("#\." interval)]]]])
+  [library
+   [lux (#- false true or and not)
+    [abstract
+     [monoid (#+ Monoid)]]
+    [math
+     [number
+      ["r" rev ("#\." interval)]]]]])
 
 (def: #export false Rev r\bottom)
 (def: #export true  Rev r\top)
diff --git a/stdlib/source/lux/math/logic/fuzzy.lux b/stdlib/source/library/lux/math/logic/fuzzy.lux
index 5308786fa..c1815f3db 100644
--- a/stdlib/source/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/library/lux/math/logic/fuzzy.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [predicate (#+ Predicate)]
-    [functor
-     ["." contravariant]]]
-   [data
-    [collection
-     ["." list]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["/" rev]]]]
+  [library
+   [lux #*
+    [abstract
+     [predicate (#+ Predicate)]
+     [functor
+      ["." contravariant]]]
+    [data
+     [collection
+      ["." list]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["/" rev]]]]]
   ["." // #_
    ["#" continuous]])
 
diff --git a/stdlib/source/lux/math/modular.lux b/stdlib/source/library/lux/math/modular.lux
index 5ecfb6763..679666580 100644
--- a/stdlib/source/lux/math/modular.lux
+++ b/stdlib/source/library/lux/math/modular.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [monoid (#+ Monoid)]
-    [codec (#+ Codec)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" text (#+ Parser)]
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." monoid)]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["i" int ("#\." decimal)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [monoid (#+ Monoid)]
+     [codec (#+ Codec)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" text (#+ Parser)]
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." monoid)]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["i" int ("#\." decimal)]]]
+    [type
+     abstract]]]
   ["." // #_
    ["#" modulus (#+ Modulus)]])
 
diff --git a/stdlib/source/lux/math/modulus.lux b/stdlib/source/library/lux/math/modulus.lux
index 00949f6ce..fa654a408 100644
--- a/stdlib/source/lux/math/modulus.lux
+++ b/stdlib/source/library/lux/math/modulus.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    [parser
-     ["<.>" code]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["i" int]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     [parser
+      ["<.>" code]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["i" int]]]
+    [type
+     abstract]]])
 
 (exception: #export zero_cannot_be_a_modulus)
 
diff --git a/stdlib/source/lux/math/number.lux b/stdlib/source/library/lux/math/number.lux
index a96c450ee..506fde750 100644
--- a/stdlib/source/lux/math/number.lux
+++ b/stdlib/source/library/lux/math/number.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [codec (#+ Codec)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." text]]]
+  [library
+   [lux #*
+    [abstract
+     [codec (#+ Codec)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." text]]]]
   ["." / #_
    ["#." nat]
    ["#." int]
diff --git a/stdlib/source/lux/math/number/complex.lux b/stdlib/source/library/lux/math/number/complex.lux
index 279f6177a..cc2c6a4f1 100644
--- a/stdlib/source/lux/math/number/complex.lux
+++ b/stdlib/source/library/lux/math/number/complex.lux
@@ -1,25 +1,26 @@
 (.module: {#.doc "Complex arithmetic."}
-  [lux #*
-   ["." math]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [codec (#+ Codec)]
-    ["M" monad (#+ Monad do)]]
-   [control
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." maybe]
-    [collection
-     ["." list ("#\." functor)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac]
-     ["." int]]]])
+  [library
+   [lux #*
+    ["." math]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [codec (#+ Codec)]
+     ["M" monad (#+ Monad do)]]
+    [control
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." maybe]
+     [collection
+      ["." list ("#\." functor)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac]
+      ["." int]]]]])
 
 (type: #export Complex
   {#real Frac
diff --git a/stdlib/source/lux/math/number/frac.lux b/stdlib/source/library/lux/math/number/frac.lux
index 4c25d5ca7..f6f01192e 100644
--- a/stdlib/source/lux/math/number/frac.lux
+++ b/stdlib/source/library/lux/math/number/frac.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- nat int rev)
-   ["@" target]
-   [abstract
-    [hash (#+ Hash)]
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]
-    [codec (#+ Codec)]
-    [predicate (#+ Predicate)]
-    [order (#+ Order)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." maybe]
-    ["." text]]]
+  [library
+   [lux (#- nat int rev)
+    ["@" target]
+    [abstract
+     [hash (#+ Hash)]
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]
+     [codec (#+ Codec)]
+     [predicate (#+ Predicate)]
+     [order (#+ Order)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." maybe]
+     ["." text]]]]
   ["." // #_
    ["#." i64]
    ["#." nat]
diff --git a/stdlib/source/lux/math/number/i16.lux b/stdlib/source/library/lux/math/number/i16.lux
index ba4f9cd02..a35300c11 100644
--- a/stdlib/source/lux/math/number/i16.lux
+++ b/stdlib/source/library/lux/math/number/i16.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- i64)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." maybe]]
-   [type (#+ :by_example)]]
+  [library
+   [lux (#- i64)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." maybe]]
+    [type (#+ :by_example)]]]
   [//
    ["." i64 (#+ Sub)]])
 
diff --git a/stdlib/source/lux/math/number/i32.lux b/stdlib/source/library/lux/math/number/i32.lux
index 9141c175d..a0ecfabc2 100644
--- a/stdlib/source/lux/math/number/i32.lux
+++ b/stdlib/source/library/lux/math/number/i32.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- i64)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." maybe]]
-   [type (#+ :by_example)]]
+  [library
+   [lux (#- i64)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." maybe]]
+    [type (#+ :by_example)]]]
   [//
    ["." i64 (#+ Sub)]])
 
diff --git a/stdlib/source/lux/math/number/i64.lux b/stdlib/source/library/lux/math/number/i64.lux
index a3b415287..357b36557 100644
--- a/stdlib/source/lux/math/number/i64.lux
+++ b/stdlib/source/library/lux/math/number/i64.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux (#- and or not false true)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [monoid (#+ Monoid)]]
-   [control
-    ["." try]]]
+  [library
+   [lux (#- and or not false true)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [monoid (#+ Monoid)]]
+    [control
+     ["." try]]]]
   [//
    ["n" nat]])
 
diff --git a/stdlib/source/lux/math/number/i8.lux b/stdlib/source/library/lux/math/number/i8.lux
index d6184315c..2e8fc0cf1 100644
--- a/stdlib/source/lux/math/number/i8.lux
+++ b/stdlib/source/library/lux/math/number/i8.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- i64)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." maybe]]
-   [type (#+ :by_example)]]
+  [library
+   [lux (#- i64)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." maybe]]
+    [type (#+ :by_example)]]]
   [//
    ["." i64 (#+ Sub)]])
 
diff --git a/stdlib/source/lux/math/number/int.lux b/stdlib/source/library/lux/math/number/int.lux
index 708ab8dd4..c72c31e16 100644
--- a/stdlib/source/lux/math/number/int.lux
+++ b/stdlib/source/library/lux/math/number/int.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [hash (#+ Hash)]
-    [enum (#+ Enum)]
-    [interval (#+ Interval)]
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]
-    [codec (#+ Codec)]
-    [predicate (#+ Predicate)]
-    ["." order (#+ Order)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    [text (#+ Char)]
-    ["." maybe]]]
+  [library
+   [lux #*
+    [abstract
+     [hash (#+ Hash)]
+     [enum (#+ Enum)]
+     [interval (#+ Interval)]
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]
+     [codec (#+ Codec)]
+     [predicate (#+ Predicate)]
+     ["." order (#+ Order)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     [text (#+ Char)]
+     ["." maybe]]]]
   ["." // #_
    ["#." nat]
    ["#." i64]])
diff --git a/stdlib/source/lux/math/number/nat.lux b/stdlib/source/library/lux/math/number/nat.lux
index 248c169ba..52e252c84 100644
--- a/stdlib/source/lux/math/number/nat.lux
+++ b/stdlib/source/library/lux/math/number/nat.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    [hash (#+ Hash)]
-    [enum (#+ Enum)]
-    [interval (#+ Interval)]
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]
-    [codec (#+ Codec)]
-    ["." order (#+ Order)]]
-   [control
-    ["." function]
-    ["." try (#+ Try)]]
-   [data
-    ["." maybe]]])
+  [library
+   [lux #*
+    [abstract
+     [hash (#+ Hash)]
+     [enum (#+ Enum)]
+     [interval (#+ Interval)]
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]
+     [codec (#+ Codec)]
+     ["." order (#+ Order)]]
+    [control
+     ["." function]
+     ["." try (#+ Try)]]
+    [data
+     ["." maybe]]]])
 
 (template [<extension> <output> <name> <documentation>]
   [(def: #export (<name> parameter subject)
diff --git a/stdlib/source/lux/math/number/ratio.lux b/stdlib/source/library/lux/math/number/ratio.lux
index ad2092fbd..ecfdf30a0 100644
--- a/stdlib/source/lux/math/number/ratio.lux
+++ b/stdlib/source/library/lux/math/number/ratio.lux
@@ -1,24 +1,25 @@
 (.module:
   {#.doc "Rational numbers."}
-  [lux (#- nat)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [monoid (#+ Monoid)]
-    [codec (#+ Codec)]
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." monoid)]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]]
+  [library
+   [lux (#- nat)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [monoid (#+ Monoid)]
+     [codec (#+ Codec)]
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." monoid)]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]]]
   [//
    ["n" nat ("#\." decimal)]])
 
diff --git a/stdlib/source/lux/math/number/rev.lux b/stdlib/source/library/lux/math/number/rev.lux
index 0f96320e3..431f44ed1 100644
--- a/stdlib/source/lux/math/number/rev.lux
+++ b/stdlib/source/library/lux/math/number/rev.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [hash (#+ Hash)]
-    [enum (#+ Enum)]
-    [interval (#+ Interval)]
-    [monoid (#+ Monoid)]
-    [equivalence (#+ Equivalence)]
-    [codec (#+ Codec)]
-    [order (#+ Order)]]
-   [control
-    ["." try]]
-   [data
-    ["." maybe]
-    [collection
-     ["." array (#+ Array)]]]]
+  [library
+   [lux #*
+    [abstract
+     [hash (#+ Hash)]
+     [enum (#+ Enum)]
+     [interval (#+ Interval)]
+     [monoid (#+ Monoid)]
+     [equivalence (#+ Equivalence)]
+     [codec (#+ Codec)]
+     [order (#+ Order)]]
+    [control
+     ["." try]]
+    [data
+     ["." maybe]
+     [collection
+      ["." array (#+ Array)]]]]]
   ["." // #_
    ["#." i64]
    ["#." nat]
diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux
index 8c95c63fa..8b555e21d 100644
--- a/stdlib/source/lux/math/random.lux
+++ b/stdlib/source/library/lux/math/random.lux
@@ -1,40 +1,41 @@
 (.module: {#.doc "Pseudo-random number generation (PRNG) algorithms."}
-  [lux (#- or and list i64 nat int rev char)
-   [abstract
-    [hash (#+ Hash)]
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [data
-    ["." text (#+ Char) ("#\." monoid)
-     ["." unicode #_
-      ["#" set]]]
-    [collection
-     ["." list ("#\." fold)]
-     ["." array (#+ Array)]
-     ["." dictionary (#+ Dictionary)]
-     ["." queue (#+ Queue)]
-     ["." set (#+ Set)]
-     ["." stack (#+ Stack)]
-     ["." row (#+ Row)]
-     [tree
-      ["." finger (#+ Tree)]]]]
-   [math
-    [number (#+ hex)
-     ["n" nat]
-     ["i" int]
-     ["f" frac]
-     ["r" ratio]
-     ["c" complex]
-     ["." i64]]]
-   ["." time (#+ Time)
-    ["." instant (#+ Instant)]
-    ["." date (#+ Date)]
-    ["." duration (#+ Duration)]
-    ["." month (#+ Month)]
-    ["." day (#+ Day)]]
-   [type
-    [refinement (#+ Refiner Refined)]]])
+  [library
+   [lux (#- or and list i64 nat int rev char)
+    [abstract
+     [hash (#+ Hash)]
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [data
+     ["." text (#+ Char) ("#\." monoid)
+      ["." unicode #_
+       ["#" set]]]
+     [collection
+      ["." list ("#\." fold)]
+      ["." array (#+ Array)]
+      ["." dictionary (#+ Dictionary)]
+      ["." queue (#+ Queue)]
+      ["." set (#+ Set)]
+      ["." stack (#+ Stack)]
+      ["." row (#+ Row)]
+      [tree
+       ["." finger (#+ Tree)]]]]
+    [math
+     [number (#+ hex)
+      ["n" nat]
+      ["i" int]
+      ["f" frac]
+      ["r" ratio]
+      ["c" complex]
+      ["." i64]]]
+    ["." time (#+ Time)
+     ["." instant (#+ Instant)]
+     ["." date (#+ Date)]
+     ["." duration (#+ Duration)]
+     ["." month (#+ Month)]
+     ["." day (#+ Day)]]
+    [type
+     [refinement (#+ Refiner Refined)]]]])
 
 (type: #export #rec PRNG
   {#.doc "An abstract way to represent any PRNG."}
diff --git a/stdlib/source/lux/meta.lux b/stdlib/source/library/lux/meta.lux
index a6877765b..b86100325 100644
--- a/stdlib/source/lux/meta.lux
+++ b/stdlib/source/library/lux/meta.lux
@@ -1,26 +1,27 @@
 (.module: {#.doc "Functions for extracting information from the state of the compiler."}
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." monoid equivalence)]
-    ["." name ("#\." codec equivalence)]
-    [collection
-     ["." list ("#\." monoid monad)]
-     [dictionary
-      ["." plist]]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]]
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." monoid equivalence)]
+     ["." name ("#\." codec equivalence)]
+     [collection
+      ["." list ("#\." monoid monad)]
+      [dictionary
+       ["." plist]]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]]]
   [/
    ["." location]])
 
@@ -144,12 +145,12 @@
 
 (def: (macro_type? type)
   (-> Type Bit)
-  (case type
-    (#.Named ["lux" "Macro"] (#.Primitive "#Macro" #.Nil))
-    true
+  (`` (case type
+        (#.Named [(~~ (static .prelude_module)) "Macro"] (#.Primitive "#Macro" #.Nil))
+        true
 
-    _
-    false))
+        _
+        false)))
 
 (def: #export (normalize name)
   {#.doc (doc "If given a name without a module prefix, gives it the current module's name as prefix."
@@ -381,7 +382,7 @@
       (find_type_def de_aliased)
       
       (#.Right [exported? def_type def_data def_value])
-      (let [type_to_code ("lux in-module" "lux" .type_to_code)]
+      (let [type_to_code (`` ("lux in-module" (~~ (static .prelude_module)) .type_to_code))]
         (if (or (is? .Type def_type)
                 (\ code.equivalence =
                    (type_to_code .Type)
diff --git a/stdlib/source/lux/meta/annotation.lux b/stdlib/source/library/lux/meta/annotation.lux
index 648119177..1b7ee480b 100644
--- a/stdlib/source/lux/meta/annotation.lux
+++ b/stdlib/source/library/lux/meta/annotation.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- nat int rev)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." maybe]
-    ["." name ("#\." equivalence)]]])
+  [library
+   [lux (#- nat int rev)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." maybe]
+     ["." name ("#\." equivalence)]]]])
 
 (type: #export Annotation
   Code)
diff --git a/stdlib/source/lux/meta/location.lux b/stdlib/source/library/lux/meta/location.lux
index 5e8453c50..ddc40b147 100644
--- a/stdlib/source/lux/meta/location.lux
+++ b/stdlib/source/library/lux/meta/location.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]]])
 
 (implementation: #export equivalence
   (Equivalence Location)
@@ -27,7 +28,7 @@
                           (~ [..dummy (#.Nat (get@ #.column location))])]))]))
 
     _
-    (#.Left (("lux in-module" "lux" wrong_syntax_error) (name_of ..here)))))
+    (#.Left (`` (("lux in-module" (~~ (static .prelude_module)) wrong_syntax_error) (name_of ..here))))))
 
 (def: #export (format value)
   (-> Location Text)
@@ -35,9 +36,9 @@
         [file line column] value]
     ($_ "lux text concat"
         "@"
-        (("lux in-module" "lux" .text\encode) file) separator
-        (("lux in-module" "lux" .nat\encode) line) separator
-        (("lux in-module" "lux" .nat\encode) column))))
+        (`` (("lux in-module" (~~ (static .prelude_module)) .text\encode) file)) separator
+        (`` (("lux in-module" (~~ (static .prelude_module)) .nat\encode) line)) separator
+        (`` (("lux in-module" (~~ (static .prelude_module)) .nat\encode) column)))))
 
 (def: \n
   ("lux i64 char" +10))
diff --git a/stdlib/source/lux/program.lux b/stdlib/source/library/lux/program.lux
index 475bd7322..bd486796b 100644
--- a/stdlib/source/lux/program.lux
+++ b/stdlib/source/library/lux/program.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    [concurrency
-     ["." thread]]
-    ["<>" parser
-     ["<.>" code]
-     ["<.>" cli]]]
-   [data
-    ["." text]
-    [collection
-     ["." list ("#\." monad)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     [concurrency
+      ["." thread]]
+     ["<>" parser
+      ["<.>" code]
+      ["<.>" cli]]]
+    [data
+     ["." text]
+     [collection
+      ["." list ("#\." monad)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]]])
 
 (type: Arguments
   (#Raw Text)
diff --git a/stdlib/source/lux/target.lux b/stdlib/source/library/lux/target.lux
index c548e6809..323cf812b 100644
--- a/stdlib/source/lux/target.lux
+++ b/stdlib/source/library/lux/target.lux
@@ -1,5 +1,6 @@
 (.module:
-  lux)
+  [library
+   lux])
 
 (type: #export Target
   Text)
diff --git a/stdlib/source/lux/target/common_lisp.lux b/stdlib/source/library/lux/target/common_lisp.lux
index f68d28c28..2ec6746c2 100644
--- a/stdlib/source/lux/target/common_lisp.lux
+++ b/stdlib/source/library/lux/target/common_lisp.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Code int if cond or and comment let)
-   [control
-    [pipe (#+ case> cond> new>)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monad fold monoid)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Code int if cond or and comment let)
+    [control
+     [pipe (#+ case> cond> new>)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monad fold monoid)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (def: as_form
   (-> Text Text)
diff --git a/stdlib/source/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux
index f1a7c3e72..d7b42280c 100644
--- a/stdlib/source/lux/target/js.lux
+++ b/stdlib/source/library/lux/target/js.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux (#- Location Code or and function if cond undefined for comment not int try)
-   [control
-    [pipe (#+ case>)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["i" int]
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Location Code or and function if cond undefined for comment not int try)
+    [control
+     [pipe (#+ case>)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["i" int]
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (def: expression (text.enclose ["(" ")"]))
 (def: element (text.enclose ["[" "]"]))
diff --git a/stdlib/source/lux/target/jvm.lux b/stdlib/source/library/lux/target/jvm.lux
index 4250bf705..b470abea9 100644
--- a/stdlib/source/lux/target/jvm.lux
+++ b/stdlib/source/library/lux/target/jvm.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux (#- Type)
-   [data
-    [collection
-     [row (#+ Row)]]]
-   [target
-    [jvm
-     [type (#+ Type)
-      ["." category (#+ Primitive Class Value Method)]]]]])
+  [library
+   [lux (#- Type)
+    [data
+     [collection
+      [row (#+ Row)]]]
+    [target
+     [jvm
+      [type (#+ Type)
+       ["." category (#+ Primitive Class Value Method)]]]]]])
 
 (type: #export Literal
   (#Boolean Bit)
diff --git a/stdlib/source/lux/target/jvm/attribute.lux b/stdlib/source/library/lux/target/jvm/attribute.lux
index 0b8457a9c..9869a6f8b 100644
--- a/stdlib/source/lux/target/jvm/attribute.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Info Code)
-   [abstract
-    [monad (#+ do)]
-    ["." equivalence (#+ Equivalence)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." sum]
-    ["." product]
-    [format
-     [".F" binary (#+ Writer)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- Info Code)
+    [abstract
+     [monad (#+ do)]
+     ["." equivalence (#+ Equivalence)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." sum]
+     ["." product]
+     [format
+      [".F" binary (#+ Writer)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    ["#." index (#+ Index)]
    [encoding
diff --git a/stdlib/source/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/target/jvm/attribute/code.lux
index 212d44765..80cc7a6ad 100644
--- a/stdlib/source/lux/target/jvm/attribute/code.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/code.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- Code)
-   [type (#+ :share)]
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." binary (#+ Binary)]
-    [format
-     [".F" binary (#+ Writer) ("#\." monoid)]]
-    [collection
-     ["." row (#+ Row) ("#\." functor fold)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- Code)
+    [type (#+ :share)]
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." binary (#+ Binary)]
+     [format
+      [".F" binary (#+ Writer) ("#\." monoid)]]
+     [collection
+      ["." row (#+ Row) ("#\." functor fold)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." /// #_
    [bytecode
     [environment
diff --git a/stdlib/source/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
index 9ae264438..e2aa089b0 100644
--- a/stdlib/source/lux/target/jvm/attribute/code/exception.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." product]
-    ["." format #_
-     ["#" binary (#+ Writer)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." product]
+     ["." format #_
+      ["#" binary (#+ Writer)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    ["//#" /// #_
     [constant (#+ Class)]
diff --git a/stdlib/source/lux/target/jvm/attribute/constant.lux b/stdlib/source/library/lux/target/jvm/attribute/constant.lux
index c5605bcc3..d9f26d418 100644
--- a/stdlib/source/lux/target/jvm/attribute/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/constant.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    [format
-     [binary (#+ Writer)]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     [format
+      [binary (#+ Writer)]]]]]
   ["." /// #_
    [constant (#+ Value)]
    ["#." index (#+ Index)]
diff --git a/stdlib/source/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux
index 551b51087..c50278c28 100644
--- a/stdlib/source/lux/target/jvm/bytecode.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux (#- Type int try)
-   ["." ffi (#+ import:)]
-   [abstract
-    [monoid (#+ Monoid)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." writer (#+ Writer)]
-    ["." state (#+ State')]
-    ["." function]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." maybe]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]
-     ["." row (#+ Row)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]
-     ["." i32 (#+ I32)]]]]
+  [library
+   [lux (#- Type int try)
+    ["." ffi (#+ import:)]
+    [abstract
+     [monoid (#+ Monoid)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." writer (#+ Writer)]
+     ["." state (#+ State')]
+     ["." function]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." maybe]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." dictionary (#+ Dictionary)]
+      ["." row (#+ Row)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]
+      ["." i32 (#+ I32)]]]]]
   ["." / #_
    ["#." address (#+ Address)]
    ["#." jump (#+ Jump Big_Jump)]
diff --git a/stdlib/source/lux/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/target/jvm/bytecode/address.lux
index b158bbd05..8d51a8597 100644
--- a/stdlib/source/lux/target/jvm/bytecode/address.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/address.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    [format
-     [binary (#+ Writer)]]
-    [text
-     ["%" format (#+ Format)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     [format
+      [binary (#+ Writer)]]
+     [text
+      ["%" format (#+ Format)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     abstract]]]
   ["." // #_
    [jump (#+ Big_Jump)]
    ["/#" // #_
diff --git a/stdlib/source/lux/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux
index 23bcb4558..fdf50d974 100644
--- a/stdlib/source/lux/target/jvm/bytecode/environment.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux (#- Type static)
-   [abstract
-    [monad (#+ do)]
-    [monoid (#+ Monoid)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]]
+  [library
+   [lux (#- Type static)
+    [abstract
+     [monad (#+ do)]
+     [monoid (#+ Monoid)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]]]
   [/
    ["/." limit (#+ Limit)
     ["/." stack (#+ Stack)]
diff --git a/stdlib/source/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
index 7c277d4c6..c7e9a8959 100644
--- a/stdlib/source/lux/target/jvm/bytecode/environment/limit.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- Type static)
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." product]
-    ["." format #_
-     ["#" binary (#+ Writer) ("#\." monoid)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- Type static)
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." product]
+     ["." format #_
+      ["#" binary (#+ Writer) ("#\." monoid)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." / #_
    ["#." stack (#+ Stack)]
    ["#." registry (#+ Registry)]
diff --git a/stdlib/source/lux/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
index 9165dfacb..05872be60 100644
--- a/stdlib/source/lux/target/jvm/bytecode/environment/limit/registry.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Type for static)
-   [abstract
-    ["." equivalence (#+ Equivalence)]]
-   [control
-    ["." try (#+ Try) ("#\." functor)]]
-   [data
-    [format
-     [binary (#+ Writer)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    abstract]]
+  [library
+   [lux (#- Type for static)
+    [abstract
+     ["." equivalence (#+ Equivalence)]]
+    [control
+     ["." try (#+ Try) ("#\." functor)]]
+    [data
+     [format
+      [binary (#+ Writer)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     abstract]]]
   ["." ///// #_
    [encoding
     ["#." unsigned (#+ U1 U2)]]
diff --git a/stdlib/source/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
index e561d2a04..99a560347 100644
--- a/stdlib/source/lux/target/jvm/bytecode/environment/limit/stack.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." equivalence (#+ Equivalence)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." maybe]
-    [text
-     ["%" format (#+ Format)]]
-    [format
-     [binary (#+ Writer)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     ["." equivalence (#+ Equivalence)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." maybe]
+     [text
+      ["%" format (#+ Format)]]
+     [format
+      [binary (#+ Writer)]]]
+    [type
+     abstract]]]
   ["." ///// #_
    [encoding
     ["#." unsigned (#+ U2)]]])
diff --git a/stdlib/source/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
index 718f14199..65e36875f 100644
--- a/stdlib/source/lux/target/jvm/bytecode/instruction.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]
-    [monoid (#+ Monoid)]]
-   [control
-    ["." function]
-    ["." try]]
-   [data
-    ["." product]
-    ["." binary]
-    ["." format #_
-     ["#" binary (#+ Mutation Specification)]]
-    [collection
-     ["." list]]]
-   [macro
-    ["." template]]
-   [math
-    [number (#+ hex)
-     ["n" nat]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]
+     [monoid (#+ Monoid)]]
+    [control
+     ["." function]
+     ["." try]]
+    [data
+     ["." product]
+     ["." binary]
+     ["." format #_
+      ["#" binary (#+ Mutation Specification)]]
+     [collection
+      ["." list]]]
+    [macro
+     ["." template]]
+    [math
+     [number (#+ hex)
+      ["n" nat]]]
+    [type
+     abstract]]]
   ["." // #_
    ["#." address (#+ Address)]
    ["#." jump (#+ Jump Big_Jump)]
diff --git a/stdlib/source/lux/target/jvm/bytecode/jump.lux b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
index 4670b07ea..2873ef781 100644
--- a/stdlib/source/lux/target/jvm/bytecode/jump.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." format #_
-     ["#" binary (#+ Writer)]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." format #_
+      ["#" binary (#+ Writer)]]]]]
   ["." /// #_
    [encoding
     ["#." signed (#+ S2 S4)]]])
diff --git a/stdlib/source/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux
index ad90c3db5..7f6705de8 100644
--- a/stdlib/source/lux/target/jvm/class.lux
+++ b/stdlib/source/library/lux/target/jvm/class.lux
@@ -1,17 +1,18 @@
  (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    ["." monad (#+ do)]]
-   [control
-    ["." state]
-    ["." try (#+ Try)]]
-   [data
-    ["." product]
-    [format
-     [".F" binary (#+ Writer) ("#\." monoid)]]
-    [collection
-     ["." row (#+ Row)]]]]
+   [library
+    [lux #*
+     [abstract
+      [equivalence (#+ Equivalence)]
+      ["." monad (#+ do)]]
+     [control
+      ["." state]
+      ["." try (#+ Try)]]
+     [data
+      ["." product]
+      [format
+       [".F" binary (#+ Writer) ("#\." monoid)]]
+      [collection
+       ["." row (#+ Row)]]]]]
   ["." // #_
    ["#." modifier (#+ Modifier modifiers:)]
    ["#." version (#+ Version Minor Major)]
diff --git a/stdlib/source/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux
index 651f667ee..663dc472f 100644
--- a/stdlib/source/lux/target/jvm/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/constant.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   ["." ffi (#+ import:)]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]
-    ["." equivalence (#+ Equivalence)]]
-   [data
-    ["." sum]
-    ["." product]
-    ["." text]
-    [format
-     [".F" binary (#+ Writer) ("#\." monoid)]]
-    [collection
-     ["." row (#+ Row)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["." i32 (#+ I32)]
-     ["." i64]
-     ["." int]
-     ["." frac]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    ["." ffi (#+ import:)]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]
+     ["." equivalence (#+ Equivalence)]]
+    [data
+     ["." sum]
+     ["." product]
+     ["." text]
+     [format
+      [".F" binary (#+ Writer) ("#\." monoid)]]
+     [collection
+      ["." row (#+ Row)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["." i32 (#+ I32)]
+      ["." i64]
+      ["." int]
+      ["." frac]]]
+    [type
+     abstract]]]
   ["." / #_
    ["#." tag]
    ["/#" // #_
diff --git a/stdlib/source/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/target/jvm/constant/pool.lux
index 8f378ed00..e7fa465d8 100644
--- a/stdlib/source/lux/target/jvm/constant/pool.lux
+++ b/stdlib/source/library/lux/target/jvm/constant/pool.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ Monad do)]]
-   [control
-    ["." state (#+ State')]
-    ["." try (#+ Try)]]
-   [data
-    ["." product]
-    ["." text]
-    ["." format #_
-     ["#" binary (#+ Writer) ("specification\." monoid)]]
-    [collection
-     ["." row (#+ Row) ("#\." fold)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["." i32]
-     ["n" nat]
-     ["." int]
-     ["." frac]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ Monad do)]]
+    [control
+     ["." state (#+ State')]
+     ["." try (#+ Try)]]
+    [data
+     ["." product]
+     ["." text]
+     ["." format #_
+      ["#" binary (#+ Writer) ("specification\." monoid)]]
+     [collection
+      ["." row (#+ Row) ("#\." fold)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["." i32]
+      ["n" nat]
+      ["." int]
+      ["." frac]]]
+    [type
+     abstract]]]
   ["." // (#+ UTF8 String Class Integer Float Long Double Constant Name_And_Type Reference)
    [//
     [encoding
diff --git a/stdlib/source/lux/target/jvm/constant/tag.lux b/stdlib/source/library/lux/target/jvm/constant/tag.lux
index 011e38374..414de077b 100644
--- a/stdlib/source/lux/target/jvm/constant/tag.lux
+++ b/stdlib/source/library/lux/target/jvm/constant/tag.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["." try]]
-   [data
-    [format
-     [binary (#+ Writer)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["." try]]
+    [data
+     [format
+      [binary (#+ Writer)]]]
+    [type
+     abstract]]]
   ["." /// #_
    [encoding
     ["#." unsigned (#+ U1) ("u1//." equivalence)]]])
diff --git a/stdlib/source/lux/target/jvm/encoding/name.lux b/stdlib/source/library/lux/target/jvm/encoding/name.lux
index 606c7439c..5a1982d3e 100644
--- a/stdlib/source/lux/target/jvm/encoding/name.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/name.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [type
+     abstract]]])
 
 (def: #export internal_separator "/")
 (def: #export external_separator ".")
diff --git a/stdlib/source/lux/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
index 934d48ce2..a914dfc3c 100644
--- a/stdlib/source/lux/target/jvm/encoding/signed.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- int)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    ["." format #_
-     ["#" binary (#+ Writer)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["." i64]
-     ["n" nat]
-     ["i" int]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- int)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     ["." format #_
+      ["#" binary (#+ Writer)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["." i64]
+      ["n" nat]
+      ["i" int]]]
+    [type
+     abstract]]])
 
 (abstract: #export (Signed brand)
   Int
diff --git a/stdlib/source/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
index 4cff01d68..d8299fa65 100644
--- a/stdlib/source/lux/target/jvm/encoding/unsigned.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- nat)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    ["." format #_
-     ["#" binary (#+ Writer)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]
-     ["." i64]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- nat)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     ["." format #_
+      ["#" binary (#+ Writer)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]
+      ["." i64]]]
+    [type
+     abstract]]])
 
 (abstract: #export (Unsigned brand)
   Nat
diff --git a/stdlib/source/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux
index 2e8863f57..aa71794a5 100644
--- a/stdlib/source/lux/target/jvm/field.lux
+++ b/stdlib/source/library/lux/target/jvm/field.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux (#- Type static)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    [format
-     [".F" binary (#+ Writer) ("#\." monoid)]]
-    [collection
-     ["." row (#+ Row)]]]]
+  [library
+   [lux (#- Type static)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     [format
+      [".F" binary (#+ Writer) ("#\." monoid)]]
+     [collection
+      ["." row (#+ Row)]]]]]
   ["." // #_
    ["." modifier (#+ Modifier modifiers:)]
    ["#." constant (#+ UTF8)
diff --git a/stdlib/source/lux/target/jvm/index.lux b/stdlib/source/library/lux/target/jvm/index.lux
index c4f0ec9d1..851d6903f 100644
--- a/stdlib/source/lux/target/jvm/index.lux
+++ b/stdlib/source/library/lux/target/jvm/index.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." equivalence (#+ Equivalence)]]
-   [data
-    [format
-     [binary (#+ Writer)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     ["." equivalence (#+ Equivalence)]]
+    [data
+     [format
+      [binary (#+ Writer)]]]
+    [type
+     abstract]]]
   ["." // #_
    [encoding
     ["#." unsigned (#+ U2)]]])
diff --git a/stdlib/source/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux
index 4ca391382..8b86321ca 100644
--- a/stdlib/source/lux/target/jvm/loader.lux
+++ b/stdlib/source/library/lux/target/jvm/loader.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO)]
-    [concurrency
-     ["." atom (#+ Atom)]]]
-   [data
-    ["." binary (#+ Binary)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." array]
-     ["." dictionary (#+ Dictionary)]]]
-   ["." ffi (#+ import: object do_to)]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO)]
+     [concurrency
+      ["." atom (#+ Atom)]]]
+    [data
+     ["." binary (#+ Binary)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." array]
+      ["." dictionary (#+ Dictionary)]]]
+    ["." ffi (#+ import: object do_to)]]])
 
 (type: #export Library
   (Atom (Dictionary Text Binary)))
diff --git a/stdlib/source/lux/target/jvm/magic.lux b/stdlib/source/library/lux/target/jvm/magic.lux
index 370d8e09b..70859362b 100644
--- a/stdlib/source/lux/target/jvm/magic.lux
+++ b/stdlib/source/library/lux/target/jvm/magic.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [control
-    ["." try]]
-   [math
-    [number (#+ hex)]]]
+  [library
+   [lux #*
+    [control
+     ["." try]]
+    [math
+     [number (#+ hex)]]]]
   ["." // #_
    [encoding
     ["#." unsigned (#+ U4)]]])
diff --git a/stdlib/source/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux
index 6219a1c1d..e832b1667 100644
--- a/stdlib/source/lux/target/jvm/method.lux
+++ b/stdlib/source/library/lux/target/jvm/method.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Type static)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    ["." monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." product]
-    ["." format #_
-     ["#" binary (#+ Writer) ("#\." monoid)]]
-    [collection
-     ["." row (#+ Row)]]]]
+  [library
+   [lux (#- Type static)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     ["." monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     ["." product]
+     ["." format #_
+      ["#" binary (#+ Writer) ("#\." monoid)]]
+     [collection
+      ["." row (#+ Row)]]]]]
   ["." // #_
    ["#." modifier (#+ Modifier modifiers:)]
    ["#." index (#+ Index)]
diff --git a/stdlib/source/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux
index 80e353f33..109486231 100644
--- a/stdlib/source/lux/target/jvm/modifier.lux
+++ b/stdlib/source/library/lux/target/jvm/modifier.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." equivalence (#+ Equivalence)]
-    ["." monoid (#+ Monoid)]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["<c>" code]]]
-   [data
-    [format
-     [".F" binary (#+ Writer)]]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    ["." number (#+ hex)
-     ["." i64]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     ["." equivalence (#+ Equivalence)]
+     ["." monoid (#+ Monoid)]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["<c>" code]]]
+    [data
+     [format
+      [".F" binary (#+ Writer)]]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     ["." number (#+ hex)
+      ["." i64]]]
+    [type
+     abstract]]]
   ["." // #_
    [encoding
     ["#." unsigned]]])
diff --git a/stdlib/source/lux/target/jvm/modifier/inner.lux b/stdlib/source/library/lux/target/jvm/modifier/inner.lux
index ff6f5d50e..fc9bc982c 100644
--- a/stdlib/source/lux/target/jvm/modifier/inner.lux
+++ b/stdlib/source/library/lux/target/jvm/modifier/inner.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- static)
-   [type
-    abstract]]
+  [library
+   [lux (#- static)
+    [type
+     abstract]]]
   [// (#+ modifiers:)])
 
 (abstract: #export Inner Any)
diff --git a/stdlib/source/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux
index 02c6b0ab0..e2297f313 100644
--- a/stdlib/source/lux/target/jvm/reflection.lux
+++ b/stdlib/source/library/lux/target/jvm/reflection.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- type)
-   ["." ffi (#+ import:)]
-   ["." type]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    [parser
-     ["<t>" text]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold functor)]
-     ["." array]
-     ["." dictionary]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- type)
+    ["." ffi (#+ import:)]
+    ["." type]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     [parser
+      ["<t>" text]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold functor)]
+      ["." array]
+      ["." dictionary]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    [encoding
     ["#." name (#+ External)]]
diff --git a/stdlib/source/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux
index 0e3d9be92..e11ef5c99 100644
--- a/stdlib/source/lux/target/jvm/type.lux
+++ b/stdlib/source/library/lux/target/jvm/type.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Type int char)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [data
-    ["." maybe]
-    ["." text
-     ["%" format (#+ Format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    abstract]]
+  [library
+   [lux (#- Type int char)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [data
+     ["." maybe]
+     ["." text
+      ["%" format (#+ Format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     abstract]]]
   ["." // #_
    [encoding
     ["#." name (#+ External)]]]
diff --git a/stdlib/source/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux
index e474250ca..56ffbe127 100644
--- a/stdlib/source/lux/target/jvm/type/alias.lux
+++ b/stdlib/source/library/lux/target/jvm/type/alias.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- Type int char type primitive)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<t>" text (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]]]]
+  [library
+   [lux (#- Type int char type primitive)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<t>" text (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]]]]]
   ["." // (#+ Type)
    [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
    ["#." descriptor]
diff --git a/stdlib/source/lux/target/jvm/type/box.lux b/stdlib/source/library/lux/target/jvm/type/box.lux
index 65816b487..9479ef218 100644
--- a/stdlib/source/lux/target/jvm/type/box.lux
+++ b/stdlib/source/library/lux/target/jvm/type/box.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux (#- int char)]
+  [library
+   [lux (#- int char)]]
   [///
    [encoding
     [name (#+ External)]]])
diff --git a/stdlib/source/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/target/jvm/type/category.lux
index 5dfb38ddc..f6c17a280 100644
--- a/stdlib/source/lux/target/jvm/type/category.lux
+++ b/stdlib/source/library/lux/target/jvm/type/category.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [macro
-    ["." template]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [macro
+     ["." template]]
+    [type
+     abstract]]])
 
 (abstract: #export Void' Any)
 (abstract: #export (Value' kind) Any)
diff --git a/stdlib/source/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux
index d8d5ea256..2cdbeb6ee 100644
--- a/stdlib/source/lux/target/jvm/type/descriptor.lux
+++ b/stdlib/source/library/lux/target/jvm/type/descriptor.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- int char)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    abstract]]
+  [library
+   [lux (#- int char)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     abstract]]]
   ["." // #_
    [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
    ["/#" // #_
diff --git a/stdlib/source/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux
index e42c54610..45fd34c8d 100644
--- a/stdlib/source/lux/target/jvm/type/lux.lux
+++ b/stdlib/source/library/lux/target/jvm/type/lux.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux (#- int char type primitive)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["<>" parser ("#\." monad)
-     ["<t>" text (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." array]
-     ["." dictionary (#+ Dictionary)]]]
-   [type
-    abstract
-    ["." check (#+ Check) ("#\." monad)]]]
+  [library
+   [lux (#- int char type primitive)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["<>" parser ("#\." monad)
+      ["<t>" text (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." array]
+      ["." dictionary (#+ Dictionary)]]]
+    [type
+     abstract
+     ["." check (#+ Check) ("#\." monad)]]]]
   ["." //
    [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
    ["#." descriptor]
diff --git a/stdlib/source/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/target/jvm/type/parser.lux
index 56e992082..5b9a3e1af 100644
--- a/stdlib/source/lux/target/jvm/type/parser.lux
+++ b/stdlib/source/library/lux/target/jvm/type/parser.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- Type int char primitive)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." function]
-    ["<>" parser ("#\." monad)
-     ["<t>" text (#+ Parser)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]]]]
+  [library
+   [lux (#- Type int char primitive)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." function]
+     ["<>" parser ("#\." monad)
+      ["<t>" text (#+ Parser)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]]]]]
   ["." // (#+ Type)
    [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
    ["#." signature]
diff --git a/stdlib/source/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux
index 7d775b1f9..78ef5a45c 100644
--- a/stdlib/source/lux/target/jvm/type/reflection.lux
+++ b/stdlib/source/library/lux/target/jvm/type/reflection.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux (#- int char)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [type
-    abstract]]
+  [library
+   [lux (#- int char)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [type
+     abstract]]]
   ["." // #_
    [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
    ["#." descriptor]
diff --git a/stdlib/source/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/target/jvm/type/signature.lux
index ab207bc39..0b21807dd 100644
--- a/stdlib/source/lux/target/jvm/type/signature.lux
+++ b/stdlib/source/library/lux/target/jvm/type/signature.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- int char)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [data
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [type
-    abstract]]
+  [library
+   [lux (#- int char)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [data
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [type
+     abstract]]]
   ["." // #_
    [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
    ["#." descriptor]
diff --git a/stdlib/source/lux/target/jvm/version.lux b/stdlib/source/library/lux/target/jvm/version.lux
index 66f97351d..0aaf297de 100644
--- a/stdlib/source/lux/target/jvm/version.lux
+++ b/stdlib/source/library/lux/target/jvm/version.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [control
-    ["." try]]]
+  [library
+   [lux #*
+    [control
+     ["." try]]]]
   ["." // #_
    [encoding
     ["#." unsigned (#+ U2)]]])
diff --git a/stdlib/source/lux/target/lua.lux b/stdlib/source/library/lux/target/lua.lux
index fe675da0f..7e0202481 100644
--- a/stdlib/source/lux/target/lua.lux
+++ b/stdlib/source/library/lux/target/lua.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux (#- Location Code int if cond function or and not let ^)
-   ["@" target]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    ["." enum]]
-   [control
-    [pipe (#+ case> cond> new>)]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." template]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Location Code int if cond function or and not let ^)
+    ["@" target]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     ["." enum]]
+    [control
+     [pipe (#+ case> cond> new>)]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." template]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (def: nest
   (-> Text Text)
diff --git a/stdlib/source/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux
index f85bf5f03..6a3e01fbb 100644
--- a/stdlib/source/lux/target/php.lux
+++ b/stdlib/source/library/lux/target/php.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- Location Code Global static int if cond or and not comment for try)
-   ["@" target]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    ["." enum]]
-   [control
-    [pipe (#+ case> cond> new>)]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." template]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Location Code Global static int if cond or and not comment for try)
+    ["@" target]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     ["." enum]]
+    [control
+     [pipe (#+ case> cond> new>)]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." template]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (def: input_separator ", ")
 (def: statement_suffix ";")
diff --git a/stdlib/source/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux
index c4e03914f..49c3d8612 100644
--- a/stdlib/source/lux/target/python.lux
+++ b/stdlib/source/library/lux/target/python.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux (#- Location Code not or and list if cond int comment exec try)
-   ["@" target]
-   ["." ffi]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    ["." enum]]
-   [control
-    [pipe (#+ new> case> cond>)]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." template]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Location Code not or and list if cond int comment exec try)
+    ["@" target]
+    ["." ffi]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     ["." enum]]
+    [control
+     [pipe (#+ new> case> cond>)]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." template]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (def: expression
   (-> Text Text)
diff --git a/stdlib/source/lux/target/r.lux b/stdlib/source/library/lux/target/r.lux
index 40fb28da7..fee2e206b 100644
--- a/stdlib/source/lux/target/r.lux
+++ b/stdlib/source/library/lux/target/r.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- Code or and list if function cond not int)
-   [control
-    [pipe (#+ case> cond> new>)]
-    ["." function]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." template]
-    ["." code]]
-   [math
-    [number
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Code or and list if function cond not int)
+    [control
+     [pipe (#+ case> cond> new>)]
+     ["." function]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." template]
+     ["." code]]
+    [math
+     [number
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (abstract: #export (Code kind)
   Text
diff --git a/stdlib/source/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux
index e23c64fc0..3eb4f07b9 100644
--- a/stdlib/source/lux/target/ruby.lux
+++ b/stdlib/source/library/lux/target/ruby.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- Location Code static int if cond function or and not comment)
-   ["@" target]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    ["." enum]]
-   [control
-    [pipe (#+ case> cond> new>)]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." template]
-    ["." code]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Location Code static int if cond function or and not comment)
+    ["@" target]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     ["." enum]]
+    [control
+     [pipe (#+ case> cond> new>)]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." template]
+     ["." code]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (def: input_separator ", ")
 (def: statement_suffix ";")
diff --git a/stdlib/source/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux
index a34023c6a..8e1308e04 100644
--- a/stdlib/source/lux/target/scheme.lux
+++ b/stdlib/source/library/lux/target/scheme.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- Code int or and if cond let)
-   ["@" target]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [control
-    [pipe (#+ new> cond> case>)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold monoid)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Code int or and if cond let)
+    ["@" target]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [control
+     [pipe (#+ new> cond> case>)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold monoid)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac]]]
+    [type
+     abstract]]])
 
 (def: nest
   (-> Text Text)
diff --git a/stdlib/source/lux/test.lux b/stdlib/source/library/lux/test.lux
index f246e0df9..6e28624ce 100644
--- a/stdlib/source/lux/test.lux
+++ b/stdlib/source/library/lux/test.lux
@@ -1,43 +1,44 @@
 (.module: {#.doc "Tools for unit & property-based/generative testing."}
-  [lux (#- and for)
-   ["." meta]
-   ["." debug]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["." io]
-    [concurrency
-     ["." atom (#+ Atom)]
-     ["." promise (#+ Promise) ("#\." monad)]]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." maybe]
-    ["." product]
-    ["." name]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set (#+ Set)]
-     ["." dictionary #_
-      ["#" ordered (#+ Dictionary)]]]]
-   [time
-    ["." instant]
-    ["." duration (#+ Duration)]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number (#+ hex)
-     ["n" nat]
-     ["f" frac]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [world
-    ["." program]]])
+  [library
+   [lux (#- and for)
+    ["." meta]
+    ["." debug]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["." io]
+     [concurrency
+      ["." atom (#+ Atom)]
+      ["." promise (#+ Promise) ("#\." monad)]]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." maybe]
+     ["." product]
+     ["." name]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set (#+ Set)]
+      ["." dictionary #_
+       ["#" ordered (#+ Dictionary)]]]]
+    [time
+     ["." instant]
+     ["." duration (#+ Duration)]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number (#+ hex)
+      ["n" nat]
+      ["f" frac]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [world
+     ["." program]]]])
 
 (type: #export Tally
   {#successes Nat
diff --git a/stdlib/source/lux/time.lux b/stdlib/source/library/lux/time.lux
index 3a737f113..5c043f696 100644
--- a/stdlib/source/lux/time.lux
+++ b/stdlib/source/library/lux/time.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [enum (#+ Enum)]
-    [codec (#+ Codec)]
-    [monad (#+ Monad do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    ["." text ("#\." monoid)]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [enum (#+ Enum)]
+     [codec (#+ Codec)]
+     [monad (#+ Monad do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     ["." text ("#\." monoid)]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]]]
+    [type
+     abstract]]]
   [/
    ["." duration (#+ Duration)]])
 
diff --git a/stdlib/source/lux/time/date.lux b/stdlib/source/library/lux/time/date.lux
index b8b483cca..e8de6d99e 100644
--- a/stdlib/source/lux/time/date.lux
+++ b/stdlib/source/library/lux/time/date.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [enum (#+ Enum)]
-    [codec (#+ Codec)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<text>" text (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." text ("#\." monoid)]
-    [collection
-     ["." list ("#\." fold)]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]
-     ["i" int]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [enum (#+ Enum)]
+     [codec (#+ Codec)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<text>" text (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." text ("#\." monoid)]
+     [collection
+      ["." list ("#\." fold)]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]
+      ["i" int]]]
+    [type
+     abstract]]]
   ["." // #_
    ["#." year (#+ Year)]
    ["#." month (#+ Month)]])
diff --git a/stdlib/source/lux/time/day.lux b/stdlib/source/library/lux/time/day.lux
index 57c0fae13..157dd6c1f 100644
--- a/stdlib/source/lux/time/day.lux
+++ b/stdlib/source/library/lux/time/day.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux (#- nat)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [enum (#+ Enum)]
-    [codec (#+ Codec)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux (#- nat)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [enum (#+ Enum)]
+     [codec (#+ Codec)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export Day
   #Sunday
diff --git a/stdlib/source/lux/time/duration.lux b/stdlib/source/library/lux/time/duration.lux
index f1fcd932c..1de5dab4f 100644
--- a/stdlib/source/lux/time/duration.lux
+++ b/stdlib/source/library/lux/time/duration.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [enum (#+ Enum)]
-    [codec (#+ Codec)]
-    [monoid (#+ Monoid)]
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["<t>" text (#+ Parser)]]]
-   [data
-    ["." text ("#\." monoid)]]
-   [math
-    [number
-     ["i" int]
-     ["." nat ("#\." decimal)]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [enum (#+ Enum)]
+     [codec (#+ Codec)]
+     [monoid (#+ Monoid)]
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["<t>" text (#+ Parser)]]]
+    [data
+     ["." text ("#\." monoid)]]
+    [math
+     [number
+      ["i" int]
+      ["." nat ("#\." decimal)]]]
+    [type
+     abstract]]]
   ["." // #_
    ["#." year]])
 
diff --git a/stdlib/source/lux/time/instant.lux b/stdlib/source/library/lux/time/instant.lux
index 05f54b30b..ecefe3491 100644
--- a/stdlib/source/lux/time/instant.lux
+++ b/stdlib/source/library/lux/time/instant.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [enum (#+ Enum)]
-    [codec (#+ Codec)]
-    [monad (#+ Monad do)]]
-   [control
-    [io (#+ IO io)]
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" text (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." text ("#\." monoid)]
-    [collection
-     ["." row]]]
-   [math
-    [number
-     ["i" int]
-     ["f" frac]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [enum (#+ Enum)]
+     [codec (#+ Codec)]
+     [monad (#+ Monad do)]]
+    [control
+     [io (#+ IO io)]
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" text (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." text ("#\." monoid)]
+     [collection
+      ["." row]]]
+    [math
+     [number
+      ["i" int]
+      ["f" frac]]]
+    [type
+     abstract]]]
   ["." // (#+ Time)
    ["." duration (#+ Duration)]
    ["." year (#+ Year)]
diff --git a/stdlib/source/lux/time/month.lux b/stdlib/source/library/lux/time/month.lux
index 6848f4869..381094933 100644
--- a/stdlib/source/lux/time/month.lux
+++ b/stdlib/source/library/lux/time/month.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [order (#+ Order)]
-    [enum (#+ Enum)]
-    [codec (#+ Codec)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [order (#+ Order)]
+     [enum (#+ Enum)]
+     [codec (#+ Codec)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export Month
   #January
diff --git a/stdlib/source/lux/time/year.lux b/stdlib/source/library/lux/time/year.lux
index 633045510..95280df9c 100644
--- a/stdlib/source/lux/time/year.lux
+++ b/stdlib/source/library/lux/time/year.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]
-    [codec (#+ Codec)]
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<t>" text (#+ Parser)]]]
-   [data
-    ["." text ("#\." monoid)]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]
-     ["i" int ("#\." decimal)]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]
+     [codec (#+ Codec)]
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<t>" text (#+ Parser)]]]
+    [data
+     ["." text ("#\." monoid)]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]
+      ["i" int ("#\." decimal)]]]
+    [type
+     abstract]]])
 
 (def: (internal year)
   (-> Int Int)
diff --git a/stdlib/source/lux/tool/compiler.lux b/stdlib/source/library/lux/tool/compiler.lux
index eda74d121..1acd9aeea 100644
--- a/stdlib/source/lux/tool/compiler.lux
+++ b/stdlib/source/library/lux/tool/compiler.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- Module Code)
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [binary (#+ Binary)]
-    ["." text]
-    [collection
-     ["." row (#+ Row)]]]
-   [world
-    ["." file (#+ Path)]]]
+  [library
+   [lux (#- Module Code)
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [binary (#+ Binary)]
+     ["." text]
+     [collection
+      ["." row (#+ Row)]]]
+    [world
+     ["." file (#+ Path)]]]]
   [/
    [meta
     ["." archive (#+ Output Archive)
diff --git a/stdlib/source/lux/tool/compiler/arity.lux b/stdlib/source/library/lux/tool/compiler/arity.lux
index 72140b6c6..61e0ea625 100644
--- a/stdlib/source/lux/tool/compiler/arity.lux
+++ b/stdlib/source/library/lux/tool/compiler/arity.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export Arity Nat)
 
diff --git a/stdlib/source/lux/tool/compiler/default/init.lux b/stdlib/source/library/lux/tool/compiler/default/init.lux
index 2803398e0..172de25e7 100644
--- a/stdlib/source/lux/tool/compiler/default/init.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/init.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- Module)
-   ["@" target (#+ Target)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary]
-     ["." set]
-     ["." row ("#\." functor)]]]
-   ["." meta]
-   [world
-    ["." file]]]
+  [library
+   [lux (#- Module)
+    ["@" target (#+ Target)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary]
+      ["." set]
+      ["." row ("#\." functor)]]]
+    ["." meta]
+    [world
+     ["." file]]]]
   ["." // #_
    ["/#" // (#+ Instancer)
     ["#." phase]
diff --git a/stdlib/source/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux
index 605f1d1e2..9ebf79b7b 100644
--- a/stdlib/source/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux
@@ -1,33 +1,34 @@
 (.module:
-  [lux (#- Module)
-   [type (#+ :share)]
-   ["." debug]
-   ["@" target]
-   [abstract
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." function]
-    ["." try (#+ Try) ("#\." functor)]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." promise (#+ Promise Resolver) ("#\." monad)]
-     ["." stm (#+ Var STM)]]]
-   [data
-    ["." binary (#+ Binary)]
-    ["." bit]
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." row (#+ Row) ("#\." fold)]
-     ["." set (#+ Set)]
-     ["." list ("#\." monoid functor fold)]]
-    [format
-     ["_" binary (#+ Writer)]]]
-   [world
-    ["." file (#+ Path)]]]
+  [library
+   [lux (#- Module)
+    [type (#+ :share)]
+    ["." debug]
+    ["@" target]
+    [abstract
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." function]
+     ["." try (#+ Try) ("#\." functor)]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." promise (#+ Promise Resolver) ("#\." monad)]
+      ["." stm (#+ Var STM)]]]
+    [data
+     ["." binary (#+ Binary)]
+     ["." bit]
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." row (#+ Row) ("#\." fold)]
+      ["." set (#+ Set)]
+      ["." list ("#\." monoid functor fold)]]
+     [format
+      ["_" binary (#+ Writer)]]]
+    [world
+     ["." file (#+ Path)]]]]
   ["." // #_
    ["#." init]
    ["/#" //
diff --git a/stdlib/source/lux/tool/compiler/language/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux.lux
index 1d507b52f..e6d5816a4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [control
-    ["<>" parser
-     ["<b>" binary (#+ Parser)]]]
-   [data
-    [format
-     ["_" binary (#+ Writer)]]]]
+  [library
+   [lux #*
+    [control
+     ["<>" parser
+      ["<b>" binary (#+ Parser)]]]
+    [data
+     [format
+      ["_" binary (#+ Writer)]]]]]
   ["." / #_
    ["#." version]
    [phase
diff --git a/stdlib/source/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
index bbbe43b27..c29eaaf54 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- nat int rev)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["." exception (#+ Exception)]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." bit ("#\." equivalence)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ Format format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]
-     ["r" rev]
-     ["f" frac]]]
-   [meta
-    ["." location]]]
+  [library
+   [lux (#- nat int rev)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["." exception (#+ Exception)]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." bit ("#\." equivalence)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ Format format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]
+      ["r" rev]
+      ["f" frac]]]
+    [meta
+     ["." location]]]]
   [//
    [phase
     ["." extension (#+ Extension)]]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/analysis/evaluation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
index 521c88a23..0895955dc 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/analysis/evaluation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux (#- Module)
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- Module)
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [math
+     [number
+      ["n" nat]]]]]
   [// (#+ Operation)
    [macro (#+ Expander)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/analysis/macro.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
index 9a84c0259..d0957820c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/analysis/macro.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   ["." meta]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    ["." meta]]]
   [/////
    ["." phase]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux
index 896a9a1cb..49ab15299 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/directive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux (#- Module)
-   [abstract
-    [monad (#+ do)]]
-   [data
-    [collection
-     ["." list ("#\." monoid)]]]]
+  [library
+   [lux (#- Module)
+    [abstract
+     [monad (#+ do)]]
+    [data
+     [collection
+      ["." list ("#\." monoid)]]]]]
   [//
    ["." analysis]
    ["." synthesis]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
index 372ed2c17..13d36021f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/generation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux (#- Module)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." function]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." name]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." row (#+ Row)]
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- Module)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." function]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." name]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." row (#+ Row)]
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   [//
    [synthesis (#+ Synthesis)]
    [phase
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
index 9e0748422..c35404a68 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   ["." meta
-    ["." location]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    ["." meta
+     ["." location]]]]
   ["." / #_
    ["#." type]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
index 41fad7934..d447b8d1d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- case)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." maybe]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold monoid functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [macro
-    ["." code]]
-   ["." type
-    ["." check]]]
+  [library
+   [lux (#- case)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." maybe]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold monoid functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [macro
+     ["." code]]
+    ["." type
+     ["." check]]]]
   ["." / #_
    ["#." coverage (#+ Coverage)]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
index 4a3afc3f5..df92858ec 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    equivalence
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try) ("#\." monad)]
-    ["ex" exception (#+ exception:)]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ Format format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [abstract
+     equivalence
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try) ("#\." monad)]
+     ["ex" exception (#+ exception:)]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ Format format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." //// #_
    [//
     ["/" analysis (#+ Pattern Variant Operation)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
index 3b654fffd..5e41e907e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    monad]
-   [control
-    ["ex" exception (#+ exception:)]]
-   [data
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold monoid monad)]]]
-   ["." type
-    ["." check]]
-   ["." meta]]
+  [library
+   [lux (#- function)
+    [abstract
+     monad]
+    [control
+     ["ex" exception (#+ exception:)]]
+    [data
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold monoid monad)]]]
+    ["." type
+     ["." check]]
+    ["." meta]]]
   ["." // #_
    ["#." scope]
    ["#." type]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux
index 31a5cb912..9ad503709 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/inference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [data
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." type
-    ["." check]]
-   ["." meta]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [data
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." type
+     ["." check]]
+    ["." meta]]]
   ["." // #_
    ["#." type]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/module.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux
index 1d7e5dc27..94b289a08 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/module.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    pipe
-    ["." try]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold functor)]
-     [dictionary
-      ["." plist]]]]
-   ["." meta]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     pipe
+     ["." try]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold functor)]
+      [dictionary
+       ["." plist]]]]
+    ["." meta]]]
   ["." /// #_
    ["#." extension]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
index dfdb7e314..27c4d98f4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- nat int rev)
-   [abstract
-    monad]]
+  [library
+   [lux (#- nat int rev)
+    [abstract
+     monad]]]
   ["." // #_
    ["#." type]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
index a3653935f..9ce2b1faa 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    monad]
-   [control
-    ["." exception (#+ exception:)]]
-   ["." meta]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    [abstract
+     monad]
+    [control
+     ["." exception (#+ exception:)]]
+    ["." meta]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]]]
   ["." // #_
    ["#." scope]
    ["#." type]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/scope.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux
index beee6a1b7..c0e598e06 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/scope.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    monad]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text ("#\." equivalence)]
-    ["." maybe ("#\." monad)]
-    ["." product]
-    [collection
-     ["." list ("#\." functor fold monoid)]
-     [dictionary
-      ["." plist]]]]]
+  [library
+   [lux #*
+    [abstract
+     monad]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text ("#\." equivalence)]
+     ["." maybe ("#\." monad)]
+     ["." product]
+     [collection
+      ["." list ("#\." functor fold monoid)]
+      [dictionary
+       ["." plist]]]]]]
   ["." /// #_
    ["#." extension]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/structure.lux
index dadc61c2d..0f8106a7d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/structure.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["ex" exception (#+ exception:)]
-    ["." state]]
-   [data
-    ["." name]
-    ["." product]
-    ["." maybe]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." type
-    ["." check]]]
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["ex" exception (#+ exception:)]
+     ["." state]]
+    [data
+     ["." name]
+     ["." product]
+     ["." maybe]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." type
+     ["." check]]]]
   ["." // #_
    ["#." type]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/type.lux
index f72ec593b..61948e7c2 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/type.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/type.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]]
-   [type
-    ["." check (#+ Check)]]
-   ["." meta]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]]
+    [type
+     ["." check (#+ Check)]]
+    ["." meta]]]
   ["." /// #_
    ["#." extension]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux
index 088bed17a..882ac3a6e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/directive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold monoid)]]]
-   ["." meta]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold monoid)]]]
+    ["." meta]]]
   ["." // #_
    ["#." extension]
    ["#." analysis
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
index 7004b8d1a..fd30c45d2 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux (#- Name)
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." text ("#\." order)
-     ["%" format (#+ Format format)]]
-    [collection
-     ["." list]
-     ["." dictionary (#+ Dictionary)]]]]
+  [library
+   [lux (#- Name)
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." text ("#\." order)
+      ["%" format (#+ Format format)]]
+     [collection
+      ["." list]
+      ["." dictionary (#+ Dictionary)]]]]]
   [/////
    ["//" phase]
    [meta
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
index 0f38bce97..a1a979555 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   [////
    [analysis (#+ Bundle)
     [evaluation (#+ Eval)]]]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux
index 887d639f1..348124448 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" common_lisp]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" common_lisp]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
index d36dcd1ef..5660a2a85 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" js]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" js]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 0d67b2224..76bcd528e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -1,44 +1,45 @@
 (.module:
-  [lux (#- Type Module primitive type char int)
-   ["." ffi (#+ import:)]
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    pipe
-    ["." try (#+ Try) ("#\." monad)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]
-     ["<.>" text]]]
-   [data
-    ["." maybe]
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold monad monoid)]
-     ["." array]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["." jvm #_
-     [".!" reflection]
-     [encoding
-      [name (#+ External)]]
-     ["#" type (#+ Type Argument Typed) ("#\." equivalence)
-      ["." category (#+ Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)]
-      ["." box]
-      ["." reflection]
-      ["." descriptor]
-      ["." signature]
-      ["#_." parser]
-      ["#_." alias (#+ Aliasing)]
-      [".T" lux (#+ Mapping)]]]]
-   ["." type
-    ["." check (#+ Check) ("#\." monad)]]]
+  [library
+   [lux (#- Type Module primitive type char int)
+    ["." ffi (#+ import:)]
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     pipe
+     ["." try (#+ Try) ("#\." monad)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]
+      ["<.>" text]]]
+    [data
+     ["." maybe]
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold monad monoid)]
+      ["." array]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["." jvm #_
+      [".!" reflection]
+      [encoding
+       [name (#+ External)]]
+      ["#" type (#+ Type Argument Typed) ("#\." equivalence)
+       ["." category (#+ Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)]
+       ["." box]
+       ["." reflection]
+       ["." descriptor]
+       ["." signature]
+       ["#_." parser]
+       ["#_." alias (#+ Aliasing)]
+       [".T" lux (#+ Mapping)]]]]
+    ["." type
+     ["." check (#+ Check) ("#\." monad)]]]]
   ["." // #_
    ["#." lux (#+ custom)]
    ["/#" //
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
index 8f97d1ba9..b0bdba0cb 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" lua]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" lua]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index a86295b2a..a5e924af1 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    ["." check]]
-   ["." meta]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     ["." check]]
+    ["." meta]]]
   ["." ///
    ["#." bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
index 19aea38fa..a30c9e6f0 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" php]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" php]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
index 53e6c0b05..a3635cf96 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" python]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" python]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
index 12f578ed2..6dfbf707e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" r]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" r]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
index 0fda869e9..1d01b479d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" ruby]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" ruby]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
index 86db4170f..e7ff4ba15 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["<>" parser
-     ["<c>" code (#+ Parser)]]]
-   [data
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary]
-     ["." list]]]
-   ["." type
-    ["." check]]
-   ["@" target
-    ["_" scheme]]]
+  [library
+   [lux #*
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["<>" parser
+      ["<c>" code (#+ Parser)]]]
+    [data
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary]
+      ["." list]]]
+    ["." type
+     ["." check]]
+    ["@" target
+     ["_" scheme]]]]
   [//
    ["/" lux (#+ custom)]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/bundle.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux
index 147904b62..3fb0c967e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/bundle.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]]]
   [// (#+ Handler Bundle)])
 
 (def: #export empty
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
index a00fe5273..8678c6269 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
@@ -1,64 +1,65 @@
 (.module:
-  [lux (#- Type Definition)
-   ["." host]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["<>" parser ("#\." monad)
-     ["<c>" code (#+ Parser)]
-     ["<t>" text]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." dictionary]
-     ["." row]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["." i32]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     ["." attribute]
-     ["." field]
-     ["." version]
-     ["." class]
-     ["." constant
-      ["." pool (#+ Resource)]]
-     [encoding
-      ["." name]]
-     ["." type (#+ Type Constraint Argument Typed)
-      [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
-      [".T" lux (#+ Mapping)]
-      ["." signature]
-      ["." descriptor (#+ Descriptor)]
-      ["." parser]]]]
-   [tool
-    [compiler
-     ["." analysis]
-     ["." synthesis]
-     ["." generation]
-     ["." directive (#+ Handler Bundle)]
-     ["." phase
-      [analysis
-       [".A" type]]
-      ["." generation
-       [jvm
-        [runtime (#+ Anchor Definition)]]]
-      ["." extension
-       ["." bundle]
+  [library
+   [lux (#- Type Definition)
+    ["." host]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["<>" parser ("#\." monad)
+      ["<c>" code (#+ Parser)]
+      ["<t>" text]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." dictionary]
+      ["." row]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["." i32]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      ["." attribute]
+      ["." field]
+      ["." version]
+      ["." class]
+      ["." constant
+       ["." pool (#+ Resource)]]
+      [encoding
+       ["." name]]
+      ["." type (#+ Type Constraint Argument Typed)
+       [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
+       [".T" lux (#+ Mapping)]
+       ["." signature]
+       ["." descriptor (#+ Descriptor)]
+       ["." parser]]]]
+    [tool
+     [compiler
+      ["." analysis]
+      ["." synthesis]
+      ["." generation]
+      ["." directive (#+ Handler Bundle)]
+      ["." phase
        [analysis
-        ["." jvm]]
-       [directive
-        ["/" lux]]]]]]
-   [type
-    ["." check (#+ Check)]]])
+        [".A" type]]
+       ["." generation
+        [jvm
+         [runtime (#+ Anchor Definition)]]]
+       ["." extension
+        ["." bundle]
+        [analysis
+         ["." jvm]]
+        [directive
+         ["/" lux]]]]]]
+    [type
+     ["." check (#+ Check)]]]])
 
 (type: Operation
   (directive.Operation Anchor (Bytecode Any) Definition))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
index 9e405eb78..dc8272030 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [io (#+ IO)]
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["p" parser
-     ["s" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]]]
-   [macro
-    ["." code]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." type (#+ :share)
-    ["." check]]]
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [io (#+ IO)]
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["p" parser
+      ["s" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]]]
+    [macro
+     ["." code]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." type (#+ :share)
+     ["." check]]]]
   ["." /// (#+ Extender)
    ["#." bundle]
    ["#." analysis]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
index dc81d4b18..f42aa31ff 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
index d1ad7bd99..7f911e3b3 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." set]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["f" frac]]]
-   ["@" target
-    ["_" common_lisp (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." set]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["f" frac]]]
+    ["@" target
+     ["_" common_lisp (#+ Expression)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux
index f6d164404..9895f051a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    ["_" common_lisp (#+ Var Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     ["_" common_lisp (#+ Var Expression)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
index 81d2fe57b..ba83e257f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
index deffe31d8..a74c72d38 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary]]]
-   [math
-    [number
-     ["f" frac]]]
-   ["@" target
-    ["_" js (#+ Literal Expression Statement)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary]]]
+    [math
+     [number
+      ["f" frac]]]
+    ["@" target
+     ["_" js (#+ Literal Expression Statement)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
index 45fb3e5d2..edc4e2321 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]]
-   [target
-    ["_" js (#+ Var Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]]
+    [target
+     ["_" js (#+ Var Expression)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
index 93816d128..396c3284e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
index 24f82d1ef..da55a6c32 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux (#- Type)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    [number
-     ["." i32]
-     ["f" frac]]
-    [collection
-     ["." list ("#\." monad)]
-     ["." dictionary]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
-     [encoding
-      ["." signed (#+ S4)]]
-     ["." type (#+ Type)
-      [category (#+ Primitive Class)]]]]]
+  [library
+   [lux (#- Type)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     [number
+      ["." i32]
+      ["f" frac]]
+     [collection
+      ["." list ("#\." monad)]
+      ["." dictionary]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
+      [encoding
+       ["." signed (#+ S4)]]
+      ["." type (#+ Type)
+       [category (#+ Primitive Class)]]]]]]
   ["." ///// #_
    [generation
     [extension (#+ Nullary Unary Binary Trinary Variadic
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
index 03ec04853..b46934a86 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
@@ -1,45 +1,46 @@
 (.module:
-  [lux (#- Type)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<t>" text]
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [number
-     ["." i32]]
-    [collection
-     ["." list ("#\." monad)]
-     ["." dictionary (#+ Dictionary)]
-     ["." set]
-     ["." row]]
-    ["." format #_
-     ["#" binary]]]
-   [target
-    [jvm
-     ["." version]
-     ["." modifier ("#\." monoid)]
-     ["." method (#+ Method)]
-     ["." class (#+ Class)]
-     [constant
-      [pool (#+ Resource)]]
-     [encoding
-      ["." name]]
-     ["_" bytecode (#+ Label Bytecode) ("#\." monad)
-      ["__" instruction (#+ Primitive-Array-Type)]]
-     ["." type (#+ Type Typed Argument)
-      ["." category (#+ Void Value' Value Return' Return Primitive Object Array Var Parameter)]
-      ["." box]
-      ["." reflection]
-      ["." signature]
-      ["." parser]]]]]
+  [library
+   [lux (#- Type)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<t>" text]
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [number
+      ["." i32]]
+     [collection
+      ["." list ("#\." monad)]
+      ["." dictionary (#+ Dictionary)]
+      ["." set]
+      ["." row]]
+     ["." format #_
+      ["#" binary]]]
+    [target
+     [jvm
+      ["." version]
+      ["." modifier ("#\." monoid)]
+      ["." method (#+ Method)]
+      ["." class (#+ Class)]
+      [constant
+       [pool (#+ Resource)]]
+      [encoding
+       ["." name]]
+      ["_" bytecode (#+ Label Bytecode) ("#\." monad)
+       ["__" instruction (#+ Primitive-Array-Type)]]
+      ["." type (#+ Type Typed Argument)
+       ["." category (#+ Void Value' Value Return' Return Primitive Object Array Var Parameter)]
+       ["." box]
+       ["." reflection]
+       ["." signature]
+       ["." parser]]]]]]
   ["." // #_
    [common (#+ custom)]
    ["///#" //// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
index ab0d0d555..1f1bd7f91 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
index b22dd6d53..b31bf5610 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["f" frac]]]
-   ["@" target
-    ["_" lua (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["f" frac]]]
+    ["@" target
+     ["_" lua (#+ Expression)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
index c9c5acec8..1bb7d771c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    ["_" lua (#+ Var Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     ["_" lua (#+ Var Expression)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
index 2f2d75c31..751e67a85 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
index ce4ab223c..2d31a6b71 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." set]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["f" frac]]]
-   ["@" target
-    ["_" php (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." set]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["f" frac]]]
+    ["@" target
+     ["_" php (#+ Expression)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
index d93fd04ff..ab01b5938 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    ["_" php (#+ Var Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     ["_" php (#+ Var Expression)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
index 5639551c6..2309732f3 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
index 61a154efc..da9ab4a4b 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["f" frac]]]
-   [target
-    ["_" python (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["f" frac]]]
+    [target
+     ["_" python (#+ Expression)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
index a46bbb9cc..6612cda07 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]]
-   [target
-    ["_" python (#+ Expression SVar)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]]
+    [target
+     ["_" python (#+ Expression SVar)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
index cd0f6b7cc..7ca8195f7 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
index d9178d8c2..36238f9e3 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." set]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["f" frac]]]
-   ["@" target
-    ["_" r (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." set]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["f" frac]]]
+    ["@" target
+     ["_" r (#+ Expression)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux
index 2d9148dda..37390f799 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    ["_" r (#+ Var Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     ["_" r (#+ Var Expression)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
index 12bcfc9b1..417ccf847 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
index 030b3b239..4f2cd3291 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["f" frac]]]
-   [target
-    ["_" ruby (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["f" frac]]]
+    [target
+     ["_" ruby (#+ Expression)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
index 206034cd7..6f538b8dd 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    ["_" ruby (#+ Var Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     ["_" ruby (#+ Var Expression)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
index 945e90e57..7245ac4f6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   ["." / #_
    ["#." common]
    ["#." host]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
index 4f1258794..17df72ac2 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary]
-     ["." set]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["f" frac]]]
-   ["@" target
-    ["_" scheme (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary]
+      ["." set]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["f" frac]]]
+    ["@" target
+     ["_" scheme (#+ Expression)]]]]
   ["." //// #_
    ["/" bundle]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
index 6072d29e5..e67e05db4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary]
-     ["." list]]
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    ["_" scheme (#+ Var Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary]
+      ["." list]]
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     ["_" scheme (#+ Var Expression)]]]]
   ["." // #_
    ["#." common (#+ custom)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux
index 40fb4f89e..7e9e85d6e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    ["." bundle]
    [///
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
index 7b81d9d4a..972e318c2 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]]]
   ["." / #_
    [runtime (#+ Phase)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
index 2896e0030..2425e2cb4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold monoid)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" common_lisp (#+ Expression Var/1)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold monoid)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" common_lisp (#+ Expression Var/1)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux
index 3bc0a0887..1880d7700 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   [//
    [runtime (#+ Bundle)]]
   [/
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
index 574995de9..baac3e891 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]]
-   [data
-    ["." product]
-    [number
-     ["f" frac]]
-    [collection
-     ["." dictionary]]]
-   [target
-    ["_" common-lisp (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]]
+    [data
+     ["." product]
+     [number
+      ["f" frac]]
+     [collection
+      ["." dictionary]]]
+    [target
+     ["_" common-lisp (#+ Expression)]]]]
   ["." /// #_
    ["#." runtime (#+ Operation Phase Handler Bundle)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux
index 2a5896e92..6adc2d747 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    pipe]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" common_lisp (#+ Expression Var/1)]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     pipe]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" common_lisp (#+ Expression Var/1)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux
index 7256e926d..bfe5e2787 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" common_lisp (#+ Expression)]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" common_lisp (#+ Expression)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Generator)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux
index 9357156f2..82ab68128 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- i64)
-   [target
-    ["_" common_lisp (#+ Expression)]]])
+  [library
+   [lux (#- i64)
+    [target
+     ["_" common_lisp (#+ Expression)]]]])
 
 (def: #export bit
   (-> Bit (Expression Any))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux
index 1fe57fb8c..83bbc6a95 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" python (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" common_lisp (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
index fd7ffc48b..41e7cda43 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux (#- Location inc)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     ["." encoding]]
-    [collection
-     ["." list ("#\." functor monoid)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["." i64]]]
-   ["@" target
-    ["_" common_lisp (#+ Expression Computation Literal)]]]
+  [library
+   [lux (#- Location inc)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      ["." encoding]]
+     [collection
+      ["." list ("#\." functor monoid)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["." i64]]]
+    ["@" target
+     ["_" common_lisp (#+ Expression Computation Literal)]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux
index 566fc148e..44bd542f6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [target
-    ["_" common_lisp (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [target
+     ["_" common_lisp (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
index 051b6357b..5196c6e33 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [parser
-     ["s" code]]]
-   [data
-    [collection
-     ["." list ("#\." functor)]]]
-   ["." meta]
-   ["." macro (#+ with_gensyms)
-    ["." code]
-    [syntax (#+ syntax:)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [parser
+      ["s" code]]]
+    [data
+     [collection
+      ["." list ("#\." functor)]]]
+    ["." meta]
+    ["." macro (#+ with_gensyms)
+     ["." code]
+     [syntax (#+ syntax:)]]]]
   ["." /// #_
    ["#." extension]
    [//
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
index ab89ff708..18319d0a2 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [target
-    ["_" js]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [target
+     ["_" js]]]]
   ["." / #_
    [runtime (#+ Phase Phase!)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
index 50e3ba008..76da7c8f1 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." maybe]
-    ["." text]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" js (#+ Expression Computation Var Statement)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." maybe]
+     ["." text]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" js (#+ Expression Computation Var Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Phase! Generator Generator!)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
index 660ac4991..df13919b0 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" js (#+ Expression Computation Var Statement)]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" js (#+ Expression Computation Var Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Phase! Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
index 135cfeb74..720257105 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" js (#+ Computation Var Expression Statement)]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" js (#+ Computation Var Expression Statement)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Phase! Generator Generator!)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux
index db00d6439..ede743c5d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- i64)
-   [target
-    ["_" js (#+ Computation)]]]
+  [library
+   [lux (#- i64)
+    [target
+     ["_" js (#+ Computation)]]]]
   ["." // #_
    ["#." runtime]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux
index c986bc2a0..b21262192 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" r (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" js (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
index c307f4302..2f6370418 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
@@ -1,34 +1,35 @@
 (.module:
-  [lux (#- i64)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["." i64]]]
-   [target
-    ["_" js (#+ Expression Var Computation Statement)]]
-   [tool
-    [compiler
-     [language
-      [lux
-       ["$" version]]]]]]
+  [library
+   [lux (#- i64)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["." i64]]]
+    [target
+     ["_" js (#+ Expression Var Computation Statement)]]
+    [tool
+     [compiler
+      [language
+       [lux
+        ["$" version]]]]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux
index a90b81f7d..8c68d5b23 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [target
-    ["_" js (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [target
+     ["_" js (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
index bb908e4c9..e8357027d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]]]
   ["." / #_
    [runtime (#+ Phase)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
index 010f97349..7d2416d67 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux (#- Type if let case int)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]]
-   [data
-    [number
-     ["." i32]
-     ["n" nat]]
-    [collection
-     ["." list ("#\." fold)]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
-     ["." type (#+ Type)
-      [category (#+ Method)]]]]]
+  [library
+   [lux (#- Type if let case int)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]]
+    [data
+     [number
+      ["." i32]
+      ["n" nat]]
+     [collection
+      ["." list ("#\." fold)]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
+      ["." type (#+ Type)
+       [category (#+ Method)]]]]]]
   ["." // #_
    ["#." type]
    ["#." runtime (#+ Operation Phase Generator)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux
index 659dc0799..65c141283 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]]
-   [data
-    [binary (#+ Binary)]
-    [text
-     ["%" format (#+ format)]]]
-   [world
-    ["." file (#+ File)]]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]]
+    [data
+     [binary (#+ Binary)]
+     [text
+      ["%" format (#+ format)]]]
+    [world
+     ["." file (#+ File)]]]])
 
 (def: extension ".class")
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
index a456644b8..37cda09e1 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
@@ -1,36 +1,37 @@
 (.module:
-  [lux (#- Type)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    [number
-     ["." i32]
-     ["n" nat]]
-    [collection
-     ["." list ("#\." monoid functor)]
-     ["." row]]
-    ["." format #_
-     ["#" binary]]]
-   [target
-    [jvm
-     ["." version]
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     ["." field (#+ Field)]
-     ["." method (#+ Method)]
-     ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
-     ["." class (#+ Class)]
-     ["." type (#+ Type)
-      [category (#+ Return' Value')]
-      ["." reflection]]
-     ["." constant
-      [pool (#+ Resource)]]
-     [encoding
-      ["." name (#+ External Internal)]
-      ["." unsigned]]]]
-   [tool
-    [compiler
-     [meta
-      ["." archive (#+ Archive)]]]]]
+  [library
+   [lux (#- Type)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     [number
+      ["." i32]
+      ["n" nat]]
+     [collection
+      ["." list ("#\." monoid functor)]
+      ["." row]]
+     ["." format #_
+      ["#" binary]]]
+    [target
+     [jvm
+      ["." version]
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      ["." field (#+ Field)]
+      ["." method (#+ Method)]
+      ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
+      ["." class (#+ Class)]
+      ["." type (#+ Type)
+       [category (#+ Return' Value')]
+       ["." reflection]]
+      ["." constant
+       [pool (#+ Resource)]]
+      [encoding
+       ["." name (#+ External Internal)]
+       ["." unsigned]]]]
+    [tool
+     [compiler
+      [meta
+       ["." archive (#+ Archive)]]]]]]
   ["." / #_
    ["#." abstract]
    [field
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux
index 0b4885180..fea8a985e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux (#- Type)
-   [data
-    [text
-     ["%" format]]]
-   [target
-    [jvm
-     ["." type (#+ Type)
-      [category (#+ Method)]]]]]
+  [library
+   [lux (#- Type)
+    [data
+     [text
+      ["%" format]]]
+    [target
+     [jvm
+      ["." type (#+ Type)
+       [category (#+ Method)]]]]]]
   [//
    [field
     [constant
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux
new file mode 100644
index 000000000..d6bb70600
--- /dev/null
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux
@@ -0,0 +1,26 @@
+(.module:
+  [library
+   [lux (#- Type type)
+    [data
+     [collection
+      ["." row]]]
+    [target
+     [jvm
+      ["." field (#+ Field)]
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      [type (#+ Type)
+       [category (#+ Value)]]
+      [constant
+       [pool (#+ Resource)]]]]]])
+
+(def: modifier
+  (Modifier Field)
+  ($_ modifier\compose
+      field.public
+      field.static
+      field.final
+      ))
+
+(def: #export (constant name type)
+  (-> Text (Type Value) (Resource Field))
+  (field.field ..modifier name type (row.row)))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux
index 011535ce9..a1e0a589d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux (#- type)
-   [target
-    [jvm
-     ["." type]
-     ["." field (#+ Field)]
-     [constant
-      [pool (#+ Resource)]]]]]
+  [library
+   [lux (#- type)
+    [target
+     [jvm
+      ["." type]
+      ["." field (#+ Field)]
+      [constant
+       [pool (#+ Resource)]]]]]]
   ["." //
    [/////////
     [arity (#+ Arity)]]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
index 478f9d454..aa200182d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux (#- Type type)
-   [data
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   [target
-    [jvm
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     ["." field (#+ Field)]
-     ["_" bytecode (#+ Bytecode)]
-     [type (#+ Type)
-      [category (#+ Value Class)]]
-     [constant
-      [pool (#+ Resource)]]]]]
+  [library
+   [lux (#- Type type)
+    [data
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    [target
+     [jvm
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      ["." field (#+ Field)]
+      ["_" bytecode (#+ Bytecode)]
+      [type (#+ Type)
+       [category (#+ Value Class)]]
+      [constant
+       [pool (#+ Resource)]]]]]]
   ["." //// #_
    ["#." type]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux
index 1c6bf6455..4506bb2f8 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- Type)
-   [data
-    [collection
-     ["." list]
-     ["." row]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." field (#+ Field)]
-     [constant
-      [pool (#+ Resource)]]
-     [type (#+ Type)
-      [category (#+ Value Class)]]]]]
+  [library
+   [lux (#- Type)
+    [data
+     [collection
+      ["." list]
+      ["." row]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." field (#+ Field)]
+      [constant
+       [pool (#+ Resource)]]
+      [type (#+ Type)
+       [category (#+ Value Class)]]]]]]
   ["." //
    ["///#" //// #_
     ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
index ff1599a0c..0a2e25b3d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- Type)
-   [abstract
-    ["." monad]]
-   [data
-    [number
-     ["n" nat]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   [target
-    [jvm
-     ["." field (#+ Field)]
-     ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
-     [type (#+ Type)
-      [category (#+ Class)]]
-     [constant
-      [pool (#+ Resource)]]]]]
+  [library
+   [lux (#- Type)
+    [abstract
+     ["." monad]]
+    [data
+     [number
+      ["n" nat]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    [target
+     [jvm
+      ["." field (#+ Field)]
+      ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
+      [type (#+ Type)
+       [category (#+ Class)]]
+      [constant
+       [pool (#+ Resource)]]]]]]
   ["." / #_
    ["#." count]
    ["/#" //
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial/count.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial/count.lux
index dbafd7ee5..5497cc094 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial/count.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial/count.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux (#- type)
-   [control
-    ["." try]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     [encoding
-      [name (#+ External)]
-      ["." signed]]
-     ["." type]]]]
+  [library
+   [lux (#- type)
+    [control
+     ["." try]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      [encoding
+       [name (#+ External)]
+       ["." signed]]
+      ["." type]]]]]
   ["." ///// #_
    ["#." abstract]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux
new file mode 100644
index 000000000..9cbde4b63
--- /dev/null
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux
@@ -0,0 +1,14 @@
+(.module:
+  [library
+   [lux #*
+    [target
+     [jvm
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      ["." method (#+ Method)]]]]])
+
+(def: #export modifier
+  (Modifier Method)
+  ($_ modifier\compose
+      method.public
+      method.strict
+      ))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
index 581cce970..e42804d63 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux (#- Type type)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    [number
-     ["n" nat]
-     ["i" int]
-     ["." i32]]
-    [collection
-     ["." list ("#\." monoid functor)]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
-     ["." method (#+ Method)]
-     [constant
-      [pool (#+ Resource)]]
-     [encoding
-      ["." signed]]
-     ["." type (#+ Type)
-      ["." category (#+ Class)]]]]]
+  [library
+   [lux (#- Type type)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     [number
+      ["n" nat]
+      ["i" int]
+      ["." i32]]
+     [collection
+      ["." list ("#\." monoid functor)]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Label Bytecode) ("#\." monad)]
+      ["." method (#+ Method)]
+      [constant
+       [pool (#+ Resource)]]
+      [encoding
+       ["." signed]]
+      ["." type (#+ Type)
+       ["." category (#+ Class)]]]]]]
   ["." //
    ["#." reset]
    ["#." implementation]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
index 000bdf569..14cde40a2 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Type type)
-   [data
-    [collection
-     ["." list]]]
-   [target
-    [jvm
-     ["." method (#+ Method)]
-     ["_" bytecode (#+ Label Bytecode)]
-     [constant
-      [pool (#+ Resource)]]
-     ["." type (#+ Type)
-      ["." category]]]]]
+  [library
+   [lux (#- Type type)
+    [data
+     [collection
+      ["." list]]]
+    [target
+     [jvm
+      ["." method (#+ Method)]
+      ["_" bytecode (#+ Label Bytecode)]
+      [constant
+       [pool (#+ Resource)]]
+      ["." type (#+ Type)
+       ["." category]]]]]]
   ["." //
    ["//#" /// #_
     ["#." type]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux
index fe8b824c9..3785f9a40 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- Type type)
-   [abstract
-    ["." monad]]
-   [control
-    ["." try]]
-   [data
-    [number
-     ["n" nat]]
-    [collection
-     ["." list ("#\." monoid functor)]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." method (#+ Method)]
-     [encoding
-      ["." unsigned]]
-     [constant
-      [pool (#+ Resource)]]
-     ["." type (#+ Type)
-      ["." category (#+ Class Value)]]]]]
+  [library
+   [lux (#- Type type)
+    [abstract
+     ["." monad]]
+    [control
+     ["." try]]
+    [data
+     [number
+      ["n" nat]]
+     [collection
+      ["." list ("#\." monoid functor)]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." method (#+ Method)]
+      [encoding
+       ["." unsigned]]
+      [constant
+       [pool (#+ Resource)]]
+      ["." type (#+ Type)
+       ["." category (#+ Class Value)]]]]]]
   ["." //
    ["#." implementation]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
index 7bf1b0bd8..f6bfa0278 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- Type type)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    [number
-     ["n" nat]]
-    [collection
-     ["." list]]]
-   [target
-    [jvm
-     ["." field (#+ Field)]
-     ["." method (#+ Method)]
-     ["_" bytecode (#+ Bytecode)]
-     ["." constant
-      [pool (#+ Resource)]]
-     [type (#+ Type)
-      ["." category (#+ Class Value Return)]]]]
-   [tool
-    [compiler
-     [meta
-      ["." archive (#+ Archive)]]]]]
+  [library
+   [lux (#- Type type)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     [number
+      ["n" nat]]
+     [collection
+      ["." list]]]
+    [target
+     [jvm
+      ["." field (#+ Field)]
+      ["." method (#+ Method)]
+      ["_" bytecode (#+ Bytecode)]
+      ["." constant
+       [pool (#+ Resource)]]
+      [type (#+ Type)
+       ["." category (#+ Class Value Return)]]]]
+    [tool
+     [compiler
+      [meta
+       ["." archive (#+ Archive)]]]]]]
   ["." //
    ["#." init]
    ["#." implementation]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
index 9793da801..229538870 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Type type)
-   [data
-    [collection
-     ["." list ("#\." functor)]]]
-   [target
-    [jvm
-     ["." method (#+ Method)]
-     ["_" bytecode (#+ Bytecode)]
-     [constant
-      [pool (#+ Resource)]]
-     ["." type (#+ Type)
-      ["." category (#+ Class)]]]]]
+  [library
+   [lux (#- Type type)
+    [data
+     [collection
+      ["." list ("#\." functor)]]]
+    [target
+     [jvm
+      ["." method (#+ Method)]
+      ["_" bytecode (#+ Bytecode)]
+      [constant
+       [pool (#+ Resource)]]
+      ["." type (#+ Type)
+       ["." category (#+ Class)]]]]]]
   ["." //
    ["#." new]
    ["/#" // #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
index 0e7a2c776..2f6b8041c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
@@ -1,42 +1,43 @@
 (.module:
-  [lux (#- Definition)
-   ["." ffi (#+ import: do-to object)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    pipe
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]
-    [concurrency
-     ["." atom (#+ Atom atom)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]]
-    [collection
-     ["." array]
-     ["." dictionary (#+ Dictionary)]
-     ["." row]]
-    ["." format #_
-     ["#" binary]]]
-   [target
-    [jvm
-     ["." loader (#+ Library)]
-     ["_" bytecode (#+ Bytecode)]
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     ["." field (#+ Field)]
-     ["." method (#+ Method)]
-     ["." version]
-     ["." class (#+ Class)]
-     ["." encoding #_
-      ["#/." name]]
-     ["." type
-      ["." descriptor]]]]
-   [tool
-    [compiler
-     ["." name]]]]
+  [library
+   [lux (#- Definition)
+    ["." ffi (#+ import: do-to object)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     pipe
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]
+     [concurrency
+      ["." atom (#+ Atom atom)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]]
+     [collection
+      ["." array]
+      ["." dictionary (#+ Dictionary)]
+      ["." row]]
+     ["." format #_
+      ["#" binary]]]
+    [target
+     [jvm
+      ["." loader (#+ Library)]
+      ["_" bytecode (#+ Bytecode)]
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      ["." field (#+ Field)]
+      ["." method (#+ Method)]
+      ["." version]
+      ["." class (#+ Class)]
+      ["." encoding #_
+       ["#/." name]]
+      ["." type
+       ["." descriptor]]]]
+    [tool
+     [compiler
+      ["." name]]]]]
   ["." // #_
    ["#." runtime (#+ Definition)]]
   )
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
index 2640f28ce..465e8d1af 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]]
-   [data
-    ["." product]
-    [number
-     ["n" nat]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Label Bytecode) ("#\." monad)]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]]
+    [data
+     ["." product]
+     [number
+      ["n" nat]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Label Bytecode) ("#\." monad)]]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." value]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
index b23d41726..6b24fb2f5 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux (#- i64)
-   ["." ffi (#+ import:)]
-   [abstract
-    [monad (#+ do)]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." type]
-     [encoding
-      ["." signed]]]]]
+  [library
+   [lux (#- i64)
+    ["." ffi (#+ import:)]
+    [abstract
+     [monad (#+ do)]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." type]
+      [encoding
+       ["." signed]]]]]]
   ["." // #_
    ["#." runtime]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux
index 6166f14c1..0441f3b00 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux (#- Definition)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    [collection
-     ["." row]]
-    ["." format #_
-     ["#" binary]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     ["." method (#+ Method)]
-     ["." version]
-     ["." class (#+ Class)]
-     [encoding
-      ["." name]]
-     ["." type
-      ["." reflection]]]]]
+  [library
+   [lux (#- Definition)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     [collection
+      ["." row]]
+     ["." format #_
+      ["#" binary]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      ["." method (#+ Method)]
+      ["." version]
+      ["." class (#+ Class)]
+      [encoding
+       ["." name]]
+      ["." type
+       ["." reflection]]]]]]
   ["." //
    ["#." runtime (#+ Definition)]
    ["#." function/abstract]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux
index edffd87ff..c41e5c16a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." type]
-     [encoding
-      ["." unsigned]]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." type]
+      [encoding
+       ["." unsigned]]]]]]
   ["." // #_
    ["#." runtime (#+ Operation)]
    ["#." value]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
index 1c31c7ed9..e445ec2d4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
@@ -1,39 +1,40 @@
 (.module:
-  [lux (#- Type Definition case false true try)
-   [abstract
-    ["." monad (#+ do)]
-    ["." enum]]
-   [control
-    ["." try]]
-   [data
-    [binary (#+ Binary)]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]
-    ["." format #_
-     ["#" binary]]
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    [number
-     ["n" nat]
-     ["." i32]
-     ["." i64]]]
-   [target
-    ["." jvm #_
-     ["_" bytecode (#+ Label Bytecode)]
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     ["." field (#+ Field)]
-     ["." method (#+ Method)]
-     ["#/." version]
-     ["." class (#+ Class)]
-     ["." constant
-      [pool (#+ Resource)]]
-     [encoding
-      ["." name]]
-     ["." type (#+ Type)
-      ["." category (#+ Return' Value')]
-      ["." reflection]]]]]
+  [library
+   [lux (#- Type Definition case false true try)
+    [abstract
+     ["." monad (#+ do)]
+     ["." enum]]
+    [control
+     ["." try]]
+    [data
+     [binary (#+ Binary)]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]
+     ["." format #_
+      ["#" binary]]
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     [number
+      ["n" nat]
+      ["." i32]
+      ["." i64]]]
+    [target
+     ["." jvm #_
+      ["_" bytecode (#+ Label Bytecode)]
+      ["." modifier (#+ Modifier) ("#\." monoid)]
+      ["." field (#+ Field)]
+      ["." method (#+ Method)]
+      ["#/." version]
+      ["." class (#+ Class)]
+      ["." constant
+       [pool (#+ Resource)]]
+      [encoding
+       ["." name]]
+      ["." type (#+ Type)
+       ["." category (#+ Return' Value')]
+       ["." reflection]]]]]]
   ["." // #_
    ["#." type]
    ["#." value]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
index b89bbca35..4ff9bdb81 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    [number
-     ["." i32]]
-    [collection
-     ["." list]]]
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." type]
-     [encoding
-      ["." signed]]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     [number
+      ["." i32]]
+     [collection
+      ["." list]]]
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." type]
+      [encoding
+       ["." signed]]]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux
index 954740d2d..4c6f14a3f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/type.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [target
-    [jvm
-     ["." type]]]])
+  [library
+   [lux #*
+    [target
+     [jvm
+      ["." type]]]]])
 
 (def: #export frac (type.class "java.lang.Double" (list)))
 (def: #export text (type.class "java.lang.String" (list)))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux
index 206af53b8..ef82a6257 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux (#- Type type)
-   [target
-    [jvm
-     ["_" bytecode (#+ Bytecode)]
-     ["." type (#+ Type) ("#\." equivalence)
-      [category (#+ Primitive)]
-      ["." box]]]]])
+  [library
+   [lux (#- Type type)
+    [target
+     [jvm
+      ["_" bytecode (#+ Bytecode)]
+      ["." type (#+ Type) ("#\." equivalence)
+       [category (#+ Primitive)]
+       ["." box]]]]]])
 
 (def: #export field "value")
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
index 3f64c53bf..529dd28a0 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [target
-    ["_" lua]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [target
+     ["_" lua]]]]
   ["." / #_
    [runtime (#+ Phase Phase!)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
index 6a2101fe3..0be2698f8 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [target
-    ["_" lua (#+ Expression Var Statement)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [target
+     ["_" lua (#+ Expression Var Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Phase! Generator Generator!)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
index 55490d3f2..97a5b1691 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    pipe]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" lua (#+ Var Expression Label Statement)]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     pipe]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" lua (#+ Var Expression Label Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Phase! Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
index e95fc0f49..a6719856c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" lua (#+ Var Expression Label Statement)]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" lua (#+ Var Expression Label Statement)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Phase! Generator Generator!)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux
index 6cce70f05..7d010b4cb 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- i64)
-   [target
-    ["_" lua (#+ Literal)]]])
+  [library
+   [lux (#- i64)
+    [target
+     ["_" lua (#+ Literal)]]]])
 
 (template [<name> <type> <implementation>]
   [(def: #export <name>
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux
index 72a54569c..52bc69a29 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" lua (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" lua (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
index 0da87ff6a..a0266db38 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- Location inc)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["." i64]]]
-   ["@" target
-    ["_" lua (#+ Expression Location Var Computation Literal Label Statement)]]]
+  [library
+   [lux (#- Location inc)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["." i64]]]
+    ["@" target
+     ["_" lua (#+ Expression Location Var Computation Literal Label Statement)]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux
index e8d192326..ff9bae4be 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [target
-    ["_" ruby (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [target
+     ["_" lua (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
index 654c07bdf..5bcb2770d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [target
-    ["_" php]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [target
+     ["_" php]]]]
   ["." / #_
    [runtime (#+ Phase Phase!)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
index 728902418..d6a4c67b0 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [math
-    [number
-     ["i" int]]]
-   [target
-    ["_" php (#+ Expression Var Statement)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [math
+     [number
+      ["i" int]]]
+    [target
+     ["_" php (#+ Expression Var Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Phase! Generator Generator!)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux
index 3bc0a0887..1880d7700 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   [//
    [runtime (#+ Bundle)]]
   [/
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
index 2a4c4c50d..5eaccf0aa 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]]
-   [data
-    ["." product]
-    ["." text]
-    [number
-     ["f" frac]]
-    [collection
-     ["." dictionary]]]
-   [target
-    ["_" php (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]]
+    [data
+     ["." product]
+     ["." text]
+     [number
+      ["f" frac]]
+     [collection
+      ["." dictionary]]]
+    [target
+     ["_" php (#+ Expression)]]]]
   ["." /// #_
    ["#." runtime (#+ Operation Phase Handler Bundle)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux
index 1194cfe9a..819f6b244 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- Global function)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    pipe]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" php (#+ Var Global Expression Argument Label Statement)]]]
+  [library
+   [lux (#- Global function)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     pipe]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" php (#+ Var Global Expression Argument Label Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Phase! Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
index b1fb94050..9dc7e9e78 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" php (#+ Var Expression Label Statement)]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" php (#+ Var Expression Label Statement)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Phase! Generator Generator!)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux
index 242519aa9..9101ee48d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux (#- i64)
-   [control
-    [pipe (#+ cond> new>)]]
-   [math
-    [number
-     ["." frac]]]
-   [target
-    ["_" php (#+ Literal Expression)]]]
+  [library
+   [lux (#- i64)
+    [control
+     [pipe (#+ cond> new>)]]
+    [math
+     [number
+      ["." frac]]]
+    [target
+     ["_" php (#+ Literal Expression)]]]]
   ["." // #_
    ["#." runtime]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux
index de532a9dc..5dce15a26 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" php (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" php (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
index 041993fb5..231bb4a29 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- Location inc)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["." i64]]]
-   ["@" target
-    ["_" php (#+ Expression Label Constant Var Computation Literal Statement)]]]
+  [library
+   [lux (#- Location inc)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["." i64]]]
+    ["@" target
+     ["_" php (#+ Expression Label Constant Var Computation Literal Statement)]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux
index 5f7a4e358..8d9334dca 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    [collection
-     ["." list]]]
-   [target
-    ["_" php (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     [collection
+      ["." list]]]
+    [target
+     ["_" php (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
index 2e86ad107..683a64ffe 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [target
-    ["_" python]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [target
+     ["_" python]]]]
   ["." / #_
    [runtime (#+ Phase Phase!)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
index 28ffbb624..a4e5e81fc 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
@@ -1,21 +1,20 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [exception (#+ exception:)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [target
-    ["_" python (#+ Expression SVar Statement)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [target
+     ["_" python (#+ Expression SVar Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator Phase! Generator!)]
    ["#." reference]
@@ -37,7 +36,8 @@
 
 (def: #export (gensym prefix)
   (-> Text (Operation SVar))
-  (///////phase\map (|>> %.nat (format prefix) _.var) /////generation.next))
+  (///////phase\map (|>> %.nat (format prefix) _.var)
+                    /////generation.next))
 
 (def: #export register
   (-> Register SVar)
@@ -175,98 +175,115 @@
       ..restore!
       post!))
 
+(def: (primitive_pattern_matching recur pathP)
+  (-> (-> Path (Operation (Statement Any)))
+      (-> Path (Operation (Maybe (Statement Any)))))
+  (.case pathP
+    (#/////synthesis.Bit_Fork when thenP elseP)
+    (do {! ///////phase.monad}
+      [then! (recur thenP)
+       else! (.case elseP
+               (#.Some elseP)
+               (recur elseP)
+
+               #.None
+               (wrap ..fail_pm!))]
+      (wrap (#.Some (.if when
+                      (_.if ..peek
+                        then!
+                        else!)
+                      (_.if ..peek
+                        else!
+                        then!)))))
+
+    (^template [<tag> <format>]
+      [(<tag> cons)
+       (do {! ///////phase.monad}
+         [clauses (monad.map ! (function (_ [match then])
+                                 (\ ! map
+                                    (|>> [(_.= (|> match <format>)
+                                               ..peek)])
+                                    (recur then)))
+                             (#.Cons cons))]
+         (wrap (#.Some (_.cond clauses
+                               ..fail_pm!))))])
+    ([#/////synthesis.I64_Fork (<| //primitive.i64 .int)]
+     [#/////synthesis.F64_Fork (<| //primitive.f64)]
+     [#/////synthesis.Text_Fork (<| //primitive.text)])
+
+    _
+    (\ ///////phase.monad wrap #.None)))
+
 (def: (pattern_matching' in_closure? statement expression archive)
   (-> Bit Phase! Phase Archive Path (Operation (Statement Any)))
   (function (recur pathP)
-    (.case pathP
-      (#/////synthesis.Then bodyS)
-      (statement expression archive bodyS)
-
-      #/////synthesis.Pop
-      (///////phase\wrap ..pop!)
+    (do {! ///////phase.monad}
+      [?output (primitive_pattern_matching recur pathP)]
+      (.case ?output
+        (#.Some output)
+        (wrap output)
 
-      (#/////synthesis.Bind register)
-      (///////phase\wrap (_.set (list (..register register)) ..peek))
+        #.None
+        (.case pathP
+          (#/////synthesis.Then bodyS)
+          (statement expression archive bodyS)
 
-      (#/////synthesis.Bit_Fork when thenP elseP)
-      (do {! ///////phase.monad}
-        [then! (recur thenP)
-         else! (.case elseP
-                 (#.Some elseP)
-                 (recur elseP)
+          #/////synthesis.Pop
+          (///////phase\wrap ..pop!)
 
-                 #.None
-                 (wrap ..fail_pm!))]
-        (wrap (.if when
-                (_.if ..peek
-                  then!
-                  else!)
-                (_.if ..peek
-                  else!
-                  then!))))
+          (#/////synthesis.Bind register)
+          (///////phase\wrap (_.set (list (..register register)) ..peek))
 
-      (^template [<tag> <format>]
-        [(<tag> cons)
-         (do {! ///////phase.monad}
-           [clauses (monad.map ! (function (_ [match then])
-                                   (\ ! map
-                                      (|>> [(_.= (|> match <format>)
-                                                 ..peek)])
-                                      (recur then)))
-                               (#.Cons cons))]
-           (wrap (_.cond clauses
-                         ..fail_pm!)))])
-      ([#/////synthesis.I64_Fork (<| //primitive.i64 .int)]
-       [#/////synthesis.F64_Fork (<| //primitive.f64)]
-       [#/////synthesis.Text_Fork (<| //primitive.text)])
+          (^template [<complex> <simple> <choice>]
+            [(^ (<complex> idx))
+             (///////phase\wrap (<choice> false idx))
 
-      (^template [<complex> <simple> <choice>]
-        [(^ (<complex> idx))
-         (///////phase\wrap (<choice> false idx))
+             (^ (<simple> idx nextP))
+             (|> nextP
+                 recur
+                 (///////phase\map (_.then (<choice> true idx))))])
+          ([/////synthesis.side/left  /////synthesis.simple_left_side  ..left_choice]
+           [/////synthesis.side/right /////synthesis.simple_right_side ..right_choice])
 
-         (^ (<simple> idx nextP))
-         (|> nextP
-             recur
-             (///////phase\map (_.then (<choice> true idx))))])
-      ([/////synthesis.side/left  /////synthesis.simple_left_side  ..left_choice]
-       [/////synthesis.side/right /////synthesis.simple_right_side ..right_choice])
+          (^ (/////synthesis.member/left 0))
+          (///////phase\wrap (|> ..peek (_.nth (_.int +0)) ..push!))
+          
+          (^template [<pm> <getter>]
+            [(^ (<pm> lefts))
+             (///////phase\wrap (|> ..peek (<getter> (_.int (.int lefts))) ..push!))])
+          ([/////synthesis.member/left  //runtime.tuple::left]
+           [/////synthesis.member/right //runtime.tuple::right])
 
-      (^ (/////synthesis.member/left 0))
-      (///////phase\wrap (|> ..peek (_.nth (_.int +0)) ..push!))
-      
-      (^template [<pm> <getter>]
-        [(^ (<pm> lefts))
-         (///////phase\wrap (|> ..peek (<getter> (_.int (.int lefts))) ..push!))])
-      ([/////synthesis.member/left  //runtime.tuple::left]
-       [/////synthesis.member/right //runtime.tuple::right])
+          (^ (/////synthesis.!bind_top register thenP))
+          (do !
+            [then! (recur thenP)]
+            (///////phase\wrap ($_ _.then
+                                   (_.set (list (..register register)) ..peek_and_pop)
+                                   then!)))
 
-      (^ (/////synthesis.!bind_top register thenP))
-      (do ///////phase.monad
-        [then! (recur thenP)]
-        (///////phase\wrap ($_ _.then
-                               (_.set (list (..register register)) ..peek_and_pop)
-                               then!)))
+          (^ (/////synthesis.!multi_pop nextP))
+          (.let [[extra_pops nextP'] (case.count_pops nextP)]
+            (do !
+              [next! (recur nextP')]
+              (///////phase\wrap ($_ _.then
+                                     (..multi_pop! (n.+ 2 extra_pops))
+                                     next!))))
 
-      (^ (/////synthesis.!multi_pop nextP))
-      (.let [[extra_pops nextP'] (case.count_pops nextP)]
-        (do ///////phase.monad
-          [next! (recur nextP')]
-          (///////phase\wrap ($_ _.then
-                                 (..multi_pop! (n.+ 2 extra_pops))
-                                 next!))))
+          (^ (/////synthesis.path/seq preP postP))
+          (do !
+            [pre! (recur preP)
+             post! (recur postP)]
+            (wrap (_.then pre! post!)))
 
-      (^ (/////synthesis.path/seq preP postP))
-      (do ///////phase.monad
-        [pre! (recur preP)
-         post! (recur postP)]
-        (wrap (_.then pre! post!)))
+          (^ (/////synthesis.path/alt preP postP))
+          (do !
+            [pre! (recur preP)
+             post! (recur postP)
+             g!once (..gensym "once")]
+            (wrap (..alternation in_closure? g!once pre! post!)))
 
-      (^ (/////synthesis.path/alt preP postP))
-      (do ///////phase.monad
-        [pre! (recur preP)
-         post! (recur postP)
-         g!once (..gensym "once")]
-        (wrap (..alternation in_closure? g!once pre! post!))))))
+          _
+          (undefined))))))
 
 (def: (pattern_matching in_closure? statement expression archive pathP)
   (-> Bit Phase! Phase Archive Path (Operation (Statement Any)))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux
index cc670d277..ca18fb0ef 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" python (#+ SVar Expression Statement)]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" python (#+ SVar Expression Statement)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Generator Phase! Generator!)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
index 0f932ee38..353c890f9 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" python (#+ Expression SVar Statement)]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" python (#+ Expression SVar Statement)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Generator Phase! Generator!)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux
index ec8889281..60175358f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- i64)
-   [target
-    ["_" python (#+ Expression)]]]
+  [library
+   [lux (#- i64)
+    [target
+     ["_" python (#+ Expression)]]]]
   ["." // #_
    ["#." runtime]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux
index 2e4488b00..eeb4604a3 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" common_lisp (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" python (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
index b77d0c915..1b7c4310c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux (#- inc)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["f" frac]
-     ["." i64]]]
-   ["@" target
-    ["_" python (#+ Expression SVar Computation Literal Statement)]]]
+  [library
+   [lux (#- inc)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["f" frac]
+      ["." i64]]]
+    ["@" target
+     ["_" python (#+ Expression SVar Computation Literal Statement)]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux
index c5edce4a7..342e180d0 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [target
-    ["_" python (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [target
+     ["_" python (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
index b4b3e6423..d3636709a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [target
-    ["_" r]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [target
+     ["_" r]]]]
   ["." / #_
    [runtime (#+ Phase)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
index fe4e4a7c2..912b7aff7 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["i" int]]]
-   [target
-    ["_" r (#+ Expression SVar)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["i" int]]]
+    [target
+     ["_" r (#+ Expression SVar)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux
index c89ffaf0a..f30e18def 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    pipe]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" r (#+ Expression SVar)]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     pipe]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" r (#+ Expression SVar)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux
index c8f8bd1d5..f4887aaaa 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" r]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" r]]]]
   ["." // #_
    [runtime (#+ Operation Phase Generator)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux
index efbd569f4..9b7f40e86 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- i64)
-   [target
-    ["_" r (#+ Expression)]]]
+  [library
+   [lux (#- i64)
+    [target
+     ["_" r (#+ Expression)]]]]
   ["." // #_
    ["#." runtime]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
index 85ccd90dc..4917eb90f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
@@ -1,6 +1,7 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
+  (lux (control [library
+                 [monad #+ do]]
                 ["ex" exception #+ exception:]
                 ["p" parser])
        (data ["e" error]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
index 3bd33955f..5dabf7f2a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
@@ -1,6 +1,7 @@
 (.module:
   lux
-  (lux (control [monad #+ do])
+  (lux (control [library
+                 [monad #+ do]])
        (data [text]
              text/format
              (coll [list "list/" Functor<List>]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux
index 6361e3d09..bbdb06ba0 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" js (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" r (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
index ac0efe5ef..4682a593d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux (#- Location inc i64)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["n" nat]
-     ["i" int ("#\." interval)]
-     ["." i64]]]
-   ["@" target
-    ["_" r (#+ SVar Expression)]]]
+  [library
+   [lux (#- Location inc i64)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["n" nat]
+      ["i" int ("#\." interval)]
+      ["." i64]]]
+    ["@" target
+     ["_" r (#+ SVar Expression)]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux
index 5f4703836..1020cad97 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/r/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    [collection
-     ["." list]]]
-   [target
-    ["_" r (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     [collection
+      ["." list]]]
+    [target
+     ["_" r (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux
index cdcc5a134..8b2a907ca 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   ["@" target]
-   [data
-    [text
-     ["%" format (#+ format)]]]]
+  [library
+   [lux #*
+    ["@" target]
+    [data
+     [text
+      ["%" format (#+ format)]]]]]
   ["." //// #_
    ["." version]
    ["#." generation (#+ Context)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
index f1a4e3c1c..c891727e4 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [target
-    ["_" ruby]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [target
+     ["_" ruby]]]]
   ["." / #_
    [runtime (#+ Phase Phase!)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
index 2249874b5..3c080ba8a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [exception (#+ exception:)]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [target
-    ["_" ruby (#+ Expression LVar Statement)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [exception (#+ exception:)]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [target
+     ["_" ruby (#+ Expression LVar Statement)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator Phase! Generator!)]
    ["#." reference]
@@ -183,102 +184,150 @@
       ..restore!
       post!))
 
+(def: (primitive_pattern_matching recur pathP)
+  (-> (-> Path (Operation Statement))
+      (-> Path (Operation (Maybe Statement))))
+  (.case pathP
+    (#/////synthesis.Bit_Fork when thenP elseP)
+    (do {! ///////phase.monad}
+      [then! (recur thenP)
+       else! (.case elseP
+               (#.Some elseP)
+               (recur elseP)
+
+               #.None
+               (wrap ..fail!))]
+      (wrap (#.Some (.if when
+                      (_.if ..peek
+                        then!
+                        else!)
+                      (_.if ..peek
+                        else!
+                        then!)))))
+
+    (^template [<tag> <format>]
+      [(<tag> cons)
+       (do {! ///////phase.monad}
+         [clauses (monad.map ! (function (_ [match then])
+                                 (\ ! map
+                                    (|>> [(_.= (|> match <format>)
+                                               ..peek)])
+                                    (recur then)))
+                             (#.Cons cons))]
+         (wrap (#.Some (_.cond clauses
+                               ..fail!))))])
+    ([#/////synthesis.I64_Fork (<| //primitive.i64 .int)]
+     [#/////synthesis.F64_Fork (<| //primitive.f64)]
+     [#/////synthesis.Text_Fork (<| //primitive.text)])
+
+    _
+    (\ ///////phase.monad wrap #.None)))
+
 (def: (pattern_matching' in_closure? statement expression archive)
   (-> Bit (Generator! Path))
   (function (recur pathP)
-    (.case pathP
-      (#/////synthesis.Then bodyS)
-      (statement expression archive bodyS)
+    (do ///////phase.monad
+      [?output (primitive_pattern_matching recur pathP)]
+      (.case ?output
+        (#.Some output)
+        (wrap output)
+        
+        #.None
+        (.case pathP
+          (#/////synthesis.Then bodyS)
+          (statement expression archive bodyS)
+
+          #/////synthesis.Pop
+          (///////phase\wrap ..pop!)
 
-      #/////synthesis.Pop
-      (///////phase\wrap ..pop!)
+          (#/////synthesis.Bind register)
+          (///////phase\wrap (_.set (list (..register register)) ..peek))
 
-      (#/////synthesis.Bind register)
-      (///////phase\wrap (_.set (list (..register register)) ..peek))
+          (#/////synthesis.Bit_Fork when thenP elseP)
+          (do {! ///////phase.monad}
+            [then! (recur thenP)
+             else! (.case elseP
+                     (#.Some elseP)
+                     (recur elseP)
 
-      (#/////synthesis.Bit_Fork when thenP elseP)
-      (do {! ///////phase.monad}
-        [then! (recur thenP)
-         else! (.case elseP
-                 (#.Some elseP)
-                 (recur elseP)
+                     #.None
+                     (wrap ..fail!))]
+            (wrap (.if when
+                    (_.if ..peek
+                      then!
+                      else!)
+                    (_.if ..peek
+                      else!
+                      then!))))
 
-                 #.None
-                 (wrap ..fail!))]
-        (wrap (.if when
-                (_.if ..peek
-                  then!
-                  else!)
-                (_.if ..peek
-                  else!
-                  then!))))
+          (^template [<tag> <format>]
+            [(<tag> cons)
+             (do {! ///////phase.monad}
+               [clauses (monad.map ! (function (_ [match then])
+                                       (\ ! map
+                                          (|>> [(_.= (|> match <format>)
+                                                     ..peek)])
+                                          (recur then)))
+                                   (#.Cons cons))]
+               (wrap (_.cond clauses
+                             ..fail!)))])
+          ([#/////synthesis.I64_Fork (<| //primitive.i64 .int)]
+           [#/////synthesis.F64_Fork (<| //primitive.f64)]
+           [#/////synthesis.Text_Fork (<| //primitive.text)])
 
-      (^template [<tag> <format>]
-        [(<tag> cons)
-         (do {! ///////phase.monad}
-           [clauses (monad.map ! (function (_ [match then])
-                                   (\ ! map
-                                      (|>> [(_.= (|> match <format>)
-                                                 ..peek)])
-                                      (recur then)))
-                               (#.Cons cons))]
-           (wrap (_.cond clauses
-                         ..fail!)))])
-      ([#/////synthesis.I64_Fork (<| //primitive.i64 .int)]
-       [#/////synthesis.F64_Fork (<| //primitive.f64)]
-       [#/////synthesis.Text_Fork (<| //primitive.text)])
+          (^template [<complex> <simple> <choice>]
+            [(^ (<complex> idx))
+             (///////phase\wrap (<choice> false idx))
 
-      (^template [<complex> <simple> <choice>]
-        [(^ (<complex> idx))
-         (///////phase\wrap (<choice> false idx))
+             (^ (<simple> idx nextP))
+             (|> nextP
+                 recur
+                 (///////phase\map (_.then (<choice> true idx))))])
+          ([/////synthesis.side/left  /////synthesis.simple_left_side  ..left_choice]
+           [/////synthesis.side/right /////synthesis.simple_right_side ..right_choice])
 
-         (^ (<simple> idx nextP))
-         (|> nextP
-             recur
-             (///////phase\map (_.then (<choice> true idx))))])
-      ([/////synthesis.side/left  /////synthesis.simple_left_side  ..left_choice]
-       [/////synthesis.side/right /////synthesis.simple_right_side ..right_choice])
+          (^ (/////synthesis.member/left 0))
+          (///////phase\wrap (|> ..peek (_.nth (_.int +0)) ..push!))
+          
+          (^template [<pm> <getter>]
+            [(^ (<pm> lefts))
+             (///////phase\wrap (|> ..peek (<getter> (_.int (.int lefts))) ..push!))])
+          ([/////synthesis.member/left  //runtime.tuple//left]
+           [/////synthesis.member/right //runtime.tuple//right])
 
-      (^ (/////synthesis.member/left 0))
-      (///////phase\wrap (|> ..peek (_.nth (_.int +0)) ..push!))
-      
-      (^template [<pm> <getter>]
-        [(^ (<pm> lefts))
-         (///////phase\wrap (|> ..peek (<getter> (_.int (.int lefts))) ..push!))])
-      ([/////synthesis.member/left  //runtime.tuple//left]
-       [/////synthesis.member/right //runtime.tuple//right])
+          (^ (/////synthesis.!bind_top register thenP))
+          (do ///////phase.monad
+            [then! (recur thenP)]
+            (///////phase\wrap ($_ _.then
+                                   (_.set (list (..register register)) ..peek_and_pop)
+                                   then!)))
 
-      (^ (/////synthesis.!bind_top register thenP))
-      (do ///////phase.monad
-        [then! (recur thenP)]
-        (///////phase\wrap ($_ _.then
-                               (_.set (list (..register register)) ..peek_and_pop)
-                               then!)))
+          (^ (/////synthesis.!multi_pop nextP))
+          (.let [[extra_pops nextP'] (case.count_pops nextP)]
+            (do ///////phase.monad
+              [next! (recur nextP')]
+              (///////phase\wrap ($_ _.then
+                                     (..multi_pop! (n.+ 2 extra_pops))
+                                     next!))))
 
-      (^ (/////synthesis.!multi_pop nextP))
-      (.let [[extra_pops nextP'] (case.count_pops nextP)]
-        (do ///////phase.monad
-          [next! (recur nextP')]
-          (///////phase\wrap ($_ _.then
-                                 (..multi_pop! (n.+ 2 extra_pops))
-                                 next!))))
+          (^ (/////synthesis.path/seq preP postP))
+          (do ///////phase.monad
+            [pre! (recur preP)
+             post! (recur postP)]
+            (wrap ($_ _.then
+                      pre!
+                      post!)))
 
-      (^ (/////synthesis.path/seq preP postP))
-      (do ///////phase.monad
-        [pre! (recur preP)
-         post! (recur postP)]
-        (wrap ($_ _.then
-                  pre!
-                  post!)))
+          (^ (/////synthesis.path/alt preP postP))
+          (do ///////phase.monad
+            [pre! (recur preP)
+             post! (recur postP)
+             g!once (..gensym "once")
+             g!continue? (..gensym "continue")]
+            (wrap (..alternation in_closure? g!once g!continue? pre! post!)))
 
-      (^ (/////synthesis.path/alt preP postP))
-      (do ///////phase.monad
-        [pre! (recur preP)
-         post! (recur postP)
-         g!once (..gensym "once")
-         g!continue? (..gensym "continue")]
-        (wrap (..alternation in_closure? g!once g!continue? pre! post!)))
-      )))
+          _
+          (undefined))))))
 
 (def: (pattern_matching in_closure? statement expression archive pathP)
   (-> Bit (Generator! Path))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
index 535453f2e..af7906c9c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" ruby (#+ LVar GVar Expression Statement)]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" ruby (#+ LVar GVar Expression Statement)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Generator Phase! Generator!)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
index a2df0884a..c1639df6a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" ruby (#+ Expression LVar Statement)]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" ruby (#+ Expression LVar Statement)]]]]
   ["." // #_
    [runtime (#+ Operation Phase Generator Phase! Generator!)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux
index 59efdb9fb..0f01d2455 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- i64)
-   [target
-    ["_" ruby (#+ Literal)]]])
+  [library
+   [lux (#- i64)
+    [target
+     ["_" ruby (#+ Literal)]]]])
 
 (template [<type> <name> <implementation>]
   [(def: #export <name>
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux
index 1ea2cca00..a54e6da57 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" ruby (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" ruby (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
index 2eb8ec79c..2ce60a9a1 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- inc)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["." i64]]]
-   ["@" target
-    ["_" ruby (#+ Expression LVar Computation Literal Statement)]]]
+  [library
+   [lux (#- inc)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["." i64]]]
+    ["@" target
+     ["_" ruby (#+ Expression LVar Computation Literal Statement)]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux
index 0d96fe6df..c172b43b8 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [target
-    ["_" lua (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [target
+     ["_" ruby (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
index 1a36df4e0..98f7b88bb 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [target
-    ["_" scheme]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [target
+     ["_" scheme]]]]
   ["." / #_
    [runtime (#+ Phase)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
index 884e20c0f..99d115b9d 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- case let if)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["i" int]]]
-   [target
-    ["_" scheme (#+ Expression Computation Var)]]]
+  [library
+   [lux (#- case let if)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["i" int]]]
+    [target
+     ["_" scheme (#+ Expression Computation Var)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux
index 3bc0a0887..1880d7700 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   [//
    [runtime (#+ Bundle)]]
   [/
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
index f7f55e260..0275e8cd9 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["ex" exception (#+ exception:)]
-    [parser
-     ["s" code]]]
-   [data
-    ["." product]
-    ["." text]
-    [number (#+ hex)
-     ["f" frac]]
-    [collection
-     ["." list ("#\." functor)]
-     ["dict" dictionary (#+ Dictionary)]]]
-   ["." macro (#+ with-gensyms)
-    ["." code]
-    [syntax (#+ syntax:)]]
-   [target
-    ["_" scheme (#+ Expression Computation)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["ex" exception (#+ exception:)]
+     [parser
+      ["s" code]]]
+    [data
+     ["." product]
+     ["." text]
+     [number (#+ hex)
+      ["f" frac]]
+     [collection
+      ["." list ("#\." functor)]
+      ["dict" dictionary (#+ Dictionary)]]]
+    ["." macro (#+ with-gensyms)
+     ["." code]
+     [syntax (#+ syntax:)]]
+    [target
+     ["_" scheme (#+ Expression Computation)]]]]
   ["." /// #_
    ["#." runtime (#+ Operation Phase Handler Bundle)]
    ["#//" ///
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
index 65c674ded..b12ddcde3 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- function)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    pipe]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [target
-    ["_" scheme (#+ Expression Computation Var)]]]
+  [library
+   [lux (#- function)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     pipe]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [target
+     ["_" scheme (#+ Expression Computation Var)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." reference]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
index d4b964910..23718bfc5 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Scope)
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    ["_" scheme]]]
+  [library
+   [lux (#- Scope)
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     ["_" scheme]]]]
   ["." // #_
    [runtime (#+ Operation Phase Generator)]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux
index 4bfa67161..a7c2b81b6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux (#- i64)
-   [target
-    ["_" scheme (#+ Expression)]]])
+  [library
+   [lux (#- i64)
+    [target
+     ["_" scheme (#+ Expression)]]]])
 
 (template [<name> <type> <code>]
   [(def: #export <name>
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux
index f24134d9f..19d46ba19 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [target
-    ["_" scheme (#+ Expression)]]]
+  [library
+   [lux #*
+    [target
+     ["_" scheme (#+ Expression)]]]]
   [///
    [reference (#+ System)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
index 7f55df9a9..ec3def7fd 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- Location inc)
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    ["." product]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." row]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number (#+ hex)
-     ["." i64]]]
-   ["@" target
-    ["_" scheme (#+ Expression Computation Var)]]]
+  [library
+   [lux (#- Location inc)
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     ["." product]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." row]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number (#+ hex)
+      ["." i64]]]
+    ["@" target
+     ["_" scheme (#+ Expression Computation Var)]]]]
   ["." /// #_
    ["#." reference]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux
index 951fa494d..50a8357f7 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    [collection
-     ["." list]]]
-   [target
-    ["_" scheme (#+ Expression)]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     [collection
+      ["." list]]]
+    [target
+     ["_" scheme (#+ Expression)]]]]
   ["." // #_
    ["#." runtime (#+ Operation Phase Generator)]
    ["#." primitive]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
index 615e7a722..47260c0fc 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- primitive)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]]
-   [data
-    ["." maybe]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]]
+  [library
+   [lux (#- primitive)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]]
+    [data
+     ["." maybe]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]]]
   ["." / #_
    ["#." function]
    ["#." case]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index 4d847ec2e..02938eb7a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ when> new> case>)]]
-   [data
-    ["." product]
-    ["." bit ("#\." equivalence)]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list ("#\." functor fold monoid)]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["n" nat]
-     ["." i64]
-     ["." frac ("#\." equivalence)]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ when> new> case>)]]
+    [data
+     ["." product]
+     ["." bit ("#\." equivalence)]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list ("#\." functor fold monoid)]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["n" nat]
+      ["." i64]
+      ["." frac ("#\." equivalence)]]]]]
   ["." /// #_
    [//
     ["#." analysis (#+ Pattern Match Analysis)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index d3558e9c4..2b0319266 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]
-    ["." enum]]
-   [control
-    [pipe (#+ case>)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor monoid fold)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]
+     ["." enum]]
+    [control
+     [pipe (#+ case>)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor monoid fold)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." // #_
    ["#." loop (#+ Transform)]
    ["//#" /// #_
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
index e0fbf816c..ed5381e02 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [data
-    ["." maybe ("#\." monad)]
-    [collection
-     ["." list]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [data
+     ["." maybe ("#\." monad)]
+     [collection
+      ["." list]]]
+    [math
+     [number
+      ["n" nat]]]]]
   [////
    ["." analysis (#+ Environment)]
    ["/" synthesis (#+ Path Abstraction Synthesis)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
index 68e12745d..07e7a54b9 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format]]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." functor fold)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format]]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." functor fold)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]]]]]
   [////
    ["/" synthesis (#+ Path Synthesis)]
    ["." analysis]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/program.lux b/stdlib/source/library/lux/tool/compiler/language/lux/program.lux
index fc384c178..f33831904 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/program.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/program.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- Module)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." maybe]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]]
+  [library
+   [lux (#- Module)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." maybe]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]]]
   [//
    [generation (#+ Context)]
    [///
diff --git a/stdlib/source/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
index 00d1497a1..e41cd0f79 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/syntax.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
@@ -25,29 +25,30 @@
 ## [file-name, line, column] to keep track of their provenance and
 ## location, which is helpful for documentation and debugging.
 (.module:
-  [lux #*
-   ["@" target]
-   [abstract
-    monad]
-   [control
-    ["." exception (#+ exception:)]
-    [parser
-     [text (#+ Offset)]]]
-   [data
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]
-     ["." dictionary (#+ Dictionary)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]
-     ["." int]
-     ["." rev]
-     ["." frac]]]])
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     monad]
+    [control
+     ["." exception (#+ exception:)]
+     [parser
+      [text (#+ Offset)]]]
+    [data
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]
+      ["." dictionary (#+ Dictionary)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]
+      ["." int]
+      ["." rev]
+      ["." frac]]]]])
 
 (template: (inline: <declaration> <type> <body>)
   (for {@.python (def: <declaration> <type> <body>)}
@@ -104,7 +105,8 @@
   Aliases
   (dictionary.new text.hash))
 
-(def: #export prelude "lux")
+(def: #export prelude
+  .prelude_module)
 
 (def: #export text_delimiter text.double_quote)
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
index 0b2086f25..cec608916 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux (#- i64 Scope)
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [control
-    [pipe (#+ case>)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." sum]
-    ["." product]
-    ["." maybe]
-    ["." bit ("#\." equivalence)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ Format format)]]
-    [collection
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    [number
-     ["." i64]
-     ["n" nat]
-     ["i" int]
-     ["f" frac]]]]
+  [library
+   [lux (#- i64 Scope)
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [control
+     [pipe (#+ case>)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." sum]
+     ["." product]
+     ["." maybe]
+     ["." bit ("#\." equivalence)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ Format format)]]
+     [collection
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     [number
+      ["." i64]
+      ["n" nat]
+      ["i" int]
+      ["f" frac]]]]]
   [//
    ["." analysis (#+ Environment Composite Analysis)]
    [phase
diff --git a/stdlib/source/lux/tool/compiler/language/lux/version.lux b/stdlib/source/library/lux/tool/compiler/language/lux/version.lux
index 53b3424ae..dd3676068 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/version.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/version.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [////
    [version (#+ Version)]])
 
diff --git a/stdlib/source/lux/tool/compiler/meta.lux b/stdlib/source/library/lux/tool/compiler/meta.lux
index df3eb31a7..23cacb4aa 100644
--- a/stdlib/source/lux/tool/compiler/meta.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [//
    [version (#+ Version)]])
 
diff --git a/stdlib/source/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
index 09b501ef3..d04f1227f 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux (#- Module)
-   [abstract
-    ["." equivalence (#+ Equivalence)]
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." function]
-    ["<>" parser
-     ["<b>" binary (#+ Parser)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." name]
-    ["." text
-     ["%" format (#+ format)]]
-    [format
-     ["." binary (#+ Writer)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]
-     ["." set]
-     ["." row (#+ Row)]]]
-   [math
-    [number
-     ["n" nat ("#\." equivalence)]]]
-   [type
-    abstract]]
+  [library
+   [lux (#- Module)
+    [abstract
+     ["." equivalence (#+ Equivalence)]
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." function]
+     ["<>" parser
+      ["<b>" binary (#+ Parser)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." name]
+     ["." text
+      ["%" format (#+ format)]]
+     [format
+      ["." binary (#+ Writer)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." dictionary (#+ Dictionary)]
+      ["." set]
+      ["." row (#+ Row)]]]
+    [math
+     [number
+      ["n" nat ("#\." equivalence)]]]
+    [type
+     abstract]]]
   [/
    ["." artifact]
    ["." signature (#+ Signature)]
diff --git a/stdlib/source/lux/tool/compiler/meta/archive/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux
index 5592df470..33e09e51a 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive/artifact.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<b>" binary (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]
-     ["." row (#+ Row) ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]]
-    [format
-     ["." binary (#+ Writer)]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<b>" binary (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]
+      ["." row (#+ Row) ("#\." functor fold)]
+      ["." dictionary (#+ Dictionary)]]
+     [format
+      ["." binary (#+ Writer)]]]
+    [type
+     abstract]]])
 
 (type: #export ID
   Nat)
diff --git a/stdlib/source/lux/tool/compiler/meta/archive/descriptor.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/descriptor.lux
index a31f6e793..2c602ac89 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive/descriptor.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/descriptor.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Module)
-   [control
-    ["<>" parser
-     ["<b>" binary (#+ Parser)]]]
-   [data
-    ["." text]
-    [collection
-     [set (#+ Set)]]
-    [format
-     ["." binary (#+ Writer)]]]
-   [world
-    [file (#+ Path)]]]
+  [library
+   [lux (#- Module)
+    [control
+     ["<>" parser
+      ["<b>" binary (#+ Parser)]]]
+    [data
+     ["." text]
+     [collection
+      [set (#+ Set)]]
+     [format
+      ["." binary (#+ Writer)]]]
+    [world
+     [file (#+ Path)]]]]
   [//
    ["." artifact (#+ Registry)]])
 
diff --git a/stdlib/source/lux/tool/compiler/meta/archive/document.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/document.lux
index b60d77246..ea5ce1006 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive/document.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/document.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux (#- Module)
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     [binary (#+ Parser)]]]
-   [data
-    [collection
-     ["." dictionary (#+ Dictionary)]]
-    [format
-     ["." binary (#+ Writer)]]]
-   [type (#+ :share)
-    abstract]]
+  [library
+   [lux (#- Module)
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      [binary (#+ Parser)]]]
+    [data
+     [collection
+      ["." dictionary (#+ Dictionary)]]
+     [format
+      ["." binary (#+ Writer)]]]
+    [type (#+ :share)
+     abstract]]]
   [//
    ["." signature (#+ Signature)]
    ["." key (#+ Key)]
diff --git a/stdlib/source/lux/tool/compiler/meta/archive/key.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
index 1f30e105b..ec6439aa7 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive/key.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [type
+     abstract]]]
   [//
    [signature (#+ Signature)]])
 
diff --git a/stdlib/source/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux
index 8956f99ec..e39bb2144 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [control
-    ["<>" parser
-     ["<b>" binary (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." name]
-    ["." text
-     ["%" format (#+ format)]]
-    [format
-     ["." binary (#+ Writer)]]]
-   [math
-    [number
-     ["." nat]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [control
+     ["<>" parser
+      ["<b>" binary (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." name]
+     ["." text
+      ["%" format (#+ format)]]
+     [format
+      ["." binary (#+ Writer)]]]
+    [math
+     [number
+      ["." nat]]]]]
   [////
    [version (#+ Version)]])
 
diff --git a/stdlib/source/lux/tool/compiler/meta/cache/dependency.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux
index 2a9389235..3ba514b5f 100644
--- a/stdlib/source/lux/tool/compiler/meta/cache/dependency.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux (#- Module)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." state]
-    ["." function
-     ["." memo (#+ Memo)]]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]
-     ["." set (#+ Set)]]]]
+  [library
+   [lux (#- Module)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." state]
+     ["." function
+      ["." memo (#+ Memo)]]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." dictionary (#+ Dictionary)]
+      ["." set (#+ Set)]]]]]
   [///
    ["." archive (#+ Output Archive)
     [key (#+ Key)]
diff --git a/stdlib/source/lux/tool/compiler/meta/io.lux b/stdlib/source/library/lux/tool/compiler/meta/io.lux
index 6bafa0a79..fe11727b7 100644
--- a/stdlib/source/lux/tool/compiler/meta/io.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux (#- Code)
-   [data
-    ["." text]]
-   [world
-    [file (#+ Path System)]]])
+  [library
+   [lux (#- Code)
+    [data
+     ["." text]]
+    [world
+     [file (#+ Path System)]]]])
 
 (type: #export Context
   Path)
diff --git a/stdlib/source/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
index 1ff603267..b5ed4b84b 100644
--- a/stdlib/source/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux (#- Module)
-   [target (#+ Target)]
-   [abstract
-    [predicate (#+ Predicate)]
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]
-    ["<>" parser
-     ["<.>" binary (#+ Parser)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]
-     ["." row (#+ Row)]
-     ["." set]]]
-   [math
-    [number
-     ["n" nat]]]
-   [world
-    ["." file]]]
+  [library
+   [lux (#- Module)
+    [target (#+ Target)]
+    [abstract
+     [predicate (#+ Predicate)]
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]
+     ["<>" parser
+      ["<.>" binary (#+ Parser)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." dictionary (#+ Dictionary)]
+      ["." row (#+ Row)]
+      ["." set]]]
+    [math
+     [number
+      ["n" nat]]]
+    [world
+     ["." file]]]]
   [program
    [compositor
     [import (#+ Import)]
diff --git a/stdlib/source/lux/tool/compiler/meta/io/context.lux b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
index f31b4e1b2..6e619d93d 100644
--- a/stdlib/source/lux/tool/compiler/meta/io/context.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux (#- Module Code)
-   ["@" target]
-   [abstract
-    [predicate (#+ Predicate)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]]
-   [data
-    [binary (#+ Binary)]
-    ["." text ("#\." hash)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." dictionary (#+ Dictionary)]]]
-   [world
-    ["." file]]]
+  [library
+   [lux (#- Module Code)
+    ["@" target]
+    [abstract
+     [predicate (#+ Predicate)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]]
+    [data
+     [binary (#+ Binary)]
+     ["." text ("#\." hash)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." dictionary (#+ Dictionary)]]]
+    [world
+     ["." file]]]]
   [program
    [compositor
     [import (#+ Import)]]]
diff --git a/stdlib/source/lux/tool/compiler/meta/packager.lux b/stdlib/source/library/lux/tool/compiler/meta/packager.lux
index fff07d28f..621045e33 100644
--- a/stdlib/source/lux/tool/compiler/meta/packager.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ Monad)]]
-   [control
-    [try (#+ Try)]]
-   [data
-    [binary (#+ Binary)]
-    [collection
-     ["." row]
-     ["." list ("#\." functor)]]]
-   [world
-    ["." file (#+ Path)]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ Monad)]]
+    [control
+     [try (#+ Try)]]
+    [data
+     [binary (#+ Binary)]
+     [collection
+      ["." row]
+      ["." list ("#\." functor)]]]
+    [world
+     ["." file (#+ Path)]]]]
   [program
    [compositor
     [static (#+ Static)]]]
diff --git a/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
index a89bdc836..f5366ab8e 100644
--- a/stdlib/source/lux/tool/compiler/meta/packager/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux (#- Module Definition)
-   [type (#+ :share)]
-   ["." ffi (#+ import: do_to)]
-   [abstract
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." binary (#+ Binary)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." row (#+ Row) ("#\." fold)]
-     ["." list ("#\." functor fold)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    [jvm
-     [encoding
-      ["." name]]]]]
+  [library
+   [lux (#- Module Definition)
+    [type (#+ :share)]
+    ["." ffi (#+ import: do_to)]
+    [abstract
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." binary (#+ Binary)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." row (#+ Row) ("#\." fold)]
+      ["." list ("#\." functor fold)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     [jvm
+      [encoding
+       ["." name]]]]]]
   [program
    [compositor
     ["." static (#+ Static)]]]
diff --git a/stdlib/source/lux/tool/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux
index ac35684ed..bcd06b6fd 100644
--- a/stdlib/source/lux/tool/compiler/meta/packager/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux (#- Module)
-   [type (#+ :share)]
-   [abstract
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]
-     ["." encoding]]
-    [collection
-     ["." row]
-     ["." list ("#\." functor fold)]
-     ["." dictionary (#+ Dictionary)]
-     ["." set]]
-    [format
-     ["." tar]
-     ["." binary]]]
-   [target
-    ["_" scheme]]
-   [time
-    ["." instant (#+ Instant)]]
-   [world
-    ["." file]]]
+  [library
+   [lux (#- Module)
+    [type (#+ :share)]
+    [abstract
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]
+      ["." encoding]]
+     [collection
+      ["." row]
+      ["." list ("#\." functor fold)]
+      ["." dictionary (#+ Dictionary)]
+      ["." set]]
+     [format
+      ["." tar]
+      ["." binary]]]
+    [target
+     ["_" scheme]]
+    [time
+     ["." instant (#+ Instant)]]
+    [world
+     ["." file]]]]
   [program
    [compositor
     ["." static (#+ Static)]]]
diff --git a/stdlib/source/lux/tool/compiler/meta/packager/script.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
index 98a011a4c..ac2b5758c 100644
--- a/stdlib/source/lux/tool/compiler/meta/packager/script.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [type (#+ :share)]
-   [abstract
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    [text
-     ["%" format (#+ format)]
-     [encoding 
-      ["." utf8]]]
-    [collection
-     ["." row]
-     ["." list ("#\." functor)]]]]
+  [library
+   [lux #*
+    [type (#+ :share)]
+    [abstract
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     [text
+      ["%" format (#+ format)]
+      [encoding 
+       ["." utf8]]]
+     [collection
+      ["." row]
+      ["." list ("#\." functor)]]]]]
   [program
    [compositor
     ["." static (#+ Static)]]]
diff --git a/stdlib/source/lux/tool/compiler/phase.lux b/stdlib/source/library/lux/tool/compiler/phase.lux
index 0d6543c33..d69098f92 100644
--- a/stdlib/source/lux/tool/compiler/phase.lux
+++ b/stdlib/source/library/lux/tool/compiler/phase.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["." debug]
-   [abstract
-    [monad (#+ Monad do)]]
-   [control
-    ["." state]
-    ["." try (#+ Try) ("#\." functor)]
-    ["ex" exception (#+ Exception exception:)]
-    ["." io]
-    [parser
-     ["s" code]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]]
-   [time
-    ["." instant]
-    ["." duration]]
-   [macro
-    [syntax (#+ syntax:)]]]
+  [library
+   [lux #*
+    ["." debug]
+    [abstract
+     [monad (#+ Monad do)]]
+    [control
+     ["." state]
+     ["." try (#+ Try) ("#\." functor)]
+     ["ex" exception (#+ Exception exception:)]
+     ["." io]
+     [parser
+      ["s" code]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]]
+    [time
+     ["." instant]
+     ["." duration]]
+    [macro
+     [syntax (#+ syntax:)]]]]
   [//
    [meta
     [archive (#+ Archive)]]])
diff --git a/stdlib/source/lux/tool/compiler/reference.lux b/stdlib/source/library/lux/tool/compiler/reference.lux
index 98a1f0c07..8823b29e2 100644
--- a/stdlib/source/lux/tool/compiler/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/reference.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [control
-    [pipe (#+ case>)]]
-   [data
-    ["." name]
-    [text
-     ["%" format (#+ Format)]]]
-   [math
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [control
+     [pipe (#+ case>)]]
+    [data
+     ["." name]
+     [text
+      ["%" format (#+ Format)]]]
+    [math
+     [number
+      ["n" nat]]]]]
   ["." / #_
    ["#." variable (#+ Variable)]])
 
diff --git a/stdlib/source/lux/tool/compiler/reference/variable.lux b/stdlib/source/library/lux/tool/compiler/reference/variable.lux
index 84aea58ab..a8ce4c049 100644
--- a/stdlib/source/lux/tool/compiler/reference/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/reference/variable.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [control
-    [pipe (#+ case>)]]
-   [data
-    [text
-     ["%" format (#+ Format)]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [control
+     [pipe (#+ case>)]]
+    [data
+     [text
+      ["%" format (#+ Format)]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]]])
 
 (type: #export Register
   Nat)
diff --git a/stdlib/source/lux/tool/compiler/version.lux b/stdlib/source/library/lux/tool/compiler/version.lux
index d29428636..733b86477 100644
--- a/stdlib/source/lux/tool/compiler/version.lux
+++ b/stdlib/source/library/lux/tool/compiler/version.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [data
-    [text
-     ["%" format]]]
-   [math
-    [number
-     ["n" nat]]]])
+  [library
+   [lux #*
+    [data
+     [text
+      ["%" format]]]
+    [math
+     [number
+      ["n" nat]]]]])
 
 (type: #export Version
   Nat)
diff --git a/stdlib/source/lux/tool/interpreter.lux b/stdlib/source/library/lux/tool/interpreter.lux
index e18a27c47..df48eb420 100644
--- a/stdlib/source/lux/tool/interpreter.lux
+++ b/stdlib/source/library/lux/tool/interpreter.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux #*
-   [control
-    [monad (#+ Monad do)]
-    ["." try (#+ Try)]
-    ["ex" exception (#+ exception:)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [type (#+ :share)
-    ["." check]]
-   [compiler
-    ["." phase
-     ["." analysis
-      ["." module]
-      ["." type]]
-     ["." generation]
-     ["." directive (#+ State+ Operation)
-      ["." total]]
-     ["." extension]]
-    ["." default
-     ["." syntax]
-     ["." platform (#+ Platform)]
-     ["." init]]
-    ["." cli (#+ Configuration)]]
-   [world
-    ["." file (#+ File)]
-    ["." console (#+ Console)]]]
+  [library
+   [lux #*
+    [control
+     [monad (#+ Monad do)]
+     ["." try (#+ Try)]
+     ["ex" exception (#+ exception:)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [type (#+ :share)
+     ["." check]]
+    [compiler
+     ["." phase
+      ["." analysis
+       ["." module]
+       ["." type]]
+      ["." generation]
+      ["." directive (#+ State+ Operation)
+       ["." total]]
+      ["." extension]]
+     ["." default
+      ["." syntax]
+      ["." platform (#+ Platform)]
+      ["." init]]
+     ["." cli (#+ Configuration)]]
+    [world
+     ["." file (#+ File)]
+     ["." console (#+ Console)]]]]
   ["." /type])
 
 (exception: #export (error {message Text})
diff --git a/stdlib/source/lux/tool/mediator.lux b/stdlib/source/library/lux/tool/mediator.lux
index 5beb217e0..b24309ef1 100644
--- a/stdlib/source/lux/tool/mediator.lux
+++ b/stdlib/source/library/lux/tool/mediator.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux (#- Source Module)
-   [world
-    ["." binary (#+ Binary)]
-    ["." file (#+ File)]]]
+  [library
+   [lux (#- Source Module)
+    [world
+     ["." binary (#+ Binary)]
+     ["." file (#+ File)]]]]
   [//
    [compiler (#+ Compiler)
     [meta
diff --git a/stdlib/source/lux/type.lux b/stdlib/source/library/lux/type.lux
index af6048ac9..751645cc4 100644
--- a/stdlib/source/lux/type.lux
+++ b/stdlib/source/library/lux/type.lux
@@ -1,30 +1,31 @@
 (.module: {#.doc "Basic functionality for working with types."}
-  [lux (#- function)
-   ["@" target]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ Monad do)]]
-   [control
-    ["." function]
-    ["." exception (#+ exception:)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." monoid equivalence)]
-    ["." name ("#\." equivalence codec)]
-    [collection
-     ["." array]
-     ["." list ("#\." functor monoid fold)]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]]]
-   ["." meta
-    ["." location]]])
+  [library
+   [lux (#- function)
+    ["@" target]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ Monad do)]]
+    [control
+     ["." function]
+     ["." exception (#+ exception:)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." monoid equivalence)]
+     ["." name ("#\." equivalence codec)]
+     [collection
+      ["." array]
+      ["." list ("#\." functor monoid fold)]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]]]
+    ["." meta
+     ["." location]]]])
 
 (template [<name> <tag>]
   [(def: #export (<name> type)
diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/library/lux/type/abstract.lux
index c3121d7ff..0bd4a505a 100644
--- a/stdlib/source/lux/type/abstract.lux
+++ b/stdlib/source/library/lux/type/abstract.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [type (#+ :cast)]
-   ["." meta]
-   [abstract
-    [monad (#+ Monad do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["<>" parser ("#\." monad)
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." name ("#\." codec)]
-    ["." text ("#\." equivalence monoid)]
-    [collection
-     ["." list ("#\." functor monoid)]]]
-   [macro
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" export]
-     ["|.|" annotations]]]])
+  [library
+   [lux #*
+    [type (#+ :cast)]
+    ["." meta]
+    [abstract
+     [monad (#+ Monad do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["<>" parser ("#\." monad)
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." name ("#\." codec)]
+     ["." text ("#\." equivalence monoid)]
+     [collection
+      ["." list ("#\." functor monoid)]]]
+    [macro
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" export]
+      ["|.|" annotations]]]]])
 
 (type: Stack List)
 
diff --git a/stdlib/source/lux/type/check.lux b/stdlib/source/library/lux/type/check.lux
index 3882591e5..a8b447338 100644
--- a/stdlib/source/lux/type/check.lux
+++ b/stdlib/source/library/lux/type/check.lux
@@ -1,23 +1,24 @@
 (.module: {#.doc "Type-checking functionality."}
-  [lux #*
-   ["@" target]
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ Exception exception:)]]
-   [data
-    ["." maybe]
-    ["." product]
-    ["." text ("#\." monoid equivalence)]
-    [collection
-     ["." list]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["n" nat ("#\." decimal)]]]]
+  [library
+   [lux #*
+    ["@" target]
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ Exception exception:)]]
+    [data
+     ["." maybe]
+     ["." product]
+     ["." text ("#\." monoid equivalence)]
+     [collection
+      ["." list]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["n" nat ("#\." decimal)]]]]]
   ["." // ("#\." equivalence)])
 
 (template: (!n\= reference subject)
diff --git a/stdlib/source/lux/type/dynamic.lux b/stdlib/source/library/lux/type/dynamic.lux
index 754e682f2..b5a6e7fc0 100644
--- a/stdlib/source/lux/type/dynamic.lux
+++ b/stdlib/source/library/lux/type/dynamic.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["." debug]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format]]]
-   [macro (#+ with_gensyms)
-    ["." syntax (#+ syntax:)]]
-   ["." type
-    abstract]])
+  [library
+   [lux #*
+    ["." debug]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format]]]
+    [macro (#+ with_gensyms)
+     ["." syntax (#+ syntax:)]]
+    ["." type
+     abstract]]])
 
 (exception: #export (wrong_type {expected Type} {actual Type})
   (exception.report
diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/library/lux/type/implicit.lux
index 14f2ac441..a308b99a8 100644
--- a/stdlib/source/lux/type/implicit.lux
+++ b/stdlib/source/library/lux/type/implicit.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ Monad do)]
-    ["eq" equivalence]]
-   [control
-    ["." try]
-    ["p" parser
-     ["s" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monad fold)]
-     ["." dictionary (#+ Dictionary)]]]
-   ["." macro
-    ["." code]
-    [syntax (#+ syntax:)]]
-   [math
-    ["." number
-     ["n" nat]]]
-   ["." meta
-    ["." annotation]]
-   ["." type
-    ["." check (#+ Check)]]])
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ Monad do)]
+     ["eq" equivalence]]
+    [control
+     ["." try]
+     ["p" parser
+      ["s" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monad fold)]
+      ["." dictionary (#+ Dictionary)]]]
+    ["." macro
+     ["." code]
+     [syntax (#+ syntax:)]]
+    [math
+     ["." number
+      ["n" nat]]]
+    ["." meta
+     ["." annotation]]
+    ["." type
+     ["." check (#+ Check)]]]])
 
 (def: (find_type_var id env)
   (-> Nat Type_Context (Meta Type))
diff --git a/stdlib/source/lux/type/quotient.lux b/stdlib/source/library/lux/type/quotient.lux
index dd47b6bf3..b872e6ff1 100644
--- a/stdlib/source/lux/type/quotient.lux
+++ b/stdlib/source/library/lux/type/quotient.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux (#- type)
-   [abstract
-    [equivalence (#+ Equivalence)]]
-   [macro (#+ with_gensyms)
-    [syntax (#+ syntax:)]]
-   ["." type
-    abstract]])
+  [library
+   [lux (#- type)
+    [abstract
+     [equivalence (#+ Equivalence)]]
+    [macro (#+ with_gensyms)
+     [syntax (#+ syntax:)]]
+    ["." type
+     abstract]]])
 
 (abstract: #export (Class t c %)
   (-> t c)
diff --git a/stdlib/source/lux/type/refinement.lux b/stdlib/source/library/lux/type/refinement.lux
index 5bbc90149..a3e49104d 100644
--- a/stdlib/source/lux/type/refinement.lux
+++ b/stdlib/source/library/lux/type/refinement.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux (#- type)
-   [abstract
-    [predicate (#+ Predicate)]]
-   ["." macro
-    [syntax (#+ syntax:)]]
-   ["." type
-    abstract]])
+  [library
+   [lux (#- type)
+    [abstract
+     [predicate (#+ Predicate)]]
+    ["." macro
+     [syntax (#+ syntax:)]]
+    ["." type
+     abstract]]])
 
 (abstract: #export (Refined t %)
   {#value t
diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/library/lux/type/resource.lux
index acad33a71..5a2b79c1d 100644
--- a/stdlib/source/lux/type/resource.lux
+++ b/stdlib/source/library/lux/type/resource.lux
@@ -1,33 +1,34 @@
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    ["." monad (#+ Monad do)
-     [indexed (#+ IxMonad)]]]
-   [control
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO)]
-    [concurrency
-     ["." promise (#+ Promise)]]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." identity (#+ Identity)]
-    ["." maybe]
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." set]
-     ["." row (#+ Row)]
-     ["." list ("#\." functor fold)]]]
-   ["." macro
-    [syntax (#+ syntax:)]]
-   [math
-    [number
-     ["n" nat]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     ["." monad (#+ Monad do)
+      [indexed (#+ IxMonad)]]]
+    [control
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO)]
+     [concurrency
+      ["." promise (#+ Promise)]]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." identity (#+ Identity)]
+     ["." maybe]
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." set]
+      ["." row (#+ Row)]
+      ["." list ("#\." functor fold)]]]
+    ["." macro
+     [syntax (#+ syntax:)]]
+    [math
+     [number
+      ["n" nat]]]
+    [type
+     abstract]]])
 
 (type: #export (Procedure monad input output value)
   (-> input (monad [output value])))
diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/library/lux/type/unit.lux
index ff0dfa645..ccdb34d46 100644
--- a/stdlib/source/lux/type/unit.lux
+++ b/stdlib/source/library/lux/type/unit.lux
@@ -1,30 +1,30 @@
-## TODO: Write tests ASAP.
 (.module:
-  [lux #*
-   ["." meta]
-   [abstract
-    [monad (#+ Monad do)]
-    [equivalence (#+ Equivalence)]
-    [order (#+ Order)]
-    [enum (#+ Enum)]]
-   [control
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [macro
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" export]
-     ["|.|" annotations]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]
-     ["." ratio (#+ Ratio)]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    ["." meta]
+    [abstract
+     [monad (#+ Monad do)]
+     [equivalence (#+ Equivalence)]
+     [order (#+ Order)]
+     [enum (#+ Enum)]]
+    [control
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [macro
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" export]
+      ["|.|" annotations]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]
+      ["." ratio (#+ Ratio)]]]
+    [type
+     abstract]]])
 
 (abstract: #export (Qty unit)
   Int
diff --git a/stdlib/source/lux/type/variance.lux b/stdlib/source/library/lux/type/variance.lux
index 863824e59..406717046 100644
--- a/stdlib/source/lux/type/variance.lux
+++ b/stdlib/source/library/lux/type/variance.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*])
+  [library
+   [lux #*]])
 
 (type: #export (Co t)
   (-> Any t))
diff --git a/stdlib/source/lux/world/console.lux b/stdlib/source/library/lux/world/console.lux
index 93842b99a..41652fdd7 100644
--- a/stdlib/source/lux/world/console.lux
+++ b/stdlib/source/library/lux/world/console.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [ffi (#+ import:)]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]
-    [concurrency
-     ["." promise (#+ Promise)]
-     ["." atom]]]
-   [data
-    ["." text (#+ Char)
-     ["%" format (#+ format)]]]])
+  [library
+   [lux #*
+    [ffi (#+ import:)]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]
+     [concurrency
+      ["." promise (#+ Promise)]
+      ["." atom]]]
+    [data
+     ["." text (#+ Char)
+      ["%" format (#+ format)]]]]])
 
 (template [<name>]
   [(exception: #export (<name>)
diff --git a/stdlib/source/lux/world/db/jdbc.lux b/stdlib/source/library/lux/world/db/jdbc.lux
index 3dba77a8e..5ef233daf 100644
--- a/stdlib/source/lux/world/db/jdbc.lux
+++ b/stdlib/source/library/lux/world/db/jdbc.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux (#- and int)
-   [control
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]
-    ["." try (#+ Try)]
-    ["ex" exception]
-    [concurrency
-     ["." promise (#+ Promise) ("#\." monad)]]
-    [security
-     ["!" capability (#+ capability:)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]]
-   ["." io (#+ IO)]
-   [world
-    [net (#+ URL)]]
-   [host (#+ import:)]]
+  [library
+   [lux (#- and int)
+    [control
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]
+     ["." try (#+ Try)]
+     ["ex" exception]
+     [concurrency
+      ["." promise (#+ Promise) ("#\." monad)]]
+     [security
+      ["!" capability (#+ capability:)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]]
+    ["." io (#+ IO)]
+    [world
+     [net (#+ URL)]]
+    [host (#+ import:)]]]
   [//
    ["." sql]]
   ["." / #_
diff --git a/stdlib/source/lux/world/db/jdbc/input.lux b/stdlib/source/library/lux/world/db/jdbc/input.lux
index 19f9e7422..9c3de1238 100644
--- a/stdlib/source/lux/world/db/jdbc/input.lux
+++ b/stdlib/source/library/lux/world/db/jdbc/input.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- and int)
-   [ffi (#+ import:)]
-   [control
-    [functor (#+ Contravariant)]
-    [monad (#+ Monad do)]
-    ["." try (#+ Try)]]
-   [time
-    ["." instant (#+ Instant)]]
-   ["." io (#+ IO)]
-   [world
-    [binary (#+ Binary)]]])
+  [library
+   [lux (#- and int)
+    [ffi (#+ import:)]
+    [control
+     [functor (#+ Contravariant)]
+     [monad (#+ Monad do)]
+     ["." try (#+ Try)]]
+    [time
+     ["." instant (#+ Instant)]]
+    ["." io (#+ IO)]
+    [world
+     [binary (#+ Binary)]]]])
 
 (import: java/lang/String)
 
diff --git a/stdlib/source/lux/world/db/jdbc/output.lux b/stdlib/source/library/lux/world/db/jdbc/output.lux
index 4639a5255..b172a1ac9 100644
--- a/stdlib/source/lux/world/db/jdbc/output.lux
+++ b/stdlib/source/library/lux/world/db/jdbc/output.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- and int)
-   [ffi (#+ import:)]
-   [control
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]
-    ["ex" exception]
-    ["." try (#+ Try)]]
-   [time
-    ["." instant (#+ Instant)]]
-   ["." io (#+ IO)]
-   [world
-    [binary (#+ Binary)]]])
+  [library
+   [lux (#- and int)
+    [ffi (#+ import:)]
+    [control
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]
+     ["ex" exception]
+     ["." try (#+ Try)]]
+    [time
+     ["." instant (#+ Instant)]]
+    ["." io (#+ IO)]
+    [world
+     [binary (#+ Binary)]]]])
 
 (import: java/lang/String)
 
diff --git a/stdlib/source/lux/world/db/sql.lux b/stdlib/source/library/lux/world/db/sql.lux
index 4c9bce9b2..99f3f027d 100644
--- a/stdlib/source/lux/world/db/sql.lux
+++ b/stdlib/source/library/lux/world/db/sql.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux (#- Source Definition function and or not type is? int)
-   [control
-    [monad (#+ do)]]
-   [data
-    [number
-     ["i" int]]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [type
-    abstract]])
+  [library
+   [lux (#- Source Definition function and or not type is? int)
+    [control
+     [monad (#+ do)]]
+    [data
+     [number
+      ["i" int]]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [type
+     abstract]]])
 
 (def: parenthesize
   (-> Text Text)
diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux
index fade9ad67..7f95b3282 100644
--- a/stdlib/source/lux/world/file.lux
+++ b/stdlib/source/library/lux/world/file.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["." ffi]
-   [abstract
-    ["." monad (#+ Monad do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try) ("#\." functor)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO) ("#\." functor)]
-    ["." function]
-    [concurrency
-     ["." promise (#+ Promise)]
-     ["." stm (#+ Var STM)]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." product]
-    ["." maybe ("#\." functor)]
-    ["." binary (#+ Binary)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." array (#+ Array)]
-     ["." list ("#\." functor)]
-     ["." dictionary (#+ Dictionary)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["i" int]
-     ["f" frac]]]
-   [time
-    ["." instant (#+ Instant)]
-    ["." duration]]])
+  [library
+   [lux #*
+    ["@" target]
+    ["." ffi]
+    [abstract
+     ["." monad (#+ Monad do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try (#+ Try) ("#\." functor)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO) ("#\." functor)]
+     ["." function]
+     [concurrency
+      ["." promise (#+ Promise)]
+      ["." stm (#+ Var STM)]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." product]
+     ["." maybe ("#\." functor)]
+     ["." binary (#+ Binary)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." array (#+ Array)]
+      ["." list ("#\." functor)]
+      ["." dictionary (#+ Dictionary)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["i" int]
+      ["f" frac]]]
+    [time
+     ["." instant (#+ Instant)]
+     ["." duration]]]])
 
 (type: #export Path
   Text)
diff --git a/stdlib/source/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux
index f1415da80..df655ed9c 100644
--- a/stdlib/source/lux/world/file/watch.lux
+++ b/stdlib/source/library/lux/world/file/watch.lux
@@ -1,34 +1,35 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["." ffi (#+ import:)]
-   [abstract
-    [predicate (#+ Predicate)]
-    ["." monad (#+ do)]]
-   [control
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." promise (#+ Promise)]
-     ["." stm (#+ STM Var)]]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." functor monoid fold)]
-     ["." set]
-     ["." array]]]
-   [math
-    [number
-     ["n" nat]]]
-   [time
-    ["." instant (#+ Instant) ("#\." equivalence)]]
-   [type
-    [abstract (#+ abstract: :representation :abstraction)]]]
+  [library
+   [lux #*
+    ["@" target]
+    ["." ffi (#+ import:)]
+    [abstract
+     [predicate (#+ Predicate)]
+     ["." monad (#+ do)]]
+    [control
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." promise (#+ Promise)]
+      ["." stm (#+ STM Var)]]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." functor monoid fold)]
+      ["." set]
+      ["." array]]]
+    [math
+     [number
+      ["n" nat]]]
+    [time
+     ["." instant (#+ Instant) ("#\." equivalence)]]
+    [type
+     [abstract (#+ abstract: :representation :abstraction)]]]]
   ["." //])
 
 (abstract: #export Concern
diff --git a/stdlib/source/lux/world/input/keyboard.lux b/stdlib/source/library/lux/world/input/keyboard.lux
index 90068c197..8c65fe493 100644
--- a/stdlib/source/lux/world/input/keyboard.lux
+++ b/stdlib/source/library/lux/world/input/keyboard.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*])
+  [library
+   [lux #*]])
 
 (type: #export Key
   Nat)
diff --git a/stdlib/source/lux/world/net.lux b/stdlib/source/library/lux/world/net.lux
index e4133710e..cea1b4a7d 100644
--- a/stdlib/source/lux/world/net.lux
+++ b/stdlib/source/library/lux/world/net.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux (#- Location)])
+  [library
+   [lux (#- Location)]])
 
 (type: #export Address Text)
 
diff --git a/stdlib/source/lux/world/net/http.lux b/stdlib/source/library/lux/world/net/http.lux
index 6682c24bd..8e205e2a0 100644
--- a/stdlib/source/lux/world/net/http.lux
+++ b/stdlib/source/library/lux/world/net/http.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   [control
-    [try (#+ Try)]
-    [concurrency
-     [promise (#+ Promise)]
-     [frp (#+ Channel)]]
-    [parser
-     ["." environment (#+ Environment)]]]
-   [data
-    [binary (#+ Binary)]]]
+  [library
+   [lux #*
+    [control
+     [try (#+ Try)]
+     [concurrency
+      [promise (#+ Promise)]
+      [frp (#+ Channel)]]
+     [parser
+      ["." environment (#+ Environment)]]]
+    [data
+     [binary (#+ Binary)]]]]
   [// (#+ URL)
    [uri (#+ URI)]])
 
diff --git a/stdlib/source/lux/world/net/http/client.lux b/stdlib/source/library/lux/world/net/http/client.lux
index 986ef0c89..5a7a93e31 100644
--- a/stdlib/source/lux/world/net/http/client.lux
+++ b/stdlib/source/library/lux/world/net/http/client.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." binary (#+ Binary)]
-    ["." maybe ("#\." functor)]
-    ["." text]
-    [collection
-     ["." dictionary]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]]
+  [library
+   [lux #*
+    ["@" target]
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." binary (#+ Binary)]
+     ["." maybe ("#\." functor)]
+     ["." text]
+     [collection
+      ["." dictionary]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]]]
   ["." //
    [// (#+ URL)]])
 
diff --git a/stdlib/source/lux/world/net/http/cookie.lux b/stdlib/source/library/lux/world/net/http/cookie.lux
index 969f951ec..08a75fecc 100644
--- a/stdlib/source/lux/world/net/http/cookie.lux
+++ b/stdlib/source/library/lux/world/net/http/cookie.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   [control
-    [monad (#+ do)]
-    ["." try (#+ Try)]
-    ["p" parser ("#\." monad)
-     ["l" text (#+ Parser)]]]
-   [data
-    [number
-     ["i" int]]
-    [text
-     ["%" format (#+ format)]]
-    [format
-     ["." context (#+ Context)]]
-    [collection
-     ["." dictionary]]]
-   [time
-    ["." duration (#+ Duration)]]]
+  [library
+   [lux #*
+    [control
+     [monad (#+ do)]
+     ["." try (#+ Try)]
+     ["p" parser ("#\." monad)
+      ["l" text (#+ Parser)]]]
+    [data
+     [number
+      ["i" int]]
+     [text
+      ["%" format (#+ format)]]
+     [format
+      ["." context (#+ Context)]]
+     [collection
+      ["." dictionary]]]
+    [time
+     ["." duration (#+ Duration)]]]]
   ["." // (#+ Header)
    ["." header]])
 
diff --git a/stdlib/source/lux/world/net/http/header.lux b/stdlib/source/library/lux/world/net/http/header.lux
index 4cd1daa67..e5b1882ad 100644
--- a/stdlib/source/lux/world/net/http/header.lux
+++ b/stdlib/source/library/lux/world/net/http/header.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [control
-    [pipe (#+ case>)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]]]]
+  [library
+   [lux #*
+    [control
+     [pipe (#+ case>)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]]]]]
   [// (#+ Header)
    ["." mime (#+ MIME)]
    [// (#+ URL)]])
diff --git a/stdlib/source/lux/world/net/http/mime.lux b/stdlib/source/library/lux/world/net/http/mime.lux
index 1029e6bb9..859b0840e 100644
--- a/stdlib/source/lux/world/net/http/mime.lux
+++ b/stdlib/source/library/lux/world/net/http/mime.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [data
-    ["." text
-     ["%" format (#+ format)]
-     ["." encoding (#+ Encoding)]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    [data
+     ["." text
+      ["%" format (#+ format)]
+      ["." encoding (#+ Encoding)]]]
+    [type
+     abstract]]])
 
 (abstract: #export MIME
   Text
diff --git a/stdlib/source/lux/world/net/http/query.lux b/stdlib/source/library/lux/world/net/http/query.lux
index 006942bfe..b6b8936b7 100644
--- a/stdlib/source/lux/world/net/http/query.lux
+++ b/stdlib/source/library/lux/world/net/http/query.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   [control
-    pipe
-    [monad (#+ do)]
-    ["." try (#+ Try)]
-    ["p" parser
-     ["l" text (#+ Parser)]]]
-   [data
-    [number
-     ["." nat]]
-    ["." text
-     ["%" format (#+ format)]]
-    [format
-     ["." context (#+ Context)]]
-    [collection
-     ["." dictionary]]]])
+  [library
+   [lux #*
+    [control
+     pipe
+     [monad (#+ do)]
+     ["." try (#+ Try)]
+     ["p" parser
+      ["l" text (#+ Parser)]]]
+    [data
+     [number
+      ["." nat]]
+     ["." text
+      ["%" format (#+ format)]]
+     [format
+      ["." context (#+ Context)]]
+     [collection
+      ["." dictionary]]]]])
 
 (def: component
   (Parser Text)
diff --git a/stdlib/source/lux/world/net/http/request.lux b/stdlib/source/library/lux/world/net/http/request.lux
index 0d9354cd8..4a6911798 100644
--- a/stdlib/source/lux/world/net/http/request.lux
+++ b/stdlib/source/library/lux/world/net/http/request.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   [control
-    pipe
-    ["." monad (#+ do)]
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]
-     ["." frp]]
-    [parser
-     ["<.>" json]]]
-   [data
-    ["." maybe]
-    ["." number
-     ["n" nat]]
-    ["." text
-     ["." encoding]]
-    [format
-     ["." json (#+ JSON)]
-     ["." context (#+ Context Property)]]
-    [collection
-     ["." list ("#\." functor fold)]
-     ["." dictionary]]]
-   [world
-    ["." binary (#+ Binary)]]]
+  [library
+   [lux #*
+    [control
+     pipe
+     ["." monad (#+ do)]
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]
+      ["." frp]]
+     [parser
+      ["<.>" json]]]
+    [data
+     ["." maybe]
+     ["." number
+      ["n" nat]]
+     ["." text
+      ["." encoding]]
+     [format
+      ["." json (#+ JSON)]
+      ["." context (#+ Context Property)]]
+     [collection
+      ["." list ("#\." functor fold)]
+      ["." dictionary]]]
+    [world
+     ["." binary (#+ Binary)]]]]
   ["." // (#+ Body Response Server)
    ["#." response]
    ["#." query]
diff --git a/stdlib/source/lux/world/net/http/response.lux b/stdlib/source/library/lux/world/net/http/response.lux
index 3e06614d2..0ca825a44 100644
--- a/stdlib/source/lux/world/net/http/response.lux
+++ b/stdlib/source/library/lux/world/net/http/response.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux (#- static)
-   [control
-    [concurrency
-     ["." promise]
-     ["." frp ("#\." monad)]]]
-   [data
-    ["." text
-     ["." encoding]]
-    [format
-     ["." html]
-     ["." css (#+ CSS)]
-     ["." context]
-     ["." json (#+ JSON) ("#\." codec)]]]
-   ["." io]
-   [world
-    ["." binary (#+ Binary)]]]
+  [library
+   [lux (#- static)
+    [control
+     [concurrency
+      ["." promise]
+      ["." frp ("#\." monad)]]]
+    [data
+     ["." text
+      ["." encoding]]
+     [format
+      ["." html]
+      ["." css (#+ CSS)]
+      ["." context]
+      ["." json (#+ JSON) ("#\." codec)]]]
+    ["." io]
+    [world
+     ["." binary (#+ Binary)]]]]
   ["." // (#+ Status Body Response Server)
    ["." status]
    ["." mime (#+ MIME)]
diff --git a/stdlib/source/lux/world/net/http/route.lux b/stdlib/source/library/lux/world/net/http/route.lux
index 32bdf1213..456ed9e36 100644
--- a/stdlib/source/lux/world/net/http/route.lux
+++ b/stdlib/source/library/lux/world/net/http/route.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux (#- or)
-   [control
-    [monad (#+ do)]
-    [concurrency
-     ["." promise]]]
-   [data
-    ["." maybe]
-    ["." text]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux (#- or)
+    [control
+     [monad (#+ do)]
+     [concurrency
+      ["." promise]]]
+    [data
+     ["." maybe]
+     ["." text]
+     [number
+      ["n" nat]]]]]
   ["." // (#+ URI Server)
    ["#." status]
    ["#." response]])
diff --git a/stdlib/source/lux/world/net/http/status.lux b/stdlib/source/library/lux/world/net/http/status.lux
index cb0e8a8af..fe3f7d90d 100644
--- a/stdlib/source/lux/world/net/http/status.lux
+++ b/stdlib/source/library/lux/world/net/http/status.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [// (#+ Status)])
 
 ## https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
diff --git a/stdlib/source/lux/world/net/http/version.lux b/stdlib/source/library/lux/world/net/http/version.lux
index 4a693766d..2443fda12 100644
--- a/stdlib/source/lux/world/net/http/version.lux
+++ b/stdlib/source/library/lux/world/net/http/version.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*]
+  [library
+   [lux #*]]
   [// (#+ Version)])
 
 (template [<name> <version>]
diff --git a/stdlib/source/lux/world/net/uri.lux b/stdlib/source/library/lux/world/net/uri.lux
index e7d70d108..2c43cbbd3 100644
--- a/stdlib/source/lux/world/net/uri.lux
+++ b/stdlib/source/library/lux/world/net/uri.lux
@@ -1,5 +1,6 @@
 (.module:
-  [lux #*])
+  [library
+   [lux #*]])
 
 (type: #export URI
   Text)
diff --git a/stdlib/source/lux/world/output/video/resolution.lux b/stdlib/source/library/lux/world/output/video/resolution.lux
index 2dbe1c8bc..24f48182c 100644
--- a/stdlib/source/lux/world/output/video/resolution.lux
+++ b/stdlib/source/library/lux/world/output/video/resolution.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]]
-   [data
-    ["." product]]
-   [math
-    [number
-     ["." nat]]]])
+  [library
+   [lux #*
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]]
+    [data
+     ["." product]]
+    [math
+     [number
+      ["." nat]]]]])
 
 (type: #export Resolution
   {#width Nat
diff --git a/stdlib/source/lux/world/program.lux b/stdlib/source/library/lux/world/program.lux
index c64f9ffa7..8c8a0ac05 100644
--- a/stdlib/source/lux/world/program.lux
+++ b/stdlib/source/library/lux/world/program.lux
@@ -1,35 +1,36 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["." ffi (#+ import:)]
-   [abstract
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." function]
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." atom]
-     ["." promise (#+ Promise)]]
-    [parser
-     ["." environment (#+ Environment)]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." array (#+ Array)]
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." functor)]]]
-   ["." macro
-    ["." template]]
-   [math
-    [number
-     ["i" int]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    ["@" target]
+    ["." ffi (#+ import:)]
+    [abstract
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." function]
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." atom]
+      ["." promise (#+ Promise)]]
+     [parser
+      ["." environment (#+ Environment)]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." array (#+ Array)]
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." functor)]]]
+    ["." macro
+     ["." template]]
+    [math
+     [number
+      ["i" int]]]
+    [type
+     abstract]]]
   [//
    [file (#+ Path)]
    [shell (#+ Exit)]])
@@ -265,11 +266,11 @@
 
                       (ffi.import: "fileutils" FileUtils #as RubyFileUtils
                         ["#::."
-                         (#static pwd [] #io Path)])
+                         (#static pwd Path)])
                       
                       (ffi.import: Dir #as RubyDir
                         ["#::."
-                         (#static home [] #io Path)])
+                         (#static home Path)])
 
                       (ffi.import: Kernel #as RubyKernel
                         ["#::."
@@ -387,7 +388,7 @@
                     <default>)
              @.python (os/path::expanduser ["~"])
              @.lua (..run_command "~" "echo ~")
-             @.ruby (RubyDir::home [])
+             @.ruby (io.io (RubyDir::home))
              ## @.php (do io.monad
              ##         [output (..getenv/1 ["HOME"])]
              ##         (wrap (if (bit\= false (:as Bit output))
@@ -418,7 +419,7 @@
                      (if (is? default on_windows)
                        (..run_command default "pwd")
                        (wrap on_windows)))
-             @.ruby (RubyFileUtils::pwd [])
+             @.ruby (io.io (RubyFileUtils::pwd))
              ## @.php (do io.monad
              ##         [output (..getcwd [])]
              ##         (wrap (if (bit\= false (:as Bit output))
diff --git a/stdlib/source/lux/world/service/authentication.lux b/stdlib/source/library/lux/world/service/authentication.lux
index a9acda426..4c66ddc1c 100644
--- a/stdlib/source/lux/world/service/authentication.lux
+++ b/stdlib/source/library/lux/world/service/authentication.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [control
-    [try (#+ Try)]
-    [security
-     [capability (#+ Capability)]]]])
+  [library
+   [lux #*
+    [control
+     [try (#+ Try)]
+     [security
+      [capability (#+ Capability)]]]]])
 
 (type: #export (Can-Register ! account secret value)
   (Capability [account secret value] (! (Try Any))))
diff --git a/stdlib/source/lux/world/service/crud.lux b/stdlib/source/library/lux/world/service/crud.lux
index 82fee2c75..bd47744f4 100644
--- a/stdlib/source/lux/world/service/crud.lux
+++ b/stdlib/source/library/lux/world/service/crud.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [control
-    ["." try (#+ Try)]
-    [security
-     ["!" capability (#+ capability:)]]]
-   [time
-    ["." instant (#+ Instant)]]])
+  [library
+   [lux #*
+    [control
+     ["." try (#+ Try)]
+     [security
+      ["!" capability (#+ capability:)]]]
+    [time
+     ["." instant (#+ Instant)]]]])
 
 (type: #export ID Nat)
 
diff --git a/stdlib/source/lux/world/service/inventory.lux b/stdlib/source/library/lux/world/service/inventory.lux
index dbdc93d6d..b6f023075 100644
--- a/stdlib/source/lux/world/service/inventory.lux
+++ b/stdlib/source/library/lux/world/service/inventory.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [control
-    [try (#+ Try)]
-    [security
-     ["!" capability (#+ capability:)]]]])
+  [library
+   [lux #*
+    [control
+     [try (#+ Try)]
+     [security
+      ["!" capability (#+ capability:)]]]]])
 
 (type: #export ID Nat)
 
diff --git a/stdlib/source/lux/world/service/journal.lux b/stdlib/source/library/lux/world/service/journal.lux
index f05195c4f..ba42af209 100644
--- a/stdlib/source/lux/world/service/journal.lux
+++ b/stdlib/source/library/lux/world/service/journal.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [control
-    [equivalence (#+ Equivalence)]
-    [interval (#+ Interval)]
-    [try (#+ Try)]
-    [security
-     ["!" capability (#+ capability:)]]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [time
-    ["." instant (#+ Instant) ("#\." equivalence)]]])
+  [library
+   [lux #*
+    [control
+     [equivalence (#+ Equivalence)]
+     [interval (#+ Interval)]
+     [try (#+ Try)]
+     [security
+      ["!" capability (#+ capability:)]]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [time
+     ["." instant (#+ Instant) ("#\." equivalence)]]]])
 
 (type: #export (Entry a)
   {#what  a
diff --git a/stdlib/source/lux/world/service/mail.lux b/stdlib/source/library/lux/world/service/mail.lux
index eb49c6131..2b2cc9dd1 100644
--- a/stdlib/source/lux/world/service/mail.lux
+++ b/stdlib/source/library/lux/world/service/mail.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   [control
-    [try (#+ Try)]
-    [concurrency
-     [frp (#+ Channel)]]
-    [security
-     ["!" capability (#+ capability:)]]]])
+  [library
+   [lux #*
+    [control
+     [try (#+ Try)]
+     [concurrency
+      [frp (#+ Channel)]]
+     [security
+      ["!" capability (#+ capability:)]]]]])
 
 (capability: #export (Can-Send ! address message)
   (can-send [address message] (! (Try Any))))
diff --git a/stdlib/source/lux/world/shell.lux b/stdlib/source/library/lux/world/shell.lux
index 254e813ad..52cd3efd4 100644
--- a/stdlib/source/lux/world/shell.lux
+++ b/stdlib/source/library/lux/world/shell.lux
@@ -1,34 +1,35 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["jvm" ffi (#+ import:)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO)]
-    [security
-     ["?" policy (#+ Context Safety Safe)]]
-    [concurrency
-     ["." atom (#+ Atom)]
-     ["." promise (#+ Promise)]]
-    [parser
-     [environment (#+ Environment)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." array (#+ Array)]
-     ["." list ("#\." fold functor)]
-     ["." dictionary]]]
-   [math
-    [number (#+ hex)
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["@" target]
+    ["jvm" ffi (#+ import:)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO)]
+     [security
+      ["?" policy (#+ Context Safety Safe)]]
+     [concurrency
+      ["." atom (#+ Atom)]
+      ["." promise (#+ Promise)]]
+     [parser
+      [environment (#+ Environment)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." array (#+ Array)]
+      ["." list ("#\." fold functor)]
+      ["." dictionary]]]
+    [math
+     [number (#+ hex)
+      ["n" nat]]]]]
   [//
    [file (#+ Path)]])
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux
deleted file mode 100644
index f3b4a4720..000000000
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux
+++ /dev/null
@@ -1,25 +0,0 @@
-(.module:
-  [lux (#- Type type)
-   [data
-    [collection
-     ["." row]]]
-   [target
-    [jvm
-     ["." field (#+ Field)]
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     [type (#+ Type)
-      [category (#+ Value)]]
-     [constant
-      [pool (#+ Resource)]]]]])
-
-(def: modifier
-  (Modifier Field)
-  ($_ modifier\compose
-      field.public
-      field.static
-      field.final
-      ))
-
-(def: #export (constant name type)
-  (-> Text (Type Value) (Resource Field))
-  (field.field ..modifier name type (row.row)))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux
deleted file mode 100644
index a6de97cc3..000000000
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux
+++ /dev/null
@@ -1,13 +0,0 @@
-(.module:
-  [lux #*
-   [target
-    [jvm
-     ["." modifier (#+ Modifier) ("#\." monoid)]
-     ["." method (#+ Method)]]]])
-
-(def: #export modifier
-  (Modifier Method)
-  ($_ modifier\compose
-      method.public
-      method.strict
-      ))
diff --git a/stdlib/source/poly/lux/abstract/equivalence.lux b/stdlib/source/poly/lux/abstract/equivalence.lux
index 590c3c92a..080e64af0 100644
--- a/stdlib/source/poly/lux/abstract/equivalence.lux
+++ b/stdlib/source/poly/lux/abstract/equivalence.lux
@@ -1,44 +1,45 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ Monad do)]]
-   [control
-    ["p" parser
-     ["<.>" type]
-     ["s" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." bit]
-    ["." maybe]
-    ["." text ("#\." monoid)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monad)]
-     ["." row]
-     ["." array]
-     ["." queue]
-     ["." set]
-     ["." dictionary (#+ Dictionary)]
-     ["." tree]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." poly (#+ poly:)]]
-   [math
-    [number
-     ["." nat ("#\." decimal)]
-     ["." int]
-     ["." rev]
-     ["." frac]]]
-   [time
-    ["." duration]
-    ["." date]
-    ["." instant]
-    ["." day]
-    ["." month]]
-   ["." type
-    ["." unit]]]
-  [\\
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ Monad do)]]
+    [control
+     ["p" parser
+      ["<.>" type]
+      ["s" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." bit]
+     ["." maybe]
+     ["." text ("#\." monoid)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monad)]
+      ["." row]
+      ["." array]
+      ["." queue]
+      ["." set]
+      ["." dictionary (#+ Dictionary)]
+      ["." tree]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." poly (#+ poly:)]]
+    [math
+     [number
+      ["." nat ("#\." decimal)]
+      ["." int]
+      ["." rev]
+      ["." frac]]]
+    [time
+     ["." duration]
+     ["." date]
+     ["." instant]
+     ["." day]
+     ["." month]]
+    ["." type
+     ["." unit]]]]
+  [\\library
    ["." /]])
 
 (poly: #export equivalence
diff --git a/stdlib/source/poly/lux/abstract/functor.lux b/stdlib/source/poly/lux/abstract/functor.lux
index 1d90bf0d9..fbd3e2519 100644
--- a/stdlib/source/poly/lux/abstract/functor.lux
+++ b/stdlib/source/poly/lux/abstract/functor.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["." type]
-   [abstract
-    [monad (#+ Monad do)]]
-   [control
-    ["p" parser
-     ["<.>" type]
-     ["s" code (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monad monoid)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." poly (#+ poly:)]]
-   [math
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["." type]
+    [abstract
+     [monad (#+ Monad do)]]
+    [control
+     ["p" parser
+      ["<.>" type]
+      ["s" code (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monad monoid)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." poly (#+ poly:)]]
+    [math
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (poly: #export functor
diff --git a/stdlib/source/poly/lux/data/format/json.lux b/stdlib/source/poly/lux/data/format/json.lux
index 3022a59a8..d7409df9f 100644
--- a/stdlib/source/poly/lux/data/format/json.lux
+++ b/stdlib/source/poly/lux/data/format/json.lux
@@ -1,45 +1,46 @@
 (.module: {#.doc "Codecs for values in the JSON format."}
-  [lux #*
-   ["." debug]
-   [abstract
-    [monad (#+ Monad do)]
-    [equivalence (#+ Equivalence)]
-    ["." codec]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["<.>" type]
-     ["</>" json]]]
-   [data
-    ["." bit]
-    maybe
-    ["." sum]
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." fold monad)]
-     ["." row (#+ Row row) ("#\." monad)]
-     ["d" dictionary]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." poly (#+ poly:)]]
-   [math
-    [number
-     ["." i64]
-     ["n" nat ("#\." decimal)]
-     ["." int]
-     ["." frac ("#\." decimal)]]]
-   [time
-    ## ["." instant]
-    ## ["." duration]
-    ["." date]
-    ["." day]
-    ["." month]]
-   ["." type
-    ["." unit]]]
-  [\\
+  [library
+   [lux #*
+    ["." debug]
+    [abstract
+     [monad (#+ Monad do)]
+     [equivalence (#+ Equivalence)]
+     ["." codec]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["<.>" type]
+      ["</>" json]]]
+    [data
+     ["." bit]
+     maybe
+     ["." sum]
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." fold monad)]
+      ["." row (#+ Row row) ("#\." monad)]
+      ["d" dictionary]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." poly (#+ poly:)]]
+    [math
+     [number
+      ["." i64]
+      ["n" nat ("#\." decimal)]
+      ["." int]
+      ["." frac ("#\." decimal)]]]
+    [time
+     ## ["." instant]
+     ## ["." duration]
+     ["." date]
+     ["." day]
+     ["." month]]
+    ["." type
+     ["." unit]]]]
+  [\\library
    ["." / (#+ JSON)]])
 
 (def: tag
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)
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)]]]])
diff --git a/stdlib/source/test/aedifex.lux b/stdlib/source/test/aedifex.lux
index b6f54f8f4..dc04f13de 100644
--- a/stdlib/source/test/aedifex.lux
+++ b/stdlib/source/test/aedifex.lux
@@ -1,9 +1,10 @@
 (.module:
-  [lux #*
-   [program (#+ program:)]
-   ["_" test (#+ Test)]
-   [control
-    ["." io]]]
+  [library
+   [lux #*
+    [program (#+ program:)]
+    ["_" test (#+ Test)]
+    [control
+     ["." io]]]]
   ["." / #_
    ["#." artifact]
    ["#." cli]
diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index b1bb102c1..6a1021b4c 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [hash (#+ Hash)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    [concurrency
-     [promise (#+ Promise)]]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]]
-   [world
-    ["." file]
-    [net
-     ["." uri]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [hash (#+ Hash)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     [concurrency
+      [promise (#+ Promise)]]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]]
+    [world
+     ["." file]
+     [net
+      ["." uri]]]]]
   ["." / #_
    ["#." extension]
    ["#." snapshot]
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 9ae382975..fd28c5d92 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." set]
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." set]
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
   [\\program
    ["." /
     ["/#" // #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index 4e968904d..94d98cf22 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]]]
   ["$." / #_
    ["#." build]
    ["#." stamp]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index 156be7af4..731219b91 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index aa3dbcff1..ba0c9f368 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]
-   [time
-    ["." instant]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]
+    [time
+     ["." instant]]]]
   [\\program
    ["." /]]
   ["$." // #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index f6861bf9c..9cfe28fb0 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]]
   ["$." /// #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 06adc7239..f0fc26321 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]]
   ["." / #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index 3ed0b32ce..dcb23646d 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [time
-    ["." instant]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [time
+     ["." instant]]]]
   ["$." /// #_
    ["#." stamp]]
   [\\program
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index c2ab6a354..f4fc185be 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["i" int]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["i" int]]]]]
   [\\program
    ["." /]]
   ["." / #_
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index 494aa5e07..e68645b8a 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [time
-    ["." date]
-    ["." year]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [time
+     ["." date]
+     ["." year]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index a17f9c40c..dd4b63904 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." time]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" text]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." time]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" text]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 447b60bac..8418febee 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text]
-    [collection
-     ["." set]
-     ["." list]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text]
+     [collection
+      ["." set]
+      ["." list]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index d1d4da7ef..9efdca98a 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]]
   ["$." // #_
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index d61a88057..20dcf506d 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux (#- Type type)
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    [concurrency
-     ["." promise (#+ Promise)]]
-    [parser
-     ["." environment]]]
-   [data
-    [binary (#+ Binary)]
-    ["." text]
-    [format
-     [xml (#+ XML)]]
-    [collection
-     ["." set]
-     ["." dictionary]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]
-   [world
-    ["." file]
-    ["." program]]]
+  [library
+   [lux (#- Type type)
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     [concurrency
+      ["." promise (#+ Promise)]]
+     [parser
+      ["." environment]]]
+    [data
+     [binary (#+ Binary)]
+     ["." text]
+     [format
+      [xml (#+ XML)]]
+     [collection
+      ["." set]
+      ["." dictionary]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]
+    [world
+     ["." file]
+     ["." program]]]]
   [//
    ["@." profile]
    ["@." artifact]
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index 30813fb94..d2eed16d7 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    [parser
-     ["." cli]]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     [parser
+      ["." cli]]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]]]
   [\\program
    ["." /
     ["/#" // #_
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
diff --git a/stdlib/source/test/aedifex/dependency.lux b/stdlib/source/test/aedifex/dependency.lux
index 189da054c..d12434d1f 100644
--- a/stdlib/source/test/aedifex/dependency.lux
+++ b/stdlib/source/test/aedifex/dependency.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
   [//
    ["@." artifact]]
   [\\program
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index 6e44e03db..a99f37ca1 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -1,36 +1,37 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." hash (#+ Hash)]]
-   [control
-    ["." io (#+ IO)]
-    ["." try ("#\." functor)]
-    [concurrency
-     ["." atom (#+ Atom)]
-     ["." promise]]]
-   [data
-    ["." product]
-    ["." maybe ("#\." functor)]
-    ["." binary (#+ Binary) ("#\." equivalence)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." set]
-     ["." list ("#\." fold)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]
-   [world
-    [net (#+ URL)
-     ["." uri (#+ URI)]
-     ["." http #_
-      ["#" client]
-      ["#/." status]
-      ["@#" /]]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." hash (#+ Hash)]]
+    [control
+     ["." io (#+ IO)]
+     ["." try ("#\." functor)]
+     [concurrency
+      ["." atom (#+ Atom)]
+      ["." promise]]]
+    [data
+     ["." product]
+     ["." maybe ("#\." functor)]
+     ["." binary (#+ Binary) ("#\." equivalence)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." set]
+      ["." list ("#\." fold)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]
+    [world
+     [net (#+ URL)
+      ["." uri (#+ URI)]
+      ["." http #_
+       ["#" client]
+       ["#/." status]
+       ["@#" /]]]]]]
   ["$." //
    ["#/" // #_
     ["#." package]]]
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index 24cde0b53..638199af3 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." predicate]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try]
-    ["." exception]
-    [concurrency
-     ["." promise]]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml]]
-    [collection
-     ["." dictionary]
-     ["." set]
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." predicate]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try]
+     ["." exception]
+     [concurrency
+      ["." promise]]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml]]
+     [collection
+      ["." dictionary]
+      ["." set]
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]]]]
   ["$." /// #_
    ["#." package]
    ["#." repository]
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index a709e6ca2..a3ac5df4e 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]]]
   ["$." /// #_
    ["#." hash]]
   [\\program
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index f4f6fe441..9064dac8b 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." codec]]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." binary (#+ Binary)]
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." codec]]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." binary (#+ Binary)]
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
   [\\program
    ["." /]]
   [test
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index cf573bb25..529185320 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    [text
-     ["%" format]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." set (#+ Set)]]]
-   [math
-    ["." random]]
-   [world
-    ["." file]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     [text
+      ["%" format]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." set (#+ Set)]]]
+    [math
+     ["." random]]
+    [world
+     ["." file]]]]
   [//
    ["$." profile]]
   [\\program
diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux
index 89e4db9de..bd78c3464 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text]]
+    [math
+     ["." random (#+ Random)]]]]
   [//
    ["@." artifact]]
   [\\program
diff --git a/stdlib/source/test/aedifex/metadata.lux b/stdlib/source/test/aedifex/metadata.lux
index 2975939bc..d4e6e816c 100644
--- a/stdlib/source/test/aedifex/metadata.lux
+++ b/stdlib/source/test/aedifex/metadata.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random]]]]
   ["." / #_
    ["#." artifact]
    ["#." snapshot]
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 56e856b88..b84eca173 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." time
-    ["." date]
-    ["." year]
-    ["." month]
-    ["." instant]
-    ["." duration]]
-   [math
-    ["." random (#+ Random)]]
-   [macro
-    ["." code]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." time
+     ["." date]
+     ["." year]
+     ["." month]
+     ["." instant]
+     ["." duration]]
+    [math
+     ["." random (#+ Random)]]
+    [macro
+     ["." code]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index d94c66761..d34eb60a9 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" xml]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." time
-    ["." date]
-    ["." year]
-    ["." month]
-    ["." instant (#+ Instant)]
-    ["." duration]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]
-   [macro
-    ["." code]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" xml]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." time
+     ["." date]
+     ["." year]
+     ["." month]
+     ["." instant (#+ Instant)]
+     ["." duration]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]
+    [macro
+     ["." code]]]]
   ["$." /// #_
    ["#." artifact
     ["#/." type]
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 61e36aaf7..ef23f35ce 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try]
-    [concurrency
-     [promise (#+ Promise)]]]
-   [data
-    ["." product]
-    ["." text
-     [encoding
-      ["." utf8]]]
-    [format
-     ["." xml (#+ XML)]]
-    [collection
-     ["." set (#+ Set)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]
-   [world
-    ["." file]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try]
+     [concurrency
+      [promise (#+ Promise)]]]
+    [data
+     ["." product]
+     ["." text
+      [encoding
+       ["." utf8]]]
+     [format
+      ["." xml (#+ XML)]]
+     [collection
+      ["." set (#+ Set)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]
+    [world
+     ["." file]]]]
   [//
    ["$." profile]
    [//
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 01c763349..33beaa7f9 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [hash (#+ Hash)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." text]
-    [collection
-     ["." set (#+ Set)]
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]
-   [macro
-    ["." code]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [hash (#+ Hash)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." text]
+     [collection
+      ["." set (#+ Set)]
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]
+    [macro
+     ["." code]]]]
   [//
    ["@." profile]]
   [\\program
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index ad3b1d801..24ca3c3c6 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]
-    ["<>" parser
-     ["<.>" xml]]]
-   [data
-    [format
-     ["." xml]]]
-   [math
-    ["." random]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]
+     ["<>" parser
+      ["<.>" xml]]]
+    [data
+     [format
+      ["." xml]]]
+    [math
+     ["." random]]]]
   [//
    ["@." profile]]
   [\\program
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index e7e3f50ac..418756ffd 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [hash (#+ Hash)]
-    [\spec
-     ["$." equivalence]
-     ["$." monoid]]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    [parser
-     ["." cli]]]
-   [data
-    ["." text]
-    [collection
-     ["." set (#+ Set)]
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [hash (#+ Hash)]
+     [\\spec
+      ["$." equivalence]
+      ["$." monoid]]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     [parser
+      ["." cli]]]
+    [data
+     ["." text]
+     [collection
+      ["." set (#+ Set)]
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
   [//
    ["@." artifact]
    ["@." dependency]]
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index d2c12109f..e1b4b051a 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." monoid]]]
-   [control
-    ["." try ("#\." functor)]
-    ["." exception]]
-   [data
-    ["." product]
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." monoid]]]
+    [control
+     ["." try ("#\." functor)]
+     ["." exception]]
+    [data
+     ["." product]
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
   [//
    ["@." profile]]
   [\\program
diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux
index 6241e14e9..c86f3d52d 100644
--- a/stdlib/source/test/aedifex/repository.lux
+++ b/stdlib/source/test/aedifex/repository.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
-    ["." monad (#+ do)]]
-   [control
-    ["." io]
-    ["." try]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." product]
-    ["." binary (#+ Binary)]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." dictionary (#+ Dictionary)]]]
-   [math
-    ["." random (#+ Random)]]
-   [world
-    [net
-     ["." uri (#+ URI)]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [hash (#+ Hash)]
+     ["." monad (#+ do)]]
+    [control
+     ["." io]
+     ["." try]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." product]
+     ["." binary (#+ Binary)]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." dictionary (#+ Dictionary)]]]
+    [math
+     ["." random (#+ Random)]]
+    [world
+     [net
+      ["." uri (#+ URI)]]]]]
   ["." / #_
    ["#." identity]
    ["#." origin]
diff --git a/stdlib/source/test/aedifex/repository/identity.lux b/stdlib/source/test/aedifex/repository/identity.lux
index df454b436..061bd9de0 100644
--- a/stdlib/source/test/aedifex/repository/identity.lux
+++ b/stdlib/source/test/aedifex/repository/identity.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux
index 5bf4c5113..1bbf2f7bb 100644
--- a/stdlib/source/test/aedifex/repository/local.lux
+++ b/stdlib/source/test/aedifex/repository/local.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["." environment]]
-    [concurrency
-     ["." promise]]]
-   [data
-    ["." binary ("#\." equivalence)]
-    [text
-     [encoding
-      ["." utf8]]]]
-   [math
-    ["." random]]
-   [world
-    ["." file]
-    ["." program]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["." environment]]
+     [concurrency
+      ["." promise]]]
+    [data
+     ["." binary ("#\." equivalence)]
+     [text
+      [encoding
+       ["." utf8]]]]
+    [math
+     ["." random]]
+    [world
+     ["." file]
+     ["." program]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/repository/origin.lux b/stdlib/source/test/aedifex/repository/origin.lux
index 7b3675f40..6531726fe 100644
--- a/stdlib/source/test/aedifex/repository/origin.lux
+++ b/stdlib/source/test/aedifex/repository/origin.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index 0fa784a77..5f74cab9d 100644
--- a/stdlib/source/test/aedifex/repository/remote.lux
+++ b/stdlib/source/test/aedifex/repository/remote.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io (#+ IO)]
-    ["." try ("#\." monad)]
-    ["." exception]
-    ["." function]]
-   [data
-    ["." binary ("#\." equivalence)]
-    ["." maybe ("#\." functor)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    [collection
-     ["." dictionary]]]
-   [math
-    ["." random (#+ Random)]]
-   [world
-    [net (#+ URL)
-     ["." http #_
-      ["#" client]
-      ["#/." status]
-      ["@#" /]]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io (#+ IO)]
+     ["." try ("#\." monad)]
+     ["." exception]
+     ["." function]]
+    [data
+     ["." binary ("#\." equivalence)]
+     ["." maybe ("#\." functor)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." dictionary]]]
+    [math
+     ["." random (#+ Random)]]
+    [world
+     [net (#+ URL)
+      ["." http #_
+       ["#" client]
+       ["#/." status]
+       ["@#" /]]]]]]
   [\\program
    ["." /
     ["/#" // #_
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index e75a9297e..24745da4a 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." maybe ("#\." functor)]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list ("#\." functor)]
-     ["." set]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list ("#\." functor)]
+      ["." set]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 415bb3500..f1af7f5a5 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -3,29 +3,30 @@
                                    (.as_is))
                    <target> <target>']
   (.module:
-    ["/" lux #*
-     [program (#+ program:)]
-     ["_" test (#+ Test)]
-     ["@" target]
-     [abstract
-      [monad (#+ do)]
-      [predicate (#+ Predicate)]]
-     [control
-      ["." io]
-      [concurrency
-       ["." atom (#+ Atom)]]]
-     [data
-      ["." name]
-      [text
-       ["%" format (#+ format)]]]
-     ["." math
-      ["." random (#+ Random) ("#\." functor)]
-      [number
-       ["n" nat]
-       ["i" int]
-       ["r" rev]
-       ["f" frac]
-       ["." i64]]]]
+    [library
+     ["/" lux #*
+      [program (#+ program:)]
+      ["_" test (#+ Test)]
+      ["@" target]
+      [abstract
+       [monad (#+ do)]
+       [predicate (#+ Predicate)]]
+      [control
+       ["." io]
+       [concurrency
+        ["." atom (#+ Atom)]]]
+      [data
+       ["." name]
+       [text
+        ["%" format (#+ format)]]]
+      ["." math
+       ["." random (#+ Random) ("#\." functor)]
+       [number
+        ["n" nat]
+        ["i" int]
+        ["r" rev]
+        ["f" frac]
+        ["." i64]]]]]
     ## TODO: Must have 100% coverage on tests.
     ["." / #_
      ["#." abstract]
@@ -224,10 +225,12 @@
                              /locale.test
                              /macro.test
                              /math.test
+                             
                              /meta.test
                              /program.test
                              /target.test
                              /test.test
+
                              /time.test
                              ## /tool.test
                              /type.test
diff --git a/stdlib/source/test/lux/abstract.lux b/stdlib/source/test/lux/abstract.lux
index b31c10617..e8368434b 100644
--- a/stdlib/source/test/lux/abstract.lux
+++ b/stdlib/source/test/lux/abstract.lux
@@ -1,6 +1,7 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
   ["." / #_
    ["#." apply]
    ["#." codec]
diff --git a/stdlib/source/test/lux/abstract/apply.lux b/stdlib/source/test/lux/abstract/apply.lux
index 97bef5b24..01fe8375f 100644
--- a/stdlib/source/test/lux/abstract/apply.lux
+++ b/stdlib/source/test/lux/abstract/apply.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." maybe]
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]
-   ["_" test (#+ Test)]]
-  [\\
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." maybe]
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]
+    ["_" test (#+ Test)]]]
+  [\\library
    ["." / (#+ Apply)]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/codec.lux b/stdlib/source/test/lux/abstract/codec.lux
index 3365c1d66..00452c205 100644
--- a/stdlib/source/test/lux/abstract/codec.lux
+++ b/stdlib/source/test/lux/abstract/codec.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [format
-     ["." json (#+ JSON)]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [format
+      ["." json (#+ JSON)]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." / (#+ Codec)
     [//
      [equivalence (#+ Equivalence)]]]])
diff --git a/stdlib/source/test/lux/abstract/comonad.lux b/stdlib/source/test/lux/abstract/comonad.lux
index 088b4fe55..9b4d935d8 100644
--- a/stdlib/source/test/lux/abstract/comonad.lux
+++ b/stdlib/source/test/lux/abstract/comonad.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." identity (#+ Identity)]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]
-   ["_" test (#+ Test)]]
-  [\\
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." identity (#+ Identity)]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]
+    ["_" test (#+ Test)]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/comonad/cofree.lux b/stdlib/source/test/lux/abstract/comonad/cofree.lux
index 9e6c8a1b1..82647f79d 100644
--- a/stdlib/source/test/lux/abstract/comonad/cofree.lux
+++ b/stdlib/source/test/lux/abstract/comonad/cofree.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [functor (#+ Functor)]
-    [comonad (#+ CoMonad)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." comonad]]]
-   [control
-    ["//" continuation]]
-   [data
-    [collection
-     ["." list]
-     ["." sequence (#+ Sequence) ("#\." comonad)]]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [functor (#+ Functor)]
+     [comonad (#+ CoMonad)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." comonad]]]
+    [control
+     ["//" continuation]]
+    [data
+     [collection
+      ["." list]
+      ["." sequence (#+ Sequence) ("#\." comonad)]]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]])
 
 (def: (injection value)
diff --git a/stdlib/source/test/lux/abstract/enum.lux b/stdlib/source/test/lux/abstract/enum.lux
index 5a923019c..09ef32175 100644
--- a/stdlib/source/test/lux/abstract/enum.lux
+++ b/stdlib/source/test/lux/abstract/enum.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." product]
-    ["." maybe ("#\." functor)]
-    [collection
-     ["." list ("#\." fold)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." product]
+     ["." maybe ("#\." functor)]
+     [collection
+      ["." list ("#\." fold)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/equivalence.lux b/stdlib/source/test/lux/abstract/equivalence.lux
index 520fa141c..5b0bfced8 100644
--- a/stdlib/source/test/lux/abstract/equivalence.lux
+++ b/stdlib/source/test/lux/abstract/equivalence.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     [functor
-      ["$." contravariant]]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      [functor
+       ["$." contravariant]]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." / (#+ Equivalence)]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/fold.lux b/stdlib/source/test/lux/abstract/fold.lux
index 8165c29c3..787a8a03d 100644
--- a/stdlib/source/test/lux/abstract/fold.lux
+++ b/stdlib/source/test/lux/abstract/fold.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Fold)]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/functor.lux b/stdlib/source/test/lux/abstract/functor.lux
index 05b72f73f..63b0ad2d7 100644
--- a/stdlib/source/test/lux/abstract/functor.lux
+++ b/stdlib/source/test/lux/abstract/functor.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." maybe]
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." maybe]
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Functor)]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/functor/contravariant.lux b/stdlib/source/test/lux/abstract/functor/contravariant.lux
index 38bf62cbf..6a07cb0c5 100644
--- a/stdlib/source/test/lux/abstract/functor/contravariant.lux
+++ b/stdlib/source/test/lux/abstract/functor/contravariant.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/hash.lux b/stdlib/source/test/lux/abstract/hash.lux
index f06a7dfc2..4c9bc67f6 100644
--- a/stdlib/source/test/lux/abstract/hash.lux
+++ b/stdlib/source/test/lux/abstract/hash.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     [functor
-      ["$." contravariant]]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]
-    [number
-     ["." nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      [functor
+       ["$." contravariant]]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]
+     [number
+      ["." nat]]]]]
+  [\\library
    ["." / (#+ Hash)
     [//
      [equivalence (#+ Equivalence)]]]])
diff --git a/stdlib/source/test/lux/abstract/interval.lux b/stdlib/source/test/lux/abstract/interval.lux
index db8eb86be..718663b4b 100644
--- a/stdlib/source/test/lux/abstract/interval.lux
+++ b/stdlib/source/test/lux/abstract/interval.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." order]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    [pipe (#+ case>)]]
-   [data
-    [collection
-     ["." set]
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." order]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     [pipe (#+ case>)]]
+    [data
+     [collection
+      ["." set]
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Interval) ("\." equivalence)]])
 
 (template [<name> <cmp>]
diff --git a/stdlib/source/test/lux/abstract/monad.lux b/stdlib/source/test/lux/abstract/monad.lux
index f66ee182f..cc4642e13 100644
--- a/stdlib/source/test/lux/abstract/monad.lux
+++ b/stdlib/source/test/lux/abstract/monad.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [data
-    ["." identity (#+ Identity)]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [data
+     ["." identity (#+ Identity)]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Monad do)]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/abstract/monad/free.lux b/stdlib/source/test/lux/abstract/monad/free.lux
index 6afb3ed62..a56c01fd5 100644
--- a/stdlib/source/test/lux/abstract/monad/free.lux
+++ b/stdlib/source/test/lux/abstract/monad/free.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    [monad (#+ Monad do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [data
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     [monad (#+ Monad do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [data
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/abstract/monoid.lux b/stdlib/source/test/lux/abstract/monoid.lux
index acd00b91a..876ac1f46 100644
--- a/stdlib/source/test/lux/abstract/monoid.lux
+++ b/stdlib/source/test/lux/abstract/monoid.lux
@@ -1,14 +1,15 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." int]]]]]
+  [\\library
    ["." /
     [//
      [equivalence (#+ Equivalence)]]]])
diff --git a/stdlib/source/test/lux/abstract/order.lux b/stdlib/source/test/lux/abstract/order.lux
index 2dc09461c..2173691de 100644
--- a/stdlib/source/test/lux/abstract/order.lux
+++ b/stdlib/source/test/lux/abstract/order.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     [functor
-      ["$." contravariant]]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      [functor
+       ["$." contravariant]]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     [//
      [equivalence (#+ Equivalence)]]]])
diff --git a/stdlib/source/test/lux/abstract/predicate.lux b/stdlib/source/test/lux/abstract/predicate.lux
index 133fbdcba..0535b5802 100644
--- a/stdlib/source/test/lux/abstract/predicate.lux
+++ b/stdlib/source/test/lux/abstract/predicate.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]
-    [\spec
-     ["$." monoid]
-     [functor
-      ["$." contravariant]]]]
-   [control
-    ["." function]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." monoid]
+      [functor
+       ["$." contravariant]]]]
+    [control
+     ["." function]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: (multiple? factor)
diff --git a/stdlib/source/test/lux/control.lux b/stdlib/source/test/lux/control.lux
index faf08f9b8..e1ab4f5f1 100644
--- a/stdlib/source/test/lux/control.lux
+++ b/stdlib/source/test/lux/control.lux
@@ -1,6 +1,7 @@
 (.module:
-  [lux (#- function)
-   ["_" test (#+ Test)]]
+  [library
+   [lux (#- function)
+    ["_" test (#+ Test)]]]
   ["." / #_
    ["#." concatenative]
    ["#." concurrency #_
diff --git a/stdlib/source/test/lux/control/concatenative.lux b/stdlib/source/test/lux/control/concatenative.lux
index bfac126b0..39265aafe 100644
--- a/stdlib/source/test/lux/control/concatenative.lux
+++ b/stdlib/source/test/lux/control/concatenative.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." sum]
-    ["." name]
-    ["." bit ("#\." equivalence)]]
-   [macro
-    ["." template]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["r" rev]
-     ["f" frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." sum]
+     ["." name]
+     ["." bit ("#\." equivalence)]]
+    [macro
+     ["." template]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]
+      ["r" rev]
+      ["f" frac]]]]]
+  [\\library
    ["." / (#+ word: => ||>)]])
 
 (def: stack_shuffling
diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux
index 854a50814..f229909bd 100644
--- a/stdlib/source/test/lux/control/concurrency/actor.lux
+++ b/stdlib/source/test/lux/control/concurrency/actor.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]
-     ["." row (#+ Row)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]
+      ["." row (#+ Row)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ actor: message:)
     [//
      ["." atom (#+ Atom)]
diff --git a/stdlib/source/test/lux/control/concurrency/atom.lux b/stdlib/source/test/lux/control/concurrency/atom.lux
index b160f64e0..674e7dd3f 100644
--- a/stdlib/source/test/lux/control/concurrency/atom.lux
+++ b/stdlib/source/test/lux/control/concurrency/atom.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index 659881a20..45d626600 100644
--- a/stdlib/source/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." try]
-    ["." exception]
-    ["." io (#+ IO io)]]
-   [data
-    [collection
-     ["." list ("#\." fold monoid)]
-     ["." row (#+ Row)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." try]
+     ["." exception]
+     ["." io (#+ IO io)]]
+    [data
+     [collection
+      ["." list ("#\." fold monoid)]
+      ["." row (#+ Row)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     [//
      ["." promise (#+ Promise) ("#\." monad)]
diff --git a/stdlib/source/test/lux/control/concurrency/promise.lux b/stdlib/source/test/lux/control/concurrency/promise.lux
index 16c60c508..6b6b0ac14 100644
--- a/stdlib/source/test/lux/control/concurrency/promise.lux
+++ b/stdlib/source/test/lux/control/concurrency/promise.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    [pipe (#+ case>)]
-    ["." io]]
-   [time
-    ["." instant]
-    ["." duration]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["." i64]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     [pipe (#+ case>)]
+     ["." io]]
+    [time
+     ["." instant]
+     ["." duration]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]
+      ["." i64]]]]]
+  [\\library
    ["." /
     [//
      ["." atom (#+ Atom)]]]])
diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux
index 8924cf66f..38e152456 100644
--- a/stdlib/source/test/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["@" target]
-   [abstract
-    ["." monad (#+ do)]
-    ["." enum]]
-   [control
-    ["." io]
-    ["." try]
-    ["." exception (#+ exception:)]
-    [concurrency
-     ["." promise (#+ Promise)]
-     ["." atom (#+ Atom)]]]
-   [data
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["." i64]]]
-   [type
-    ["." refinement]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["@" target]
+    [abstract
+     ["." monad (#+ do)]
+     ["." enum]]
+    [control
+     ["." io]
+     ["." try]
+     ["." exception (#+ exception:)]
+     [concurrency
+      ["." promise (#+ Promise)]
+      ["." atom (#+ Atom)]]]
+    [data
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["." i64]]]
+    [type
+     ["." refinement]]]]
+  [\\library
    ["." /]])
 
 (def: delay
diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux
index 6bbbc3f54..6667274b5 100644
--- a/stdlib/source/test/lux/control/concurrency/stm.lux
+++ b/stdlib/source/test/lux/control/concurrency/stm.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ Monad do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." io (#+ IO)]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ Monad do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." io (#+ IO)]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     [//
      ["." atom (#+ Atom atom)]
diff --git a/stdlib/source/test/lux/control/concurrency/thread.lux b/stdlib/source/test/lux/control/concurrency/thread.lux
index df005c4ac..557b6a80b 100644
--- a/stdlib/source/test/lux/control/concurrency/thread.lux
+++ b/stdlib/source/test/lux/control/concurrency/thread.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]]
-   [time
-    ["." instant (#+ Instant)]
-    ["." duration]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]]
+    [time
+     ["." instant (#+ Instant)]
+     ["." duration]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /
     [//
      ["." atom (#+ Atom)]
diff --git a/stdlib/source/test/lux/control/continuation.lux b/stdlib/source/test/lux/control/continuation.lux
index a85418f8a..bec8160c1 100644
--- a/stdlib/source/test/lux/control/continuation.lux
+++ b/stdlib/source/test/lux/control/continuation.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [data
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [data
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux
index e63a2b66e..f62ad9271 100644
--- a/stdlib/source/test/lux/control/exception.lux
+++ b/stdlib/source/test/lux/control/exception.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ exception:)
     [//
      ["." try (#+ Try)]]]])
diff --git a/stdlib/source/test/lux/control/function.lux b/stdlib/source/test/lux/control/function.lux
index 6463e4c1c..8669e4220 100644
--- a/stdlib/source/test/lux/control/function.lux
+++ b/stdlib/source/test/lux/control/function.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]
-    [\spec
-     ["$." monoid]]]
-   [data
-    ["." text ("#!." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." monoid]]]
+    [data
+     ["." text ("#!." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]]
   ["." / #_
    ["#." contract]
diff --git a/stdlib/source/test/lux/control/function/contract.lux b/stdlib/source/test/lux/control/function/contract.lux
index e1b06a325..81840fd08 100644
--- a/stdlib/source/test/lux/control/function/contract.lux
+++ b/stdlib/source/test/lux/control/function/contract.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux
index 87cf14b0b..29c39dbdb 100644
--- a/stdlib/source/test/lux/control/function/memo.lux
+++ b/stdlib/source/test/lux/control/function/memo.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io (#+ IO)]
-    ["." state (#+ State) ("#\." monad)]]
-   [data
-    ["." product]
-    [collection
-     ["." dictionary (#+ Dictionary)]
-     ["." list ("#\." functor fold)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["." i64]]]
-   [time
-    ["." instant]
-    ["." duration (#+ Duration)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io (#+ IO)]
+     ["." state (#+ State) ("#\." monad)]]
+    [data
+     ["." product]
+     [collection
+      ["." dictionary (#+ Dictionary)]
+      ["." list ("#\." functor fold)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["." i64]]]
+    [time
+     ["." instant]
+     ["." duration (#+ Duration)]]]]
+  [\\library
    ["." /
     ["/#" // #_
      ["#" mixin]]]])
diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux
index 35cd36027..a74ca04d4 100644
--- a/stdlib/source/test/lux/control/function/mixin.lux
+++ b/stdlib/source/test/lux/control/function/mixin.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [predicate (#+ Predicate)]
-    [monad (#+ do)]
-    [\spec
-     ["$." monoid]]]
-   [control
-    ["." state (#+ State)]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#\." functor fold)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [predicate (#+ Predicate)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." monoid]]]
+    [control
+     ["." state (#+ State)]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#\." functor fold)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/control/function/mutual.lux b/stdlib/source/test/lux/control/function/mutual.lux
index 120413e5a..c9fbfbace 100644
--- a/stdlib/source/test/lux/control/function/mutual.lux
+++ b/stdlib/source/test/lux/control/function/mutual.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: test_let
diff --git a/stdlib/source/test/lux/control/io.lux b/stdlib/source/test/lux/control/io.lux
index a45fd28a9..1db7423e8 100644
--- a/stdlib/source/test/lux/control/io.lux
+++ b/stdlib/source/test/lux/control/io.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ IO)
     [//
      ["." function]]]])
diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux
index 81155f605..ff8520b10 100644
--- a/stdlib/source/test/lux/control/parser.lux
+++ b/stdlib/source/test/lux/control/parser.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." try (#+ Try)]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." try (#+ Try)]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]]]
+  [\\library
    ["." / (#+ Parser)]]
   ["." / #_
    ["#." analysis]
diff --git a/stdlib/source/test/lux/control/parser/analysis.lux b/stdlib/source/test/lux/control/parser/analysis.lux
index 49e7b0478..8be89e101 100644
--- a/stdlib/source/test/lux/control/parser/analysis.lux
+++ b/stdlib/source/test/lux/control/parser/analysis.lux
@@ -1,34 +1,35 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    ["." exception]
-    ["<>" parser]]
-   [data
-    ["." name ("#\." equivalence)]
-    ["." bit ("#\." equivalence)]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["f" frac]
-     ["r" rev]]]
-   [tool
-    [compiler
-     [reference (#+ Constant)
-      [variable (#+)]]
-     [language
-      [lux
-       ["." analysis]]]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     ["." exception]
+     ["<>" parser]]
+    [data
+     ["." name ("#\." equivalence)]
+     ["." bit ("#\." equivalence)]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]
+      ["f" frac]
+      ["r" rev]]]
+    [tool
+     [compiler
+      [reference (#+ Constant)
+       [variable (#+)]]
+      [language
+       [lux
+        ["." analysis]]]]]]]
+  [\\library
    ["." /]])
 
 (template: (!expect <expectation> <computation>)
diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux
index 289a80ba9..972078a43 100644
--- a/stdlib/source/test/lux/control/parser/binary.lux
+++ b/stdlib/source/test/lux/control/parser/binary.lux
@@ -1,43 +1,44 @@
 (.module:
-  [lux (#- primitive)
-   ["_" test (#+ Test)]
-   ["." type]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [predicate (#+ Predicate)]
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    ["." exception]
-    ["<>" parser]]
-   [data
-    ["." binary]
-    ["." sum]
-    ["." maybe]
-    ["." bit]
-    ["." name]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]
-    ["." format #_
-     ["#" binary]]
-    [collection
-     ["." list]
-     ["." row]
-     ["." set]]]
-   [macro
-    ["." code]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." i64]
-     ["." int]
-     ["." rev]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux (#- primitive)
+    ["_" test (#+ Test)]
+    ["." type]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [predicate (#+ Predicate)]
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     ["." exception]
+     ["<>" parser]]
+    [data
+     ["." binary]
+     ["." sum]
+     ["." maybe]
+     ["." bit]
+     ["." name]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     ["." format #_
+      ["#" binary]]
+     [collection
+      ["." list]
+      ["." row]
+      ["." set]]]
+    [macro
+     ["." code]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." i64]
+      ["." int]
+      ["." rev]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (template: (!expect <expectation> <computation>)
diff --git a/stdlib/source/test/lux/control/parser/cli.lux b/stdlib/source/test/lux/control/parser/cli.lux
index 97ffd5e0e..fbf0a810f 100644
--- a/stdlib/source/test/lux/control/parser/cli.lux
+++ b/stdlib/source/test/lux/control/parser/cli.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["<>" parser]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat ("#\." decimal)]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["<>" parser]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat ("#\." decimal)]]]]]
+  [\\library
    ["." /]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/parser/code.lux b/stdlib/source/test/lux/control/parser/code.lux
index 987f0ad9d..7bb5d1ddb 100644
--- a/stdlib/source/test/lux/control/parser/code.lux
+++ b/stdlib/source/test/lux/control/parser/code.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["<>" parser]]
-   [data
-    ["." bit]
-    ["." name]
-    ["." text]
-    [collection
-     ["." list]]]
-   [macro
-    ["." code]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["<>" parser]]
+    [data
+     ["." bit]
+     ["." name]
+     ["." text]
+     [collection
+      ["." list]]]
+    [macro
+     ["." code]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/parser/environment.lux b/stdlib/source/test/lux/control/parser/environment.lux
index 48b7bca54..68f98ea13 100644
--- a/stdlib/source/test/lux/control/parser/environment.lux
+++ b/stdlib/source/test/lux/control/parser/environment.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." dictionary]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." dictionary]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     ["/#" // ("#\." monad)]]])
 
diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux
index 0a4adcc83..6b6511e15 100644
--- a/stdlib/source/test/lux/control/parser/json.lux
+++ b/stdlib/source/test/lux/control/parser/json.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    ["." exception]
-    ["<>" parser]]
-   [data
-    ["." maybe]
-    ["." bit]
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]
-     ["." set]
-     ["." dictionary]
-     ["." row (#+ row) ("#\." functor)]]
-    [format
-     ["." json]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     ["." exception]
+     ["<>" parser]]
+    [data
+     ["." maybe]
+     ["." bit]
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]
+      ["." set]
+      ["." dictionary]
+      ["." row (#+ row) ("#\." functor)]]
+     [format
+      ["." json]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/parser/synthesis.lux b/stdlib/source/test/lux/control/parser/synthesis.lux
index 064891f2c..83211a95f 100644
--- a/stdlib/source/test/lux/control/parser/synthesis.lux
+++ b/stdlib/source/test/lux/control/parser/synthesis.lux
@@ -1,34 +1,35 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["<>" parser]
-    ["." try]
-    ["." exception]]
-   [data
-    ["." bit]
-    ["." name]
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." i64]
-     ["." frac]]]
-   [tool
-    [compiler
-     [reference (#+)
-      ["." variable (#+ Variable)]]
-     [language
-      [lux
-       [analysis (#+ Environment)]
-       ["." synthesis (#+ Synthesis)]]]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["<>" parser]
+     ["." try]
+     ["." exception]]
+    [data
+     ["." bit]
+     ["." name]
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." i64]
+      ["." frac]]]
+    [tool
+     [compiler
+      [reference (#+)
+       ["." variable (#+ Variable)]]
+      [language
+       [lux
+        [analysis (#+ Environment)]
+        ["." synthesis (#+ Synthesis)]]]]]]]
+  [\\library
    ["." /]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux
index 0ccad4208..d00a21d90 100644
--- a/stdlib/source/test/lux/control/parser/text.lux
+++ b/stdlib/source/test/lux/control/parser/text.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ Exception)]
-    ["." function]]
-   [data
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]
-     ["." unicode #_
-      ["#" set]
-      ["#/." block]]]
-    [collection
-     ["." set]
-     ["." list ("#\." functor)]
-     [tree
-      ["." finger]]]]
-   [math
-    ["." random]
-    [number (#+ hex)
-     ["n" nat]]]
-   [macro
-    ["." code]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ Exception)]
+     ["." function]]
+    [data
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]
+      ["." unicode #_
+       ["#" set]
+       ["#/." block]]]
+     [collection
+      ["." set]
+      ["." list ("#\." functor)]
+      [tree
+       ["." finger]]]]
+    [math
+     ["." random]
+     [number (#+ hex)
+      ["n" nat]]]
+    [macro
+     ["." code]]]]
+  [\\library
    ["." /
     ["<>" //
      ["<c>" code]]]])
diff --git a/stdlib/source/test/lux/control/parser/tree.lux b/stdlib/source/test/lux/control/parser/tree.lux
index f4daaf751..62c4ab04e 100644
--- a/stdlib/source/test/lux/control/parser/tree.lux
+++ b/stdlib/source/test/lux/control/parser/tree.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    [collection
-     ["." tree
-      ["." zipper]]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     [collection
+      ["." tree
+       ["." zipper]]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     ["/#" //]]])
 
diff --git a/stdlib/source/test/lux/control/parser/type.lux b/stdlib/source/test/lux/control/parser/type.lux
index d2a9bce32..7a8feca69 100644
--- a/stdlib/source/test/lux/control/parser/type.lux
+++ b/stdlib/source/test/lux/control/parser/type.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux (#- primitive)
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." name ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]
-   ["." type ("#\." equivalence)]]
-  [\\
+  [library
+   [lux (#- primitive)
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." name ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]
+    ["." type ("#\." equivalence)]]]
+  [\\library
    ["." /
     ["/#" //]]])
 
diff --git a/stdlib/source/test/lux/control/parser/xml.lux b/stdlib/source/test/lux/control/parser/xml.lux
index 435e3f4d3..aab371fa9 100644
--- a/stdlib/source/test/lux/control/parser/xml.lux
+++ b/stdlib/source/test/lux/control/parser/xml.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." type ("#\." equivalence)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." text ("#\." equivalence)]
-    ["." name ("#\." equivalence)]
-    [format
-     ["." xml]]
-    [collection
-     ["." dictionary]
-     ["." list]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." type ("#\." equivalence)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." text ("#\." equivalence)]
+     ["." name ("#\." equivalence)]
+     [format
+      ["." xml]]
+     [collection
+      ["." dictionary]
+      ["." list]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     ["/#" // ("#\." monad)]]])
 
diff --git a/stdlib/source/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux
index 61d7aab25..e38fafba4 100644
--- a/stdlib/source/test/lux/control/pipe.lux
+++ b/stdlib/source/test/lux/control/pipe.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." debug]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." identity]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." debug]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." identity]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/control/reader.lux b/stdlib/source/test/lux/control/reader.lux
index 9302a014c..b0edaa401 100644
--- a/stdlib/source/test/lux/control/reader.lux
+++ b/stdlib/source/test/lux/control/reader.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Reader)
     [//
      ["." io (#+ IO)]]]])
diff --git a/stdlib/source/test/lux/control/region.lux b/stdlib/source/test/lux/control/region.lux
index 5e21b3a37..2d2c5e1f9 100644
--- a/stdlib/source/test/lux/control/region.lux
+++ b/stdlib/source/test/lux/control/region.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   [type (#+ :share)]
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]
-    ["." enum]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    [type (#+ :share)]
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]
+     ["." enum]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Region)
     [//
      ["." thread (#+ Thread)]
diff --git a/stdlib/source/test/lux/control/remember.lux b/stdlib/source/test/lux/control/remember.lux
index 17c59b8a3..a96f993c9 100644
--- a/stdlib/source/test/lux/control/remember.lux
+++ b/stdlib/source/test/lux/control/remember.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." meta]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." io]
-    ["." try (#+ Try)]
-    ["." exception]
-    [parser
-     ["<c>" code]]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]]
-   [math
-    [number (#+ hex)]
-    ["." random (#+ Random) ("#\." monad)]]
-   [time
-    ["." date (#+ Date)]
-    ["." instant]
-    ["." duration]]
-   ["." macro
-    ["." code]
-    ["." syntax (#+ syntax:)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." meta]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." io]
+     ["." try (#+ Try)]
+     ["." exception]
+     [parser
+      ["<c>" code]]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]]
+    [math
+     [number (#+ hex)]
+     ["." random (#+ Random) ("#\." monad)]]
+    [time
+     ["." date (#+ Date)]
+     ["." instant]
+     ["." duration]]
+    ["." macro
+     ["." code]
+     ["." syntax (#+ syntax:)]]]]
+  [\\library
    ["." /]])
 
 (def: deadline (Random Date) random.date)
diff --git a/stdlib/source/test/lux/control/security/capability.lux b/stdlib/source/test/lux/control/security/capability.lux
index ef3d64d05..2798c21b2 100644
--- a/stdlib/source/test/lux/control/security/capability.lux
+++ b/stdlib/source/test/lux/control/security/capability.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io (#+ IO)]
-    [concurrency
-     ["." promise]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io (#+ IO)]
+     [concurrency
+      ["." promise]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (/.capability: (Can-Shift a)
diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux
index 0cf9729dd..87beb9a3a 100644
--- a/stdlib/source/test/lux/control/security/policy.lux
+++ b/stdlib/source/test/lux/control/security/policy.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [hash (#+ Hash)]
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [hash (#+ Hash)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Context Privacy Can_Conceal Can_Reveal Privilege Private)]])
 
 (def: (injection can_conceal)
diff --git a/stdlib/source/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux
index 6d6626522..2c1541dbf 100644
--- a/stdlib/source/test/lux/control/state.lux
+++ b/stdlib/source/test/lux/control/state.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    [pipe (#+ let>)]
-    ["." io]]
-   [data
-    ["." product]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     [pipe (#+ let>)]
+     ["." io]]
+    [data
+     ["." product]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ State)]])
 
 (def: (with-conditions [state output] computation)
diff --git a/stdlib/source/test/lux/control/thread.lux b/stdlib/source/test/lux/control/thread.lux
index d2369a0bc..f3ad379dd 100644
--- a/stdlib/source/test/lux/control/thread.lux
+++ b/stdlib/source/test/lux/control/thread.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Thread)
     [//
      ["." io]]]])
diff --git a/stdlib/source/test/lux/control/try.lux b/stdlib/source/test/lux/control/try.lux
index c2b00360f..9f131cffd 100644
--- a/stdlib/source/test/lux/control/try.lux
+++ b/stdlib/source/test/lux/control/try.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]
-     ["$." equivalence]]]
-   [control
-    pipe
-    ["." io]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]
+      ["$." equivalence]]]
+    [control
+     pipe
+     ["." io]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Try)]])
 
 (def: injection
diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux
index 1c007d9b1..8d440ddd0 100644
--- a/stdlib/source/test/lux/control/writer.lux
+++ b/stdlib/source/test/lux/control/writer.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monoid (#+ Monoid)]
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." io]]
-   [data
-    ["." product]
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monoid (#+ Monoid)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." io]]
+    [data
+     ["." product]
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / (#+ Writer)]])
 
 (def: (injection monoid value)
diff --git a/stdlib/source/test/lux/data.lux b/stdlib/source/test/lux/data.lux
index 33f0d963b..95576f815 100644
--- a/stdlib/source/test/lux/data.lux
+++ b/stdlib/source/test/lux/data.lux
@@ -1,10 +1,11 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [math
-    ["." random]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random]]]]
   ["." / #_
    ["#." binary]
    ["#." bit]
@@ -32,6 +33,7 @@
        body)))
 
 (def: format
+  Test
   ($_ _.and
       /format/binary.test
       /format/json.test
@@ -39,27 +41,36 @@
       /format/xml.test
       ))
 
+(def: test/0
+  Test
+  ($_ _.and
+      /binary.test
+      /bit.test
+      /color.test
+      /color/named.test))
+
+(def: test/1
+  Test
+  ($_ _.and
+      /identity.test
+      /lazy.test
+      /maybe.test
+      /name.test))
+
+(def: test/2
+  Test
+  ($_ _.and
+      /product.test
+      /sum.test
+      /text.test))
+
 (def: #export test
   Test
   ## TODO: Inline ASAP
-  (let [test0 ($_ _.and
-                  /binary.test
-                  /bit.test
-                  /color.test
-                  /color/named.test
-                  /identity.test)
-        test1 ($_ _.and
-                  /lazy.test
-                  /maybe.test
-                  /name.test
-                  /product.test)
-        test2 ($_ _.and
-                  /sum.test
-                  /text.test
-                  ..format
-                  /collection.test)]
-    ($_ _.and
-        (!bundle test0)
-        (!bundle test1)
-        (!bundle test2)
-        )))
+  ($_ _.and
+      (!bundle test/0)
+      (!bundle test/1)
+      (!bundle test/2)
+      (!bundle ..format)
+      (!bundle /collection.test)
+      ))
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]]]])
diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux
index 5c0a950dc..bbbf299d8 100644
--- a/stdlib/source/test/lux/debug.lux
+++ b/stdlib/source/test/lux/debug.lux
@@ -1,34 +1,35 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    ["." exception]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor)]]
-    [format
-     [json (#+ JSON)]
-     [xml (#+ XML)]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     [ratio (#+ Ratio)]]]
-   [time (#+ Time)
-    [instant (#+ Instant)]
-    [date (#+ Date)]
-    [duration (#+ Duration)]
-    [month (#+ Month)]
-    [day (#+ Day)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     ["." exception]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor)]]
+     [format
+      [json (#+ JSON)]
+      [xml (#+ XML)]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      [ratio (#+ Ratio)]]]
+    [time (#+ Time)
+     [instant (#+ Instant)]
+     [date (#+ Date)]
+     [duration (#+ Duration)]
+     [month (#+ Month)]
+     [day (#+ Day)]]]]
+  [\\library
    ["." /]]
   ["$." // #_
    ["#." type]
diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux
index c784788ba..39597a8a3 100644
--- a/stdlib/source/test/lux/extension.lux
+++ b/stdlib/source/test/lux/extension.lux
@@ -1,46 +1,47 @@
 (.module:
-  [lux #*
-   ["." debug]
-   ["@" target
-    ["." jvm]
-    ["." js]
-    ["." python]
-    ["." lua]
-    ["." ruby]
-    ["." php]
-    ["." scheme]]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["<.>" code]
-     ["<.>" analysis]
-     ["<.>" synthesis]]]
-   [data
-    ["." product]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." row]
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]
-   [tool
-    [compiler
-     ["." phase]
-     [language
-      [lux
-       ["." analysis]
-       ["." synthesis]
-       ["." directive]
-       [phase
-        [analysis
-         ["." type]]]]]]]
-   ["_" test (#+ Test)]]
-  [\\
+  [library
+   [lux #*
+    ["." debug]
+    ["@" target
+     ["." jvm]
+     ["." js]
+     ["." python]
+     ["." lua]
+     ["." ruby]
+     ["." php]
+     ["." scheme]]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["<.>" code]
+      ["<.>" analysis]
+      ["<.>" synthesis]]]
+    [data
+     ["." product]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." row]
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]
+    [tool
+     [compiler
+      ["." phase]
+      [language
+       [lux
+        ["." analysis]
+        ["." synthesis]
+        ["." directive]
+        [phase
+         [analysis
+          ["." type]]]]]]]
+    ["_" test (#+ Test)]]]
+  [\\library
    ["." / (#+ analysis: synthesis: generation: directive:)]])
 
 (def: my_analysis "my analysis")
diff --git a/stdlib/source/test/lux/ffi.js.lux b/stdlib/source/test/lux/ffi.js.lux
index e2c699dbd..70ca96929 100644
--- a/stdlib/source/test/lux/ffi.js.lux
+++ b/stdlib/source/test/lux/ffi.js.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (/.import: Uint8Array)
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index 7baa32fa2..ba02b1fc9 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." type ("#\." equivalence)]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." try]
-    ["." exception]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." array (#+ Array)]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int ("#\." equivalence)]
-     ["f" frac ("#\." equivalence)]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." type ("#\." equivalence)]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." try]
+     ["." exception]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." array (#+ Array)]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int ("#\." equivalence)]
+      ["f" frac ("#\." equivalence)]]]]]
+  [\\library
    ["." /]])
 
 (/.import: (java/util/concurrent/Callable a))
diff --git a/stdlib/source/test/lux/ffi.lua.lux b/stdlib/source/test/lux/ffi.lua.lux
index b05973bb8..c8d4ea6d5 100644
--- a/stdlib/source/test/lux/ffi.lua.lux
+++ b/stdlib/source/test/lux/ffi.lua.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux
index b7a4ba099..36ec40e21 100644
--- a/stdlib/source/test/lux/ffi.old.lux
+++ b/stdlib/source/test/lux/ffi.old.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ case>)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["f" frac]]]
-   ["." type ("#\." equivalence)]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]
+      ["f" frac]]]
+    ["." type ("#\." equivalence)]]]
+  [\\library
    ["." /]])
 
 (/.import: java/lang/Object)
diff --git a/stdlib/source/test/lux/ffi.php.lux b/stdlib/source/test/lux/ffi.php.lux
index b05973bb8..c8d4ea6d5 100644
--- a/stdlib/source/test/lux/ffi.php.lux
+++ b/stdlib/source/test/lux/ffi.php.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/ffi.py.lux b/stdlib/source/test/lux/ffi.py.lux
index b05973bb8..18aab4188 100644
--- a/stdlib/source/test/lux/ffi.py.lux
+++ b/stdlib/source/test/lux/ffi.py.lux
@@ -1,24 +1,61 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [math
+     ["." random]
+     [number
+      ["i" int]]]]]
+  [\\library
    ["." /]])
 
+(/.import: os
+  ["#::."
+   (#static R_OK /.Integer)
+   (#static W_OK /.Integer)])
+
 (def: #export test
   Test
   (do {! random.monad}
-    []
+    [boolean random.bit
+     integer random.int
+     float random.frac
+     string (random.ascii/lower 1)]
     (<| (_.covering /._)
-        (_.test "TBD"
-                true))))
+        (`` ($_ _.and
+                (~~ (template [<type> <sample>]
+                      [(_.cover [<type>]
+                                (exec
+                                  (: <type> <sample>)
+                                  true))]
+
+                      [/.Boolean boolean]
+                      [/.Integer integer]
+                      [/.Float float]
+                      [/.String string]
+                      ))
+                (_.for [/.Object]
+                       ($_ _.and
+                           (~~ (template [<type>]
+                                 [(_.cover [<type>]
+                                           (exec
+                                             (|> []
+                                                 (:as <type>)
+                                                 (: (Ex [a] (/.Object a))))
+                                             true))]
+
+                                 [/.None]
+                                 [/.Dict]
+                                 ))))
+                (_.cover [/.Function /.lambda]
+                         (exec
+                           (|> (/.lambda [input/0] input/0)
+                               (: /.Function)
+                               (: (Ex [a] (/.Object a))))
+                           true))
+                (_.cover [/.import:]
+                         (and (i.= (os::R_OK) (os::R_OK))
+                              (not (i.= (os::W_OK) (os::R_OK)))))
+                )))))
diff --git a/stdlib/source/test/lux/ffi.rb.lux b/stdlib/source/test/lux/ffi.rb.lux
index b05973bb8..c8d4ea6d5 100644
--- a/stdlib/source/test/lux/ffi.rb.lux
+++ b/stdlib/source/test/lux/ffi.rb.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/ffi.scm.lux b/stdlib/source/test/lux/ffi.scm.lux
index b05973bb8..c8d4ea6d5 100644
--- a/stdlib/source/test/lux/ffi.scm.lux
+++ b/stdlib/source/test/lux/ffi.scm.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]]
-   [data
-    ["." text ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]]
+    [data
+     ["." text ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." frac]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/locale.lux b/stdlib/source/test/lux/locale.lux
index a7949a62b..54b29cff7 100644
--- a/stdlib/source/test/lux/locale.lux
+++ b/stdlib/source/test/lux/locale.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["." encoding (#+ Encoding)]]
-    [collection
-     ["." list]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["." encoding (#+ Encoding)]]
+     [collection
+      ["." list]]]]]
   ["." / #_
    ["#." language]
    ["#." territory]]
-  [\\
+  [\\library
    ["." /
     ["." language (#+ Language)]
     ["." territory (#+ Territory)]]])
diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/locale/language.lux
index bce125224..39bc71aae 100644
--- a/stdlib/source/test/lux/locale/language.lux
+++ b/stdlib/source/test/lux/locale/language.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [hash (#+ Hash)]
-    [\spec
-     ["$." hash]]]
-   [data
-    ["." maybe]
-    ["." text]
-    [collection
-     ["." set (#+ Set)]
-     ["." list ("#\." functor fold)]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [hash (#+ Hash)]
+     [\\spec
+      ["$." hash]]]
+    [data
+     ["." maybe]
+     ["." text]
+     [collection
+      ["." set (#+ Set)]
+      ["." list ("#\." functor fold)]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (type: Bundle
@@ -178,7 +179,8 @@
         ..languages/x
         ..languages/y
         ..languages/z
-        ..languages/etc))
+        ..languages/etc
+        ))
 
 (def: (aggregate lens hash territories)
   (All [a] (-> (-> Bundle (Set a))
@@ -214,7 +216,7 @@
            (list.every? (\ /.equivalence = <reference>)
                         (`` (list (~~ (template.splice <aliases>)))))))
 
-(def: aliases_test
+(def: aliases_test/0
   Test
   ($_ _.and
       ## A
@@ -236,6 +238,11 @@
       (!aliases /.kachin [/.jingpho])
       (!aliases /.kalaallisut [/.greenlandic])
       (!aliases /.khotanese [/.sakan])
+      ))
+
+(def: aliases_test/1
+  Test
+  ($_ _.and
       ## M
       (!aliases /.mi'kmaq [/.micmac])
       ## N
@@ -260,6 +267,13 @@
       (!aliases /.zaza [/.dimili /.dimli /.kirdki /.kirmanjki /.zazaki])
       ))
 
+(def: aliases_test
+  Test
+  ($_ _.and
+      ..aliases_test/0
+      ..aliases_test/1
+      ))
+
 (def: #export random
   (Random /.Language)
   (let [options (|> ..languages
diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux
index 61692050b..fadbe2890 100644
--- a/stdlib/source/test/lux/locale/territory.lux
+++ b/stdlib/source/test/lux/locale/territory.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [hash (#+ Hash)]
-    [\spec
-     ["$." hash]]]
-   [data
-    ["." maybe]
-    ["." text]
-    [collection
-     ["." set (#+ Set)]
-     ["." list ("#\." functor fold)]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [hash (#+ Hash)]
+     [\\spec
+      ["$." hash]]]
+    [data
+     ["." maybe]
+     ["." text]
+     [collection
+      ["." set (#+ Set)]
+      ["." list ("#\." functor fold)]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (type: Bundle
diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux
index 7864fb686..98d3ead2b 100644
--- a/stdlib/source/test/lux/macro.lux
+++ b/stdlib/source/test/lux/macro.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." name]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]]]
-   ["." meta
-    ["." location]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." name]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]]]
+    ["." meta
+     ["." location]]]]
+  [\\library
    ["." /
     [syntax (#+ syntax:)]
     ["." code ("#\." equivalence)]
diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux
index 93ed2c19b..576ccb54a 100644
--- a/stdlib/source/test/lux/macro/code.lux
+++ b/stdlib/source/test/lux/macro/code.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." product]
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]
-   [meta
-    ["." location]]
-   [tool
-    [compiler
-     [language
-      [lux
-       ["." syntax]]]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." product]
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]
+    [meta
+     ["." location]]
+    [tool
+     [compiler
+      [language
+       [lux
+        ["." syntax]]]]]]]
+  [\\library
    ["." /]])
 
 (def: random_text
diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/macro/local.lux
index d125a2af4..cbe6f0e3a 100644
--- a/stdlib/source/test/lux/macro/local.lux
+++ b/stdlib/source/test/lux/macro/local.lux
@@ -1,29 +1,30 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    [text
-     ["%" format]]
-    [collection
-     ["." list]
-     [dictionary
-      ["." plist]]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     [text
+      ["%" format]]
+     [collection
+      ["." list]
+      [dictionary
+       ["." plist]]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (syntax: (macro_error macro)
diff --git a/stdlib/source/test/lux/macro/poly.lux b/stdlib/source/test/lux/macro/poly.lux
index d15e96d3d..90c57c87c 100644
--- a/stdlib/source/test/lux/macro/poly.lux
+++ b/stdlib/source/test/lux/macro/poly.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
+  [\\library
    ["." /]]
   ["." / #_
    ["#." equivalence]
diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux
index a43da2d84..c8cd7c7bf 100644
--- a/stdlib/source/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/test/lux/macro/poly/equivalence.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["%" data/text/format (#+ format)]
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)
-     [\poly
-      ["." /]]]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." bit]
-    ["." maybe]
-    ["." text]
-    [collection
-     ["." list]]]
-   [macro
-    [poly (#+ derived:)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]])
+  [library
+   [lux #*
+    ["%" data/text/format (#+ format)]
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)
+      [\\poly
+       ["." /]]]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." bit]
+     ["." maybe]
+     ["." text]
+     [collection
+      ["." list]]]
+    [macro
+     [poly (#+ derived:)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]])
 
 (type: Variant
   (#Case0 Bit)
diff --git a/stdlib/source/test/lux/macro/poly/functor.lux b/stdlib/source/test/lux/macro/poly/functor.lux
index 8d94cf852..6eebf2d55 100644
--- a/stdlib/source/test/lux/macro/poly/functor.lux
+++ b/stdlib/source/test/lux/macro/poly/functor.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["%" data/text/format (#+ format)]
-   [abstract
-    [monad (#+ do)]
-    [functor
-     [\poly
-      ["." /]]]]
-   ["r" math/random (#+ Random)]
-   ["_" test (#+ Test)]
-   [control
-    ["." state]]
-   [data
-    ["." identity]]
-   [macro
-    [poly (#+ derived:)]]])
+  [library
+   [lux #*
+    ["%" data/text/format (#+ format)]
+    [abstract
+     [monad (#+ do)]
+     [functor
+      [\\poly
+       ["." /]]]]
+    ["r" math/random (#+ Random)]
+    ["_" test (#+ Test)]
+    [control
+     ["." state]]
+    [data
+     ["." identity]]
+    [macro
+     [poly (#+ derived:)]]]])
 
 (derived: maybe_functor (/.functor .Maybe))
 (derived: list_functor (/.functor .List))
diff --git a/stdlib/source/test/lux/macro/poly/json.lux b/stdlib/source/test/lux/macro/poly/json.lux
index 91ad9b010..e369dac92 100644
--- a/stdlib/source/test/lux/macro/poly/json.lux
+++ b/stdlib/source/test/lux/macro/poly/json.lux
@@ -1,48 +1,49 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." debug]
-   [abstract
-    codec
-    [monad (#+ do)]
-    ["." equivalence (#+ Equivalence)
-     ["poly/#" \poly]]
-    [\spec
-     ["$." equivalence]
-     ["$." codec]]]
-   [control
-    pipe
-    ["." try]
-    ["p" parser
-     ## TODO: Get rid of this import ASAP
-     [json (#+)]]]
-   [data
-    ["." bit]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [format
-     [json (#+)
-      [\poly
-       ["." /]]]]
-    [collection
-     [row (#+ row)]
-     ["d" dictionary]
-     ["." list]]]
-   [macro
-    [poly (#+ derived:)]]
-   [type
-    ["." unit]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." frac]]]
-   [time
-    ["ti" instant]
-    ["tda" date]
-    ## ["tdu" duration]
-    ]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." debug]
+    [abstract
+     codec
+     [monad (#+ do)]
+     ["." equivalence (#+ Equivalence)
+      ["poly/#" \\poly]]
+     [\\spec
+      ["$." equivalence]
+      ["$." codec]]]
+    [control
+     pipe
+     ["." try]
+     ["p" parser
+      ## TODO: Get rid of this import ASAP
+      [json (#+)]]]
+    [data
+     ["." bit]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [format
+      [json (#+)
+       [\\poly
+        ["." /]]]]
+     [collection
+      [row (#+ row)]
+      ["d" dictionary]
+      ["." list]]]
+    [macro
+     [poly (#+ derived:)]]
+    [type
+     ["." unit]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." frac]]]
+    [time
+     ["ti" instant]
+     ["tda" date]
+     ## ["tdu" duration]
+     ]]]
   [test
    [lux
     [time
diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux
index 057565f3d..35d680974 100644
--- a/stdlib/source/test/lux/macro/syntax.lux
+++ b/stdlib/source/test/lux/macro/syntax.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
    ["." /]]
   ["." / #_
    ["#." annotations]
diff --git a/stdlib/source/test/lux/macro/syntax/annotations.lux b/stdlib/source/test/lux/macro/syntax/annotations.lux
index fdee0ffa5..00d71c949 100644
--- a/stdlib/source/test/lux/macro/syntax/annotations.lux
+++ b/stdlib/source/test/lux/macro/syntax/annotations.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try]
-    [parser
-     ["<.>" code]]]
-   [data
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try]
+     [parser
+      ["<.>" code]]]
+    [data
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]]
   ["$." /// #_
    ["#." code]])
diff --git a/stdlib/source/test/lux/macro/syntax/check.lux b/stdlib/source/test/lux/macro/syntax/check.lux
index 59f5c1a0b..626471c73 100644
--- a/stdlib/source/test/lux/macro/syntax/check.lux
+++ b/stdlib/source/test/lux/macro/syntax/check.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["<.>" code]]]
-   [math
-    ["." random (#+ Random)]]
-   [macro
-    ["." code ("#\." equivalence)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["<.>" code]]]
+    [math
+     ["." random (#+ Random)]]
+    [macro
+     ["." code ("#\." equivalence)]]]]
+  [\\library
    ["." /]]
   ["$." /// #_
    ["#." code]])
diff --git a/stdlib/source/test/lux/macro/syntax/declaration.lux b/stdlib/source/test/lux/macro/syntax/declaration.lux
index 555c3138e..761ba87cc 100644
--- a/stdlib/source/test/lux/macro/syntax/declaration.lux
+++ b/stdlib/source/test/lux/macro/syntax/declaration.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try]
-    [parser
-     ["<.>" code]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try]
+     [parser
+      ["<.>" code]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export random
diff --git a/stdlib/source/test/lux/macro/syntax/definition.lux b/stdlib/source/test/lux/macro/syntax/definition.lux
index 48719ac17..c98b1e853 100644
--- a/stdlib/source/test/lux/macro/syntax/definition.lux
+++ b/stdlib/source/test/lux/macro/syntax/definition.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try]
-    ["." exception]
-    ["<>" parser
-     ["<.>" code]]]
-   [math
-    ["." random (#+ Random)]]
-   [macro
-    ["." code ("#\." equivalence)]]
-   [meta
-    ["." location]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try]
+     ["." exception]
+     ["<>" parser
+      ["<.>" code]]]
+    [math
+     ["." random (#+ Random)]]
+    [macro
+     ["." code ("#\." equivalence)]]
+    [meta
+     ["." location]]]]
+  [\\library
    ["." /]]
   ["$."// #_
    ["#." check]
diff --git a/stdlib/source/test/lux/macro/syntax/export.lux b/stdlib/source/test/lux/macro/syntax/export.lux
index 10e86fd20..6e93f2e4b 100644
--- a/stdlib/source/test/lux/macro/syntax/export.lux
+++ b/stdlib/source/test/lux/macro/syntax/export.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/macro/syntax/input.lux b/stdlib/source/test/lux/macro/syntax/input.lux
index bf22a9c17..34357f79a 100644
--- a/stdlib/source/test/lux/macro/syntax/input.lux
+++ b/stdlib/source/test/lux/macro/syntax/input.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try]
-    [parser
-     ["<.>" code]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try]
+     [parser
+      ["<.>" code]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]]
   ["$." /// #_
    ["#." code]])
diff --git a/stdlib/source/test/lux/macro/syntax/type/variable.lux b/stdlib/source/test/lux/macro/syntax/type/variable.lux
index d2ac5d86e..8ff84f36f 100644
--- a/stdlib/source/test/lux/macro/syntax/type/variable.lux
+++ b/stdlib/source/test/lux/macro/syntax/type/variable.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    ["." try ("#\." functor)]
-    [parser
-     ["<.>" code]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     ["." try ("#\." functor)]
+     [parser
+      ["<.>" code]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /]])
 
 (def: #export random
diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux
index 12e503e33..fc1d62f11 100644
--- a/stdlib/source/test/lux/macro/template.lux
+++ b/stdlib/source/test/lux/macro/template.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    [collection
-     ["." list]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     [collection
+      ["." list]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]]]]]
+  [\\library
    ["." /]])
 
 (/.let [(!pow/2 <scalar>)
diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux
index fc9de2f8f..a43d63a2b 100644
--- a/stdlib/source/test/lux/math.lux
+++ b/stdlib/source/test/lux/math.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["f" frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]
+      ["f" frac]]]]]
+  [\\library
    ["." /]]
   ["." / #_
    ["#." infix]
diff --git a/stdlib/source/test/lux/math/infix.lux b/stdlib/source/test/lux/math/infix.lux
index 29a3cfcab..2dafd35aa 100644
--- a/stdlib/source/test/lux/math/infix.lux
+++ b/stdlib/source/test/lux/math/infix.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["f" frac]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["f" frac]]]]]
+  [\\library
    ["." /
     ["." //]]])
 
diff --git a/stdlib/source/test/lux/math/logic/continuous.lux b/stdlib/source/test/lux/math/logic/continuous.lux
index ceb4ca33b..5ff4c46cc 100644
--- a/stdlib/source/test/lux/math/logic/continuous.lux
+++ b/stdlib/source/test/lux/math/logic/continuous.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." monoid]]]
-   [math
-    ["." random]
-    [number
-     ["r" rev]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." monoid]]]
+    [math
+     ["." random]
+     [number
+      ["r" rev]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux
index 3da2e4cc9..ea39da68a 100644
--- a/stdlib/source/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/test/lux/math/logic/fuzzy.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]
-    [\spec
-     [functor
-      ["$." contravariant]]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." list]
-     ["." set]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["r" rev]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]
+     [\\spec
+      [functor
+       ["$." contravariant]]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." list]
+      ["." set]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["r" rev]]]]]
+  [\\library
    ["." / (#+ Fuzzy)
     ["/#" // #_
      ["#" continuous]]]])
diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux
index 21d451472..5322b162b 100644
--- a/stdlib/source/test/lux/math/modular.lux
+++ b/stdlib/source/test/lux/math/modular.lux
@@ -1,28 +1,29 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." type ("#\." equivalence)]
-   [abstract
-    [monad (#+ do)]
-    ["." predicate]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." monoid]
-     ["$." codec]]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." product]
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["i" int]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." type ("#\." equivalence)]
+    [abstract
+     [monad (#+ do)]
+     ["." predicate]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." monoid]
+      ["$." codec]]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." product]
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["i" int]]]]]
   ["$." // #_
    ["#" modulus]]
-  [\\
+  [\\library
    ["." /
     ["/#" // #_
      ["#" modulus]]]])
diff --git a/stdlib/source/test/lux/math/modulus.lux b/stdlib/source/test/lux/math/modulus.lux
index af3a3dc5b..af040b645 100644
--- a/stdlib/source/test/lux/math/modulus.lux
+++ b/stdlib/source/test/lux/math/modulus.lux
@@ -1,20 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["i" int]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["i" int]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]]]
+  [\\library
    ["." /]])
 
 (syntax: (|divisor|)
diff --git a/stdlib/source/test/lux/math/number.lux b/stdlib/source/test/lux/math/number.lux
index 99cf72928..b13fa5cf8 100644
--- a/stdlib/source/test/lux/math/number.lux
+++ b/stdlib/source/test/lux/math/number.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [control
-    ["." try]]
-   [data
-    ["." text]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [control
+     ["." try]]
+    [data
+     ["." text]]]]
+  [\\library
    ["." /
     ["n" nat]
     ["i" int]
diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux
index d32abc2c5..2670d53dc 100644
--- a/stdlib/source/test/lux/math/number/complex.lux
+++ b/stdlib/source/test/lux/math/number/complex.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["%" data/text/format (#+ format)]
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." codec]]]
-   [data
-    [collection
-     ["." list ("#\." functor)]]]
-   ["." math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["%" data/text/format (#+ format)]
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." codec]]]
+    [data
+     [collection
+      ["." list ("#\." functor)]]]
+    ["." math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux
index eb981a5b0..093511510 100644
--- a/stdlib/source/test/lux/math/number/frac.lux
+++ b/stdlib/source/test/lux/math/number/frac.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["@" target]
-   ["." ffi]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["@" target]
+    ["." ffi]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [// #*
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/i16.lux b/stdlib/source/test/lux/math/number/i16.lux
index 4450cf88e..4720a13b7 100644
--- a/stdlib/source/test/lux/math/number/i16.lux
+++ b/stdlib/source/test/lux/math/number/i16.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     ["/#" // #_
      ["i" int]
diff --git a/stdlib/source/test/lux/math/number/i32.lux b/stdlib/source/test/lux/math/number/i32.lux
index 8b2d0e5f2..66d65fa40 100644
--- a/stdlib/source/test/lux/math/number/i32.lux
+++ b/stdlib/source/test/lux/math/number/i32.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     ["/#" // #_
      ["i" int]
diff --git a/stdlib/source/test/lux/math/number/i64.lux b/stdlib/source/test/lux/math/number/i64.lux
index 129d2bb84..942930af0 100644
--- a/stdlib/source/test/lux/math/number/i64.lux
+++ b/stdlib/source/test/lux/math/number/i64.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." / ("\." equivalence)
     [// (#+ hex)
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/i8.lux b/stdlib/source/test/lux/math/number/i8.lux
index 1f5c7de42..c5fee1fcf 100644
--- a/stdlib/source/test/lux/math/number/i8.lux
+++ b/stdlib/source/test/lux/math/number/i8.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     ["/#" // #_
      ["i" int]
diff --git a/stdlib/source/test/lux/math/number/int.lux b/stdlib/source/test/lux/math/number/int.lux
index f339b3ac4..47e381985 100644
--- a/stdlib/source/test/lux/math/number/int.lux
+++ b/stdlib/source/test/lux/math/number/int.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." enum]
-     ["$." interval]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." enum]
+      ["$." interval]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/nat.lux b/stdlib/source/test/lux/math/number/nat.lux
index 26a872067..ff3eb64d1 100644
--- a/stdlib/source/test/lux/math/number/nat.lux
+++ b/stdlib/source/test/lux/math/number/nat.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." enum]
-     ["$." interval]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." enum]
+      ["$." interval]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /
     [//
      ["f" frac]]]])
diff --git a/stdlib/source/test/lux/math/number/ratio.lux b/stdlib/source/test/lux/math/number/ratio.lux
index 8e8aeb0d0..838e8ca81 100644
--- a/stdlib/source/test/lux/math/number/ratio.lux
+++ b/stdlib/source/test/lux/math/number/ratio.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." maybe ("#\." functor)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." maybe ("#\." functor)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      ["n" nat ("#\." equivalence)]]]])
diff --git a/stdlib/source/test/lux/math/number/rev.lux b/stdlib/source/test/lux/math/number/rev.lux
index e4d6b81f7..70ab24c61 100644
--- a/stdlib/source/test/lux/math/number/rev.lux
+++ b/stdlib/source/test/lux/math/number/rev.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." enum]
-     ["$." interval]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." enum]
+      ["$." interval]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /
     [// (#+ hex)
      ["n" nat]
diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux
index b8aa1ff8b..3b3bf1ae2 100644
--- a/stdlib/source/test/lux/meta.lux
+++ b/stdlib/source/test/lux/meta.lux
@@ -1,33 +1,34 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." type ("#\." equivalence)]
-   [abstract
-    [equivalence (#+ Equivalence)]
-    [monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    ["." try (#+ Try) ("#\." functor)]]
-   [data
-    ["." product]
-    ["." maybe]
-    ["." bit ("#\." equivalence)]
-    ["." name ("#\." equivalence)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor monoid)]
-     ["." set]]]
-   [meta
-    ["." location]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." type ("#\." equivalence)]
+    [abstract
+     [equivalence (#+ Equivalence)]
+     [monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     ["." try (#+ Try) ("#\." functor)]]
+    [data
+     ["." product]
+     ["." maybe]
+     ["." bit ("#\." equivalence)]
+     ["." name ("#\." equivalence)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor monoid)]
+      ["." set]]]
+    [meta
+     ["." location]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]]
   ["." / #_
    ["#." annotation]
diff --git a/stdlib/source/test/lux/meta/annotation.lux b/stdlib/source/test/lux/meta/annotation.lux
index 791e5759a..88ffb18d0 100644
--- a/stdlib/source/test/lux/meta/annotation.lux
+++ b/stdlib/source/test/lux/meta/annotation.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    ["." product]
-    ["." bit]
-    ["." name ("#\." equivalence)]
-    ["." text]
-    [collection
-     ["." list ("#\." functor)]]]
-   [macro
-    ["." code ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]
-     ["." int]
-     ["." rev]
-     ["." frac]]]]
-  [\\
-   ["." /]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     ["." product]
+     ["." bit]
+     ["." name ("#\." equivalence)]
+     ["." text]
+     [collection
+      ["." list ("#\." functor)]]]
+    [macro
+     ["." code ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]
+      ["." int]
+      ["." rev]
+      ["." frac]]]]]
   [///
    [macro
-    ["_." code]]])
+    ["_." code]]]
+  [\\library
+   ["." /]])
 
 (def: random_key
   (Random Name)
diff --git a/stdlib/source/test/lux/meta/location.lux b/stdlib/source/test/lux/meta/location.lux
index 6e005bd5f..2aaa797a0 100644
--- a/stdlib/source/test/lux/meta/location.lux
+++ b/stdlib/source/test/lux/meta/location.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." text]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." text]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /]]
   ["$." /// #_
    [macro
diff --git a/stdlib/source/test/lux/program.lux b/stdlib/source/test/lux/program.lux
index 2da869ab5..ec605af3b 100644
--- a/stdlib/source/test/lux/program.lux
+++ b/stdlib/source/test/lux/program.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["." try]
-    ["<>" parser
-     ["<.>" code]
-     ["<.>" cli]]]
-   [data
-    ["." text]
-    [collection
-     ["." list]]]
-   [macro
-    [syntax (#+ syntax:)]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["." try]
+     ["<>" parser
+      ["<.>" code]
+      ["<.>" cli]]]
+    [data
+     ["." text]
+     [collection
+      ["." list]]]
+    [macro
+     [syntax (#+ syntax:)]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]])
 
 (syntax: (actual_program {actual_program (<| <code>.form
diff --git a/stdlib/source/test/lux/target.lux b/stdlib/source/test/lux/target.lux
index 3158b76ee..e9c2594fc 100644
--- a/stdlib/source/test/lux/target.lux
+++ b/stdlib/source/test/lux/target.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [data
-    ["." text]
-    [collection
-     ["." list]
-     ["." set (#+ Set)]]]
-   [math
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [data
+     ["." text]
+     [collection
+      ["." list]
+      ["." set (#+ Set)]]]
+    [math
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (with_expansions [<targets> (as_is /.old
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux
index 218f3df42..3486821ce 100644
--- a/stdlib/source/test/lux/target/jvm.lux
+++ b/stdlib/source/test/lux/target/jvm.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux (#- Type type primitive int)
-   ["." ffi (#+ import:)]
-   ["@" target]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["." io]
-    ["." try]
-    [concurrency
-     ["." atom]]]
-   [data
-    ["." maybe]
-    ["." bit ("#\." equivalence)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    ["." format #_
-     ["#" binary]]
-    [collection
-     ["." array]
-     ["." dictionary]
-     ["." row]
-     ["." set]
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]
-     ["i" int]
-     ["f" frac]
-     ["." i32 (#+ I32)]
-     ["." i64]]]
-   ["_" test (#+ Test)]]
-  [\\
+  [library
+   [lux (#- Type type primitive int)
+    ["." ffi (#+ import:)]
+    ["@" target]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["." io]
+     ["." try]
+     [concurrency
+      ["." atom]]]
+    [data
+     ["." maybe]
+     ["." bit ("#\." equivalence)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     ["." format #_
+      ["#" binary]]
+     [collection
+      ["." array]
+      ["." dictionary]
+      ["." row]
+      ["." set]
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]
+      ["i" int]
+      ["f" frac]
+      ["." i32 (#+ I32)]
+      ["." i64]]]
+    ["_" test (#+ Test)]]]
+  [\\library
    ["." / #_
     ["#." loader (#+ Library)]
     ["#." version]
diff --git a/stdlib/source/test/lux/test.lux b/stdlib/source/test/lux/test.lux
index ede26191c..9c3e0f506 100644
--- a/stdlib/source/test/lux/test.lux
+++ b/stdlib/source/test/lux/test.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["." exception]
-    [concurrency
-     ["." promise]
-     ["." atom (#+ Atom)]]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["." exception]
+     [concurrency
+      ["." promise]
+      ["." atom (#+ Atom)]]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: (verify expected_message/0 expected_message/1 successes failures [tally message])
diff --git a/stdlib/source/test/lux/time.lux b/stdlib/source/test/lux/time.lux
index 6b321d1ce..17b17c61a 100644
--- a/stdlib/source/test/lux/time.lux
+++ b/stdlib/source/test/lux/time.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." enum]
-     ["$." codec]]]
-   [control
-    [pipe (#+ case>)]
-    ["." try ("#\." functor)]
-    ["." exception]
-    [parser
-     ["<.>" text]]]
-   [data
-    ["." text
-     ["%" format (#+ format)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." enum]
+      ["$." codec]]]
+    [control
+     [pipe (#+ case>)]
+     ["." try ("#\." functor)]
+     ["." exception]
+     [parser
+      ["<.>" text]]]
+    [data
+     ["." text
+      ["%" format (#+ format)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
   ["." / #_
    ["#." date]
    ["#." day]
@@ -28,7 +29,7 @@
    ["#." instant]
    ["#." month]
    ["#." year]]
-  [\\
+  [\\library
    ["." /
     ["." duration]]])
 
diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux
index fdf78d535..cb9d46978 100644
--- a/stdlib/source/test/lux/time/date.lux
+++ b/stdlib/source/test/lux/time/date.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." enum]
-     ["$." codec]]]
-   [control
-    ["." try ("#\." functor)]
-    ["." exception]
-    [parser
-     ["<.>" text]]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." enum]
+      ["$." codec]]]
+    [control
+     ["." try ("#\." functor)]
+     ["." exception]
+     [parser
+      ["<.>" text]]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/time/day.lux b/stdlib/source/test/lux/time/day.lux
index 3245c69b6..d2499309b 100644
--- a/stdlib/source/test/lux/time/day.lux
+++ b/stdlib/source/test/lux/time/day.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." enum]
-     ["$." codec]]]
-   [control
-    ["." try]
-    ["." exception]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." enum]
+      ["$." codec]]]
+    [control
+     ["." try]
+     ["." exception]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]]]
+  [\\library
    ["." /]])
 
 (def: #export random
diff --git a/stdlib/source/test/lux/time/duration.lux b/stdlib/source/test/lux/time/duration.lux
index 7ca984beb..a3014cc1a 100644
--- a/stdlib/source/test/lux/time/duration.lux
+++ b/stdlib/source/test/lux/time/duration.lux
@@ -1,22 +1,23 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." enum]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." enum]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/time/instant.lux b/stdlib/source/test/lux/time/instant.lux
index 80a43472b..6fef2f55e 100644
--- a/stdlib/source/test/lux/time/instant.lux
+++ b/stdlib/source/test/lux/time/instant.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." enum]
-     ["$." codec]]]
-   [control
-    ["." function]
-    ["." try]
-    ["." io]]
-   [data
-    [collection
-     ["." list ("#\." fold)]]]
-   [math
-    ["." random]]
-   [time
-    ["." duration (#+ Duration)]
-    ["." day (#+ Day) ("#\." enum)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." enum]
+      ["$." codec]]]
+    [control
+     ["." function]
+     ["." try]
+     ["." io]]
+    [data
+     [collection
+      ["." list ("#\." fold)]]]
+    [math
+     ["." random]]
+    [time
+     ["." duration (#+ Duration)]
+     ["." day (#+ Day) ("#\." enum)]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/time/month.lux b/stdlib/source/test/lux/time/month.lux
index dac255f2c..202048cac 100644
--- a/stdlib/source/test/lux/time/month.lux
+++ b/stdlib/source/test/lux/time/month.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    ["." predicate]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." enum]
-     ["$." codec]]]
-   [control
-    ["." try ("#\." functor)]
-    ["." exception]]
-   [data
-    [collection
-     ["." set]
-     ["." list ("#\." functor fold)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     ["." predicate]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." enum]
+      ["$." codec]]]
+    [control
+     ["." try ("#\." functor)]
+     ["." exception]]
+    [data
+     [collection
+      ["." set]
+      ["." list ("#\." functor fold)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     [//
      ["." duration]]]])
diff --git a/stdlib/source/test/lux/time/year.lux b/stdlib/source/test/lux/time/year.lux
index 97c416c11..ba364eaab 100644
--- a/stdlib/source/test/lux/time/year.lux
+++ b/stdlib/source/test/lux/time/year.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." codec]]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [text
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." codec]]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [text
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /
     ["/#" //
      ["#." duration]
diff --git a/stdlib/source/test/lux/tool.lux b/stdlib/source/test/lux/tool.lux
index 5452fbb65..ebda4eb93 100644
--- a/stdlib/source/test/lux/tool.lux
+++ b/stdlib/source/test/lux/tool.lux
@@ -1,6 +1,7 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
   ["." / #_
    [compiler
     [language
diff --git a/stdlib/source/test/lux/type.lux b/stdlib/source/test/lux/type.lux
index cae8a8773..3a01acaab 100644
--- a/stdlib/source/test/lux/type.lux
+++ b/stdlib/source/test/lux/type.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [control
-    [pipe (#+ case>)]]
-   [data
-    ["." maybe]
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list]
-     ["." array]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [control
+     [pipe (#+ case>)]]
+    [data
+     ["." maybe]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list]
+      ["." array]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." / ("#\." equivalence)]]
   ["." / #_
    ["#." abstract]
@@ -192,12 +193,31 @@
                                          example
                                          
                                          (List a)))))
-          (do {! random.monad}
+          (do random.monad
             [sample random.nat]
             (_.cover [/.:log!]
                      (exec
                        (/.:log! sample)
                        true)))
+          (do random.monad
+            [left random.nat
+             right (random.ascii/lower 1)
+             #let [left,right [left right]]]
+            (_.cover [/.:cast]
+                     (|> left,right
+                         (/.:cast [l r] (& l r) (| l r))
+                         (/.:cast [l r] (| l r) (& l r))
+                         (is? left,right))))
+          (do random.monad
+            [expected random.nat]
+            (_.cover [/.:share]
+                     (n.= expected
+                          (/.:share [a]
+                                    (I64 a)
+                                    expected
+
+                                    (I64 a)
+                                    (.i64 expected)))))
 
           /abstract.test
           /check.test
diff --git a/stdlib/source/test/lux/type/abstract.lux b/stdlib/source/test/lux/type/abstract.lux
index a023e1350..47d478f3f 100644
--- a/stdlib/source/test/lux/type/abstract.lux
+++ b/stdlib/source/test/lux/type/abstract.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." text ("#\." equivalence)]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]
-   ["." math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." text ("#\." equivalence)]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]
+    ["." math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (template.with_locals [g!Foo g!Bar]
diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux
index b9f0f570f..949009d5b 100644
--- a/stdlib/source/test/lux/type/check.lux
+++ b/stdlib/source/test/lux/type/check.lux
@@ -1,32 +1,33 @@
 (.module:
-  [lux (#- type)
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]
-    [\spec
-     ["$." functor (#+ Injection Comparison)]
-     ["$." apply]
-     ["$." monad]]]
-   [control
-    [pipe (#+ case>)]
-    ["." function]
-    ["." try]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." product]
-    ["." maybe]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." functor monoid)]
-     ["." set]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]
-    [number
-     ["n" nat]]]
-   ["." type ("#\." equivalence)]]
-  [\\
+  [library
+   [lux (#- type)
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]
+     [\\spec
+      ["$." functor (#+ Injection Comparison)]
+      ["$." apply]
+      ["$." monad]]]
+    [control
+     [pipe (#+ case>)]
+     ["." function]
+     ["." try]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." product]
+     ["." maybe]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." functor monoid)]
+      ["." set]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]
+     [number
+      ["n" nat]]]
+    ["." type ("#\." equivalence)]]]
+  [\\library
    ["." /]])
 
 ## TODO: Remove the following 3 definitions ASAP. //.type already exists...
diff --git a/stdlib/source/test/lux/type/dynamic.lux b/stdlib/source/test/lux/type/dynamic.lux
index f9b5472f4..0c743cabf 100644
--- a/stdlib/source/test/lux/type/dynamic.lux
+++ b/stdlib/source/test/lux/type/dynamic.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: #export test
diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux
index 0387c1dd2..bf6db29e6 100644
--- a/stdlib/source/test/lux/type/implicit.lux
+++ b/stdlib/source/test/lux/type/implicit.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [equivalence (#+)]
-    [functor (#+)]
-    [monoid (#+)]
-    [monad (#+ do)]
-    ["." enum]]
-   [data
-    ["." bit ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [equivalence (#+)]
+     [functor (#+)]
+     [monoid (#+)]
+     [monad (#+ do)]
+     ["." enum]]
+    [data
+     ["." bit ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (/.implicit: [n.multiplication])
diff --git a/stdlib/source/test/lux/type/quotient.lux b/stdlib/source/test/lux/type/quotient.lux
index 962d2d2aa..11d711ac7 100644
--- a/stdlib/source/test/lux/type/quotient.lux
+++ b/stdlib/source/test/lux/type/quotient.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    ["." monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat ("#\." equivalence)]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     ["." monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat ("#\." equivalence)]]]]]
+  [\\library
    ["." /]])
 
 (def: #export (random class super)
diff --git a/stdlib/source/test/lux/type/refinement.lux b/stdlib/source/test/lux/type/refinement.lux
index 1e4e4da3b..6ee53edcd 100644
--- a/stdlib/source/test/lux/type/refinement.lux
+++ b/stdlib/source/test/lux/type/refinement.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [predicate (#+ Predicate)]
-    [monad (#+ do)]]
-   [data
-    ["." maybe ("#\." monad)]
-    [collection
-     ["." list ("#\." functor)]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [predicate (#+ Predicate)]
+     [monad (#+ do)]]
+    [data
+     ["." maybe ("#\." monad)]
+     [collection
+      ["." list ("#\." functor)]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (def: _refiner
diff --git a/stdlib/source/test/lux/type/resource.lux b/stdlib/source/test/lux/type/resource.lux
index e5061dc1e..859e8ca3f 100644
--- a/stdlib/source/test/lux/type/resource.lux
+++ b/stdlib/source/test/lux/type/resource.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." meta]
-   [abstract
-    ["." monad
-     [indexed (#+ do)]]]
-   [control
-    ["." io]
-    ["." try]
-    ["." exception (#+ Exception)]
-    [concurrency
-     ["." promise]]
-    [parser
-     ["<.>" code]]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   ["." macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." meta]
+    [abstract
+     ["." monad
+      [indexed (#+ do)]]]
+    [control
+     ["." io]
+     ["." try]
+     ["." exception (#+ Exception)]
+     [concurrency
+      ["." promise]]
+     [parser
+      ["<.>" code]]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    ["." macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." / (#+ Res)]])
 
 (def: pure
diff --git a/stdlib/source/test/lux/type/unit.lux b/stdlib/source/test/lux/type/unit.lux
index aecce2374..6789d7b65 100644
--- a/stdlib/source/test/lux/type/unit.lux
+++ b/stdlib/source/test/lux/type/unit.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." debug]
-   ["." meta]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." enum]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["i" int]
-     ["." ratio ("#\." equivalence)]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." debug]
+    ["." meta]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." enum]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["i" int]
+      ["." ratio ("#\." equivalence)]]]]]
+  [\\library
    ["." /]])
 
 (template [<name> <type> <unit>]
diff --git a/stdlib/source/test/lux/type/variance.lux b/stdlib/source/test/lux/type/variance.lux
index d8f5aebf2..b0987e833 100644
--- a/stdlib/source/test/lux/type/variance.lux
+++ b/stdlib/source/test/lux/type/variance.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
    ["." /
     ["/#" // #_
      ["#." check]]]])
diff --git a/stdlib/source/test/lux/world.lux b/stdlib/source/test/lux/world.lux
index c5ea26a6f..795b3e55c 100644
--- a/stdlib/source/test/lux/world.lux
+++ b/stdlib/source/test/lux/world.lux
@@ -1,6 +1,7 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
   ["." / #_
    ["#." file]
    ["#." shell]
diff --git a/stdlib/source/test/lux/world/console.lux b/stdlib/source/test/lux/world/console.lux
index b153e84e9..055ee1466 100644
--- a/stdlib/source/test/lux/world/console.lux
+++ b/stdlib/source/test/lux/world/console.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /]]
   [\\spec
    ["$." /]])
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index 0e5c61c8f..1074749f4 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io]]
-   [math
-    ["." random]]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io]]
+    [math
+     ["." random]]]]
   ["." / #_
    ["#." watch]]
-  [\\
+  [\\library
    ["." /]]
   [\\spec
    ["$." /]])
diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux
index 9b9937a25..a4a8748ed 100644
--- a/stdlib/source/test/lux/world/file/watch.lux
+++ b/stdlib/source/test/lux/world/file/watch.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [predicate (#+ Predicate)]
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." binary (#+ Binary) ("#\." equivalence)]
-    ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]]]
-   [math
-    ["." random (#+ Random) ("#\." monad)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [predicate (#+ Predicate)]
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." binary (#+ Binary) ("#\." equivalence)]
+     ["." text ("#\." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]]]
+    [math
+     ["." random (#+ Random) ("#\." monad)]]]]
+  [\\library
    ["." /
     ["/#" //]]]
   [////
diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux
index b58bff96f..f75907fad 100644
--- a/stdlib/source/test/lux/world/input/keyboard.lux
+++ b/stdlib/source/test/lux/world/input/keyboard.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." maybe]
-    [collection
-     ["." list]
-     ["." set (#+ Set)]]]
-   [macro
-    ["." template]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." maybe]
+     [collection
+      ["." list]
+      ["." set (#+ Set)]]]
+    [macro
+     ["." template]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (with_expansions [<groups> (as_is [keys/commands
diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux
index 612d599ff..c784d9cbe 100644
--- a/stdlib/source/test/lux/world/net/http/client.lux
+++ b/stdlib/source/test/lux/world/net/http/client.lux
@@ -1,25 +1,28 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ do>)]
-    ["." io (#+ IO)]
-    ["." try]
-    ["." function]]
-   [data
-    ["." binary]
-    ["." product]
-    [text
-     ["%" format (#+ format)]
-     [encoding
-      ["." utf8]]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["." nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ do>)]
+     ["." io (#+ IO)]
+     ["." try]
+     ["." function]]
+    [data
+     ["." binary]
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]
+      [encoding
+       ["." utf8]]]
+     [collection
+      ["." dictionary]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["." nat]]]]]
+  [\\library
    ["." /
     ["/#" //
      ["#." status]]]])
@@ -28,7 +31,7 @@
   Test
   (<| (_.covering /._)
       (_.for [/.Client])
-      (do random.monad
+      (do {! random.monad}
         [on_post random.nat
          on_get random.nat
          on_put random.nat
@@ -38,6 +41,8 @@
          on_connect random.nat
          on_options random.nat
          on_trace random.nat
+         num_headers (\ ! map (nat.% 10) random.nat)
+         headers (random.dictionary text.hash num_headers (random.ascii/lower 3) (random.ascii/lower 3))
          #let [mock (: (/.Client IO)
                        (implementation
                         (def: (request method url headers data)
@@ -81,4 +86,10 @@
                       [/.options on_options]
                       [/.trace on_trace]
                       ))
+                (_.cover [/.headers]
+                         (nat.= (dictionary.size headers)
+                                (|> headers
+                                    dictionary.entries
+                                    /.headers
+                                    dictionary.size)))
                 )))))
diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux
index 84fbf4b2c..b051d8e8e 100644
--- a/stdlib/source/test/lux/world/net/http/status.lux
+++ b/stdlib/source/test/lux/world/net/http/status.lux
@@ -1,16 +1,17 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [data
-    [collection
-     ["." list]
-     ["." set (#+ Set)]]]
-   [macro
-    ["." template]]
-   [math
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [data
+     [collection
+      ["." list]
+      ["." set (#+ Set)]]]
+    [macro
+     ["." template]]
+    [math
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     ["/#" //]]])
 
diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux
index ebeec3a65..1cfcd0ae8 100644
--- a/stdlib/source/test/lux/world/output/video/resolution.lux
+++ b/stdlib/source/test/lux/world/output/video/resolution.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]]]
-   [data
-    ["." maybe]
-    [collection
-     ["." list]
-     ["." set (#+ Set)]]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]]]
+    [data
+     ["." maybe]
+     [collection
+      ["." list]
+      ["." set (#+ Set)]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /]])
 
 (with_expansions [<resolutions> (as_is /.svga
diff --git a/stdlib/source/test/lux/world/program.lux b/stdlib/source/test/lux/world/program.lux
index d91d7fc62..fafda5f91 100644
--- a/stdlib/source/test/lux/world/program.lux
+++ b/stdlib/source/test/lux/world/program.lux
@@ -1,25 +1,36 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [parser
-     [environment (#+ Environment)]]]
-   [data
-    ["." text]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." io]
+     ["." try]
+     ["." exception]
+     [parser
+      [environment (#+ Environment)]]]
+    [data
+     ["." maybe ("#\." functor)]
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." dictionary]
+      ["." list]]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]]]]]
+  [\\library
    ["." /
     [//
      [file (#+ Path)]]]]
   [\\spec
    ["$." /]])
 
-(def: environment
-  (Random Environment)
-  (random.dictionary text.hash 5
+(def: (environment env_size)
+  (-> Nat (Random Environment))
+  (random.dictionary text.hash env_size
                      (random.ascii/alpha 5)
                      (random.ascii/alpha 5)))
 
@@ -30,11 +41,38 @@
 (def: #export test
   Test
   (<| (_.covering /._)
-      (do random.monad
-        [environment ..environment
+      (do {! random.monad}
+        [env_size (\ ! map (|>> (n.% 10) inc) random.nat)
+         environment (..environment env_size)
          home ..path
-         directory ..path]
+         directory ..path
+
+         unknown (random.ascii/alpha 1)]
         ($_ _.and
             (_.for [/.mock /.async]
                    ($/.spec (/.async (/.mock environment home directory))))
+            (_.cover [/.environment]
+                     (let [program (/.mock environment home directory)]
+                       (io.run
+                        (do io.monad
+                          [actual (/.environment io.monad program)]
+                          (wrap (and (n.= (dictionary.size environment)
+                                          (dictionary.size actual))
+                                     (|> actual
+                                         dictionary.entries
+                                         (list.every? (function (_ [key value])
+                                                        (|> environment
+                                                            (dictionary.get key)
+                                                            (maybe\map (text\= value))
+                                                            (maybe.default false)))))))))))
+            (_.cover [/.unknown_environment_variable]
+                     (let [program (/.mock environment home directory)]
+                       (|> unknown
+                           (\ program variable)
+                           io.run
+                           (case> (#try.Success _)
+                                  false
+                                  
+                                  (#try.Failure error)
+                                  (exception.match? /.unknown_environment_variable error)))))
             ))))
diff --git a/stdlib/source/test/lux/world/shell.lux b/stdlib/source/test/lux/world/shell.lux
index 4cbdb27ed..8d117eefa 100644
--- a/stdlib/source/test/lux/world/shell.lux
+++ b/stdlib/source/test/lux/world/shell.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO)]
-    [concurrency
-     ["." promise (#+ Promise)]]
-    [parser
-     ["." environment (#+ Environment)]]]
-   [data
-    ["." text ("#\." equivalence)]
-    [collection
-     ["." list]]]
-   [math
-    ["." random]
-    [number
-     ["n" nat]
-     ["i" int]]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO)]
+     [concurrency
+      ["." promise (#+ Promise)]]
+     [parser
+      ["." environment (#+ Environment)]]]
+    [data
+     ["." text ("#\." equivalence)]
+     [collection
+      ["." list]]]
+    [math
+     ["." random]
+     [number
+      ["n" nat]
+      ["i" int]]]]]
+  [\\library
    ["." /
     [//
      [file (#+ Path)]]]]