Normalized the hierarchy of the standard library modules.

2 files changed, 86 insertions, 84 deletions

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