No longer giving default aliases to un-prefixed imports.

78 files changed, 395 insertions, 462 deletions

diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index a4730e2ef..5325d9b79 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -2,14 +2,14 @@
   [lux #*
    [control
     [monad (#+ do)]]
-   [math]
-   ["r" math/random]
    [data
-    [maybe]
+    ["." maybe]
     [number
-     [i64]]
+     ["." i64]]
     [text ("text/" Equivalence<Text>)
      format]]
+   ["." math
+    ["r" random]]
    ["." macro
     ["s" syntax (#+ syntax:)]]
    test])
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index 0bcdb785e..1504f2187 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -1,19 +1,18 @@
 (.module:
   [lux #*
-   [io]
    [control
     ["M" monad (#+ do Monad)]
     pipe
     ["p" parser]]
    [data
-    [product]
-    [sum]
     ["E" error]
-    [number]
+    ["." number]
     [text ("text/" Equivalence<Text>)
      format]
-    [collection [list]]]
-   [math ["r" random]]
+    [collection
+     ["." list]]]
+   [math
+    ["r" random]]
    ["/" cli]]
   lux/test)
 
diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux
index a4f2ae234..a84ded979 100644
--- a/stdlib/test/test/lux/concurrency/actor.lux
+++ b/stdlib/test/test/lux/concurrency/actor.lux
@@ -1,12 +1,11 @@
 (.module:
   [lux #*
-   [io (#+ IO io)]
+   ["." io (#+ IO io)]
    [control
     ["M" monad (#+ do Monad)]
     ["ex" exception]]
    [data
     ["e" error]
-    [number]
     [text
      format]]
    [concurrency
diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux
index 77f52b94d..03895bdeb 100644
--- a/stdlib/test/test/lux/concurrency/atom.lux
+++ b/stdlib/test/test/lux/concurrency/atom.lux
@@ -1,12 +1,8 @@
 (.module:
   [lux #*
-   [io]
+   ["." io]
    [control
     ["M" monad (#+ do Monad)]]
-   [data
-    [number]
-    [text
-     format]]
    [concurrency
     ["&" atom]]
    [math
diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux
index 0cb6b7831..db2ad4a2f 100644
--- a/stdlib/test/test/lux/concurrency/frp.lux
+++ b/stdlib/test/test/lux/concurrency/frp.lux
@@ -1,18 +1,16 @@
 (.module:
   [lux #*
-   [io (#+ IO io)]
+   ["." io (#+ IO io)]
    [control
-    [monad (#+ do Monad)]]
+    ["." monad (#+ do Monad)]]
    [data
-    [number]
-    [text
-     format]
+    ["." number]
     [collection
-     [list]]]
+     ["." list]]]
    [concurrency
-    [promise ("promise/" Monad<Promise>)]
-    [frp (#+ Channel)]
-    [atom (#+ Atom atom)]]]
+    ["." promise ("promise/" Monad<Promise>)]
+    ["." frp (#+ Channel)]
+    ["." atom (#+ Atom atom)]]]
   lux/test)
 
 (def: (write! values channel)
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index 0aae405ab..2ede2b349 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -1,13 +1,9 @@
 (.module:
   [lux #*
-   [io (#+ IO io)]
+   ["." io]
    [control
     ["M" monad (#+ do Monad)]
     pipe]
-   [data
-    [number]
-    [text
-     format]]
    [concurrency
     ["&" promise ("&/" Monad<Promise>)]]
    [math
@@ -17,7 +13,7 @@
 (context: "Promises"
   ($_ seq
       (wrap (do &.Monad<Promise>
-              [running? (&.future (io #1))]
+              [running? (&.future (io.io #1))]
               (assert "Can run IO actions in separate threads."
                       running?)))
 
@@ -27,8 +23,8 @@
                       #1)))
 
       (wrap (do &.Monad<Promise>
-              [[left right] (&.seq (&.future (io #1))
-                                   (&.future (io #0)))]
+              [[left right] (&.seq (&.future (io.io #1))
+                                   (&.future (io.io #0)))]
               (assert "Can combine promises sequentially."
                       (and left (not right)))))
 
diff --git a/stdlib/test/test/lux/concurrency/semaphore.lux b/stdlib/test/test/lux/concurrency/semaphore.lux
index 7eadd5ac7..b941654f0 100644
--- a/stdlib/test/test/lux/concurrency/semaphore.lux
+++ b/stdlib/test/test/lux/concurrency/semaphore.lux
@@ -1,17 +1,18 @@
 (.module:
   [lux #*
    [control
-    [monad (#+ do)]]
+    ["." monad (#+ do)]]
    [data
-    [maybe]
-    [text ("text/" Equivalence<Text> Monoid<Text>)
+    ["." maybe]
+    ["." text ("text/" Equivalence<Text> Monoid<Text>)
      format]
-    [collection [list ("list/" Functor<List>)]]]
+    [collection
+     ["." list ("list/" Functor<List>)]]]
    [concurrency
     ["/" semaphore]
-    [promise (#+ Promise)]
-    [atom (#+ Atom)]]
-   [io]
+    ["." promise (#+ Promise)]
+    ["." atom (#+ Atom)]]
+   ["." io]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux
index 1a254284f..d4697cd6e 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -1,19 +1,17 @@
 (.module:
   [lux #*
-   [io (#+ IO)]
+   ["." io (#+ IO)]
    [control
     ["M" monad (#+ do Monad)]]
    [data
-    [number]
-    [maybe]
-    [text format]
+    ["." number]
     [collection
-     [list ("list/" Functor<List>)]]]
+     ["." list ("list/" Functor<List>)]]]
    [concurrency
-    [atom (#+ Atom atom)]
+    ["." atom (#+ Atom atom)]
     ["&" stm]
-    [promise]
-    [frp (#+ Channel)]]
+    ["." promise]
+    ["." frp (#+ Channel)]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/control/continuation.lux b/stdlib/test/test/lux/control/continuation.lux
index 9d5cad55b..60dfb7ac4 100644
--- a/stdlib/test/test/lux/control/continuation.lux
+++ b/stdlib/test/test/lux/control/continuation.lux
@@ -4,8 +4,9 @@
     ["M" monad (#+ do Monad)]
     ["&" continuation]]
    [data
-    [number]
-    [collection [list]]]
+    ["." number]
+    [collection
+     ["." list]]]
    ["r" math/random]]
   lux/test)
 
diff --git a/stdlib/test/test/lux/control/exception.lux b/stdlib/test/test/lux/control/exception.lux
index 9e11dbe0f..c1aa9d08e 100644
--- a/stdlib/test/test/lux/control/exception.lux
+++ b/stdlib/test/test/lux/control/exception.lux
@@ -1,14 +1,12 @@
 (.module:
   [lux #*
-   [io]
    [control
     ["M" monad (#+ do Monad)]
     ["&" exception (#+ exception:)]]
    [data
     ["E" error]
     ["." text
-     format]
-    [number]]
+     format]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux
index 89691a719..190ebce0d 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/test/test/lux/control/interval.lux
@@ -5,13 +5,10 @@
     ["M" monad (#+ do Monad)]
     pipe
     ["&" interval]]
-   [io]
    [math
     ["r" random]]
    [data
-    [number]
-    [text
-     format]
+    ["." number]
     [collection
      ["S" set]
      ["L" list]]]])
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index 70cf4cfbe..505ee4b55 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -1,16 +1,15 @@
 (.module:
   [lux #*
-   [io]
    [control
     ["M" monad (#+ do)]
     [equivalence (#+ Equivalence)]
     ["&" parser]]
    [data
-    [error (#+ Error)]]
+    ["." error (#+ Error)]]
    [math
     ["r" random]]
    ["." macro
-    [code]
+    ["." code]
     ["s" syntax (#+ syntax:)]]]
   lux/test)
 
diff --git a/stdlib/test/test/lux/control/pipe.lux b/stdlib/test/test/lux/control/pipe.lux
index 6e232a255..d03becffc 100644
--- a/stdlib/test/test/lux/control/pipe.lux
+++ b/stdlib/test/test/lux/control/pipe.lux
@@ -1,12 +1,9 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe]
    [data
-    [number]
-    [product]
     identity
     [text ("text/" Equivalence<Text>)
      format]]
diff --git a/stdlib/test/test/lux/control/reader.lux b/stdlib/test/test/lux/control/reader.lux
index 560e6565c..51b1f82f3 100644
--- a/stdlib/test/test/lux/control/reader.lux
+++ b/stdlib/test/test/lux/control/reader.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [io]
+   ["." io]
    [control
     [monad (#+ do)]
     pipe
diff --git a/stdlib/test/test/lux/control/region.lux b/stdlib/test/test/lux/control/region.lux
index 266fd2733..b6cd43ea7 100644
--- a/stdlib/test/test/lux/control/region.lux
+++ b/stdlib/test/test/lux/control/region.lux
@@ -1,15 +1,14 @@
 (.module:
   [lux #*
    [control
-    [monad (#+ do)]
+    ["." monad (#+ do)]
     ["/" region]
-    [thread (#+ Thread)]
+    ["." thread (#+ Thread)]
     ["ex" exception (#+ exception:)]]
    [data
     ["e" error (#+ Error)]
-    [text
-     format]
-    [collection [list]]]
+    [collection
+     ["." list]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/control/state.lux b/stdlib/test/test/lux/control/state.lux
index 3d8c2fd10..2b3b3160c 100644
--- a/stdlib/test/test/lux/control/state.lux
+++ b/stdlib/test/test/lux/control/state.lux
@@ -1,12 +1,12 @@
 (.module:
   [lux #*
-   [io]
+   ["." io]
    [control
     ["M" monad (#+ do Monad)]
     pipe
     ["&" state]]
    [data
-    [product]]
+    ["." product]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/control/writer.lux b/stdlib/test/test/lux/control/writer.lux
index 8f44f6784..7172e865e 100644
--- a/stdlib/test/test/lux/control/writer.lux
+++ b/stdlib/test/test/lux/control/writer.lux
@@ -1,14 +1,13 @@
 (.module:
   [lux #*
-   [io]
+   ["." io]
    [control
     ["M" monad (#+ do Monad)]
     pipe
     ["&" writer]]
    [data
-    [number]
-    [product]
-    [text ("text/" Equivalence<Text>)]]]
+    ["." product]
+    ["." text ("text/" Equivalence<Text>)]]]
   lux/test)
 
 (context: "Writer."
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux
index 8d0a93a83..7eea70f7a 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/test/test/lux/data/bit.lux
@@ -2,7 +2,6 @@
   [lux #*
    [control
     ["M" monad (#+ do Monad)]]
-   [io]
    [data
     bit]
    [math
diff --git a/stdlib/test/test/lux/data/collection/array.lux b/stdlib/test/test/lux/data/collection/array.lux
index 91b67b5c5..a362df27b 100644
--- a/stdlib/test/test/lux/data/collection/array.lux
+++ b/stdlib/test/test/lux/data/collection/array.lux
@@ -3,13 +3,12 @@
    [control
     [monad (#+ do Monad)]
     pipe]
-   [io]
    [data
-    [number]
-    [maybe]
+    ["." number]
+    ["." maybe]
     [collection
      ["@" array]
-     [list]]]
+     ["." list]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/collection/bits.lux b/stdlib/test/test/lux/data/collection/bits.lux
index dd53f42eb..c9c1a1b85 100644
--- a/stdlib/test/test/lux/data/collection/bits.lux
+++ b/stdlib/test/test/lux/data/collection/bits.lux
@@ -2,14 +2,17 @@
   [lux #*
    [control
     [monad (#+ do)]
-    [predicate]]
+    ["." predicate]]
    [data
     [collection
      ["/" bits]]]
    [math
     ["r" random]]]
   lux/test
-  [test [lux [control ["_eq" equivalence]]]])
+  [test
+   [lux
+    [control
+     ["_eq" equivalence]]]])
 
 (def: (size min max)
   (-> Nat Nat (r.Random Nat))
diff --git a/stdlib/test/test/lux/data/collection/dictionary.lux b/stdlib/test/test/lux/data/collection/dictionary.lux
index f79327c29..c56bd7d42 100644
--- a/stdlib/test/test/lux/data/collection/dictionary.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary.lux
@@ -1,18 +1,16 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     ["eq" equivalence]]
    [data
-    [number]
-    [maybe]
-    ["." text
-     format]
+    ["." number]
+    ["." maybe]
     [collection
      ["&" dictionary]
-     [list ("list/" Fold<List> Functor<List>)]]]
-   ["r" math/random]]
+     ["." list ("list/" Fold<List> Functor<List>)]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Dictionaries."
diff --git a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
index 64a51b413..b95f889b1 100644
--- a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
@@ -1,17 +1,16 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     [equivalence (#+ Equivalence)]]
    [data
-    [product]
-    [number]
+    ["." product]
+    ["." number]
     [collection
      ["s" set]
-     ["dict" dictionary]
-     [dictionary ["&" ordered]]
-     [list ("list/" Functor<List>)]]]
+     ["dict" dictionary
+      ["&" ordered]]
+     ["." list ("list/" Functor<List>)]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/collection/list.lux b/stdlib/test/test/lux/data/collection/list.lux
index f5565c455..2e8ac8b0e 100644
--- a/stdlib/test/test/lux/data/collection/list.lux
+++ b/stdlib/test/test/lux/data/collection/list.lux
@@ -1,13 +1,14 @@
 (.module:
   [lux #*
-   [io]
+   ["." io]
    [control
     [monad (#+ do Monad)]
     pipe]
-   [data [number]
-    [bit]
-    [product]
-    [maybe]
+   [data
+    ["." number]
+    ["." bit]
+    ["." product]
+    ["." maybe]
     [collection
      ["&" list]]]
    [math
diff --git a/stdlib/test/test/lux/data/collection/queue.lux b/stdlib/test/test/lux/data/collection/queue.lux
index 89f674462..82ea751d8 100644
--- a/stdlib/test/test/lux/data/collection/queue.lux
+++ b/stdlib/test/test/lux/data/collection/queue.lux
@@ -1,10 +1,9 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
-    [number]
+    ["." number]
     [collection
      ["&" queue]]]
    [math
diff --git a/stdlib/test/test/lux/data/collection/queue/priority.lux b/stdlib/test/test/lux/data/collection/queue/priority.lux
index d893fe960..b5f8a1d17 100644
--- a/stdlib/test/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/test/test/lux/data/collection/queue/priority.lux
@@ -1,12 +1,13 @@
 (.module:
   [lux #*
-   [io]
    [control
-    [monad (#+ do Monad)]]
+    ["." monad (#+ do Monad)]]
    [data
-    [number]
-    [maybe]
-    [collection [queue ["&" priority]]]]
+    ["." number]
+    ["." maybe]
+    [collection
+     [queue
+      ["&" priority]]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/collection/row.lux b/stdlib/test/test/lux/data/collection/row.lux
index dbe9280b6..ad71d0380 100644
--- a/stdlib/test/test/lux/data/collection/row.lux
+++ b/stdlib/test/test/lux/data/collection/row.lux
@@ -1,11 +1,10 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
-    [number]
-    [maybe]
+    ["." number]
+    ["." maybe]
     [collection ["&" row]
      [list ("list/" Fold<List>)]]]
    [math
diff --git a/stdlib/test/test/lux/data/collection/sequence.lux b/stdlib/test/test/lux/data/collection/sequence.lux
index 16b98a90b..b33882557 100644
--- a/stdlib/test/test/lux/data/collection/sequence.lux
+++ b/stdlib/test/test/lux/data/collection/sequence.lux
@@ -1,15 +1,14 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     comonad]
    [data
-    [maybe]
-    [number ("nat/" Codec<Text,Nat>)]
-    [text ("text/" Monoid<Text>)
-     format]
-    [collection [list]
+    ["." maybe]
+    ["." number ("nat/" Codec<Text,Nat>)]
+    ["." text ("text/" Monoid<Text>)]
+    [collection
+     ["." list]
      ["&" sequence]]]
    [math
     ["r" random]]]
diff --git a/stdlib/test/test/lux/data/collection/set.lux b/stdlib/test/test/lux/data/collection/set.lux
index 43bd48069..3db08f344 100644
--- a/stdlib/test/test/lux/data/collection/set.lux
+++ b/stdlib/test/test/lux/data/collection/set.lux
@@ -1,12 +1,12 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
-    [number]
-    [collection ["&" set (#+ Set)]
-     [list]]]
+    ["." number]
+    [collection
+     ["&" set (#+ Set)]
+     ["." list]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/collection/set/ordered.lux b/stdlib/test/test/lux/data/collection/set/ordered.lux
index 261eebbb1..d75fe3c53 100644
--- a/stdlib/test/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/set/ordered.lux
@@ -1,16 +1,15 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
-    [number]
+    ["." number]
     [text
      format]
     [collection
      ["." set
       ["&" ordered]]
-     [list]]]
+     ["." list]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/collection/stack.lux b/stdlib/test/test/lux/data/collection/stack.lux
index 06e8af547..0be661232 100644
--- a/stdlib/test/test/lux/data/collection/stack.lux
+++ b/stdlib/test/test/lux/data/collection/stack.lux
@@ -3,8 +3,9 @@
    [control
     [monad (#+ do)]]
    [data
-    [maybe]
-    [collection ["&" stack]]]
+    ["." maybe]
+    [collection
+     ["&" stack]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/collection/tree/rose.lux b/stdlib/test/test/lux/data/collection/tree/rose.lux
index ac340cd13..f1cb294fb 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose.lux
@@ -1,16 +1,16 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
-    [product]
-    [number]
+    ["." product]
+    ["." number]
     [text ("text/" Equivalence<Text>)
      format]
     [collection
-     [tree ["&" rose]]
-     [list ("list/" Functor<List> Fold<List>)]]]
+     ["." list ("list/" Functor<List> Fold<List>)]
+     [tree
+      ["&" rose]]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
index 28c7ec0f9..1a24a805b 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
@@ -1,19 +1,18 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe]
    [data
-    [number]
-    [maybe]
+    ["." number]
+    ["." maybe]
     ["." text
      format]
     [collection
-     [list ("list/" Fold<List> Functor<List>)]
+     ["." list]
      [tree
-      [rose]
-      [rose ["&" zipper]]]]]
+      ["." rose
+       ["&" zipper]]]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/color.lux b/stdlib/test/test/lux/data/color.lux
index 797a0336b..246945686 100644
--- a/stdlib/test/test/lux/data/color.lux
+++ b/stdlib/test/test/lux/data/color.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do)]]
    [data
diff --git a/stdlib/test/test/lux/data/error.lux b/stdlib/test/test/lux/data/error.lux
index 7e64cc5ed..9b69c6a80 100644
--- a/stdlib/test/test/lux/data/error.lux
+++ b/stdlib/test/test/lux/data/error.lux
@@ -1,13 +1,11 @@
 (.module:
   [lux #*
-   [io]
+   ["." io]
    [control
-    ["M" monad (#+ do Monad)]
+    [monad (#+ do Monad)]
     pipe]
    [data
-    ["&" error]
-    [text
-     format]]]
+    ["&" error]]]
   lux/test)
 
 (context: "Errors"
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 086c13ece..2183c5004 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     codec
@@ -9,9 +8,9 @@
     ["p" parser]]
    [data
     ["e" error]
-    [bit]
-    [maybe]
-    [number]
+    ["." bit]
+    ["." maybe]
+    ["." number]
     ["." text
      format]
     [format
@@ -19,15 +18,13 @@
     [collection
      [row (#+ row)]
      ["d" dictionary]
-     [list]]]
-   [macro (#+ with-gensyms)
-    [code]
-    [syntax (#+ syntax:)]
+     ["." list]]]
+   [macro
     [poly (#+ derived:)]
-    [poly/equivalence]
-    [poly/json]]
+    ["." poly/equivalence]
+    ["." poly/json]]
    [type
-    [unit]]
+    ["." unit]]
    [math
     ["r" random]]
    [time
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux
index 350718f0f..8795e7f27 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/test/test/lux/data/format/xml.lux
@@ -1,21 +1,20 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     ["p" parser]
     pipe]
    [data
-    [ident]
+    ["." ident]
     ["E" error]
-    [maybe]
-    [text ("text/" Equivalence<Text>)
+    ["." maybe]
+    ["." text ("text/" Equivalence<Text>)
      format]
     [format
      ["&" xml]]
     [collection
      ["dict" dictionary]
-     [list ("list/" Functor<List>)]]]
+     ["." list ("list/" Functor<List>)]]]
    [math
     ["r" random ("r/" Monad<Random>)]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux
index e0e37d7a8..622edf474 100644
--- a/stdlib/test/test/lux/data/ident.lux
+++ b/stdlib/test/test/lux/data/ident.lux
@@ -1,14 +1,14 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe]
    [data
     ["&" ident]
-    [text ("text/" Equivalence<Text>)
+    ["." text ("text/" Equivalence<Text>)
      format]]
-   [math ["r" random]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: (gen-part size)
diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/test/test/lux/data/identity.lux
index a57a05f4c..9fe0cb50e 100644
--- a/stdlib/test/test/lux/data/identity.lux
+++ b/stdlib/test/test/lux/data/identity.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     ["M" monad (#+ do Monad)]
     comonad]
diff --git a/stdlib/test/test/lux/data/lazy.lux b/stdlib/test/test/lux/data/lazy.lux
index 895fa8b1c..785f08719 100644
--- a/stdlib/test/test/lux/data/lazy.lux
+++ b/stdlib/test/test/lux/data/lazy.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/test/test/lux/data/maybe.lux
index 8e6680ad8..4a1d39552 100644
--- a/stdlib/test/test/lux/data/maybe.lux
+++ b/stdlib/test/test/lux/data/maybe.lux
@@ -1,55 +1,52 @@
 (.module:
   [lux #*
-   [io]
+   ["." io ("io/" Monad<IO>)]
    [control
     ["M" monad (#+ do Monad)]
     pipe]
    [data
-    ["&" maybe]
-    [number]
-    [text ("text/" Monoid<Text>)]]]
+    ["&" maybe ("&/" Monoid<Maybe>)]
+    ["." text ("text/" Monoid<Text>)]]]
   lux/test)
 
 (context: "Maybe"
-  (let [(^open "&/") &.Monoid<Maybe>
-        (^open "&/") &.Apply<Maybe>
+  (let [(^open "&/") &.Apply<Maybe>
         (^open "&/") &.Monad<Maybe>
-        (^open "Maybe/") (&.Equivalence<Maybe> text.Equivalence<Text>)]
+        (^open "&/") (&.Equivalence<Maybe> text.Equivalence<Text>)]
     ($_ seq
         (test "Can compare Maybe values."
-              (and (Maybe/= #.None #.None)
-                   (Maybe/= (#.Some "yolo") (#.Some "yolo"))
-                   (not (Maybe/= (#.Some "yolo") (#.Some "lol")))
-                   (not (Maybe/= (#.Some "yolo") #.None))))
+              (and (&/= #.None #.None)
+                   (&/= (#.Some "yolo") (#.Some "yolo"))
+                   (not (&/= (#.Some "yolo") (#.Some "lol")))
+                   (not (&/= (#.Some "yolo") #.None))))
 
         (test "Monoid respects Maybe."
-              (and (Maybe/= #.None &/identity)
-                   (Maybe/= (#.Some "yolo") (&/compose (#.Some "yolo") (#.Some "lol")))
-                   (Maybe/= (#.Some "yolo") (&/compose (#.Some "yolo") #.None))
-                   (Maybe/= (#.Some "lol") (&/compose #.None (#.Some "lol")))
-                   (Maybe/= #.None (: (Maybe Text) (&/compose #.None #.None)))))
+              (and (&/= #.None &/identity)
+                   (&/= (#.Some "yolo") (&/compose (#.Some "yolo") (#.Some "lol")))
+                   (&/= (#.Some "yolo") (&/compose (#.Some "yolo") #.None))
+                   (&/= (#.Some "lol") (&/compose #.None (#.Some "lol")))
+                   (&/= #.None (: (Maybe Text) (&/compose #.None #.None)))))
         
         (test "Functor respects Maybe."
-              (and (Maybe/= #.None (&/map (text/compose "yolo") #.None))
-                   (Maybe/= (#.Some "yololol") (&/map (text/compose "yolo") (#.Some "lol")))))
+              (and (&/= #.None (&/map (text/compose "yolo") #.None))
+                   (&/= (#.Some "yololol") (&/map (text/compose "yolo") (#.Some "lol")))))
         
         (test "Apply respects Maybe."
-              (and (Maybe/= (#.Some "yolo") (&/wrap "yolo"))
-                   (Maybe/= (#.Some "yololol")
-                            (&/apply (&/wrap (text/compose "yolo")) (&/wrap "lol")))))
+              (and (&/= (#.Some "yolo") (&/wrap "yolo"))
+                   (&/= (#.Some "yololol")
+                        (&/apply (&/wrap (text/compose "yolo")) (&/wrap "lol")))))
         
         (test "Monad respects Maybe."
-              (Maybe/= (#.Some "yololol")
-                       (do &.Monad<Maybe>
-                         [f (wrap text/compose)
-                          a (wrap "yolo")
-                          b (wrap "lol")]
-                         (wrap (f a b)))))
+              (&/= (#.Some "yololol")
+                   (do &.Monad<Maybe>
+                     [f (wrap text/compose)
+                      a (wrap "yolo")
+                      b (wrap "lol")]
+                     (wrap (f a b)))))
         )))
 
 (context: "Monad transformer"
-  (let [lift (&.lift io.Monad<IO>)
-        (^open "io/") io.Monad<IO>]
+  (let [lift (&.lift io.Monad<IO>)]
     (test "Can add maybe functionality to any monad."
           (|> (io.run (do (&.MaybeT io.Monad<IO>)
                         [a (lift (io/wrap 123))
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux
index 15bdbfd4c..fc96fd8ff 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/test/test/lux/data/number.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     ["M" monad (#+ do Monad)]
     pipe]
diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/test/test/lux/data/number/complex.lux
index 15d759ba7..838c625c6 100644
--- a/stdlib/test/test/lux/data/number/complex.lux
+++ b/stdlib/test/test/lux/data/number/complex.lux
@@ -1,17 +1,13 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe]
    [data
-    [product]
-    [number ("frac/" Number<Frac>)
+    ["." number ("frac/" Number<Frac>)
      ["&" complex]]
-    [text
-     format]
     [collection
-     [list ("list/" Functor<List>)]]]
+     ["." list ("list/" Functor<List>)]]]
    ["." math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/number/i64.lux b/stdlib/test/test/lux/data/number/i64.lux
index 52b80ea25..d48d009e6 100644
--- a/stdlib/test/test/lux/data/number/i64.lux
+++ b/stdlib/test/test/lux/data/number/i64.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     ["M" monad (#+ do Monad)]]
    [data
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index 5be1942f2..32fc03e7a 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -1,11 +1,11 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe]
    [data
-    ["&" number/ratio ("&/" Number<Ratio>)]]
+    [number
+     ["&" ratio ("&/" Number<Ratio>)]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux
index 4f8cadac2..4d699581f 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/test/test/lux/data/sum.lux
@@ -4,9 +4,9 @@
     pipe]
    [data
     sum
-    [text]
+    ["." text]
     [collection
-     [list]]]]
+     ["." list]]]]
   lux/test)
 
 (context: "Sum operations"
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index 478fb8c39..bb7ee219a 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -1,15 +1,13 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe]
    [data
     ["&" text
      format]
-    [number]
     [collection
-     [list]]]
+     ["." list]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux
index 6c877da7b..eb42a088d 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/test/test/lux/data/text/format.lux
@@ -1,12 +1,10 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
     ["." text
-     format]
-    [number]]]
+     format]]]
   lux/test)
 
 (context: "Formatters"
diff --git a/stdlib/test/test/lux/data/text/lexer.lux b/stdlib/test/test/lux/data/text/lexer.lux
index cab364c59..d86093f3a 100644
--- a/stdlib/test/test/lux/data/text/lexer.lux
+++ b/stdlib/test/test/lux/data/text/lexer.lux
@@ -4,14 +4,13 @@
     [monad (#+ do Monad)]
     pipe
     ["p" parser]]
-   [io]
    [data
     ["E" error]
-    [text ("text/" Equivalence<Text>)
+    ["." text ("text/" Equivalence<Text>)
      format
      ["&" lexer]]
     [collection
-     [list]]]
+     ["." list]]]
    [math
     ["r" random]]]
   lux/test)
@@ -104,7 +103,7 @@
                  (should-fail (&.run "M"
                                      (&.range (char "X") (char "Z"))))))
       
-      (test "Can lex upper-case and &.lower-case letters."
+      (test "Can lex upper-case and lower-case letters."
             (and (should-passT "Y" (&.run "Y"
                                           &.upper))
                  (should-fail (&.run "m"
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux
index dd13cee12..c177e07a4 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/test/test/lux/data/text/regex.lux
@@ -1,26 +1,23 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe
     ["p" parser]]
    [data
-    [product]
     [text ("text/" Equivalence<Text>)
      format
-     [lexer]
+     ["." lexer (#+ Lexer)]
      ["&" regex]]]
-   ["." macro
-    [code]
-    ["s" syntax (#+ syntax:)]]
    [math
-    ["r" random]]]
+    ["r" random]]
+   [macro
+    ["s" syntax (#+ syntax:)]]]
   lux/test)
 
 ## [Utils]
 (def: (should-pass regex input)
-  (-> (lexer.Lexer Text) Text Bit)
+  (-> (Lexer Text) Text Bit)
   (|> (lexer.run input regex)
       (case> (#.Right parsed)
              (text/= parsed input)
@@ -29,7 +26,7 @@
              #0)))
 
 (def: (should-passT test regex input)
-  (-> Text (lexer.Lexer Text) Text Bit)
+  (-> Text (Lexer Text) Text Bit)
   (|> (lexer.run input regex)
       (case> (#.Right parsed)
              (text/= test parsed)
@@ -38,7 +35,7 @@
              #0)))
 
 (def: (should-fail regex input)
-  (All [a] (-> (lexer.Lexer a) Text Bit))
+  (All [a] (-> (Lexer a) Text Bit))
   (|> (lexer.run input regex)
       (case> (#.Left _) #1 _ #0)))
 
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux
index 5d233187d..b2b88148c 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/test/test/lux/host.jvm.lux
@@ -1,29 +1,26 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     pipe]
    [data
-    [number]
-    [product]
-    [text ("text/" Equivalence<Text>)
-     format]]
-   ["&" host (#+ class: interface: object)]
-   ["r" math/random]]
+    [text ("text/" Equivalence<Text>)]]
+   ["&" host (#+ import: class: interface: object)]
+   [math
+    ["r" random]]]
   lux/test)
 
-(&.import: (java/util/concurrent/Callable a))
+(import: (java/util/concurrent/Callable a))
 
-(&.import: java/lang/Exception
+(import: java/lang/Exception
   (new [String]))
 
-(&.import: java/lang/Object)
+(import: java/lang/Object)
 
-(&.import: (java/lang/Class a)
+(import: (java/lang/Class a)
   (getName [] String))
 
-(&.import: java/lang/System
+(import: java/lang/System
   (#static out java/io/PrintStream)
   (#static currentTimeMillis [] #io long)
   (#static getenv [String] #io #? String))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/case.lux b/stdlib/test/test/lux/language/compiler/analysis/case.lux
index adbacaa0e..c15bb192a 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/case.lux
@@ -1,26 +1,25 @@
 (.module:
   [lux #*
-   [io]
    [control
-    [monad (#+ do)]
+    ["." monad (#+ do)]
     pipe]
    [data
-    [product]
-    [maybe]
-    [text ("text/" Equivalence<Text>)]
+    ["." product]
+    ["." maybe]
+    ["." text ("text/" Equivalence<Text>)]
     [collection
-     [list ("list/" Monad<List>)]
-     [set]]]
+     ["." list ("list/" Monad<List>)]
+     ["." set]]]
    [math
     ["r" random ("random/" Monad<Random>)]]
    [macro
-    [code]]
+    ["." code]]
    [language
     ["." type
-     [check]]
+     ["." check]]
     ["." compiler
      ["." analysis
-      [module]
+      ["." module]
       [".A" type]
       ["/" case]]]]
    test]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/function.lux b/stdlib/test/test/lux/language/compiler/analysis/function.lux
index f3d8ce0dc..f3c7dc5b5 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/function.lux
@@ -1,29 +1,28 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do)]
     pipe]
    [data
     ["e" error]
-    [maybe]
-    [product]
+    ["." maybe]
+    ["." product]
     [text ("text/" Equivalence<Text>)
      format]
     [collection
-     [list ("list/" Functor<List>)]]]
+     ["." list ("list/" Functor<List>)]]]
    [math
     ["r" random]]
    ["." macro
-    [code]]
+    ["." code]]
    ["." language
-    [type]
-    [reference]
+    ["." type]
+    ["." reference]
     ["." compiler
-     [init]
-     [analysis (#+ Analysis Operation)
+     ["." init]
+     ["." analysis (#+ Analysis Operation)
       [".A" type]
-      [expression]
+      ["." expression]
       ["/" function]]
      [extension
       [".E" analysis]]]]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
index 07510ae9d..c5a5bee5a 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
@@ -1,24 +1,24 @@
 (.module:
   [lux (#- primitive)
-   [io]
    [control
     [monad (#+ do)]
     pipe
     ["ex" exception (#+ exception:)]]
    [data
     ["e" error]
-    [text format]]
+    [text
+     format]]
    [math
     ["r" random ("random/" Monad<Random>)]]
    [macro
-    [code]]
+    ["." code]]
    ["." language
     [".L" type ("type/" Equivalence<Type>)]
     ["." compiler
-     [init]
-     [analysis (#+ Analysis Operation)
+     ["." init]
+     ["." analysis (#+ Analysis Operation)
       [".A" type]
-      [expression]]
+      ["." expression]]
      [extension
       [".E" analysis]]]]
    test])
@@ -83,7 +83,7 @@
                                             _
                                             #0))))]
 
-                        ["bit" Bit #analysis.Bit r.bit code.bit]
+                        ["bit"  Bit  #analysis.Bit  r.bit  code.bit]
                         ["nat"  Nat  #analysis.Nat  r.nat  code.nat]
                         ["int"  Int  #analysis.Int  r.int  code.int]
                         ["rev"  Rev  #analysis.Rev  r.rev  code.rev]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
index 19d1e8e96..82858a595 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
@@ -5,22 +5,22 @@
     [monad (#+ do)]
     pipe]
    [concurrency
-    [atom]]
+    ["." atom]]
    [data
     ["e" error]
-    [product]
-    [text format]
-    [collection [array]]]
+    ["." product]
+    [text
+     format]]
    [math
     ["r" random]]
    [macro
-    [code]]
+    ["." code]]
    [language
     [type ("type/" Equivalence<Type>)]
     ["." compiler
-     [init]
+     ["." init]
      [analysis
-      [scope]
+      ["." scope]
       [".A" type]]
      [extension
       [".E" analysis]]]]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/reference.lux b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
index 0ae6dbe96..118b1b586 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/reference.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do)]
     pipe]
@@ -11,18 +10,18 @@
    [math
     ["r" random]]
    [macro
-    [code]]
+    ["." code]]
    ["." language]
    [language
     [type ("type/" Equivalence<Type>)]
-    [reference]
+    ["." reference]
     ["." compiler
-     [init]
+     ["." init]
      ["." analysis
-      [scope]
-      [module]
+      ["." scope]
+      ["." module]
       [".A" type]
-      [expression]]
+      ["." expression]]
      [extension
       [".E" analysis]]]]
    test]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/structure.lux b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
index 3fb2d2455..79d040e51 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
@@ -6,26 +6,26 @@
    [data
     [bit ("bit/" Equivalence<Bit>)]
     ["e" error]
-    [product]
-    [maybe]
+    ["." product]
+    ["." maybe]
     ["." text]
     [collection
-     [list ("list/" Functor<List>)]
-     [set]]]
+     ["." list ("list/" Functor<List>)]
+     ["." set]]]
    [math
     ["r" random]]
    [macro
-    [code]]
+    ["." code]]
    ["." language
-    [type ("type/" Equivalence<Type>)
-     [check]]
+    ["." type ("type/" Equivalence<Type>)
+     ["." check]]
     ["." compiler
-     [init]
-     [analysis (#+ Analysis Variant Tag Operation)
-      [module]
+     ["." init]
+     ["." analysis (#+ Analysis Variant Tag Operation)
+      ["." module]
       [".A" type]
       ["/" structure]
-      [expression]]
+      ["." expression]]
      [extension
       [".E" analysis]]]]
    test]
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/case.lux b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
index da8e59fa1..2acde1a5b 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
@@ -4,19 +4,19 @@
     [monad (#+ do)]
     pipe]
    [data
-    [error ("error/" Functor<Error>)]]
+    ["." error ("error/" Functor<Error>)]]
    [language
-    [reference]
+    ["." reference]
     ["." compiler
-     [analysis (#+ Branch Analysis)]
+     ["." analysis (#+ Branch Analysis)]
      ["//" synthesis (#+ Synthesis)
-      [expression]]
+      ["." expression]]
      [extension
-      [bundle]]]]
+      ["." bundle]]]]
    [math
     ["r" random]]
    test]
-  [//primitive])
+  ["." //primitive])
 
 (context: "Dummy variables."
   (<| (times +100)
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/function.lux b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
index 8954aafb1..35d2c4dd6 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
@@ -1,30 +1,31 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do)]
     pipe]
    [data
-    [product]
-    [maybe]
-    [error]
-    [number]
-    [text format]
+    ["." product]
+    ["." maybe]
+    ["." error]
+    ["." number]
+    [text
+     format]
     [collection
-     [list ("list/" Functor<List> Fold<List>)]
+     ["." list ("list/" Functor<List> Fold<List>)]
      ["dict" dictionary (#+ Dictionary)]
-     [set]]]
+     ["." set]]]
    [language
-    [reference (#+ Variable) ("variable/" Equivalence<Variable>)]
+    ["." reference (#+ Variable) ("variable/" Equivalence<Variable>)]
     ["." compiler
-     [analysis (#+ Arity Analysis)]
+     ["." analysis (#+ Arity Analysis)]
      ["//" synthesis (#+ Synthesis)
-      [expression]]
+      ["." expression]]
      [extension
-      [bundle]]]]
-   [math ["r" random]]
+      ["." bundle]]]]
+   [math
+    ["r" random]]
    test]
-  [//primitive])
+  ["." //primitive])
 
 (def: constant-function
   (r.Random [Arity Analysis Analysis])
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
index 86eecb600..c4cc940f1 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
@@ -1,20 +1,19 @@
 (.module:
   [lux (#- primitive)
-   [io]
    [control
     [monad (#+ do)]
     pipe]
    [data
-    [error]
+    ["." error]
     [text
      format]]
    [language
     ["." compiler
-     [analysis (#+ Analysis)]
+     ["." analysis (#+ Analysis)]
      ["//" synthesis (#+ Synthesis)
-      [expression]]
+      ["." expression]]
      [extension
-      [bundle]]]]
+      ["." bundle]]]]
    [math
     ["r" random]]
    test])
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/structure.lux b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
index cb82f9131..2b86e318a 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
@@ -1,26 +1,25 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do)]
     pipe]
    [data
     [bit ("bit/" Equivalence<Bit>)]
-    [product]
-    [error]
+    ["." product]
+    ["." error]
     [collection
-     [list]]]
+     ["." list]]]
    [language
     ["." compiler
-     [analysis]
+     ["." analysis]
      ["//" synthesis (#+ Synthesis)
-      [expression]]
+      ["." expression]]
      [extension
-      [bundle]]]]
+      ["." bundle]]]]
    [math
     ["r" random]]
    test]
-  [//primitive])
+  ["." //primitive])
 
 (context: "Variants"
   (<| (times +100)
diff --git a/stdlib/test/test/lux/language/syntax.lux b/stdlib/test/test/lux/language/syntax.lux
index 110140e58..8ead2f863 100644
--- a/stdlib/test/test/lux/language/syntax.lux
+++ b/stdlib/test/test/lux/language/syntax.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do)]]
    [data
@@ -10,12 +9,14 @@
      format
      ["l" lexer]]
     [collection
-     [list]
+     ["." list]
      ["dict" dictionary (#+ Dictionary)]]]
    [math
     ["r" random ("r/" Monad<Random>)]]
-   [macro [code]]
-   [language ["&" syntax]]
+   [macro
+    ["." code]]
+   [language
+    ["&" syntax]]
    test])
 
 (def: default-cursor
diff --git a/stdlib/test/test/lux/language/type.lux b/stdlib/test/test/lux/language/type.lux
index 631e3de09..ae0b5283b 100644
--- a/stdlib/test/test/lux/language/type.lux
+++ b/stdlib/test/test/lux/language/type.lux
@@ -1,15 +1,14 @@
 (.module:
   [lux #*
-   [io]
    [control
     ["M" monad (#+ do Monad)]
     pipe]
    [data
-    [maybe]
+    ["." maybe]
     [text
      format]
     [collection
-     [list]]]
+     ["." list]]]
    [math
     ["r" random]]
    [language
diff --git a/stdlib/test/test/lux/language/type/check.lux b/stdlib/test/test/lux/language/type/check.lux
index 1faf59f16..868039238 100644
--- a/stdlib/test/test/lux/language/type/check.lux
+++ b/stdlib/test/test/lux/language/type/check.lux
@@ -1,22 +1,20 @@
 (.module:
   [lux #*
-   [io]
    [control
-    [monad (#+ do Monad)]
+    ["." monad (#+ do Monad)]
     [pipe (#+ case>)]]
    [data
-    [product]
-    [maybe]
-    [number]
-    [text ("text/" Monoid<Text> Equivalence<Text>)
-     format]
+    ["." product]
+    ["." maybe]
+    ["." number]
+    [text ("text/" Equivalence<Text>)]
     [collection
-     [list ("list/" Functor<List>)]
-     [set]]]
+     ["." list ("list/" Functor<List>)]
+     ["." set]]]
    [math
     ["r" random]]
    [language
-    [type ("type/" Equivalence<Type>)
+    ["." type ("type/" Equivalence<Type>)
      ["@" check]]]]
   lux/test)
 
diff --git a/stdlib/test/test/lux/macro/poly/equivalence.lux b/stdlib/test/test/lux/macro/poly/equivalence.lux
index d6b48428a..d6e48ed13 100644
--- a/stdlib/test/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/test/test/lux/macro/poly/equivalence.lux
@@ -1,21 +1,21 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     [equivalence (#+ Equivalence)]]
    [data
-    [bit]
-    [maybe]
+    ["." bit]
+    ["." maybe]
     [number ("int/" Number<Int>)]
     ["." text
      format]
-    [collection [list]]]
+    [collection
+     ["." list]]]
    [math
     ["r" random]]
    ["." macro
-    [poly (#+ derived:)]
-    ["&" poly/equivalence]]]
+    [poly (#+ derived:)
+     ["&" equivalence]]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 3bd4a0847..873259496 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -1,12 +1,12 @@
 (.module:
   [lux #*
    [control
-    [state]]
+    ["." state]]
    [data
-    [identity]]
+    ["." identity]]
    [macro
-    [poly (#+ derived:)]
-    ["&" poly/functor]]]
+    [poly (#+ derived:)
+     ["&" functor]]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index c30157eb7..a9913f754 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -1,21 +1,20 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
     [equivalence (#+ Equivalence)]
     ["p" parser]]
    [data
-    [bit]
-    [ident]
+    ["." bit]
+    ["." ident]
     ["e" error]
-    [number]
+    ["." number]
     ["." text
      format]]
    [math
     ["r" random]]
    ["." macro
-    [code]
+    ["." code]
     ["s" syntax (#+ syntax: Syntax)]]]
   lux/test)
 
@@ -73,7 +72,7 @@
                                   (found? (s.this? (<ctor> <value>)) (list (<ctor> <value>)))
                                   (enforced? (s.this (<ctor> <value>)) (list (<ctor> <value>)))))]
 
-                      ["Can parse Bit syntax."    #1           code.bit    bit.Equivalence<Bit>    s.bit]
+                      ["Can parse Bit syntax."    #1             code.bit    bit.Equivalence<Bit>    s.bit]
                       ["Can parse Nat syntax."    +123           code.nat    number.Equivalence<Nat>  s.nat]
                       ["Can parse Int syntax."    123            code.int    number.Equivalence<Int>  s.int]
                       ["Can parse Rev syntax."   .123            code.rev    number.Equivalence<Rev>  s.rev]
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index 920b0c951..ec38702ea 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -1,6 +1,5 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index a5501b737..c53ad434b 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -2,7 +2,6 @@
   [lux #*
    [control
     [monad (#+ do)]]
-   [io]
    [math
     ["r" random]
     [logic
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index 55f5d0c67..95c231dca 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -1,16 +1,15 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
     [bit ("bit/" Equivalence<Bit>)]
-    [number]
+    ["." number]
     [text
      format]
     [collection
-     [list]
-     [set]]]
+     ["." list]
+     ["." set]]]
    [math
     ["r" random]
     [logic
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux
index f54c2ef69..cfc40fcfa 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/test/test/lux/math/modular.lux
@@ -3,7 +3,7 @@
    [control
     [monad (#+ do)]]
    [data
-    [product]
+    ["." product]
     [bit ("bit/" Equivalence<Bit>)]
     ["e" error]
     [text
@@ -11,7 +11,8 @@
    [math
     ["r" random]
     ["/" modular]]
-   [language [type ("type/" Equivalence<Type>)]]]
+   [language
+    [type ("type/" Equivalence<Type>)]]]
   lux/test)
 
 (def: %3 (/.modulus 3))
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index 2785666e0..dfb58c46b 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -1,20 +1,19 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]]
    [data
-    [number]
-    [text format]
+    ["." number]
     [collection
-     [list]
-     [row]
-     [array]
-     [queue]
-     [stack]
-     [set]
+     ["." list]
+     ["." row]
+     ["." array]
+     ["." queue]
+     ["." stack]
+     ["." set]
      ["dict" dictionary]]]
-   [math ["r" random]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Random."
diff --git a/stdlib/test/test/lux/time/date.lux b/stdlib/test/test/lux/time/date.lux
index 5e92fffce..72c15f4f5 100644
--- a/stdlib/test/test/lux/time/date.lux
+++ b/stdlib/test/test/lux/time/date.lux
@@ -1,18 +1,18 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do Monad)]
-    [pipe]]
+    pipe]
    [data
-    [error]]
+    ["." error]]
    [math
     ["r" random ("random/" Monad<Random>)]]
    [time
     ["@." instant]
     ["@" date]]]
   lux/test
-  [test [lux [time ["_." instant]]]])
+  [//
+   ["_." instant]])
 
 (def: month
   (r.Random @.Month)
@@ -140,8 +140,8 @@
               (|> sample
                   @/encode
                   @/decode
-                  (pipe.case> (#error.Success decoded)
-                              (@/= sample decoded)
+                  (case> (#error.Success decoded)
+                         (@/= sample decoded)
 
-                              (#error.Error error)
-                              #0))))))
+                         (#error.Error error)
+                         #0))))))
diff --git a/stdlib/test/test/lux/type/object/interface.lux b/stdlib/test/test/lux/type/object/interface.lux
index 6cc1eb4b0..9f1c25ad2 100644
--- a/stdlib/test/test/lux/type/object/interface.lux
+++ b/stdlib/test/test/lux/type/object/interface.lux
@@ -2,7 +2,7 @@
   [lux #*
    [data
     [collection
-     [list]]]
+     ["." list]]]
    [type
     [object
      interface]]])
diff --git a/stdlib/test/test/lux/type/resource.lux b/stdlib/test/test/lux/type/resource.lux
index 7a9940499..1457135a6 100644
--- a/stdlib/test/test/lux/type/resource.lux
+++ b/stdlib/test/test/lux/type/resource.lux
@@ -3,10 +3,9 @@
    [control
     [monad
      [indexed (#+ do)]]]
-   [macro]
    [type
-    [resource (#+ Res)]]
-   [io]]
+    ["." resource (#+ Res)]]
+   ["." io]]
   lux/test)
 
 (context: "Sub-structural typing."
diff --git a/stdlib/test/test/lux/world/blob.lux b/stdlib/test/test/lux/world/blob.lux
index 24035bb0d..e24017587 100644
--- a/stdlib/test/test/lux/world/blob.lux
+++ b/stdlib/test/test/lux/world/blob.lux
@@ -1,14 +1,13 @@
 (.module:
   [lux #*
-   [io]
    [control
-    [monad (#+ do)]
-    [pipe]]
+    ["." monad (#+ do)]]
    [data
     ["e" error]
     ["." number
-     [i64]]
-    [collection [list]]]
+     ["." i64]]
+    [collection
+     ["." list]]]
    [world
     ["/" blob]]
    [math
diff --git a/stdlib/test/test/lux/world/net/tcp.lux b/stdlib/test/test/lux/world/net/tcp.lux
index b72364e5b..370697323 100644
--- a/stdlib/test/test/lux/world/net/tcp.lux
+++ b/stdlib/test/test/lux/world/net/tcp.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [io]
+   ["." io]
    [control
     [monad (#+ do)]
     ["ex" exception (#+ exception:)]]
@@ -13,7 +13,7 @@
     ["." text
      format]]
    [world
-    [blob]
+    ["." blob]
     ["." net
      ["@" tcp]]]
    [math
diff --git a/stdlib/test/test/lux/world/net/udp.lux b/stdlib/test/test/lux/world/net/udp.lux
index a00b75dbf..444f8ac11 100644
--- a/stdlib/test/test/lux/world/net/udp.lux
+++ b/stdlib/test/test/lux/world/net/udp.lux
@@ -1,19 +1,16 @@
 (.module:
   [lux #*
-   [io]
    [control
-    [monad (#+ do)]
-    ["ex" exception (#+ exception:)]]
+    [monad (#+ do)]]
    [concurrency
     ["P" promise]
-    ["T" task]
-    [frp]]
+    ["T" task]]
    [data
     ["E" error]
     ["." text
      format]]
    [world
-    [blob]
+    ["." blob]
     ["." net
      ["@" udp]]]
    [math
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index baa1c6f54..c79b17073 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -1,41 +1,49 @@
 (.module:
-  [lux #*
+  [lux
    [cli (#+ program:)]
-   [test]
+   ["." test]
    ## TODO: Test these modules
    [control
-    [contract]
-    [concatenative]
-    [predicate]
-    [monad/free]]
+    ["._" contract]
+    ["._" concatenative]
+    ["._" predicate]
+    [monad
+     ["._" free]]]
    [data
-    [env]
-    [trace]
-    [store]
-    [tainted]
+    ["._" env]
+    ["._" trace]
+    ["._" store]
+    ["._" tainted]
     [format
-     [context]
-     [html]
-     [css]
-     [binary]]
+     ["._" context]
+     ["._" html]
+     ["._" css]
+     ["._" binary]]
     [collection
-     [tree ["_." rose/parser]]
-     [dictionary [plist]]
-     [set [multi]]]
-    [text [buffer]]]
-   [macro (#+)
-    [poly [json]]]
+     [tree
+      [rose
+       ["._" parser]]]
+     [dictionary
+      ["._" plist]]
+     [set
+      ["._" multi]]]
+    [text
+     ["._" buffer]]]
+   ["._" macro
+    [poly
+     ["._" json]]]
    [type
-    [unit]
-    [refinement]
-    [quotient]]
+    ["._" unit]
+    ["._" refinement]
+    ["._" quotient]]
    [world
-    [environment]
-    [console]]
+    ["._" environment]
+    ["._" console]]
    [language
-    [host [".H" scheme]]
+    [host
+     [".H" scheme]]
     [compiler
-     [translation (#+)
+     ["._" translation
       [scheme
        ["._scheme" primitive]
        ["._scheme" structure]
@@ -46,14 +54,17 @@
        ["._scheme" extension]
        ["._scheme" extension/common]
        ["._scheme" expression]]]
-     [default [repl [type]]]
+     [default
+      [repl
+       ["._" type]]]
      [meta
-      [io]
-      [io/context]
-      [io/archive]
-      [archive]
+      ["._meta" io
+       ["._meta_io" context]
+       ["._meta_io" archive]]
+      ["._meta" archive]
       ["._meta" cache]]
-     [default ["._default" cache]]]]]
+     [default
+      ["._default" cache]]]]]
   [test
    ["_." lux]
    [lux
@@ -84,7 +95,6 @@
      ["_." region]]
     [data
      ["_." bit]
-     ["_." bool]
      ["_." color]
      ["_." error]
      ["_." ident]
@@ -93,12 +103,12 @@
      ["_." maybe]
      ["_." product]
      ["_." sum]
-     ## ["_." number] ## Specially troublesome...
      [number
+      ## "_." number ## TODO: Specially troublesome...
+      ["_." i64]
       ["_." ratio]
       ["_." complex]]
-     ["_." text]
-     [text
+     ["_." text
       ["_." format]
       ["_." lexer]
       ["_." regex]]
@@ -112,17 +122,16 @@
       ["_." stack]
       ["_." row]
       ["_." sequence]
-      ["_." dictionary]
-      [dictionary ["_.D" ordered]]
-      ["_." set]
-      [set ["_.S" ordered]]
-      ["_." queue]
-      [queue ["_." priority]]
+      ["_." dictionary
+       ["dictionary_." ordered]]
+      ["_." set
+       ["set_." ordered]]
+      ["_." queue
+       ["_." priority]]
       [tree
-       ["_." rose]
-       [rose ["_." zipper]]]]]
-    ["_." math]
-    [math
+       ["_." rose
+        ["_." zipper]]]]]
+    ["_." math
      ["_." random]
      ["_." modular]
      [logic
@@ -135,15 +144,15 @@
       ["poly_." equivalence]
       ["poly_." functor]]]
     [type
-     ## ["_." implicit] ## Specially troublesome...
+     ## ["_." implicit] ## TODO: Specially troublesome...
      ["_." resource]
      [object
       ["_." interface]
       ["_." protocol]]]
     [language
      ["_language/." syntax]
-     ["_." type]
-     [type ["_." check]]
+     ["_." type
+      ["_." check]]
      [compiler
       [analysis
        ["_.A" primitive]
@@ -151,24 +160,19 @@
        ["_.A" reference]
        ["_.A" case]
        ["_.A" function]
-       ## [procedure
-       ##  ["_.A" common]
-       ##  ["_.A" host]]
-       ]
-      ## [synthesis
-      ##  ["_.S" primitive]
-      ##  ["_.S" structure]
-      ##  ["_.S" case]
-      ##  ["_.S" function]]
-      ]
-     ]
+       [procedure
+        ["_.A" common]]]
+      [synthesis
+       ["_.S" primitive]
+       ["_.S" structure]
+       ["_.S" case]
+       ["_.S" function]]]]
     [world
      ["_." blob]
-     ## ["_." file] ## Specially troublesome...
+     ## ["_." file] ## TODO: Specially troublesome...
      [net
       ["_." tcp]
-      ["_." udp]]]
-    ]]
+      ["_." udp]]]]]
   )
 
 (program: args