78 files changed, 14 insertions, 17 deletions
diff --git a/stdlib/source/lux/cli.lux b/stdlib/source/lux/cli.lux
index e590700bc..69a7cae7f 100644
--- a/stdlib/source/lux/cli.lux
+++ b/stdlib/source/lux/cli.lux
@@ -2,7 +2,7 @@
   [lux #*
    [control
     monad
-    ["p" parser]
+    ["p" parser (#+ Parser)]
     [concurrency
      ["." process]]]
    [data
@@ -14,17 +14,15 @@
    [macro (#+ with-gensyms)
     ["." code]
     ["s" syntax (#+ syntax: Syntax)]]
-   [platform
+   [tool
     [compiler
      ["." host]]]
    ["." io]])
 
-## [Types]
 (type: #export (CLI a)
   {#.doc "A command-line interface parser."}
-  (p.Parser (List Text) a))
+  (Parser (List Text) a))
 
-## [Combinators]
 (def: #export (run inputs parser)
   (All [a] (-> (List Text) (CLI a) (Error a)))
   (case (p.run inputs parser)
@@ -109,7 +107,6 @@
       (p.after (p.either (..this short) (..this long)))
       ..somewhere))
 
-## [Syntax]
 (type: Program-Args
   (#Raw Text)
   (#Parsed (List [Code Code])))
diff --git a/stdlib/source/lux/control/concurrency/atom.lux b/stdlib/source/lux/control/concurrency/atom.lux
index 61152d7b6..a8fd975b2 100644
--- a/stdlib/source/lux/control/concurrency/atom.lux
+++ b/stdlib/source/lux/control/concurrency/atom.lux
@@ -6,7 +6,7 @@
    ["." io (#- run)]
    [type
     abstract]
-   [platform
+   [tool
     [compiler
      ["." host]]]
    [host (#+ import:)]])
diff --git a/stdlib/source/lux/control/concurrency/process.lux b/stdlib/source/lux/control/concurrency/process.lux
index d1d2ac245..018659ba1 100644
--- a/stdlib/source/lux/control/concurrency/process.lux
+++ b/stdlib/source/lux/control/concurrency/process.lux
@@ -6,7 +6,7 @@
    [data
     [collection
      ["." list]]]
-   [platform
+   [tool
     [compiler
      ["." host]]]
    ["." io (#+ IO io)]
diff --git a/stdlib/source/lux/control/thread.lux b/stdlib/source/lux/control/thread.lux
index 978d6a683..b83acabc9 100644
--- a/stdlib/source/lux/control/thread.lux
+++ b/stdlib/source/lux/control/thread.lux
@@ -9,7 +9,7 @@
      ["." array (#+ Array)]]]
    [type (#+ :share)
     abstract]
-   [platform
+   [tool
     [compiler
      ["." host]]]
    ["." io (#+ IO)]])
diff --git a/stdlib/source/lux/data/collection/array.lux b/stdlib/source/lux/data/collection/array.lux
index 4b8695bb0..0871e1a86 100644
--- a/stdlib/source/lux/data/collection/array.lux
+++ b/stdlib/source/lux/data/collection/array.lux
@@ -11,7 +11,7 @@
     ["." maybe]
     [collection
      ["." list ("#/." fold)]]]
-   [platform
+   [tool
     [compiler
      ["." host]]]])
 
diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux
index 1b414f2f2..9be782e65 100644
--- a/stdlib/source/lux/data/text.lux
+++ b/stdlib/source/lux/data/text.lux
@@ -13,7 +13,7 @@
      ["." i64]]
     [collection
      ["." list ("#/." fold)]]]
-   [platform
+   [tool
     [compiler
      ["." host]]]])
 
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux
index 00b5b719b..55cb06ef3 100644
--- a/stdlib/source/lux/data/text/encoding.lux
+++ b/stdlib/source/lux/data/text/encoding.lux
@@ -8,7 +8,7 @@
     abstract]
    [world
     [binary (#+ Binary)]]
-   [platform
+   [tool
     [compiler
      ["_" host]]]
    [host (#+ import:)]])
diff --git a/stdlib/source/lux/platform/compiler.lux b/stdlib/source/lux/tool/compiler.lux
index b4fdd541e..b4fdd541e 100644
--- a/stdlib/source/lux/platform/compiler.lux
+++ b/stdlib/source/lux/tool/compiler.lux
diff --git a/stdlib/source/lux/platform/compiler/cli.lux b/stdlib/source/lux/tool/compiler/cli.lux
index 7e92b2c34..7e92b2c34 100644
--- a/stdlib/source/lux/platform/compiler/cli.lux
+++ b/stdlib/source/lux/tool/compiler/cli.lux
diff --git a/stdlib/source/lux/platform/compiler/default.lux b/stdlib/source/lux/tool/compiler/default.lux
index 726562cc8..726562cc8 100644
--- a/stdlib/source/lux/platform/compiler/default.lux
+++ b/stdlib/source/lux/tool/compiler/default.lux
diff --git a/stdlib/source/lux/platform/compiler/default/cache.lux b/stdlib/source/lux/tool/compiler/default/cache.lux
index 1770b4a82..1770b4a82 100644
--- a/stdlib/source/lux/platform/compiler/default/cache.lux
+++ b/stdlib/source/lux/tool/compiler/default/cache.lux
diff --git a/stdlib/source/lux/platform/compiler/default/evaluation.lux b/stdlib/source/lux/tool/compiler/default/evaluation.lux
index 1f21304ca..1f21304ca 100644
--- a/stdlib/source/lux/platform/compiler/default/evaluation.lux
+++ b/stdlib/source/lux/tool/compiler/default/evaluation.lux
diff --git a/stdlib/source/lux/platform/compiler/default/init.lux b/stdlib/source/lux/tool/compiler/default/init.lux
index a416c0a3b..a416c0a3b 100644
--- a/stdlib/source/lux/platform/compiler/default/init.lux
+++ b/stdlib/source/lux/tool/compiler/default/init.lux
diff --git a/stdlib/source/lux/platform/compiler/default/platform.lux b/stdlib/source/lux/tool/compiler/default/platform.lux
index 7e3846c09..7e3846c09 100644
--- a/stdlib/source/lux/platform/compiler/default/platform.lux
+++ b/stdlib/source/lux/tool/compiler/default/platform.lux
diff --git a/stdlib/source/lux/platform/compiler/default/syntax.lux b/stdlib/source/lux/tool/compiler/default/syntax.lux
index c76857aab..c76857aab 100644
--- a/stdlib/source/lux/platform/compiler/default/syntax.lux
+++ b/stdlib/source/lux/tool/compiler/default/syntax.lux
diff --git a/stdlib/source/lux/platform/compiler/host.lux b/stdlib/source/lux/tool/compiler/host.lux
index 218de67a4..218de67a4 100644
--- a/stdlib/source/lux/platform/compiler/host.lux
+++ b/stdlib/source/lux/tool/compiler/host.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/archive.lux b/stdlib/source/lux/tool/compiler/meta/archive.lux
index c318bfaf7..c318bfaf7 100644
--- a/stdlib/source/lux/platform/compiler/meta/archive.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/archive/descriptor.lux b/stdlib/source/lux/tool/compiler/meta/archive/descriptor.lux
index 328240e6c..328240e6c 100644
--- a/stdlib/source/lux/platform/compiler/meta/archive/descriptor.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive/descriptor.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/archive/document.lux b/stdlib/source/lux/tool/compiler/meta/archive/document.lux
index 5c077080f..5c077080f 100644
--- a/stdlib/source/lux/platform/compiler/meta/archive/document.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive/document.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/archive/key.lux b/stdlib/source/lux/tool/compiler/meta/archive/key.lux
index 50c10ac01..50c10ac01 100644
--- a/stdlib/source/lux/platform/compiler/meta/archive/key.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive/key.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/archive/signature.lux b/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
index fb96aec58..fb96aec58 100644
--- a/stdlib/source/lux/platform/compiler/meta/archive/signature.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/cache.lux b/stdlib/source/lux/tool/compiler/meta/cache.lux
index 7ba16878a..7ba16878a 100644
--- a/stdlib/source/lux/platform/compiler/meta/cache.lux
+++ b/stdlib/source/lux/tool/compiler/meta/cache.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/cache/dependency.lux b/stdlib/source/lux/tool/compiler/meta/cache/dependency.lux
index 4664ade1d..4664ade1d 100644
--- a/stdlib/source/lux/platform/compiler/meta/cache/dependency.lux
+++ b/stdlib/source/lux/tool/compiler/meta/cache/dependency.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/io.lux b/stdlib/source/lux/tool/compiler/meta/io.lux
index dd261a539..dd261a539 100644
--- a/stdlib/source/lux/platform/compiler/meta/io.lux
+++ b/stdlib/source/lux/tool/compiler/meta/io.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/io/archive.lux b/stdlib/source/lux/tool/compiler/meta/io/archive.lux
index 354f84460..354f84460 100644
--- a/stdlib/source/lux/platform/compiler/meta/io/archive.lux
+++ b/stdlib/source/lux/tool/compiler/meta/io/archive.lux
diff --git a/stdlib/source/lux/platform/compiler/meta/io/context.lux b/stdlib/source/lux/tool/compiler/meta/io/context.lux
index be72e4ccc..be72e4ccc 100644
--- a/stdlib/source/lux/platform/compiler/meta/io/context.lux
+++ b/stdlib/source/lux/tool/compiler/meta/io/context.lux
diff --git a/stdlib/source/lux/platform/compiler/name.lux b/stdlib/source/lux/tool/compiler/name.lux
index 394bdb2db..394bdb2db 100644
--- a/stdlib/source/lux/platform/compiler/name.lux
+++ b/stdlib/source/lux/tool/compiler/name.lux
diff --git a/stdlib/source/lux/platform/compiler/phase.lux b/stdlib/source/lux/tool/compiler/phase.lux
index 66abcc6cd..66abcc6cd 100644
--- a/stdlib/source/lux/platform/compiler/phase.lux
+++ b/stdlib/source/lux/tool/compiler/phase.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis.lux b/stdlib/source/lux/tool/compiler/phase/analysis.lux
index 845346482..845346482 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/case.lux b/stdlib/source/lux/tool/compiler/phase/analysis/case.lux
index 37bcfef6e..37bcfef6e 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/case.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/case.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux b/stdlib/source/lux/tool/compiler/phase/analysis/case/coverage.lux
index cd6ccd83d..cd6ccd83d 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/case/coverage.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/case/coverage.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/expression.lux b/stdlib/source/lux/tool/compiler/phase/analysis/expression.lux
index 3ce70fe9b..3ce70fe9b 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/expression.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/expression.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/function.lux b/stdlib/source/lux/tool/compiler/phase/analysis/function.lux
index cbea165f8..cbea165f8 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/function.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/function.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux b/stdlib/source/lux/tool/compiler/phase/analysis/inference.lux
index 4ce9c6985..4ce9c6985 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/inference.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/inference.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux b/stdlib/source/lux/tool/compiler/phase/analysis/macro.lux
index 18455b837..18455b837 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/macro.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/macro.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/module.lux b/stdlib/source/lux/tool/compiler/phase/analysis/module.lux
index 29865f352..29865f352 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/module.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/module.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/primitive.lux b/stdlib/source/lux/tool/compiler/phase/analysis/primitive.lux
index b46983293..b46983293 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/primitive.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/primitive.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux b/stdlib/source/lux/tool/compiler/phase/analysis/reference.lux
index 5969b9f5c..5969b9f5c 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/reference.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/reference.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux b/stdlib/source/lux/tool/compiler/phase/analysis/scope.lux
index 69d7c80a9..69d7c80a9 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/scope.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/scope.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux b/stdlib/source/lux/tool/compiler/phase/analysis/structure.lux
index 6991c67f7..6991c67f7 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/structure.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/structure.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/analysis/type.lux b/stdlib/source/lux/tool/compiler/phase/analysis/type.lux
index 75d691628..75d691628 100644
--- a/stdlib/source/lux/platform/compiler/phase/analysis/type.lux
+++ b/stdlib/source/lux/tool/compiler/phase/analysis/type.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension.lux b/stdlib/source/lux/tool/compiler/phase/extension.lux
index 0d58cf37a..0d58cf37a 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension/analysis.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis.lux
index 3b31f3d46..3b31f3d46 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension/analysis.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis/common.lux
index fa9b36270..fa9b36270 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension/analysis/common.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis/common.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.jvm.lux
index 0654e79c4..0654e79c4 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension/analysis/host.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis/host.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux b/stdlib/source/lux/tool/compiler/phase/extension/bundle.lux
index 643e3b38c..643e3b38c 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension/bundle.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/bundle.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension/statement.lux b/stdlib/source/lux/tool/compiler/phase/extension/statement.lux
index c5ae87050..c5ae87050 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension/statement.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/statement.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension/synthesis.lux b/stdlib/source/lux/tool/compiler/phase/extension/synthesis.lux
index 1a2e44f6f..1a2e44f6f 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension/synthesis.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/synthesis.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/extension/translation.lux b/stdlib/source/lux/tool/compiler/phase/extension/translation.lux
index 232c8c168..232c8c168 100644
--- a/stdlib/source/lux/platform/compiler/phase/extension/translation.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/translation.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/statement.lux b/stdlib/source/lux/tool/compiler/phase/statement.lux
index c7ff3719f..c7ff3719f 100644
--- a/stdlib/source/lux/platform/compiler/phase/statement.lux
+++ b/stdlib/source/lux/tool/compiler/phase/statement.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/statement/total.lux b/stdlib/source/lux/tool/compiler/phase/statement/total.lux
index c494b01c6..c494b01c6 100644
--- a/stdlib/source/lux/platform/compiler/phase/statement/total.lux
+++ b/stdlib/source/lux/tool/compiler/phase/statement/total.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis.lux b/stdlib/source/lux/tool/compiler/phase/synthesis.lux
index 4cc9c7336..4cc9c7336 100644
--- a/stdlib/source/lux/platform/compiler/phase/synthesis.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux b/stdlib/source/lux/tool/compiler/phase/synthesis/case.lux
index b1890688d..b1890688d 100644
--- a/stdlib/source/lux/platform/compiler/phase/synthesis/case.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis/case.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux b/stdlib/source/lux/tool/compiler/phase/synthesis/expression.lux
index ac6a82ab8..ac6a82ab8 100644
--- a/stdlib/source/lux/platform/compiler/phase/synthesis/expression.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis/expression.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux b/stdlib/source/lux/tool/compiler/phase/synthesis/function.lux
index ce9efe59b..ce9efe59b 100644
--- a/stdlib/source/lux/platform/compiler/phase/synthesis/function.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis/function.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux b/stdlib/source/lux/tool/compiler/phase/synthesis/loop.lux
index 28517bd42..28517bd42 100644
--- a/stdlib/source/lux/platform/compiler/phase/synthesis/loop.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis/loop.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation.lux b/stdlib/source/lux/tool/compiler/phase/translation.lux
index d8522adcd..d8522adcd 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/case.jvm.lux
index 92b55cb80..92b55cb80 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/case.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/expression.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/expression.jvm.lux
index 53d7bbbcb..53d7bbbcb 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/expression.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/expression.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/extension.jvm.lux
index a40b4953f..a40b4953f 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/extension.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/extension/common.jvm.lux
index 1c55abf83..1c55abf83 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/common.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/extension/common.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/host.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/extension/host.jvm.lux
index b8b2b7612..b8b2b7612 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/extension/host.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/extension/host.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/function.jvm.lux
index fe08b6a50..fe08b6a50 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/function.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/loop.jvm.lux
index 0d85654c1..0d85654c1 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/loop.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/loop.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/primitive.jvm.lux
index dc643bcbc..dc643bcbc 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/primitive.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/primitive.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/reference.jvm.lux
index 161d2adea..161d2adea 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/reference.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/reference.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/runtime.jvm.lux
index d254e8c7d..d254e8c7d 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/runtime.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/phase/translation/scheme/structure.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/structure.jvm.lux
index dc1b88591..dc1b88591 100644
--- a/stdlib/source/lux/platform/compiler/phase/translation/scheme/structure.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/structure.jvm.lux
diff --git a/stdlib/source/lux/platform/compiler/reference.lux b/stdlib/source/lux/tool/compiler/reference.lux
index a20691986..a20691986 100644
--- a/stdlib/source/lux/platform/compiler/reference.lux
+++ b/stdlib/source/lux/tool/compiler/reference.lux
diff --git a/stdlib/source/lux/platform/interpreter.lux b/stdlib/source/lux/tool/interpreter.lux
index d2fbccfdc..d2fbccfdc 100644
--- a/stdlib/source/lux/platform/interpreter.lux
+++ b/stdlib/source/lux/tool/interpreter.lux
diff --git a/stdlib/source/lux/platform/interpreter/type.lux b/stdlib/source/lux/tool/interpreter/type.lux
index f6a66a76a..f6a66a76a 100644
--- a/stdlib/source/lux/platform/interpreter/type.lux
+++ b/stdlib/source/lux/tool/interpreter/type.lux
diff --git a/stdlib/source/lux/platform/mediator.lux b/stdlib/source/lux/tool/mediator.lux
index 4481b6e2e..4481b6e2e 100644
--- a/stdlib/source/lux/platform/mediator.lux
+++ b/stdlib/source/lux/tool/mediator.lux
diff --git a/stdlib/source/lux/platform/mediator/parallelism.lux b/stdlib/source/lux/tool/mediator/parallelism.lux
index c694f0490..c694f0490 100644
--- a/stdlib/source/lux/platform/mediator/parallelism.lux
+++ b/stdlib/source/lux/tool/mediator/parallelism.lux
diff --git a/stdlib/source/lux/world/console.lux b/stdlib/source/lux/world/console.lux
index 8f58b0266..ff54445ed 100644
--- a/stdlib/source/lux/world/console.lux
+++ b/stdlib/source/lux/world/console.lux
@@ -13,7 +13,7 @@
      format]]
    ["." io (#+ IO Process io)]
    [host (#+ import:)]
-   [platform
+   [tool
     [compiler
      ["." host]]]])
 
diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux
index 0592d41af..55c8a4f8d 100644
--- a/stdlib/source/lux/world/file.lux
+++ b/stdlib/source/lux/world/file.lux
@@ -24,7 +24,7 @@
     ["." binary (#+ Binary)]]
    ["." io (#+ IO) ("#/." functor)]
    [host (#+ import:)]
-   [platform
+   [tool
     [compiler
      ["." host]]]])
 
diff --git a/stdlib/source/lux/world/net/http/client.lux b/stdlib/source/lux/world/net/http/client.lux
index 318a17ef6..af48d8a23 100644
--- a/stdlib/source/lux/world/net/http/client.lux
+++ b/stdlib/source/lux/world/net/http/client.lux
@@ -11,7 +11,7 @@
      ["." context]]
     [collection
      ["." dictionary]]]
-   [platform
+   [tool
     [compiler
      ["." host]]]
    ["." io (#+ IO)]
diff --git a/stdlib/source/lux/world/net/tcp.jvm.lux b/stdlib/source/lux/world/net/tcp.jvm.lux
index bd911f95a..3b664d9d8 100644
--- a/stdlib/source/lux/world/net/tcp.jvm.lux
+++ b/stdlib/source/lux/world/net/tcp.jvm.lux
@@ -12,7 +12,7 @@
     ["." binary (#+ Binary)]]
    ["." io (#+ IO)]
    [host (#+ import:)]
-   [platform
+   [tool
     [compiler
      ["." host]]]]
   ["." // (#+ Can-Read Can-Write Can-Close)])
diff --git a/stdlib/source/lux/world/net/udp.jvm.lux b/stdlib/source/lux/world/net/udp.jvm.lux
index 2d4ac82a1..27363956d 100644
--- a/stdlib/source/lux/world/net/udp.jvm.lux
+++ b/stdlib/source/lux/world/net/udp.jvm.lux
@@ -15,7 +15,7 @@
     ["." binary (#+ Binary)]]
    ["." io (#+ IO)]
    [host (#+ import:)]
-   [platform
+   [tool
     [compiler
      ["." host]]]]
   ["." // (#+ Location Can-Read Can-Write Can-Close)])