Moved "lux/macro" to "lux/meta/macro".

68 files changed, 207 insertions, 189 deletions

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 1e997b2cf..1452a1aed 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -21,10 +21,6 @@
                ["[0]" set (.only Set) (.use "[1]#[0]" equivalence)]
                ["[0]" list (.use "[1]#[0]" functor)
                 ["[0]" property]]]]
-             ["[0]" macro (.only)
-              [syntax (.only syntax)]
-              ["^" pattern]
-              ["[0]" template]]
              ["[0]" math
               ["[0]" random (.use "[1]#[0]" functor)]
               [number
@@ -38,7 +34,11 @@
              ["[0]" meta (.use "[1]#[0]" monad)
               ["[0]" location (.use "[1]#[0]" equivalence)]
               ["[0]" code (.use "[1]#[0]" equivalence)
-               ["<[1]>" \\parser]]]]]
+               ["<[1]>" \\parser]]
+              ["[0]" macro (.only)
+               [syntax (.only syntax)]
+               ["^" pattern]
+               ["[0]" template]]]]]
            ... TODO: Must have 100% coverage on tests.
            ["[0]" /
             ["[1][0]" abstract]
@@ -48,7 +48,6 @@
             
             ["[1][0]" documentation]
             ["[1][0]" locale]
-            ["[1][0]" macro]
             ["[1][0]" math]
             
             ["[1][0]" meta]
@@ -1213,7 +1212,6 @@
 
                      /documentation.test
                      /locale.test
-                     /macro.test
                      /math.test
                      
                      /meta.test
diff --git a/stdlib/source/test/lux/control/concatenative.lux b/stdlib/source/test/lux/control/concatenative.lux
index 7634e19fe..542175167 100644
--- a/stdlib/source/test/lux/control/concatenative.lux
+++ b/stdlib/source/test/lux/control/concatenative.lux
@@ -7,15 +7,16 @@
    [data
     ["[0]" sum]
     ["[0]" bit (.use "[1]#[0]" equivalence)]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random]
     [number
      ["n" nat]
      ["i" int]
      ["r" rev]
-     ["f" frac]]]]]
+     ["f" frac]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only =>)]])
 
diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux
index ed8410fa1..1a310744f 100644
--- a/stdlib/source/test/lux/control/function/memo.lux
+++ b/stdlib/source/test/lux/control/function/memo.lux
@@ -12,13 +12,14 @@
     [collection
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random]
     [number
      ["n" nat]
      ["[0]" i64]]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [time
     ["[0]" instant]
     ["[0]" duration (.only Duration)]]]]
diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux
index 3ed034a69..edc355e23 100644
--- a/stdlib/source/test/lux/control/function/mixin.lux
+++ b/stdlib/source/test/lux/control/function/mixin.lux
@@ -15,12 +15,13 @@
     ["[0]" product]
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux
index 6cecb66d4..2a7139b86 100644
--- a/stdlib/source/test/lux/control/parser.lux
+++ b/stdlib/source/test/lux/control/parser.lux
@@ -20,11 +20,11 @@
     ["[0]" random]
     [number
      ["n" nat]]]
-   [macro
-    [syntax (.only syntax)]]
    [meta
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    [macro
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" / (.only Parser)]])
 
diff --git a/stdlib/source/test/lux/control/remember.lux b/stdlib/source/test/lux/control/remember.lux
index 17440088a..9f79123c1 100644
--- a/stdlib/source/test/lux/control/remember.lux
+++ b/stdlib/source/test/lux/control/remember.lux
@@ -15,11 +15,11 @@
    [math
     [number (.only hex)]
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]]
-   ["[0]" macro (.only)
-    ["[0]" syntax (.only syntax)]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     ["[0]" syntax (.only syntax)]]]
    [time
     ["[0]" date (.only Date)]
     ["[0]" instant]
diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux
index 1cfbf5c9e..7e0de2086 100644
--- a/stdlib/source/test/lux/control/security/policy.lux
+++ b/stdlib/source/test/lux/control/security/policy.lux
@@ -11,12 +11,13 @@
      ["$[0]" monad]]]
    [data
     ["[0]" text (.use "[1]#[0]" equivalence)]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" / (.only Context Privacy Can_Conceal Can_Reveal Privilege Private)]])
 
diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index d3fcc968a..c43caf3a4 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -31,8 +31,6 @@
      ["[0]" set]
      [array
       [\\unsafe (.only)]]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
@@ -42,9 +40,11 @@
      ["[0]" rev]
      ["[0]" frac]]]
    [meta
-    ["[0]" code]
     ["[0]" symbol]
-    ["[0]" type]]]]
+    ["[0]" type]
+    ["[0]" code]
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" / (.only) (.use "[1]#[0]" equivalence)
    ["!" \\unsafe]
diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux
index aec7a93e5..3f560f85d 100644
--- a/stdlib/source/test/lux/data/collection/tree.lux
+++ b/stdlib/source/test/lux/data/collection/tree.lux
@@ -16,12 +16,13 @@
     ["[0]" product]
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  ["[0]" \\parser]
  [\\library
   ["[0]" / (.only Tree)
diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux
index d98340a31..5bb0ca32b 100644
--- a/stdlib/source/test/lux/data/color/named.lux
+++ b/stdlib/source/test/lux/data/color/named.lux
@@ -8,12 +8,13 @@
     [collection
      ["[0]" list]
      ["[0]" set]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" //]]])
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index bfc2b7d89..0e7ec6b44 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -27,9 +27,6 @@
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" set]
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   ["[0]" macro (.only)
-    ["^" pattern]
-    ["[0]" syntax (.only syntax)]]
    [math
     ["[0]" random (.only Random)]
     [number
@@ -43,6 +40,9 @@
      ["[0]/[1]" \\test]]]
    ["[0]" meta (.only)
     ["[0]" code]
+    ["[0]" macro (.only)
+     ["^" pattern]
+     ["[0]" syntax (.only syntax)]]
     [type
      ["[0]" unit]]]]]
  ["[0]" \\polytypic]
diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux
index 4a4426fd9..817c38c5a 100644
--- a/stdlib/source/test/lux/data/format/tar.lux
+++ b/stdlib/source/test/lux/data/format/tar.lux
@@ -24,14 +24,14 @@
     [collection
      ["[0]" sequence]
      ["[0]" list (.use "[1]#[0]" mix)]]]
-   [time
-    ["[0]" instant (.only Instant)]
-    ["[0]" duration]]
    [math
     ["[0]" random (.only Random)]
     [number
      ["n" nat]
-     ["i" int]]]]]
+     ["i" int]]]
+   [time
+    ["[0]" instant (.only Instant)]
+    ["[0]" duration]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux
index dfdc7ac0e..72a4a5665 100644
--- a/stdlib/source/test/lux/data/format/xml.lux
+++ b/stdlib/source/test/lux/data/format/xml.lux
@@ -18,16 +18,16 @@
     [collection
      ["[0]" dictionary]
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   [macro
-    ["^" pattern]
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
      ["n" nat]]]
    [meta
     ["[0]" symbol (.use "[1]#[0]" equivalence)]
-    ["[0]" type (.use "[1]#[0]" equivalence)]]]]
+    ["[0]" type (.use "[1]#[0]" equivalence)]
+    [macro
+     ["^" pattern]
+     ["[0]" template]]]]]
  ["[0]" \\parser]
  [\\library
   ["[0]" / (.use "[1]#[0]" equivalence)]])
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index ef8bf11ec..82d998311 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -33,8 +33,6 @@
      ["[0]" unicode
       ["[1]" set]
       ["[1]/[0]" block]]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     ["[0]" modulus]
@@ -50,7 +48,9 @@
     ["[0]" symbol]
     ["[0]" type]
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    [macro
+     ["^" pattern]]]
    ["[0]" time (.only)
     ["[0]" day]
     ["[0]" month]
diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux
index 47a1ddbb7..7464a5934 100644
--- a/stdlib/source/test/lux/data/text/encoding.lux
+++ b/stdlib/source/test/lux/data/text/encoding.lux
@@ -14,12 +14,13 @@
     [collection
      ["[0]" list (.use "[1]#[0]" mix)]
      ["[0]" set]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]]
  ["[0]" /
diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux
index da90e8f24..7509dcf58 100644
--- a/stdlib/source/test/lux/data/text/escape.lux
+++ b/stdlib/source/test/lux/data/text/escape.lux
@@ -14,16 +14,16 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" set (.only Set)]]]
-   [macro
-    [syntax (.only syntax)]
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number (.only hex)
      ["n" nat]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    [macro
+     [syntax (.only syntax)]
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only)
    [//
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index 5dabc0a9b..faadefa50 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -11,14 +11,14 @@
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format (.only format)]
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     [number (.only hex)]
     ["[0]" random]]
    [meta
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux
index 7149a441c..34f1ab7cd 100644
--- a/stdlib/source/test/lux/data/text/unicode/block.lux
+++ b/stdlib/source/test/lux/data/text/unicode/block.lux
@@ -13,12 +13,13 @@
     [collection
      ["[0]" set]
      ["[0]" list]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number (.only hex)
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux
index cda9456f2..5214ede51 100644
--- a/stdlib/source/test/lux/debug.lux
+++ b/stdlib/source/test/lux/debug.lux
@@ -16,15 +16,15 @@
     [format
      [json (.only JSON)]
      [xml (.only XML)]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     ["[0]" random (.only Random)]
     [number
      [ratio (.only Ratio)]]]
    [meta
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]
    [time (.only Time)
     [instant (.only Instant)]
     [date (.only Date)]
diff --git a/stdlib/source/test/lux/documentation.lux b/stdlib/source/test/lux/documentation.lux
index 9a22ca625..37aff4544 100644
--- a/stdlib/source/test/lux/documentation.lux
+++ b/stdlib/source/test/lux/documentation.lux
@@ -10,12 +10,12 @@
      ["%" \\format]]
     [format
      ["md" markdown]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]
-    ["[0]" template]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux
index a50ff37ac..1ee8a623a 100644
--- a/stdlib/source/test/lux/extension.lux
+++ b/stdlib/source/test/lux/extension.lux
@@ -30,15 +30,15 @@
               [collection
                ["[0]" sequence]
                ["[0]" list (.use "[1]#[0]" functor)]]]
-             [macro
-              ["[0]" template]]
              [math
               ["[0]" random]
               [number
                ["n" nat]]]
              [meta
               ["[0]" code
-               ["<[1]>" \\parser]]]
+               ["<[1]>" \\parser]]
+              [macro
+               ["[0]" template]]]
              [tool
               [compiler
                ["[0]" phase]
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index 642075157..55ca861be 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -17,9 +17,6 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" array (.only Array)]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number (.only hex)
@@ -30,7 +27,10 @@
    ["[0]" meta (.only)
     ["[0]" type (.use "[1]#[0]" equivalence)]
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]
+     ["[0]" template]]]
    [target
     ["[0]" jvm
      ["[1]" type (.use "[1]#[0]" equivalence)]]]]]
diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux
index b8d9ea20a..a5beca2bb 100644
--- a/stdlib/source/test/lux/ffi.old.lux
+++ b/stdlib/source/test/lux/ffi.old.lux
@@ -10,15 +10,16 @@
    [data
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random]
     [number
      ["n" nat]
      ["i" int]
      ["f" frac]]]
-   ["[0]" type (.use "[1]#[0]" equivalence)]]]
+   [meta
+    ["[0]" type (.use "[1]#[0]" equivalence)]
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/ffi/export.jvm.lux b/stdlib/source/test/lux/ffi/export.jvm.lux
index a567e8df4..81615af21 100644
--- a/stdlib/source/test/lux/ffi/export.jvm.lux
+++ b/stdlib/source/test/lux/ffi/export.jvm.lux
@@ -10,8 +10,6 @@
     ["[0]" bit (.use "[1]#[0]" equivalence)]
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number (.only hex)
@@ -19,7 +17,9 @@
      ["[0]" int (.use "[1]#[0]" equivalence)]
      ["[0]" frac (.use "[1]#[0]" equivalence)]]]
    ["[0]" meta (.only)
-    ["[0]" code]]]]
+    ["[0]" code]
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" //]]])
diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/locale/language.lux
index 4c4f2d62e..edabb90d2 100644
--- a/stdlib/source/test/lux/locale/language.lux
+++ b/stdlib/source/test/lux/locale/language.lux
@@ -14,12 +14,13 @@
     [collection
      ["[0]" set (.only Set)]
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux
index 514009dc0..969fe32a1 100644
--- a/stdlib/source/test/lux/locale/territory.lux
+++ b/stdlib/source/test/lux/locale/territory.lux
@@ -14,12 +14,13 @@
     [collection
      ["[0]" set (.only Set)]
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux
index 382b84009..251e3e9ad 100644
--- a/stdlib/source/test/lux/math.lux
+++ b/stdlib/source/test/lux/math.lux
@@ -6,8 +6,6 @@
     [monad (.only do)]]
    [data
     ["[0]" bit (.use "[1]#[0]" equivalence)]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
@@ -16,7 +14,10 @@
      ["r" rev]
      ["f" frac]
      ["[0]" ratio (.only Ratio)]
-     ["[0]" complex (.only Complex)]]]]]
+     ["[0]" complex (.only Complex)]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]]
  ["[0]" /
diff --git a/stdlib/source/test/lux/math/modulus.lux b/stdlib/source/test/lux/math/modulus.lux
index 98c4480d2..021bd0758 100644
--- a/stdlib/source/test/lux/math/modulus.lux
+++ b/stdlib/source/test/lux/math/modulus.lux
@@ -11,10 +11,10 @@
     ["[0]" random (.only Random)]
     [number
      ["i" int]]]
-   [macro
-    [syntax (.only syntax)]]
    ["[0]" meta (.only)
-    ["[0]" code]]]]
+    ["[0]" code]
+    [macro
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux
index adefb43e7..bf89cddbd 100644
--- a/stdlib/source/test/lux/math/number/frac.lux
+++ b/stdlib/source/test/lux/math/number/frac.lux
@@ -14,10 +14,11 @@
      ["$[0]" codec]]]
    [data
     ["[0]" bit (.use "[1]#[0]" equivalence)]]
-   [macro
-    ["[0]" template]]
    [math
-    ["[0]" random (.only Random)]]]]
+    ["[0]" random (.only Random)]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only)
    [// (.except)
diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux
index 2c2943c19..5cd2da267 100644
--- a/stdlib/source/test/lux/meta.lux
+++ b/stdlib/source/test/lux/meta.lux
@@ -20,15 +20,15 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor monoid)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    [meta
     ["[0]" location]
-    ["[0]" symbol (.use "[1]#[0]" equivalence)]]]]
+    ["[0]" symbol (.use "[1]#[0]" equivalence)]
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" / (.only)
    ["[0]" type (.use "[1]#[0]" equivalence)]]]
@@ -38,7 +38,8 @@
   ["[1][0]" symbol]
   ["[1][0]" configuration]
   ["[1][0]" version]
-  ["[1][0]" type]])
+  ["[1][0]" type]
+  ["[1][0]" macro]])
 
 (def !expect
   (template (_ <pattern> <value>)
@@ -1024,4 +1025,5 @@
            /configuration.test
            /version.test
            /type.test
+           /macro.test
            )))
diff --git a/stdlib/source/test/lux/meta/code.lux b/stdlib/source/test/lux/meta/code.lux
index 49db56a18..65d848f76 100644
--- a/stdlib/source/test/lux/meta/code.lux
+++ b/stdlib/source/test/lux/meta/code.lux
@@ -16,8 +16,6 @@
     ["[0]" text]
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
@@ -27,7 +25,9 @@
      ["[0]" frac]]]
    [meta
     ["[0]" symbol]
-    ["[0]" location]]
+    ["[0]" location]
+    [macro
+     ["^" pattern]]]
    [tool
     [compiler
      [language
diff --git a/stdlib/source/test/lux/meta/configuration.lux b/stdlib/source/test/lux/meta/configuration.lux
index 141d7ed96..0630f5186 100644
--- a/stdlib/source/test/lux/meta/configuration.lux
+++ b/stdlib/source/test/lux/meta/configuration.lux
@@ -16,13 +16,13 @@
      ["<[1]>" \\parser]]
     [collection
      ["[0]" list]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/meta/macro.lux
index 948acd4cd..d128a74be 100644
--- a/stdlib/source/test/lux/macro.lux
+++ b/stdlib/source/test/lux/meta/macro.lux
@@ -13,8 +13,6 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" functor)]
     [number
@@ -23,7 +21,9 @@
     ["[0]" location]
     ["[0]" symbol]
     ["[0]" code (.use "[1]#[0]" equivalence)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" / (.only)
    [syntax (.only syntax)]
diff --git a/stdlib/source/test/lux/macro/context.lux b/stdlib/source/test/lux/meta/macro/context.lux
index 52df97710..52df97710 100644
--- a/stdlib/source/test/lux/macro/context.lux
+++ b/stdlib/source/test/lux/meta/macro/context.lux
diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/meta/macro/local.lux
index 75b8b68ca..1aa793639 100644
--- a/stdlib/source/test/lux/macro/local.lux
+++ b/stdlib/source/test/lux/meta/macro/local.lux
@@ -14,15 +14,15 @@
     [collection
      ["[0]" list
       ["[0]" property]]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/macro/pattern.lux b/stdlib/source/test/lux/meta/macro/pattern.lux
index 7b9e161c1..7b9e161c1 100644
--- a/stdlib/source/test/lux/macro/pattern.lux
+++ b/stdlib/source/test/lux/meta/macro/pattern.lux
diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/meta/macro/syntax.lux
index 5c6b392f1..5c6b392f1 100644
--- a/stdlib/source/test/lux/macro/syntax.lux
+++ b/stdlib/source/test/lux/meta/macro/syntax.lux
diff --git a/stdlib/source/test/lux/macro/syntax/check.lux b/stdlib/source/test/lux/meta/macro/syntax/check.lux
index 11fa981e6..1820536b8 100644
--- a/stdlib/source/test/lux/macro/syntax/check.lux
+++ b/stdlib/source/test/lux/meta/macro/syntax/check.lux
@@ -17,8 +17,7 @@
  [\\library
   ["[0]" /]]
  ["$[0]" ////
-  [meta
-   ["[1][0]" code]]])
+  ["[1][0]" code]])
 
 (def .public random
   (Random /.Check)
diff --git a/stdlib/source/test/lux/macro/syntax/declaration.lux b/stdlib/source/test/lux/meta/macro/syntax/declaration.lux
index d111576fc..d81a44ac3 100644
--- a/stdlib/source/test/lux/macro/syntax/declaration.lux
+++ b/stdlib/source/test/lux/meta/macro/syntax/declaration.lux
@@ -15,9 +15,8 @@
  [\\library
   ["[0]" / (.only)
    [////
-    [meta
-     ["[0]" code
-      ["<[1]>" \\parser]]]]]])
+    ["[0]" code
+     ["<[1]>" \\parser]]]]])
 
 (def .public random
   (Random /.Declaration)
diff --git a/stdlib/source/test/lux/macro/syntax/definition.lux b/stdlib/source/test/lux/meta/macro/syntax/definition.lux
index 0ebf14286..878cc8ee9 100644
--- a/stdlib/source/test/lux/macro/syntax/definition.lux
+++ b/stdlib/source/test/lux/meta/macro/syntax/definition.lux
@@ -21,8 +21,7 @@
  ["$[0]"//
   ["[1][0]" check]
   ["[1]//" ///
-   [meta
-    ["[1][0]" code]]]])
+   ["[1][0]" code]]])
 
 (def .public random
   (Random /.Definition)
diff --git a/stdlib/source/test/lux/macro/syntax/export.lux b/stdlib/source/test/lux/meta/macro/syntax/export.lux
index bace31485..bace31485 100644
--- a/stdlib/source/test/lux/macro/syntax/export.lux
+++ b/stdlib/source/test/lux/meta/macro/syntax/export.lux
diff --git a/stdlib/source/test/lux/macro/syntax/input.lux b/stdlib/source/test/lux/meta/macro/syntax/input.lux
index 2294518a9..49ae69f1c 100644
--- a/stdlib/source/test/lux/macro/syntax/input.lux
+++ b/stdlib/source/test/lux/meta/macro/syntax/input.lux
@@ -21,8 +21,7 @@
  [\\library
   ["[0]" /]]
  ["$[0]" ////
-  [meta
-   ["[1][0]" code]]])
+  ["[1][0]" code]])
 
 (def .public random
   (Random /.Input)
diff --git a/stdlib/source/test/lux/macro/syntax/type/variable.lux b/stdlib/source/test/lux/meta/macro/syntax/type/variable.lux
index d0c249716..c0c2c146d 100644
--- a/stdlib/source/test/lux/macro/syntax/type/variable.lux
+++ b/stdlib/source/test/lux/meta/macro/syntax/type/variable.lux
@@ -13,9 +13,8 @@
  [\\library
   ["[0]" / (.only)
    [/////
-    [meta
-     ["[0]" code
-      ["<[1]>" \\parser]]]]]])
+    ["[0]" code
+     ["<[1]>" \\parser]]]]])
 
 (def .public random
   (Random /.Variable)
diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/meta/macro/template.lux
index 1269484f8..d2952d268 100644
--- a/stdlib/source/test/lux/macro/template.lux
+++ b/stdlib/source/test/lux/meta/macro/template.lux
@@ -10,15 +10,15 @@
    [data
     [collection
      ["[0]" list]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     ["[0]" random (.only Random)]
     [number
      ["[0]" nat]]]
    [meta
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/meta/symbol.lux b/stdlib/source/test/lux/meta/symbol.lux
index f7825cfe8..8644c6057 100644
--- a/stdlib/source/test/lux/meta/symbol.lux
+++ b/stdlib/source/test/lux/meta/symbol.lux
@@ -11,12 +11,13 @@
      ["$[0]" codec]]]
    [data
     ["[0]" text]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/meta/type.lux b/stdlib/source/test/lux/meta/type.lux
index 86359c7de..d00adca34 100644
--- a/stdlib/source/test/lux/meta/type.lux
+++ b/stdlib/source/test/lux/meta/type.lux
@@ -19,15 +19,15 @@
     [collection
      ["[0]" list]
      ["[0]" array]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
      ["n" nat]]]
    [meta
     ["[0]" symbol (.use "[1]#[0]" equivalence)]
-    ["[0]" code (.use "[1]#[0]" equivalence)]]]]
+    ["[0]" code (.use "[1]#[0]" equivalence)]
+    [macro
+     ["^" pattern]]]]]
  ["[0]" \\parser]
  [\\library
   ["[0]" / (.use "[1]#[0]" equivalence)]]
diff --git a/stdlib/source/test/lux/meta/type/check.lux b/stdlib/source/test/lux/meta/type/check.lux
index d568d5b76..a8d6bfb34 100644
--- a/stdlib/source/test/lux/meta/type/check.lux
+++ b/stdlib/source/test/lux/meta/type/check.lux
@@ -21,12 +21,13 @@
     [collection
      ["[0]" list (.use "[1]#[0]" functor monoid)]
      ["[0]" set]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" // (.use "[1]#[0]" equivalence)]]])
diff --git a/stdlib/source/test/lux/meta/type/primitive.lux b/stdlib/source/test/lux/meta/type/primitive.lux
index 8766f07c2..899c0d75b 100644
--- a/stdlib/source/test/lux/meta/type/primitive.lux
+++ b/stdlib/source/test/lux/meta/type/primitive.lux
@@ -9,16 +9,16 @@
     ["[0]" exception]]
    [data
     ["[0]" text (.use "[1]#[0]" equivalence)]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]
-    ["[0]" template]]
    ["[0]" math (.only)
     ["[0]" random]
     [number
      ["n" nat]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/meta/type/resource.lux b/stdlib/source/test/lux/meta/type/resource.lux
index 00bb863c3..34a3bc422 100644
--- a/stdlib/source/test/lux/meta/type/resource.lux
+++ b/stdlib/source/test/lux/meta/type/resource.lux
@@ -15,13 +15,13 @@
     ["[0]" identity (.only Identity)]
     ["[0]" text (.use "[1]#[0]" equivalence)
      ["%" \\format (.only format)]]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     ["[0]" random]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" / (.only Res)]])
 
diff --git a/stdlib/source/test/lux/meta/type/unit/scale.lux b/stdlib/source/test/lux/meta/type/unit/scale.lux
index 15b5dab9a..6a4a8c625 100644
--- a/stdlib/source/test/lux/meta/type/unit/scale.lux
+++ b/stdlib/source/test/lux/meta/type/unit/scale.lux
@@ -5,15 +5,15 @@
    [abstract
     [monad (.only do)]
     [equivalence (.only Equivalence)]]
-   [macro
-    [syntax (.only syntax)]]
    [math
     ["[0]" random (.only Random)]
     [number
      ["i" int]
      ["[0]" ratio (.use "[1]#[0]" equivalence)]]]
    ["[0]" meta (.only)
-    ["[0]" code]]]]
+    ["[0]" code]
+    [macro
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" //]]])
diff --git a/stdlib/source/test/lux/meta/version.lux b/stdlib/source/test/lux/meta/version.lux
index e225265da..eebef8c0b 100644
--- a/stdlib/source/test/lux/meta/version.lux
+++ b/stdlib/source/test/lux/meta/version.lux
@@ -10,15 +10,15 @@
     ["[0]" exception]]
    [data
     ["[0]" text]]
-   ["[0]" macro (.only)
-    [syntax (.only syntax)]]
    [math
     ["[0]" random]
     [number
      ["n" nat]]]
    ["[0]" meta (.only)
     ["[0]" code (.only)
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    ["[0]" macro (.only)
+     [syntax (.only syntax)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/program.lux b/stdlib/source/test/lux/program.lux
index cedad66d5..1f31b3874 100644
--- a/stdlib/source/test/lux/program.lux
+++ b/stdlib/source/test/lux/program.lux
@@ -12,16 +12,16 @@
     ["[0]" text (.use "[1]#[0]" equivalence)]
     [collection
      ["[0]" list]]]
-   [macro
-    [syntax (.only syntax)]
-    ["^" pattern]]
    [math
     ["[0]" random]
     [number
      ["n" nat (.use "[1]#[0]" decimal)]]]
    [meta
     ["[0]" code
-     ["<[1]>" \\parser]]]]]
+     ["<[1]>" \\parser]]
+    [macro
+     [syntax (.only syntax)]
+     ["^" pattern]]]]]
  ["[0]" \\parser]
  [\\library
   ["[0]" /]])
diff --git a/stdlib/source/test/lux/target/js.lux b/stdlib/source/test/lux/target/js.lux
index 739381cf4..0288ca3b1 100644
--- a/stdlib/source/test/lux/target/js.lux
+++ b/stdlib/source/test/lux/target/js.lux
@@ -17,15 +17,16 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
      ["n" nat]
      ["i" int]
      ["f" frac]
-     ["[0]" i64]]]]]
+     ["[0]" i64]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/target/lua.lux b/stdlib/source/test/lux/target/lua.lux
index 318f8ae57..129748613 100644
--- a/stdlib/source/test/lux/target/lua.lux
+++ b/stdlib/source/test/lux/target/lua.lux
@@ -20,15 +20,16 @@
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
      ["n" nat]
      ["i" int]
      ["f" frac]
-     ["[0]" i64]]]]]
+     ["[0]" i64]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux
index 487daeb16..afa79d64e 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux
@@ -19,8 +19,6 @@
     ["[0]" text (.use "[1]#[0]" equivalence)]
     [collection
      ["[0]" list]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
@@ -30,6 +28,8 @@
      ["r" rev]]]
    [meta
     ["[0]" symbol (.use "[1]#[0]" equivalence)]
+    [macro
+     ["[0]" template]]
     ["[0]" configuration
      ["$[1]" \\test]]]
    [tool
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
index 49dd92a3b..eb47e634e 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
@@ -21,15 +21,16 @@
      ["[0]" set]
      ["[0]" dictionary]
      ["[0]" list (.use "[1]#[0]" functor mix)]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
      ["n" nat (.use "[1]#[0]" interval)]
      ["i" int]
      ["r" rev]
-     ["f" frac]]]]]
+     ["f" frac]]]
+   [meta
+    [macro
+     ["^" pattern]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" //
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux
index a1bae7897..24433b8d0 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux
@@ -2,7 +2,6 @@
  [library
   [lux (.except)
    ["_" test (.only Test)]
-   ["[0]" macro]
    [abstract
     [monad (.only do)]]
    [control
@@ -21,6 +20,7 @@
      ["n" nat]]]
    [meta
     ["[0]" code]
+    ["[0]" macro]
     ["[0]" symbol
      ["$[1]" \\test]]
     ["[0]" configuration
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux
index 5a830ba38..19c701bef 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux
@@ -2,7 +2,6 @@
  [library
   [lux (.except)
    ["_" test (.only Test)]
-   ["[0]" macro]
    [abstract
     [monad (.only do)]
     [\\specification
@@ -23,6 +22,7 @@
      ["n" nat]]]
    ["[0]" meta (.only)
     ["[0]" code (.use "[1]#[0]" equivalence)]
+    ["[0]" macro]
     ["[0]" configuration
      ["$[1]" \\test]]]]]
  ["$" ///////
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
index fd16878b1..317a4ec53 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
@@ -2,7 +2,6 @@
  [library
   [lux (.except)
    ["_" test (.only Test)]
-   ["[0]" macro]
    [abstract
     [monad (.only do)]]
    [control
@@ -19,6 +18,7 @@
      ["n" nat]]]
    [meta
     ["[0]" code]
+    ["[0]" macro]
     ["[0]" type (.use "[1]#[0]" equivalence)
      ["[0]" check]]]]]
  [\\library
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
index b905363d0..5c1752fe3 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -2,7 +2,6 @@
  [library
   [lux (.except)
    ["_" test (.only Test)]
-   ["[0]" macro]
    [abstract
     [monad (.only do)]]
    [control
@@ -16,6 +15,7 @@
     ["[0]" random]]
    [meta
     ["[0]" code]
+    ["[0]" macro]
     ["[0]" type (.use "[1]#[0]" equivalence)
      ["[0]" check]]]]]
  [\\library
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
index f8f6e693c..2e7b3e031 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
@@ -17,8 +17,6 @@
     [collection
      ["[0]" list (.use "[1]#[0]" monad monoid)]
      ["[0]" set]]]
-   ["[0]" macro (.only)
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random) (.use "[1]#[0]" monad)]
     [number
@@ -26,6 +24,8 @@
      ["f" frac]]]
    [meta
     ["[0]" code]
+    ["[0]" macro (.only)
+     ["^" pattern]]
     ["[0]" symbol (.only)
      ["$[1]" \\test]]
     ["[0]" configuration
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
index 8c2212df4..efd22de9a 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -2,7 +2,6 @@
  [library
   [lux (.except)
    ["_" test (.only Test)]
-   ["[0]" macro]
    [abstract
     [monad (.only do)]]
    [control
@@ -21,6 +20,7 @@
      ["n" nat]]]
    [meta
     ["[0]" code]
+    ["[0]" macro]
     ["[0]" symbol
      ["$[1]" \\test]]
     ["[0]" type (.use "[1]#[0]" equivalence)
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index e4631f5ad..10700d853 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -15,10 +15,11 @@
     ["[0]" list (.use "[1]#[0]" functor mix monoid)]
     ["[0]" dictionary (.only Dictionary)]
     ["[0]" set]]]
-  [macro
-   ["^" pattern]]
   [math
-   ["[0]" random (.only Random)]]]
+   ["[0]" random (.only Random)]]
+  [meta
+   [macro
+    ["^" pattern]]]]
  ["[0]" //
   ["[1][0]" primitive]]
  [\\
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
index 85cb4dedc..309ba20ff 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
@@ -3,8 +3,6 @@
   ["_" test (.only Test)]
   [abstract
    ["[0]" monad (.only do)]]
-  [math
-   ["[0]" random (.only Random)]]
   [control
    ["[0]" try]]
   [data
@@ -16,8 +14,11 @@
    [collection
     ["[0]" list (.use "[1]#[0]" functor mix)]
     ["[0]" dictionary (.only Dictionary)]]]
-  [macro
-   ["^" pattern]]]
+  [math
+   ["[0]" random (.only Random)]]
+  [meta
+   [macro
+    ["^" pattern]]]]
  [\\
   ["[0]" /
    [////
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux
index 9f69c7972..46ae030bc 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis.lux
@@ -13,8 +13,6 @@
     ["[0]" text]
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random (.only Random)]
     [number
@@ -22,7 +20,9 @@
      ["[0]" i64]
      ["[0]" frac]]]
    [meta
-    ["[0]" symbol]]
+    ["[0]" symbol]
+    [macro
+     ["^" pattern]]]
    [tool
     [compiler
      [reference (.only)
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index 5fd673e83..5133e9c39 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -17,10 +17,11 @@
     [collection
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" list]]]
-   [macro
-    ["^" pattern]]
    [math
     ["[0]" random]]
+   [meta
+    [macro
+     ["^" pattern]]]
    [time
     ["[0]" instant (.only Instant)]]]]
  ["[0]" /
diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux
index 25b652db6..ef44188ba 100644
--- a/stdlib/source/test/lux/world/input/keyboard.lux
+++ b/stdlib/source/test/lux/world/input/keyboard.lux
@@ -11,12 +11,13 @@
     [collection
      ["[0]" list]
      ["[0]" set (.only Set)]]]
-   [macro
-    ["[0]" template]]
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux
index 7e890002b..370c1e6bd 100644
--- a/stdlib/source/test/lux/world/net/http/status.lux
+++ b/stdlib/source/test/lux/world/net/http/status.lux
@@ -6,11 +6,12 @@
     [collection
      ["[0]" list]
      ["[0]" set (.only Set)]]]
-   [macro
-    ["[0]" template]]
    [math
     [number
-     ["n" nat]]]]]
+     ["n" nat]]]
+   [meta
+    [macro
+     ["[0]" template]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" //]]])