- Moved the lux/data/struct/* modules to lux/data/coll/*.

- Did the same for the lux/codata/struct/* modules.
- Moved lux/codata/io to lux/io.
- Moved lux/control/effect to lux/effect.
- Renamed "sample" functions to "this" functions.
- Renamed "at" functions to "nth" functions.

55 files changed, 150 insertions, 149 deletions

diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index cd394ac76..947676665 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -7,7 +7,7 @@
   lux
   lux/test
   (lux (control monad)
-       (codata [io])
+       [io]
        [math]
        ["R" random]
        (data [text "T/" Eq<Text>]
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index 2aab87ae4..35b342000 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -5,14 +5,14 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data text/format
              [text "Text/" Eq<Text>]
              [number]
              [product]
              [sum]
-             (struct [list]))
+             (coll [list]))
        (codata function)
        ["&" cli]
        ["R" random]
diff --git a/stdlib/test/test/lux/codata/struct/stream.lux b/stdlib/test/test/lux/codata/coll/stream.lux
index 41132b2ee..9dc10c07f 100644
--- a/stdlib/test/test/lux/codata/struct/stream.lux
+++ b/stdlib/test/test/lux/codata/coll/stream.lux
@@ -5,16 +5,16 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 comonad)
        (data [text "Text/" Monoid<Text>]
              text/format
-             (struct [list])
+             (coll [list])
              [number "Nat/" Codec<Text,Nat>])
        (codata function
                [cont]
-               (struct ["&" stream]))
+               (coll ["&" stream]))
        ["R" random]
        pipe)
   lux/test)
@@ -53,7 +53,7 @@
                    ))
 
       (assert "Can repeat any element and infinite number of times."
-              (n.= elem (&;at offset (&;repeat elem))))
+              (n.= elem (&;nth offset (&;repeat elem))))
 
       (assert "Can obtain the head & tail of a stream."
               (and (n.= offset (&;head sample1))
@@ -62,13 +62,13 @@
 
       (assert "Can filter streams."
               (and (n.= (n.* +2 offset)
-                        (&;at offset
-                              (&;filter n.even? sample0)))
+                        (&;nth offset
+                               (&;filter n.even? sample0)))
                    (let [[evens odds] (&;partition n.even? (&;iterate n.inc +0))]
                      (and (n.= (n.* +2 offset)
-                               (&;at offset evens))
+                               (&;nth offset evens))
                           (n.= (n.inc (n.* +2 offset))
-                               (&;at offset odds))))))
+                               (&;nth offset odds))))))
 
       (assert "Functor goes over 'all' elements in a stream."
               (let [(^open "&/") &;Functor<Stream>
@@ -99,8 +99,8 @@
       (assert "Can cycle over the same elements as an infinite stream."
               (|> (&;cycle cycle-seed)
                   (default (undefined))
-                  (&;at cycle-sample-idx)
+                  (&;nth cycle-sample-idx)
                   (n.= (default (undefined)
-                         (list;at (n.% size cycle-sample-idx)
-                                  cycle-seed)))))
+                         (list;nth (n.% size cycle-sample-idx)
+                                   cycle-seed)))))
       ))
diff --git a/stdlib/test/test/lux/codata/cont.lux b/stdlib/test/test/lux/codata/cont.lux
index 39fdd6f42..b0e906248 100644
--- a/stdlib/test/test/lux/codata/cont.lux
+++ b/stdlib/test/test/lux/codata/cont.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/codata/env.lux b/stdlib/test/test/lux/codata/env.lux
index 4f5a37de9..2acad142f 100644
--- a/stdlib/test/test/lux/codata/env.lux
+++ b/stdlib/test/test/lux/codata/env.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/codata/state.lux b/stdlib/test/test/lux/codata/state.lux
index 79a458cc0..d73ebaa58 100644
--- a/stdlib/test/test/lux/codata/state.lux
+++ b/stdlib/test/test/lux/codata/state.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux
index 7136ab30d..5ae191512 100644
--- a/stdlib/test/test/lux/concurrency/actor.lux
+++ b/stdlib/test/test/lux/concurrency/actor.lux
@@ -5,14 +5,14 @@
 
 (;module:
   lux
-  (lux (control monad)
+  (lux [io #- run]
+       (control monad)
        (data [number]
              text/format
              [error #- fail])
        (concurrency [promise #+ Promise Monad<Promise> "Promise/" Monad<Promise>]
                     ["&" actor #+ actor:])
-       (codata function
-               [io #- run]))
+       (codata function))
   lux/test)
 
 (actor: Adder
diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux
index 312bc0369..a2ef82562 100644
--- a/stdlib/test/test/lux/concurrency/atom.lux
+++ b/stdlib/test/test/lux/concurrency/atom.lux
@@ -5,10 +5,10 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [number]
-             (struct [list "" Functor<List>])
+             (coll [list "" Functor<List>])
              text/format)
        (concurrency ["&" atom])
        ["R" random]
diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux
index 6bec2ea37..2d0b75f95 100644
--- a/stdlib/test/test/lux/concurrency/frp.lux
+++ b/stdlib/test/test/lux/concurrency/frp.lux
@@ -5,14 +5,14 @@
 
 (;module:
   lux
-  (lux (control monad)
+  (lux [io #- run]
+       (control monad)
        (data [number]
              text/format
              [error #- fail])
        (concurrency [promise #+ Promise Monad<Promise> "Promise/" Monad<Promise>]
                     ["&" frp])
-       (codata function
-               [io #- run]))
+       (codata function))
   lux/test)
 
 (def: (List->Chan values)
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index 53accdfcc..c217fccf9 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (control monad)
+  (lux [io #- run]
+       (control monad)
        (data [number]
              text/format
              [error #- fail])
        (concurrency ["&" promise])
-       (codata function
-               [io #- run])
+       (codata function)
        ["R" random]
        pipe)
   lux/test)
diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux
index 5b385c685..763804018 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -5,10 +5,10 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [number]
-             (struct [list "" Functor<List> "List/" Fold<List>])
+             (coll [list "" Functor<List> "List/" Fold<List>])
              text/format)
        (concurrency ["&" stm]
                     [promise])
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux
index 0b66b30f5..0da5cfd45 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/test/test/lux/data/bit.lux
@@ -5,8 +5,8 @@
 
 (;module:
   lux
-  (lux (control [monad])
-       (codata [io])
+  (lux [io]
+       (control [monad])
        (data ["&" bit]
              number)
        ["R" random])
diff --git a/stdlib/test/test/lux/data/bool.lux b/stdlib/test/test/lux/data/bool.lux
index 4c196546c..669232f47 100644
--- a/stdlib/test/test/lux/data/bool.lux
+++ b/stdlib/test/test/lux/data/bool.lux
@@ -6,7 +6,7 @@
 (;module:
   lux
   (lux (control [monad])
-       (codata [io])
+       [io]
        (data bool)
        ["R" random])
   lux/test)
diff --git a/stdlib/test/test/lux/data/char.lux b/stdlib/test/test/lux/data/char.lux
index 6482dd219..460e98b24 100644
--- a/stdlib/test/test/lux/data/char.lux
+++ b/stdlib/test/test/lux/data/char.lux
@@ -6,7 +6,7 @@
 (;module:
   lux
   (lux (control [monad])
-       (codata [io])
+       [io]
        (data char
              [text]
              text/format)
@@ -35,7 +35,7 @@
                               (#;Left _)
                               false))
                    (|> value as-text
-                       (text;at +0) (default (undefined))
+                       (text;nth +0) (default (undefined))
                        (:: Eq<Char> = value))))
 
       (assert "Characters have an ordering relationship."
diff --git a/stdlib/test/test/lux/data/struct/array.lux b/stdlib/test/test/lux/data/coll/array.lux
index ae7ff4bbc..236c2f915 100644
--- a/stdlib/test/test/lux/data/struct/array.lux
+++ b/stdlib/test/test/lux/data/coll/array.lux
@@ -6,9 +6,9 @@
 (;module:
   lux
   (lux (control [monad])
-       (codata [io])
-       (data (struct ["&" array]
-                     [list])
+       [io]
+       (data (coll ["&" array]
+                   [list])
              [number])
        ["R" random]
        pipe)
diff --git a/stdlib/test/test/lux/data/struct/dict.lux b/stdlib/test/test/lux/data/coll/dict.lux
index b467e232a..38b8e83b4 100644
--- a/stdlib/test/test/lux/data/struct/dict.lux
+++ b/stdlib/test/test/lux/data/coll/dict.lux
@@ -5,15 +5,15 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 [eq])
        (data [text "Text/" Monoid<Text>]
              text/format
              [number]
              [char]
-             (struct ["&" dict]
-                     [list "List/" Fold<List> Functor<List>]))
+             (coll ["&" dict]
+                   [list "List/" Fold<List> Functor<List>]))
        (codata function)
        ["R" random]
        pipe)
@@ -131,7 +131,7 @@
                          (&;contains? non-key rebound)
                          (not (&;contains? first-key rebound))
                          (n.= (default (undefined)
-                               (&;get first-key dict))
-                             (default (undefined)
-                               (&;get non-key rebound)))))))
+                                (&;get first-key dict))
+                              (default (undefined)
+                                (&;get non-key rebound)))))))
       ))
diff --git a/stdlib/test/test/lux/data/struct/list.lux b/stdlib/test/test/lux/data/coll/list.lux
index b40615036..9df350b0b 100644
--- a/stdlib/test/test/lux/data/struct/list.lux
+++ b/stdlib/test/test/lux/data/coll/list.lux
@@ -5,9 +5,9 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
-       (data (struct ["&" list])
+       (data (coll ["&" list])
              [text "Text/" Monoid<Text>]
              [number]
              [bool]
@@ -62,7 +62,7 @@
 
       (assert "Any element of the list can be considered it's member."
               (let [elem (default (undefined)
-                           (&;at idx sample))]
+                           (&;nth idx sample))]
                 (&;member? number;Eq<Nat> sample elem)))
       ))
 
diff --git a/stdlib/test/test/lux/data/struct/queue.lux b/stdlib/test/test/lux/data/coll/queue.lux
index d92fecf10..e65c4eb74 100644
--- a/stdlib/test/test/lux/data/struct/queue.lux
+++ b/stdlib/test/test/lux/data/coll/queue.lux
@@ -5,9 +5,9 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
-       (data (struct ["&" queue])
+       (data (coll ["&" queue])
              [number])
        ["R" random]
        pipe)
diff --git a/stdlib/test/test/lux/data/struct/set.lux b/stdlib/test/test/lux/data/coll/set.lux
index ae709384f..d9540927e 100644
--- a/stdlib/test/test/lux/data/struct/set.lux
+++ b/stdlib/test/test/lux/data/coll/set.lux
@@ -5,10 +5,10 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
-       (data (struct ["&" set]
-                     [list "" Fold<List>])
+       (data (coll ["&" set]
+                   [list "" Fold<List>])
              [number])
        ["R" random]
        pipe)
diff --git a/stdlib/test/test/lux/data/struct/stack.lux b/stdlib/test/test/lux/data/coll/stack.lux
index 001eb1af1..f8057b1f2 100644
--- a/stdlib/test/test/lux/data/struct/stack.lux
+++ b/stdlib/test/test/lux/data/coll/stack.lux
@@ -5,10 +5,10 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
-       (data (struct ["&" stack]
-                     [list "" Fold<List>])
+       (data (coll ["&" stack]
+                   [list "" Fold<List>])
              [number])
        ["R" random]
        pipe)
diff --git a/stdlib/test/test/lux/data/struct/tree/rose.lux b/stdlib/test/test/lux/data/coll/tree/rose.lux
index 21592aba9..126a36678 100644
--- a/stdlib/test/test/lux/data/struct/tree/rose.lux
+++ b/stdlib/test/test/lux/data/coll/tree/rose.lux
@@ -5,10 +5,10 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
-       (data (struct (tree ["&" rose])
-                     [list "List/" Monad<List>])
+       (data (coll (tree ["&" rose])
+                   [list "List/" Monad<List>])
              [number])
        ["R" random]
        pipe)
diff --git a/stdlib/test/test/lux/data/struct/tree/zipper.lux b/stdlib/test/test/lux/data/coll/tree/zipper.lux
index f2d7fe708..949b558a7 100644
--- a/stdlib/test/test/lux/data/struct/tree/zipper.lux
+++ b/stdlib/test/test/lux/data/coll/tree/zipper.lux
@@ -5,11 +5,11 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
-       (data (struct [list "List/" Fold<List> Functor<List>]
-                     (tree ["&" zipper]
-                           [rose]))
+       (data (coll [list "List/" Fold<List> Functor<List>]
+                   (tree ["&" zipper]
+                         [rose]))
              [text "Text/" Monoid<Text>]
              text/format
              [number])
diff --git a/stdlib/test/test/lux/data/struct/vector.lux b/stdlib/test/test/lux/data/coll/vector.lux
index 35663c63a..9e1c3c44b 100644
--- a/stdlib/test/test/lux/data/struct/vector.lux
+++ b/stdlib/test/test/lux/data/coll/vector.lux
@@ -5,10 +5,10 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
-       (data (struct ["&" vector]
-                     [list "List/" Fold<List> Functor<List>])
+       (data (coll ["&" vector]
+                   [list "List/" Fold<List> Functor<List>])
              [text "Text/" Monoid<Text>]
              text/format
              [number])
@@ -41,14 +41,14 @@
       (assert "Can put and get elements into vectors."
               (|> sample
                   (&;put idx non-member)
-                  (&;at idx)
+                  (&;nth idx)
                   (default (undefined))
                   (is non-member)))
 
       (assert "Can update elements of vectors."
               (|> sample
                   (&;put idx non-member) (&;update idx n.inc)
-                  (&;at idx) (default (undefined))
+                  (&;nth idx) (default (undefined))
                   (n.= (n.inc non-member))))
 
       (assert "Can safely transform to/from lists."
diff --git a/stdlib/test/test/lux/data/error.lux b/stdlib/test/test/lux/data/error.lux
index 880c2e0f1..a53d7faf2 100644
--- a/stdlib/test/test/lux/data/error.lux
+++ b/stdlib/test/test/lux/data/error.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data text/format
              ["&" error])
diff --git a/stdlib/test/test/lux/data/error/exception.lux b/stdlib/test/test/lux/data/error/exception.lux
index 312bca2a2..c3db059e6 100644
--- a/stdlib/test/test/lux/data/error/exception.lux
+++ b/stdlib/test/test/lux/data/error/exception.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [error #- fail]
              (error ["&" exception #+ exception:])
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 06c29707f..3734192a0 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 codec
                 eq)
@@ -17,9 +17,9 @@
              [maybe]
              [number "i/" Number<Int>]
              (format ["&" json])
-             (struct [vector #+ vector]
-                     [dict]
-                     [list]))
+             (coll [vector #+ vector]
+                   [dict]
+                   [list]))
        [compiler #+ with-gensyms]
        [macro]
        (macro [ast]
diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux
index 70a8d2a58..1f8cc0441 100644
--- a/stdlib/test/test/lux/data/ident.lux
+++ b/stdlib/test/test/lux/data/ident.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data ["&" ident]
              [text "Text/" Eq<Text>]
diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/test/test/lux/data/identity.lux
index 4f8c26cb1..2444b80b7 100644
--- a/stdlib/test/test/lux/data/identity.lux
+++ b/stdlib/test/test/lux/data/identity.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 comonad)
        (data ["&" identity]
diff --git a/stdlib/test/test/lux/data/log.lux b/stdlib/test/test/lux/data/log.lux
index dd94b1efa..abc1112a2 100644
--- a/stdlib/test/test/lux/data/log.lux
+++ b/stdlib/test/test/lux/data/log.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data ["&" log]
              [text "Text/" Monoid<Text> Eq<Text>]
diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/test/test/lux/data/maybe.lux
index b0f2b411c..de738e336 100644
--- a/stdlib/test/test/lux/data/maybe.lux
+++ b/stdlib/test/test/lux/data/maybe.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data ["&" maybe]
              [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux
index 8b7267444..4de7d4c14 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/test/test/lux/data/number.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data number
              [text "Text/" Monoid<Text> Eq<Text>]
diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/test/test/lux/data/product.lux
index 3d064f96e..69b1029b9 100644
--- a/stdlib/test/test/lux/data/product.lux
+++ b/stdlib/test/test/lux/data/product.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data product
              [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux
index 2ff10dbf5..abb00dbfa 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/test/test/lux/data/sum.lux
@@ -5,12 +5,12 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data sum
              [text "Text/" Monoid<Text>]
              [number]
-             (struct [list]))
+             (coll [list]))
        (codata function)
        pipe)
   lux/test)
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index 14f58aedb..fc1d17e64 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data ["&" text]
              [char]
              text/format
              [number]
-             (struct [list]))
+             (coll [list]))
        (codata function)
        ["R" random]
        pipe)
@@ -34,7 +34,7 @@
    idx (:: @ map (n.% size) R;nat)
    sample (R;text size)]
   (assert "" (|> sample
-                 (&;at idx)
+                 (&;nth idx)
                  (case> (^=> (#;Some char)
                              [(char;as-text char) char']
                              [[(&;index-of char' sample)
@@ -132,20 +132,21 @@
         )))
 
 (test: "Structures"
-  ($_ seq
-      (assert "" (:: &;Ord<Text> < "bcd" "abc"))
-      (assert "" (not (:: &;Ord<Text> < "abc" "abc")))
-      (assert "" (not (:: &;Ord<Text> < "abc" "bcd")))
-      (assert "" (:: &;Ord<Text> <= "bcd" "abc"))
-      (assert "" (:: &;Ord<Text> <= "abc" "abc"))
-      (assert "" (not (:: &;Ord<Text> <= "abc" "bcd")))
-      (assert "" (:: &;Ord<Text> > "abc" "bcd"))
-      (assert "" (not (:: &;Ord<Text> > "abc" "abc")))
-      (assert "" (not (:: &;Ord<Text> > "bcd" "abc")))
-      (assert "" (:: &;Ord<Text> >= "abc" "bcd"))
-      (assert "" (:: &;Ord<Text> >= "abc" "abc"))
-      (assert "" (not (:: &;Ord<Text> >= "bcd" "abc")))
-      ))
+  (let [(^open "&/") &;Ord<Text>]
+    ($_ seq
+        (assert "" (&/< "bcd" "abc"))
+        (assert "" (not (&/< "abc" "abc")))
+        (assert "" (not (&/< "abc" "bcd")))
+        (assert "" (&/<= "bcd" "abc"))
+        (assert "" (&/<= "abc" "abc"))
+        (assert "" (not (&/<= "abc" "bcd")))
+        (assert "" (&/> "abc" "bcd"))
+        (assert "" (not (&/> "abc" "abc")))
+        (assert "" (not (&/> "bcd" "abc")))
+        (assert "" (&/>= "abc" "bcd"))
+        (assert "" (&/>= "abc" "abc"))
+        (assert "" (not (&/>= "bcd" "abc")))
+        )))
 
 (test: "Codec"
   [size bounded-size
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux
index 12516a9ca..7ec6baf98 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/test/test/lux/data/text/format.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data text/format
              [text]
diff --git a/stdlib/test/test/lux/control/effect.lux b/stdlib/test/test/lux/effect.lux
index be7eda3aa..275e1e66a 100644
--- a/stdlib/test/test/lux/control/effect.lux
+++ b/stdlib/test/test/lux/effect.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io "IO/" Monad<IO>])
+  (lux [io "IO/" Monad<IO>]
        (control monad
                 functor)
        (data [text]
@@ -13,7 +13,7 @@
        [macro]
        ["R" random]
        pipe
-       (control effect))
+       effect)
   lux/test)
 
 (do-template [<effect> <op> <field>]
diff --git a/stdlib/test/test/lux/host.lux b/stdlib/test/test/lux/host.lux
index 03ed87772..61f6aa7ec 100644
--- a/stdlib/test/test/lux/host.lux
+++ b/stdlib/test/test/lux/host.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (control monad)
+  (lux [io]
+       (control monad)
        (data text/format
              [number]
              [product]
              [text "Text/" Eq<Text>])
-       (codata function
-               [io])
+       (codata function)
        ["&" host #+ jvm-import class: interface: object]
        ["R" random]
        pipe)
diff --git a/stdlib/test/test/lux/codata/io.lux b/stdlib/test/test/lux/io.lux
index 7965869d0..0d7a3e5a9 100644
--- a/stdlib/test/test/lux/codata/io.lux
+++ b/stdlib/test/test/lux/io.lux
@@ -5,12 +5,12 @@
 
 (;module:
   lux
-  (lux (control monad)
+  (lux ["&" io]
+       (control monad)
        (data [text "Text/" Monoid<Text> Eq<Text>]
              text/format
              [number])
-       (codata function
-               ["&" io]))
+       (codata function))
   lux/test)
 
 (test: "I/O"
diff --git a/stdlib/test/test/lux/lexer.lux b/stdlib/test/test/lux/lexer.lux
index 3c459ab8e..f08841a93 100644
--- a/stdlib/test/test/lux/lexer.lux
+++ b/stdlib/test/test/lux/lexer.lux
@@ -6,12 +6,12 @@
 (;module:
   lux
   (lux (control monad)
-       (codata [io])
+       [io]
        (data [error #- fail]
              [text "T/" Eq<Text>]
              text/format
              [char "C/" Eq<Char>]
-             (struct [list]))
+             (coll [list]))
        ["R" random]
        pipe
        ["&" lexer])
diff --git a/stdlib/test/test/lux/lexer/regex.lux b/stdlib/test/test/lux/lexer/regex.lux
index 4a9f01c27..fd8e563ec 100644
--- a/stdlib/test/test/lux/lexer/regex.lux
+++ b/stdlib/test/test/lux/lexer/regex.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [error #- fail]
              [product]
diff --git a/stdlib/test/test/lux/macro/ast.lux b/stdlib/test/test/lux/macro/ast.lux
index 61127bef7..9c010c1e4 100644
--- a/stdlib/test/test/lux/macro/ast.lux
+++ b/stdlib/test/test/lux/macro/ast.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (codata function)
        (control monad)
        (data [text "T/" Eq<Text>]
diff --git a/stdlib/test/test/lux/macro/poly/eq.lux b/stdlib/test/test/lux/macro/poly/eq.lux
index 4f4c296d6..ed34369a9 100644
--- a/stdlib/test/test/lux/macro/poly/eq.lux
+++ b/stdlib/test/test/lux/macro/poly/eq.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 eq)
        (data text/format
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 23d42c78d..ca269e15e 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 [functor]
                 eq)
diff --git a/stdlib/test/test/lux/macro/poly/text-encoder.lux b/stdlib/test/test/lux/macro/poly/text-encoder.lux
index 154d9ab10..ef9474f42 100644
--- a/stdlib/test/test/lux/macro/poly/text-encoder.lux
+++ b/stdlib/test/test/lux/macro/poly/text-encoder.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 eq)
        (data text/format
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index 2755bbf8e..1d96883de 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 eq)
        (data [text "Text/" Monoid<Text>]
@@ -73,8 +73,8 @@
   (let% [<simple-tests> (do-template [<assertion> <value> <ctor> <Eq> <get>]
                           [(assert <assertion>
                                    (and (is? <Eq> <value> <get> (list (<ctor> <value>)))
-                                        (found? (s;sample? (<ctor> <value>)) (list (<ctor> <value>)))
-                                        (enforced? (s;sample! (<ctor> <value>)) (list (<ctor> <value>)))))]
+                                        (found? (s;this? (<ctor> <value>)) (list (<ctor> <value>)))
+                                        (enforced? (s;this! (<ctor> <value>)) (list (<ctor> <value>)))))]
 
                           ["Can parse Bool syntax."   true           ast;bool   bool;Eq<Bool>   s;bool]
                           ["Can parse Nat syntax."    +123           ast;nat    number;Eq<Nat>  s;nat]
@@ -252,8 +252,8 @@
       (assert "Can parse while taking separators into account."
               (and (match (list 123 456 789)
                           (s;run (list (ast;int 123) (ast;text "YOLO") (ast;int 456) (ast;text "YOLO") (ast;int 789))
-                                 (s;sep-by (s;sample! (' "YOLO")) s;int)))
+                                 (s;sep-by (s;this! (' "YOLO")) s;int)))
                    (match (list 123 456)
                           (s;run (list (ast;int 123) (ast;text "YOLO") (ast;int 456) (ast;int 789))
-                                 (s;sep-by (s;sample! (' "YOLO")) s;int)))))
+                                 (s;sep-by (s;this! (' "YOLO")) s;int)))))
       ))
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index 1ffba0aa2..f16517d85 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
              [bool "b/" Eq<Bool>]
              [number "r/" Number<Real>]
-             (struct [list "List/" Fold<List> Functor<List>])
+             (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
        ["R" random]
diff --git a/stdlib/test/test/lux/math/complex.lux b/stdlib/test/test/lux/math/complex.lux
index f9743e9ec..0fb327425 100644
--- a/stdlib/test/test/lux/math/complex.lux
+++ b/stdlib/test/test/lux/math/complex.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
              [bool "b/" Eq<Bool>]
              [number "r/" Number<Real>]
-             (struct [list "List/" Fold<List> Functor<List>])
+             (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
        [math]
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index 883d54a06..57905a4d7 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (codata function)
        ["R" random]
diff --git a/stdlib/test/test/lux/math/ratio.lux b/stdlib/test/test/lux/math/ratio.lux
index 0cdbf4f93..cd9c6138b 100644
--- a/stdlib/test/test/lux/math/ratio.lux
+++ b/stdlib/test/test/lux/math/ratio.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
              [bool "b/" Eq<Bool>]
              [number "r/" Number<Real>]
-             (struct [list "List/" Fold<List> Functor<List>])
+             (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
        ["R" random]
diff --git a/stdlib/test/test/lux/math/simple.lux b/stdlib/test/test/lux/math/simple.lux
index 235723f25..0fc6ee2be 100644
--- a/stdlib/test/test/lux/math/simple.lux
+++ b/stdlib/test/test/lux/math/simple.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
              [bool "b/" Eq<Bool>]
              [number "r/" Number<Real>]
-             (struct [list "List/" Fold<List> Functor<List>])
+             (coll [list "List/" Fold<List> Functor<List>])
              [product])
        (codata function)
        ["R" random]
diff --git a/stdlib/test/test/lux/pipe.lux b/stdlib/test/test/lux/pipe.lux
index 86f45079f..0fc95add2 100644
--- a/stdlib/test/test/lux/pipe.lux
+++ b/stdlib/test/test/lux/pipe.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data text/format
              [number]
diff --git a/stdlib/test/test/lux/type.lux b/stdlib/test/test/lux/type.lux
index 1670f3146..081d9d444 100644
--- a/stdlib/test/test/lux/type.lux
+++ b/stdlib/test/test/lux/type.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text>]
              text/format
              [number]
              maybe
-             (struct [list]))
+             (coll [list]))
        ["R" random]
        pipe
        ["&" type])
diff --git a/stdlib/test/test/lux/type/auto.lux b/stdlib/test/test/lux/type/auto.lux
index fdc1ec51a..12b52292e 100644
--- a/stdlib/test/test/lux/type/auto.lux
+++ b/stdlib/test/test/lux/type/auto.lux
@@ -5,7 +5,7 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad
                 functor
                 [eq])
@@ -14,7 +14,7 @@
              [number]
              [bool "B/" Eq<Bool>]
              maybe
-             (struct [list]))
+             (coll [list]))
        ["R" random]
        pipe
        [type]
diff --git a/stdlib/test/test/lux/type/check.lux b/stdlib/test/test/lux/type/check.lux
index 2dadd92f2..e69bcfc45 100644
--- a/stdlib/test/test/lux/type/check.lux
+++ b/stdlib/test/test/lux/type/check.lux
@@ -5,13 +5,13 @@
 
 (;module:
   lux
-  (lux (codata [io])
+  (lux [io]
        (control monad)
        (data [text "Text/" Monoid<Text> Eq<Text>]
              text/format
              [number]
              maybe
-             (struct [list]))
+             (coll [list]))
        ["R" random]
        pipe
        [type]
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index fdcf01457..d6a21cae4 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -6,27 +6,27 @@
 (;module:
   lux
   (lux (control monad)
-       (codata [io])
+       [io]
        (concurrency [promise])
        [cli #+ program:]
        [test])
   (test lux
         (lux ["_;" cli]
              ["_;" host]
+             ["_;" io]
              ["_;" pipe]
              ["_;" lexer]
              (lexer ["_;" regex])
-             (codata ["_;" io]
+             (codata ["_;" cont]
                      ["_;" env]
                      ["_;" state]
-                     ["_;" cont]
-                     (struct ["_;" stream]))
+                     (coll ["_;" stream]))
              (concurrency ["_;" actor]
                           ["_;" atom]
                           ["_;" frp]
                           ["_;" promise]
                           ["_;" stm])
-             (control [effect])
+             ["_;" effect]
              (data [bit]
                    [bool]
                    [char]
@@ -41,15 +41,15 @@
                    [text]
                    (error [exception])
                    (format [json])
-                   (struct [array]
-                           [dict]
-                           [list]
-                           [queue]
-                           [set]
-                           [stack]
-                           ## [vector]
-                           (tree [rose]
-                                 [zipper]))
+                   (coll [array]
+                         [dict]
+                         [list]
+                         [queue]
+                         [set]
+                         [stack]
+                         ## [vector]
+                         (tree [rose]
+                               [zipper]))
                    (text [format])
                    )
              ["_;" math]