7 files changed, 133 insertions, 126 deletions
diff --git a/stdlib/source/lux/control/concurrency/actor.lux b/stdlib/source/library/lux/control/concurrency/actor.lux
index 9e17193b2..a12e65471 100644
--- a/stdlib/source/lux/control/concurrency/actor.lux
+++ b/stdlib/source/library/lux/control/concurrency/actor.lux
@@ -1,34 +1,35 @@
 (.module: {#.doc "The actor model of concurrency."}
-  [lux #*
-   [abstract
-    monad]
-   [control
-    [pipe (#+ case>)]
-    ["." function]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]
-    ["<>" parser
-     ["<.>" code (#+ Parser)]]]
-   [data
-    ["." product]
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." list ("#\." monoid monad fold)]]]
-   ["." macro (#+ with_gensyms)
-    ["." code]
-    [syntax (#+ syntax:)
-     ["|.|" input]
-     ["|.|" export]
-     ["|.|" annotations]]]
-   [math
-    [number
-     ["n" nat]]]
-   ["." meta (#+ monad)
-    ["." annotation]]
-   [type (#+ :share)
-    ["." abstract (#+ abstract: :representation :abstraction)]]]
+  [library
+   [lux #*
+    [abstract
+     monad]
+    [control
+     [pipe (#+ case>)]
+     ["." function]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]
+     ["<>" parser
+      ["<.>" code (#+ Parser)]]]
+    [data
+     ["." product]
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." list ("#\." monoid monad fold)]]]
+    ["." macro (#+ with_gensyms)
+     ["." code]
+     [syntax (#+ syntax:)
+      ["|.|" input]
+      ["|.|" export]
+      ["|.|" annotations]]]
+    [math
+     [number
+      ["n" nat]]]
+    ["." meta (#+ monad)
+     ["." annotation]]
+    [type (#+ :share)
+     ["." abstract (#+ abstract: :representation :abstraction)]]]]
   [//
    ["." atom (#+ Atom atom)]
    ["." promise (#+ Promise Resolver) ("#\." monad)]
diff --git a/stdlib/source/lux/control/concurrency/atom.lux b/stdlib/source/library/lux/control/concurrency/atom.lux
index e3b711785..057bfd5b2 100644
--- a/stdlib/source/lux/control/concurrency/atom.lux
+++ b/stdlib/source/library/lux/control/concurrency/atom.lux
@@ -1,18 +1,19 @@
 (.module:
-  [lux #*
-   ["." ffi]
-   ["@" target]
-   [abstract
-    [monad (#+ do)]]
-   [control
-    ["." function]
-    ["." io (#- run) ("#\." functor)]]
-   [data
-    ["." product]
-    [collection
-     ["." array]]]
-   [type
-    abstract]])
+  [library
+   [lux #*
+    ["." ffi]
+    ["@" target]
+    [abstract
+     [monad (#+ do)]]
+    [control
+     ["." function]
+     ["." io (#- run) ("#\." functor)]]
+    [data
+     ["." product]
+     [collection
+      ["." array]]]
+    [type
+     abstract]]])
 
 (with_expansions [<jvm> (as_is (ffi.import: (java/util/concurrent/atomic/AtomicReference a)
                                  ["#::."
diff --git a/stdlib/source/lux/control/concurrency/frp.lux b/stdlib/source/library/lux/control/concurrency/frp.lux
index 452c153f1..416b8c7c4 100644
--- a/stdlib/source/lux/control/concurrency/frp.lux
+++ b/stdlib/source/library/lux/control/concurrency/frp.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [predicate (#+ Predicate)]
-    [equivalence (#+ Equivalence)]
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]]
-   [data
-    ["." maybe ("#\." functor)]]
-   [type (#+ :share)
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [predicate (#+ Predicate)]
+     [equivalence (#+ Equivalence)]
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]]
+    [data
+     ["." maybe ("#\." functor)]]
+    [type (#+ :share)
+     abstract]]]
   [//
    ["." atom (#+ Atom)]
    ["." promise (#+ Promise) ("#\." functor)]])
diff --git a/stdlib/source/lux/control/concurrency/promise.lux b/stdlib/source/library/lux/control/concurrency/promise.lux
index 8e0acf8b9..ad94bbff8 100644
--- a/stdlib/source/lux/control/concurrency/promise.lux
+++ b/stdlib/source/library/lux/control/concurrency/promise.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux (#- and or)
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    [pipe (#+ case>)]
-    ["." function]
-    ["." io (#+ IO io)]]
-   [data
-    ["." product]]
-   [type (#+ :share)
-    abstract]]
+  [library
+   [lux (#- and or)
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     [pipe (#+ case>)]
+     ["." function]
+     ["." io (#+ IO io)]]
+    [data
+     ["." product]]
+    [type (#+ :share)
+     abstract]]]
   [//
    ["." thread]
    ["." atom (#+ Atom atom)]])
diff --git a/stdlib/source/lux/control/concurrency/semaphore.lux b/stdlib/source/library/lux/control/concurrency/semaphore.lux
index 0e8fa2b94..597e96306 100644
--- a/stdlib/source/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/library/lux/control/concurrency/semaphore.lux
@@ -1,24 +1,25 @@
 (.module:
-  [lux #*
-   [abstract
-    [monad (#+ do)]]
-   [control
-    [pipe (#+ if>)]
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]
-    ["." exception (#+ exception:)]]
-   [data
-    [text
-     ["%" format (#+ format)]]
-    [collection
-     ["." queue (#+ Queue)]]]
-   [math
-    [number
-     ["n" nat]
-     ["i" int]]]
-   [type
-    abstract
-    ["." refinement]]]
+  [library
+   [lux #*
+    [abstract
+     [monad (#+ do)]]
+    [control
+     [pipe (#+ if>)]
+     ["." io (#+ IO)]
+     ["." try (#+ Try)]
+     ["." exception (#+ exception:)]]
+    [data
+     [text
+      ["%" format (#+ format)]]
+     [collection
+      ["." queue (#+ Queue)]]]
+    [math
+     [number
+      ["n" nat]
+      ["i" int]]]
+    [type
+     abstract
+     ["." refinement]]]]
   [//
    ["." atom (#+ Atom)]
    ["." promise (#+ Promise Resolver)]])
diff --git a/stdlib/source/lux/control/concurrency/stm.lux b/stdlib/source/library/lux/control/concurrency/stm.lux
index d375059a4..081d2f3d9 100644
--- a/stdlib/source/lux/control/concurrency/stm.lux
+++ b/stdlib/source/library/lux/control/concurrency/stm.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   [abstract
-    [functor (#+ Functor)]
-    [apply (#+ Apply)]
-    ["." monad (#+ Monad do)]]
-   [control
-    ["." io (#+ IO io)]
-    ["." try]]
-   [data
-    ["." product]
-    ["." maybe]
-    [collection
-     ["." list]]]
-   [type
-    abstract]]
+  [library
+   [lux #*
+    [abstract
+     [functor (#+ Functor)]
+     [apply (#+ Apply)]
+     ["." monad (#+ Monad do)]]
+    [control
+     ["." io (#+ IO io)]
+     ["." try]]
+    [data
+     ["." product]
+     ["." maybe]
+     [collection
+      ["." list]]]
+    [type
+     abstract]]]
   [//
    ["." atom (#+ Atom atom)]
    ["." promise (#+ Promise Resolver)]
diff --git a/stdlib/source/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux
index d6dc71c37..9c9bf6549 100644
--- a/stdlib/source/lux/control/concurrency/thread.lux
+++ b/stdlib/source/library/lux/control/concurrency/thread.lux
@@ -1,23 +1,24 @@
 (.module:
-  [lux #*
-   ["@" target]
-   ["." ffi]
-   [abstract
-    ["." monad (#+ do)]]
-   [control
-    ["." try]
-    ["." exception (#+ exception:)]
-    ["." io (#+ IO io)]]
-   [data
-    ["." text]
-    [collection
-     ["." list]]]
-   [math
-    [number
-     ["n" nat]
-     ["f" frac]]]
-   [time
-    ["." instant]]]
+  [library
+   [lux #*
+    ["@" target]
+    ["." ffi]
+    [abstract
+     ["." monad (#+ do)]]
+    [control
+     ["." try]
+     ["." exception (#+ exception:)]
+     ["." io (#+ IO io)]]
+    [data
+     ["." text]
+     [collection
+      ["." list]]]
+    [math
+     [number
+      ["n" nat]
+      ["f" frac]]]
+    [time
+     ["." instant]]]]
   [//
    ["." atom (#+ Atom)]])