Moved "lux/cli", "lux/io" and "lux/function" under "lux/control".

7 files changed, 12 insertions, 10 deletions

diff --git a/stdlib/source/lux/tool/compiler/analysis.lux b/stdlib/source/lux/tool/compiler/analysis.lux
index 2f173007b..3abbc2ecc 100644
--- a/stdlib/source/lux/tool/compiler/analysis.lux
+++ b/stdlib/source/lux/tool/compiler/analysis.lux
@@ -2,6 +2,8 @@
   [lux (#- nat int rev)
    [abstract
     [monad (#+ do)]]
+   [control
+    ["." function]]
    [data
     ["." product]
     ["." error]
@@ -9,8 +11,7 @@
     ["." text ("#;." equivalence)
      format]
     [collection
-     ["." list ("#;." functor fold)]]]
-   ["." function]]
+     ["." list ("#;." functor fold)]]]]
   [//
    ["." reference (#+ Register Variable Reference)]
    [phase
diff --git a/stdlib/source/lux/tool/compiler/phase.lux b/stdlib/source/lux/tool/compiler/phase.lux
index 09657c3cf..dbe13e40c 100644
--- a/stdlib/source/lux/tool/compiler/phase.lux
+++ b/stdlib/source/lux/tool/compiler/phase.lux
@@ -4,7 +4,8 @@
     [monad (#+ do)]]
    [control
     ["." state]
-    ["ex" exception (#+ Exception exception:)]]
+    ["ex" exception (#+ Exception exception:)]
+    ["." io]]
    [data
     ["." product]
     ["." error (#+ Error) ("#;." functor)]
@@ -13,7 +14,6 @@
    [time
     ["." instant]
     ["." duration]]
-   ["." io]
    [macro
     ["s" syntax (#+ syntax:)]]])
 
diff --git a/stdlib/source/lux/tool/compiler/phase/extension.lux b/stdlib/source/lux/tool/compiler/phase/extension.lux
index 87e7474d4..bce8a66d9 100644
--- a/stdlib/source/lux/tool/compiler/phase/extension.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension.lux
@@ -3,6 +3,7 @@
    [abstract
     [monad (#+ do)]]
    [control
+    ["." function]
     ["ex" exception (#+ exception:)]]
    [data
     ["." error (#+ Error)]
@@ -10,8 +11,7 @@
      format]
     [collection
      ["." list ("#;." functor)]
-     ["." dictionary (#+ Dictionary)]]]
-   ["." function]]
+     ["." dictionary (#+ Dictionary)]]]]
   ["." //])
 
 (type: #export Name Text)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux
index 97eee0025..4fba47218 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [lux #*
-   ["." function]
    [abstract
     [monad (#+ do)]]
    [control
+    ["." function]
     ["p" parser]]
    [data
     [number (#+ hex)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux
index 46cd6d79e..adec09fa3 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux
@@ -1,8 +1,9 @@
 (.module:
   [lux #*
-   ["." function]
    [abstract
     ["." monad (#+ do)]]
+   [control
+    ["." function]]
    [data
     ["." product]
     [collection
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux
index d10434000..d095e9fe2 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [lux (#- inc)
-   ["." function]
    [abstract
     [monad (#+ do)]]
    [control
+    ["." function]
     ["p" parser]]
    [data
     [number (#+ hex)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
index 1e891c006..b66b7abaf 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
@@ -1,9 +1,9 @@
 (.module:
   [lux #*
-   ["." function]
    [abstract
     [monad (#+ do)]]
    [control
+    ["." function]
     ["p" parser ("#;." monad)]]
    [data
     [number (#+ hex)]