5 files changed, 46 insertions, 49 deletions
diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux
index 1eb7fe2fc..fc34eecdc 100644
--- a/new-luxc/source/program.lux
+++ b/new-luxc/source/program.lux
@@ -30,11 +30,12 @@
       [extension (#+ Phase Bundle Operation Handler Extender)
        ["." analysis #_
         ["#" jvm]]
+       ["." generation #_
+        ["#" jvm]]
        ## ["." directive #_
        ##  ["#" jvm]]
        ]
-      ["." generation #_
-       ["#" jvm/extension]
+      [generation
        ["." jvm #_
         ## ["." runtime (#+ Anchor Definition)]
         ["." packager]
diff --git a/stdlib/source/lux/tool/compiler/phase/extension/generation.lux b/stdlib/source/lux/tool/compiler/phase/extension/generation.lux
deleted file mode 100644
index 467adbf35..000000000
--- a/stdlib/source/lux/tool/compiler/phase/extension/generation.lux
+++ /dev/null
@@ -1,10 +0,0 @@
-(.module:
-  [lux #*]
-  [//
-   ["." bundle]
-   [//
-    [generation (#+ Bundle)]]])
-
-(def: #export bundle
-  Bundle
-  bundle.empty)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/jvm/extension.lux b/stdlib/source/lux/tool/compiler/phase/extension/generation/jvm.lux
index d436d1974..93816d128 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/jvm/extension.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/generation/jvm.lux
@@ -6,8 +6,10 @@
   ["." / #_
    ["#." common]
    ["#." host]
-   [//
-    [runtime (#+ Bundle)]]])
+   [////
+    [generation
+     [jvm
+      [runtime (#+ Bundle)]]]]])
 
 (def: #export bundle
   Bundle
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/jvm/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/extension/generation/jvm/common.lux
index d57dd6b50..c666c1df5 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/jvm/extension/common.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/generation/jvm/common.lux
@@ -23,20 +23,22 @@
       ["." signed (#+ S4)]]
      ["." type (#+ Type)
       [category (#+ Primitive Class)]]]]]
-  ["." ///
-   ["#." value]
-   ["#." runtime (#+ Operation Phase Bundle Handler)]
-   ["#." function #_
-    ["#" abstract]]
-   ["//#" ///
-    [generation
-     [extension (#+ Nullary Unary Binary Trinary Variadic
-                    nullary unary binary trinary variadic)]]
-    [extension
-     ["#extension" /]
-     ["#." bundle]]
-    ["/#" //
-     ["#." synthesis (#+ Synthesis %synthesis)]]]])
+  [/////
+   [generation
+    ["///" jvm #_
+     ["#." value]
+     ["#." runtime (#+ Operation Phase Bundle Handler)]
+     ["#." function #_
+      ["#" abstract]]
+     ["//#" ///
+      [generation
+       [extension (#+ Nullary Unary Binary Trinary Variadic
+                      nullary unary binary trinary variadic)]]
+      [extension
+       ["#extension" /]
+       ["#." bundle]]
+      ["/#" //
+       ["#." synthesis (#+ Synthesis %synthesis)]]]]]])
 
 (def: #export (custom [parser handler])
   (All [s]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/jvm/extension/host.lux b/stdlib/source/lux/tool/compiler/phase/extension/generation/jvm/host.lux
index 84af963d2..6c8253c12 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/jvm/extension/host.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/generation/jvm/host.lux
@@ -39,28 +39,30 @@
       ["." reflection]
       ["." signature]
       ["." parser]]]]]
-  ["." // #_
+  [//
    [common (#+ custom)]
-   ["/#" //
-    [runtime (#+ Operation Bundle Handler)]
-    ["#." reference]
-    [function
-     [field
-      [variable
-       ["." foreign]]]]
-    ["//#" ///
-     [generation
-      [extension (#+ Nullary Unary Binary Trinary Variadic
-                     nullary unary binary trinary variadic)]]
-     [extension
-      ["#." bundle]
-      [analysis
-       ["/" jvm]]]
-     ["/#" //
-      ["#." reference (#+ Variable)]
-      [analysis (#+ Environment)]
-      ["#." synthesis (#+ Synthesis Path %synthesis)]
-      ["#." generation]]]]])
+   [////
+    [generation
+     ["///" jvm
+      [runtime (#+ Operation Bundle Handler)]
+      ["#." reference]
+      [function
+       [field
+        [variable
+         ["." foreign]]]]
+      ["//#" ///
+       [generation
+        [extension (#+ Nullary Unary Binary Trinary Variadic
+                       nullary unary binary trinary variadic)]]
+       [extension
+        ["#." bundle]
+        [analysis
+         ["/" jvm]]]
+       ["/#" //
+        ["#." reference (#+ Variable)]
+        [analysis (#+ Environment)]
+        ["#." synthesis (#+ Synthesis Path %synthesis)]
+        ["#." generation]]]]]]])
 
 (template [<name> <0> <1>]
   [(def: <name>