4 files changed, 10 insertions, 7 deletions
diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux
index 07e0b601a..f927a0cef 100644
--- a/lux-js/source/program.lux
+++ b/lux-js/source/program.lux
@@ -23,9 +23,7 @@
     ["_" js]]
    [tool
     [compiler
-     ["." cli]
      ["." name]
-     ["/" program]
      [phase
       [macro (#+ Expander)]
       ["." generation
@@ -33,7 +31,10 @@
         ["." runtime]
         ["." extension]]]]
      [default
-      ["." platform (#+ Platform)]]]]])
+      ["." platform (#+ Platform)]]]]]
+  [program
+   ["/" compositor
+    ["/." cli]]])
 
 (import: #long java/lang/String)
 
@@ -482,5 +483,5 @@
            #platform.phase js.generate
            #platform.runtime runtime.generate})))
 
-(program: [{service cli.service}]
+(program: [{service /cli.service}]
   (/.compiler ..expander ..platform extension.bundle service))
diff --git a/stdlib/source/lux/tool/compiler/default/platform.lux b/stdlib/source/lux/tool/compiler/default/platform.lux
index 529a4ed79..7748db721 100644
--- a/stdlib/source/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/lux/tool/compiler/default/platform.lux
@@ -24,12 +24,14 @@
      ["." generation]
      [analysis
       ["." module]]]
-    ["." cli (#+ Configuration)]
     [meta
      ["." archive (#+ Archive)
       [descriptor (#+ Module)]]
      [io
-      ["." context]]]]])
+      ["." context]]]]]
+  [program
+   [compositor
+    ["." cli (#+ Configuration)]]])
 
 (type: #export (Platform ! anchor expression statement)
   {#&monad (Monad !)
diff --git a/stdlib/source/lux/tool/compiler/program.lux b/stdlib/source/program/compositor.lux
index 4a079cc0f..5fb90837f 100644
--- a/stdlib/source/lux/tool/compiler/program.lux
+++ b/stdlib/source/program/compositor.lux
@@ -26,7 +26,7 @@
       ["." archive (#+ Archive)]]]
     ## ["." interpreter]
     ]]
-  [//
+  [/
    ["." cli (#+ Service)]])
 
 (def: (or-crash! failure-description action)
diff --git a/stdlib/source/lux/tool/compiler/cli.lux b/stdlib/source/program/compositor/cli.lux
index e08c83c7e..e08c83c7e 100644
--- a/stdlib/source/lux/tool/compiler/cli.lux
+++ b/stdlib/source/program/compositor/cli.lux