14 files changed, 55 insertions, 55 deletions
diff --git a/stdlib/source/lux/cli.lux b/stdlib/source/lux/cli.lux
index 0ac9ff0bd..34514b5b9 100644
--- a/stdlib/source/lux/cli.lux
+++ b/stdlib/source/lux/cli.lux
@@ -2,22 +2,22 @@
   [lux #*
    [control
     monad
-    ["p" parser]]
+    ["p" parser]
+    [concurrency
+     ["." process]]]
    [data
     [collection
      [list ("list/." Monoid<List> Monad<List>)]]
     ["." text ("text/." Equivalence<Text>)
      format]
-    ["E" error]]
+    ["." error (#+ Error)]]
    [macro (#+ with-gensyms)
     ["." code]
     ["s" syntax (#+ syntax: Syntax)]]
    [platform
     [compiler
      ["." host]]]
-   ["." io]
-   [concurrency
-    ["." process]]])
+   ["." io]])
 
 ## [Types]
 (type: #export (CLI a)
@@ -26,18 +26,18 @@
 
 ## [Combinators]
 (def: #export (run inputs parser)
-  (All [a] (-> (List Text) (CLI a) (E.Error a)))
+  (All [a] (-> (List Text) (CLI a) (Error a)))
   (case (p.run inputs parser)
-    (#E.Success [remaining output])
+    (#error.Success [remaining output])
     (case remaining 
       #.Nil
-      (#E.Success output)
+      (#error.Success output)
 
       _
-      (#E.Error (format "Remaining CLI inputs: " (text.join-with " " remaining))))
+      (#error.Error (format "Remaining CLI inputs: " (text.join-with " " remaining))))
 
-    (#E.Error error)
-    (#E.Error error)))
+    (#error.Error error)
+    (#error.Error error)))
 
 (def: #export any
   {#.doc "Just returns the next input without applying any logic."}
@@ -45,16 +45,16 @@
   (function (_ inputs)
     (case inputs
       (#.Cons arg inputs')
-      (#E.Success [inputs' arg])
+      (#error.Success [inputs' arg])
       
       _
-      (#E.Error "Cannot parse empty arguments."))))
+      (#error.Error "Cannot parse empty arguments."))))
 
 (def: #export (parse parser)
   {#.doc "Parses the next input with a parsing function."}
-  (All [a] (-> (-> Text (E.Error a)) (CLI a)))
+  (All [a] (-> (-> Text (Error a)) (CLI a)))
   (function (_ inputs)
-    (do E.Monad<Error>
+    (do error.Monad<Error>
       [[remaining raw] (any inputs)
        output (parser raw)]
       (wrap [remaining output]))))
@@ -63,11 +63,11 @@
   {#.doc "Checks that a token is in the inputs."}
   (-> Text (CLI Any))
   (function (_ inputs)
-    (do E.Monad<Error>
+    (do error.Monad<Error>
       [[remaining raw] (any inputs)]
       (if (text/= reference raw)
         (wrap [remaining []])
-        (E.fail (format "Missing token: '" reference "'"))))))
+        (error.fail (format "Missing token: '" reference "'"))))))
 
 (def: #export (somewhere cli)
   {#.doc "Given a parser, tries to parse it somewhere in the inputs (i.e. not necessarily parsing the immediate inputs)."}
@@ -75,16 +75,16 @@
   (function (_ inputs)
     (loop [immediate inputs]
       (case (p.run immediate cli)
-        (#E.Success [remaining output])
-        (#E.Success [remaining output])
+        (#error.Success [remaining output])
+        (#error.Success [remaining output])
 
-        (#E.Error error)
+        (#error.Error error)
         (case immediate
           #.Nil
-          (#E.Error error)
+          (#error.Error error)
           
           (#.Cons to-omit immediate')
-          (do E.Monad<Error>
+          (do error.Monad<Error>
             [[remaining output] (recur immediate')]
             (wrap [(#.Cons to-omit remaining)
                    output])))))))
@@ -94,8 +94,8 @@
   (CLI Any)
   (function (_ inputs)
     (case inputs
-      #.Nil (#E.Success [inputs []])
-      _     (#E.Error (format "Unknown parameters: " (text.join-with " " inputs))))))
+      #.Nil (#error.Success [inputs []])
+      _     (#error.Error (format "Unknown parameters: " (text.join-with " " inputs))))))
 
 (def: #export (named name value)
   (All [a] (-> Text (CLI a) (CLI a)))
@@ -168,10 +168,10 @@
                                                                      (` process.run!)))))]
                                                  ((~' wrap) (~ g!output))))))
                                  (~ g!args))
-                            (#E.Success [(~ g!_) (~ g!output)])
+                            (#error.Success [(~ g!_) (~ g!output)])
                             (~ g!output)
 
-                            (#E.Error (~ g!message))
+                            (#error.Error (~ g!message))
                             (.error! (~ g!message))
                             ))))
                     )))
diff --git a/stdlib/source/lux/concurrency/actor.lux b/stdlib/source/lux/control/concurrency/actor.lux
index 0af0d09f9..0af0d09f9 100644
--- a/stdlib/source/lux/concurrency/actor.lux
+++ b/stdlib/source/lux/control/concurrency/actor.lux
diff --git a/stdlib/source/lux/concurrency/atom.lux b/stdlib/source/lux/control/concurrency/atom.lux
index b1692b6e3..b1692b6e3 100644
--- a/stdlib/source/lux/concurrency/atom.lux
+++ b/stdlib/source/lux/control/concurrency/atom.lux
diff --git a/stdlib/source/lux/concurrency/frp.lux b/stdlib/source/lux/control/concurrency/frp.lux
index 8db54f28f..8db54f28f 100644
--- a/stdlib/source/lux/concurrency/frp.lux
+++ b/stdlib/source/lux/control/concurrency/frp.lux
diff --git a/stdlib/source/lux/concurrency/process.lux b/stdlib/source/lux/control/concurrency/process.lux
index a67734747..a67734747 100644
--- a/stdlib/source/lux/concurrency/process.lux
+++ b/stdlib/source/lux/control/concurrency/process.lux
diff --git a/stdlib/source/lux/concurrency/promise.lux b/stdlib/source/lux/control/concurrency/promise.lux
index 1a471022f..1a471022f 100644
--- a/stdlib/source/lux/concurrency/promise.lux
+++ b/stdlib/source/lux/control/concurrency/promise.lux
diff --git a/stdlib/source/lux/concurrency/semaphore.lux b/stdlib/source/lux/control/concurrency/semaphore.lux
index 7b749ea60..46762ecf3 100644
--- a/stdlib/source/lux/concurrency/semaphore.lux
+++ b/stdlib/source/lux/control/concurrency/semaphore.lux
@@ -1,13 +1,13 @@
 (.module:
   [lux #*
    [control [monad (#+ do)]]
-   [concurrency
-    ["." atom (#+ Atom)]
-    ["." promise (#+ Promise)]]
    ["." io (#+ IO)]
    [type
     abstract
-    ["." refinement]]])
+    ["." refinement]]]
+  [//
+   ["." atom (#+ Atom)]
+   ["." promise (#+ Promise)]])
 
 (type: State
   {#open-positions Nat
@@ -81,13 +81,13 @@
     (-> Any Mutex)
     (:abstraction (semaphore 1)))
 
-  (def: (acquire mutex)
+  (def: acquire
     (-> Mutex (Promise Any))
-    (wait (:representation mutex)))
+    (|>> :representation wait))
 
-  (def: (release mutex)
+  (def: release
     (-> Mutex (Promise Any))
-    (signal (:representation mutex)))
+    (|>> :representation signal))
 
   (def: #export (synchronize mutex procedure)
     (All [a] (-> Mutex (IO (Promise a)) (Promise a)))
@@ -138,7 +138,7 @@
          (wait (get@ <turnstile> barrier))))]
 
     [start inc limit #start-turnstile]
-    [end   dec 0    #end-turnstile]
+    [end   dec 0     #end-turnstile]
     )
 
   (def: #export (block barrier)
diff --git a/stdlib/source/lux/concurrency/stm.lux b/stdlib/source/lux/control/concurrency/stm.lux
index 648d86d95..3203b2d52 100644
--- a/stdlib/source/lux/concurrency/stm.lux
+++ b/stdlib/source/lux/control/concurrency/stm.lux
@@ -10,12 +10,12 @@
     ["." maybe]
     [collection
      ["." list ("list/." Functor<List> Fold<List>)]]]
-   [concurrency
-    ["." atom (#+ Atom atom)]
-    ["." promise (#+ Promise promise)]
-    ["." frp ("frp/." Functor<Channel>)]]
    [type
-    abstract]])
+    abstract]]
+  [//
+   ["." atom (#+ Atom atom)]
+   ["." promise (#+ Promise promise)]
+   ["." frp ("frp/." Functor<Channel>)]])
 
 (type: #export (Observer a)
   (-> a (IO Any)))
diff --git a/stdlib/source/lux/concurrency/task.lux b/stdlib/source/lux/control/concurrency/task.lux
index c03ab7647..c03ab7647 100644
--- a/stdlib/source/lux/concurrency/task.lux
+++ b/stdlib/source/lux/control/concurrency/task.lux
diff --git a/stdlib/source/lux/test.lux b/stdlib/source/lux/test.lux
index b928b1860..ea4e9b6de 100644
--- a/stdlib/source/lux/test.lux
+++ b/stdlib/source/lux/test.lux
@@ -2,7 +2,10 @@
   [lux #*
    [control
     ["." monad (#+ do Monad)]
-    ["p" parser]]
+    ["p" parser]
+    [concurrency
+     ["." process]
+     ["." promise (#+ Promise)]]]
    [data
     ["." product]
     ["." maybe]
@@ -19,9 +22,6 @@
    ["." macro (#+ with-gensyms)
     ["s" syntax (#+ syntax: Syntax)]
     ["." code]]
-   [concurrency
-    ["." process]
-    ["." promise (#+ Promise)]]
    ["." io (#+ IO io)]])
 
 ## [Types]
diff --git a/stdlib/source/lux/world/console.lux b/stdlib/source/lux/world/console.lux
index 209063dfd..5c0aff910 100644
--- a/stdlib/source/lux/world/console.lux
+++ b/stdlib/source/lux/world/console.lux
@@ -3,6 +3,8 @@
    [control
     [monad (#+ do)]
     ["ex" exception (#+ exception:)]
+    [concurrency
+     ["." promise (#+ Promise)]]
     [security
      ["." taint (#+ Dirty taint)]
      [capability (#+ Capability)]]]
@@ -11,8 +13,6 @@
     ["." text
      format]]
    ["." io (#+ IO Process io)]
-   [concurrency
-    ["." promise (#+ Promise)]]
    [host (#+ import:)]
    [platform
     [compiler
diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux
index e0975799d..ac033fd89 100644
--- a/stdlib/source/lux/world/file.lux
+++ b/stdlib/source/lux/world/file.lux
@@ -3,6 +3,8 @@
    [control
     ["." monad (#+ Monad do)]
     ["ex" exception (#+ Exception exception:)]
+    [concurrency
+     ["." promise (#+ Promise)]]
     [security
      ["." taint (#+ Dirty taint)]
      ["." capability (#+ Capability)]]]
@@ -20,8 +22,6 @@
    [world
     ["." binary (#+ Binary)]]
    ["." io (#+ IO) ("io/." Functor<IO>)]
-   [concurrency
-    ["." promise (#+ Promise)]]
    [host (#+ import:)]
    [platform
     [compiler
diff --git a/stdlib/source/lux/world/net/tcp.jvm.lux b/stdlib/source/lux/world/net/tcp.jvm.lux
index add7427cb..f9bde2e2c 100644
--- a/stdlib/source/lux/world/net/tcp.jvm.lux
+++ b/stdlib/source/lux/world/net/tcp.jvm.lux
@@ -2,12 +2,12 @@
   [lux #*
    [control
     monad
+    [concurrency
+     ["." promise (#+ Promise promise)]
+     [task (#+ Task)]
+     ["." frp]]
     [security
      ["." taint (#+ Dirty taint)]]]
-   [concurrency
-    ["." promise (#+ Promise promise)]
-    [task (#+ Task)]
-    ["." frp]]
    [data
     ["." error (#+ Error)]]
    [world
diff --git a/stdlib/source/lux/world/net/udp.jvm.lux b/stdlib/source/lux/world/net/udp.jvm.lux
index f27ca1c5e..3e9015b56 100644
--- a/stdlib/source/lux/world/net/udp.jvm.lux
+++ b/stdlib/source/lux/world/net/udp.jvm.lux
@@ -3,11 +3,11 @@
    [control
     monad
     ["ex" exception (#+ exception:)]
+    [concurrency
+     ["." promise (#+ Promise)]
+     [task (#+ Task)]]
     [security
      ["." taint (#+ Dirty taint)]]]
-   [concurrency
-    ["." promise (#+ Promise)]
-    [task (#+ Task)]]
    [data
     ["." error (#+ Error)]
     ["." maybe]