17 files changed, 26 insertions, 25 deletions
diff --git a/stdlib/source/lux/control/algebra.lux b/stdlib/source/lux/abstract/algebra.lux
index 2813ed0e7..2813ed0e7 100644
--- a/stdlib/source/lux/control/algebra.lux
+++ b/stdlib/source/lux/abstract/algebra.lux
diff --git a/stdlib/source/lux/control/apply.lux b/stdlib/source/lux/abstract/apply.lux
index 5eb42b63d..5eb42b63d 100644
--- a/stdlib/source/lux/control/apply.lux
+++ b/stdlib/source/lux/abstract/apply.lux
diff --git a/stdlib/source/lux/control/codec.lux b/stdlib/source/lux/abstract/codec.lux
index b51f76d97..abe80ba4a 100644
--- a/stdlib/source/lux/control/codec.lux
+++ b/stdlib/source/lux/abstract/codec.lux
@@ -1,11 +1,10 @@
 (.module:
   [lux #*
-   [control
-    monad]
    [data
-    ["." error (#+ Error)]]])
+    ["." error (#+ Error)]]]
+  [//
+   monad])
 
-## [Signatures]
 (signature: #export (Codec m a)
   {#.doc "A way to move back-and-forth between a type and an alternative representation for it."}
   (: (-> a m)
@@ -13,7 +12,6 @@
   (: (-> m (Error a))
      decode))
 
-## [Values]
 (structure: #export (compose cb-codec ba-codec)
   {#.doc "Codec composition."}
   (All [a b c]
diff --git a/stdlib/source/lux/control/comonad.lux b/stdlib/source/lux/abstract/comonad.lux
index 1d6ac49e5..1d6ac49e5 100644
--- a/stdlib/source/lux/control/comonad.lux
+++ b/stdlib/source/lux/abstract/comonad.lux
diff --git a/stdlib/source/lux/control/enum.lux b/stdlib/source/lux/abstract/enum.lux
index 9f2845b01..5bbb7df38 100644
--- a/stdlib/source/lux/control/enum.lux
+++ b/stdlib/source/lux/abstract/enum.lux
@@ -1,7 +1,7 @@
 (.module:
-  [lux #*
-   [control
-    ["." order]]])
+  [lux #*]
+  [//
+   ["." order]])
 
 (signature: #export (Enum e)
   {#.doc "Enumerable types, with a notion of moving forward and backwards through a type's instances."}
diff --git a/stdlib/source/lux/control/equivalence.lux b/stdlib/source/lux/abstract/equivalence.lux
index 57db7a925..b773505de 100644
--- a/stdlib/source/lux/control/equivalence.lux
+++ b/stdlib/source/lux/abstract/equivalence.lux
@@ -1,7 +1,7 @@
 (.module:
-  [lux #*
-   [control
-    [functor (#+ Contravariant)]]])
+  [lux #*]
+  [//
+   [functor (#+ Contravariant)]])
 
 (signature: #export (Equivalence a)
   {#.doc "Equivalence for a type's instances."}
diff --git a/stdlib/source/lux/control/fold.lux b/stdlib/source/lux/abstract/fold.lux
index 504f41f58..504f41f58 100644
--- a/stdlib/source/lux/control/fold.lux
+++ b/stdlib/source/lux/abstract/fold.lux
diff --git a/stdlib/source/lux/control/functor.lux b/stdlib/source/lux/abstract/functor.lux
index 1ade0a45b..1ade0a45b 100644
--- a/stdlib/source/lux/control/functor.lux
+++ b/stdlib/source/lux/abstract/functor.lux
diff --git a/stdlib/source/lux/control/hash.lux b/stdlib/source/lux/abstract/hash.lux
index d2dee3bcb..d2dee3bcb 100644
--- a/stdlib/source/lux/control/hash.lux
+++ b/stdlib/source/lux/abstract/hash.lux
diff --git a/stdlib/source/lux/control/interval.lux b/stdlib/source/lux/abstract/interval.lux
index 046f5b77d..efb131843 100644
--- a/stdlib/source/lux/control/interval.lux
+++ b/stdlib/source/lux/abstract/interval.lux
@@ -1,9 +1,9 @@
 (.module:
-  [lux #*
-   [control
-    [equivalence (#+ Equivalence)]
-    ["." order]
-    [enum (#+ Enum)]]])
+  [lux #*]
+  [//
+   [equivalence (#+ Equivalence)]
+   ["." order]
+   [enum (#+ Enum)]])
 
 (signature: #export (Interval a)
   {#.doc "A representation of top and bottom boundaries for an ordered type."}
diff --git a/stdlib/source/lux/control/monad.lux b/stdlib/source/lux/abstract/monad.lux
index 513f55b1e..0e509c64e 100644
--- a/stdlib/source/lux/control/monad.lux
+++ b/stdlib/source/lux/abstract/monad.lux
@@ -1,5 +1,5 @@
 (.module:
-  lux
+  [lux #*]
   [//
    ["." functor (#+ Functor)]])
 
diff --git a/stdlib/source/lux/control/monad/free.lux b/stdlib/source/lux/abstract/monad/free.lux
index 214261450..214261450 100644
--- a/stdlib/source/lux/control/monad/free.lux
+++ b/stdlib/source/lux/abstract/monad/free.lux
diff --git a/stdlib/source/lux/control/monad/indexed.lux b/stdlib/source/lux/abstract/monad/indexed.lux
index 57a18c109..57a18c109 100644
--- a/stdlib/source/lux/control/monad/indexed.lux
+++ b/stdlib/source/lux/abstract/monad/indexed.lux
diff --git a/stdlib/source/lux/control/monoid.lux b/stdlib/source/lux/abstract/monoid.lux
index 33d082020..33d082020 100644
--- a/stdlib/source/lux/control/monoid.lux
+++ b/stdlib/source/lux/abstract/monoid.lux
diff --git a/stdlib/source/lux/control/number.lux b/stdlib/source/lux/abstract/number.lux
index b3a314ba5..b3a314ba5 100644
--- a/stdlib/source/lux/control/number.lux
+++ b/stdlib/source/lux/abstract/number.lux
diff --git a/stdlib/source/lux/control/order.lux b/stdlib/source/lux/abstract/order.lux
index 68573b326..85b33fa18 100644
--- a/stdlib/source/lux/control/order.lux
+++ b/stdlib/source/lux/abstract/order.lux
@@ -1,9 +1,8 @@
 (.module:
   [lux #*
-   [control
-    [functor (#+ Contravariant)]]
    function]
   [//
+   [functor (#+ Contravariant)]
    ["." equivalence (#+ Equivalence)]])
 
 (`` (signature: #export (Order a)
diff --git a/stdlib/source/lux/control/predicate.lux b/stdlib/source/lux/abstract/predicate.lux
index 7d6433f33..faa1859b9 100644
--- a/stdlib/source/lux/control/predicate.lux
+++ b/stdlib/source/lux/abstract/predicate.lux
@@ -1,9 +1,9 @@
 (.module:
   [lux #*
-   [control
-    [monoid (#+ Monoid)]
-    [functor (#+ Contravariant)]]
-   ["." function]])
+   ["." function]]
+  [//
+   [monoid (#+ Monoid)]
+   [functor (#+ Contravariant)]])
 
 (type: #export (Predicate a)
   (-> a Bit))
@@ -24,7 +24,9 @@
   )
 
 (template [<name> <identity> <composition>]
-  [(structure: #export <name> (All [a] (Monoid (Predicate a)))
+  [(structure: #export <name>
+     (All [a] (Monoid (Predicate a)))
+     
      (def: identity <identity>)
      (def: compose <composition>))]
 
@@ -48,6 +50,8 @@
         (Predicate a)))
   (|>> (predicate (rec predicate))))
 
-(structure: #export _ (Contravariant Predicate)
+(structure: #export _
+  (Contravariant Predicate)
+  
   (def: (map-1 f fb)
     (|>> f fb)))