Moved "lux/time" to "lux/world/time".

65 files changed, 200 insertions, 171 deletions

diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux
index 578bee850..321aebffd 100644
--- a/stdlib/source/documentation/lux.lux
+++ b/stdlib/source/documentation/lux.lux
@@ -28,7 +28,6 @@
   ["[1][0]" program]
   ["[1][0]" static]
   ["[1][0]" test]
-  ["[1][0]" time]
   ["[1][0]" world]])
 
 (.`` (.def .public documentation
@@ -898,7 +897,6 @@
                   /program.documentation
                   /static.documentation
                   /test.documentation
-                  /time.documentation
                   /world.documentation])))
 
 (program: inputs
diff --git a/stdlib/source/documentation/lux/world.lux b/stdlib/source/documentation/lux/world.lux
index 7376eb311..777b02678 100644
--- a/stdlib/source/documentation/lux/world.lux
+++ b/stdlib/source/documentation/lux/world.lux
@@ -19,7 +19,8 @@
    ["[1]/[0]" video
     ["[1]/[0]" resolution]]]
   ["[1][0]" environment]
-  ["[1][0]" shell]])
+  ["[1][0]" shell]
+  ["[1][0]" time]])
 
 (.def .public documentation
   (.List $.Module)
@@ -30,4 +31,5 @@
        /net.documentation
        /output/video/resolution.documentation
        /environment.documentation
-       /shell.documentation))
+       /shell.documentation
+       /time.documentation))
diff --git a/stdlib/source/documentation/lux/time.lux b/stdlib/source/documentation/lux/world/time.lux
index f327e942a..f327e942a 100644
--- a/stdlib/source/documentation/lux/time.lux
+++ b/stdlib/source/documentation/lux/world/time.lux
diff --git a/stdlib/source/documentation/lux/time/date.lux b/stdlib/source/documentation/lux/world/time/date.lux
index 17fd0143b..17fd0143b 100644
--- a/stdlib/source/documentation/lux/time/date.lux
+++ b/stdlib/source/documentation/lux/world/time/date.lux
diff --git a/stdlib/source/documentation/lux/time/day.lux b/stdlib/source/documentation/lux/world/time/day.lux
index e7923dfe0..e7923dfe0 100644
--- a/stdlib/source/documentation/lux/time/day.lux
+++ b/stdlib/source/documentation/lux/world/time/day.lux
diff --git a/stdlib/source/documentation/lux/time/duration.lux b/stdlib/source/documentation/lux/world/time/duration.lux
index 0b9ddaa0b..0b9ddaa0b 100644
--- a/stdlib/source/documentation/lux/time/duration.lux
+++ b/stdlib/source/documentation/lux/world/time/duration.lux
diff --git a/stdlib/source/documentation/lux/time/instant.lux b/stdlib/source/documentation/lux/world/time/instant.lux
index c5fbe2b01..c5fbe2b01 100644
--- a/stdlib/source/documentation/lux/time/instant.lux
+++ b/stdlib/source/documentation/lux/world/time/instant.lux
diff --git a/stdlib/source/documentation/lux/time/month.lux b/stdlib/source/documentation/lux/world/time/month.lux
index 9e9d4dc28..9e9d4dc28 100644
--- a/stdlib/source/documentation/lux/time/month.lux
+++ b/stdlib/source/documentation/lux/world/time/month.lux
diff --git a/stdlib/source/documentation/lux/time/year.lux b/stdlib/source/documentation/lux/world/time/year.lux
index 1ac6a11ca..1ac6a11ca 100644
--- a/stdlib/source/documentation/lux/time/year.lux
+++ b/stdlib/source/documentation/lux/world/time/year.lux
diff --git a/stdlib/source/format/lux/data/text.lux b/stdlib/source/format/lux/data/text.lux
index 2cbf6d99c..f9d79c466 100644
--- a/stdlib/source/format/lux/data/text.lux
+++ b/stdlib/source/format/lux/data/text.lux
@@ -15,12 +15,6 @@
      ["[0]" json]]
     [collection
      ["[0]" list (.use "[1]#[0]" monad)]]]
-   ["[0]" time (.only)
-    ["[0]" instant]
-    ["[0]" duration]
-    ["[0]" date]
-    ["[0]" day]
-    ["[0]" month]]
    [math
     ["[0]" modular]
     [number
@@ -37,7 +31,14 @@
      ["<[1]>" \\parser (.only Parser)]]
     [macro
      [syntax (.only syntax)]
-     ["[0]" template]]]]])
+     ["[0]" template]]]
+   [world
+    ["[0]" time (.only)
+     ["[0]" instant]
+     ["[0]" duration]
+     ["[0]" date]
+     ["[0]" day]
+     ["[0]" month]]]]])
 
 (.type .public (Format a)
   (-> a Text))
diff --git a/stdlib/source/library/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux
index 5fb0f883b..408b854f8 100644
--- a/stdlib/source/library/lux/control/concurrency/thread.lux
+++ b/stdlib/source/library/lux/control/concurrency/thread.lux
@@ -19,8 +19,9 @@
    [meta
     ["@" target]
     ["[0]" configuration]]
-   [time
-    ["[0]" instant]]]]
+   [world
+    [time
+     ["[0]" instant]]]]]
  [//
   ["[0]" atom (.only Atom)]])
 
diff --git a/stdlib/source/library/lux/control/remember.lux b/stdlib/source/library/lux/control/remember.lux
index 800dc3627..b7a91758f 100644
--- a/stdlib/source/library/lux/control/remember.lux
+++ b/stdlib/source/library/lux/control/remember.lux
@@ -17,9 +17,10 @@
     [macro
      [syntax (.only syntax)]
      ["[0]" template]]]
-   [time
-    ["[0]" instant]
-    ["[0]" date (.only Date) (.use "[1]#[0]" order)]]]])
+   [world
+    [time
+     ["[0]" instant]
+     ["[0]" date (.only Date) (.use "[1]#[0]" order)]]]]])
 
 (exception .public (must_remember [deadline Date
                                    today Date
diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux
index 41a582b07..aad8579af 100644
--- a/stdlib/source/library/lux/data/format/tar.lux
+++ b/stdlib/source/library/lux/data/format/tar.lux
@@ -33,11 +33,11 @@
      ["^" pattern]]
     [type
      [primitive (.except)]]]
-   [time
-    ["[0]" instant (.only Instant)]
-    ["[0]" duration]]
    [world
-    ["[0]" file]]]])
+    ["[0]" file]
+    [time
+     ["[0]" instant (.only Instant)]
+     ["[0]" duration]]]]])
 
 (type Size
   Nat)
diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux
index 5bf180093..47046fadc 100644
--- a/stdlib/source/library/lux/debug.lux
+++ b/stdlib/source/library/lux/debug.lux
@@ -35,12 +35,13 @@
      ["[0]" syntax (.only syntax)]]
     ["[0]" type (.only)
      ["<[1]>" \\parser (.only Parser)]]]
-   [time (.only Time)
-    [instant (.only Instant)]
-    [duration (.only Duration)]
-    [date (.only Date)]
-    [month (.only Month)]
-    [day (.only Day)]]]])
+   [world
+    [time (.only Time)
+     [instant (.only Instant)]
+     [duration (.only Duration)]
+     [date (.only Date)]
+     [month (.only Month)]
+     [day (.only Day)]]]]])
 
 (with_expansions [<jvm> (these (import java/lang/String
                                  "[1]::[0]")
diff --git a/stdlib/source/library/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux
index ece9576f8..d482c72b3 100644
--- a/stdlib/source/library/lux/math/random.lux
+++ b/stdlib/source/library/lux/math/random.lux
@@ -31,12 +31,13 @@
    [meta
     [type
      [refinement (.only Refiner Refined)]]]
-   ["[0]" time (.only Time)
-    ["[0]" instant (.only Instant)]
-    ["[0]" date (.only Date)]
-    ["[0]" duration (.only Duration)]
-    ["[0]" month (.only Month)]
-    ["[0]" day (.only Day)]]]])
+   [world
+    ["[0]" time (.only Time)
+     ["[0]" instant (.only Instant)]
+     ["[0]" date (.only Date)]
+     ["[0]" duration (.only Duration)]
+     ["[0]" month (.only Month)]
+     ["[0]" day (.only Day)]]]]])
 
 (type .public PRNG
   (Rec PRNG
diff --git a/stdlib/source/library/lux/meta/compiler/meta/export.lux b/stdlib/source/library/lux/meta/compiler/meta/export.lux
index 20a0bd0cd..a32656ffa 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/export.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/export.lux
@@ -23,10 +23,10 @@
       [cli (.only Source Export)]
       ["[0]" io
        ["[1]" context]]]]]
-   [time
-    ["[0]" instant]]
    [world
-    ["[0]" file]]]])
+    ["[0]" file]
+    [time
+     ["[0]" instant]]]]])
 
 (def .public file
   "library.tar")
diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux
index b98361ff0..0b14e378f 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux
@@ -23,10 +23,10 @@
    [meta
     [target
      ["_" scheme]]]
-   [time
-    ["[0]" instant (.only Instant)]]
    [world
-    ["[0]" file]]]]
+    ["[0]" file]
+    [time
+     ["[0]" instant (.only Instant)]]]]]
  [program
   [compositor
    ["[0]" static (.only Static)]]]
diff --git a/stdlib/source/library/lux/meta/compiler/phase.lux b/stdlib/source/library/lux/meta/compiler/phase.lux
index a0b4df481..2b67baec4 100644
--- a/stdlib/source/library/lux/meta/compiler/phase.lux
+++ b/stdlib/source/library/lux/meta/compiler/phase.lux
@@ -13,9 +13,10 @@
     ["[0]" product]
     [text
      ["%" \\format (.only format)]]]
-   [time
-    ["[0]" instant]
-    ["[0]" duration]]]]
+   [world
+    [time
+     ["[0]" instant]
+     ["[0]" duration]]]]]
  [//
   [meta
    [archive (.only Archive)]]])
diff --git a/stdlib/source/library/lux/test.lux b/stdlib/source/library/lux/test.lux
index b3de0884d..e6690c522 100644
--- a/stdlib/source/library/lux/test.lux
+++ b/stdlib/source/library/lux/test.lux
@@ -35,12 +35,12 @@
      ["<[1]>" \\parser]]
     [macro
      [syntax (.only syntax)]]]
-   [time
-    ["[0]" instant]
-    ["[0]" duration (.only Duration)]]
    [world
     ["[0]" environment]
-    ["[0]" console]]]])
+    ["[0]" console]
+    [time
+     ["[0]" instant]
+     ["[0]" duration (.only Duration)]]]]])
 
 (type .public Tally
   (Record
diff --git a/stdlib/source/library/lux/world/db/jdbc/input.lux b/stdlib/source/library/lux/world/db/jdbc/input.lux
index fb8f9b3e3..713a108de 100644
--- a/stdlib/source/library/lux/world/db/jdbc/input.lux
+++ b/stdlib/source/library/lux/world/db/jdbc/input.lux
@@ -7,10 +7,10 @@
     [monad (.only Monad do)]
     ["[0]" try (.only Try)]
     ["[0]" io (.only IO)]]
-   [time
-    ["[0]" instant (.only Instant)]]
    [world
-    [binary (.only Binary)]]]])
+    [binary (.only Binary)]
+    [time
+     ["[0]" instant (.only Instant)]]]]])
 
 (import java/lang/String)
 
diff --git a/stdlib/source/library/lux/world/db/jdbc/output.lux b/stdlib/source/library/lux/world/db/jdbc/output.lux
index 6a9181636..383f565dc 100644
--- a/stdlib/source/library/lux/world/db/jdbc/output.lux
+++ b/stdlib/source/library/lux/world/db/jdbc/output.lux
@@ -9,10 +9,10 @@
     ["ex" exception]
     ["[0]" try (.only Try)]
     ["[0]" io (.only IO)]]
-   [time
-    ["[0]" instant (.only Instant)]]
    [world
-    [binary (.only Binary)]]]])
+    [binary (.only Binary)]
+    [time
+     ["[0]" instant (.only Instant)]]]]])
 
 (import java/lang/String)
 
diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux
index 560ae9e4e..cb8c48307 100644
--- a/stdlib/source/library/lux/world/file.lux
+++ b/stdlib/source/library/lux/world/file.lux
@@ -34,10 +34,11 @@
              [meta
               ["@" target]
               [macro
-               ["[0]" template]]]
-             [time
-              ["[0]" instant (.only Instant)]
-              ["[0]" duration]]]])))
+               ["[0]" template]]]]]
+           [//
+            [time
+             ["[0]" instant (.only Instant)]
+             ["[0]" duration]]])))
 
 (type .public Path
   Text)
diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux
index fac39061f..91cd25c53 100644
--- a/stdlib/source/library/lux/world/file/watch.lux
+++ b/stdlib/source/library/lux/world/file/watch.lux
@@ -26,12 +26,13 @@
    [math
     [number
      ["n" nat]]]
-   [time
-    ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]]
    [meta
     ["@" target]
     [type
-     [primitive (.only primitive representation abstraction)]]]]]
+     [primitive (.only primitive representation abstraction)]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]]]]]
  ["[0]" //])
 
 (primitive .public Concern
diff --git a/stdlib/source/library/lux/world/net/http/cookie.lux b/stdlib/source/library/lux/world/net/http/cookie.lux
index ffad57e2c..a87addd69 100644
--- a/stdlib/source/library/lux/world/net/http/cookie.lux
+++ b/stdlib/source/library/lux/world/net/http/cookie.lux
@@ -15,8 +15,9 @@
      ["[0]" context (.only Context)]]
     [collection
      ["[0]" dictionary]]]
-   [time
-    ["[0]" duration (.only Duration)]]]]
+   [world
+    [time
+     ["[0]" duration (.only Duration)]]]]]
  ["[0]" // (.only Header)
   ["[0]" header]])
 
diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/world/time.lux
index d24e87497..d24e87497 100644
--- a/stdlib/source/library/lux/time.lux
+++ b/stdlib/source/library/lux/world/time.lux
diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/world/time/date.lux
index 09fd828ae..09fd828ae 100644
--- a/stdlib/source/library/lux/time/date.lux
+++ b/stdlib/source/library/lux/world/time/date.lux
diff --git a/stdlib/source/library/lux/time/day.lux b/stdlib/source/library/lux/world/time/day.lux
index 4f1570d43..4f1570d43 100644
--- a/stdlib/source/library/lux/time/day.lux
+++ b/stdlib/source/library/lux/world/time/day.lux
diff --git a/stdlib/source/library/lux/time/duration.lux b/stdlib/source/library/lux/world/time/duration.lux
index 00a7c1d1e..00a7c1d1e 100644
--- a/stdlib/source/library/lux/time/duration.lux
+++ b/stdlib/source/library/lux/world/time/duration.lux
diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/world/time/instant.lux
index 2f08a6833..2f08a6833 100644
--- a/stdlib/source/library/lux/time/instant.lux
+++ b/stdlib/source/library/lux/world/time/instant.lux
diff --git a/stdlib/source/library/lux/time/month.lux b/stdlib/source/library/lux/world/time/month.lux
index c2e88c976..c2e88c976 100644
--- a/stdlib/source/library/lux/time/month.lux
+++ b/stdlib/source/library/lux/world/time/month.lux
diff --git a/stdlib/source/library/lux/time/year.lux b/stdlib/source/library/lux/world/time/year.lux
index a7bdb0dcf..a7bdb0dcf 100644
--- a/stdlib/source/library/lux/time/year.lux
+++ b/stdlib/source/library/lux/world/time/year.lux
diff --git a/stdlib/source/polytypic/lux/abstract/equivalence.lux b/stdlib/source/polytypic/lux/abstract/equivalence.lux
index 50d04c8e0..64c684936 100644
--- a/stdlib/source/polytypic/lux/abstract/equivalence.lux
+++ b/stdlib/source/polytypic/lux/abstract/equivalence.lux
@@ -31,12 +31,13 @@
      ["<[1]>" \\parser]
      ["[0]" poly (.only polytypic)]
      ["[0]" unit]]]
-   [time
-    ["[0]" duration]
-    ["[0]" date]
-    ["[0]" instant]
-    ["[0]" day]
-    ["[0]" month]]]]
+   [world
+    [time
+     ["[0]" duration]
+     ["[0]" date]
+     ["[0]" instant]
+     ["[0]" day]
+     ["[0]" month]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/polytypic/lux/data/format/json.lux b/stdlib/source/polytypic/lux/data/format/json.lux
index cae0194d4..c68d521ce 100644
--- a/stdlib/source/polytypic/lux/data/format/json.lux
+++ b/stdlib/source/polytypic/lux/data/format/json.lux
@@ -32,12 +32,13 @@
      ["<[1]>" \\parser]
      ["[0]" unit]
      ["[0]" poly (.only polytypic)]]]
-   [time
-    ... ["[0]" instant]
-    ... ["[0]" duration]
-    ["[0]" date]
-    ["[0]" day]
-    ["[0]" month]]]]
+   [world
+    [time
+     ... ["[0]" instant]
+     ... ["[0]" duration]
+     ["[0]" date]
+     ["[0]" day]
+     ["[0]" month]]]]]
  [\\library
   ["[0]" / (.only JSON)]])
 
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index 9acb04c63..b4fb82186 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -13,8 +13,9 @@
     [format
      ["[0]" xml (.only XML)
       ["<[1]>" \\parser (.only Parser)]]]]
-   [time
-    ["[0]" instant (.only Instant)]]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant)]]]]]
  ["[0]" ///
   ["[1][0]" time
    ["[1]/[0]" date]
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index 59e0ee3d1..764ae9b86 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -12,8 +12,9 @@
     ["[0]" text
      ["%" \\format (.only Format)]
      ["<[1]>" \\parser (.only Parser)]]]
-   ["[0]" time (.only)
-    ["[0]" instant (.only Instant)]]]]
+   [world
+    ["[0]" time (.only)
+     ["[0]" instant (.only Instant)]]]]]
  ["[0]" /
   ["[1][0]" date]
   ["[1][0]" time]])
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index 5cdbd0d1d..84e33836a 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -16,12 +16,14 @@
     [number
      ["n" nat]
      ["i" int]]]
-   [time
-    ["[0]" date (.use "[1]#[0]" equivalence)]
-    ["[0]" year]
-    ["[0]" month]]
-   [type
-    [primitive (.except)]]]])
+   [meta
+    [type
+     [primitive (.except)]]]
+   [world
+    [time
+     ["[0]" date (.use "[1]#[0]" equivalence)]
+     ["[0]" year]
+     ["[0]" month]]]]])
 
 (def .public (pad value)
   (-> Nat Text)
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 53e6824f0..9ccfd46ba 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -19,10 +19,11 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" time (.only Time)
-    ["[0]" date (.only Date)]
-    ["[0]" year]
-    ["[0]" month]]]]
+   [world
+    ["[0]" time (.only Time)
+     ["[0]" date (.only Date)]
+     ["[0]" year]
+     ["[0]" month]]]]]
  ["[0]" //
   ["[1][0]" time]
   ["[1][0]" snapshot (.only Snapshot)
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux
index 6a2c64817..40d7e2532 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -19,8 +19,9 @@
      ["[0]" dictionary]
      ["[0]" set (.only Set)]
      ["[0]" list (.use "[1]#[0]" monoid)]]]
-   [time
-    ["[0]" instant (.only Instant)]]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant)]]]]]
  ["[0]" ///
   [repository (.only Repository)]
   ["[1][0]" hash (.only Hash)]
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 3ddc320b2..5df1ae3a7 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -25,14 +25,14 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" time (.only Time)
-    ["[0]" instant (.only Instant)]
-    ["[0]" date (.only Date)]
-    ["[0]" year]
-    ["[0]" month]]
    [world
     [net
-     ["[0]" uri (.only URI)]]]]]
+     ["[0]" uri (.only URI)]]
+    ["[0]" time (.only Time)
+     ["[0]" instant (.only Instant)]
+     ["[0]" date (.only Date)]
+     ["[0]" year]
+     ["[0]" month]]]]]
  ["[0]" // (.only)
   ["/[1]" //
    [repository (.only Repository)]
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 78b0e8c55..7b3e4d5d0 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -25,14 +25,14 @@
    [math
     [number
      ["n" nat]]]
-   ["[0]" time (.only Time)
-    ["[0]" instant (.only Instant)]
-    ["[0]" date (.only Date)]
-    ["[0]" year]
-    ["[0]" month]]
    [world
     [net
-     ["[0]" uri (.only URI)]]]]]
+     ["[0]" uri (.only URI)]]
+    ["[0]" time (.only Time)
+     ["[0]" instant (.only Instant)]
+     ["[0]" date (.only Date)]
+     ["[0]" year]
+     ["[0]" month]]]]]
  ["[0]" // (.only)
   ["/[1]" //
    [repository (.only Repository)]
diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index ac17513ed..3b5150c7e 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -50,12 +50,12 @@
        ["ioW" archive]]]]
     ... ["[0]" interpreter]
     ]
-   [time
-    ["[0]" instant]]
    ["[0]" world
     ["[0]" file]
     ["[0]" console]
-    ["[1]/[0]" environment]]]])
+    ["[1]/[0]" environment]
+    [time
+     ["[0]" instant]]]]])
 
 (def (or_crash! failure_description action)
   (All (_ a)
diff --git a/stdlib/source/specification/lux/world/file.lux b/stdlib/source/specification/lux/world/file.lux
index 607e7e2f6..dc6cb6528 100644
--- a/stdlib/source/specification/lux/world/file.lux
+++ b/stdlib/source/specification/lux/world/file.lux
@@ -26,8 +26,9 @@
     ["[0]" random]
     [number
      ["n" nat]]]
-   [time
-    ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant) (.use "[1]#[0]" equivalence)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index da8755d6f..2b4265932 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -14,8 +14,9 @@
       ["<[1]>" \\parser]]]]
    [math
     ["[0]" random (.only Random)]]
-   [time
-    ["[0]" instant]]]]
+   [world
+    [time
+     ["[0]" instant]]]]]
  [\\program
   ["[0]" /]]
  ["$[0]" //
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index c81dffa89..2c7d29269 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -15,8 +15,9 @@
     ["[0]" random (.only Random)]
     [number
      ["i" int]]]
-   [time
-    ["[0]" instant (.use "[1]#[0]" equivalence)]]]]
+   [world
+    [time
+     ["[0]" instant (.use "[1]#[0]" equivalence)]]]]]
  [\\program
   ["[0]" /]]
  ["[0]" /
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index 564cf6ab0..8cc8177a1 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -24,14 +24,14 @@
     ["[0]" random]
     [number
      ["n" nat]]]
-   [time
-    ["[0]" instant]]
    [world
     [console (.only Console)]
     ["[0]" shell (.only Exit Shell)]
     ["[0]" program (.only Program)]
     ["[0]" file
-     ["[0]" watch]]]]]
+     ["[0]" watch]]
+    [time
+     ["[0]" instant]]]]]
  ["[0]" //
   ["$[0]" version]
   ["$[0]" build]]
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 17770c575..ed5b95b3b 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -26,15 +26,15 @@
      ["n" nat]]]
    [meta
     ["[0]" code]]
-   ["[0]" time (.only)
-    ["[0]" date]
-    ["[0]" year]
-    ["[0]" month]
-    ["[0]" instant]
-    ["[0]" duration]]
    [world
     ["[0]" file]
-    ["[0]" program]]]]
+    ["[0]" program]
+    ["[0]" time (.only)
+     ["[0]" date]
+     ["[0]" year]
+     ["[0]" month]
+     ["[0]" instant]
+     ["[0]" duration]]]]]
  [\\program
   ["[0]" / (.only)
    ["/[1]" // (.only)
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 46e368dbf..773dd262b 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -26,15 +26,15 @@
      ["n" nat]]]
    [meta
     ["[0]" code]]
-   ["[0]" time (.only)
-    ["[0]" date]
-    ["[0]" year]
-    ["[0]" month]
-    ["[0]" instant (.only Instant)]
-    ["[0]" duration]]
    [world
     ["[0]" file]
-    ["[0]" program]]]]
+    ["[0]" program]
+    ["[0]" time (.only)
+     ["[0]" date]
+     ["[0]" year]
+     ["[0]" month]
+     ["[0]" instant (.only Instant)]
+     ["[0]" duration]]]]]
  ["$[0]" ///
   ["[1][0]" artifact
    ["[1]/[0]" type]
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index d9e4bbc29..7212f5fb4 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -55,7 +55,6 @@
             ["[1][0]" static]
             ["[1][0]" test]
             
-            ["[1][0]" time]
             ["[1][0]" world]
 
             ["[1][0]" ffi]
@@ -1213,7 +1212,6 @@
                      /static.test
                      /test.test
                      
-                     /time.test
                      /world.test
 
                      /ffi.test
diff --git a/stdlib/source/test/lux/control/concurrency/async.lux b/stdlib/source/test/lux/control/concurrency/async.lux
index e5d175486..42d938ddd 100644
--- a/stdlib/source/test/lux/control/concurrency/async.lux
+++ b/stdlib/source/test/lux/control/concurrency/async.lux
@@ -18,9 +18,10 @@
      ["[0]" i64]]]
    [meta
     ["@" target]]
-   [time
-    ["[0]" instant]
-    ["[0]" duration]]]]
+   [world
+    [time
+     ["[0]" instant]
+     ["[0]" duration]]]]]
  [\\library
   ["[0]" / (.only)
    [//
diff --git a/stdlib/source/test/lux/control/concurrency/thread.lux b/stdlib/source/test/lux/control/concurrency/thread.lux
index 87ba8859a..da2a9ea37 100644
--- a/stdlib/source/test/lux/control/concurrency/thread.lux
+++ b/stdlib/source/test/lux/control/concurrency/thread.lux
@@ -6,14 +6,15 @@
     [monad (.only do)]]
    [control
     ["[0]" io]]
-   [time
-    ["[0]" instant (.only Instant)]
-    ["[0]" duration]]
    [math
     ["[0]" random]
     [number
      ["n" nat]
-     ["i" int]]]]]
+     ["i" int]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant)]
+     ["[0]" duration]]]]]
  [\\library
   ["[0]" / (.only)
    [//
diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux
index 1a310744f..1abe7f7f9 100644
--- a/stdlib/source/test/lux/control/function/memo.lux
+++ b/stdlib/source/test/lux/control/function/memo.lux
@@ -20,9 +20,10 @@
    [meta
     [macro
      ["^" pattern]]]
-   [time
-    ["[0]" instant]
-    ["[0]" duration (.only Duration)]]]]
+   [world
+    [time
+     ["[0]" instant]
+     ["[0]" duration (.only Duration)]]]]]
  [\\library
   ["[0]" / (.only)
    ["/[1]" //
diff --git a/stdlib/source/test/lux/control/remember.lux b/stdlib/source/test/lux/control/remember.lux
index 83dc740e8..5f4fae4ac 100644
--- a/stdlib/source/test/lux/control/remember.lux
+++ b/stdlib/source/test/lux/control/remember.lux
@@ -20,10 +20,11 @@
      ["<[1]>" \\parser]]
     ["[0]" macro (.only)
      ["[0]" syntax (.only syntax)]]]
-   [time
-    ["[0]" date (.only Date)]
-    ["[0]" instant]
-    ["[0]" duration]]]]
+   [world
+    [time
+     ["[0]" date (.only Date)]
+     ["[0]" instant]
+     ["[0]" duration]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index bda5d1aba..e057efcfe 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -39,12 +39,13 @@
      ["[0]" syntax (.only syntax)]]
     [type
      ["[0]" unit]]]
-   [time
-    ["[0]" date]
-    ["[0]" instant
-     ["[0]/[1]" \\test]]
-    ["[0]" duration
-     ["[0]/[1]" \\test]]]]]
+   [world
+    [time
+     ["[0]" date]
+     ["[0]" instant
+      ["[0]/[1]" \\test]]
+     ["[0]" duration
+      ["[0]/[1]" \\test]]]]]]
  ["[0]" \\polytypic]
  ["[0]" \\parser]
  [\\library
diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux
index 7f695042d..5665efaec 100644
--- a/stdlib/source/test/lux/data/format/tar.lux
+++ b/stdlib/source/test/lux/data/format/tar.lux
@@ -29,9 +29,10 @@
     [number
      ["n" nat]
      ["i" int]]]
-   [time
-    ["[0]" instant (.only Instant)]
-    ["[0]" duration]]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant)]
+     ["[0]" duration]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index 82d998311..8aead4f9b 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -51,12 +51,13 @@
      ["<[1]>" \\parser]]
     [macro
      ["^" pattern]]]
-   ["[0]" time (.only)
-    ["[0]" day]
-    ["[0]" month]
-    ["[0]" instant]
-    ["[0]" duration]
-    ["[0]" date]]]]
+   [world
+    ["[0]" time (.only)
+     ["[0]" day]
+     ["[0]" month]
+     ["[0]" instant]
+     ["[0]" duration]
+     ["[0]" date]]]]]
  ["$[0]" //
   [format
    ["[1][0]" xml]
diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux
index ccf72208a..8dae4a18e 100644
--- a/stdlib/source/test/lux/debug.lux
+++ b/stdlib/source/test/lux/debug.lux
@@ -25,12 +25,13 @@
      ["<[1]>" \\parser]]
     ["[0]" macro (.only)
      [syntax (.only syntax)]]]
-   [time (.only Time)
-    [instant (.only Instant)]
-    [date (.only Date)]
-    [duration (.only Duration)]
-    [month (.only Month)]
-    [day (.only Day)]]]]
+   [world
+    [time (.only Time)
+     [instant (.only Instant)]
+     [date (.only Date)]
+     [duration (.only Duration)]
+     [month (.only Month)]
+     [day (.only Day)]]]]]
  [\\library
   ["[0]" /]]
  ["$[0]" //
diff --git a/stdlib/source/test/lux/world.lux b/stdlib/source/test/lux/world.lux
index 37b9d2892..e0018ab8b 100644
--- a/stdlib/source/test/lux/world.lux
+++ b/stdlib/source/test/lux/world.lux
@@ -15,7 +15,8 @@
   ["[1][0]" net
    ["[1]/[0]" http
     ["[1]/[0]" client]
-    ["[1]/[0]" status]]]])
+    ["[1]/[0]" status]]]
+  ["[1][0]" time]])
 
 (def .public test
   Test
@@ -28,4 +29,5 @@
        /output/video/resolution.test
        /net/http/client.test
        /net/http/status.test
+       /time.test
        ))
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index 5133e9c39..faebedb1f 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -22,8 +22,9 @@
    [meta
     [macro
      ["^" pattern]]]
-   [time
-    ["[0]" instant (.only Instant)]]]]
+   [world
+    [time
+     ["[0]" instant (.only Instant)]]]]]
  ["[0]" /
   ["[1][0]" watch]]
  [\\library
diff --git a/stdlib/source/test/lux/time.lux b/stdlib/source/test/lux/world/time.lux
index 62c3ec43c..62c3ec43c 100644
--- a/stdlib/source/test/lux/time.lux
+++ b/stdlib/source/test/lux/world/time.lux
diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/world/time/date.lux
index c97fd626e..c97fd626e 100644
--- a/stdlib/source/test/lux/time/date.lux
+++ b/stdlib/source/test/lux/world/time/date.lux
diff --git a/stdlib/source/test/lux/time/day.lux b/stdlib/source/test/lux/world/time/day.lux
index eecc8a0fb..eecc8a0fb 100644
--- a/stdlib/source/test/lux/time/day.lux
+++ b/stdlib/source/test/lux/world/time/day.lux
diff --git a/stdlib/source/test/lux/time/duration.lux b/stdlib/source/test/lux/world/time/duration.lux
index e73108548..e73108548 100644
--- a/stdlib/source/test/lux/time/duration.lux
+++ b/stdlib/source/test/lux/world/time/duration.lux
diff --git a/stdlib/source/test/lux/time/instant.lux b/stdlib/source/test/lux/world/time/instant.lux
index 3899c04b9..56a4749ec 100644
--- a/stdlib/source/test/lux/time/instant.lux
+++ b/stdlib/source/test/lux/world/time/instant.lux
@@ -17,12 +17,12 @@
     [collection
      ["[0]" list (.use "[1]#[0]" mix)]]]
    [math
-    ["[0]" random]]
-   [time
-    ["[0]" duration (.only Duration)]
-    ["[0]" day (.only Day) (.use "[1]#[0]" enum)]]]]
+    ["[0]" random]]]]
  [\\library
-  ["[0]" /]])
+  ["[0]" / (.only)
+   [//
+    ["[0]" duration (.only Duration)]
+    ["[0]" day (.only Day) (.use "[1]#[0]" enum)]]]])
 
 (def .public test
   Test
diff --git a/stdlib/source/test/lux/time/month.lux b/stdlib/source/test/lux/world/time/month.lux
index c87a956cd..c87a956cd 100644
--- a/stdlib/source/test/lux/time/month.lux
+++ b/stdlib/source/test/lux/world/time/month.lux
diff --git a/stdlib/source/test/lux/time/year.lux b/stdlib/source/test/lux/world/time/year.lux
index 0e0dee518..0e0dee518 100644
--- a/stdlib/source/test/lux/time/year.lux
+++ b/stdlib/source/test/lux/world/time/year.lux