13 files changed, 42 insertions, 40 deletions
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 2a3f3f564..5d2491d28 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -5,13 +5,13 @@
     [monad (#+ do)]]
    [data
     ["." text ("#\." equivalence)]
-    [number
-     ["n" nat]]
     [collection
      ["." set]
      ["." list]]]
    [math
-    ["." random (#+ Random)]]]
+    ["." random (#+ Random)]
+    [number
+     ["n" nat]]]]
   {#program
    ["." /
     ["/#" // #_
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 7f153b2a9..01b581eb3 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -5,13 +5,13 @@
     [monad (#+ do)]]
    [data
     ["." text]
-    [number
-     ["n" nat]]
     [collection
      ["." set]
      ["." list]]]
    [math
-    ["." random (#+ Random) ("#\." monad)]]]
+    ["." random (#+ Random) ("#\." monad)]
+    [number
+     ["n" nat]]]]
   {#program
    ["." /]})
 
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index bc436733b..22a32e43f 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -12,15 +12,15 @@
    [data
     [binary (#+ Binary)]
     ["." text]
-    [number
-     ["n" nat]]
     [format
      [xml (#+ XML)]]
     [collection
      ["." set]
      ["." dictionary]]]
    [math
-    ["." random (#+ Random) ("#\." monad)]]
+    ["." random (#+ Random) ("#\." monad)]
+    [number
+     ["n" nat]]]
    [world
     ["." file]
     ["." program]]]
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index 817b4db5f..7bac6eb5d 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -15,14 +15,14 @@
    [data
     ["." text
      ["%" format (#+ format)]]
-    [number
-     ["n" nat]]
     [collection
      ["." dictionary]
      ["." set]
      ["." list ("#\." functor)]]]
    [math
-    ["." random]]
+    ["." random]
+    [number
+     ["n" nat]]]
    [world
     [console (#+ Console)]
     ["." shell (#+ Shell)]
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index c429f34fb..d98473259 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -14,13 +14,13 @@
     ["." product]
     ["." text ("#\." equivalence)
      ["%" format (#+ format)]]
-    [number
-     ["n" nat]]
     [collection
      ["." list ("#\." functor)]
      ["." set]]]
    [math
-    ["." random (#+ Random)]]
+    ["." random (#+ Random)]
+    [number
+     ["n" nat]]]
    [world
     ["." file (#+ Path File)]]]
   [//
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index b6cd89469..45d39cffc 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -49,7 +49,8 @@
       ["#." local]
       ["#." hash]
       ["#." repository (#+ Repository)
-       [identity (#+ Identity)]]
+       [identity (#+ Identity)]
+       ["#/." remote]]
       ["#." artifact (#+ Artifact)
        ["#/." extension]]]]]})
 
@@ -111,10 +112,10 @@
                                                  (export.library fs)
                                                  (\ ! map (format.run tar.writer)))
 
-                            actual_pom (\ repository download (///repository.uri artifact ///artifact/extension.pom))
-                            actual_library (\ repository download (///repository.uri artifact ///artifact/extension.lux_library))
-                            actual_sha-1 (\ repository download (///repository.uri artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
-                            actual_md5 (\ repository download (///repository.uri artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
+                            actual_pom (\ repository download (///repository/remote.uri artifact ///artifact/extension.pom))
+                            actual_library (\ repository download (///repository/remote.uri artifact ///artifact/extension.lux_library))
+                            actual_sha-1 (\ repository download (///repository/remote.uri artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
+                            actual_md5 (\ repository download (///repository/remote.uri artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
 
                             #let [deployed_library!
                                   (\ binary.equivalence =
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index 502130970..4c057be60 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -12,12 +12,12 @@
     ["." exception]]
    [data
     ["." binary (#+ Binary)]
-    [number
-     ["n" nat]]
     [text
      ["%" format (#+ format)]]]
    [math
-    ["." random (#+ Random)]]]
+    ["." random (#+ Random)]
+    [number
+     ["n" nat]]]]
   {#program
    ["." /]}
   [test
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 3177c6ff2..6c39546b4 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -10,7 +10,7 @@
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
-   [data
+   [math
     [number
      ["n" nat]]]
    ["." time
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index e9e42be9a..c1725f55a 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -10,7 +10,7 @@
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
-   [data
+   [math
     [number
      ["n" nat]]]
    ["." time
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 7562547df..960a75f21 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -10,11 +10,11 @@
    [data
     ["." text]
     [collection
-     ["." set (#+ Set)]]
+     ["." set (#+ Set)]]]
+   [math
+    ["." random (#+ Random)]
     [number
      ["n" nat]]]
-   [math
-    ["." random (#+ Random)]]
    [world
     ["." file]]]
   [//
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 1eb62b75d..0a13acb32 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -11,14 +11,14 @@
      ["<c>" code]]]
    [data
     ["." text]
-    [number
-     ["n" nat]]
     [collection
      ["." set (#+ Set)]
      ["." dictionary (#+ Dictionary)]
      ["." list ("#\." functor)]]]
    [math
-    ["." random (#+ Random)]]
+    ["." random (#+ Random)]
+    [number
+     ["n" nat]]]
    [macro
     ["." code]]]
   [//
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 9316fae66..ea03a1e92 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -15,22 +15,23 @@
      ["." cli]]]
    [data
     ["." text]
-    [number
-     ["n" nat]]
     [collection
      ["." set (#+ Set)]
      ["." dictionary (#+ Dictionary)]]]
    [math
-    ["." random (#+ Random) ("#\." monad)]]]
+    ["." random (#+ Random) ("#\." monad)]
+    [number
+     ["n" nat]]]]
   [//
    ["@." artifact]
    ["@." dependency]]
   {#program
    ["." /
     ["/#" // #_
-     [repository (#+ Address)]
      ["#." dependency (#+ Dependency)]
-     ["#." format]]]})
+     ["#." format]
+     [repository
+      [remote (#+ Address)]]]]})
 
 (def: distribution
   (Random /.Distribution)
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index cec9c0cae..5e26b63de 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -12,11 +12,11 @@
     ["." exception]]
    [data
     ["." product]
-    ["." text ("#\." equivalence)]
-    [number
-     ["n" nat]]]
+    ["." text ("#\." equivalence)]]
    [math
-    ["." random (#+ Random) ("#\." monad)]]]
+    ["." random (#+ Random) ("#\." monad)]
+    [number
+     ["n" nat]]]]
   [//
    ["@." profile]]
   {#program