Merge pull request #58 from LuxLang/hierarchy_normalization

Hierarchy normalization

20 files changed, 529 insertions, 509 deletions

diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index bcd40a1f8..4d78d729c 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux #*
-   [ffi (#+ import:)]
-   [type (#+ :share)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try (#+ Try)]]
-   [data
-    [identity (#+ Identity)]
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#@." fold)]
-     ["." dictionary (#+ Dictionary)]
-     ["." row (#+ Row) ("#@." functor fold)]]]
-   [math
-    [number
-     ["." nat]]]
-   [target
-    ["/" jvm]]
-   [tool
-    [compiler
-     ["." phase]
-     [language
-      [lux
-       [synthesis (#+ Synthesis)]
-       ["." generation]
-       ["." directive]
-       [phase
-        ["." extension
-         ["." bundle]
-         [directive
-          ["./" lux]]]]]]]]]
+  [library
+   [lux #*
+    [ffi (#+ import:)]
+    [type (#+ :share)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try (#+ Try)]]
+    [data
+     [identity (#+ Identity)]
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#@." fold)]
+      ["." dictionary (#+ Dictionary)]
+      ["." row (#+ Row) ("#@." functor fold)]]]
+    [math
+     [number
+      ["." nat]]]
+    [target
+     ["/" jvm]]
+    [tool
+     [compiler
+      ["." phase]
+      [language
+       [lux
+        [synthesis (#+ Synthesis)]
+        ["." generation]
+        ["." directive]
+        [phase
+         ["." extension
+          ["." bundle]
+          [directive
+           ["./" lux]]]]]]]]]]
   [///
    [host
     ["." jvm (#+ Inst)
diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index a50090c5d..de92a3ba5 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -1,31 +1,32 @@
 (.module:
-  [lux (#- Definition Type)
-   [ffi (#+ import:)]
-   [abstract
-    monad]
-   [control
-    ["<>" parser
-     ["<.>" code]]]
-   [data
-    [binary (#+ Binary)]
-    [collection
-     ["." list ("#/." functor)]]]
-   [macro
-    ["." code]
-    [syntax (#+ syntax:)]]
-   [target
-    [jvm
-     ["." type (#+ Type)
-      [category (#+ Class)]]]]
-   [tool
-    [compiler
-     [reference
-      [variable (#+ Register)]]
-     [language
-      [lux
-       ["." generation]]]
-     [meta
-      [archive (#+ Archive)]]]]])
+  [library
+   [lux (#- Definition Type)
+    [ffi (#+ import:)]
+    [abstract
+     monad]
+    [control
+     ["<>" parser
+      ["<.>" code]]]
+    [data
+     [binary (#+ Binary)]
+     [collection
+      ["." list ("#/." functor)]]]
+    [macro
+     ["." code]
+     [syntax (#+ syntax:)]]
+    [target
+     [jvm
+      ["." type (#+ Type)
+       [category (#+ Class)]]]]
+    [tool
+     [compiler
+      [reference
+       [variable (#+ Register)]]
+      [language
+       [lux
+        ["." generation]]]
+      [meta
+       [archive (#+ Archive)]]]]]])
 
 (import: org/objectweb/asm/MethodVisitor)
 
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index b2012006a..58121502a 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -1,26 +1,27 @@
 (.module:
-  [lux (#- Type)
-   ["." ffi (#+ import: do_to)]
-   [control
-    ["." function]]
-   [data
-    ["." product]
-    ["." text
-     ["%" format (#+ format)]]
-    [collection
-     ["." array (#+ Array)]
-     ["." list ("#@." functor)]]]
-   [math
-    [number
-     ["i" int]]]
-   [target
-    [jvm
-     [encoding
-      ["." name]]
-     ["." type (#+ Type Constraint)
-      [category (#+ Class Value Method)]
-      ["." signature]
-      ["." descriptor]]]]]
+  [library
+   [lux (#- Type)
+    ["." ffi (#+ import: do_to)]
+    [control
+     ["." function]]
+    [data
+     ["." product]
+     ["." text
+      ["%" format (#+ format)]]
+     [collection
+      ["." array (#+ Array)]
+      ["." list ("#@." functor)]]]
+    [math
+     [number
+      ["i" int]]]
+    [target
+     [jvm
+      [encoding
+       ["." name]]
+      ["." type (#+ Type Constraint)
+       [category (#+ Class Value Method)]
+       ["." signature]
+       ["." descriptor]]]]]]
   ["." //])
 
 (def: signature (|>> type.signature signature.signature))
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 95de82463..8427e23e1 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux (#- Type int char try)
-   ["." ffi (#+ import: do_to)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." try]
-    ["p" parser
-     ["s" code]]]
-   [data
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list ("#@." functor)]]]
-   [macro
-    [syntax (#+ syntax:)]
-    ["." code]
-    ["." template]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [target
-    [jvm
-     [encoding
-      ["." name (#+ External)]]
-     ["." type (#+ Type) ("#@." equivalence)
-      [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
-      ["." box]
-      ["." descriptor]
-      ["." reflection]]]]
-   [tool
-    [compiler
-     [phase (#+ Operation)]]]]
+  [library
+   [lux (#- Type int char try)
+    ["." ffi (#+ import: do_to)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." try]
+     ["p" parser
+      ["s" code]]]
+    [data
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list ("#@." functor)]]]
+    [macro
+     [syntax (#+ syntax:)]
+     ["." code]
+     ["." template]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [target
+     [jvm
+      [encoding
+       ["." name (#+ External)]]
+      ["." type (#+ Type) ("#@." equivalence)
+       [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
+       ["." box]
+       ["." descriptor]
+       ["." reflection]]]]
+    [tool
+     [compiler
+      [phase (#+ Operation)]]]]]
   ["." // (#+ Inst)])
 
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))
diff --git a/lux-jvm/source/luxc/lang/synthesis/variable.lux b/lux-jvm/source/luxc/lang/synthesis/variable.lux
index f6a45b02e..33f359239 100644
--- a/lux-jvm/source/luxc/lang/synthesis/variable.lux
+++ b/lux-jvm/source/luxc/lang/synthesis/variable.lux
@@ -1,6 +1,7 @@
 (.module:
   lux
-  (lux (data [number]
+  (lux (data [library
+              [number]]
              (coll [list "list/" Fold<List> Monoid<List>]
                    ["s" set])))
   (luxc (lang ["la" analysis]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 7b5df9f08..4cd521f9f 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -1,39 +1,40 @@
 (.module:
-  [lux (#- Module 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)]]]
-   [target
-    [jvm
-     ["." loader (#+ Library)]
-     ["." type
-      ["." descriptor]]]]
-   [tool
-    [compiler
-     [language
-      [lux
-       ["." version]
-       ["." generation]]]
-     [meta
-      [io (#+ lux_context)]
-      [archive
-       [descriptor (#+ Module)]
-       ["." artifact]]]]]]
+  [library
+   [lux (#- Module 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)]]]
+    [target
+     [jvm
+      ["." loader (#+ Library)]
+      ["." type
+       ["." descriptor]]]]
+    [tool
+     [compiler
+      [language
+       [lux
+        ["." version]
+        ["." generation]]]
+      [meta
+       [io (#+ lux_context)]
+       [archive
+        [descriptor (#+ Module)]
+        ["." artifact]]]]]]]
   [///
    [host
     ["." jvm (#+ Inst Definition Host State)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/case.lux b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
index f3bbb2a1c..65e5dba62 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/case.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
@@ -1,30 +1,31 @@
 (.module:
-  [lux (#- Type if let case)
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]
-    ["ex" exception (#+ exception:)]]
-   [data
-    [collection
-     ["." list ("#@." fold)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [target
-    [jvm
-     ["." type (#+ Type)
-      ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
-      ["." descriptor (#+ Descriptor)]
-      ["." signature (#+ Signature)]]]]
-   [tool
-    [compiler
-     ["." phase ("operation@." monad)]
-     [meta
-      [archive (#+ Archive)]]
-     [language
-      [lux
-       ["." synthesis (#+ Path Synthesis)]]]]]]
+  [library
+   [lux (#- Type if let case)
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]
+     ["ex" exception (#+ exception:)]]
+    [data
+     [collection
+      ["." list ("#@." fold)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [target
+     [jvm
+      ["." type (#+ Type)
+       ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
+       ["." descriptor (#+ Descriptor)]
+       ["." signature (#+ Signature)]]]]
+    [tool
+     [compiler
+      ["." phase ("operation@." monad)]
+      [meta
+       [archive (#+ Archive)]]
+      [language
+       [lux
+        ["." synthesis (#+ Path Synthesis)]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/common.lux
index 6cd7f4f2f..10e865283 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/common.lux
@@ -1,25 +1,26 @@
 (.module:
-  [lux #*
-   ## [abstract
-   ##  [monad (#+ do)]]
-   ## [control
-   ##  ["." try (#+ Try)]
-   ##  ["ex" exception (#+ exception:)]
-   ##  ["." io]]
-   ## [data
-   ##  [binary (#+ Binary)]
-   ##  ["." text ("#/." hash)
-   ##   format]
-   ##  [collection
-   ##   ["." dictionary (#+ Dictionary)]]]
-   ## ["." macro]
-   ## [host (#+ import:)]
-   ## [tool
-   ##  [compiler
-   ##   [reference (#+ Register)]
-   ##   ["." name]
-   ##   ["." phase]]]
-   ]
+  [library
+   [lux #*
+    ## [abstract
+    ##  [monad (#+ do)]]
+    ## [control
+    ##  ["." try (#+ Try)]
+    ##  ["ex" exception (#+ exception:)]
+    ##  ["." io]]
+    ## [data
+    ##  [binary (#+ Binary)]
+    ##  ["." text ("#/." hash)
+    ##   format]
+    ##  [collection
+    ##   ["." dictionary (#+ Dictionary)]]]
+    ## ["." macro]
+    ## [host (#+ import:)]
+    ## [tool
+    ##  [compiler
+    ##   [reference (#+ Register)]
+    ##   ["." name]
+    ##   ["." phase]]]
+    ]]
   ## [luxc
   ##  [lang
   ##   [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
index 01425750f..44abe2444 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
@@ -1,12 +1,13 @@
 (.module:
-  [lux #*
-   [tool
-    [compiler
-     [language
-      [lux
-       ["." synthesis]
-       [phase
-        ["." extension]]]]]]]
+  [library
+   [lux #*
+    [tool
+     [compiler
+      [language
+       [lux
+        ["." synthesis]
+        [phase
+         ["." extension]]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
index 9066dd156..2f1bd6a36 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
@@ -1,8 +1,9 @@
 (.module:
-  [lux #*
-   [data
-    [collection
-     ["." dictionary]]]]
+  [library
+   [lux #*
+    [data
+     [collection
+      ["." dictionary]]]]]
   [////
    [host
     [jvm (#+ Bundle)]]]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
index c15d1ffcf..d79362d79 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -1,37 +1,38 @@
 (.module:
-  [lux (#- Type)
-   [ffi (#+ import:)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["<>" parser
-     ["<s>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    [collection
-     ["." list ("#@." monad)]
-     ["." dictionary]]]
-   [math
-    [number
-     ["f" frac]]]
-   [target
-    [jvm
-     ["." type]]]
-   [tool
-    [compiler
-     ["." phase]
-     [meta
-      [archive (#+ Archive)]]
-     [language
-      [lux
-       ["." synthesis (#+ Synthesis %synthesis)]
-       [phase
-        [generation
-         [extension (#+ Nullary Unary Binary Trinary Variadic
-                        nullary unary binary trinary variadic)]]
-        ["." extension
-         ["." bundle]]]]]]]]
+  [library
+   [lux (#- Type)
+    [ffi (#+ import:)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["<>" parser
+      ["<s>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     [collection
+      ["." list ("#@." monad)]
+      ["." dictionary]]]
+    [math
+     [number
+      ["f" frac]]]
+    [target
+     [jvm
+      ["." type]]]
+    [tool
+     [compiler
+      ["." phase]
+      [meta
+       [archive (#+ Archive)]]
+      [language
+       [lux
+        ["." synthesis (#+ Synthesis %synthesis)]
+        [phase
+         [generation
+          [extension (#+ Nullary Unary Binary Trinary Variadic
+                         nullary unary binary trinary variadic)]]
+         ["." extension
+          ["." bundle]]]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index 96fa95363..69e63ab71 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -1,56 +1,57 @@
 (.module:
-  [lux (#- Type primitive int char type)
-   [ffi (#+ import:)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]
-    ["." function]
-    ["<>" parser ("#@." monad)
-     ["<.>" text]
-     ["<.>" synthesis (#+ Parser)]]]
-   [data
-    ["." product]
-    ["." maybe ("#@." functor)]
-    ["." text ("#@." equivalence)
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#@." monad)]
-     ["." dictionary (#+ Dictionary)]
-     ["." set]]]
-   [math
-    [number
-     ["." nat]]]
-   [target
-    [jvm
-     ["." type (#+ Type Typed Argument)
-      ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
-      ["." box]
-      ["." reflection]
-      ["." signature]
-      ["." parser]]]]
-   [tool
-    [compiler
-     ["." phase ("#@." monad)]
-     [reference (#+)
-      ["." variable (#+ Variable)]]
-     [meta
-      [archive (#+ Archive)]]
-     [language
-      [lux
-       [analysis (#+ Environment)]
-       ["." synthesis (#+ Synthesis Path %synthesis)]
-       ["." generation]
-       [phase
-        [generation
-         [extension (#+ Nullary Unary Binary
-                        nullary unary binary)]]
-        [analysis
-         [".A" reference]]
-        ["." extension
-         ["." bundle]
+  [library
+   [lux (#- Type primitive int char type)
+    [ffi (#+ import:)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]
+     ["." function]
+     ["<>" parser ("#@." monad)
+      ["<.>" text]
+      ["<.>" synthesis (#+ Parser)]]]
+    [data
+     ["." product]
+     ["." maybe ("#@." functor)]
+     ["." text ("#@." equivalence)
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#@." monad)]
+      ["." dictionary (#+ Dictionary)]
+      ["." set]]]
+    [math
+     [number
+      ["." nat]]]
+    [target
+     [jvm
+      ["." type (#+ Type Typed Argument)
+       ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
+       ["." box]
+       ["." reflection]
+       ["." signature]
+       ["." parser]]]]
+    [tool
+     [compiler
+      ["." phase ("#@." monad)]
+      [reference (#+)
+       ["." variable (#+ Variable)]]
+      [meta
+       [archive (#+ Archive)]]
+      [language
+       [lux
+        [analysis (#+ Environment)]
+        ["." synthesis (#+ Synthesis Path %synthesis)]
+        ["." generation]
+        [phase
+         [generation
+          [extension (#+ Nullary Unary Binary
+                         nullary unary binary)]]
          [analysis
-          ["/" jvm]]]]]]]]]
+          [".A" reference]]
+         ["." extension
+          ["." bundle]
+          [analysis
+           ["/" jvm]]]]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index a3583155b..f524dc097 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -1,38 +1,39 @@
 (.module:
-  [lux (#- Type function)
-   [abstract
-    ["." monad (#+ do)]
-    ["." enum]]
-   [control
-    [pipe (#+ when> new>)]
-    ["." function]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#@." functor monoid)]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [target
-    [jvm
-     ["." type (#+ Type)
-      ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]]]]
-   [tool
-    [compiler
-     [arity (#+ Arity)]
-     ["." phase]
-     [reference
-      [variable (#+ Register)]]
-     [language
-      [lux
-       [analysis (#+ Environment)]
-       [synthesis (#+ Synthesis Abstraction Apply)]
-       ["." generation (#+ Context)]]]
-     [meta
-      [archive (#+ Archive)]]]]]
+  [library
+   [lux (#- Type function)
+    [abstract
+     ["." monad (#+ do)]
+     ["." enum]]
+    [control
+     [pipe (#+ when> new>)]
+     ["." function]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#@." functor monoid)]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [target
+     [jvm
+      ["." type (#+ Type)
+       ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]]]]
+    [tool
+     [compiler
+      [arity (#+ Arity)]
+      ["." phase]
+      [reference
+       [variable (#+ Register)]]
+      [language
+       [lux
+        [analysis (#+ Environment)]
+        [synthesis (#+ Synthesis Abstraction Apply)]
+        ["." generation (#+ Context)]]]
+      [meta
+       [archive (#+ Archive)]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
index 5ad997539..d17d3dfe2 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." function]]
-   [data
-    [collection
-     ["." list ("#@." functor monoid)]]]
-   [math
-    [number
-     ["n" nat]]]
-   [tool
-    [compiler
-     ["." phase]
-     [reference
-      [variable (#+ Register)]]
-     [language
-      [lux
-       ["." synthesis (#+ Synthesis)]
-       ["." generation]]]]]]
+  [library
+   [lux #*
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." function]]
+    [data
+     [collection
+      ["." list ("#@." functor monoid)]]]
+    [math
+     [number
+      ["n" nat]]]
+    [tool
+     [compiler
+      ["." phase]
+      [reference
+       [variable (#+ Register)]]
+      [language
+       [lux
+        ["." synthesis (#+ Synthesis)]
+        ["." generation]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
index 5f3a98b0f..1bced2ffc 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
@@ -1,15 +1,16 @@
 (.module:
-  [lux (#- i64)
-   ["." ffi (#+ import:)]
-   [math
-    [number
-     ["i" int]]]
-   [target
-    [jvm
-     ["." type]]]
-   [tool
-    [compiler
-     [phase ("operation@." monad)]]]]
+  [library
+   [lux (#- i64)
+    ["." ffi (#+ import:)]
+    [math
+     [number
+      ["i" int]]]
+    [target
+     [jvm
+      ["." type]]]
+    [tool
+     [compiler
+      [phase ("operation@." monad)]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/program.lux b/lux-jvm/source/luxc/lang/translation/jvm/program.lux
index 234c20fa9..1ebdf33f0 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/program.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/program.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    [jvm
-     ["$t" type]]]
-   [tool
-    [compiler
-     [language
-      [lux
-       [generation (#+ Context)]
-       [program (#+ Program)]]]]]]
+  [library
+   [lux #*
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     [jvm
+      ["$t" type]]]
+    [tool
+     [compiler
+      [language
+       [lux
+        [generation (#+ Context)]
+        [program (#+ Program)]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/reference.lux b/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
index d2a524a82..bfbda85be 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [data
-    [text
-     ["%" format (#+ format)]]]
-   [target
-    [jvm
-     ["." type]]]
-   [tool
-    [compiler
-     [reference
-      ["." variable (#+ Register Variable)]]
-     ["." phase ("operation@." monad)]
-     [meta
-      [archive (#+ Archive)]]
-     [language
-      [lux
-       ["." generation]]]]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [data
+     [text
+      ["%" format (#+ format)]]]
+    [target
+     [jvm
+      ["." type]]]
+    [tool
+     [compiler
+      [reference
+       ["." variable (#+ Register Variable)]]
+      ["." phase ("operation@." monad)]
+      [meta
+       [archive (#+ Archive)]]
+      [language
+       [lux
+        ["." generation]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
index cd719679d..20bd9bd9e 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
@@ -1,35 +1,36 @@
 (.module:
-  [lux (#- Type try)
-   [abstract
-    [monad (#+ do)]
-    ["." enum]]
-   [data
-    [binary (#+ Binary)]
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#@." functor)]
-     ["." row]]]
-   ["." math
-    [number
-     ["n" nat]]]
-   [target
-    [jvm
-     ["." type (#+ Type)
-      ["." category (#+ Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)]
-      ["." reflection]]]]
-   [tool
-    [compiler
-     [arity (#+ Arity)]
-     ["." phase]
-     [language
-      [lux
-       ["." synthesis]
-       ["." generation]]]
-     [meta
-      [archive (#+ Output)
-       ["." artifact (#+ Registry)]]]]]]
+  [library
+   [lux (#- Type try)
+    [abstract
+     [monad (#+ do)]
+     ["." enum]]
+    [data
+     [binary (#+ Binary)]
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#@." functor)]
+      ["." row]]]
+    ["." math
+     [number
+      ["n" nat]]]
+    [target
+     [jvm
+      ["." type (#+ Type)
+       ["." category (#+ Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method)]
+       ["." reflection]]]]
+    [tool
+     [compiler
+      [arity (#+ Arity)]
+      ["." phase]
+      [language
+       [lux
+        ["." synthesis]
+        ["." generation]]]
+      [meta
+       [archive (#+ Output)
+        ["." artifact (#+ Registry)]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index 100bce9d9..16b320b6d 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -1,33 +1,34 @@
 (.module:
-  [lux (#- Type)
-   ["." ffi (#+ import:)]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [target
-    [jvm
-     ["." type (#+ Type)
-      ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
-      ["." descriptor (#+ Descriptor)]
-      ["." signature (#+ Signature)]]]]
-   [tool
-    [compiler
-     ["." phase]
-     [meta
-      [archive (#+ Archive)]]
-     [language
-      [lux
-       [synthesis (#+ Synthesis)]]]]]]
+  [library
+   [lux (#- Type)
+    ["." ffi (#+ import:)]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [target
+     [jvm
+      ["." type (#+ Type)
+       ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
+       ["." descriptor (#+ Descriptor)]
+       ["." signature (#+ Signature)]]]]
+    [tool
+     [compiler
+      ["." phase]
+      [meta
+       [archive (#+ Archive)]]
+      [language
+       [lux
+        [synthesis (#+ Synthesis)]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux
index e9f58a71b..185d2d9ba 100644
--- a/lux-jvm/source/program.lux
+++ b/lux-jvm/source/program.lux
@@ -1,60 +1,61 @@
 (.module:
-  [lux (#- Definition)
-   [program (#+ program:)]
-   ["@" target]
-   ["." ffi (#+ import:)]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]
-    [concurrency
-     ["." promise (#+ Promise)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     [array (#+ Array)]
-     ["." dictionary]]]
-   ["." world #_
-    ["." file]
-    ["#/." program]]
-   [target
-    ["." jvm #_
-     [bytecode (#+ Bytecode)]
-     ["#/." type
-      ["#/." box]]]]
-   [tool
-    [compiler
-     [reference (#+)]
-     ["." phase]
-     [default
-      ["." platform (#+ Platform)]]
-     [meta
-      [archive (#+ Archive)]
-      ["." packager #_
-       ["#" jvm]]]
-     [language
-      [lux
-       ["$" synthesis (#+ Synthesis)]
-       ["." generation]
-       [analysis
-        [macro (#+ Expander)]]
-       [phase
-        [extension (#+ Phase Bundle Operation Handler Extender)
-         ["." analysis #_
-          ["#" jvm]]
-         ## ["." generation #_
-         ##  ["#" jvm]]
-         ## ["." directive #_
-         ##  ["#" jvm]]
-         ]
-        [generation
-         ["." jvm #_
-          ["#/." runtime]
-          ## ["#/." host]
-          ]]]]]]]]
+  [library
+   [lux (#- Definition)
+    [program (#+ program:)]
+    ["@" target]
+    ["." ffi (#+ import:)]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]
+     [concurrency
+      ["." promise (#+ Promise)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      [array (#+ Array)]
+      ["." dictionary]]]
+    ["." world #_
+     ["." file]
+     ["#/." program]]
+    [target
+     ["." jvm #_
+      [bytecode (#+ Bytecode)]
+      ["#/." type
+       ["#/." box]]]]
+    [tool
+     [compiler
+      [reference (#+)]
+      ["." phase]
+      [default
+       ["." platform (#+ Platform)]]
+      [meta
+       [archive (#+ Archive)]
+       ["." packager #_
+        ["#" jvm]]]
+      [language
+       [lux
+        ["$" synthesis (#+ Synthesis)]
+        ["." generation]
+        [analysis
+         [macro (#+ Expander)]]
+        [phase
+         [extension (#+ Phase Bundle Operation Handler Extender)
+          ["." analysis #_
+           ["#" jvm]]
+          ## ["." generation #_
+          ##  ["#" jvm]]
+          ## ["." directive #_
+          ##  ["#" jvm]]
+          ]
+         [generation
+          ["." jvm #_
+           ["#/." runtime]
+           ## ["#/." host]
+           ]]]]]]]]]
   [program
    ["/" compositor
     ["/." cli]