Tricu 2.0.0

Sorry for squashing all of this but 🤷

lib/arboricx/arboricx.tri

@@ -1,4 +1,7 @@
-!import "manifest.tri" !Local
+!import "prelude"           !Local
+!import "arboricx.common"   !Local
+!import "arboricx.manifest" !Local
+!import "arboricx.nodes"    !Local
 
 -- Read and validate a full Arboricx bundle.
 -- Returns (pair validManifest afterContainer).

lib/arboricx/common.tri

@@ -1,6 +1,6 @@
-!import "../prelude.tri" !Local
-!import "../bytes.tri"   !Local
-!import "../binary.tri"  !Local
+!import "prelude" !Local
+!import "binary"  !Local
+
 
 arboricxMagic = [(65) (82) (66) (79) (82) (73) (67) (88)]
 arboricxMajorVersion = [(0) (1)]

lib/arboricx/dispatch.tri

@@ -1,4 +1,5 @@
-!import "arboricx.tri" !Local
+!import "prelude"  !Local
+!import "arboricx" !Local
 
 -- Multi-purpose kernel dispatch.
 -- runArboricxTyped tag bundleBytes args

lib/arboricx/manifest.tri

@@ -1,4 +1,7 @@
-!import "nodes.tri" !Local
+!import "prelude"         !Local
+!import "binary"          !Local
+!import "arboricx.common" !Local
+!import "arboricx.nodes"  !Local
 
 readManifestMagic = (bs :
   expectBytes arboricxManifestMagic bs)

lib/arboricx/nodes.tri

@@ -1,4 +1,6 @@
-!import "common.tri" !Local
+!import "prelude"         !Local
+!import "binary"          !Local
+!import "arboricx.common" !Local
 
 -- Indexed Arboricx node section reader.
 --

lib/arboricx/server.tri

@@ -1,8 +1,9 @@
-!import "../io.tri"        !Local
-!import "../http.tri"      !Local
-!import "../socket.tri"    !Local
-!import "../patterns.tri"  !Local
-!import "arboricx.tri"     !Local
+!import "prelude"  !Local
+!import "io"       !Local
+!import "http"     !Local
+!import "socket"   !Local
+!import "patterns" !Local
+!import "arboricx" !Local
 
 -- ---------------------------------------------------------------------------
 -- Store layout helpers